Index: lams_admin/build.xml
===================================================================
diff -u -r0e43e21301c93315b5e7959c30e892f93411787f -rc83e5b8bf2c9f0a192f91608c3dd8a0d1ede5c12
--- lams_admin/build.xml	(.../build.xml)	(revision 0e43e21301c93315b5e7959c30e892f93411787f)
+++ lams_admin/build.xml	(.../build.xml)	(revision c83e5b8bf2c9f0a192f91608c3dd8a0d1ede5c12)
@@ -3,7 +3,7 @@
 <!-- -->
 <!DOCTYPE project [
 ]>
-<project name="lams_admin" default="usage" basedir=".">
+<project name="Lams_Admin" default="usage" basedir=".">
 
 	<property file="build.properties"/>
 	<property file="../lams_build/common.properties"/>
@@ -123,7 +123,7 @@
 			<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="${conf.hibernate.mapping.dir}"/>-->
 				<fileset dir="${build.web}"/>
 			</jar>
 		</target>
@@ -176,7 +176,22 @@
 	   	   </war>
 	   	
 	   </target>
+	
 	<!-- =================================================================== -->
+	<!-- Deploy the jar and war                               -->
+	<!-- =================================================================== -->
+	<target name="deploy-war" depends="build-war" description="Deploy the SubmitFiles tool war file and jar file">
+		<delete quiet="true">
+			<fileset dir="${jboss.deploy}/tmp"/>
+			<fileset dir="${jboss.deploy}/work"/>
+		</delete>
+		<copy file="${build.lib}/${product}.jar"
+				todir="${jboss.deploy}"/> 
+		<copy file="${build.lib}/${product}.war"
+				todir="${jboss.deploy}"/> 
+	</target>
+
+	<!-- =================================================================== -->
 	<!-- Run JUnit Tests                                                     -->
 	<!-- =================================================================== -->
 	<target name="test" depends="compile.test">
@@ -196,7 +211,7 @@
 			<classpath>
 				<pathelement location="${build.classes.java}" />
 				<pathelement location="${build.classes.test}" />
-				<pathelement location="${conf.hibernate.mapping.dir}" />
+				<!--<pathelement location="${conf.hibernate.mapping.dir}" />-->
 				<pathelement location="${conf.web.dir}" />
 				<path refid="project.classpath" />
 			</classpath>
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/util/AdminPreparer.java
===================================================================
diff -u -rf8845fdf880cec49384de0f55bd7a49400fcdf6f -rc83e5b8bf2c9f0a192f91608c3dd8a0d1ede5c12
--- lams_admin/src/java/org/lamsfoundation/lams/admin/util/AdminPreparer.java	(.../AdminPreparer.java)	(revision f8845fdf880cec49384de0f55bd7a49400fcdf6f)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/util/AdminPreparer.java	(.../AdminPreparer.java)	(revision c83e5b8bf2c9f0a192f91608c3dd8a0d1ede5c12)
@@ -11,11 +11,11 @@
 
 import javax.servlet.http.HttpServletRequest;
 
-import org.lamsfoundation.lams.admin.web.AttributeNames;
 import org.lamsfoundation.lams.usermanagement.Organisation;
 import org.lamsfoundation.lams.usermanagement.Role;
 import org.lamsfoundation.lams.usermanagement.UserOrganisationRole;
 import org.lamsfoundation.lams.usermanagement.service.UserManagementService;
+import org.lamsfoundation.lams.web.util.AttributeNames;
 
 /**
  * TODO Add description here
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/AdminAction.java
===================================================================
diff -u -r0e43e21301c93315b5e7959c30e892f93411787f -rc83e5b8bf2c9f0a192f91608c3dd8a0d1ede5c12
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/AdminAction.java	(.../AdminAction.java)	(revision 0e43e21301c93315b5e7959c30e892f93411787f)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/AdminAction.java	(.../AdminAction.java)	(revision c83e5b8bf2c9f0a192f91608c3dd8a0d1ede5c12)
@@ -27,6 +27,7 @@
 import org.lamsfoundation.lams.usermanagement.UserOrganisation;
 import org.lamsfoundation.lams.usermanagement.service.UserManagementService;
 import org.lamsfoundation.lams.util.UploadFileUtil;
+import org.lamsfoundation.lams.web.util.AttributeNames;
 import org.lamsfoundation.lams.web.util.HttpSessionManager;
 import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.context.support.WebApplicationContextUtils;
Fisheye: Tag c83e5b8bf2c9f0a192f91608c3dd8a0d1ede5c12 refers to a dead (removed) revision in file `lams_admin/src/java/org/lamsfoundation/lams/admin/web/AttributeNames.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_admin/web/admin/adminContent.jsp
===================================================================
diff -u -rf8845fdf880cec49384de0f55bd7a49400fcdf6f -rc83e5b8bf2c9f0a192f91608c3dd8a0d1ede5c12
--- lams_admin/web/admin/adminContent.jsp	(.../adminContent.jsp)	(revision f8845fdf880cec49384de0f55bd7a49400fcdf6f)
+++ lams_admin/web/admin/adminContent.jsp	(.../adminContent.jsp)	(revision c83e5b8bf2c9f0a192f91608c3dd8a0d1ede5c12)
@@ -10,7 +10,7 @@
 <%@ page import="org.lamsfoundation.lams.usermanagement.Organisation" %>
 <%@ page import="org.lamsfoundation.lams.usermanagement.Role" %>
 <%@ page import="org.lamsfoundation.lams.usermanagement.User" %>
-<%@ page import="org.lamsfoundation.lams.admin.web.AttributeNames" %>
+<%@ page import="org.lamsfoundation.lams.web.util.AttributeNames" %>
 <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
 <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
 <%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>