Index: lams_admin/.classpath
===================================================================
diff -u
--- lams_admin/.classpath	(revision 0)
+++ lams_admin/.classpath	(revision 0e43e21301c93315b5e7959c30e892f93411787f)
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src/java"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/3rdParty"/>
+	<classpathentry kind="lib" path="/lams_build/lib/lams/lams.jar"/>
+	<classpathentry kind="lib" path="/lams_build/lib/lams/lams-central.jar"/>
+	<classpathentry kind="con" path="com.genuitec.eclipse.j2eedt.core.J2EE14_CONTAINER"/>
+	<classpathentry kind="output" path="build/classes/java"/>
+</classpath>
Index: lams_admin/.cvsignore
===================================================================
diff -u
--- lams_admin/.cvsignore	(revision 0)
+++ lams_admin/.cvsignore	(revision 0e43e21301c93315b5e7959c30e892f93411787f)
@@ -0,0 +1 @@
+build
Index: lams_admin/build.properties
===================================================================
diff -u -rf8845fdf880cec49384de0f55bd7a49400fcdf6f -r0e43e21301c93315b5e7959c30e892f93411787f
--- lams_admin/build.properties	(.../build.properties)	(revision f8845fdf880cec49384de0f55bd7a49400fcdf6f)
+++ lams_admin/build.properties	(.../build.properties)	(revision 0e43e21301c93315b5e7959c30e892f93411787f)
@@ -1,59 +1,8 @@
-# Ant properties for building the lams survey tool
-
+####################################################################################################
+## NOTE: Most variables are defined in ../lams_build/common.properties file.
+##       You could define same name variable in this file to override value in common.properties.
+#####################################################################################################
 #name of this project
 name=lams_admin
-
-# Library directory within project. Where third party jars reside.
-lams_commondir=../lams_common
-lib.dir=${basedir}/lib
-common.lib.dir=${lams_commondir}/lib
-common.build.dir=${lams_commondir}/build/classes
-
-# Source directory under the current root
-src.dir=${basedir}/src
-src.dir.java=${src.dir}/java
-test.dir=${basedir}/test
-test.dir.java=${test.dir}/java
-
-# Build directory
-build=${basedir}/build
-build.classes.java=${build}/classes/java
-build.classes.test=${build}/classes/test
-build.lib=${build}/lib
-build.report=${build}/report
-
-
-jboss.home.windows.dir=C:/jboss-3.2.6
-jboss.deploy.windows.dir=${jboss.home.windows.dir}/server/default/deploy
-jboss.home.unix.dir=/usr/local/jboss-3.2.6
-jboss.deploy.unix.dir=${jboss.home.unix.dir}/server/default/deploy
-
-
-#configuration files
-conf.dir=${basedir}/conf
-conf.web.dir=${basedir}/web
-conf.webinf.dir=${conf.web.dir}/WEB-INF
-conf.struts.dir=${conf.web.dir}/WEB-INF/struts
-conf.xdoclet.dir=${conf.dir}/xdoclet
-
-lamsconf.windows.dir=C:/lamsconf
-lamsconf.unix.dir=/usr/local/lamsconf
-
-conf.windows.dir=${conf.dir}/windows
-conf.jboss.windows.dir=${conf.windows.dir}/jboss
-conf.auth.windows.dir=${conf.windows.dir}/authentication
-conf.lams.windows.dir=${conf.windows.dir}/lams
-conf.unix.dir=${conf.dir}/unix
-conf.jboss.unix.dir=${conf.unix.dir}/jboss
-conf.auth.unix.dir=${conf.unix.dir}/authentication
-conf.lams.unix.dir=${conf.unix.dir}/lams
-
-#xdoclet version number
-xdoclet.version=1.2.2
-
-#web application properties
-sessiontimeout=120
-
-#Gui or not?
-gui=true
-
+product=lams-admin
+j2eelibs=C:/Program Files/MyEclipse/eclipse/plugins/com.genuitec.eclipse.j2eedt.core_3.8.4/data/libraryset/1.4
\ No newline at end of file
Index: lams_admin/build.xml
===================================================================
diff -u -rf8845fdf880cec49384de0f55bd7a49400fcdf6f -r0e43e21301c93315b5e7959c30e892f93411787f
--- lams_admin/build.xml	(.../build.xml)	(revision f8845fdf880cec49384de0f55bd7a49400fcdf6f)
+++ lams_admin/build.xml	(.../build.xml)	(revision 0e43e21301c93315b5e7959c30e892f93411787f)
@@ -3,20 +3,18 @@
 <!-- -->
 <!DOCTYPE project [
 ]>
-
-
 <project name="lams_admin" default="usage" basedir=".">
 
-	<property file="build.properties" />
+	<property file="build.properties"/>
+	<property file="../lams_build/common.properties"/>
 
 	<path id="all-libs">
-		<fileset dir="${lib.dir}">
-			<include name="**/*.jar" />
-		</fileset>
-		<fileset dir="${common.lib.dir}">
-			<include name="**/*.jar" />
-		</fileset>
-		<pathelement location="${common.build.dir}" />
+			<fileset dir="${sharedlib}">
+				<include name="**/*.jar"/>
+			</fileset>
+			<fileset dir="${j2eelibs}">
+					<include name="**/*.jar"/>
+			</fileset>
 	</path>
 
 	<path id="project.classpath">
@@ -67,7 +65,7 @@
 
 	<target name="compile.java" depends="clean"
 		description="compile java sources">
-		<javac srcdir="${src.dir.java}" compiler="modern"
+		<javac srcdir="${src.java.dir}" compiler="modern"
 			destdir="${build.classes.java}" deprecation="on" debug="on">
 			<classpath>
 				<path refid="project.classpath" />
@@ -77,43 +75,26 @@
 
 	<target name="compile.test" depends="compile.java">
 		<javac destdir="${build.classes.test}" compiler="modern">
-			<src path="${test.dir.java}" />
+			<src path="${src.test.dir}" />
 			<classpath>
 				<pathelement location="${build.classes.java}" />
 				<path refid="project.classpath" />
 			</classpath>
 		</javac>
 	</target>
-	
-	
-	<target name="prepareconfdir-windows">
-		<delete quiet="true">
-			<fileset dir="${lamsconf.windows.dir}"/>
-		</delete>
-		<mkdir dir="${lamsconf.windows.dir}"/>
-	</target>
-	
-	<target name="copyconf-windows" depends="prepareconfdir-windows" description="copy lib and config files">
-		<copy overwrite="yes" todir="${jboss.home.windows.dir}/server/default/conf/">
-			<fileset dir="${conf.jboss.windows.dir}/">
-				<include name="login-config.xml"/>
+	<target name="copyContext" description="copies the applicationContext.xml files to the web directory">
+		<copy overwrite="yes" todir="${build.web}">
+			<fileset dir="${conf.web.dir}">
+				<include name="**/*.xml"/>
+				<include name="**/*.tld"/>
 			</fileset>
 		</copy>
-		<copy overwrite="yes" todir="${lamsconf.windows.dir}">
-			<fileset dir="${conf.auth.windows.dir}/">
-				<include name="*.xml"/>
-				<include name="*.dtd"/>
-			</fileset>
-			<fileset dir="${conf.lams.windows.dir}/">
-				<include name="*.xml"/>
-				<include name="*.dtd"/>
-			</fileset>
-		</copy>
-		<copy overwrite="yes" todir="${jboss.deploy.windows.dir}">
-			<fileset dir="${conf.jboss.windows.dir}/service">
-				<include name="mysql*.xml"/>
-			</fileset>
-		</copy>
+		<copy overwrite="yes" todir="${build.classes.java}/org/lamsfoundation/lams">
+				<fileset dir="${src.java.dir}/org/lamsfoundation/lams">
+						<include name="**/*.xml"/>
+						<include name="**/*.properties"/>
+				</fileset>
+		</copy>	
 	</target>
 
 	<!-- =================================================================== -->
@@ -135,46 +116,70 @@
 		</fail>
 	</target>
 
+	<!-- ================================================================ -->
+	<!-- Make jar archive for deployment        		    	          -->
+	<!-- ================================================================ -->
+		<target name="build-jar" depends="compile.java,copyContext" description="creates jar file">
+			<delete file="${build.lib}/${product}.jar"/>
+			<jar jarfile="${build.lib}/${product}.jar" manifest="${conf.dir}/jar/META-INF/MANIFEST.MF">
+				<fileset dir="${build.classes.java}"/>
+				<fileset dir="${conf.hibernate.mapping.dir}"/>
+				<fileset dir="${build.web}"/>
+			</jar>
+		</target>
+	
+	   <!-- =================================================================== -->
+	   <!-- Run xdoclet			                                                -->
+	   <!-- =================================================================== -->
+	   	<taskdef name="webdoclet" classname="xdoclet.modules.web.WebDocletTask">
+		    <classpath refid="all-libs"/>
+		</taskdef>
+		
+		<target name="webdoclet" depends="preparedirs">
+			<webdoclet destdir="${generated.java}" force="${xdoclet.force}">
 
-	<!-- =================================================================== -->
-	<!-- Run webdoclet                                                       -->
-	<!-- =================================================================== -->
-
-
-	<!-- the webdoclet target is commented out as the web.xml and
-	struts-config.xml are not auto-generated -->
-	<!--taskdef name="webdoclet"
-		classname="xdoclet.modules.web.WebDocletTask">
-		<classpath refid="all-libs" />
-	</taskdef>
-
-	<target name="webdoclet" depends="preparedirs">
-		<webdoclet destdir="${generated.java}"
-			force="${xdoclet.force}">
-
-			<fileset dir="${src.dir.java}">
+	         <fileset dir="${src.java.dir}">
 	            <include name="**/*Action.java" />
 	            <include name="**/*Form.java" />
-			</fileset>
-			<fileset dir="${test.dir.java}">
-	            <include name="**/*Action.java" />
-	            <include name="**/*Form.java" />
-			</fileset>
+	         </fileset>
 
-			<deploymentdescriptor servletspec="2.3"
-				destdir="${conf.webinf.dir}" mergedir="${conf.xdoclet.dir}"
-				sessiontimeout="${sessiontimeout}" />
-
-			<strutsconfigxml destdir="${conf.struts.dir}"
-				mergedir="${conf.xdoclet.dir}" version="1.2" />
-		</webdoclet>
-	</target-->
-
-
+	         <deploymentdescriptor servletspec="2.3" destdir="${conf.webinf.dir}"
+				mergedir="${conf.xdoclet.dir}" sessiontimeout="${sessiontimeout}"/>
+				
+	         <strutsconfigxml destdir="${conf.struts.dir}" mergedir="${conf.xdoclet.dir}" version="1.2" />
+	         <strutsdynaformvalidationxml destdir="${conf.struts.dir}" mergedir="${conf.xdoclet.dir}" version="1.1.3"  />
+	      </webdoclet>
+	   </target>
+	
+	   <!-- ================================================ -->
+	   <!-- Make the WAR archive for deployment				 -->
+	   <!-- ================================================ -->	
+		
+	   <target name="build-war" depends="webdoclet,build-jar" description="creates war file">
+	   		<delete file="${build.lib}/${product}.war"/>	
+	   		<war warfile="${build.lib}/${product}.war" manifest="${conf.dir}/war/META-INF/MANIFEST.MF"
+	   			 webxml="${conf.webinf.dir}/web.xml">
+	   			
+	   			<webinf dir="${conf.webinf.dir}">
+	   				<include name=".xml"/>
+	   				<include name="**/*.*"/>
+	   				<exclude name="web.xml"/>
+	   				<exclude name="classes/**"/>
+	   			</webinf>
+	   			<classes dir="${build.classes.java}"/>	
+	   			<!-- front end programs like HTML, JSP, CSS etc. -->
+	   			<fileset dir="${conf.web.dir}">
+						<include name="**/*.jsp"/>
+						<include name="includes/**"/>
+				</fileset>
+	   			
+	   	   </war>
+	   	
+	   </target>
 	<!-- =================================================================== -->
 	<!-- Run JUnit Tests                                                     -->
 	<!-- =================================================================== -->
-	<!-- target name="test" depends="compile.test,build-db">
+	<target name="test" depends="compile.test">
 		<mkdir dir="${build.report}" />
 		<junit printsummary="yes" haltonerror="no" haltonfailure="no"
 			fork="yes">
@@ -206,6 +211,6 @@
 			</fileset>
 			<report todir="${build.report}/html" />
 		</junitreport>
-	</target-->
+	</target>
 
 </project>
Index: lams_admin/conf/jar/META-INF/MANIFEST.MF
===================================================================
diff -u
--- lams_admin/conf/jar/META-INF/MANIFEST.MF	(revision 0)
+++ lams_admin/conf/jar/META-INF/MANIFEST.MF	(revision 0e43e21301c93315b5e7959c30e892f93411787f)
@@ -0,0 +1,3 @@
+Implementation-Title: LAMS Admin
+Implementation-Version: 1.1
+Implementation-Vendor: LAMS Foundation (http://lamsfoundation.org)
Fisheye: Tag 0e43e21301c93315b5e7959c30e892f93411787f refers to a dead (removed) revision in file `lams_admin/conf/unix/authentication/authentication.dtd'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 0e43e21301c93315b5e7959c30e892f93411787f refers to a dead (removed) revision in file `lams_admin/conf/unix/authentication/authentication.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 0e43e21301c93315b5e7959c30e892f93411787f refers to a dead (removed) revision in file `lams_admin/conf/unix/jboss/login-config.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 0e43e21301c93315b5e7959c30e892f93411787f refers to a dead (removed) revision in file `lams_admin/conf/unix/jboss/service/mysql-ds.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 0e43e21301c93315b5e7959c30e892f93411787f refers to a dead (removed) revision in file `lams_admin/conf/unix/lams/lams.dtd'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 0e43e21301c93315b5e7959c30e892f93411787f refers to a dead (removed) revision in file `lams_admin/conf/unix/lams/lams.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_admin/conf/war/META-INF/MANIFEST.MF
===================================================================
diff -u
--- lams_admin/conf/war/META-INF/MANIFEST.MF	(revision 0)
+++ lams_admin/conf/war/META-INF/MANIFEST.MF	(revision 0e43e21301c93315b5e7959c30e892f93411787f)
@@ -0,0 +1 @@
+Class-Path: ./lams.jar ./lams_central.jar ./lams_admin.jar
Fisheye: Tag 0e43e21301c93315b5e7959c30e892f93411787f refers to a dead (removed) revision in file `lams_admin/conf/windows/authentication/authentication.dtd'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 0e43e21301c93315b5e7959c30e892f93411787f refers to a dead (removed) revision in file `lams_admin/conf/windows/authentication/authentication.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 0e43e21301c93315b5e7959c30e892f93411787f refers to a dead (removed) revision in file `lams_admin/conf/windows/jboss/login-config.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 0e43e21301c93315b5e7959c30e892f93411787f refers to a dead (removed) revision in file `lams_admin/conf/windows/jboss/service/mysql-ds.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 0e43e21301c93315b5e7959c30e892f93411787f refers to a dead (removed) revision in file `lams_admin/conf/windows/lams/lams.dtd'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 0e43e21301c93315b5e7959c30e892f93411787f refers to a dead (removed) revision in file `lams_admin/conf/windows/lams/lams.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 0e43e21301c93315b5e7959c30e892f93411787f refers to a dead (removed) revision in file `lams_admin/src/java/org/lamsfoundation/lams/admin/login/web/HomeAction.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 0e43e21301c93315b5e7959c30e892f93411787f refers to a dead (removed) revision in file `lams_admin/src/java/org/lamsfoundation/lams/admin/login/web/PasswordChangeAction.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 0e43e21301c93315b5e7959c30e892f93411787f refers to a dead (removed) revision in file `lams_admin/src/java/org/lamsfoundation/lams/admin/login/web/PasswordChangeActionForm.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 0e43e21301c93315b5e7959c30e892f93411787f refers to a dead (removed) revision in file `lams_admin/src/java/org/lamsfoundation/lams/admin/security/AbstractServerLoginModule.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 0e43e21301c93315b5e7959c30e892f93411787f refers to a dead (removed) revision in file `lams_admin/src/java/org/lamsfoundation/lams/admin/security/AuthenticationMethodConfigurer.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 0e43e21301c93315b5e7959c30e892f93411787f refers to a dead (removed) revision in file `lams_admin/src/java/org/lamsfoundation/lams/admin/security/DatabaseAuthenticator.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 0e43e21301c93315b5e7959c30e892f93411787f refers to a dead (removed) revision in file `lams_admin/src/java/org/lamsfoundation/lams/admin/security/JspRedirectStrategy.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 0e43e21301c93315b5e7959c30e892f93411787f refers to a dead (removed) revision in file `lams_admin/src/java/org/lamsfoundation/lams/admin/security/LDAPAuthenticator.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 0e43e21301c93315b5e7959c30e892f93411787f refers to a dead (removed) revision in file `lams_admin/src/java/org/lamsfoundation/lams/admin/security/NestableGroup.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 0e43e21301c93315b5e7959c30e892f93411787f refers to a dead (removed) revision in file `lams_admin/src/java/org/lamsfoundation/lams/admin/security/SimpleGroup.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 0e43e21301c93315b5e7959c30e892f93411787f refers to a dead (removed) revision in file `lams_admin/src/java/org/lamsfoundation/lams/admin/security/SimplePrincipal.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 0e43e21301c93315b5e7959c30e892f93411787f refers to a dead (removed) revision in file `lams_admin/src/java/org/lamsfoundation/lams/admin/security/UniversalLoginModule.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 0e43e21301c93315b5e7959c30e892f93411787f refers to a dead (removed) revision in file `lams_admin/src/java/org/lamsfoundation/lams/admin/security/UsernamePasswordLoginModule.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 0e43e21301c93315b5e7959c30e892f93411787f refers to a dead (removed) revision in file `lams_admin/src/java/org/lamsfoundation/lams/admin/security/WebAuthAuthenticator.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 0e43e21301c93315b5e7959c30e892f93411787f refers to a dead (removed) revision in file `lams_admin/src/java/org/lamsfoundation/lams/admin/security/WebAuthServlet.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/AdminAction.java
===================================================================
diff -u -rf8845fdf880cec49384de0f55bd7a49400fcdf6f -r0e43e21301c93315b5e7959c30e892f93411787f
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/AdminAction.java	(.../AdminAction.java)	(revision f8845fdf880cec49384de0f55bd7a49400fcdf6f)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/AdminAction.java	(.../AdminAction.java)	(revision 0e43e21301c93315b5e7959c30e892f93411787f)
@@ -2,10 +2,10 @@
 
 import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
-import java.util.Iterator;
-import java.util.List;
 import java.util.ArrayList;
 import java.util.Date;
+import java.util.Iterator;
+import java.util.List;
 
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
@@ -19,19 +19,17 @@
 import org.apache.struts.action.ActionForward;
 import org.apache.struts.action.ActionMapping;
 import org.apache.struts.actions.DispatchAction;
-import org.springframework.web.context.WebApplicationContext;
-import org.springframework.web.context.support.WebApplicationContextUtils;
-
 import org.lamsfoundation.lams.admin.util.AdminPreparer;
 import org.lamsfoundation.lams.admin.util.ExcelUserImportFileParser;
-import org.lamsfoundation.lams.admin.web.UserActionForm;
 import org.lamsfoundation.lams.usermanagement.Organisation;
-import org.lamsfoundation.lams.usermanagement.UserOrganisation;
-import org.lamsfoundation.lams.usermanagement.User;
 import org.lamsfoundation.lams.usermanagement.Role;
+import org.lamsfoundation.lams.usermanagement.User;
+import org.lamsfoundation.lams.usermanagement.UserOrganisation;
 import org.lamsfoundation.lams.usermanagement.service.UserManagementService;
-import org.lamsfoundation.lams.web.HttpSessionManager;
 import org.lamsfoundation.lams.util.UploadFileUtil;
+import org.lamsfoundation.lams.web.util.HttpSessionManager;
+import org.springframework.web.context.WebApplicationContext;
+import org.springframework.web.context.support.WebApplicationContextUtils;
 
 /**
  * Main access calls for the normal user adminstration screens.
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/OrganisationAction.java
===================================================================
diff -u -rf8845fdf880cec49384de0f55bd7a49400fcdf6f -r0e43e21301c93315b5e7959c30e892f93411787f
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/OrganisationAction.java	(.../OrganisationAction.java)	(revision f8845fdf880cec49384de0f55bd7a49400fcdf6f)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/OrganisationAction.java	(.../OrganisationAction.java)	(revision 0e43e21301c93315b5e7959c30e892f93411787f)
@@ -9,24 +9,23 @@
 
 import org.apache.log4j.Logger;
 import org.apache.struts.action.Action;
-import org.apache.struts.action.ActionMessage;
 import org.apache.struts.action.ActionErrors;
 import org.apache.struts.action.ActionForm;
 import org.apache.struts.action.ActionForward;
 import org.apache.struts.action.ActionMapping;
+import org.apache.struts.action.ActionMessage;
 import org.apache.struts.action.ActionMessages;
-import org.springframework.web.context.WebApplicationContext;
-import org.springframework.web.context.support.WebApplicationContextUtils;
-
 import org.lamsfoundation.lams.admin.util.AdminPreparer;
 import org.lamsfoundation.lams.usermanagement.Organisation;
-import org.lamsfoundation.lams.usermanagement.User;
+import org.lamsfoundation.lams.usermanagement.OrganisationType;
 import org.lamsfoundation.lams.usermanagement.Role;
+import org.lamsfoundation.lams.usermanagement.User;
 import org.lamsfoundation.lams.usermanagement.UserOrganisation;
 import org.lamsfoundation.lams.usermanagement.UserOrganisationRole;
-import org.lamsfoundation.lams.usermanagement.OrganisationType;
 import org.lamsfoundation.lams.usermanagement.service.UserManagementService;
-import org.lamsfoundation.lams.web.HttpSessionManager;
+import org.lamsfoundation.lams.web.util.HttpSessionManager;
+import org.springframework.web.context.WebApplicationContext;
+import org.springframework.web.context.support.WebApplicationContextUtils;
 
 /**
  * @author Fei Yang
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserAction.java
===================================================================
diff -u -rf8845fdf880cec49384de0f55bd7a49400fcdf6f -r0e43e21301c93315b5e7959c30e892f93411787f
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserAction.java	(.../UserAction.java)	(revision f8845fdf880cec49384de0f55bd7a49400fcdf6f)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserAction.java	(.../UserAction.java)	(revision 0e43e21301c93315b5e7959c30e892f93411787f)
@@ -1,34 +1,32 @@
 package org.lamsfoundation.lams.admin.web;
 
 import java.io.IOException;
-import java.util.List;
 import java.util.ArrayList;
+import java.util.List;
 
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-
 import org.apache.commons.beanutils.BeanUtils;
 import org.apache.log4j.Logger;
 import org.apache.struts.action.Action;
-import org.apache.struts.action.ActionMessage;
-import org.apache.struts.action.ActionMessages;
 import org.apache.struts.action.ActionErrors;
 import org.apache.struts.action.ActionForm;
 import org.apache.struts.action.ActionForward;
 import org.apache.struts.action.ActionMapping;
-import org.springframework.web.context.WebApplicationContext;
-import org.springframework.web.context.support.WebApplicationContextUtils;
-
+import org.apache.struts.action.ActionMessage;
+import org.apache.struts.action.ActionMessages;
 import org.lamsfoundation.lams.admin.util.AdminPreparer;
-import org.lamsfoundation.lams.usermanagement.User;
-import org.lamsfoundation.lams.usermanagement.Role;
 import org.lamsfoundation.lams.usermanagement.Organisation;
+import org.lamsfoundation.lams.usermanagement.Role;
+import org.lamsfoundation.lams.usermanagement.User;
 import org.lamsfoundation.lams.usermanagement.UserOrganisation;
 import org.lamsfoundation.lams.usermanagement.UserOrganisationRole;
 import org.lamsfoundation.lams.usermanagement.service.UserManagementService;
-import org.lamsfoundation.lams.web.HttpSessionManager;
+import org.lamsfoundation.lams.web.util.HttpSessionManager;
+import org.springframework.web.context.WebApplicationContext;
+import org.springframework.web.context.support.WebApplicationContextUtils;
 
 
 /**
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/UsersAddAction.java
===================================================================
diff -u -rf8845fdf880cec49384de0f55bd7a49400fcdf6f -r0e43e21301c93315b5e7959c30e892f93411787f
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/UsersAddAction.java	(.../UsersAddAction.java)	(revision f8845fdf880cec49384de0f55bd7a49400fcdf6f)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/UsersAddAction.java	(.../UsersAddAction.java)	(revision 0e43e21301c93315b5e7959c30e892f93411787f)
@@ -1,33 +1,31 @@
 package org.lamsfoundation.lams.admin.web;
 
-import java.util.List;
-import java.util.Map;
 import java.util.HashMap;
 import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-
 import org.apache.log4j.Logger;
 import org.apache.struts.action.Action;
-import org.apache.struts.action.ActionMessage;
-import org.apache.struts.action.ActionMessages;
 import org.apache.struts.action.ActionErrors;
 import org.apache.struts.action.ActionForm;
 import org.apache.struts.action.ActionForward;
 import org.apache.struts.action.ActionMapping;
-import org.springframework.web.context.WebApplicationContext;
-import org.springframework.web.context.support.WebApplicationContextUtils;
-
+import org.apache.struts.action.ActionMessage;
+import org.apache.struts.action.ActionMessages;
 import org.lamsfoundation.lams.admin.util.AdminPreparer;
-import org.lamsfoundation.lams.usermanagement.User;
-import org.lamsfoundation.lams.usermanagement.Role;
 import org.lamsfoundation.lams.usermanagement.Organisation;
+import org.lamsfoundation.lams.usermanagement.Role;
+import org.lamsfoundation.lams.usermanagement.User;
 import org.lamsfoundation.lams.usermanagement.UserOrganisation;
 import org.lamsfoundation.lams.usermanagement.UserOrganisationRole;
 import org.lamsfoundation.lams.usermanagement.service.UserManagementService;
-import org.lamsfoundation.lams.web.HttpSessionManager;
+import org.lamsfoundation.lams.web.util.HttpSessionManager;
+import org.springframework.web.context.WebApplicationContext;
+import org.springframework.web.context.support.WebApplicationContextUtils;
 
 /**
  * @author Fei Yang
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/UsersRemoveAction.java
===================================================================
diff -u -rf8845fdf880cec49384de0f55bd7a49400fcdf6f -r0e43e21301c93315b5e7959c30e892f93411787f
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/UsersRemoveAction.java	(.../UsersRemoveAction.java)	(revision f8845fdf880cec49384de0f55bd7a49400fcdf6f)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/UsersRemoveAction.java	(.../UsersRemoveAction.java)	(revision 0e43e21301c93315b5e7959c30e892f93411787f)
@@ -5,19 +5,18 @@
 
 import org.apache.log4j.Logger;
 import org.apache.struts.action.Action;
-import org.apache.struts.action.ActionMessage;
-import org.apache.struts.action.ActionMessages;
 import org.apache.struts.action.ActionErrors;
 import org.apache.struts.action.ActionForm;
 import org.apache.struts.action.ActionForward;
 import org.apache.struts.action.ActionMapping;
-import org.springframework.web.context.WebApplicationContext;
-import org.springframework.web.context.support.WebApplicationContextUtils;
-
+import org.apache.struts.action.ActionMessage;
+import org.apache.struts.action.ActionMessages;
 import org.lamsfoundation.lams.admin.util.AdminPreparer;
 import org.lamsfoundation.lams.usermanagement.Organisation;
 import org.lamsfoundation.lams.usermanagement.service.UserManagementService;
-import org.lamsfoundation.lams.web.HttpSessionManager;
+import org.lamsfoundation.lams.web.util.HttpSessionManager;
+import org.springframework.web.context.WebApplicationContext;
+import org.springframework.web.context.support.WebApplicationContextUtils;
 
 /**
  * @author Fei Yang
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>
Index: lams_admin/web/WEB-INF/struts/validation.xml
===================================================================
diff -u
--- lams_admin/web/WEB-INF/struts/validation.xml	(revision 0)
+++ lams_admin/web/WEB-INF/struts/validation.xml	(revision 0e43e21301c93315b5e7959c30e892f93411787f)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE form-validation PUBLIC "-//Apache Software Foundation//DTD Commons Validator Rules Configuration 1.1.3//EN" "http://jakarta.apache.org/commons/dtds/validator_1_1_3.dtd">
+<form-validation>
+  <!--
+    Define global validation config in validation-global.xml
+  -->
+  <formset>
+  <!--
+    Define form validation config in validation-forms.xml
+  -->
+
+  </formset>
+</form-validation>
Index: lams_admin/web/WEB-INF/web.xml
===================================================================
diff -u -rf8845fdf880cec49384de0f55bd7a49400fcdf6f -r0e43e21301c93315b5e7959c30e892f93411787f
--- lams_admin/web/WEB-INF/web.xml	(.../web.xml)	(revision f8845fdf880cec49384de0f55bd7a49400fcdf6f)
+++ lams_admin/web/WEB-INF/web.xml	(.../web.xml)	(revision 0e43e21301c93315b5e7959c30e892f93411787f)
@@ -1,241 +1,79 @@
 <?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>
+<web-app >
+   <distributable/>
 
-	<!--
-		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>
+    <!--
+    To use non XDoclet filters, create a filters.xml file that
+    contains the additional filters (eg Sitemesh) and place it in your
+    project's 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.
+    -->
 
-	<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>
+    <!--
+    To use non XDoclet filter-mappings, create a filter-mappings.xml file that
+    contains the additional filter-mappings and place it in your
+    project's merge dir.
+    -->
 
-	<!--
-	  - 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/spring/dataAccessContext.xml  /WEB-INF/spring/applicationContext.xml
-		</param-value>
-	</context-param>
+    <!--
+    To use non XDoclet listeners, create a listeners.xml file that
+    contains the additional listeners and place it in your
+    project's merge dir.
+    -->
 
-   <listener>
-      <listener-class>org.lamsfoundation.lams.web.SessionListener</listener-class>
-   </listener>
+  <!--
+  To use non XDoclet servlets, create a servlets.xml file that
+  contains the additional servlets (eg Struts) and place it in your
+  project's merge dir.  Don't include servlet-mappings in this file,
+  include them in a file called servlet-mappings.xml and put that in
+  the same directory.
+  -->
 
-	<!--
-	  - 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>
+   <session-config>
+      <session-timeout>120</session-timeout>
+   </session-config>
 
-	<!--
-	  - 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.admin.security.WebAuthServlet
-		</servlet-class>
-		<load-on-startup>2</load-on-startup>
-	</servlet>
+   <!--
+   To specify mime mappings, create a file named mime-mappings.xml, put it in your project's mergedir.
+   Organize mime-mappings.xml following this DTD slice:
 
-	
+   <!ELEMENT mime-mapping (extension, mime-type)>
+   -->
 
-	<!--
-		- Dispatcher servlet mapping for the main web user interface.
-	-->
-	<servlet-mapping>
-		<servlet-name>action</servlet-name>
-		<url-pattern>*.do</url-pattern>
-	</servlet-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:
 
-	<servlet-mapping>
-		<servlet-name>webauthservlet</servlet-name>
-		<url-pattern>/webauth</url-pattern>
-	</servlet-mapping>
+   <!ELEMENT error-page ((error-code | exception-type), location)>
+   -->
 
-	<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 add taglibs by xml, create a file called taglibs.xml and place it
+  in your merge dir.
+  -->
 
-	<!--
-		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)>
-	-->
+   <!--
+   To set up security settings for your web app, create a file named web-security.xml, put it in your project's mergedir.
+   Organize web-security.xml following this DTD slice:
 
-	<!-- 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>
+   <!ELEMENT security-constraint (display-name?, web-resource-collection+, auth-constraint?, user-data-constraint?)>
+   <!ELEMENT web-resource-collection (web-resource-name, description?, url-pattern*, http-method*)>
+   <!ELEMENT web-resource-name (#PCDATA)>
+   <!ELEMENT url-pattern (#PCDATA)>
+   <!ELEMENT http-method (#PCDATA)>
+   <!ELEMENT user-data-constraint (description?, transport-guarantee)>
+   <!ELEMENT transport-guarantee (#PCDATA)>
 
-		<auth-constraint>
-			<role-name>*</role-name>
-		</auth-constraint>
+   <!ELEMENT login-config (auth-method?, realm-name?, form-login-config?)>
+   <!ELEMENT auth-method (#PCDATA)>
+   <!ELEMENT realm-name (#PCDATA)>
+   <!ELEMENT form-login-config (form-login-page, form-error-page)>
+   <!ELEMENT form-login-page (#PCDATA)>
+   <!ELEMENT form-error-page (#PCDATA)>
+   -->
 
-	</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>
Fisheye: Tag 0e43e21301c93315b5e7959c30e892f93411787f refers to a dead (removed) revision in file `lams_admin/web/adminHeader.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 0e43e21301c93315b5e7959c30e892f93411787f refers to a dead (removed) revision in file `lams_admin/web/changeStyle.js'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 0e43e21301c93315b5e7959c30e892f93411787f refers to a dead (removed) revision in file `lams_admin/web/errorContent.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 0e43e21301c93315b5e7959c30e892f93411787f refers to a dead (removed) revision in file `lams_admin/web/footer.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 0e43e21301c93315b5e7959c30e892f93411787f refers to a dead (removed) revision in file `lams_admin/web/getSysInfo.js'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 0e43e21301c93315b5e7959c30e892f93411787f refers to a dead (removed) revision in file `lams_admin/web/header.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 0e43e21301c93315b5e7959c30e892f93411787f refers to a dead (removed) revision in file `lams_admin/web/index.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 0e43e21301c93315b5e7959c30e892f93411787f refers to a dead (removed) revision in file `lams_admin/web/indexContent.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 0e43e21301c93315b5e7959c30e892f93411787f refers to a dead (removed) revision in file `lams_admin/web/login.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 0e43e21301c93315b5e7959c30e892f93411787f refers to a dead (removed) revision in file `lams_admin/web/loginContent.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 0e43e21301c93315b5e7959c30e892f93411787f refers to a dead (removed) revision in file `lams_admin/web/loginHeader.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 0e43e21301c93315b5e7959c30e892f93411787f refers to a dead (removed) revision in file `lams_admin/web/openUrls.js'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 0e43e21301c93315b5e7959c30e892f93411787f refers to a dead (removed) revision in file `lams_admin/web/passwordChangeContent.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 0e43e21301c93315b5e7959c30e892f93411787f refers to a dead (removed) revision in file `lams_admin/web/passwordChangeOkContent.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 0e43e21301c93315b5e7959c30e892f93411787f refers to a dead (removed) revision in file `lams_admin/web/style.css'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 0e43e21301c93315b5e7959c30e892f93411787f refers to a dead (removed) revision in file `lams_admin/web/template.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?