CSPACE-575: Adding targets for Vocabulary installer.

diff --git a/installer/build.xml b/installer/build.xml
index 137fb3b2de7be8e4a0915f6341f255441552f5f2..37b3819986c4893258ad341fb67a2a38d2d84dae 100644 (file)
--- a/installer/build.xml
+++ b/installer/build.xml
@@ -4,6 +4,7 @@
         collectionspace services\r
     </description>\r
   <!-- set global properties for this build -->\r
+    <property name="services.trunk" value="../.."/>\r
     <property file="build.properties" />\r
     <property name="src" location="src"/>\r
 \r
@@ -17,9 +18,48 @@
         <os family="windows" />\r
     </condition>\r
     \r
-    <target name="setup">\r
+    <target name="install"\r
+       description="Installer: Copy artifacts for CollectionSpace Nuxeo doctypes">\r
+        <copy todir="${jboss.deploy.nuxeo.system}">\r
+            <fileset file="${services.trunk}/${dist.deploy.nuxeo.system}/*.jar"/>\r
+        </copy>\r
+        <!-- cspace\server\cspace -->     \r
+        <copy todir="${jboss.server.cspace}/cspace">\r
+            <fileset dir="${services.trunk}/${dist.server.cspace}/cspace"/>\r
+        </copy>\r
+        <!-- cspace\server\cspace\deploy -->     \r
+        <copy todir="${jboss.server.cspace}/deploy">\r
+            <fileset dir="${services.trunk}/${dist.server.cspace}/deploy">\r
+               <include name="*"/>\r
+            </fileset>\r
+        </copy>\r
+        <!-- cspace\server\cspace\lib -->      \r
+        <copy todir="${jboss.server.cspace}/lib">\r
+            <fileset dir="${services.trunk}/${dist.server.cspace}/lib"/>\r
+        </copy>   \r
+        <!-- cspace\server\cspace\nuxeo-client\lib -->     \r
+        <copy todir="${jboss.server.cspace}/nuxeo-client/lib">\r
+            <fileset dir="${services.trunk}/${dist.server.cspace}/nuxeo-client/lib">\r
+               <include name="*.jar"/>\r
+                                               </fileset>\r
+        </copy>\r
+        <!-- cspace\server\cspace\nuxeo-client\lib (5.2GA) -->      \r
+        <copy todir="${jboss.server.cspace}/nuxeo-client/lib">\r
+            <fileset dir="${services.trunk}/${dist.server.cspace}/nuxeo-client/lib/${nuxeo.release}">\r
+               <include name="*.jar"/>\r
+                                               </fileset>\r
+        </copy>        \r
+    </target>    \r
+    \r
+    <target name="config" description="">\r
+        <exec executable="echo">\r
+                       <arg value="Installer: Executing CollectionSpace Service's &apos;config&apos; target." />\r
+                               </exec>\r
+    </target>    \r
+    \r
+    <target name="predeploy">\r
         <exec executable="echo">\r
-                       <arg value="Executing installer's &apos;setup&apos; target." />\r
+                       <arg value="Installer: Executing installer's &apos;predeploy&apos; target." />\r
                                </exec>\r
                                \r
         <exec executable="echo">\r
@@ -35,16 +75,22 @@
             </classpath>\r
         </sql>\r
                                \r
-                               <!-- Now, invoke the "setup" target on each of the services' install directories -->\r
-        <ant antfile="services/build.xml" target="setup" inheritAll="false"/>          \r
+                               <!-- Now, invoke the "predeploy" target on each of the services' install directories -->\r
+        <ant antfile="services/build.xml" target="predeploy" inheritAll="false"/>              \r
     </target>\r
+    \r
+    <target name="deploy" description="">\r
+        <exec executable="echo">\r
+                       <arg value="Installer: Executing CollectionSpace Service's &apos;deploy&apos; target." />\r
+                               </exec>\r
+    </target>     \r
        \r
-    <target name="init">\r
+    <target name="postdeploy">\r
         <exec executable="echo">\r
-                       <arg value="Executing installer's &apos;init&apos; target." />\r
+                       <arg value="Installer: Executing installer's &apos;postdeploy&apos; target." />\r
                                </exec>\r
-                               <!-- Now, invoke the "setup" target on each of the services' install directories -->\r
-        <ant antfile="services/build.xml" target="init" inheritAll="false"/>           \r
+                               <!-- Now, invoke the "predeploy" target on each of the services' install directories -->\r
+        <ant antfile="services/build.xml" target="postdeploy" inheritAll="false"/>             \r
     </target>\r
 \r
 </project>\r

diff --git a/services/collectionobject/installer/build.xml b/services/collectionobject/installer/build.xml
index 3e78cfdee9f30a0262091bca98a780491b515875..81c11857076a865247c8e31ad360cd0d1a2fdca8 100644 (file)
--- a/services/collectionobject/installer/build.xml
+++ b/services/collectionobject/installer/build.xml
@@ -17,21 +17,34 @@
         <os family="windows" />\r
     </condition>\r
 \r
-    <target name="setup" description="">\r
-        <tstamp/>\r
+    <target name="install" description="">\r
         <exec executable="echo">\r
-                       <arg value="Installer: Executing CollectionObject Service's &apos;setup&apos; target." />\r
+                       <arg value="Installer: Executing CollectionObject Service's &apos;install&apos; target." />\r
                                </exec>\r
+        <copy todir="${jboss.deploy.nuxeo.system}">\r
+            <fileset file="nuxeo/*.jar"/>\r
+        </copy>\r
     </target>\r
 \r
-    <target name="takedown" description="">\r
-        <tstamp/>\r
+    <target name="config" description="">\r
         <exec executable="echo">\r
-                       <arg value="Installer: Executing CollectionObject Service's &apos;takedown&apos; target." />\r
+                       <arg value="Installer: Executing CollectionObject Service's &apos;config&apos; target." />\r
+                               </exec>\r
+    </target>\r
+\r
+    <target name="predeploy" description="">\r
+        <exec executable="echo">\r
+                       <arg value="Installer: Executing CollectionObject Service's &apos;predeploy&apos; target." />\r
+                               </exec>\r
+    </target>\r
+\r
+    <target name="deploy" description="">\r
+        <exec executable="echo">\r
+                       <arg value="Installer: Executing CollectionObject Service's &apos;deploy&apos; target." />\r
                                </exec>\r
     </target>\r
     \r
-    <target name="init" description="">\r
+    <target name="postdeploy" description="">\r
         <exec executable="echo">\r
                        <arg value="Installer: Executing CollectionObject Service's &apos;init&apos; target." />\r
                                </exec>         \r

diff --git a/services/id/installer/build.xml b/services/id/installer/build.xml
index 49d9931284f2ec85cd3370c35796453041f85b0c..dc2ed159f3a1f53381b5c4142f4e52d8aad5ed7a 100644 (file)
--- a/services/id/installer/build.xml
+++ b/services/id/installer/build.xml
@@ -17,9 +17,21 @@
         <os family="windows" />\r
     </condition>\r
 \r
-    <target name="setup">\r
+    <target name="install" description="">\r
         <exec executable="echo">\r
-                       <arg value="Installer: Executing ID Service's &apos;setup&apos; target for the ID Service." />\r
+                       <arg value="Installer: Executing ID Service's &apos;install&apos; target." />\r
+                               </exec>\r
+    </target>\r
+\r
+    <target name="config" description="">\r
+        <exec executable="echo">\r
+                       <arg value="Installer: Executing ID Service's &apos;config&apos; target." />\r
+                               </exec>\r
+    </target>\r
+\r
+    <target name="predeploy">\r
+        <exec executable="echo">\r
+                       <arg value="Installer: Executing ID Service's &apos;predeploy&apos; target for the ID Service." />\r
                                </exec>\r
                                \r
         <exec executable="echo">\r
@@ -37,7 +49,7 @@
         </sql>\r
                \r
         <exec executable="echo">\r
-                       <arg value="Loading tables for the ID Service." />\r
+                       <arg value="Installer: Loading tables for the ID Service." />\r
                                </exec>         \r
                                \r
                                <!-- Load the tables -->\r
@@ -52,7 +64,13 @@
         </sql>         \r
     </target>\r
     \r
-    <target name="init" description="">\r
+    <target name="deploy" description="">\r
+        <exec executable="echo">\r
+                       <arg value="Installer: Executing ID Service's &apos;deploy&apos; target." />\r
+                               </exec>\r
+    </target>\r
+    \r
+    <target name="postdeploy" description="">\r
         <exec executable="echo">\r
                        <arg value="Installer: Executing ID Service's &apos;init&apos; target." />\r
                                </exec>\r

diff --git a/services/installer/build.xml b/services/installer/build.xml
index ef1b6a348bf14dca94e4bba298400d491b54aab5..a7d601cb8bc2c6598cc1085cc98e6cb12381407e 100644 (file)
--- a/services/installer/build.xml
+++ b/services/installer/build.xml
@@ -3,8 +3,9 @@
     <description>\r
     </description>\r
   <!-- set global properties for this build -->\r
-    <property name="services.trunk" value=".."/>\r
-    <property file="${services.trunk}/build.properties" />\r
+    <property name="installer.trunk" value=".."/>\r
+    <property name="services.trunk" value="../../.."/>\r
+    <property file="${installer.trunk}/build.properties" />\r
     <property name="mvn.opts" value="" />\r
     <property name="src" location="src"/>\r
 \r
@@ -14,20 +15,33 @@
     <condition property="osfamily-windows">\r
         <os family="windows" />\r
     </condition>\r
+    \r
+    <target name="install"\r
+       description="Copy artifacts for CollectionSpace Nuxeo doctypes">\r
+        <copy todir="${jboss.deploy.nuxeo.system}">\r
+            <fileset file="${services.trunk}/${dist.deploy.nuxeo.system}/*.jar"/>\r
+        </copy>        \r
+    </target>\r
+    \r
+    <target name="config" description="">\r
+        <exec executable="echo">\r
+                       <arg value="Installer: Executing CollectionSpace Service's &apos;config&apos; target." />\r
+                               </exec>\r
+    </target>    \r
 \r
     <!-- this target is called in order based on the dependencies between the services -->\r
-    <target name="setup" description="">\r
+    <target name="predeploy" description="">\r
         <exec executable="echo">\r
-                       <arg value="Installer: Executing services &apos;setup&apos; target." />\r
+                       <arg value="Installer: Executing services &apos;predeploy&apos; target." />\r
                                </exec>         \r
 <!--\r
         <ant antfile="common/build.xml" target="setup" inheritAll="false"/>\r
         <ant antfile="authentication/build.xml" target="setup" inheritAll="false"/>\r
         <ant antfile="relation/build.xml" target="setup" inheritAll="false"/>\r
 -->        \r
-        <ant antfile="id/build.xml" target="setup" inheritAll="false"/>\r
-        <ant antfile="collectionobject/build.xml" target="setup" inheritAll="false"/>\r
-        <ant antfile="vocabulary/build.xml" target="setup" inheritAll="false"/>\r
+        <ant antfile="id/build.xml" target="predeploy" inheritAll="false"/>\r
+        <ant antfile="collectionobject/build.xml" target="predeploy" inheritAll="false"/>\r
+        <ant antfile="vocabulary/build.xml" target="predeploy" inheritAll="false"/>\r
 <!--        \r
         <ant antfile="intake/build.xml" target="setup" inheritAll="false"/>\r
         <ant antfile="acquisition/build.xml" target="setup" inheritAll="false"/>\r
@@ -35,31 +49,24 @@
 -->        \r
     </target>\r
 \r
-    <!-- this target is called in revese order of deploy targets -->\r
-    <target name="takedown" description="">\r
-        <ant antfile="JaxRsServiceProvider/build.xml" target="takedown" inheritAll="false"/>\r
-        <ant antfile="vocabulary/build.xml" target="takedown" inheritAll="false"/>\r
-        <ant antfile="acquisition/build.xml" target="takedown" inheritAll="false"/>\r
-        <ant antfile="intake/build.xml" target="takedown" inheritAll="false"/>\r
-        <ant antfile="collectionobject/build.xml" target="takedown" inheritAll="false"/>\r
-        <ant antfile="id/build.xml" target="takedown" inheritAll="false"/>\r
-        <ant antfile="relation/build.xml" target="takedown" inheritAll="false"/>\r
-        <ant antfile="authentication/build.xml" target="takedown" inheritAll="false"/>\r
-        <ant antfile="common/build.xml" target="takedown" inheritAll="false"/>\r
+    <target name="deploy" description="">\r
+        <exec executable="echo">\r
+                       <arg value="Installer: Executing CollectionSpace Service's &apos;deploy&apos; target." />\r
+                               </exec>\r
     </target>\r
 \r
-    <target name="init" description="">\r
+    <target name="postdeploy" description="">\r
         <exec executable="echo">\r
-                       <arg value="Executing installer's services &apos;init&apos; target." />\r
+                       <arg value="Executing CollectionSpace Service's &apos;postdeploy&apos; target." />\r
                                </exec>         \r
 <!--\r
         <ant antfile="common/build.xml" target="setup" inheritAll="false"/>\r
         <ant antfile="authentication/build.xml" target="setup" inheritAll="false"/>\r
         <ant antfile="relation/build.xml" target="setup" inheritAll="false"/>\r
 -->        \r
-        <ant antfile="id/build.xml" target="init" inheritAll="false"/>\r
-        <ant antfile="collectionobject/build.xml" target="init" inheritAll="false"/>\r
-        <ant antfile="vocabulary/build.xml" target="init" inheritAll="false"/>\r
+        <ant antfile="id/build.xml" target="postdeploy" inheritAll="false"/>\r
+        <ant antfile="collectionobject/build.xml" target="postdeploy" inheritAll="false"/>\r
+        <ant antfile="vocabulary/build.xml" target="postdeploy" inheritAll="false"/>\r
 <!--        \r
         <ant antfile="intake/build.xml" target="setup" inheritAll="false"/>\r
         <ant antfile="acquisition/build.xml" target="setup" inheritAll="false"/>\r

diff --git a/services/vocabulary/build.xml b/services/vocabulary/build.xml
index afe421a90cdab3f64c7247f809eea36192455293..f56f37c2e04011aafdff421b528dfc35b2ef4e7f 100644 (file)
--- a/services/vocabulary/build.xml
+++ b/services/vocabulary/build.xml
@@ -43,7 +43,6 @@
         </exec>\r
     </target>\r
 \r
-\r
     <target name="install" depends="package,install-unix,install-windows"\r
   description="Install" />\r
     <target name="install-unix" if="osfamily-unix">\r

diff --git a/services/vocabulary/installer/build.xml b/services/vocabulary/installer/build.xml
new file mode 100644 (file)
index 0000000..3f1251f
--- /dev/null
+++ b/services/vocabulary/installer/build.xml
@@ -0,0 +1,62 @@
+\r
+<project name="vocabulary" default="package" basedir=".">\r
+    <description>\r
+        vocabulary service\r
+    </description>\r
+  <!-- set global properties for this build -->\r
+    <property name="services.trunk" value="../.."/>\r
+    <property file="${services.trunk}/build.properties" />\r
+    <property name="mvn.opts" value="" />\r
+    <property name="src" location="src"/>\r
+\r
+    <condition property="osfamily-unix">\r
+        <os family="unix" />\r
+    </condition>\r
+    <condition property="osfamily-windows">\r
+        <os family="windows" />\r
+    </condition>\r
+    \r
+    <target name="install" description="">\r
+        <exec executable="echo">\r
+                       <arg value="Installer: Executing Vocabulary Service's &apos;install&apos; target." />\r
+                               </exec>\r
+                               <!-- Copy the Nuxeo DocType jar files to the Nuxeo app server domain -->\r
+        <copy todir="${jboss.deploy.nuxeo.system}">\r
+            <fileset file="nuxeo/*.jar"/>\r
+        </copy>                                \r
+    </target>    \r
+\r
+    <target name="config" description="">\r
+        <exec executable="echo">\r
+                       <arg value="Installer: Executing Vocabulary Service's &apos;config&apos; target." />\r
+                               </exec>\r
+    </target>\r
+    \r
+    <target name="predeploy" description="">\r
+        <exec executable="echo">\r
+                       <arg value="Installer: Executing Vocabulary Service's &apos;predeploy&apos; target." />\r
+                               </exec>\r
+    </target>    \r
+    \r
+    <target name="deploy" description="">\r
+        <exec executable="echo">\r
+                       <arg value="Installer: Executing Vocabulary Service's &apos;deploy&apos; target." />\r
+                               </exec>\r
+    </target>\r
+    \r
+    <target name="postdeploy">\r
+        <exec executable="echo">\r
+                       <arg value="Installer: Executing installer's &apos;postdeploy&apos; target for the Vocabulary Service." />\r
+                               </exec>         \r
+        <exec executable="echo">\r
+                       <arg value="Importing necessary vocabularies." />\r
+                               </exec>                         \r
+        <java jar="./init/collectionspace-services-vocabulary-importer-jar-with-dependencies.jar"\r
+               fork="true"\r
+               failonerror="true">\r
+               <arg value="-h"/>\r
+                               </java> \r
+    </target>\r
+    \r
+\r
+</project>\r