Index: lams_common/build.xml
===================================================================
diff -u -re0dceb06e9103275e3112817d954f34e1dd43cea -r32e8aadaa935bdf558b1bd1efae9a12d7aff6413
--- lams_common/build.xml	(.../build.xml)	(revision e0dceb06e9103275e3112817d954f34e1dd43cea)
+++ lams_common/build.xml	(.../build.xml)	(revision 32e8aadaa935bdf558b1bd1efae9a12d7aff6413)
@@ -351,6 +351,9 @@
 	<!-- =================================================================== -->
 	<target name="test" depends="compile.test,insert-test-data"> 
 		<mkdir dir="${build.report}"/>
+		<copy file="${webinf}/web.xml" todir="${testwebinf}" overwrite="true"/>		
+		<copy file="${webinf}/struts/struts-config.xml" todir="${testwebinf}" overwrite="true"/>			
+		<copy file="${webinf}/tiles/tiles-defs.xml" todir="${testwebinf}/tiles" overwrite="true"/>			
 		<junit printsummary="yes" haltonerror="no" haltonfailure="no"
 			   fork="yes">
 			<formatter type="plain" usefile="false"/>
@@ -366,8 +369,7 @@
 				<pathelement location="${build.classes}"/>
 				<pathelement location="${build.classes.test}"/>
 				<pathelement location="${hbm}"/>
-				<pathelement location="${web}"/>
-				<pathelement location="${conf.struts}"/>
+				<pathelement location="${testweb}"/>
 				<path refid="project.classpath"/>
 			</classpath>
 		</junit>
Index: lams_common/test/web/WEB-INF/struts-config.xml
===================================================================
diff -u
--- lams_common/test/web/WEB-INF/struts-config.xml	(revision 0)
+++ lams_common/test/web/WEB-INF/struts-config.xml	(revision 32e8aadaa935bdf558b1bd1efae9a12d7aff6413)
@@ -0,0 +1,190 @@
+<?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">
+
+<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.
+	-->
+
+	<!-- ========== Form Bean Definitions =================================== -->
+	<form-beans>
+	
+    <form-bean name="PasswordChangeActionForm"
+               type="org.lamsfoundation.lams.web.PasswordChangeActionForm" />
+    
+    <form-bean name="OrganisationActionForm"
+               type="org.lamsfoundation.lams.usermanagement.web.OrganisationActionForm" />
+
+    <form-bean name="UserActionForm"
+               type="org.lamsfoundation.lams.usermanagement.web.UserActionForm" />
+               
+    <form-bean name="UsersAddActionForm"
+               type="org.lamsfoundation.lams.usermanagement.web.UsersAddActionForm" />
+
+    <form-bean name="UsersRemoveActionForm"
+               type="org.lamsfoundation.lams.usermanagement.web.UsersRemoveActionForm" />
+               
+	</form-beans>
+	<!-- ========== Global Exceptions Definitions =================================== -->
+	<!--
+		Define your exceptions in a file called global-exceptions.xml and place
+		it in your merge directory.
+	-->
+
+	<!-- ========== 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>
+
+	<!-- ========== Action Mapping Definitions =================================== -->
+	<action-mappings>
+
+    <action path="/home"
+            type="org.lamsfoundation.lams.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 path="/admin"
+            type="org.lamsfoundation.lams.usermanagement.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>
+
+    <action path="/organisation"
+            type="org.lamsfoundation.lams.usermanagement.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>
+
+    <action path="/user"
+            type="org.lamsfoundation.lams.usermanagement.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>
+
+    <action path="/usersadd"
+            type="org.lamsfoundation.lams.usermanagement.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>
+
+    <action path="/usersremove"
+            type="org.lamsfoundation.lams.usermanagement.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.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.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
Index: lams_common/test/web/WEB-INF/tiles/tiles-defs.xml
===================================================================
diff -u
--- lams_common/test/web/WEB-INF/tiles/tiles-defs.xml	(revision 0)
+++ lams_common/test/web/WEB-INF/tiles/tiles-defs.xml	(revision 32e8aadaa935bdf558b1bd1efae9a12d7aff6413)
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE tiles-definitions PUBLIC
+   "-//Apache Software Foundation//DTD Tiles Configuration//EN"
+   "http://jakarta.apache.org/struts/dtds/tiles-config.dtd">
+
+<tiles-definitions>
+
+	<definition name=".passwordChange" path="/template.jsp">
+		<put name="title" value="LAMS :: Change Password"/>
+		<put name="pageHeader" value="Change Password"/>
+		<put name="header" value="header.jsp"/>
+		<put name="content" value="passwordChangeContent.jsp"/>	
+		<put name="footer" value="footer.jsp"/>	
+	</definition>
+	
+	<definition name=".passwordChangeOk" path="/template.jsp">
+		<put name="title" value="LAMS :: Password Changed"/>
+		<put name="pageHeader" value="Password Changed"/>
+		<put name="header" value="header.jsp"/>
+		<put name="content" value="passwordChangeOkContent.jsp" />	
+		<put name="footer" value="footer.jsp"/>	
+	</definition>
+
+	<definition name=".error" path="/template.jsp">
+		<put name="title" value="LAMS :: Error"/>
+		<put name="pageHeader" value="Error"/>
+		<put name="header" value="header.jsp"/>
+		<put name="content" value="errorContent.jsp" />	
+		<put name="footer" value="footer.jsp"/>	
+	</definition>
+
+	<definition name=".admin.error" path="/template.jsp">
+		<put name="title" value="LAMS ::Admin Error"/>
+		<put name="pageHeader" value="Admin Error"/>
+		<put name="header" value="header.jsp"/>
+		<put name="content" value="/admin/errorContent.jsp" />	
+		<put name="footer" value="footer.jsp"/>	
+	</definition>
+
+
+	<definition name=".admin" path="/template.jsp">
+		<put name="title" value="LAMS :: Maintain Organisations/Users"/>
+		<put name="pageHeader" value="Maintain Organisations/Users"/>
+		<put name="header" value="adminHeader.jsp"/>
+		<put name="content" value="/admin/adminContent.jsp" />	
+		<put name="footer" value="footer.jsp"/>	
+	</definition>
+
+	<definition name=".admin.organisation" path="/template.jsp">
+		<put name="title" value="LAMS :: Organisation Entry"/>
+		<put name="pageHeader" value="Organisation Entry"/>
+		<put name="header" value="adminHeader.jsp"/>
+		<put name="content" value="/admin/organisationContent.jsp" />	
+		<put name="footer" value="footer.jsp"/>	
+	</definition>
+
+	<definition name=".admin.user" path="/template.jsp">
+		<put name="title" value="LAMS :: User Entry"/>
+		<put name="pageHeader" value="User Entry"/>
+		<put name="header" value="adminHeader.jsp"/>
+		<put name="content" value="/admin/userContent.jsp" />	
+		<put name="footer" value="footer.jsp"/>	
+	</definition>
+
+	<definition name=".admin.usersadd" path="/template.jsp">
+		<put name="title" value="LAMS :: Add Users To Organisation"/>
+		<put name="pageHeader" value="Add Users To Organisation"/>
+		<put name="header" value="adminHeader.jsp"/>
+		<put name="content" value="/admin/usersaddContent.jsp" />	
+		<put name="footer" value="footer.jsp"/>	
+	</definition>
+
+	<definition name=".admin.usersremove" path="/template.jsp">
+		<put name="title" value="LAMS :: Remove Users From Organisation"/>
+		<put name="pageHeader" value="Remove Users From Organisation"/>
+		<put name="header" value="adminHeader.jsp"/>
+		<put name="content" value="/admin/usersremoveContent.jsp" />	
+		<put name="footer" value="footer.jsp"/>	
+	</definition>
+	
+</tiles-definitions>
\ No newline at end of file
Index: lams_common/test/web/WEB-INF/web.xml
===================================================================
diff -u
--- lams_common/test/web/WEB-INF/web.xml	(revision 0)
+++ lams_common/test/web/WEB-INF/web.xml	(revision 32e8aadaa935bdf558b1bd1efae9a12d7aff6413)
@@ -0,0 +1,241 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
+
+<web-app>
+
+	<!--
+		To use non XDoclet filters, create a filters.xml file that
+		contains the additional filters (eg Sitemesh) and place it in your
+		projects merge dir.  Don't include filter-mappings in this file,
+		include them in a file called filter-mappings.xml and put that in
+		the same directory.
+	-->
+	
+	<display-name>LAMS</display-name>
+
+	<description>Learning Acitivity Management System</description>
+	
+	<!--
+	  - Location of the Log4J config file, for initialization and refresh checks.
+	  - Applied by Log4jConfigListener.
+	-->
+	<context-param>
+		<param-name>log4jConfigLocation</param-name>
+		<param-value>/WEB-INF/log4j.xml</param-value>
+	</context-param>
+
+	<!--
+	  - Location of the XML file that defines the root application context.
+	  - Applied by ContextLoaderServlet.
+	-->
+	<context-param>
+		<param-name>contextConfigLocation</param-name>
+		<param-value>
+			/WEB-INF/applicationContext.xml
+		</param-value>
+	</context-param>
+
+   <listener>
+      <listener-class>org.lamsfoundation.lams.web.SessionListener</listener-class>
+   </listener>
+
+	<!--
+	  - Loads the root application context of this web app at startup,
+	  - by default from "/WEB-INF/applicationContext.xml".
+		- Note that it is preferable to use ContextLoaderListener in a servlet container
+		- that follows the Servlet 2.4 initialization order (most Servlet 2.3 containers do).
+		-
+	  - Use WebApplicationContextUtils.getWebApplicationContext(servletContext)
+	  - to access it anywhere in the web application, outside of the framework.
+	  -
+	  - The root context is the parent of all servlet-specific contexts.
+	  - This means that its beans are automatically available in these child contexts,
+	  - both for getBean(name) calls and (external) bean references.
+		-->
+	<servlet>
+		<servlet-name>context</servlet-name>
+		<servlet-class>org.springframework.web.context.ContextLoaderServlet</servlet-class>
+		<load-on-startup>1</load-on-startup>
+	</servlet>
+
+	<!--
+	  - Struts servlet that dispatches requests to registered actions.
+		- Reads its configuration from "struts-config.xml".
+		-
+		- A web app can just contain one such servlet.
+		- If you need multiple namespaces, use Struts' module mechanism.
+    -->
+	<servlet>
+		<servlet-name>action</servlet-name>
+		<servlet-class>
+			org.apache.struts.action.ActionServlet
+		</servlet-class>
+		<init-param>
+			<param-name>config</param-name>
+			<param-value>/WEB-INF/struts/struts-config.xml</param-value>
+		</init-param>
+		<init-param>
+			<param-name>debug</param-name>
+			<param-value>999</param-value>
+		</init-param>
+		<init-param>
+			<param-name>detail</param-name>
+			<param-value>2</param-value>
+		</init-param>
+		<init-param>
+			<param-name>validate</param-name>
+			<param-value>true</param-value>
+		</init-param>
+		<load-on-startup>2</load-on-startup>
+	</servlet>
+	
+	<servlet>
+		<servlet-name>webauthservlet</servlet-name>
+		<servlet-class>
+			org.lamsfoundation.lams.security.WebAuthServlet
+		</servlet-class>
+		<load-on-startup>2</load-on-startup>
+	</servlet>
+
+	
+
+	<!--
+		- Dispatcher servlet mapping for the main web user interface.
+	-->
+	<servlet-mapping>
+		<servlet-name>action</servlet-name>
+		<url-pattern>*.do</url-pattern>
+	</servlet-mapping>
+
+	<servlet-mapping>
+		<servlet-name>webauthservlet</servlet-name>
+		<url-pattern>/webauth</url-pattern>
+	</servlet-mapping>
+
+	<session-config>
+		<session-timeout>3600</session-timeout>
+	</session-config>
+	
+	<mime-mapping>
+		<extension>csv</extension>
+		<mime-type>text/plain</mime-type>
+	</mime-mapping>
+	
+	<mime-mapping>
+		<extension>pdf</extension>
+		<mime-type>application/pdf</mime-type>
+	</mime-mapping>
+
+	<!--
+		To specify error pages, create a file named error-pages.xml, put it in your project's mergedir.
+		Organize error-pages.xml following this DTD slice:
+		
+		<!ELEMENT error-page ((error-code | exception-type), location)>
+	-->
+
+	<!-- Struts Tag Library Defintions -->
+	<taglib>
+		<taglib-uri>/WEB-INF/struts-bean.tld</taglib-uri>
+		<taglib-location>
+			/WEB-INF/struts/struts-bean.tld
+		</taglib-location>
+	</taglib>
+	<taglib>
+		<taglib-uri>/WEB-INF/struts-html.tld</taglib-uri>
+		<taglib-location>
+			/WEB-INF/struts/struts-html.tld
+		</taglib-location>
+	</taglib>
+	<taglib>
+		<taglib-uri>/WEB-INF/struts-logic.tld</taglib-uri>
+		<taglib-location>
+			/WEB-INF/struts/struts-logic.tld
+		</taglib-location>
+	</taglib>
+	<taglib>
+		<taglib-uri>/WEB-INF/struts-tiles.tld</taglib-uri>
+		<taglib-location>
+			/WEB-INF/struts/struts-tiles.tld
+		</taglib-location>
+	</taglib>
+	<taglib>
+		<taglib-uri>/WEB-INF/struts-bean-el.tld</taglib-uri>
+		<taglib-location>
+			/WEB-INF/struts/struts-bean-el.tld
+		</taglib-location>
+	</taglib>
+	<taglib>
+		<taglib-uri>/WEB-INF/struts-logic-el.tld</taglib-uri>
+		<taglib-location>
+			/WEB-INF/struts/struts-logic-el.tld
+		</taglib-location>
+	</taglib>
+	<taglib>
+		<taglib-uri>/WEB-INF/struts-html-el.tld</taglib-uri>
+		<taglib-location>
+			/WEB-INF/struts/struts-html-el.tld
+		</taglib-location>
+	</taglib>
+	<taglib>
+		<taglib-uri>/WEB-INF/struts-tiles-el.tld</taglib-uri>
+		<taglib-location>
+			/WEB-INF/struts/struts-tiles-el.tld
+		</taglib-location>
+	</taglib>
+	<taglib>
+		<taglib-uri>/WEB-INF/struts-nested.tld</taglib-uri>
+		<taglib-location>
+			/WEB-INF/struts/struts-nested.tld
+		</taglib-location>
+	</taglib>
+	
+	<!-- JSTL Tag Library Defintions -->
+	<taglib>
+		<taglib-uri>http://java.sun.com/jstl/core</taglib-uri>
+		<taglib-location>/WEB-INF/jstl/c.tld</taglib-location>
+	</taglib>
+	<taglib>
+		<taglib-uri>http://java.sun.com/jstl/core_rt</taglib-uri>
+		<taglib-location>/WEB-INF/jstl/c-rt.tld</taglib-location>
+	</taglib>
+	<taglib>
+		<taglib-uri>http://java.sun.com/jstl/fmt</taglib-uri>
+		<taglib-location>/WEB-INF/jstl/fmt.tld</taglib-location>
+	</taglib>
+	<taglib>
+		<taglib-uri>http://java.sun.com/jstl/fmt_rt</taglib-uri>
+		<taglib-location>/WEB-INF/jstl/fmt-rt.tld</taglib-location>
+	</taglib>
+	<taglib>
+		<taglib-uri>http://java.sun.com/jstl/xml</taglib-uri>
+		<taglib-location>/WEB-INF/jstl/x.tld</taglib-location>
+	</taglib>
+	<taglib>
+		<taglib-uri>http://java.sun.com/jstl/xml_rt</taglib-uri>
+		<taglib-location>/WEB-INF/jstl/x-rt.tld</taglib-location>
+	</taglib>
+	
+	<!--Tomcat security config-->
+	<security-constraint>
+		<web-resource-collection>
+			<web-resource-name>Secure Content</web-resource-name>
+			<url-pattern>*.jsp</url-pattern>
+			<url-pattern>*.html</url-pattern>
+		</web-resource-collection>
+
+		<auth-constraint>
+			<role-name>*</role-name>
+		</auth-constraint>
+
+	</security-constraint>
+	
+	<login-config>
+		<auth-method>FORM</auth-method>
+		<realm-name>lams</realm-name>
+		<form-login-config>
+			<form-login-page>/login.jsp</form-login-page>
+			<form-error-page>/login.jsp?failed=y</form-error-page>
+		</form-login-config>
+	</login-config>
+
+</web-app>