Index: lams_central/.classpath
===================================================================
diff -u -r3adcc4e312e804bf86c3598e3bc744b64a46c21f -rf52875283624b11386286a63e9009658bf449a7d
--- lams_central/.classpath	(.../.classpath)	(revision 3adcc4e312e804bf86c3598e3bc744b64a46c21f)
+++ lams_central/.classpath	(.../.classpath)	(revision f52875283624b11386286a63e9009658bf449a7d)
@@ -18,5 +18,5 @@
 	</classpathentry>
 	<classpathentry kind="var" path="JBOSS_HOME/common/lib/log4j.jar"/>
 	<classpathentry kind="lib" path="/lams_build/lib/xstream/joda-time-0.98.jar"/>
-	<classpathentry kind="output" path="build/classes"/>
+	<classpathentry kind="output" path="build/classes/java"/>
 </classpath>
Index: lams_central/build.properties
===================================================================
diff -u -r87af23f275675d99a2e83bc9fe44b1d52659ed28 -rf52875283624b11386286a63e9009658bf449a7d
--- lams_central/build.properties	(.../build.properties)	(revision 87af23f275675d99a2e83bc9fe44b1d52659ed28)
+++ lams_central/build.properties	(.../build.properties)	(revision f52875283624b11386286a63e9009658bf449a7d)
@@ -3,3 +3,5 @@
 product=lams-central
 version=1.1
 
+# Precompiled JSP classes package
+jsp.java.src.package=org.lamsfoundation.lams.central.jsp
\ No newline at end of file
Index: lams_central/build.xml
===================================================================
diff -u -rd9e30efbb383b58b09653c7f4342f5c9e559bc77 -rf52875283624b11386286a63e9009658bf449a7d
--- lams_central/build.xml	(.../build.xml)	(revision d9e30efbb383b58b09653c7f4342f5c9e559bc77)
+++ lams_central/build.xml	(.../build.xml)	(revision f52875283624b11386286a63e9009658bf449a7d)
@@ -110,24 +110,6 @@
 	<!-- = = = = = = = = = = = = = = = = = = = = = = = =  -->
 	<!-- Make the war archive  for deployment             -->
 	<!-- = = = = = = = = = = = = = = = = = = = = = = = =  -->
-	<target name="copyConfFlashFiles" description="Copy the Flash files from the conf directory to the web directory">
-		<!-- Clean out any old ones first so we don't get rams/lams confused -->
-		<delete dir="web/flashxml"/>
-		<mkdir dir="web/flashxml"/>
-		<copy overwrite="yes" todir="web/flashxml">
-			<fileset dir="${conf.dir}/flashxml/${conf.application}">
-				<include name="**/*.xml"/>
-			</fileset>
-		</copy>
-	</target>
-	
-	<target name="copyConfFaviconFile" description="Copy the Favicon ISO file from the conf directory to the web directory">
-		<copy overwrite="yes" todir="web">
-			<fileset dir="${conf.dir}/favicon/${conf.application}">
-				<include name="**/*.ico"/>
-			</fileset>
-		</copy>
-	</target>
 
 	<target name="test-application">
 		  <condition property="isLAMS">
@@ -151,46 +133,33 @@
 			file="${build.lib}/${product}.war/images/css/rams_login.gif" verbose="true"/>
 	</target>
 
-	<target name="build-war" depends="webdoclet,build-jar,copyConfFlashFiles,copyConfFaviconFile" description="creates war file">
+	<target name="build-war" depends="webdoclet,build-jar,jsp-plaincopy,jsp-precompile" description="creates war file">
+		<!-- Copy favicone file from conf to assembly -->
+		<copy overwrite="yes" todir="${build.war.assembly}">
+			<fileset dir="${conf.dir}/favicon/${conf.application}">
+				<include name="**/*.ico"/>
+			</fileset>
+		</copy>
+		
+		<!-- Copy Flash files from conf to assembly -->
+		<copy overwrite="yes" todir="${build.war.assembly}/flashxml">
+			<fileset dir="${conf.dir}/flashxml/${conf.application}">
+				<include name="**/*.xml"/>
+			</fileset>
+		</copy>
+		
 		<delete dir="${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="*.tld"/>
-				<include name="*.wsdd"/>
-				<include name="conf/**"/>
-				<include name="modules/**"/>
-				<include name="services/**"/>
-				<include name="tags/**"/>
-				<include name="*.properties"/>
-				<include name="struts/**"/>
-				<include name="jstl/**"/>
-				<include name="ckeditor/**"/>
-				<include name="tiles/**"/>
-				<exclude name="web.xml"/>
-			</webinf>
-			<fileset dir="${conf.web.dir}">
-				<include name="*"/>
-				<include name="css/**"/>
-				<include name="includes/**"/>
-				<include name="images/**"/>
-				<include name="ckeditor/**"/>
-				<include name="development/**"/>
-				<include name="flashxml/**"/>
-				<include name="toolcontent/**"/>
-				<include name="**/*.jsp"/>
-				<exclude name="classes"/>
+		<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>
 		</war>
+		
 		<move file="${build.lib}/lams-central.war" tofile="${build.lib}/temp.war"/>
 		<unjar src="${build.lib}/temp.war" dest="${build.lib}/lams-central.war"/>
 		<antcall target="update-logo-for-RAMS"/>
 		
-		<!-- Add Pedagogical Planner, if available -->
-		<available file="../${lams_planner}/build.xml" property="planner_available" />
-		<antcall target="copy-planner" />
-		
 		<!-- Add Mindapp integration, if available -->
 		<available file="../${lams_mindapp}/build.xml" property="mindapp_available" />
 		<antcall target="copy-mindapp-war" />
@@ -300,11 +269,14 @@
 	<target name="deploy-war" depends="build-war">
 		<copy file="${build.lib}/${product}.jar"
 				todir="${jboss.deploy}"/>
+		
+		<delete dir="${jboss.deploy}/${product}.war"/>
 		<copy todir="${jboss.deploy}/${product}.war">
 			<fileset dir="${build.lib}/${product}.war">
 				<include name="**/*"/>
 			</fileset>
 		</copy>
+		
 		<copy overwrite="yes" todir="${jboss.deploy}/lams-dictionary.jar">
 			<fileset dir="${build.lib}/language">
 				<include name="**/*.properties"/>
@@ -345,6 +317,128 @@
 			</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>
+		
+		<!-- Add Pedagogical Planner, if available -->
+		<available file="../${lams_planner}/build.xml" property="planner_available" />
+		<antcall target="copy-planner" />
+		
+		<!-- 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"/>
+		
+		<!-- Add Pedagogical Planner, if available -->
+		<available file="../${lams_planner}/build.xml" property="planner_available" />
+		<antcall target="copy-planner" />
+	 	<copy todir="${build.war.assembly}">
+			<fileset dir="${build.war}">
+				<include name="**"/>
+			</fileset>
+	 	</copy>
+		
+		<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_central/src/java/org/lamsfoundation/lams/web/IndexAction.java
===================================================================
diff -u -r4f33380083bd35fd6d0851de9def290c62ffc3c9 -rf52875283624b11386286a63e9009658bf449a7d
--- lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java	(.../IndexAction.java)	(revision 4f33380083bd35fd6d0851de9def290c62ffc3c9)
+++ lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java	(.../IndexAction.java)	(revision f52875283624b11386286a63e9009658bf449a7d)
@@ -219,6 +219,6 @@
 	String plannerPath = lamsEarPath + File.separator + IndexAction.PATH_LAMS_CENTRAL + File.separator
 		+ IndexAction.PATH_PEDAGOGICAL_PLANNER;
 	File plannerDir = new File(plannerPath);
-	return plannerDir.isDirectory() && plannerDir.list().length > 0;
+	return plannerDir.isDirectory();
     }
 }
\ No newline at end of file
Index: lams_central/web/WEB-INF/lams.tld
===================================================================
diff -u -r3ed103dc1c4ba8816d2ffbf0817c550adf156e12 -rf52875283624b11386286a63e9009658bf449a7d
--- lams_central/web/WEB-INF/lams.tld	(.../lams.tld)	(revision 3ed103dc1c4ba8816d2ffbf0817c550adf156e12)
+++ lams_central/web/WEB-INF/lams.tld	(.../lams.tld)	(revision f52875283624b11386286a63e9009658bf449a7d)
@@ -457,10 +457,6 @@
        <name>Passon</name>
        <path>/WEB-INF/tags/Passon.tag</path>
    	</tag-file>  
-	<tag-file>
-	    <name>ExportPortOutput</name>
-		<path>/WEB-INF/tags/ExportPortOutput.tag</path>
-   	</tag-file>  
    	<tag-file>
 	    <name>Date</name>
 		<path>/WEB-INF/tags/Date.tag</path>
@@ -519,10 +515,6 @@
 	<tag-file>
 		<name>head</name>
 	    <path>/WEB-INF/tags/Head.tag</path>
-	</tag-file>  
-  	<tag-file>
-	    <name>ProgressOutput</name>
-		<path>/WEB-INF/tags/ProgressOutput.tag</path>
-   	</tag-file>  
+	</tag-file>
 
 </taglib>
Index: lams_central/web/favicon.ico
===================================================================
diff -u -r64938df458cbab9999f9a826ef2902d061648d7d -rf52875283624b11386286a63e9009658bf449a7d
Binary files differ