Index: lams_learning/web/WEB-INF/struts/struts-config.xml
===================================================================
diff -u -rbf77e0e7ce264dac574577c0d61cc94caad9a1fb -ra068098703ce1ee36cc9e8dcf92165ab5c1be2e7
--- lams_learning/web/WEB-INF/struts/struts-config.xml	(.../struts-config.xml)	(revision bf77e0e7ce264dac574577c0d61cc94caad9a1fb)
+++ lams_learning/web/WEB-INF/struts/struts-config.xml	(.../struts-config.xml)	(revision a068098703ce1ee36cc9e8dcf92165ab5c1be2e7)
@@ -14,14 +14,14 @@
   <form-beans>
 
     <form-bean
-      name="activityForm"
-      type="org.lamsfoundation.lams.learning.web.form.ActivityForm"
-    />
-    <form-bean
       name="testDblSubmitForm"
       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"
     />
@@ -86,8 +86,10 @@
   <!-- ========== Action Mapping Definitions =================================== -->
    <action-mappings>
     <action
-      path="/gate"
-      type="org.lamsfoundation.lams.learning.web.action.GateAction"
+      path="/grouping"
+      type="org.lamsfoundation.lams.learning.web.action.GroupingAction"
+      name="GroupingForm"
+      scope="request"
       parameter="method"
       unknown="false"
       validate="false"
@@ -100,31 +102,19 @@
         scope="request"
       />
       <forward
-        name="waiting"
-        path=".gateWaiting"
+        name="viewGrouping"
+        path="/grouping.do?method=viewGrouping"
         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"
+        name="showGroup"
+        path=".grouping"
         redirect="false"
       />
     </action>
     <action
-      path="/grouping"
-      type="org.lamsfoundation.lams.learning.web.action.GroupingAction"
-      name="GroupingForm"
-      scope="request"
+      path="/learner"
+      type="org.lamsfoundation.lams.learning.web.action.LearnerAction"
       parameter="method"
       unknown="false"
       validate="false"
@@ -137,33 +127,75 @@
         scope="request"
       />
       <forward
-        name="viewGrouping"
-        path="/grouping.do?method=viewGrouping"
+        name="displayActivity"
+        path="/DisplayActivity.do"
         redirect="false"
       />
       <forward
-        name="showGroup"
-        path=".grouping"
+        name="welcome"
+        path=".welcome"
         redirect="false"
       />
     </action>
     <action
-      path="/LoadToolActivity"
-      type="org.lamsfoundation.lams.learning.web.action.LoadToolActivityAction"
+      path="/CompleteActivity"
+      type="org.lamsfoundation.lams.learning.web.action.CompleteActivityAction"
       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="/test/DblSubmit"
+      type="org.lamsfoundation.lams.learning.web.action.TestDblSubmitAction"
+      name="testDblSubmitForm"
+      scope="request"
+      unknown="false"
+      validate="false"
+    >
       <forward
-        name="displayTool"
-        path=".loadToolActivity"
+        name="display"
+        path="/test/dblSubmitTest.jsp"
         redirect="false"
       />
     </action>
     <action
-      path="/learner"
-      type="org.lamsfoundation.lams.learning.web.action.LearnerAction"
+      path="/ChooseActivity"
+      type="org.lamsfoundation.lams.learning.web.action.ChooseActivityAction"
+      name="activityForm"
+      scope="request"
+      unknown="false"
+      validate="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="/gate"
+      type="org.lamsfoundation.lams.learning.web.action.GateAction"
       parameter="method"
       unknown="false"
       validate="false"
@@ -176,33 +208,44 @@
         scope="request"
       />
       <forward
-        name="displayActivity"
-        path="/DisplayActivity.do"
+        name="waiting"
+        path=".gateWaiting"
         redirect="false"
       />
-      <forward
-        name="welcome"
-        path=".welcome"
-        redirect="false"
-      />
     </action>
     <action
-      path="/CompleteActivity"
-      type="org.lamsfoundation.lams.learning.web.action.CompleteActivityAction"
-      name="activityForm"
-      scope="request"
+      path="/dummylearner"
+      type="org.lamsfoundation.lams.learning.web.action.DummyLearnerAction"
+      parameter="method"
       unknown="false"
       validate="false"
     >
+      <exception
+        key="error.system.learner"
+        type="org.lamsfoundation.lams.learning.service.LearnerServiceException"
+        handler="org.lamsfoundation.lams.learning.util.CustomStrutsExceptionHandler"
+        path=".systemError"
+        scope="request"
+      />
+      <forward
+        name="controlActivity"
+        path="/controlBottomFrame.jsp"
+        redirect="false"
+      />
     </action>
     <action
-      path="/DisplayToolActivity"
-      type="org.lamsfoundation.lams.learning.web.action.DisplayToolActivityAction"
+      path="/LoadToolActivity"
+      type="org.lamsfoundation.lams.learning.web.action.LoadToolActivityAction"
       name="activityForm"
       scope="request"
       unknown="false"
       validate="false"
     >
+      <forward
+        name="displayTool"
+        path=".loadToolActivity"
+        redirect="false"
+      />
     </action>
     <action
       path="/DisplayActivity"
@@ -239,20 +282,6 @@
       />
     </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="/DisplayParallelActivity"
       type="org.lamsfoundation.lams.learning.web.action.DisplayParallelActivityAction"
       name="activityForm"
@@ -295,15 +324,6 @@
         redirect="false"
       />
     </action>
-    <action
-      path="/ChooseActivity"
-      type="org.lamsfoundation.lams.learning.web.action.ChooseActivityAction"
-      name="activityForm"
-      scope="request"
-      unknown="false"
-      validate="false"
-    >
-    </action>
 
    <!--
 Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)