Index: lams_build/build.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_build/build.xml,v
diff -u -r1.79.2.2 -r1.79.2.3
--- lams_build/build.xml	14 May 2009 01:16:31 -0000	1.79.2.2
+++ lams_build/build.xml	30 Jun 2009 02:30:52 -0000	1.79.2.3
@@ -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,34 +118,30 @@
 					<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" />
 					<include name="smack/smack.jar"/>
 					<include name="smack/smackx.jar"/>
 					<include name="spring/*.jar" />
 					<include name="struts/*.jar" />
 					<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" />
 				</patternset>
 			</fileset> 
 			<fileset dir="..">
-				<include name="${lams_common}/${sub.build.lib}/*.jar" />
+				<include name="${lams_common}/${sub.build.lib}/lams.jar" />
 				<include name="${lams_contentrepository}/${sub.build.lib}/*.jar" />
 				<include name="${lams_central}/${sub.build.lib}/*.jar" />
 				<include name="${lams_monitoring}/${sub.build.lib}/*.jar"/>
@@ -183,9 +184,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 +245,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,6 +322,7 @@
 			<property name="jboss.deploy" location="${jboss.deploy}"/>
 			<property name="generate.for.installers" value="${generate.for.installers}"/>
 		</ant>
+<<<<<<< build.xml
 		<ant antfile="../${tool_videorecorder_dir}/build.xml" target="deploy-tool"
 						inheritAll="false" >
 			<property name="jboss.deploy" location="${jboss.deploy}"/>
@@ -337,8 +343,24 @@
 			<property name="jboss.deploy" location="${jboss.deploy}"/>
 			<property name="generate.for.installers" value="${generate.for.installers}"/>
 		</ant>
+=======
+		
+>>>>>>> 1.79.2.1.2.5
 	</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>
@@ -401,7 +423,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}"/>
@@ -411,38 +433,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>
 		
@@ -479,12 +504,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"/>
@@ -496,6 +521,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 -->
@@ -528,68 +554,72 @@
 		
 	</target>
 	
-	<target name="slim-jboss" description="makes a backup and removes unnecessary services from JBoss 4.0.2;
-		do not run it twice, otherwise you will need to copy standardjboss.xml and ejb-deployer.xml
-		from the original JBoss distribution and then build the whole LAMS project">
+	<target name="slim-jboss" description="makes a backup and removes unnecessary services from JBoss 5; do not run twice!">
 		<!-- Backup -->
 		<copy todir="${jboss.server.instance}/slim-backup/deploy">
 			<fileset dir="${jboss.ear.deploy}/">
-				<include name="ejb-deployer.xml"/>
-				<include name="client-deployer-service.xml"/>
+				<include name="ejb2-container-jboss-beans.xml"/>
+				<include name="ejb2-timer-service.xml"/>
+				<include name="ejb3-connectors-jboss-beans.xml"/>
+				<include name="ejb3-container-jboss-beans.xml"/>
+				<include name="ejb3-interceptors-aop.xml"/>
+				<include name="ejb3-timerservice-jboss-beans.xml"/>
+				<include name="jsr88-service.xml"/>
+				<include name="monitoring-service.xml"/>
+				<include name="profileservice-jboss-beans.xml"/>
 				<include name="schedule-manager-service.xml"/>
 				<include name="scheduler-service.xml"/>
-				<include name="bsh-deployer.xml"/>
-				<include name="jboss-aop.deployer/"/>
-				<include name="jboss-ws4ee.sar/"/>
-				<include name="jmx-console.war/"/>
+				<include name="transaction-service.xml"/>
+				<include name="jbossws.sar/"/>
+				<include name="profileservice-secured.jar/"/>
+				<include name="admin-console.war/"/>
+				<include name="xnio-provider.jar/"/>
 				<include name="http-invoker.sar/"/>
 			</fileset>
 		</copy>
 		
-		<copy todir="${jboss.server.instance}/slim-backup/conf">
-			<fileset dir="${jboss.server.instance}/conf">
-				<include name="jboss-service.xml"/>
-				<include name="standardjboss.xml"/>
+		<copy todir="${jboss.server.instance}/slim-backup/deployers">
+			<fileset dir="${jboss.server.instance}/deployers">
+				<include name="jsr77-deployers-jboss-beans.xml"/>
+				<include name="logbridge-jboss-beans.xml"/>
+				<include name="jbossws.deployer/"/>
+				<include name="seam.deployer/"/>
 			</fileset>
 		</copy>
 		
-		<copy todir="${jboss.server.instance}/slim-backup/lib">
-			<fileset dir="${jboss.server.instance.lib}">
-				<include name="autonumber-plugin.jar"/>
-				<include name="bcel.jar"/>
-				<include name="jboss-jaxrpc.jar"/>
-				<include name="jboss-saaj.jar"/>
-				<include name="scheduler-plugin.jar"/>
-				<include name="scheduler-plugin-example.jar"/>
-				<include name="bsh-1.3.0.jar"/>
-				<include name="bsh-deployer.jar"/>
+		<copy todir="${jboss.server.instance}/slim-backup/conf">
+			<fileset dir="${jboss.server.instance}/conf">
+				<include name="bootstrap.xml"/>
 			</fileset>
 		</copy>
 		
 		<!-- Configuring -->
-		<copy overwrite="yes" file="${conf.jboss}/ejb-deployer.slim.xml" tofile="${jboss.ear.deploy}/ejb-deployer.xml" />
-		<copy overwrite="yes" file="${conf.jboss}/jboss-service.slim.xml" tofile="${jboss.server.instance}/conf/jboss-service.xml" />
-		<copy overwrite="yes" file="${conf.jboss}/standardjboss.slim.xml" tofile="${jboss.server.instance}/conf/standardjboss.xml" />
+		<copy overwrite="yes" file="${conf.jboss}/bootstrap.slim.xml" tofile="${jboss.server.instance}/conf/bootstrap.xml" />
 		
-		
-		<delete dir="${jboss.ear.deploy}jboss-aop.deployer" />
-		<delete dir="${jboss.ear.deploy}/jboss-ws4ee.sar" />
-		<delete dir="${jboss.ear.deploy}/jmx-console.war"/>
-		<delete dir="${jboss.ear.deploy}/http-invoker.sar"/>
-		
-		<delete file="${jboss.ear.deploy}/client-deployer-service.xml"/>
+		<delete file="${jboss.ear.deploy}/ejb2-container-jboss-beans.xml"/>
+		<delete file="${jboss.ear.deploy}/ejb2-timer-service.xml"/>
+		<delete file="${jboss.ear.deploy}/ejb3-connectors-jboss-beans.xml"/>
+		<delete file="${jboss.ear.deploy}/ejb3-container-jboss-beans.xml"/>
+		<delete file="${jboss.ear.deploy}/ejb3-interceptors-aop.xml"/>
+		<delete file="${jboss.ear.deploy}/ejb3-timerservice-jboss-beans.xml"/>
+		<delete file="${jboss.ear.deploy}/jsr88-service.xml"/>
+		<delete file="${jboss.ear.deploy}/monitoring-service.xml"/>
+		<delete file="${jboss.ear.deploy}/profileservice-jboss-beans.xml"/>
 		<delete file="${jboss.ear.deploy}/schedule-manager-service.xml"/>
 		<delete file="${jboss.ear.deploy}/scheduler-service.xml"/>
-		<delete file="${jboss.ear.deploy}/bsh-deployer.xml"/>
+		<delete file="${jboss.ear.deploy}/transaction-service.xml"/>
 		
-		<delete file="${jboss.server.instance.lib}/autonumber-plugin.jar"/>
-		<delete file="${jboss.server.instance.lib}/bcel.jar"/>
-		<delete file="${jboss.server.instance.lib}/jboss-jaxrpc.jar"/>
-		<delete file="${jboss.server.instance.lib}/jboss-saaj.jar"/>
-		<delete file="${jboss.server.instance.lib}/scheduler-plugin.jar"/>
-		<delete file="${jboss.server.instance.lib}/scheduler-plugin-example.jar"/>
-		<delete file="${jboss.server.instance.lib}/bsh-1.3.0.jar"/>
-		<delete file="${jboss.server.instance.lib}/bsh-deployer.jar"/>
+		<delete dir="${jboss.ear.deploy}/jbossws.sar/"/>
+		<delete dir="${jboss.ear.deploy}/profileservice-secured.jar/"/>
+		<delete dir="${jboss.ear.deploy}/admin-console.war/"/>
+		<delete dir="${jboss.ear.deploy}/xnio-provider.jar/"/>
+		<delete dir="${jboss.ear.deploy}/http-invoker.sar/"/>
+		
+		<delete file="${jboss.server.instance}/deployers/jsr77-deployers-jboss-beans.xml"/>
+		<delete file="${jboss.server.instance}/deployers/logbridge-jboss-beans.xml"/>
+		
+		<delete dir="${jboss.server.instance}/deployers/jbossws.deployer"/>
+		<delete dir="${jboss.server.instance}/deployers/seam.deployer"/>
 	</target>
 	
 	<target name="slim-jboss-revert" description="reverts changes made by slim-jboss task">
@@ -605,9 +635,9 @@
 			</fileset>
 		</copy>
 		
-		<copy overwrite="yes" todir="${jboss.server.instance.lib}">
-			<fileset dir="${jboss.server.instance}/slim-backup/lib">
-				<include name="*"/>
+		<copy overwrite="yes" todir="${jboss.server.instance}/deployers">
+			<fileset dir="${jboss.server.instance}/slim-backup/deployers">
+				<include name="*/"/>
 			</fileset>
 		</copy>
 	</target>