Index: lams_build/build.xml
===================================================================
diff -u
--- lams_build/build.xml	(revision 0)
+++ lams_build/build.xml	(revision b2e4889e9b159cb132154fbf4f621154fed46b47)
@@ -0,0 +1,272 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project name="LAMS" default="usage" basedir=".">
+
+	<!-- import properties from the shared and o/s specific files -->
+	<property file="common.properties" />
+	<property file="shared.properties" />
+	<property file="windows.properties" />
+
+	<target name="init">
+		<mkdir dir="${assembly}" />
+	</target>
+
+	<target name="usage" description="print usage message">
+		<echo>------------ Utility Methods ------------------------</echo>
+		<echo>usage: this message</echo>
+		<echo>clean: clean the ear assembly directories</echo>
+		<echo>clean-subprojects: clean sub project build directories</echo>
+		<echo>build-subprojects: build sub projects</echo>
+		<echo>build-tool-deploy-utility: build the tool_deploy utility and update copy in lams_build</echo>
+		<echo>------------ Build/Deploy LAMS  ------------------------</echo>
+		<echo>assemble-ear: assemble ear structure</echo>
+		<echo>deploy-ear: copy ear to local jboss server</echo>
+		<echo>copyfiles: copy configuration files to local jboss server</echo>
+		<echo>----------------------------------------------------------</echo>
+		<echo>To deploy LAMS:</echo>
+		<echo>   1. copyfiles (this only needs to be done once, or when basic configuration the files change)</echo>
+		<echo>   2. assemble-ear</echo>
+		<echo>   3. manually refresh the project</echo>
+		<echo>   4. deploy-ear</echo>
+		<echo>Do not try to assemble and deploy in the same run - if you do,</echo>
+		<echo>Eclipse may not deploy all of the newly created files.</echo>
+	</target>
+
+	<!-- clean dirs for this script only -->
+	<target name="clean" description="cleans assembly">
+		<delete includeEmptyDirs="true" dir="${assembly}"
+			includes="**/*" />
+	</target>
+
+	<!-- clean all projects -->
+	<target name="clean-subprojects" description="cleans sub projects" />
+
+
+	<!-- build sub-projects -->
+	<target name="build-subprojects"
+		description="builds sub porjects">
+		<ant antfile="../${lams_common}/build.xml" target="build-jar"
+			inheritAll="false" />
+		<ant antfile="../${lams_contentrepository}/build.xml"
+			target="build-jar" inheritAll="false" />
+		<ant antfile="../${lams_central}/build.xml" target="build-war"
+			inheritAll="false" />
+		<ant antfile="../${lams_learning}/build.xml" target="build-war" inheritAll="false"/>
+		<ant antfile="../${lams_monitoring}/build.xml"  target="build-war" inheritAll="false"/>
+		<ant antfile="../${lams_admin}/build.xml" target="build-war" inheritAll="false"/>
+	</target>
+
+	<!-- build sub-projects -->
+	<target name="build-tool-deploy-utility"
+		description="builds the tool deploy utility and copy to lams_build">
+
+		<ant antfile="../${lams_tool_deploy}/build.xml" target="build"
+			inheritAll="false" />
+
+		<mkdir dir="${deploy.tool}" />
+		<mkdir dir="${deploy.tool}/lib" />
+		
+		<copy todir="${deploy.tool}" overwrite="yes" flatten="true">
+			<fileset dir="../${lams_tool_deploy}">
+				<include name="deploy.bat" />
+				<include name="deploy.sh" />
+			</fileset>
+		</copy>
+
+		<copy todir="${deploy.tool}/lib" overwrite="yes" flatten="true">
+			<fileset dir="../${lams_tool_deploy}/lib">
+				<include name="jakarta-commmons/*.jar" />
+				<include name="mysql/*.jar" />
+			</fileset>
+		</copy>
+		
+		<copy todir="${deploy.tool}/lib" overwrite="yes" flatten="true">
+			<fileset dir="../${lams_tool_deploy}/build/lib">
+				<include name="lams-tool-deploy.jar" />
+			</fileset>
+		</copy>
+		
+	</target>
+
+	<!-- assemble ear -->
+	<target name="assemble-ear" depends="init, clean, build-subprojects"
+		description="Assemble lams ear in exploded form">
+		<!-- have to copy the libs etc. to a temp location otherwise we end up with all the directories under lib as well-->
+		<mkdir dir="${assembly}/temp" />
+		<copy todir="${assembly}/temp" failonerror="true"
+			flatten="true">
+			<fileset dir="${lib}">
+				<patternset id="lib.jars">
+					<!--  the desired jars are nominated explicitly so -->
+					<!--  we don't release a build only one by accident -->
+					<include name="aopalliance/*.jar" />
+					<include name="cglib/*.jar" />
+					<include name="dom4j/*.jar" />
+					<include name="ehcache/*.jar" />
+					<include name="fckeditor/*.jar" />
+					<include name="hibernate/*.jar" />
+					<include name="j2ee/*.jar" />
+					<include name="jakarta-commons/*.jar" />
+					<include name="jakarta-poi/*.jar" />
+					<include name="jakarta-taglibs/*.jar" />
+					<include name="jboss/*.jar" />
+					<include name="jdom/*.jar" />
+					<include name="jfreechart/*.jar" />
+					<include name="log4j/*.jar" />
+					<include name="mysql/*.jar" />
+					<include name="odmg/*.jar" />
+					<include name="quartz/*.jar" />
+					<include name="spring/*.jar" />
+					<include name="struts/*.jar" />
+					<include name="wddx/*.jar" />
+					<include name="concurrent/*.jar" />					
+				</patternset>
+			</fileset>
+			<fileset dir="..">
+				<include name="${lams.jar}" />
+				<include name="${lams-contentrepository.jar}" />
+				<include name="${lams-central.war}" />
+				<include name="${lams-central.jar}" />
+				<include name="${lams-monitoring.jar}"/>
+				<include name="${lams-monitoring.war}"/>
+				<include name="${lams-learning.jar}"/>
+				<include name="${lams-learning.war}"/>
+				<include name="${lams-admin.jar}"/>
+				<include name="${lams-admin.war}"/>
+			</fileset>
+		</copy>
+		<!-- create a temporary ear -->
+		<ear destfile="${assembly.temp.ear}" compress="false"
+			appxml="${app.xml}">
+			<fileset dir="${assembly}/temp" includes="*" />
+		</ear>
+		<!-- remove temp lib -->
+		<delete dir="${assembly}/temp" includeEmptyDirs="true" />
+		<!-- explode the ear (Why doesn't the EAR task support exploded format?) -->
+		<unjar src="${assembly.temp.ear}" dest="${assembly.lams.ear}" />
+		<!-- delete temp.ear -->
+		<delete file="${assembly.temp.ear}" />
+	</target>
+
+	<!-- ============================================================================== -->
+	<!-- Deploy the ear file to the server                                              -->
+	<!-- ============================================================================== -->
+
+	<target name="deploy-ear" 
+		description="Deploys previously assembled ear to jboss">
+		<copy todir="${jboss.ear.deploy}" overwrite="true"
+			failonerror="true" verbose="true">
+			<fileset dir="${assembly}">
+				<include name="${lams.ear}/**/*.*" />
+			</fileset>
+
+		</copy>
+	</target>
+
+	<!-- ============================================================================== -->
+	<!-- Deploy IMS Content Package tool to the depoloyed ear 							-->
+	<!--  Relies on the tools using the parameter jboss.deploy							-->						
+	<!-- ============================================================================== -->
+	<target name="deploy-tools">
+<!-- 		<ant antfile="../${tool_forum_dir}/build.xml" target="deploy-tool"
+				inheritAll="false" >
+			<property name="jboss.deploy" location="${jboss.deploy}"/>
+		</ant> -->
+		<ant antfile="../${tool_imscp_dir}/build.xml" target="deploy-tool"
+				inheritAll="false" >
+			<property name="jboss.deploy" location="${jboss.deploy}"/>
+		</ant>
+		<ant antfile="../${tool_lanb_dir}/build.xml" target="deploy-tool"
+				inheritAll="false" >
+			<property name="jboss.deploy" location="${jboss.deploy}"/>
+		</ant>
+		<ant antfile="../${tool_laqa_dir}/build.xml" target="deploy-tool"
+				inheritAll="false" >
+			<property name="jboss.deploy" location="${jboss.deploy}"/>
+		</ant>
+		<ant antfile="../${tool_sbmt_dir}/build.xml" target="deploy-tool"
+				inheritAll="false" >
+			<property name="jboss.deploy" location="${jboss.deploy}"/>
+		</ant>
+		<ant antfile="../${tool_survey_dir}/build.xml" target="deploy-tool"
+				inheritAll="false" >
+			<property name="jboss.deploy" location="${jboss.deploy}"/>
+		</ant>
+	</target>
+	
+	<!-- ============================================================================== -->
+	<!-- Copy the third party jar files and cofiguration files for deployment           -->
+	<!-- ============================================================================== -->
+	<target name="makeconfdir">
+		<delete quiet="true">
+			<fileset dir="${lamsconf}" />
+		</delete>
+		<mkdir dir="${lamsconf}" />
+	</target>
+
+	<target name="copyfiles" depends="makeconfdir"
+		description="copy lib and config files">
+		<copy overwrite="yes" todir="${jboss.server.instance}/conf/">
+			<fileset dir="${conf.jboss}/">
+				<include name="login-config.xml" />
+				<include name="log4j.xml" />
+				<include name="jboss-service.xml" />
+			</fileset>
+		</copy>
+		<copy overwrite="yes" todir="${lamsconf}">
+			<fileset dir="${conf.auth}/">
+				<include name="*.xml" />
+				<include name="*.dtd" />
+			</fileset>
+			<fileset dir="${conf.lams}/">
+				<include name="*.xml" />
+				<include name="*.dtd" />
+			</fileset>
+		</copy>
+		<copy overwrite="yes" todir="${jboss.ear.deploy}">
+			<fileset dir="${conf.jboss}/service">
+				<include name="mysql*.xml" />
+				<include name="local-service.xml" />
+			</fileset>
+		</copy>
+		<copy overwrite="yes" todir="${jboss.ear.deploy}/jbossweb-tomcat55.sar/META-INF">
+			<fileset dir="${conf.jboss}/tomcat">
+				<include name="jboss-service.xml" />
+			</fileset>
+		</copy>
+		<copy overwrite="yes" todir="${jboss.ear.deploy}/jbossweb-tomcat55.sar/">
+			<fileset dir="${conf.jboss}/tomcat">
+				<include name="server.xml" />
+				<include name="context.xml" />
+			</fileset>
+		</copy>
+		<ant antfile="../${lams_common}/build.xml" target="copy-shared-session-jar" inheritAll="false"/>
+		<echo message="Please copy jboss-cache.jar and jgroups.jar from server/all/lib to server/default/lib"
+			level="warning"/>
+	</target>
+
+	<target name="test-report" description="Run all the test cases across the system. Takes a long time.">
+		<!-- Core projects first -->
+<!-- 		<ant antfile="../${lams_common}/build.xml" target="insert-test-data" inheritAll="false"/>
+ 		<ant antfile="../${lams_common}/build.xml" target="test-report" inheritAll="false"/>
+ 		<ant antfile="../${lams_contentrepository}/build.xml" target="test-report" inheritAll="false"/>
+ 		<ant antfile="../${lams_common}/build.xml" target="insert-test-data" inheritAll="false"/>
+		<ant antfile="../${lams_central}/build.xml" target="test-report" inheritAll="false"/>
+-->
+ 		<ant antfile="../${lams_common}/build.xml" target="insert-test-data" inheritAll="false"/>
+ 		<ant antfile="../${tool_survey_dir}/build.xml" target="build-db" inheritAll="false"/> 
+<!--  		<ant antfile="../${tool_survey_dir}/build.xml" target="build-jar" inheritAll="false"/>  -->
+		<ant antfile="../${lams_monitoring}/build.xml" target="test" inheritAll="false"/> 
+<!-- 		<ant antfile="../${lams_learning}/build.xml" target="test-report" inheritAll="false"/> -->
+
+		<!--  Now the tools -->
+<!-- 		<ant antfile="../${lams_common}/build.xml" target="insert-test-data" inheritAll="false"/>
+		<ant antfile="../${tool_forum_dir}/build.xml" target="test-report" inheritAll="false"/>
+		<ant antfile="../${tool_imscp_dir}/build.xml" target="test-report" inheritAll="false"/>
+		<ant antfile="../${tool_laqa_dir}/build.xml" target="test-report" inheritAll="false"/>
+		<ant antfile="../${tool_lanb_dir}/build.xml" target="test-report" inheritAll="false"/>
+		<ant antfile="../${tool_sbmt_dir}/build.xml" target="test-report" inheritAll="false"/>
+		<ant antfile="../${tool_survey_dir}/build.xml" target="test-report" inheritAll="false"/>
+	-->
+	</target>
+</project>
Fisheye: Tag b2e4889e9b159cb132154fbf4f621154fed46b47 refers to a dead (removed) revision in file `lams_build/master-build.xml'.
Fisheye: No comparison available.  Pass `N' to diff?