Index: lams_monitoring/web/WEB-INF/struts/struts-config.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/web/WEB-INF/struts/Attic/struts-config.xml,v
diff -u -r1.20 -r1.21
--- lams_monitoring/web/WEB-INF/struts/struts-config.xml	19 Oct 2007 01:03:00 -0000	1.20
+++ lams_monitoring/web/WEB-INF/struts/struts-config.xml	11 Sep 2008 02:24:42 -0000	1.21
@@ -43,22 +43,17 @@
   <!-- ========== Action Mapping Definitions =================================== -->
    <action-mappings>
     <action
-      path="/grouping"
-      type="org.lamsfoundation.lams.monitoring.web.GroupingAJAXAction"
+      path="/toolBranching"
+      type="org.lamsfoundation.lams.monitoring.web.ToolOutputBranchingAction"
       parameter="method"
       unknown="false"
       validate="false"
     >
       <forward
-        name="chosenGrouping"
-        path="/grouping/chosenGrouping.jsp"
+        name="viewBranches"
+        path=".viewBranches"
         redirect="false"
       />
-      <forward
-        name="viewGroups"
-        path=".viewGroups"
-        redirect="false"
-      />
     </action>
     <action
       path="/gate"
@@ -86,38 +81,37 @@
       />
     </action>
     <action
-      path="/groupedBranching"
-      type="org.lamsfoundation.lams.monitoring.web.GroupBasedBranchingAJAXAction"
-      parameter="method"
+      path="/complexProgress"
+      type="org.lamsfoundation.lams.monitoring.web.ComplexLearnerProgressAction"
       unknown="false"
       validate="false"
     >
       <forward
-        name="groupedSelection"
-        path="/branching/groupedSelection.jsp"
+        name="complexProgress"
+        path=".complexProgress"
         redirect="false"
       />
       <forward
-        name="viewBranches"
-        path=".viewBranches"
+        name="parallelProgress"
+        path="/parallelProgress.jsp"
         redirect="false"
       />
     </action>
     <action
-      path="/chosenBranching"
-      type="org.lamsfoundation.lams.monitoring.web.ChosenBranchingAJAXAction"
+      path="/grouping"
+      type="org.lamsfoundation.lams.monitoring.web.GroupingAJAXAction"
       parameter="method"
       unknown="false"
       validate="false"
     >
       <forward
-        name="chosenSelection"
-        path="/branching/chosenSelection.jsp"
+        name="chosenGrouping"
+        path="/grouping/chosenGrouping.jsp"
         redirect="false"
       />
       <forward
-        name="viewBranches"
-        path=".viewBranches"
+        name="viewGroups"
+        path=".viewGroups"
         redirect="false"
       />
     </action>
@@ -140,19 +134,42 @@
       />
     </action>
     <action
-      path="/toolBranching"
-      type="org.lamsfoundation.lams.monitoring.web.ToolOutputBranchingAction"
+      path="/chosenBranching"
+      type="org.lamsfoundation.lams.monitoring.web.ChosenBranchingAJAXAction"
       parameter="method"
       unknown="false"
       validate="false"
     >
       <forward
+        name="chosenSelection"
+        path="/branching/chosenSelection.jsp"
+        redirect="false"
+      />
+      <forward
         name="viewBranches"
         path=".viewBranches"
         redirect="false"
       />
     </action>
     <action
+      path="/groupedBranching"
+      type="org.lamsfoundation.lams.monitoring.web.GroupBasedBranchingAJAXAction"
+      parameter="method"
+      unknown="false"
+      validate="false"
+    >
+      <forward
+        name="groupedSelection"
+        path="/branching/groupedSelection.jsp"
+        redirect="false"
+      />
+      <forward
+        name="viewBranches"
+        path=".viewBranches"
+        redirect="false"
+      />
+    </action>
+    <action
       path="/sequence"
       type="org.lamsfoundation.lams.monitoring.web.SequenceAction"
       parameter="method"