Index: lams_learning/web/WEB-INF/struts/struts-config.xml
===================================================================
diff -u -r4f68a533e24967e0185132c5e361a8a054f43941 -rc209be8131f22f6fe37bd8d6c14b56425a78b766
--- lams_learning/web/WEB-INF/struts/struts-config.xml	(.../struts-config.xml)	(revision 4f68a533e24967e0185132c5e361a8a054f43941)
+++ lams_learning/web/WEB-INF/struts/struts-config.xml	(.../struts-config.xml)	(revision c209be8131f22f6fe37bd8d6c14b56425a78b766)
@@ -18,13 +18,13 @@
       type="org.lamsfoundation.lams.learning.web.form.TestDblSubmitForm"
     />
     <form-bean
-      name="activityForm"
-      type="org.lamsfoundation.lams.learning.web.form.ActivityForm"
-    />
-    <form-bean
       name="optionsActivityForm"
       type="org.lamsfoundation.lams.learning.web.form.OptionsActivityForm"
     />
+    <form-bean
+      name="activityForm"
+      type="org.lamsfoundation.lams.learning.web.form.ActivityForm"
+    />
 
    <form-bean name="GroupingForm"  type="org.apache.struts.action.DynaActionForm">
 	<form-property name="title" type="java.lang.String" />
@@ -36,7 +36,7 @@
 </form-bean>
 
 <form-bean name="GateForm"  type="org.apache.struts.action.DynaActionForm">
-	<form-property name="gate" type="org.lamsfoundation.lams.learningdesign.GateActivity" />
+	<form-property name="gate" type="org.lamsfoundation.lams.learning.web.bean.GateActivityDTO" />
 	<form-property name="activityID" type="java.lang.Long" />
 	<form-property name="lessonID" type="java.lang.Long" />
 	<form-property name="waitingLearners" type="java.lang.Integer"/>
@@ -93,67 +93,40 @@
   <!-- ========== Action Mapping Definitions =================================== -->
    <action-mappings>
     <action
-      path="/grouping"
-      type="org.lamsfoundation.lams.learning.web.action.GroupingAction"
-      name="GroupingForm"
+      path="/gate"
+      type="org.lamsfoundation.lams.learning.web.action.GateAction"
+      name="GateForm"
       scope="request"
       parameter="method"
       unknown="false"
       validate="false"
     >
       <forward
-        name="viewGroup"
-        path="/grouping.do?method=viewGrouping"
+        name="permissionGate"
+        path=".permissionGate"
         redirect="false"
       />
       <forward
-        name="showGroup"
-        path=".showgroup"
+        name="scheduleGate"
+        path=".scheduleGate"
         redirect="false"
       />
       <forward
-        name="waitGroup"
-        path=".waitgroup"
+        name="synchGate"
+        path=".synchGate"
         redirect="false"
       />
     </action>
     <action
-      path="/learner"
-      type="org.lamsfoundation.lams.learning.web.action.LearnerAction"
-      parameter="method"
-      unknown="false"
-      validate="false"
-    >
-      <forward
-        name="displayActivity"
-        path="/DisplayActivity.do"
-        redirect="false"
-      />
-      <forward
-        name="displayProgress"
-        path="/progress.jsp"
-        redirect="false"
-      />
-    </action>
-    <action
-      path="/CompleteActivity"
-      type="org.lamsfoundation.lams.learning.web.action.CompleteActivityAction"
+      path="/ChooseActivity"
+      type="org.lamsfoundation.lams.learning.web.action.ChooseActivityAction"
       name="activityForm"
       scope="request"
       unknown="false"
       validate="false"
     >
     </action>
     <action
-      path="/DisplayToolActivity"
-      type="org.lamsfoundation.lams.learning.web.action.DisplayToolActivityAction"
-      name="activityForm"
-      scope="request"
-      unknown="false"
-      validate="false"
-    >
-    </action>
-    <action
       path="/notebook"
       type="org.lamsfoundation.lams.learning.web.action.NotebookAction"
       name="NotebookForm"
@@ -189,101 +162,65 @@
       />
     </action>
     <action
-      path="/LessonComplete"
-      type="org.lamsfoundation.lams.learning.web.action.LessonCompleteActivityAction"
+      path="/DisplayParallelActivity"
+      type="org.lamsfoundation.lams.learning.web.action.DisplayParallelActivityAction"
       name="activityForm"
       scope="request"
       unknown="false"
       validate="false"
     >
       <forward
-        name="lessonComplete"
-        path=".lessonComplete"
+        name="displayParallel"
+        path=".parallelActivity"
         redirect="false"
       />
     </action>
     <action
-      path="/test/DblSubmit"
-      type="org.lamsfoundation.lams.learning.web.action.TestDblSubmitAction"
-      name="testDblSubmitForm"
-      scope="request"
-      unknown="false"
-      validate="false"
-    >
-      <forward
-        name="display"
-        path="/test/dblSubmitTest.jsp"
-        redirect="false"
-      />
-    </action>
-    <action
-      path="/branching"
-      type="org.lamsfoundation.lams.learning.web.action.BranchingActivityAction"
-      name="BranchingForm"
-      scope="request"
+      path="/learner"
+      type="org.lamsfoundation.lams.learning.web.action.LearnerAction"
       parameter="method"
       unknown="false"
       validate="false"
     >
       <forward
-        name="displayBranchingWait"
-        path=".branchingActivityWait"
+        name="displayActivity"
+        path="/DisplayActivity.do"
         redirect="false"
       />
       <forward
-        name="displayBranchingPreview"
-        path=".branchingActivityPreview"
+        name="displayProgress"
+        path="/progress.jsp"
         redirect="false"
       />
     </action>
     <action
-      path="/ChooseActivity"
-      type="org.lamsfoundation.lams.learning.web.action.ChooseActivityAction"
+      path="/SequenceActivity"
+      type="org.lamsfoundation.lams.learning.web.action.SequenceActivityAction"
       name="activityForm"
       scope="request"
       unknown="false"
       validate="false"
     >
     </action>
     <action
-      path="/DisplayOptionsActivity"
-      type="org.lamsfoundation.lams.learning.web.action.DisplayOptionsActivityAction"
-      name="optionsActivityForm"
+      path="/branching"
+      type="org.lamsfoundation.lams.learning.web.action.BranchingActivityAction"
+      name="BranchingForm"
       scope="request"
-      input="/Activity.do"
-      unknown="false"
-      validate="false"
-    >
-      <forward
-        name="displayOptions"
-        path=".optionsActivity"
-        redirect="false"
-      />
-    </action>
-    <action
-      path="/gate"
-      type="org.lamsfoundation.lams.learning.web.action.GateAction"
-      name="GateForm"
-      scope="request"
       parameter="method"
       unknown="false"
       validate="false"
     >
       <forward
-        name="permissionGate"
-        path=".permissionGate"
+        name="displayBranchingWait"
+        path=".branchingActivityWait"
         redirect="false"
       />
       <forward
-        name="scheduleGate"
-        path=".scheduleGate"
+        name="displayBranchingPreview"
+        path=".branchingActivityPreview"
         redirect="false"
       />
-      <forward
-        name="synchGate"
-        path=".synchGate"
-        redirect="false"
-      />
     </action>
     <action
       path="/LoadToolActivity"
@@ -305,13 +242,32 @@
       />
     </action>
     <action
-      path="/SequenceActivity"
-      type="org.lamsfoundation.lams.learning.web.action.SequenceActivityAction"
+      path="/test/DblSubmit"
+      type="org.lamsfoundation.lams.learning.web.action.TestDblSubmitAction"
+      name="testDblSubmitForm"
+      scope="request"
+      unknown="false"
+      validate="false"
+    >
+      <forward
+        name="display"
+        path="/test/dblSubmitTest.jsp"
+        redirect="false"
+      />
+    </action>
+    <action
+      path="/LessonComplete"
+      type="org.lamsfoundation.lams.learning.web.action.LessonCompleteActivityAction"
       name="activityForm"
       scope="request"
       unknown="false"
       validate="false"
     >
+      <forward
+        name="lessonComplete"
+        path=".lessonComplete"
+        redirect="false"
+      />
     </action>
     <action
       path="/DisplayActivity"
@@ -348,19 +304,68 @@
       />
     </action>
     <action
-      path="/DisplayParallelActivity"
-      type="org.lamsfoundation.lams.learning.web.action.DisplayParallelActivityAction"
+      path="/DisplayToolActivity"
+      type="org.lamsfoundation.lams.learning.web.action.DisplayToolActivityAction"
       name="activityForm"
       scope="request"
       unknown="false"
       validate="false"
     >
+    </action>
+    <action
+      path="/grouping"
+      type="org.lamsfoundation.lams.learning.web.action.GroupingAction"
+      name="GroupingForm"
+      scope="request"
+      parameter="method"
+      unknown="false"
+      validate="false"
+    >
       <forward
-        name="displayParallel"
-        path=".parallelActivity"
+        name="viewGroup"
+        path="/grouping.do?method=viewGrouping"
         redirect="false"
       />
+      <forward
+        name="showGroup"
+        path=".showgroup"
+        redirect="false"
+      />
+      <forward
+        name="waitGroup"
+        path=".waitgroup"
+        redirect="false"
+      />
+      <forward
+        name="chooseGroup"
+        path=".choosegroup"
+        redirect="false"
+      />
     </action>
+    <action
+      path="/DisplayOptionsActivity"
+      type="org.lamsfoundation.lams.learning.web.action.DisplayOptionsActivityAction"
+      name="optionsActivityForm"
+      scope="request"
+      input="/Activity.do"
+      unknown="false"
+      validate="false"
+    >
+      <forward
+        name="displayOptions"
+        path=".optionsActivity"
+        redirect="false"
+      />
+    </action>
+    <action
+      path="/CompleteActivity"
+      type="org.lamsfoundation.lams.learning.web.action.CompleteActivityAction"
+      name="activityForm"
+      scope="request"
+      unknown="false"
+      validate="false"
+    >
+    </action>
 
 <action path="/index"
 	type="org.apache.struts.actions.ForwardAction"