Index: lams_learning/web/WEB-INF/struts/.struts-config.mex
===================================================================
diff -u -r7213f7efef305780b43d6d8f8c3f0616237ba8ec -rab7ecf3891aec5852576ebf42c663b7414b1041f
--- lams_learning/web/WEB-INF/struts/.struts-config.mex	(.../.struts-config.mex)	(revision 7213f7efef305780b43d6d8f8c3f0616237ba8ec)
+++ lams_learning/web/WEB-INF/struts/.struts-config.mex	(.../.struts-config.mex)	(revision ab7ecf3891aec5852576ebf42c663b7414b1041f)
@@ -1 +1 @@
-<FlowViewLayout Version="1.2"><StrutsActivity path="/DisplayOptionsActivity.do" location="105,15" dimension="368,75" /><StrutsActivity path="/LoadToolActivity.do" location="1850,50" dimension="370,75" /><StrutsActivity path="/test/DummyTool.do" location="540,105" dimension="346,75" /><StrutsActivity path="/learner.do" location="1550,250" dimension="328,75" /><StrutsActivity path="/CompleteActivity.do" location="-45,420" dimension="342,75" /><StrutsActivity path="/DisplayToolActivity.do" location="645,300" dimension="351,75" /><StrutsActivity path="/DisplayActivity.do" location="1170,15" dimension="331,75" /><StrutsActivity path="/test/DblSubmit.do" location="-45,330" dimension="359,75" /><StrutsActivity path="/DisplayParallelActivity.do" location="-45,600" dimension="365,75" /><StrutsActivity path="/ChooseActivity.do" location="645,390" dimension="333,75" /><StrutsActivity path="/test/DummyLesson.do" location="705,0" dimension="359,75" /><StrutsActivity path="/index.do" location="150,705" dimension="239,75" /><StrutsActivity path="/requestDisplay.do" location="645,570" dimension="239,75" /><StrutsActivity path="/parallelWait.do" location="645,675" dimension="239,75" /><StrutsActivity path="/lessonComplete.do" location="1035,195" dimension="239,75" /><StrutsActivity path="error;6" location="-300,690" dimension="150,75" /><StrutsActivity path="noSessionError;6" location="-300,795" dimension="150,75" /><StrutsActivity path=".optionsActivity" location="555,30" dimension="105,49" /><StrutsActivity path="/Activity.do.do" location="1250,350" dimension="96,75" /><StrutsActivity path=".loadToolActivity" location="390,120" dimension="110,49" /><StrutsActivity path="/test/dummyTool.jsp" location="630,225" dimension="129,49" /><StrutsActivity path=".requestDisplay" location="1005,105" dimension="105,49" /><StrutsActivity path=".welcome" location="1250,650" dimension="75,49" /><StrutsActivity path="/test/dblSubmitTest.jsp" location="420,345" dimension="142,49" /><StrutsActivity path=".parallelActivity" location="480,615" dimension="104,49" /><StrutsActivity path="/error.jsp" location="-105,705" dimension="150,49" /><StrutsActivity path="/noSessionError.jsp" location="-120,810" dimension="150,49" /><StrutsActivity path="/content.do.do" location="645,480" dimension="239,75" /><StrutsActivity path="/Activity.do.do.do" location="950,550" dimension="96,75" /><StrutsActivity path="/notebook/DisplayEntry.do.do.do" location="-60,510" dimension="367,75" /><StrutsActivity path="/DisplayLoadToolActivity.do.do.do" location="-105,120" dimension="374,75" /><StrutsActivity path=".journalDetail" location="450,525" dimension="94,49" /><StrutsActivity path="/Activity.do.do.do.do" location="-90,30" dimension="150,62" /><StrutsActivity path="/partialCompleted.jsp" location="-300,960" dimension="150,49" /><StrutsActivity path="/lessonComplete.jsp" location="405,885" dimension="150,49" /><StrutsActivity path="/requestDisplayActivity.jsp" location="615,885" dimension="150,62" /><StrutsActivity path="/parallelActivity.jsp" location="45,885" dimension="150,49" /><StrutsActivity path=".toolActivity" location="900,855" dimension="150,49" /><StrutsActivity path="/optionsActivity.jsp" location="210,960" dimension="150,49" /><StrutsActivity path="/toolActivity" location="360,195" dimension="150,49" /><StrutsActivity path="/MultiPartialCompleted.jsp" location="-300,885" dimension="150,62" /><StrutsActivity path="/SequenceCompleted.jsp" location="-270,435" dimension="150,49" /><StrutsActivity path="/RequestDisplayActivity.jsp" location="225,885" dimension="150,62" /><StrutsActivity path="/ParallelActivity.jsp" location="-270,285" dimension="150,49" /><StrutsActivity path="/ToolActivity.jsp" location="-135,960" dimension="150,49" /><StrutsActivity path="/OptionsActivity.jsp" location="-270,165" dimension="150,49" /><StrutsActivity path="/Error.jsp" location="390,960" dimension="150,49" /><StrutsActivity path="/NoSessionError.jsp" location="600,960" dimension="150,49" /><StrutsActivity path="/clientRequestDisplay.jsp" location="-135,885" dimension="150,62" /><StrutsActivity path="/Wait.jsp" location="900,780" dimension="150,49" /><StrutsActivity path="/SyncWait.jsp" location="-270,570" dimension="150,49" /><StrutsActivity path="/ParallelActivityCompleted.jsp" location="-270,345" dimension="150,62" /><StrutsActivity path="/SingleActivity.jsp" location="-270,495" dimension="150,49" /><StrutsActivity path="/DisplaySingleActivity.jsp" location="-270,15" dimension="150,49" /><StrutsActivity path="/DisplayMultiActivity.jsp" location="45,960" dimension="150,49" /><StrutsActivity path="/ActivityCompleted.jsp" location="-270,90" dimension="150,49" /><StrutsActivity path="/MultiActivity.jsp" location="-270,225" dimension="150,49" /><StrutsTransition id="/DisplayActivity.do,displayParallelActivity,/DisplayParallelActivity.do,1" routingType="0"><AutomaticBendpoints><AbsolutePoint location="1335,15" /><AbsolutePoint location="1335,-45" /><AbsolutePoint location="-375,-45" /><AbsolutePoint location="-375,637" /><AbsolutePoint location="-45,637" /></AutomaticBendpoints></StrutsTransition><StrutsTransition id="/DisplayActivity.do,displayOptionsActivity,/DisplayOptionsActivity.do,1" routingType="0"><AutomaticBendpoints><AbsolutePoint location="1365,15" /><AbsolutePoint location="1365,-75" /><AbsolutePoint location="319,-75" /><AbsolutePoint location="319,15" /></AutomaticBendpoints></StrutsTransition><StrutsTransition id="/learner.do,displayActivity,/DisplayActivity.do,1" routingType="0"><AutomaticBendpoints><AbsolutePoint location="1714,250" /><AbsolutePoint location="1714,35" /><AbsolutePoint location="1501,35" /></AutomaticBendpoints></StrutsTransition><StrutsTransition id="/test/DummyTool.do,next,.requestDisplay,1" routingType="0"><AutomaticBendpoints><AbsolutePoint location="886,139" /><AbsolutePoint location="1005,139" /></AutomaticBendpoints></StrutsTransition><StrutsTransition id="/DisplayActivity.do,lessonComplete,/lessonComplete.do,1" routingType="0"><AutomaticBendpoints><AbsolutePoint location="1259,90" /><AbsolutePoint location="1259,195" /></AutomaticBendpoints></StrutsTransition><StrutsTransition id="/test/DblSubmit.do,display,/test/dblSubmitTest.jsp,1" routingType="0"><AutomaticBendpoints><AbsolutePoint location="314,367" /><AbsolutePoint location="420,367" /></AutomaticBendpoints></StrutsTransition><StrutsTransition id="/LoadToolActivity.do,displayTool,.loadToolActivity,1" routingType="0"><AutomaticBendpoints><AbsolutePoint location="2035,50" /><AbsolutePoint location="2035,-15" /><AbsolutePoint location="488,-15" /><AbsolutePoint location="488,120" /></AutomaticBendpoints></StrutsTransition><StrutsTransition id="/test/DummyTool.do,display,/test/dummyTool.jsp,1" routingType="0"><AutomaticBendpoints><AbsolutePoint location="713,180" /><AbsolutePoint location="713,225" /></AutomaticBendpoints></StrutsTransition><StrutsTransition id="/DisplayParallelActivity.do,displayParallel,.parallelActivity,1" routingType="0"><AutomaticBendpoints><AbsolutePoint location="320,637" /><AbsolutePoint location="480,637" /></AutomaticBendpoints></StrutsTransition><StrutsTransition id="/DisplayActivity.do,parallelWait,/parallelWait.do,1" routingType="0"><AutomaticBendpoints><AbsolutePoint location="1340,90" /><AbsolutePoint location="1340,714" /><AbsolutePoint location="884,714" /></AutomaticBendpoints></StrutsTransition><StrutsTransition id="noSessionError;6,null,/noSessionError.jsp,1" routingType="0"><AutomaticBendpoints><AbsolutePoint location="-150,832" /><AbsolutePoint location="-120,832" /></AutomaticBendpoints></StrutsTransition><StrutsTransition id="/learner.do,welcome,.welcome,1" routingType="0"><AutomaticBendpoints><AbsolutePoint location="1714,325" /><AbsolutePoint location="1714,674" /><AbsolutePoint location="1325,674" /></AutomaticBendpoints></StrutsTransition><StrutsTransition id="/test/DummyLesson.do,displayLesson,/DisplayActivity.do,1" routingType="0"><AutomaticBendpoints><AbsolutePoint location="1064,37" /><AbsolutePoint location="1170,37" /></AutomaticBendpoints></StrutsTransition><StrutsTransition id="/DisplayOptionsActivity.do,displayOptions,.optionsActivity,1" routingType="0"><AutomaticBendpoints><AbsolutePoint location="473,52" /><AbsolutePoint location="555,52" /></AutomaticBendpoints></StrutsTransition><StrutsTransition id="error;6,null,/error.jsp,1" routingType="0"><AutomaticBendpoints><AbsolutePoint location="-150,727" /><AbsolutePoint location="-105,727" /></AutomaticBendpoints></StrutsTransition><StrutsTransition id="/DisplayActivity.do,loadToolActivity,/LoadToolActivity.do,1" routingType="0"><AutomaticBendpoints><AbsolutePoint location="1501,65" /><AbsolutePoint location="1850,65" /></AutomaticBendpoints></StrutsTransition><StrutsTransition id="/Activity.do.do,null,/DisplayOptionsActivity.do,2" routingType="0"><AutomaticBendpoints><AbsolutePoint location="1046,587" /><AbsolutePoint location="1516,587" /><AbsolutePoint location="1516,-135" /><AbsolutePoint location="289,-135" /><AbsolutePoint location="289,15" /></AutomaticBendpoints></StrutsTransition></FlowViewLayout>
\ No newline at end of file
+<FlowViewLayout Version="1.1"><StrutsActivity path="/DisplayOptionsActivity.do" location="105,15" dimension="368,75" /><StrutsActivity path="/gate.do" location="84,708" dimension="150,114" /><StrutsActivity path="/grouping.do" location="84,2983" dimension="150,114" /><StrutsActivity path="/LoadToolActivity.do" location="1850,50" dimension="370,75" /><StrutsActivity path="/learner.do" location="1550,250" dimension="328,75" /><StrutsActivity path="/test/DummyTool.do" location="540,105" dimension="346,75" /><StrutsActivity path="/CompleteActivity.do" location="-45,420" dimension="342,75" /><StrutsActivity path="/DisplayToolActivity.do" location="645,300" dimension="351,75" /><StrutsActivity path="/DisplayActivity.do" location="1170,15" dimension="331,75" /><StrutsActivity path="/test/DblSubmit.do" location="-45,330" dimension="359,75" /><StrutsActivity path="/DisplayParallelActivity.do" location="-45,600" dimension="365,75" /><StrutsActivity path="/ChooseActivity.do" location="645,390" dimension="333,75" /><StrutsActivity path="/test/DummyLesson.do" location="705,0" dimension="359,75" /><StrutsActivity path="/index.do" location="150,705" dimension="239,75" /><StrutsActivity path="/content.do" location="84,1073" dimension="150,101" /><StrutsActivity path="/requestDisplay.do" location="645,570" dimension="239,75" /><StrutsActivity path="/parallelWait.do" location="645,675" dimension="239,75" /><StrutsActivity path="/lessonComplete.do" location="1035,195" dimension="239,75" /><StrutsActivity path="error;6" location="-300,690" dimension="150,75" /><StrutsActivity path="noSessionError;6" location="-300,795" dimension="150,75" /><StrutsActivity path=".optionsActivity" location="555,30" dimension="105,49" /><StrutsActivity path="/Activity.do.do" location="384,872" dimension="150,88" /><StrutsActivity path=".gateWaiting" location="384,1035" dimension="150,62" /><StrutsActivity path=".grouping" location="384,2983" dimension="150,62" /><StrutsActivity path=".loadToolActivity" location="390,120" dimension="110,49" /><StrutsActivity path=".welcome" location="1250,650" dimension="75,49" /><StrutsActivity path="/test/dummyTool.jsp" location="630,225" dimension="129,49" /><StrutsActivity path=".requestDisplay" location="1005,105" dimension="105,49" /><StrutsActivity path="/test/dblSubmitTest.jsp" location="420,345" dimension="142,49" /><StrutsActivity path=".parallelActivity" location="480,615" dimension="104,49" /><StrutsActivity path="/error.jsp" location="-105,705" dimension="150,49" /><StrutsActivity path="/noSessionError.jsp" location="-120,810" dimension="150,49" /><StrutsActivity path="/Activity.do.do.do" location="1250,350" dimension="96,75" /><StrutsActivity path="/content.do.do.do" location="645,480" dimension="239,75" /><StrutsActivity path="/Activity.do.do.do.do" location="950,550" dimension="96,75" /><StrutsActivity path="/notebook/DisplayEntry.do.do.do.do" location="-60,510" dimension="367,75" /><StrutsActivity path="/DisplayLoadToolActivity.do.do.do.do" location="-105,120" dimension="374,75" /><StrutsActivity path=".journalDetail" location="450,525" dimension="94,49" /><StrutsActivity path="/Activity.do.do.do.do.do" location="-90,30" dimension="150,62" /><StrutsActivity path="/partialCompleted.jsp" location="-300,960" dimension="150,49" /><StrutsActivity path="/lessonComplete.jsp" location="405,885" dimension="150,49" /><StrutsActivity path="/requestDisplayActivity.jsp" location="615,885" dimension="150,62" /><StrutsActivity path="/parallelActivity.jsp" location="45,885" dimension="150,49" /><StrutsActivity path=".toolActivity" location="900,855" dimension="150,49" /><StrutsActivity path="/optionsActivity.jsp" location="210,960" dimension="150,49" /><StrutsActivity path="/toolActivity" location="360,195" dimension="150,49" /><StrutsActivity path="/MultiPartialCompleted.jsp" location="-300,885" dimension="150,62" /><StrutsActivity path="/SequenceCompleted.jsp" location="-270,435" dimension="150,49" /><StrutsActivity path="/RequestDisplayActivity.jsp" location="225,885" dimension="150,62" /><StrutsActivity path="/ParallelActivity.jsp" location="-270,285" dimension="150,49" /><StrutsActivity path="/ToolActivity.jsp" location="-135,960" dimension="150,49" /><StrutsActivity path="/OptionsActivity.jsp" location="-270,165" dimension="150,49" /><StrutsActivity path="/Error.jsp" location="390,960" dimension="150,49" /><StrutsActivity path="/NoSessionError.jsp" location="600,960" dimension="150,49" /><StrutsActivity path="/clientRequestDisplay.jsp" location="-135,885" dimension="150,62" /><StrutsActivity path="/Wait.jsp" location="900,780" dimension="150,49" /><StrutsActivity path="/SyncWait.jsp" location="-270,570" dimension="150,49" /><StrutsActivity path="/ParallelActivityCompleted.jsp" location="-270,345" dimension="150,62" /><StrutsActivity path="/SingleActivity.jsp" location="-270,495" dimension="150,49" /><StrutsActivity path="/DisplaySingleActivity.jsp" location="-270,15" dimension="150,49" /><StrutsActivity path="/DisplayMultiActivity.jsp" location="45,960" dimension="150,49" /><StrutsActivity path="/ActivityCompleted.jsp" location="-270,90" dimension="150,49" /><StrutsActivity path="/MultiActivity.jsp" location="-270,225" dimension="150,49" /><StrutsTransition id="/DisplayActivity.do,displayParallelActivity,/DisplayParallelActivity.do,1" routingType="0" /><StrutsTransition id="/gate.do,waiting,.gateWaiting,1" routingType="0" /><StrutsTransition id="/DisplayActivity.do,displayOptionsActivity,/DisplayOptionsActivity.do,1" routingType="0" /><StrutsTransition id="/learner.do,displayActivity,/DisplayActivity.do,1" routingType="0" /><StrutsTransition id="/test/DblSubmit.do,display,/test/dblSubmitTest.jsp,1" routingType="0" /><StrutsTransition id="/test/DummyTool.do,next,.requestDisplay,1" routingType="0" /><StrutsTransition id="/DisplayActivity.do,lessonComplete,/lessonComplete.do,1" routingType="0" /><StrutsTransition id="/LoadToolActivity.do,displayTool,.loadToolActivity,1" routingType="0" /><StrutsTransition id="/test/DummyTool.do,display,/test/dummyTool.jsp,1" routingType="0" /><StrutsTransition id="/DisplayParallelActivity.do,displayParallel,.parallelActivity,1" routingType="0" /><StrutsTransition id="/DisplayActivity.do,parallelWait,/parallelWait.do,1" routingType="0" /><StrutsTransition id="noSessionError;6,null,/noSessionError.jsp,1" routingType="0" /><StrutsTransition id="/grouping.do,showGroup,.grouping,1" routingType="0" /><StrutsTransition id="/learner.do,welcome,.welcome,1" routingType="0" /><StrutsTransition id="/test/DummyLesson.do,displayLesson,/DisplayActivity.do,1" routingType="0" /><StrutsTransition id="/DisplayOptionsActivity.do,displayOptions,.optionsActivity,1" routingType="0" /><StrutsTransition id="error;6,null,/error.jsp,1" routingType="0" /><StrutsTransition id="/DisplayActivity.do,loadToolActivity,/LoadToolActivity.do,1" routingType="0" /><StrutsTransition id="/grouping.do,viewGrouping,/grouping.do,1" routingType="0" /><StrutsTransition id="/Activity.do.do,null,/DisplayOptionsActivity.do,2" routingType="0" /></FlowViewLayout>
\ No newline at end of file