Index: lams_central/web/WEB-INF/struts/struts-config.xml
===================================================================
diff -u -rab19db088359a46353cc92e806c40ff5cff818b9 -r8179037dc958585c054547eb7de9be14c6aed233
--- lams_central/web/WEB-INF/struts/struts-config.xml	(.../struts-config.xml)	(revision ab19db088359a46353cc92e806c40ff5cff818b9)
+++ lams_central/web/WEB-INF/struts/struts-config.xml	(.../struts-config.xml)	(revision 8179037dc958585c054547eb7de9be14c6aed233)
@@ -14,21 +14,21 @@
   <form-beans>
 
     <form-bean
-      name="lamsCommunityLoginForm"
-      type="org.lamsfoundation.lams.web.lamscommunity.LamsCommunityLoginForm"
+      name="PasswordChangeActionForm"
+      type="org.lamsfoundation.lams.web.PasswordChangeActionForm"
     />
     <form-bean
       name="PortraitActionForm"
       type="org.lamsfoundation.lams.web.PortraitActionForm"
     />
     <form-bean
+      name="lamsCommunityLoginForm"
+      type="org.lamsfoundation.lams.web.lamscommunity.LamsCommunityLoginForm"
+    />
+    <form-bean
       name="TextSearchActionForm"
       type="org.lamsfoundation.lams.web.TextSearchActionForm"
     />
-    <form-bean
-      name="PasswordChangeActionForm"
-      type="org.lamsfoundation.lams.web.PasswordChangeActionForm"
-    />
 
    <form-bean
   name="PedagogicalPlannerGroupingForm"
@@ -64,7 +64,7 @@
 	<form-property name="fax" type="java.lang.String" />
 	<form-property name="email" type="java.lang.String" />
 	<form-property name="localeId" type="java.lang.Integer" />
-	<form-property name="timeZone" type="java.lang.Short" />
+	<form-property name="timeZone" type="java.lang.String" />
 	<form-property name="enableFlash" type="java.lang.Boolean" />
 	<form-property name="lamsCommunityToken" type="java.lang.String" />
 	<form-property name="lamsCommunityUsername" type="java.lang.String" />
@@ -101,78 +101,45 @@
   <!-- ========== 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="/index"
-      type="org.lamsfoundation.lams.web.IndexAction"
+      path="/PresenceChatLogger"
+      type="org.lamsfoundation.lams.webservice.PresenceChatLoggerAction"
+      parameter="method"
       unknown="false"
       validate="false"
     >
-      <forward
-        name="main"
-        path="/main.jsp"
-        redirect="false"
-      />
-      <forward
-        name="community"
-        path=".community"
-        redirect="false"
-      />
-      <forward
-        name="profile"
-        path="/profile.do?method=view"
-        redirect="false"
-      />
-      <forward
-        name="editprofile"
-        path="/profile.do?method=edit"
-        redirect="false"
-      />
-      <forward
-        name="password"
-        path="/password.do"
-        redirect="false"
-      />
-      <forward
-        name="passwordChanged"
-        path=".passwordChangeOk"
-        redirect="false"
-      />
-      <forward
-        name="portrait"
-        path="/portrait.do"
-        redirect="false"
-      />
-      <forward
-        name="lessons"
-        path="/profile.do?method=lessons"
-        redirect="false"
-      />
     </action>
     <action
+      path="/Paint"
+      type="org.lamsfoundation.lams.webservice.PaintAction"
+      parameter="method"
+      unknown="false"
+      validate="false"
+    >
+    </action>
+    <action
       path="/tutorial"
       type="org.lamsfoundation.lams.web.TutorialAction"
       parameter="method"
@@ -201,107 +168,59 @@
       />
     </action>
     <action
-      path="/PresenceChatLogger"
-      type="org.lamsfoundation.lams.webservice.PresenceChatLoggerAction"
-      parameter="method"
+      path="/authoring/importToolContent"
+      type="org.lamsfoundation.lams.authoring.web.ImportToolContentAction"
       unknown="false"
       validate="false"
     >
-    </action>
-    <action
-      path="/password"
-      type="org.lamsfoundation.lams.web.PasswordAction"
-      name="PasswordChangeActionForm"
-      scope="request"
-      unknown="false"
-      validate="false"
-    >
       <forward
-        name="passwordChange"
-        path=".passwordChange"
+        name="upload"
+        path="/toolcontent/import.jsp"
         redirect="false"
       />
+      <forward
+        name="success"
+        path="/toolcontent/importresult.jsp"
+        redirect="false"
+      />
+      <forward
+        name="successLC"
+        path="/toolcontent/importresultLC.jsp"
+        redirect="false"
+      />
+      <forward
+        name="importLC"
+        path="/toolcontent/importLC.jsp"
+        redirect="false"
+      />
     </action>
     <action
-      path="/Paint"
-      type="org.lamsfoundation.lams.webservice.PaintAction"
+      path="/theme"
+      type="org.lamsfoundation.lams.themes.web.ThemeAction"
       parameter="method"
       unknown="false"
       validate="false"
     >
     </action>
     <action
-      path="/saveportrait"
-      type="org.lamsfoundation.lams.web.PortraitSaveAction"
-      name="PortraitActionForm"
-      scope="request"
-      input=".portrait"
+      path="/authoring/author"
+      type="org.lamsfoundation.lams.authoring.web.AuthoringAction"
+      parameter="method"
       unknown="false"
       validate="false"
     >
-      <forward
-        name="profile"
-        path="/index.do?state=active&amp;tab=profile"
-        redirect="false"
-      />
-      <forward
-        name="errors"
-        path="/index.do?state=active&amp;tab=portrait"
-        redirect="false"
-      />
     </action>
     <action
-      path="/home"
-      type="org.lamsfoundation.lams.web.HomeAction"
-      parameter="method"
+      path="/loginas"
+      type="org.lamsfoundation.lams.web.LoginAsAction"
       unknown="false"
       validate="false"
     >
       <forward
-        name="sysadmin"
-        path="/sysadmin.jsp"
+        name="usersearch"
+        path="/admin/usersearch.do"
         redirect="false"
       />
-      <forward
-        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="/index.jsp"
-        redirect="false"
-      />
     </action>
     <action
       path="/Presence"
@@ -317,12 +236,29 @@
       />
     </action>
     <action
-      path="/theme"
-      type="org.lamsfoundation.lams.themes.web.ThemeAction"
+      path="/profile"
+      type="org.lamsfoundation.lams.web.ProfileAction"
+      name="UserForm"
+      scope="request"
       parameter="method"
       unknown="false"
       validate="false"
     >
+      <forward
+        name="view"
+        path=".profile"
+        redirect="false"
+      />
+      <forward
+        name="lessons"
+        path=".lessons"
+        redirect="false"
+      />
+      <forward
+        name="edit"
+        path=".editprofile"
+        redirect="false"
+      />
     </action>
     <action
       path="/r"
@@ -342,17 +278,16 @@
       />
     </action>
     <action
-      path="/lamsCommunityLogin"
-      type="org.lamsfoundation.lams.web.lamscommunity.LamsCommunityLoginAction"
-      name="lamsCommunityLoginForm"
+      path="/password"
+      type="org.lamsfoundation.lams.web.PasswordAction"
+      name="PasswordChangeActionForm"
       scope="request"
-      parameter="dispatch"
       unknown="false"
       validate="false"
     >
       <forward
-        name="lamsCommunityLogin"
-        path="/lamscommunity/lamscommunityLogin.jsp"
+        name="passwordChange"
+        path=".passwordChange"
         redirect="false"
       />
     </action>
@@ -375,6 +310,53 @@
       />
     </action>
     <action
+      path="/index"
+      type="org.lamsfoundation.lams.web.IndexAction"
+      unknown="false"
+      validate="false"
+    >
+      <forward
+        name="main"
+        path="/main.jsp"
+        redirect="false"
+      />
+      <forward
+        name="community"
+        path=".community"
+        redirect="false"
+      />
+      <forward
+        name="profile"
+        path="/profile.do?method=view"
+        redirect="false"
+      />
+      <forward
+        name="editprofile"
+        path="/profile.do?method=edit"
+        redirect="false"
+      />
+      <forward
+        name="password"
+        path="/password.do"
+        redirect="false"
+      />
+      <forward
+        name="passwordChanged"
+        path=".passwordChangeOk"
+        redirect="false"
+      />
+      <forward
+        name="portrait"
+        path="/portrait.do"
+        redirect="false"
+      />
+      <forward
+        name="lessons"
+        path="/profile.do?method=lessons"
+        redirect="false"
+      />
+    </action>
+    <action
       path="/pedagogicalPlanner"
       type="org.lamsfoundation.lams.web.planner.PedagogicalPlannerAction"
       name="PedagogicalPlannerSequenceNodeForm"
@@ -445,93 +427,109 @@
       />
     </action>
     <action
-      path="/authoring/importToolContent"
-      type="org.lamsfoundation.lams.authoring.web.ImportToolContentAction"
+      path="/displayGroup"
+      type="org.lamsfoundation.lams.web.DisplayGroupAction"
       unknown="false"
       validate="false"
     >
       <forward
-        name="upload"
-        path="/toolcontent/import.jsp"
+        name="groupHeader"
+        path="/groupHeader.jsp"
         redirect="false"
       />
       <forward
-        name="success"
-        path="/toolcontent/importresult.jsp"
+        name="groupContents"
+        path="/groupContents.jsp"
         redirect="false"
       />
       <forward
-        name="successLC"
-        path="/toolcontent/importresultLC.jsp"
+        name="group"
+        path="/group.jsp"
         redirect="false"
       />
+    </action>
+    <action
+      path="/workspace"
+      type="org.lamsfoundation.lams.workspace.web.WorkspaceAction"
+      parameter="method"
+      unknown="false"
+      validate="false"
+    >
       <forward
-        name="importLC"
-        path="/toolcontent/importLC.jsp"
+        name="success"
+        path="/index.jsp"
         redirect="false"
       />
     </action>
     <action
-      path="/profile"
-      type="org.lamsfoundation.lams.web.ProfileAction"
-      name="UserForm"
-      scope="request"
+      path="/home"
+      type="org.lamsfoundation.lams.web.HomeAction"
       parameter="method"
       unknown="false"
       validate="false"
     >
       <forward
-        name="view"
-        path=".profile"
+        name="sysadmin"
+        path="/sysadmin.jsp"
         redirect="false"
       />
       <forward
-        name="lessons"
-        path=".lessons"
+        name="learner"
+        path="/learner.jsp"
         redirect="false"
       />
       <forward
-        name="edit"
-        path=".editprofile"
+        name="author"
+        path="/author.jsp"
         redirect="false"
       />
-    </action>
-    <action
-      path="/workspace"
-      type="org.lamsfoundation.lams.workspace.web.WorkspaceAction"
-      parameter="method"
-      unknown="false"
-      validate="false"
-    >
       <forward
-        name="success"
-        path="/index.jsp"
+        name="monitorLesson"
+        path="/monitorLesson.jsp"
         redirect="false"
       />
-    </action>
-    <action
-      path="/displayGroup"
-      type="org.lamsfoundation.lams.web.DisplayGroupAction"
-      unknown="false"
-      validate="false"
-    >
       <forward
-        name="groupHeader"
-        path="/groupHeader.jsp"
+        name="addLesson"
+        path="/addLesson.jsp"
         redirect="false"
       />
       <forward
-        name="groupContents"
-        path="/groupContents.jsp"
+        name="error"
+        path=".error"
         redirect="false"
       />
       <forward
-        name="group"
-        path="/group.jsp"
+        name="message"
+        path=".message"
         redirect="false"
       />
+      <forward
+        name="passwordChange"
+        path=".passwordChange"
+        redirect="false"
+      />
+      <forward
+        name="index"
+        path="/index.jsp"
+        redirect="false"
+      />
     </action>
     <action
+      path="/lamsCommunityLogin"
+      type="org.lamsfoundation.lams.web.lamscommunity.LamsCommunityLoginAction"
+      name="lamsCommunityLoginForm"
+      scope="request"
+      parameter="dispatch"
+      unknown="false"
+      validate="false"
+    >
+      <forward
+        name="lamsCommunityLogin"
+        path="/lamscommunity/lamscommunityLogin.jsp"
+        redirect="false"
+      />
+    </action>
+    <action
       path="/authoring/exportToolContent"
       type="org.lamsfoundation.lams.authoring.web.ExportToolContentAction"
       unknown="false"
@@ -554,26 +552,6 @@
       />
     </action>
     <action
-      path="/authoring/author"
-      type="org.lamsfoundation.lams.authoring.web.AuthoringAction"
-      parameter="method"
-      unknown="false"
-      validate="false"
-    >
-    </action>
-    <action
-      path="/loginas"
-      type="org.lamsfoundation.lams.web.LoginAsAction"
-      unknown="false"
-      validate="false"
-    >
-      <forward
-        name="usersearch"
-        path="/admin/usersearch.do"
-        redirect="false"
-      />
-    </action>
-    <action
       path="/portrait"
       type="org.lamsfoundation.lams.web.PortraitAction"
       name="PortraitActionForm"
@@ -588,28 +566,50 @@
       />
     </action>
     <action
-      path="/launchlearner"
-      type="org.lamsfoundation.lams.web.LaunchLearnerAction"
-      parameter="mod"
+      path="/passwordChanged"
+      type="org.lamsfoundation.lams.web.PasswordChangeAction"
+      name="PasswordChangeActionForm"
+      scope="request"
+      input=".passwordChange"
       unknown="false"
       validate="false"
     >
       <forward
-        name="learner"
-        path="/launchlearner.jsp"
+        name="okay"
+        path="/index.do?state=active&amp;tab=passwordChanged"
         redirect="false"
       />
       <forward
-        name="error"
-        path=".error"
+        name="cancelled"
+        path="/index.do?state=active&amp;tab=profile"
         redirect="false"
       />
       <forward
-        name="message"
-        path=".message"
+        name="errors"
+        path="/index.do?state=active&amp;tab=password"
         redirect="false"
       />
     </action>
+    <action
+      path="/saveportrait"
+      type="org.lamsfoundation.lams.web.PortraitSaveAction"
+      name="PortraitActionForm"
+      scope="request"
+      input=".portrait"
+      unknown="false"
+      validate="false"
+    >
+      <forward
+        name="profile"
+        path="/index.do?state=active&amp;tab=profile"
+        redirect="false"
+      />
+      <forward
+        name="errors"
+        path="/index.do?state=active&amp;tab=portrait"
+        redirect="false"
+      />
+    </action>
 
     <!--  uncomment to use wddxPost   
  	<action