Index: lams_tool_nb/web/WEB-INF/struts-config.xml
===================================================================
diff -u -r05db875c7974d705f89231416ff6dfe91a5e70f1 -r8179037dc958585c054547eb7de9be14c6aed233
--- lams_tool_nb/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision 05db875c7974d705f89231416ff6dfe91a5e70f1)
+++ lams_tool_nb/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision 8179037dc958585c054547eb7de9be14c6aed233)
@@ -14,25 +14,25 @@
   <form-beans>
 
     <form-bean
-      name="NbPedagogicalPlannerForm"
-      type="org.lamsfoundation.lams.tool.noticeboard.web.NbPedagogicalPlannerForm"
-    />
-    <form-bean
       name="NbMonitoringForm"
       type="org.lamsfoundation.lams.tool.noticeboard.web.NbMonitoringForm"
     />
     <form-bean
+      name="NbAuthoringForm"
+      type="org.lamsfoundation.lams.tool.noticeboard.web.NbAuthoringForm"
+    />
+    <form-bean
+      name="NbPedagogicalPlannerForm"
+      type="org.lamsfoundation.lams.tool.noticeboard.web.NbPedagogicalPlannerForm"
+    />
+    <form-bean
       name="NbLearnerForm"
       type="org.lamsfoundation.lams.tool.noticeboard.web.NbLearnerForm"
     />
     <form-bean
       name="NbExportForm"
       type="org.lamsfoundation.lams.tool.noticeboard.web.NbExportForm"
     />
-    <form-bean
-      name="NbAuthoringForm"
-      type="org.lamsfoundation.lams.tool.noticeboard.web.NbAuthoringForm"
-    />
 
     <!--
          If you have non XDoclet forms, define them in a file called struts-forms.xml and
@@ -59,59 +59,6 @@
   <!-- ========== Action Mapping Definitions =================================== -->
    <action-mappings>
     <action
-      path="/starter/learner"
-      type="org.lamsfoundation.lams.tool.noticeboard.web.NbLearnerStarterAction"
-      name="NbLearnerForm"
-      scope="request"
-      parameter="mode"
-      unknown="false"
-      validate="false"
-    >
-      <forward
-        name="displayLearnerContent"
-        path=".learnerContent"
-        redirect="false"
-      />
-      <forward
-        name="displayMessage"
-        path=".message"
-        redirect="false"
-      />
-      <forward
-        name="defineLater"
-        path=".defineLater"
-        redirect="false"
-      />
-    </action>
-    <action
-      path="/clearsession"
-      type="org.lamsfoundation.lams.tool.noticeboard.web.ClearSessionAction"
-      unknown="false"
-      validate="false"
-    >
-    </action>
-    <action
-      path="/authoring"
-      type="org.lamsfoundation.lams.tool.noticeboard.web.NbAuthoringAction"
-      name="NbAuthoringForm"
-      scope="request"
-      input="/author_page.jsp"
-      parameter="method"
-      unknown="false"
-      validate="true"
-    >
-      <forward
-        name="authoringContent"
-        path="/authoring/authoring.jsp"
-        redirect="false"
-      />
-      <forward
-        name="displayMessage"
-        path=".message"
-        redirect="false"
-      />
-    </action>
-    <action
       path="/exportPortfolio"
       type="org.lamsfoundation.lams.tool.noticeboard.web.NbExportAction"
       name="NbExportForm"
@@ -169,6 +116,38 @@
       />
     </action>
     <action
+      path="/starter/learner"
+      type="org.lamsfoundation.lams.tool.noticeboard.web.NbLearnerStarterAction"
+      name="NbLearnerForm"
+      scope="request"
+      parameter="mode"
+      unknown="false"
+      validate="false"
+    >
+      <forward
+        name="displayLearnerContent"
+        path=".learnerContent"
+        redirect="false"
+      />
+      <forward
+        name="displayMessage"
+        path=".message"
+        redirect="false"
+      />
+      <forward
+        name="defineLater"
+        path=".defineLater"
+        redirect="false"
+      />
+    </action>
+    <action
+      path="/clearsession"
+      type="org.lamsfoundation.lams.tool.noticeboard.web.ClearSessionAction"
+      unknown="false"
+      validate="false"
+    >
+    </action>
+    <action
       path="/pedagogicalPlanner"
       type="org.lamsfoundation.lams.tool.noticeboard.web.NbPedagogicalPlannerAction"
       name="NbPedagogicalPlannerForm"
@@ -183,6 +162,27 @@
         redirect="false"
       />
     </action>
+    <action
+      path="/authoring"
+      type="org.lamsfoundation.lams.tool.noticeboard.web.NbAuthoringAction"
+      name="NbAuthoringForm"
+      scope="request"
+      input="/author_page.jsp"
+      parameter="method"
+      unknown="false"
+      validate="true"
+    >
+      <forward
+        name="authoringContent"
+        path="/authoring/authoring.jsp"
+        redirect="false"
+      />
+      <forward
+        name="displayMessage"
+        path=".message"
+        redirect="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>