Index: lams_tool_notebook/web/WEB-INF/struts/struts-config.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/web/WEB-INF/struts/Attic/struts-config.xml,v
diff -u -r1.5 -r1.6
--- lams_tool_notebook/web/WEB-INF/struts/struts-config.xml	9 Dec 2008 05:40:32 -0000	1.5
+++ lams_tool_notebook/web/WEB-INF/struts/struts-config.xml	6 Oct 2010 10:15:53 -0000	1.6
@@ -22,14 +22,14 @@
       type="org.lamsfoundation.lams.tool.notebook.web.forms.MonitoringForm"
     />
     <form-bean
-      name="notebookConditionForm"
-      type="org.lamsfoundation.lams.tool.notebook.web.forms.NotebookConditionForm"
-    />
-    <form-bean
       name="authoringForm"
       type="org.lamsfoundation.lams.tool.notebook.web.forms.AuthoringForm"
     />
     <form-bean
+      name="notebookConditionForm"
+      type="org.lamsfoundation.lams.tool.notebook.web.forms.NotebookConditionForm"
+    />
+    <form-bean
       name="learningForm"
       type="org.lamsfoundation.lams.tool.notebook.web.forms.LearningForm"
     />
@@ -50,31 +50,6 @@
   <!-- ========== Action Mapping Definitions =================================== -->
    <action-mappings>
     <action
-      path="/learning"
-      type="org.lamsfoundation.lams.tool.notebook.web.actions.LearningAction"
-      name="learningForm"
-      scope="request"
-      parameter="dispatch"
-      unknown="false"
-      validate="true"
-    >
-      <forward
-        name="notebook"
-        path="tiles:/learning/main"
-        redirect="false"
-      />
-      <forward
-        name="runOffline"
-        path="tiles:/learning/runOffline"
-        redirect="false"
-      />
-      <forward
-        name="defineLater"
-        path="tiles:/learning/defineLater"
-        redirect="false"
-      />
-    </action>
-    <action
       path="/monitoring"
       type="org.lamsfoundation.lams.tool.notebook.web.actions.MonitoringAction"
       name="monitoringForm"
@@ -95,13 +70,6 @@
       />
     </action>
     <action
-      path="/clearsession"
-      type="org.lamsfoundation.lams.tool.notebook.web.actions.ClearSessionAction"
-      unknown="false"
-      validate="false"
-    >
-    </action>
-    <action
       path="/authoring"
       type="org.lamsfoundation.lams.tool.notebook.web.actions.AuthoringAction"
       name="authoringForm"
@@ -136,6 +104,38 @@
         redirect="false"
       />
     </action>
+    <action
+      path="/learning"
+      type="org.lamsfoundation.lams.tool.notebook.web.actions.LearningAction"
+      name="learningForm"
+      scope="request"
+      parameter="dispatch"
+      unknown="false"
+      validate="true"
+    >
+      <forward
+        name="notebook"
+        path="tiles:/learning/main"
+        redirect="false"
+      />
+      <forward
+        name="runOffline"
+        path="tiles:/learning/runOffline"
+        redirect="false"
+      />
+      <forward
+        name="defineLater"
+        path="tiles:/learning/defineLater"
+        redirect="false"
+      />
+    </action>
+    <action
+      path="/clearsession"
+      type="org.lamsfoundation.lams.tool.notebook.web.actions.ClearSessionAction"
+      unknown="false"
+      validate="false"
+    >
+    </action>
 
    <action path="/authoring/newConditionInit"
 	type="org.lamsfoundation.lams.tool.notebook.web.actions.AuthoringNotebookConditionAction"