Index: lams_build/build.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_build/build.xml,v
diff -u -r1.50 -r1.51
--- lams_build/build.xml	12 Jan 2007 04:59:05 -0000	1.50
+++ lams_build/build.xml	19 Feb 2007 23:20:00 -0000	1.51
@@ -197,29 +197,25 @@
 	<!-- ============================================================================== -->
 
 	<target name="deploy-ear" 
-		description="Deploys previously assembled ear to jboss">
+		description="Delete any old versions of the ear directory">
+		<delete dir="${jboss.deploy}"/>
 		<copy todir="${jboss.ear.deploy}" overwrite="true"
 			failonerror="true">
 			<fileset dir="${assembly}">
 				<include name="${lams.ear}/**/*.*" />
 			</fileset>
-
 		</copy>
 	</target>
 
 	<!-- ============================================================================== -->
-	<!-- Deploy IMS Content Package tool to the depoloyed ear 							-->
+	<!-- Deploy the LAMS or RAMS set of tools to the deployed ear 				               			-->
 	<!--  Relies on the tools using the parameter jboss.deploy							-->						
 	<!-- ============================================================================== -->
-	<target name="deploy-tools" description="Deploy the tools, including any special parallel activities">
- 		<ant antfile="../${tool_forum_dir}/build.xml" target="deploy-tool"
+	<target name="deploy-common-tools" description="Deploy the tools shared between LAMS and RAMS. Called by deploy-lams-tools and deploy-rams-tools">
+		<ant antfile="../${tool_forum_dir}/build.xml" target="deploy-tool"
 				inheritAll="false" >
 			<property name="jboss.deploy" location="${jboss.deploy}"/>
 		</ant>
-		<ant antfile="../${tool_lamc_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}"/>
@@ -256,9 +252,40 @@
 				inheritAll="false" >
 			<property name="jboss.deploy" location="${jboss.deploy}"/>
 		</ant>
-		<ant target="deploy-learning-libraries"/>
 	</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>
+		<ant antfile="../${tool_lamc_dir}/build.xml" target="deploy-tool"
+				inheritAll="false" >
+			<property name="jboss.deploy" location="${jboss.deploy}"/>
+		</ant> 
+	</target>
+			
+	<target name="deploy-rams-tools" depends="test-application, deploy-common-tools" if="isRAMS"
+			description="Deploys the RAMS tools. Called by deploy-tools.">
+		<echo>Building the RAMS set of tools.</echo>
+		<!-- No RAMS specific tools yet -->
+	</target>
 	
+	<target name="test-application">
+		  <condition property="isLAMS">
+		  	<equals arg1="${conf.application}" arg2="lams" />
+		  </condition>
+		  <condition property="isRAMS">
+		  	<equals arg1="${conf.application}" arg2="rams" />
+		  </condition>
+		  <echo>isLAMS ${isLAMS}</echo>
+		  <echo>isRAMS ${isRAMS}</echo>
+	</target>
+	
+	<target name="deploy-tools" depends="deploy-lams-tools,deploy-rams-tools" 
+		description="Deploys the desired tools, working out automatically whether they should be the LAMS or RAMS set of tools. Includes any special parallel activities">
+		<ant target="deploy-learning-libraries"/>
+	</target>
+
+
 	<!-- ============================================================================== -->
 	<!--  Rebuild the LAMS Database														-->						
 	<!-- ============================================================================== -->
Index: lams_build/buildcombinedtasks.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_build/Attic/buildcombinedtasks.xml,v
diff -u -r1.2 -r1.3
--- lams_build/buildcombinedtasks.xml	17 Feb 2007 12:02:56 -0000	1.2
+++ lams_build/buildcombinedtasks.xml	19 Feb 2007 23:20:00 -0000	1.3
@@ -35,7 +35,7 @@
 			</copy>
 
 			<copy overwrite="yes" todir="${assembly.activity}/language">
-				<fileset dir="${package.cfg}/language/${conf.language.application}">
+				<fileset dir="${package.cfg}/language/${conf.application}">
 					<include name="*.*"/>
 				</fileset>
 			</copy>
Index: lams_build/common.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_build/common.properties,v
diff -u -r1.19 -r1.20
--- lams_build/common.properties	17 Feb 2007 12:02:55 -0000	1.19
+++ lams_build/common.properties	19 Feb 2007 23:20:00 -0000	1.20
@@ -21,6 +21,10 @@
 project=LAMS
 project_version=2.0beta1
 
+# which application are we trying to build? LAMS or RAMS
+#conf.application=lams
+conf.application=rams
+
 # which o/s related property file do you want? valid values "windows" or "unix"
 osPropertiesName=windows
 
@@ -70,11 +74,8 @@
 conf.struts.dir=${conf.webinf.dir}/struts
 
 ##Language Files 
-# do we use lams or rams? needed as a separate option for the combined tasks.
-conf.language.application=lams
-#conf.language.application=rams
 # conf.language.dir is the directory containing all the language files for all the tools, learning, monitoring, etc.
-conf.language.dir=${conf.dir}/language/${conf.language.application}
+conf.language.dir=${conf.dir}/language/${conf.application}
 
 # Build directory
 build=${basedir}/build