Index: lams_admin/web/WEB-INF/struts/struts-config.xml
===================================================================
diff -u -rf8845fdf880cec49384de0f55bd7a49400fcdf6f -r0e43e21301c93315b5e7959c30e892f93411787f
--- lams_admin/web/WEB-INF/struts/struts-config.xml	(.../struts-config.xml)	(revision f8845fdf880cec49384de0f55bd7a49400fcdf6f)
+++ lams_admin/web/WEB-INF/struts/struts-config.xml	(.../struts-config.xml)	(revision 0e43e21301c93315b5e7959c30e892f93411787f)
@@ -1,190 +1,191 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 
-<!DOCTYPE struts-config PUBLIC "-//Apache Software Foundation//DTD Struts Configuration 1.1//EN" "http://jakarta.apache.org/struts/dtds/struts-config_1_1.dtd">
+<!DOCTYPE struts-config PUBLIC "-//Apache Software Foundation//DTD Struts Configuration 1.2//EN" "http://jakarta.apache.org/struts/dtds/struts-config_1_2.dtd">
 
 <struts-config>
 
-	<!-- ========== Data Sources Definitions =================================== -->
-	<!--
-		Define your Struts data sources in a file called struts-data-sources.xml and place
-		it in your merge directory.
-	-->
+  <!-- ========== Data Sources Definitions =================================== -->
+  <!--
+    Define your Struts data sources in a file called struts-data-sources.xml and place
+    it in your merge directory.
+  -->
 
-	<!-- ========== Form Bean Definitions =================================== -->
-	<form-beans>
-	
-    <form-bean name="PasswordChangeActionForm"
-               type="org.lamsfoundation.lams.admin.login.web.PasswordChangeActionForm" />
-    
-    <form-bean name="OrganisationActionForm"
-               type="org.lamsfoundation.lams.admin.web.OrganisationActionForm" />
+  <!-- ========== Form Bean Definitions =================================== -->
+  <form-beans>
 
-    <form-bean name="UserActionForm"
-               type="org.lamsfoundation.lams.admin.web.UserActionForm" />
-               
-    <form-bean name="UsersAddActionForm"
-               type="org.lamsfoundation.lams.admin.web.UsersAddActionForm" />
+    <form-bean
+      name="OrganisationActionForm"
+      type="org.lamsfoundation.lams.admin.web.OrganisationActionForm"
+    />
+    <form-bean
+      name="UsersRemoveActionForm"
+      type="org.lamsfoundation.lams.admin.web.UsersRemoveActionForm"
+    />
+    <form-bean
+      name="UserActionForm"
+      type="org.lamsfoundation.lams.admin.web.UserActionForm"
+    />
+    <form-bean
+      name="UsersAddActionForm"
+      type="org.lamsfoundation.lams.admin.web.UsersAddActionForm"
+    />
 
-    <form-bean name="UsersRemoveActionForm"
-               type="org.lamsfoundation.lams.admin.web.UsersRemoveActionForm" />
-               
-	</form-beans>
-	<!-- ========== Global Exceptions Definitions =================================== -->
-	<!--
-		Define your exceptions in a file called global-exceptions.xml and place
-		it in your merge directory.
-	-->
+    <!--
+         If you have non XDoclet forms, define them in a file called struts-forms.xml and
+         place it in your merge directory.
+    -->
+  </form-beans>
 
-	<!-- ========== Global Forward Definitions =================================== -->
-	<!--
-		Define your forwards in a file called global-forwards.xml and place
-		it in your merge directory.
-	-->
-	<global-forwards>
-		<forward name="error" path=".error"/>
-	</global-forwards>
+  <!-- ========== Global Exceptions Definitions =================================== -->
+  <!--
+    Define your exceptions in a file called global-exceptions.xml and place
+    it in your merge directory.
+  -->
 
-	<!-- ========== Action Mapping Definitions =================================== -->
-	<action-mappings>
+  <!-- ========== Global Forward Definitions =================================== -->
+  <global-forwards>
+	<forward name="error" path=".error"/>
+</global-forwards>
 
-    <action path="/home"
-            type="org.lamsfoundation.lams.admin.login.web.HomeAction"
-            parameter="method">
-      <forward name="admin"
-               path=".admin">
-      </forward>
-      <forward name="staff"
-               path="/staff.jsp">
-      </forward>
-      <forward name="author"
-               path="/author.jsp">
-      </forward>
-      <forward name="learner"
-               path="/learner.jsp">
-      </forward>
-      <forward name="passwordChange"
-               path=".passwordChange">
-      </forward>
-	</action>
+  <!-- ========== Action Mapping Definitions =================================== -->
+   <action-mappings>
+    <action
+      path="usersremove"
+      type="org.lamsfoundation.lams.admin.web.UsersRemoveAction"
+      name="UsersRemoveActionForm"
+      scope="session"
+      input=".admin.usersremove"
+      unknown="false"
+      validate="false"
+    >
+      <forward
+        name="admin"
+        path=".admin"
+        redirect="false"
+      />
+      <forward
+        name="error"
+        path=".admin.error"
+        redirect="false"
+      />
+    </action>
+    <action
+      path="/admin/organisation"
+      type="org.lamsfoundation.lams.admin.web.OrganisationAction"
+      name="OrganisationActionForm"
+      scope="session"
+      input=".admin.organisation"
+      unknown="false"
+      validate="true"
+    >
+      <forward
+        name="admin"
+        path=".admin"
+        redirect="false"
+      />
+      <forward
+        name="error"
+        path=".admin.error"
+        redirect="false"
+      />
+    </action>
+    <action
+      path="/admin"
+      type="org.lamsfoundation.lams.admin.web.AdminAction"
+      parameter="method"
+      unknown="false"
+      validate="false"
+    >
+      <forward
+        name="admin"
+        path=".admin"
+        redirect="false"
+      />
+      <forward
+        name="organisation"
+        path=".admin.organisation"
+        redirect="false"
+      />
+      <forward
+        name="user"
+        path=".admin.user"
+        redirect="false"
+      />
+      <forward
+        name="usersadd"
+        path=".admin.usersadd"
+        redirect="false"
+      />
+      <forward
+        name="usersremove"
+        path=".admin.usersremove"
+        redirect="false"
+      />
+      <forward
+        name="error"
+        path=".admin.error"
+        redirect="false"
+      />
+    </action>
+    <action
+      path="/user"
+      type="org.lamsfoundation.lams.admin.web.UserAction"
+      name="UserActionForm"
+      scope="session"
+      input=".admin.user"
+      unknown="false"
+      validate="true"
+    >
+      <forward
+        name="admin"
+        path=".admin"
+        redirect="false"
+      />
+      <forward
+        name="error"
+        path=".admin.error"
+        redirect="false"
+      />
+    </action>
+    <action
+      path="/usersadd"
+      type="org.lamsfoundation.lams.admin.web.UsersAddAction"
+      name="UsersAddActionForm"
+      scope="session"
+      input=".admin.usersadd"
+      unknown="false"
+      validate="false"
+    >
+      <forward
+        name="admin"
+        path=".admin"
+        redirect="false"
+      />
+      <forward
+        name="usersadd"
+        path=".admin.usersadd"
+        redirect="false"
+      />
+      <forward
+        name="error"
+        path=".admin.error"
+        redirect="false"
+      />
+    </action>
 
-    <action path="/admin"
-            type="org.lamsfoundation.lams.admin.web.AdminAction"
-            parameter="method">
-      <forward name="admin"
-               path=".admin">
-      </forward>
-      <forward name="organisation"
-               path=".admin.organisation">
-      </forward>
-      <forward name="user"
-               path=".admin.user">
-      </forward>
-      <forward name="usersadd"
-               path=".admin.usersadd">
-      </forward>
-      <forward name="usersremove"
-               path=".admin.usersremove">
-      </forward>
-      <forward name="error"
-               path=".admin.error">
-      </forward>
-	</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>
 
-    <action path="/organisation"
-            type="org.lamsfoundation.lams.admin.web.OrganisationAction"
-            name="OrganisationActionForm"
-            scope="session"
-            input=".admin.organisation"
-            validate="true">
-      <forward name="admin"
-               path=".admin">
-      </forward>
-      <forward name="error"
-               path=".admin.error">
-      </forward>
-	</action>
+   <!-- Define your Struts controller in a file called struts-controller.xml and place it in your merge directory. -->
 
-    <action path="/user"
-            type="org.lamsfoundation.lams.admin.web.UserAction"
-            name="UserActionForm"
-            scope="session"
-            input=".admin.user"
-            validate="true">
-      <forward name="admin"
-               path=".admin">
-      </forward>
-      <forward name="error"
-               path=".admin.error">
-      </forward>
-	</action>
+<message-resources parameter="org.lamsfoundation.lams.admin.application" />
 
-    <action path="/usersadd"
-            type="org.lamsfoundation.lams.admin.web.UsersAddAction"
-            name="UsersAddActionForm"
-            scope="session"
-            input=".admin.usersadd"
-            validate="true">
-      <forward name="admin"
-               path=".admin">
-      </forward>
-      <forward name="usersadd"
-               path=".admin.usersadd">
-      </forward>
-      <forward name="error"
-               path=".admin.error">
-      </forward>
-	</action>
+<plug-in className="org.apache.struts.tiles.TilesPlugin">
+	<set-property property="definitions-config"
+		value="/WEB-INF/tiles/tiles-defs.xml" />
+	<set-property property="definitions-debug" value="0" />
+	<set-property property="definitions-parser-details" value="0" />
+	<set-property property="definitions-parser-validate" value="true" />
+</plug-in>
 
-    <action path="/usersremove"
-            type="org.lamsfoundation.lams.admin.web.UsersRemoveAction"
-            name="UsersRemoveActionForm"
-            scope="session"
-            input=".admin.usersremove"
-            validate="false">
-      <forward name="admin"
-               path=".admin">
-      </forward>
-      <forward name="error"
-               path=".admin.error">
-      </forward>
-	</action>
-
-
-    <action path="/passwordChanged"
-            type="org.lamsfoundation.lams.admin.login.web.PasswordChangeAction"
-            name="PasswordChangeActionForm"
-            scope="session"
-            input=".passwordChange"
-            validate="true">
-      <forward name="okay"
-               path=".passwordChangeOk">
-      </forward>
-      <forward name="cancelled"
-               path="/index.jsp">
-      </forward>
-	</action>
-	
-	<action path="/passwordChangeOk"
-			parameter="/index.jsp"
-			type="org.apache.struts.actions.ForwardAction"
-			scope="request"
-			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>
-
-	<!-- Define your Struts controller in a file called struts-controller.xml and place it in your merge directory. -->
-
-   <message-resources parameter="org.lamsfoundation.lams.admin.application" />
-
-	<!-- ===================== Plugin Definition  ======================== -->
-	<plug-in className="org.apache.struts.tiles.TilesPlugin">
-		<set-property property="definitions-config"
-			value="/WEB-INF/tiles/tiles-defs.xml" />
-		<set-property property="definitions-debug" value="0" />
-		<set-property property="definitions-parser-details" value="0" />
-		<set-property property="definitions-parser-validate" value="true" />
-	</plug-in>
-
-
-</struts-config>
\ No newline at end of file
+</struts-config>