From: Richard Millet <richard.millet@berkeley.edu>
Date: Wed, 18 Nov 2009 23:44:02 +0000 (+0000)
Subject: CSPACE-575: Adding updated "installer" related ant targets, scripts, props etc.
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=ff68f710b53955b1d23506f861116f7baf102a11;p=tmp%2Fjakarta-migration.git

CSPACE-575: Adding updated "installer" related ant targets, scripts, props etc.
---

diff --git a/build.xml b/build.xml
index 75e1ea890..4cbc54949 100644
--- a/build.xml
+++ b/build.xml
@@ -267,6 +267,7 @@
     	description="Installer: Creates an installer distribution for the CollectionSpace services.">
         <!-- copy install scripts, etc. -->
         <copy todir="${basedir}/${dist.installer}">
+            <fileset file="${basedir}/build.properties"/>
             <fileset dir="installer"/>
             <fileset dir="${src}/main/resources/scripts"/>            
         </copy>
diff --git a/installer/build.properties b/installer/build.properties
deleted file mode 100644
index 770a857b1..000000000
--- a/installer/build.properties
+++ /dev/null
@@ -1,51 +0,0 @@
-#cspace
-cspace.release=0.2
-cspace.services.release=cspace-services-${cspace.release}
-cspace.services.war=cspace-services.war
-domain.cspace=cspace
-domain.nuxeo=default
-
-#nuxeo
-#nuxeo.release=5.2.M4
-nuxeo.release=5.2.GA
-nuxeo.ear=nuxeo.ear
-nuxeo.system=${nuxeo.ear}/system
-
-#distribution
-dist=dist
-dist.cspace=${dist}/cspace
-dist.nuxeo=${dist}/nuxeo
-
-#dist cspace domain
-dist.domain.cspace=${domain.cspace}
-dist.server.cspace=${dist.cspace}/server/${jboss.domain.cspace}
-dist.deploy.cspace=${dist.server.cspace}/deploy
-dist.lib.cspace=${dist.server.cspace}/lib
-
-#dist nuxeo domain
-dist.domain.nuxeo=${domain.nuxeo}
-dist.server.nuxeo=${dist.nuxeo}/server/${jboss.domain.nuxeo}
-dist.deploy.nuxeo=${dist.server.nuxeo}/deploy
-dist.lib.nuxeo=${dist.server.nuxeo}/lib
-dist.deploy.nuxeo.system=${dist.deploy.nuxeo}/${nuxeo.system}
-
-#jboss
-#assumption: both nuxeo and cspace domains are using the same JBoss installation
-jboss.release=jboss-4.2.3.GA
-jboss.dir=C:/dev/${jboss.release}
-jboss.home=${jboss.dir}
-
-#jboss cspace domain
-jboss.domain.cspace=${domain.cspace}
-jboss.server.cspace=${jboss.home}/server/${jboss.domain.cspace}
-jboss.deploy.cspace=${jboss.server.cspace}/deploy
-jboss.lib.cspace=${jboss.server.cspace}/lib
-jboss.deploy.cspace.services=${jboss.server.cspace}/deploy/${cspace.services.war}
-
-#jboss nuxeo domain
-jboss.domain.nuxeo=${domain.nuxeo}
-jboss.server.nuxeo=${jboss.home}/server/${jboss.domain.nuxeo}
-jboss.deploy.nuxeo=${jboss.server.nuxeo}/deploy
-jboss.lib.nuxeo=${jboss.server.nuxeo}/lib
-jboss.deploy.nuxeo.system=${jboss.deploy.nuxeo}/${nuxeo.system}
-
diff --git a/installer/build.xml b/installer/build.xml
index 37b381998..3b4014dd3 100644
--- a/installer/build.xml
+++ b/installer/build.xml
@@ -20,9 +20,6 @@
     
     <target name="install"
     	description="Installer: Copy artifacts for CollectionSpace Nuxeo doctypes">
-        <copy todir="${jboss.deploy.nuxeo.system}">
-            <fileset file="${services.trunk}/${dist.deploy.nuxeo.system}/*.jar"/>
-        </copy>
         <!-- cspace\server\cspace -->     
         <copy todir="${jboss.server.cspace}/cspace">
             <fileset dir="${services.trunk}/${dist.server.cspace}/cspace"/>
@@ -48,22 +45,19 @@
             <fileset dir="${services.trunk}/${dist.server.cspace}/nuxeo-client/lib/${nuxeo.release}">
             	<include name="*.jar"/>
 						</fileset>
-        </copy>        
+        </copy>
+        <!-- Now execute the "install" target on the services -->
+				<ant antfile="services/build.xml" target="install" inheritAll="false"/>        
     </target>    
     
-    <target name="config" description="">
-        <exec executable="echo">
-        		<arg value="Installer: Executing CollectionSpace Service's &apos;config&apos; target." />
-				</exec>
+    <target name="config" description="" depends="install">
+        <!-- Now execute the "install" target on the services -->
+				<ant antfile="services/build.xml" target="config" inheritAll="false"/>        
     </target>    
     
-    <target name="predeploy">
-        <exec executable="echo">
-        		<arg value="Installer: Executing installer's &apos;predeploy&apos; target." />
-				</exec>
-				
+    <target name="predeploy" depends="config">
         <exec executable="echo">
-        		<arg value="Creating necessary databases and associated users and privileges." />
+        		<arg value="Installer: Creating necessary databases and associated users and privileges." />
 				</exec>
         <sql driver="com.mysql.jdbc.Driver"
         url="jdbc:mysql://localhost:3306/cspace"
@@ -80,17 +74,16 @@
     </target>
     
     <target name="deploy" description="">
-        <exec executable="echo">
-        		<arg value="Installer: Executing CollectionSpace Service's &apos;deploy&apos; target." />
-				</exec>
+				<!-- Now, invoke the "deploy" target on each of the services' install directories -->
+        <ant antfile="services/build.xml" target="deploy" inheritAll="false"/>        	
     </target>     
     	
     <target name="postdeploy">
         <exec executable="echo">
         		<arg value="Installer: Executing installer's &apos;postdeploy&apos; target." />
 				</exec>
-				<!-- Now, invoke the "predeploy" target on each of the services' install directories -->
-        <ant antfile="services/build.xml" target="postdeploy" inheritAll="false"/>        	
+				<!-- Now, invoke the "postdeploy" target on each of the services' install directories -->
+        <ant antfile="services/build.xml" target="postdeploy" inheritAll="false"/>
     </target>
 
 </project>
diff --git a/services/collectionobject/installer/build.xml b/services/collectionobject/installer/build.xml
index 81c118570..d13a0333c 100644
--- a/services/collectionobject/installer/build.xml
+++ b/services/collectionobject/installer/build.xml
@@ -26,13 +26,13 @@
         </copy>
     </target>
 
-    <target name="config" description="">
+    <target name="config" description="" depends="install">
         <exec executable="echo">
         		<arg value="Installer: Executing CollectionObject Service's &apos;config&apos; target." />
 				</exec>
     </target>
 
-    <target name="predeploy" description="">
+    <target name="predeploy" description="" depends="config">
         <exec executable="echo">
         		<arg value="Installer: Executing CollectionObject Service's &apos;predeploy&apos; target." />
 				</exec>
diff --git a/services/id/installer/build.xml b/services/id/installer/build.xml
index dc2ed159f..eb9d0e0ad 100644
--- a/services/id/installer/build.xml
+++ b/services/id/installer/build.xml
@@ -23,13 +23,13 @@
 				</exec>
     </target>
 
-    <target name="config" description="">
+    <target name="config" description="" depends="install">
         <exec executable="echo">
         		<arg value="Installer: Executing ID Service's &apos;config&apos; target." />
 				</exec>
     </target>
 
-    <target name="predeploy">
+    <target name="predeploy" depends="config">
         <exec executable="echo">
         		<arg value="Installer: Executing ID Service's &apos;predeploy&apos; target for the ID Service." />
 				</exec>
diff --git a/services/installer/build.xml b/services/installer/build.xml
index a7d601cb8..fef1f4d4a 100644
--- a/services/installer/build.xml
+++ b/services/installer/build.xml
@@ -18,19 +18,22 @@
     
     <target name="install"
     	description="Copy artifacts for CollectionSpace Nuxeo doctypes">
-        <copy todir="${jboss.deploy.nuxeo.system}">
-            <fileset file="${services.trunk}/${dist.deploy.nuxeo.system}/*.jar"/>
-        </copy>        
+        <exec executable="echo">
+        		<arg value="Installer: Executing CollectionSpace Service's &apos;install&apos; target." />
+				</exec>
+        <ant antfile="id/build.xml" target="install" inheritAll="false"/>
+        <ant antfile="collectionobject/build.xml" target="install" inheritAll="false"/>
+        <ant antfile="vocabulary/build.xml" target="install" inheritAll="false"/>
     </target>
     
-    <target name="config" description="">
+    <target name="config" description="" depends="install">
         <exec executable="echo">
         		<arg value="Installer: Executing CollectionSpace Service's &apos;config&apos; target." />
 				</exec>
     </target>    
 
     <!-- this target is called in order based on the dependencies between the services -->
-    <target name="predeploy" description="">
+    <target name="predeploy" description="" depends="config">
         <exec executable="echo">
         		<arg value="Installer: Executing services &apos;predeploy&apos; target." />
 				</exec>    	
diff --git a/services/vocabulary/import/build.xml b/services/vocabulary/import/build.xml
index 75761ad0d..b183150a6 100644
--- a/services/vocabulary/import/build.xml
+++ b/services/vocabulary/import/build.xml
@@ -50,7 +50,7 @@
     <target name="dist_installer" depends="package"
     	description="distribute vocabulary service importer tool">        
         <!-- copy install scripts, etc. -->
-        <copy todir="${services.trunk}/${dist.installer.services}/vocabulary/init">
+        <copy todir="${services.trunk}/${dist.installer.services}/vocabulary/postdeploy">
             <fileset dir="${basedir}/target">
             	<include name="*with-dependencies*.jar"/>
             </fileset>
diff --git a/services/vocabulary/installer/build.xml b/services/vocabulary/installer/build.xml
index 3f1251fe0..1e0443396 100644
--- a/services/vocabulary/installer/build.xml
+++ b/services/vocabulary/installer/build.xml
@@ -26,13 +26,13 @@
         </copy>				
     </target>    
 
-    <target name="config" description="">
+    <target name="config" description="" depends="install">
         <exec executable="echo">
         		<arg value="Installer: Executing Vocabulary Service's &apos;config&apos; target." />
 				</exec>
     </target>
     
-    <target name="predeploy" description="">
+    <target name="predeploy" description="" depends="config">
         <exec executable="echo">
         		<arg value="Installer: Executing Vocabulary Service's &apos;predeploy&apos; target." />
 				</exec>
@@ -51,10 +51,9 @@
         <exec executable="echo">
         		<arg value="Importing necessary vocabularies." />
 				</exec>				
-        <java jar="./init/collectionspace-services-vocabulary-importer-jar-with-dependencies.jar"
+        <java jar="./postdeploy/collectionspace-services-vocabulary-importer-jar-with-dependencies.jar"
         	fork="true"
         	failonerror="true">
-        	<arg value="-h"/>
 				</java>	
     </target>