Index: lams_tool_gmap/web/WEB-INF/struts/struts-config.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_gmap/web/WEB-INF/struts/Attic/struts-config.xml,v
diff -u -r1.5 -r1.6
--- lams_tool_gmap/web/WEB-INF/struts/struts-config.xml	22 Oct 2008 02:35:55 -0000	1.5
+++ lams_tool_gmap/web/WEB-INF/struts/struts-config.xml	6 Oct 2010 10:17:22 -0000	1.6
@@ -22,13 +22,13 @@
       type="org.lamsfoundation.lams.tool.gmap.web.forms.AuthoringForm"
     />
     <form-bean
-      name="lagmap10AdminForm"
-      type="org.lamsfoundation.lams.tool.gmap.web.forms.AdminForm"
-    />
-    <form-bean
       name="learningForm"
       type="org.lamsfoundation.lams.tool.gmap.web.forms.LearningForm"
     />
+    <form-bean
+      name="lagmap10AdminForm"
+      type="org.lamsfoundation.lams.tool.gmap.web.forms.AdminForm"
+    />
 
   </form-beans>
 
@@ -46,39 +46,44 @@
   <!-- ========== Action Mapping Definitions =================================== -->
    <action-mappings>
     <action
-      path="/lagmap10admin"
-      type="org.lamsfoundation.lams.tool.gmap.web.actions.AdminAction"
-      name="lagmap10AdminForm"
+      path="/monitoring"
+      type="org.lamsfoundation.lams.tool.gmap.web.actions.MonitoringAction"
+      name="monitoringForm"
       scope="request"
       parameter="dispatch"
       unknown="false"
       validate="false"
     >
       <forward
-        name="config"
-        path="/pages/admin/config.jsp"
+        name="success"
+        path="tiles:/monitoring/main"
         redirect="false"
       />
+      <forward
+        name="gmap_display"
+        path="tiles:/monitoring/gmap_display"
+        redirect="false"
+      />
+      <forward
+        name="notebook"
+        path="/pages/monitoring/notebook.jsp"
+        redirect="false"
+      />
     </action>
     <action
-      path="/authoring"
-      type="org.lamsfoundation.lams.tool.gmap.web.actions.AuthoringAction"
-      name="authoringForm"
+      path="/lagmap10admin"
+      type="org.lamsfoundation.lams.tool.gmap.web.actions.AdminAction"
+      name="lagmap10AdminForm"
       scope="request"
       parameter="dispatch"
       unknown="false"
       validate="false"
     >
       <forward
-        name="success"
-        path="tiles:/authoring/main"
+        name="config"
+        path="/pages/admin/config.jsp"
         redirect="false"
       />
-      <forward
-        name="message_page"
-        path="tiles:/generic/message"
-        redirect="false"
-      />
     </action>
     <action
       path="/learning"
@@ -111,37 +116,32 @@
       />
     </action>
     <action
-      path="/monitoring"
-      type="org.lamsfoundation.lams.tool.gmap.web.actions.MonitoringAction"
-      name="monitoringForm"
+      path="/clearsession"
+      type="org.lamsfoundation.lams.tool.gmap.web.actions.ClearSessionAction"
+      unknown="false"
+      validate="false"
+    >
+    </action>
+    <action
+      path="/authoring"
+      type="org.lamsfoundation.lams.tool.gmap.web.actions.AuthoringAction"
+      name="authoringForm"
       scope="request"
       parameter="dispatch"
       unknown="false"
       validate="false"
     >
       <forward
         name="success"
-        path="tiles:/monitoring/main"
+        path="tiles:/authoring/main"
         redirect="false"
       />
       <forward
-        name="gmap_display"
-        path="tiles:/monitoring/gmap_display"
+        name="message_page"
+        path="tiles:/generic/message"
         redirect="false"
       />
-      <forward
-        name="notebook"
-        path="/pages/monitoring/notebook.jsp"
-        redirect="false"
-      />
     </action>
-    <action
-      path="/clearsession"
-      type="org.lamsfoundation.lams.tool.gmap.web.actions.ClearSessionAction"
-      unknown="false"
-      validate="false"
-    >
-    </action>
 
     <!-- If you have non XDoclet actions, define them in a file called struts-actions.xml and place it in your merge directory. -->
   </action-mappings>