Index: lams_build/build.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_build/build.xml,v
diff -u -r1.79.2.1 -r1.79.2.1.2.1
--- lams_build/build.xml	11 May 2009 05:09:16 -0000	1.79.2.1
+++ lams_build/build.xml	13 May 2009 09:37:53 -0000	1.79.2.1.2.1
@@ -97,6 +97,11 @@
 		<echo>Building LAMS using CruiseControl</echo>
 	</target>
 	
+	<!-- cruise control task : build lams without tools -->
+	<target name="lams-cruise-min-tools" depends="assemble-ear, rebuild-db, deploy-ear, copyfiles, deploy-minimal-tools" description="builds entire LAMS without tools"> 
+		<echo>Building LAMS using CruiseControl</echo>
+	</target>
+	
 	<!-- assemble ear -->
 	<target name="assemble-ear" depends="init, clean, build-subprojects"
 		description="Assemble lams ear in exploded form">
@@ -113,15 +118,13 @@
 					<include name="cglib/*.jar" />
 					<include name="dom4j/*.jar" />
 					<include name="fckeditor/*.jar" />
-					<include name="hibernate/*.jar" />
 					<include name="j2ee/*.jar" />
 					<include name="jabber/*.jar" />
 					<include name="jakarta-commons/*.jar" />
 					<include name="jakarta-poi/*.jar" />
 					<include name="jakarta-taglibs/*.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" />
@@ -132,8 +135,7 @@
 					<include name="wddx/*.jar" />
 					<include name="concurrent/*.jar" />					
 					<include name="xstream/*.jar" />		
-					<include name="flagstone/*.jar" />		
-					<include name="slf4j/*.jar" />
+					<include name="flagstone/*.jar" />
 					<include name="lucene/*.jar" />
 					<include name="excel/*.jar" />
 					<include name="csv/*.jar" />
@@ -183,9 +185,11 @@
 		<!-- explode the ear (Why doesn't the EAR task support exploded format?) -->
 		<!-- lams-central.war is already exploded when copied -->
 		<unjar src="${assembly.temp.ear}" dest="${assembly.lams.ear}" />
-		<!-- Add local copy of DTD so developers with no internet access can still build the project -->
+		<!-- Add local copy of XSD so developers with no internet access can still build the project -->
 		<copy todir="${assembly.lams.ear}/META-INF" failonerror="true">
-			<fileset dir="${app.xml.dir}"><include name="application_1_3.dtd" /></fileset>
+			<fileset dir="${app.xml.dir}">
+				<include name="application_5.xsd" />
+			</fileset>
 		</copy>
 		<move file="${assembly.lams.ear}/lams-www.war" tofile="${assembly.lams.ear}/temp.war"/>
 		<unjar src="${assembly.lams.ear}/temp.war" dest="${assembly.lams.ear}/lams-www.war"/>
@@ -242,6 +246,8 @@
 			<property name="jboss.deploy" location="${jboss.deploy}"/>
 			<property name="generate.for.installers" value="${generate.for.installers}"/>
 		</ant>
+		
+
 		<ant antfile="../${tool_laqa_dir}/build.xml" target="deploy-tool"
 				inheritAll="false" >
 			<property name="jboss.deploy" location="${jboss.deploy}"/>
@@ -317,8 +323,22 @@
 			<property name="jboss.deploy" location="${jboss.deploy}"/>
 			<property name="generate.for.installers" value="${generate.for.installers}"/>
 		</ant>
+		
 	</target>
 
+	<target name="deploy-minimal-tools" description="Deploy the tools shared between LAMS and RAMS. Called by deploy-lams-tools and deploy-rams-tools">
+  		<ant antfile="../${tool_notebook_dir}/build.xml" target="deploy-tool"
+				inheritAll="false" >
+			<property name="jboss.deploy" location="${jboss.deploy}"/>
+			<property name="generate.for.installers" value="${generate.for.installers}"/>
+		</ant>
+		<ant antfile="../${tool_videorecorder_dir}/build.xml" target="deploy-tool"
+						inheritAll="false" >
+			<property name="jboss.deploy" location="${jboss.deploy}"/>
+			<property name="generate.for.installers" value="${generate.for.installers}"/>
+		</ant>
+	</target>
+	
 	<target name="deploy-lams-tools" depends="test-application, deploy-common-tools" if="isLAMS"
 			description="Deploy the LAMS tools. Called by deploy-tools.">
 		<echo>Building the LAMS set of tools.</echo>
@@ -381,7 +401,7 @@
 		
 		<copy overwrite="yes" todir="${jboss.server.instance}/conf/">
 			<fileset dir="${conf.jboss}/">
-				<include name="log4j.xml"/>
+				<include name="jboss-log4j.xml"/>
 			</fileset>
 			<filterset>
 				<filter token="application" value="${conf.application}"/>
@@ -391,38 +411,41 @@
 		<copy overwrite="yes" todir="${jboss.ear.deploy}">
 			<fileset dir="${conf.jboss}/service">
 				<include name="mysql*.xml" />
-				<include name="local-service.xml" />
+				<!--
+					<include name="lams-cache-jboss-beans.xml" />
+				-->
 			</fileset>
 	        <filterset>
 	            <filter token="db.name" value="${db.name}"/>
                 <filter token="db.username" value="${db.username}"/>
                 <filter token="db.password" value="${db.password}"/>
 	        </filterset>
 		</copy>
-		<copy overwrite="yes" todir="${jboss.ear.deploy}/jbossweb-tomcat55.sar/META-INF">
-			<fileset dir="${conf.jboss}/tomcat">
-				<include name="jboss-service.xml" />
+		
+		<copy overwrite="yes" todir="${jboss.deploy}">
+			<fileset dir="${conf.jboss}/service">
+				<include name="treecache.xml" />
 			</fileset>
 		</copy>
-		<copy overwrite="yes" todir="${jboss.ear.deploy}/jbossweb-tomcat55.sar/">
-			<fileset dir="${conf.jboss}/tomcat">
+                	
+		
+		<copy overwrite="yes" todir="${jboss.ear.deployers}/jbossweb.deployer/META-INF">
+			<fileset dir="${conf.jboss}/jbossweb">
+				<include name="war-deployers-jboss-beans.xml" />
+			</fileset>
+		</copy>
+		<copy overwrite="yes" todir="${jboss.ear.deploy}/jbossweb.sar/">
+			<fileset dir="${conf.jboss}/jbossweb">
 				<include name="server.xml" />
 				<include name="context.xml" />
 			</fileset>
 		</copy>
-		<copy overwrite="yes" todir="${jboss.ear.deploy}/jbossweb-tomcat55.sar/conf">
-			<fileset dir="${conf.jboss}/tomcat">
-				<include name="web.xml" />
-			</fileset>
-		</copy>
-
+		
 		<ant antfile="../${lams_common}/build.xml" target="copy-shared-session-jar" inheritAll="false"/>
 		<ant antfile="../${lams_common}/build.xml" target="copy-lams-valve-jar" inheritAll="false"/>
 		<copy overwrite="yes" todir="${jboss.server.instance.lib}">	
 			<fileset dir="${lib}/jboss">
-				<include name="jboss-cache.jar" />
-				<include name="jgroups.jar" />
-				<include name="jboss-serialization.jar" />
+				<include name="*.jar" />
 			</fileset>
 		</copy>
 		
@@ -459,12 +482,12 @@
 
 		<echo>Deploying Library Activities</echo>
 
-		<!-- Generate the deployment package for share resources / forum parallel activity. -->
+		<!-- Generate the deployment package for share resources / forum parallel activity.-->
 		<ant antfile="buildcombinedtasks.xml" target="deploy-package-library">
 			<property name="assembly.activity" location="${basedir}/assembly/shareresourcesforum"/>
 			<property name="package.cfg" location="librarypackages/shareresourcesforum"/>
 		</ant> 
-
+ 
 		<!-- Generate the deployment package for chat / scribe parallel activity. -->
 		<ant antfile="buildcombinedtasks.xml" target="deploy-package-library">
 			<property name="assembly.activity" value="${basedir}/assembly/chatscribe"/>
@@ -476,6 +499,7 @@
 			<property name="assembly.activity" value="${basedir}/assembly/forumscribe"/>
 			<property name="package.cfg" value="librarypackages/forumscribe"/>
 		</ant> 
+		
 </target>
 
 	<!-- Copy lams.tld and the lams tags from lams-central to the other projects -->