Index: lams_openid/.classpath
===================================================================
RCS file: /usr/local/cvsroot/lams_openid/.classpath,v
diff -u -r1.1 -r1.2
--- lams_openid/.classpath	5 Feb 2009 04:51:16 -0000	1.1
+++ lams_openid/.classpath	28 Mar 2012 14:04:23 -0000	1.2
@@ -4,14 +4,14 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="com.genuitec.eclipse.j2eedt.core.J2EE14_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/3rdParty"/>
-	<classpathentry kind="var" path="JBOSS_HOME/server/default/lib/javax.servlet.jar"/>
-	<classpathentry kind="var" path="JBOSS_HOME/server/default/lib/javax.servlet.jsp.jar"/>
-	<classpathentry kind="var" path="JBOSS_HOME/server/default/lib/jboss-j2ee.jar"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/lams_common"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/lams_contentrepository"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/lams_central"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/lams_learning"/>
 	<classpathentry kind="lib" path="lib/joid.jar"/>
 	<classpathentry kind="lib" path="lib/tsik.jar"/>
+	<classpathentry kind="var" path="JBOSS_HOME/common/lib/servlet-api.jar"/>
+	<classpathentry kind="var" path="JBOSS_HOME/common/lib/log4j.jar"/>
+	<classpathentry kind="var" path="JBOSS_HOME/common/lib/jsp-api.jar"/>
 	<classpathentry kind="output" path="build/classes/java"/>
 </classpath>
Index: lams_openid/build.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_openid/build.properties,v
diff -u -r1.1 -r1.2
--- lams_openid/build.properties	5 Feb 2009 04:51:16 -0000	1.1
+++ lams_openid/build.properties	28 Mar 2012 14:04:23 -0000	1.2
@@ -1,6 +1,9 @@
 
 package=org/lamsfoundation/lams/openid
 package.name=org.lamsfoundation.lams.openid
+# Precompiled JSP classes package
+jsp.java.src.package=${package.name}.jsp
+
 weblib=lib
 
 name=lams-openid
@@ -29,20 +32,25 @@
 build.classes.test=${build}/classes/test/java
 build.lib=${build}/lib
 build.web=${build}/web
+build.war=${build}/war
+build.war.assembly=${build.war}/assembly
 
-
 # Source directory under the current root
 src.dir=${basedir}/src
 src.java.dir=${src.dir}/java
 src.test.dir=${basedir}/test/java
 
 #JBoss deploy directory (Unix)
-jboss.home=/home/lfoxton/workspace/jboss-4.0.2/
+jboss.home=/path/to/your/jboss/server/
 jboss.server=${jboss.home}server/
 jboss.server.instance=${jboss.server}default
 jboss.server.instance.lib=${jboss.server.instance}/lib
 jboss.ear.deploy=${jboss.server.instance}/deploy/
+jboss.ear.deployers=${jboss.server.instance}/deployers/
 jboss.deploy=${jboss.ear.deploy}/lams.ear
 
 
-j2eelibs=${jboss.server.instance}/lib
\ No newline at end of file
+j2eelibs=${jboss.home}/common/lib
+
+# To precompile JSP pages uncomment the property below
+jsp.precompile=anyvalue
\ No newline at end of file
Index: lams_openid/build.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_openid/build.xml,v
diff -u -r1.2 -r1.3
--- lams_openid/build.xml	9 Feb 2009 00:08:09 -0000	1.2
+++ lams_openid/build.xml	28 Mar 2012 14:04:23 -0000	1.3
@@ -103,28 +103,18 @@
 	<!-- = = = = = = = = = = = = = = = = = = = = = = = =  -->
 	<!-- Make the war archive  for deployment             -->
 	<!-- = = = = = = = = = = = = = = = = = = = = = = = =  -->
-	<target name="build-war" depends="build-jar" description="creates war file">
+	<target name="build-war" depends="build-jar,jsp-plaincopy,jsp-precompile" description="creates war file">
+	 	<copy todir="${build.war.assembly}/WEB-INF/lib">
+			<fileset dir="${build.lib}">
+				 <include name="${product}.jar"/>
+			</fileset>
+	 	</copy>
 		<delete file="${build.lib}/${product}.war" />
-		<war warfile="${build.lib}/${product}.war" webxml="${conf.webinf.dir}/web.xml" manifest="${conf.dir}/war/META-INF/MANIFEST.MF">
-			<webinf dir="${conf.webinf.dir}">
-				<include name="**/*.tld" />
-				<include name="*.xml" />
-				<include name="*.properties" />
-				<exclude name="web.xml" />
-				<include name="spring/*" />
-				<include name="tiles/*.xml" />
-				<include name="struts/*" />
-				<include name="tags/*.tag" />
-			</webinf>
-			<fileset dir="${conf.web.dir}">
-				<include name="*" />
+		<war warfile="${build.lib}/${product}.war" 
+  				webxml="${build.war}/WEB-INF/web.xml" manifest="${conf.dir}/war/META-INF/MANIFEST.MF">
+			<fileset dir="${build.war.assembly}">
+				<include name="**" />
 			</fileset>
-			<lib dir="${build.lib}">
-			    <include name="${product}.jar"/>
-			</lib>
-			<lib dir="lib">
-			    <include name="*.jar"/>
-			</lib>
 		</war>
 	</target>
 
@@ -161,5 +151,114 @@
 			</fileset>
 		</copy>
 	</target>
+	
+	<!-- Runs if jsp.precompile setting is set in lams_build/common.properties -->
+	<target name="jsp-precompile" if="jsp.precompile">
+		<!-- Work on a copy of web files, not originals-->
+		<echo>Copying web files</echo>
+		<delete dir="${build.war}" quiet="false"/>
+	 	<copy overwrite="yes" todir="${build.war}">
+			<fileset dir="${conf.web.dir}">
+				<include name="**"/>
+				<exclude name="WEB-INF/classes"/>
+			</fileset>
+	 	</copy>
+		
+		<!-- Define JSP compiler -->
+		<path id="jsp.precompile.classpath">
+			<path refid="project.classpath"/>
+			<pathelement location="${build.classes.java}"/>
+			<fileset dir="${jboss.home}/lib">
+				<include name="jboss-common-core.jar" />
+				<include name="jboss-logging-spi.jar" />
+			</fileset>
+			<fileset dir="${jboss.ear.deployers}/jbossweb.deployer">
+				<include name="*.jar" />
+			</fileset>
+	        <fileset dir="${jboss.ear.deploy}/jbossweb.sar">
+	            <include name="jbossweb.jar" />
+	        </fileset>
+		</path>
+		<taskdef classname="org.apache.jasper.JspC" name="jasper2" classpathref="jsp.precompile.classpath" />
+		
+		<!-- Generate Java files and put servlet mappings in web.xml file -->
+		<echo>Generating Java source from JSP pages</echo>
+		<jasper2 uriroot="${build.war}"
+			webXmlFragment="${build.war}/WEB-INF/generated_web.xml"
+			outputDir="${build.war}/WEB-INF/src"
+			package="${jsp.java.src.package}"
+			addWebXmlMappings="true" validateXml="false" failOnError="true"
+		/>
+		
+		<!-- Compile main Java source as some JSPs refer to it
+		Uncomment if you get "class not found" errors when precompiling JSPs
+		<antcall target="compile-java"/>
+		-->
+		
+		<!-- Compile Java files generated from JSPs -->
+		<echo>Compiling JSP classes</echo>
+		
+		<!-- Make src folder if it does not exist i.e. no JSPs were compiled in previous step -->
+		<mkdir dir="${build.war}/WEB-INF/src"/>
+		<mkdir dir="${build.war}/WEB-INF/classes"/>
+	    <javac destdir="${build.war}/WEB-INF/classes"
+	           optimize="on"
+	           debug="off" failonerror="true"
+	           srcdir="${build.war}/WEB-INF/src" 
+		  	   excludes="**/*.smap"
+	    	   classpathref="jsp.precompile.classpath">
+	      <include name="**" />
+	      <exclude name="tags/**" />
+	    </javac>
+		
+		<!-- Prepare files for WAR, exclude plain JSP and tags -->
+		<echo>Copying web resources</echo>
+		<copy todir="${build.war.assembly}">	
+			<fileset dir="${build.war}">
+				<include name="**"/>
+				<exclude name="WEB-INF/src/"/>
+				<exclude name="WEB-INF/web.xml"/>
+				<exclude name="**/*.java"/>
+				<exclude name="**/*.jsp"/>
+				<exclude name="**/*.tag"/>
+				<exclude name="**/*.tld"/>
+				<exclude name="**/.cvsignore"/>
+			</fileset>
+		</copy>
+		
+	 	<copy todir="${build.war.assembly}/WEB-INF/lib" flatten="true" failonerror="false">
+			<fileset dir="${basedir}/lib">
+				<include name="**/*"/>
+			</fileset>
+	 	</copy>
+	</target>
+					
+	<!-- Runs if jsp.precompile setting is NOT set in lams_build/common.properties 
+		 JSPs will be compiled at runtime, which is default behaviour allowing hotdeploy -->
+	<target name="jsp-plaincopy" unless="jsp.precompile">
+		<delete dir="${build.war}" quiet="false"/>
+		
+		<echo>Copying web resources</echo>
+	 	<copy todir="${build.war}">
+			<fileset dir="${conf.web.dir}">
+				<include name="WEB-INF/web.xml"/>
+			</fileset>
+	 	</copy>
+		
+	 	<copy todir="${build.war.assembly}">
+			<fileset dir="${conf.web.dir}">
+				<include name="**"/>
+				<exclude name="WEB-INF/web.xml"/>
+				<exclude name="WEB-INF/classes"/>
+				<exclude name="**/.cvsignore"/>
+			</fileset>
+	 	</copy>
+		
+	 	<copy todir="${build.war.assembly}/WEB-INF/lib" flatten="true" failonerror="false">
+			<fileset dir="${basedir}/lib">
+				<include name="**/*"/>
+			</fileset>
+	 	</copy>
+	</target>
 </project>
 
Index: lams_openid/conf/war/META-INF/MANIFEST.MF
===================================================================
RCS file: /usr/local/cvsroot/lams_openid/conf/war/META-INF/MANIFEST.MF,v
diff -u -r1.1 -r1.2
--- lams_openid/conf/war/META-INF/MANIFEST.MF	5 Feb 2009 04:51:15 -0000	1.1
+++ lams_openid/conf/war/META-INF/MANIFEST.MF	28 Mar 2012 14:04:23 -0000	1.2
@@ -1,4 +1,4 @@
 Implementation-Title: LAMS - Openid Tool
 Implementation-Version: 2.1
 Implementation-Vendor: LAMS Foundation (http://lamsfoundation.org)
-Class-Path: ./lams.jar ./lams-tool-laopid11.jar ./lams-contentrepository.jar ./lams-learning.jar
+Class-Path: ./lams.jar ./lams-contentrepository.jar ./lams-learning.jar ./lams-openid.jar