Index: lams_contentrepository/build.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_contentrepository/build.xml,v
diff -u -r1.13 -r1.14
--- lams_contentrepository/build.xml	28 Feb 2005 07:56:22 -0000	1.13
+++ lams_contentrepository/build.xml	16 Mar 2005 06:13:51 -0000	1.14
@@ -54,10 +54,12 @@
 		<echo message=""/>
 		<echo message="Among the available targets are:"/>
 		<echo message=""/>
-		<echo message="deploy-lamscr-jar  --> Deploy the content repository jar"/>
-		<echo message="deploy-lamscr-jarwar  --> Deploy the content repository jar and web example"/>
-		<echo message="lamscr-jar  --> Make jar archive for deployment"/>
-		<echo message="lamscr-war  --> Make war archive for deployment"/>
+		<echo message="deploy-jar  --> Deploy the content repository jar"/>
+		<echo message="deploy-jarwar  --> Deploy the content repository jar and web example"/>
+		<echo message="build-all  --> Make jar and war archive for deployment"/>
+		<echo message="build-jar  --> Make jar archive for deployment"/>
+		<echo message="build-war  --> Make war archive for deployment"/>
+		<echo message="clean-build  --> Make war archive for deployment"/>
 		<echo message="copyfiles --> Copy the third party jar files and cofiguration files for deployment"/> 
 		<echo message="test-report --> Run the junit tests"/> 
 <!--		<echo message="middlegen-cr --> <!-- Run middlegen for content repository tables"/>  -->
@@ -74,6 +76,13 @@
 	</target>
 
 	<!-- =================================================================== -->
+	<!-- Build and deploy all the java files                            -->
+	<!-- =================================================================== -->
+	<target name="build-all" depends="build-war" description="Builds all the war/jar files">
+	</target>
+	
+
+	<!-- =================================================================== -->
 	<!-- Fails if XDoclet 1.2.x is not on classpath                          -->
 	<!-- =================================================================== -->
 	<target name="fail-if-no-xdoclet-1.2.x" unless="xdoclet-jars-installed">
@@ -109,7 +118,7 @@
 	<!-- Don't run this target for any more as changes have been made.       -->
 	<!-- running middlegen would remove the changes.						 -->
 	<!-- =================================================================== -->
-	<target 
+	<!-- <target 
       name="middlegen-cr" 
       description="Run Middlegen For Content Repository tables" 
       unless="middlegen.skip"
@@ -141,18 +150,18 @@
             javaTypeMapper="middlegen.plugins.hibernate.HibernateJavaTypeMapper"
             />
 
-			<!-- <table name="lams_cr_node"/> -->
-			<!-- <table name="lams_cr_node_version"/> -->
-			<!-- <table name="lams_cr_node_version_property"/> -->
-			<!-- <table name="lams_cr_credential"/> -->
-			<!-- <table name="lams_cr_workspace"/> -->
-			<!-- <table name="lams_cr_workspace_credential"/> -->
+			<table name="lams_cr_node"/>
+			<table name="lams_cr_node_version"/>
+			<table name="lams_cr_node_version_property"/> 
+			<table name="lams_cr_credential"/>
+			<table name="lams_cr_workspace"/>
+			<table name="lams_cr_workspace_credential"/>
 
 		</middlegen-cr>
 
 	</target>
+	-->
 	
-	
 	<!-- =================================================================== -->
 	<!-- Run hbm2java for Content Repository                                 -->
 	<!-- =================================================================== -->
@@ -183,16 +192,14 @@
 	</target>
 
 
-	<target name="clean" depends="preparedirs" description="removes all class files">
-		<delete>
-			<fileset dir="${build.classes}"/>
-			<fileset dir="${build.lib}"/>
-		</delete>
+	<target name="clean-build" depends="preparedirs" description="removes all class files">
+		<delete dir="${build.classes}"/>
+		<delete dir="${build.lib}"/>
 		<mkdir dir="${build.classes}"/>
 		<mkdir dir="${build.lib}"/>
 	</target>
 
-	<target name="compile" depends="clean" description="compile java sources">
+	<target name="compile" depends="clean-build" description="compile java sources">
 		<javac srcdir="${src.java}" compiler="modern"
 	         	 	destdir="${build.classes}" deprecation="on" debug="on">
 			<classpath>
@@ -233,7 +240,7 @@
 	<!-- ================================================================ -->
 	<!-- Make jar archive for deployment        		    	          -->
 	<!-- ================================================================ -->
-	<target name="lamscr-jar" depends="compile" description="creates jar file">
+	<target name="build-jar" depends="compile" description="creates jar file">
 		<delete file="${build.lib}/${product}.jar"/>
 		<jar jarfile="${build.lib}/${product}.jar" manifest="${conf}/META-INF/MANIFEST.MF">
 			<fileset dir="${build.classes}">
@@ -246,7 +253,7 @@
 	<!-- = = = = = = = = = = = = = = = = = = = = = = = =  -->
 	<!-- Make the war archive  for deployment             -->
 	<!-- = = = = = = = = = = = = = = = = = = = = = = = =  -->
-	<target name="lamscr-war" description="creates war file">
+	<target name="build-war" description="creates war file">
 		<delete file="${build.lib}/${product}.war"/>
 		<war warfile="${build.lib}/${product}.war" 
   				webxml="${webinf}/web.xml">
@@ -326,7 +333,7 @@
 	<!-- =================================================================== -->
 	<!-- Deploy the project's jar file only                                  -->
 	<!-- =================================================================== -->
-	<target name="deploy-lamscr-jar" depends="lamscr-jar" description="deploy jar file">
+	<target name="deploy-jar" depends="build-jar" description="deploy jar file">
 		<delete quiet="true">
 			<fileset dir="${jboss.deploy}/tmp"/>
 			<fileset dir="${jboss.deploy}/work"/>
@@ -338,7 +345,7 @@
 	<!-- =================================================================== -->
 	<!-- Deploy the example struts jar and war                               -->
 	<!-- =================================================================== -->
-	<target name="deploy-lamscr-jarwar" depends="lamscr-jar, lamscr-war" description="deploy example war file">
+	<target name="deploy-jarwar" depends="build-jar, build-war" description="deploy example war file">
 		<delete quiet="true">
 			<fileset dir="${jboss.deploy}/tmp"/>
 			<fileset dir="${jboss.deploy}/work"/>