From: Richard Millet <richard.millet@berkeley.edu>
Date: Wed, 18 Nov 2009 18:55:24 +0000 (+0000)
Subject: CSPACE-575: Adding targets for Vocabulary installer.
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=ffcf573bd507e9dc223c76c2f1cc8ee181bd8627;p=tmp%2Fjakarta-migration.git

CSPACE-575: Adding targets for Vocabulary installer.
---

diff --git a/installer/build.xml b/installer/build.xml
index 137fb3b2d..37b381998 100644
--- a/installer/build.xml
+++ b/installer/build.xml
@@ -4,6 +4,7 @@
         collectionspace services
     </description>
   <!-- set global properties for this build -->
+    <property name="services.trunk" value="../.."/>
     <property file="build.properties" />
     <property name="src" location="src"/>
 
@@ -17,9 +18,48 @@
         <os family="windows" />
     </condition>
     
-    <target name="setup">
+    <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"/>
+        </copy>
+        <!-- cspace\server\cspace\deploy -->     
+        <copy todir="${jboss.server.cspace}/deploy">
+            <fileset dir="${services.trunk}/${dist.server.cspace}/deploy">
+            	<include name="*"/>
+            </fileset>
+        </copy>
+        <!-- cspace\server\cspace\lib -->      
+        <copy todir="${jboss.server.cspace}/lib">
+            <fileset dir="${services.trunk}/${dist.server.cspace}/lib"/>
+        </copy>   
+        <!-- cspace\server\cspace\nuxeo-client\lib -->     
+        <copy todir="${jboss.server.cspace}/nuxeo-client/lib">
+            <fileset dir="${services.trunk}/${dist.server.cspace}/nuxeo-client/lib">
+            	<include name="*.jar"/>
+						</fileset>
+        </copy>
+        <!-- cspace\server\cspace\nuxeo-client\lib (5.2GA) -->      
+        <copy todir="${jboss.server.cspace}/nuxeo-client/lib">
+            <fileset dir="${services.trunk}/${dist.server.cspace}/nuxeo-client/lib/${nuxeo.release}">
+            	<include name="*.jar"/>
+						</fileset>
+        </copy>        
+    </target>    
+    
+    <target name="config" description="">
+        <exec executable="echo">
+        		<arg value="Installer: Executing CollectionSpace Service's &apos;config&apos; target." />
+				</exec>
+    </target>    
+    
+    <target name="predeploy">
         <exec executable="echo">
-        		<arg value="Executing installer's &apos;setup&apos; target." />
+        		<arg value="Installer: Executing installer's &apos;predeploy&apos; target." />
 				</exec>
 				
         <exec executable="echo">
@@ -35,16 +75,22 @@
             </classpath>
         </sql>
 				
-				<!-- Now, invoke the "setup" target on each of the services' install directories -->
-        <ant antfile="services/build.xml" target="setup" inheritAll="false"/>        	
+				<!-- Now, invoke the "predeploy" target on each of the services' install directories -->
+        <ant antfile="services/build.xml" target="predeploy" inheritAll="false"/>        	
     </target>
+    
+    <target name="deploy" description="">
+        <exec executable="echo">
+        		<arg value="Installer: Executing CollectionSpace Service's &apos;deploy&apos; target." />
+				</exec>
+    </target>     
     	
-    <target name="init">
+    <target name="postdeploy">
         <exec executable="echo">
-        		<arg value="Executing installer's &apos;init&apos; target." />
+        		<arg value="Installer: Executing installer's &apos;postdeploy&apos; target." />
 				</exec>
-				<!-- Now, invoke the "setup" target on each of the services' install directories -->
-        <ant antfile="services/build.xml" target="init" inheritAll="false"/>        	
+				<!-- Now, invoke the "predeploy" 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 3e78cfdee..81c118570 100644
--- a/services/collectionobject/installer/build.xml
+++ b/services/collectionobject/installer/build.xml
@@ -17,21 +17,34 @@
         <os family="windows" />
     </condition>
 
-    <target name="setup" description="">
-        <tstamp/>
+    <target name="install" description="">
         <exec executable="echo">
-        		<arg value="Installer: Executing CollectionObject Service's &apos;setup&apos; target." />
+        		<arg value="Installer: Executing CollectionObject Service's &apos;install&apos; target." />
 				</exec>
+        <copy todir="${jboss.deploy.nuxeo.system}">
+            <fileset file="nuxeo/*.jar"/>
+        </copy>
     </target>
 
-    <target name="takedown" description="">
-        <tstamp/>
+    <target name="config" description="">
         <exec executable="echo">
-        		<arg value="Installer: Executing CollectionObject Service's &apos;takedown&apos; target." />
+        		<arg value="Installer: Executing CollectionObject Service's &apos;config&apos; target." />
+				</exec>
+    </target>
+
+    <target name="predeploy" description="">
+        <exec executable="echo">
+        		<arg value="Installer: Executing CollectionObject Service's &apos;predeploy&apos; target." />
+				</exec>
+    </target>
+
+    <target name="deploy" description="">
+        <exec executable="echo">
+        		<arg value="Installer: Executing CollectionObject Service's &apos;deploy&apos; target." />
 				</exec>
     </target>
     
-    <target name="init" description="">
+    <target name="postdeploy" description="">
         <exec executable="echo">
         		<arg value="Installer: Executing CollectionObject Service's &apos;init&apos; target." />
 				</exec>    	
diff --git a/services/id/installer/build.xml b/services/id/installer/build.xml
index 49d993128..dc2ed159f 100644
--- a/services/id/installer/build.xml
+++ b/services/id/installer/build.xml
@@ -17,9 +17,21 @@
         <os family="windows" />
     </condition>
 
-    <target name="setup">
+    <target name="install" description="">
         <exec executable="echo">
-        		<arg value="Installer: Executing ID Service's &apos;setup&apos; target for the ID Service." />
+        		<arg value="Installer: Executing ID Service's &apos;install&apos; target." />
+				</exec>
+    </target>
+
+    <target name="config" description="">
+        <exec executable="echo">
+        		<arg value="Installer: Executing ID Service's &apos;config&apos; target." />
+				</exec>
+    </target>
+
+    <target name="predeploy">
+        <exec executable="echo">
+        		<arg value="Installer: Executing ID Service's &apos;predeploy&apos; target for the ID Service." />
 				</exec>
 				
         <exec executable="echo">
@@ -37,7 +49,7 @@
         </sql>
         	
         <exec executable="echo">
-        		<arg value="Loading tables for the ID Service." />
+        		<arg value="Installer: Loading tables for the ID Service." />
 				</exec>        	
 				
 				<!-- Load the tables -->
@@ -52,7 +64,13 @@
         </sql>        	
     </target>
     
-    <target name="init" description="">
+    <target name="deploy" description="">
+        <exec executable="echo">
+        		<arg value="Installer: Executing ID Service's &apos;deploy&apos; target." />
+				</exec>
+    </target>
+    
+    <target name="postdeploy" description="">
         <exec executable="echo">
         		<arg value="Installer: Executing ID Service's &apos;init&apos; target." />
 				</exec>
diff --git a/services/installer/build.xml b/services/installer/build.xml
index ef1b6a348..a7d601cb8 100644
--- a/services/installer/build.xml
+++ b/services/installer/build.xml
@@ -3,8 +3,9 @@
     <description>
     </description>
   <!-- set global properties for this build -->
-    <property name="services.trunk" value=".."/>
-    <property file="${services.trunk}/build.properties" />
+    <property name="installer.trunk" value=".."/>
+    <property name="services.trunk" value="../../.."/>
+    <property file="${installer.trunk}/build.properties" />
     <property name="mvn.opts" value="" />
     <property name="src" location="src"/>
 
@@ -14,20 +15,33 @@
     <condition property="osfamily-windows">
         <os family="windows" />
     </condition>
+    
+    <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>        
+    </target>
+    
+    <target name="config" description="">
+        <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="setup" description="">
+    <target name="predeploy" description="">
         <exec executable="echo">
-        		<arg value="Installer: Executing services &apos;setup&apos; target." />
+        		<arg value="Installer: Executing services &apos;predeploy&apos; target." />
 				</exec>    	
 <!--
         <ant antfile="common/build.xml" target="setup" inheritAll="false"/>
         <ant antfile="authentication/build.xml" target="setup" inheritAll="false"/>
         <ant antfile="relation/build.xml" target="setup" inheritAll="false"/>
 -->        
-        <ant antfile="id/build.xml" target="setup" inheritAll="false"/>
-        <ant antfile="collectionobject/build.xml" target="setup" inheritAll="false"/>
-        <ant antfile="vocabulary/build.xml" target="setup" inheritAll="false"/>
+        <ant antfile="id/build.xml" target="predeploy" inheritAll="false"/>
+        <ant antfile="collectionobject/build.xml" target="predeploy" inheritAll="false"/>
+        <ant antfile="vocabulary/build.xml" target="predeploy" inheritAll="false"/>
 <!--        
         <ant antfile="intake/build.xml" target="setup" inheritAll="false"/>
         <ant antfile="acquisition/build.xml" target="setup" inheritAll="false"/>
@@ -35,31 +49,24 @@
 -->        
     </target>
 
-    <!-- this target is called in revese order of deploy targets -->
-    <target name="takedown" description="">
-        <ant antfile="JaxRsServiceProvider/build.xml" target="takedown" inheritAll="false"/>
-        <ant antfile="vocabulary/build.xml" target="takedown" inheritAll="false"/>
-        <ant antfile="acquisition/build.xml" target="takedown" inheritAll="false"/>
-        <ant antfile="intake/build.xml" target="takedown" inheritAll="false"/>
-        <ant antfile="collectionobject/build.xml" target="takedown" inheritAll="false"/>
-        <ant antfile="id/build.xml" target="takedown" inheritAll="false"/>
-        <ant antfile="relation/build.xml" target="takedown" inheritAll="false"/>
-        <ant antfile="authentication/build.xml" target="takedown" inheritAll="false"/>
-        <ant antfile="common/build.xml" target="takedown" inheritAll="false"/>
+    <target name="deploy" description="">
+        <exec executable="echo">
+        		<arg value="Installer: Executing CollectionSpace Service's &apos;deploy&apos; target." />
+				</exec>
     </target>
 
-    <target name="init" description="">
+    <target name="postdeploy" description="">
         <exec executable="echo">
-        		<arg value="Executing installer's services &apos;init&apos; target." />
+        		<arg value="Executing CollectionSpace Service's &apos;postdeploy&apos; target." />
 				</exec>    	
 <!--
         <ant antfile="common/build.xml" target="setup" inheritAll="false"/>
         <ant antfile="authentication/build.xml" target="setup" inheritAll="false"/>
         <ant antfile="relation/build.xml" target="setup" inheritAll="false"/>
 -->        
-        <ant antfile="id/build.xml" target="init" inheritAll="false"/>
-        <ant antfile="collectionobject/build.xml" target="init" inheritAll="false"/>
-        <ant antfile="vocabulary/build.xml" target="init" inheritAll="false"/>
+        <ant antfile="id/build.xml" target="postdeploy" inheritAll="false"/>
+        <ant antfile="collectionobject/build.xml" target="postdeploy" inheritAll="false"/>
+        <ant antfile="vocabulary/build.xml" target="postdeploy" inheritAll="false"/>
 <!--        
         <ant antfile="intake/build.xml" target="setup" inheritAll="false"/>
         <ant antfile="acquisition/build.xml" target="setup" inheritAll="false"/>
diff --git a/services/vocabulary/build.xml b/services/vocabulary/build.xml
index afe421a90..f56f37c2e 100644
--- a/services/vocabulary/build.xml
+++ b/services/vocabulary/build.xml
@@ -43,7 +43,6 @@
         </exec>
     </target>
 
-
     <target name="install" depends="package,install-unix,install-windows"
   description="Install" />
     <target name="install-unix" if="osfamily-unix">
diff --git a/services/vocabulary/installer/build.xml b/services/vocabulary/installer/build.xml
new file mode 100644
index 000000000..3f1251fe0
--- /dev/null
+++ b/services/vocabulary/installer/build.xml
@@ -0,0 +1,62 @@
+
+<project name="vocabulary" default="package" basedir=".">
+    <description>
+        vocabulary service
+    </description>
+  <!-- set global properties for this build -->
+    <property name="services.trunk" value="../.."/>
+    <property file="${services.trunk}/build.properties" />
+    <property name="mvn.opts" value="" />
+    <property name="src" location="src"/>
+
+    <condition property="osfamily-unix">
+        <os family="unix" />
+    </condition>
+    <condition property="osfamily-windows">
+        <os family="windows" />
+    </condition>
+    
+    <target name="install" description="">
+        <exec executable="echo">
+        		<arg value="Installer: Executing Vocabulary Service's &apos;install&apos; target." />
+				</exec>
+				<!-- Copy the Nuxeo DocType jar files to the Nuxeo app server domain -->
+        <copy todir="${jboss.deploy.nuxeo.system}">
+            <fileset file="nuxeo/*.jar"/>
+        </copy>				
+    </target>    
+
+    <target name="config" description="">
+        <exec executable="echo">
+        		<arg value="Installer: Executing Vocabulary Service's &apos;config&apos; target." />
+				</exec>
+    </target>
+    
+    <target name="predeploy" description="">
+        <exec executable="echo">
+        		<arg value="Installer: Executing Vocabulary Service's &apos;predeploy&apos; target." />
+				</exec>
+    </target>    
+    
+    <target name="deploy" description="">
+        <exec executable="echo">
+        		<arg value="Installer: Executing Vocabulary Service's &apos;deploy&apos; target." />
+				</exec>
+    </target>
+    
+    <target name="postdeploy">
+        <exec executable="echo">
+        		<arg value="Installer: Executing installer's &apos;postdeploy&apos; target for the Vocabulary Service." />
+				</exec>		
+        <exec executable="echo">
+        		<arg value="Importing necessary vocabularies." />
+				</exec>				
+        <java jar="./init/collectionspace-services-vocabulary-importer-jar-with-dependencies.jar"
+        	fork="true"
+        	failonerror="true">
+        	<arg value="-h"/>
+				</java>	
+    </target>
+    
+
+</project>