Index: lams_tool_pixlr/web/WEB-INF/struts/struts-config.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_pixlr/web/WEB-INF/struts/Attic/struts-config.xml,v
diff -u -r1.2 -r1.3
--- lams_tool_pixlr/web/WEB-INF/struts/struts-config.xml	12 Jan 2009 03:15:39 -0000	1.2
+++ lams_tool_pixlr/web/WEB-INF/struts/struts-config.xml	6 Oct 2010 10:16:55 -0000	1.3
@@ -14,10 +14,6 @@
   <form-beans>
 
     <form-bean
-      name="monitoringForm"
-      type="org.lamsfoundation.lams.tool.pixlr.web.forms.MonitoringForm"
-    />
-    <form-bean
       name="learningForm"
       type="org.lamsfoundation.lams.tool.pixlr.web.forms.LearningForm"
     />
@@ -26,7 +22,11 @@
       type="org.lamsfoundation.lams.tool.pixlr.web.forms.AuthoringForm"
     />
     <form-bean
-      name="lapixlr10AdminForm"
+      name="monitoringForm"
+      type="org.lamsfoundation.lams.tool.pixlr.web.forms.MonitoringForm"
+    />
+    <form-bean
+      name="lapixl10AdminForm"
       type="org.lamsfoundation.lams.tool.pixlr.web.forms.AdminForm"
     />
 
@@ -46,44 +46,39 @@
   <!-- ========== Action Mapping Definitions =================================== -->
    <action-mappings>
     <action
-      path="/authoring"
-      type="org.lamsfoundation.lams.tool.pixlr.web.actions.AuthoringAction"
-      name="authoringForm"
+      path="/monitoring"
+      type="org.lamsfoundation.lams.tool.pixlr.web.actions.MonitoringAction"
+      name="monitoringForm"
       scope="request"
       parameter="dispatch"
       unknown="false"
       validate="false"
     >
       <forward
         name="success"
-        path="tiles:/authoring/main"
+        path="tiles:/monitoring/main"
         redirect="false"
       />
       <forward
-        name="message_page"
-        path="tiles:/generic/message"
+        name="pixlr_display"
+        path="tiles:/monitoring/pixlr_display"
         redirect="false"
       />
     </action>
     <action
-      path="/monitoring"
-      type="org.lamsfoundation.lams.tool.pixlr.web.actions.MonitoringAction"
-      name="monitoringForm"
+      path="/lapixl10admin"
+      type="org.lamsfoundation.lams.tool.pixlr.web.actions.AdminAction"
+      name="lapixl10AdminForm"
       scope="request"
       parameter="dispatch"
       unknown="false"
       validate="false"
     >
       <forward
-        name="success"
-        path="tiles:/monitoring/main"
+        name="config"
+        path="/pages/admin/config.jsp"
         redirect="false"
       />
-      <forward
-        name="pixlr_display"
-        path="tiles:/monitoring/pixlr_display"
-        redirect="false"
-      />
     </action>
     <action
       path="/learning"
@@ -126,27 +121,32 @@
       />
     </action>
     <action
-      path="/lapixl10admin"
-      type="org.lamsfoundation.lams.tool.pixlr.web.actions.AdminAction"
-      name="lapixl10AdminForm"
+      path="/clearsession"
+      type="org.lamsfoundation.lams.tool.pixlr.web.actions.ClearSessionAction"
+      unknown="false"
+      validate="false"
+    >
+    </action>
+    <action
+      path="/authoring"
+      type="org.lamsfoundation.lams.tool.pixlr.web.actions.AuthoringAction"
+      name="authoringForm"
       scope="request"
       parameter="dispatch"
       unknown="false"
       validate="false"
     >
       <forward
-        name="config"
-        path="/pages/admin/config.jsp"
+        name="success"
+        path="tiles:/authoring/main"
         redirect="false"
       />
+      <forward
+        name="message_page"
+        path="tiles:/generic/message"
+        redirect="false"
+      />
     </action>
-    <action
-      path="/clearsession"
-      type="org.lamsfoundation.lams.tool.pixlr.web.actions.ClearSessionAction"
-      unknown="false"
-      validate="false"
-    >
-    </action>
 
    <action path="/authoring/newConditionInit"
 	type="org.lamsfoundation.lams.tool.pixlr.web.actions.AuthoringPixlrConditionAction"