Index: lams_learning/web/WEB-INF/struts/struts-config.xml
===================================================================
diff -u -rc09b25205f064fec423af2757330fae1c09af94a -r736b64f0115b15a7a7a6fa99fea71837f42c4104
--- lams_learning/web/WEB-INF/struts/struts-config.xml	(.../struts-config.xml)	(revision c09b25205f064fec423af2757330fae1c09af94a)
+++ lams_learning/web/WEB-INF/struts/struts-config.xml	(.../struts-config.xml)	(revision 736b64f0115b15a7a7a6fa99fea71837f42c4104)
@@ -14,14 +14,18 @@
   <form-beans>
 
     <form-bean
-      name="toolTestForm"
-      type="org.lamsfoundation.lams.learning.web.form.ToolTestForm"
-    />
-    <form-bean
       name="activityForm"
       type="org.lamsfoundation.lams.learning.web.form.ActivityForm"
     />
     <form-bean
+      name="dummyToolForm"
+      type="org.lamsfoundation.lams.learning.web.form.DummyToolForm"
+    />
+    <form-bean
+      name="testDblSubmitForm"
+      type="org.lamsfoundation.lams.learning.web.form.TestDblSubmitForm"
+    />
+    <form-bean
       name="optionsActivityForm"
       type="org.lamsfoundation.lams.learning.web.form.OptionsActivityForm"
     />
@@ -35,54 +39,53 @@
   -->
 
   <!-- ========== Global Forward Definitions =================================== -->
-<global-forwards>
+  <global-forwards>
 	<forward name="error" path="/error.jsp" />
 	<forward name="noSessionError" path="/noSessionError.jsp" />
+	<forward name="displayActivity" path="/DisplayActivity.do" />
+	<forward name="displayToolActivity" path="/DisplayToolActivity.do" />
+	<forward name="displayParallelActivity" path="/DisplayParallelActivity.do" />
+	<forward name="displayOptionsActivity" path="/DisplayOptionsActivity.do" />
+	<!-- forward name="displayGateActivity" path="/DisplayGateActivity.do" /-->
 </global-forwards>
 
   <!-- ========== Action Mapping Definitions =================================== -->
    <action-mappings>
     <action
-      path="/DisplayParallelActivity"
-      type="org.lamsfoundation.lams.learning.web.action.DisplayParallelActivity"
+      path="/DisplayActivity"
+      type="org.lamsfoundation.lams.learning.web.action.DisplayActivity"
       name="activityForm"
       scope="request"
       unknown="false"
       validate="false"
     >
-      <forward
-        name="displayParallel"
-        path=".parallelActivity"
-        redirect="false"
-      />
     </action>
     <action
-      path="/DisplayOptionsActivity"
-      type="org.lamsfoundation.lams.learning.web.action.DisplayOptionsActivity"
-      name="optionsActivityForm"
+      path="/DisplayToolActivity"
+      type="org.lamsfoundation.lams.learning.web.action.DisplayToolActivity"
+      name="activityForm"
       scope="request"
-      input="/Activity.do"
       unknown="false"
       validate="false"
     >
       <forward
-        name="displayOptions"
-        path=".optionsActivity"
+        name="displayTool"
+        path=".toolActivity"
         redirect="false"
       />
     </action>
     <action
-      path="/toolTest"
-      type="org.lamsfoundation.lams.learning.web.action.ToolTestAction"
-      name="toolTestForm"
+      path="/test/DummyTool"
+      type="org.lamsfoundation.lams.learning.web.action.DummyToolAction"
+      name="dummyToolForm"
       scope="request"
       parameter="method"
       unknown="false"
       validate="false"
     >
       <forward
         name="display"
-        path="/toolTest.jsp"
+        path="/test/dummyTool.jsp"
         redirect="false"
       />
       <forward
@@ -92,71 +95,78 @@
       />
     </action>
     <action
-      path="/test"
-      type="org.lamsfoundation.lams.learning.web.action.TestAction"
-      name="testForm"
+      path="/DisplayParallelActivity"
+      type="org.lamsfoundation.lams.learning.web.action.DisplayParallelActivity"
+      name="activityForm"
       scope="request"
       unknown="false"
       validate="false"
     >
+      <forward
+        name="displayParallel"
+        path=".parallelActivity"
+        redirect="false"
+      />
     </action>
     <action
-      path="/Activity"
-      type="org.lamsfoundation.lams.learning.web.action.ActivityAction"
-      name="activityForm"
+      path="/DisplayOptionsActivity"
+      type="org.lamsfoundation.lams.learning.web.action.DisplayOptionsActivity"
+      name="optionsActivityForm"
       scope="request"
-      parameter="method"
+      input="/Activity.do"
       unknown="false"
       validate="false"
     >
       <forward
-        name="displayToolActivity"
-        path="/DisplayToolActivity.do"
+        name="displayOptions"
+        path=".optionsActivity"
         redirect="false"
       />
+    </action>
+    <action
+      path="/CompleteActivity"
+      type="org.lamsfoundation.lams.learning.web.action.CompleteActivity"
+      name="activityForm"
+      scope="request"
+      unknown="false"
+      validate="false"
+    >
+    </action>
+    <action
+      path="/test/DblSubmit"
+      type="org.lamsfoundation.lams.learning.web.action.TestDblSubmitAction"
+      name="testDblSubmitForm"
+      scope="request"
+      unknown="false"
+      validate="false"
+    >
       <forward
-        name="displayParallelActivity"
-        path="/DisplayParallelActivity.do"
+        name="display"
+        path="/test/dblSubmitTest.jsp"
         redirect="false"
       />
-      <forward
-        name="displayOptionsActivity"
-        path="/DisplayOptionsActivity.do"
-        redirect="false"
-      />
-      <forward
-        name="displayGateActivity"
-        path="/DisplayGateActivity.do"
-        redirect="false"
-      />
-      <forward
-        name="requestDisplay"
-        path=".requestDisplay"
-        redirect="false"
-      />
-      <forward
-        name="parallelWait"
-        path=".parallelWait"
-        redirect="true"
-      />
-      <forward
-        name="lessonComplete"
-        path=".lessonComplete"
-        redirect="true"
-      />
     </action>
     <action
-      path="/DisplayToolActivity"
-      type="org.lamsfoundation.lams.learning.web.action.DisplayToolActivity"
+      path="/ChooseActivity"
+      type="org.lamsfoundation.lams.learning.web.action.ChooseActivity"
       name="activityForm"
       scope="request"
       unknown="false"
       validate="false"
     >
+    </action>
+    <action
+      path="/test/DummyLesson"
+      type="org.lamsfoundation.lams.learning.web.action.DummyLessonAction"
+      name="activityForm"
+      scope="request"
+      unknown="false"
+      validate="false"
+    >
       <forward
-        name="displayTool"
-        path=".toolActivity"
-        redirect="false"
+        name="displayLesson"
+        path="/DisplayActivity.do"
+        redirect="true"
       />
     </action>