Index: lams_central/web/WEB-INF/struts/struts-config.xml
===================================================================
diff -u -r570bcc3eaf789d638c08cb96e0fec3e4a9ba6167 -r775fdedefed0e3a8ae170d1e82fe1a5a58437e28
--- lams_central/web/WEB-INF/struts/struts-config.xml	(.../struts-config.xml)	(revision 570bcc3eaf789d638c08cb96e0fec3e4a9ba6167)
+++ lams_central/web/WEB-INF/struts/struts-config.xml	(.../struts-config.xml)	(revision 775fdedefed0e3a8ae170d1e82fe1a5a58437e28)
@@ -14,13 +14,13 @@
   <form-beans>
 
     <form-bean
-      name="PortraitActionForm"
-      type="org.lamsfoundation.lams.web.PortraitActionForm"
-    />
-    <form-bean
       name="PasswordChangeActionForm"
       type="org.lamsfoundation.lams.web.PasswordChangeActionForm"
     />
+    <form-bean
+      name="PortraitActionForm"
+      type="org.lamsfoundation.lams.web.PortraitActionForm"
+    />
 
    <form-bean name="UserForm" type="org.apache.struts.action.DynaActionForm">
 	<form-property name="userId" type="java.lang.Integer" />
@@ -71,146 +71,220 @@
   <!-- ========== Action Mapping Definitions =================================== -->
    <action-mappings>
     <action
-      path="/passwordChanged"
-      type="org.lamsfoundation.lams.web.PasswordChangeAction"
-      name="PasswordChangeActionForm"
-      scope="request"
-      input=".passwordChange"
+      path="/launchlearner"
+      type="org.lamsfoundation.lams.web.LaunchLearnerAction"
+      parameter="mod"
       unknown="false"
       validate="false"
     >
       <forward
-        name="okay"
-        path="/index.do?state=active&amp;tab=passwordChanged"
+        name="learner"
+        path="/launchlearner.jsp"
         redirect="false"
       />
       <forward
-        name="cancelled"
-        path="/index.do?state=active&amp;tab=profile"
+        name="error"
+        path=".error"
         redirect="false"
       />
       <forward
-        name="errors"
-        path="/index.do?state=active&amp;tab=password"
+        name="message"
+        path=".message"
         redirect="false"
       />
     </action>
     <action
-      path="/authoring/importToolContent"
-      type="org.lamsfoundation.lams.authoring.web.ImportToolContentAction"
-      name="ImportAction"
-      scope="request"
+      path="/home"
+      type="org.lamsfoundation.lams.web.HomeAction"
+      parameter="method"
       unknown="false"
       validate="false"
     >
       <forward
-        name="upload"
-        path="/toolcontent/import.jsp"
+        name="sysadmin"
+        path="/sysadmin.jsp"
         redirect="false"
       />
       <forward
-        name="success"
-        path="/toolcontent/importresult.jsp"
+        name="learner"
+        path="/learner.jsp"
         redirect="false"
       />
+      <forward
+        name="author"
+        path="/author.jsp"
+        redirect="false"
+      />
+      <forward
+        name="monitorLesson"
+        path="/monitorLesson.jsp"
+        redirect="false"
+      />
+      <forward
+        name="addLesson"
+        path="/addLesson.jsp"
+        redirect="false"
+      />
+      <forward
+        name="error"
+        path=".error"
+        redirect="false"
+      />
+      <forward
+        name="message"
+        path=".message"
+        redirect="false"
+      />
+      <forward
+        name="passwordChange"
+        path=".passwordChange"
+        redirect="false"
+      />
+      <forward
+        name="index"
+        path="/login.jsp"
+        redirect="false"
+      />
     </action>
     <action
-      path="/profile"
-      type="org.lamsfoundation.lams.web.ProfileAction"
+      path="/saveprofile"
+      type="org.lamsfoundation.lams.web.ProfileSaveAction"
       name="UserForm"
       scope="request"
-      parameter="method"
+      input=".editprofile"
       unknown="false"
       validate="false"
     >
       <forward
-        name="view"
-        path=".profile"
+        name="profile"
+        path="/index.do?state=active&amp;tab=profile"
         redirect="false"
       />
       <forward
-        name="edit"
-        path=".editprofile"
+        name="editprofile"
+        path="/index.do?state=active&amp;tab=editprofile"
         redirect="false"
       />
     </action>
     <action
-      path="/workspace"
-      type="org.lamsfoundation.lams.workspace.web.WorkspaceAction"
-      parameter="method"
+      path="/authoring/importToolContent"
+      type="org.lamsfoundation.lams.authoring.web.ImportToolContentAction"
+      name="ImportAction"
+      scope="request"
       unknown="false"
       validate="false"
     >
       <forward
+        name="upload"
+        path="/toolcontent/import.jsp"
+        redirect="false"
+      />
+      <forward
         name="success"
-        path="/index.jsp"
+        path="/toolcontent/importresult.jsp"
         redirect="false"
       />
     </action>
     <action
-      path="/index"
-      type="org.lamsfoundation.lams.web.IndexAction"
+      path="/theme"
+      type="org.lamsfoundation.lams.themes.web.ThemeAction"
+      name="ThemeAction"
+      scope="request"
+      parameter="method"
       unknown="false"
       validate="false"
     >
+    </action>
+    <action
+      path="/authoring/author"
+      type="org.lamsfoundation.lams.authoring.web.AuthoringAction"
+      name="AuthoringAction"
+      scope="request"
+      parameter="method"
+      unknown="false"
+      validate="false"
+    >
+    </action>
+    <action
+      path="/authoring/exportToolContent"
+      type="org.lamsfoundation.lams.authoring.web.ExportToolContentAction"
+      name="ExportAction"
+      scope="request"
+      unknown="false"
+      validate="false"
+    >
       <forward
-        name="main"
-        path="/main.jsp"
+        name="choice"
+        path="/toolcontent/exportchoice.jsp"
         redirect="false"
       />
       <forward
-        name="community"
-        path=".community"
+        name="loading"
+        path="/toolcontent/exportloading.jsp"
         redirect="false"
       />
       <forward
-        name="profile"
-        path="/profile.do?method=view"
+        name="result"
+        path="/toolcontent/exportresult.jsp"
         redirect="false"
       />
+    </action>
+    <action
+      path="/portrait"
+      type="org.lamsfoundation.lams.web.PortraitAction"
+      name="PortraitActionForm"
+      scope="request"
+      unknown="false"
+      validate="false"
+    >
       <forward
-        name="editprofile"
-        path="/profile.do?method=edit"
+        name="portrait"
+        path=".portrait"
         redirect="false"
       />
+    </action>
+    <action
+      path="/profile"
+      type="org.lamsfoundation.lams.web.ProfileAction"
+      name="UserForm"
+      scope="request"
+      parameter="method"
+      unknown="false"
+      validate="false"
+    >
       <forward
-        name="password"
-        path="/password.do"
+        name="view"
+        path=".profile"
         redirect="false"
       />
       <forward
-        name="passwordChanged"
-        path=".passwordChangeOk"
+        name="edit"
+        path=".editprofile"
         redirect="false"
       />
-      <forward
-        name="portrait"
-        path="/portrait.do"
-        redirect="false"
-      />
-      <forward
-        name="content"
-        path="/indexContent.jsp"
-        redirect="false"
-      />
     </action>
     <action
-      path="/saveprofile"
-      type="org.lamsfoundation.lams.web.ProfileSaveAction"
-      name="UserForm"
+      path="/passwordChanged"
+      type="org.lamsfoundation.lams.web.PasswordChangeAction"
+      name="PasswordChangeActionForm"
       scope="request"
-      input=".editprofile"
+      input=".passwordChange"
       unknown="false"
       validate="false"
     >
       <forward
-        name="profile"
+        name="okay"
+        path="/index.do?state=active&amp;tab=passwordChanged"
+        redirect="false"
+      />
+      <forward
+        name="cancelled"
         path="/index.do?state=active&amp;tab=profile"
         redirect="false"
       />
       <forward
-        name="editprofile"
-        path="/index.do?state=active&amp;tab=editprofile"
+        name="errors"
+        path="/index.do?state=active&amp;tab=password"
         redirect="false"
       />
     </action>
@@ -249,139 +323,65 @@
       />
     </action>
     <action
-      path="/home"
-      type="org.lamsfoundation.lams.web.HomeAction"
-      parameter="method"
+      path="/index"
+      type="org.lamsfoundation.lams.web.IndexAction"
       unknown="false"
       validate="false"
     >
       <forward
-        name="sysadmin"
-        path="/sysadmin.jsp"
+        name="main"
+        path="/main.jsp"
         redirect="false"
       />
       <forward
-        name="learner"
-        path="/learner.jsp"
+        name="community"
+        path=".community"
         redirect="false"
       />
       <forward
-        name="author"
-        path="/author.jsp"
+        name="profile"
+        path="/profile.do?method=view"
         redirect="false"
       />
       <forward
-        name="monitorLesson"
-        path="/monitorLesson.jsp"
+        name="editprofile"
+        path="/profile.do?method=edit"
         redirect="false"
       />
       <forward
-        name="addLesson"
-        path="/addLesson.jsp"
+        name="password"
+        path="/password.do"
         redirect="false"
       />
       <forward
-        name="error"
-        path=".error"
+        name="passwordChanged"
+        path=".passwordChangeOk"
         redirect="false"
       />
       <forward
-        name="message"
-        path=".message"
+        name="portrait"
+        path="/portrait.do"
         redirect="false"
       />
       <forward
-        name="passwordChange"
-        path=".passwordChange"
+        name="content"
+        path="/indexContent.jsp"
         redirect="false"
       />
-      <forward
-        name="index"
-        path="/login.jsp"
-        redirect="false"
-      />
     </action>
     <action
-      path="/theme"
-      type="org.lamsfoundation.lams.themes.web.ThemeAction"
-      name="ThemeAction"
-      scope="request"
+      path="/workspace"
+      type="org.lamsfoundation.lams.workspace.web.WorkspaceAction"
       parameter="method"
       unknown="false"
       validate="false"
     >
-    </action>
-    <action
-      path="/authoring/exportToolContent"
-      type="org.lamsfoundation.lams.authoring.web.ExportToolContentAction"
-      name="ExportAction"
-      scope="request"
-      unknown="false"
-      validate="false"
-    >
       <forward
-        name="choice"
-        path="/toolcontent/exportchoice.jsp"
+        name="success"
+        path="/index.jsp"
         redirect="false"
       />
-      <forward
-        name="loading"
-        path="/toolcontent/exportloading.jsp"
-        redirect="false"
-      />
-      <forward
-        name="result"
-        path="/toolcontent/exportresult.jsp"
-        redirect="false"
-      />
     </action>
-    <action
-      path="/authoring/author"
-      type="org.lamsfoundation.lams.authoring.web.AuthoringAction"
-      name="AuthoringAction"
-      scope="request"
-      parameter="method"
-      unknown="false"
-      validate="false"
-    >
-    </action>
-    <action
-      path="/portrait"
-      type="org.lamsfoundation.lams.web.PortraitAction"
-      name="PortraitActionForm"
-      scope="request"
-      unknown="false"
-      validate="false"
-    >
-      <forward
-        name="portrait"
-        path=".portrait"
-        redirect="false"
-      />
-    </action>
-    <action
-      path="/launchlearner"
-      type="org.lamsfoundation.lams.web.LaunchLearnerAction"
-      parameter="mod"
-      unknown="false"
-      validate="false"
-    >
-      <forward
-        name="learner"
-        path="/launchlearner.jsp"
-        redirect="false"
-      />
-      <forward
-        name="error"
-        path=".error"
-        redirect="false"
-      />
-      <forward
-        name="message"
-        path=".message"
-        redirect="false"
-      />
-    </action>
 
     <!--  uncomment to use wddxPost   
  	<action