Index: lams_learning/web/WEB-INF/struts/struts-config.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/WEB-INF/struts/Attic/struts-config.xml,v
diff -u -r1.35 -r1.36
--- lams_learning/web/WEB-INF/struts/struts-config.xml	9 May 2007 00:59:43 -0000	1.35
+++ lams_learning/web/WEB-INF/struts/struts-config.xml	12 Jul 2007 00:59:27 -0000	1.36
@@ -26,9 +26,13 @@
       type="org.lamsfoundation.lams.learning.web.form.OptionsActivityForm"
     />
 
-   <form-bean name="GroupingForm"  type="org.apache.struts.validator.DynaValidatorForm">
+   <form-bean name="GroupingForm"  type="org.apache.struts.action.DynaActionForm">
 	<form-property name="title" type="java.lang.String" />
 	<form-property name="previewLesson" type="java.lang.Boolean" />
+	<!--  used for updating the the progress bar -->
+	<form-property name="lessonID" type="java.lang.Long" />
+	<form-property name="version" type="java.lang.Integer" />
+	<form-property name="progressSummary" type="java.lang.String"/>
 </form-bean>
 
 <form-bean name="GateForm"  type="org.apache.struts.action.DynaActionForm">
@@ -40,6 +44,9 @@
 	<form-property name="startingTime" type="java.util.Date" />
 	<form-property name="endingTime" type="java.util.Date" />
 	<form-property name="previewLesson" type="java.lang.Boolean" />
+	<!--  used for updating the the progress bar -->
+	<form-property name="version" type="java.lang.Integer" />
+	<form-property name="progressSummary" type="java.lang.String"/>
 </form-bean>
 
 <form-bean name="NotebookForm" type="org.apache.struts.action.DynaActionForm">
@@ -50,6 +57,19 @@
 	<form-property name="signature" type="java.lang.String" />
 </form-bean>
 
+<form-bean name="BranchingForm"  type="org.apache.struts.action.DynaActionForm">
+	<form-property name="activityID" type="java.lang.Long" />
+	<form-property name="progressID" type="java.lang.Long" />
+	<form-property name="previewLesson" type="java.lang.Boolean" />
+	<form-property name="showFinishButton" type="java.lang.Boolean" />
+	<form-property name="title" type="java.lang.String" />
+	<form-property name="type" type="java.lang.String" />
+	<!--  used for updating the the progress bar -->
+	<form-property name="lessonID" type="java.lang.Long" />
+	<form-property name="version" type="java.lang.Integer" />
+	<form-property name="progressSummary" type="java.lang.String"/>
+</form-bean> 
+
   </form-beans>
 
   <!-- ========== Global Exceptions Definitions =================================== -->
@@ -109,17 +129,17 @@
       />
     </action>
     <action
-      path="/DisplayToolActivity"
-      type="org.lamsfoundation.lams.learning.web.action.DisplayToolActivityAction"
+      path="/CompleteActivity"
+      type="org.lamsfoundation.lams.learning.web.action.CompleteActivityAction"
       name="activityForm"
       scope="request"
       unknown="false"
       validate="false"
     >
     </action>
     <action
-      path="/CompleteActivity"
-      type="org.lamsfoundation.lams.learning.web.action.CompleteActivityAction"
+      path="/DisplayToolActivity"
+      type="org.lamsfoundation.lams.learning.web.action.DisplayToolActivityAction"
       name="activityForm"
       scope="request"
       unknown="false"
@@ -190,6 +210,21 @@
       />
     </action>
     <action
+      path="/Branching"
+      type="org.lamsfoundation.lams.learning.web.action.BranchingActivityAction"
+      name="BranchingForm"
+      scope="request"
+      parameter="method"
+      unknown="false"
+      validate="false"
+    >
+      <forward
+        name="displayBranchingWait"
+        path=".branchingActivityWait"
+        redirect="false"
+      />
+    </action>
+    <action
       path="/ChooseActivity"
       type="org.lamsfoundation.lams.learning.web.action.ChooseActivityAction"
       name="activityForm"
@@ -258,6 +293,20 @@
       />
     </action>
     <action
+      path="/SequenceActivity"
+      type="org.lamsfoundation.lams.learning.web.action.SequenceActivityAction"
+      name="activityForm"
+      scope="request"
+      unknown="false"
+      validate="false"
+    >
+      <forward
+        name="empty"
+        path=".sequenceActivityEmpty"
+        redirect="false"
+      />
+    </action>
+    <action
       path="/DisplayActivity"
       type="org.lamsfoundation.lams.learning.web.action.DisplayActivityAction"
       name="activityForm"