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

diff --git a/3rdparty/build.xml b/3rdparty/build.xml
index d9def5db098a8510b3db5223df54980a180363fc..18747454a53df87a5f117891d750568d2f07ff4a 100644 (file)
--- a/3rdparty/build.xml
+++ b/3rdparty/build.xml
@@ -23,12 +23,10 @@
         <tstamp/>\r
     <!-- Create the build directory structure used by compile -->\r
         <mkdir dir="${build}"/>\r
-\r
     </target>\r
 \r
-\r
     <target name="package" depends="package-unix,package-windows"\r
-  description="Package CollectionSpace Services" />\r
+               description="Package CollectionSpace Services" />               \r
     <target name="package-unix" if="osfamily-unix">\r
         <exec executable="mvn" failonerror="true">\r
             <arg value="package" />\r
@@ -53,7 +51,7 @@
     </target>\r
     \r
     <target name="install" depends="package,install-unix,install-windows"\r
-  description="Install" />\r
+       description="Install" />\r
     <target name="install-unix" if="osfamily-unix">\r
         <exec executable="mvn" failonerror="true">\r
             <arg value="install" />\r
@@ -78,7 +76,7 @@
     </target>\r
 \r
     <target name="clean" depends="clean-unix,clean-windows"\r
-  description="Delete target directories" >\r
+       description="Delete target directories" >\r
         <delete dir="${build}"/>\r
     </target>\r
     <target name="clean-unix" if="osfamily-unix">\r
@@ -113,17 +111,17 @@
     </target>\r
 \r
     <target name="deploy" depends="package"\r
-    description="deploy 3rdparty in ${jboss.server.cspace}">\r
+       description="deploy 3rdparty in ${jboss.server.cspace}">\r
         <ant antfile="nuxeo/build.xml" target="deploy" inheritall="false"/>\r
     </target>\r
 \r
     <target name="undeploy"\r
-    description="undeploy 3rdparty from ${jboss.server.cspace}">\r
+       description="undeploy 3rdparty from ${jboss.server.cspace}">\r
         <ant antfile="nuxeo/build.xml" target="undeploy" inheritall="false"/>\r
     </target>\r
 \r
     <target name="dist"\r
-    description="generate distribution for 3rdparty">\r
+       description="generate distribution for 3rdparty">\r
         <ant antfile="nuxeo/build.xml" target="dist" inheritall="false"/>\r
     </target>\r
 \r

diff --git a/3rdparty/nuxeo/build.xml b/3rdparty/nuxeo/build.xml
index bd277ae1612cdcbad373c915027cefa73665f448..3998dcfd5827bbb63b8553e3e8624bb653f12571 100644 (file)
--- a/3rdparty/nuxeo/build.xml
+++ b/3rdparty/nuxeo/build.xml
@@ -26,9 +26,8 @@
 \r
     </target>\r
 \r
-\r
     <target name="package" depends="package-unix,package-windows"\r
-  description="Package CollectionSpace Services" />\r
+       description="Package CollectionSpace Services" />\r
     <target name="package-unix" if="osfamily-unix">\r
         <exec executable="mvn" failonerror="true">\r
             <arg value="package" />\r
@@ -53,7 +52,7 @@
     </target>\r
 \r
     <target name="install" depends="package,install-unix,install-windows"\r
-  description="Install" />\r
+       description="Install" />\r
     <target name="install-unix" if="osfamily-unix">\r
         <exec executable="mvn" failonerror="true">\r
             <arg value="install" />\r
@@ -78,7 +77,7 @@
     </target>\r
 \r
     <target name="clean" depends="clean-unix,clean-windows"\r
-  description="Delete target directories" >\r
+       description="Delete target directories" >\r
         <delete dir="${build}"/>\r
     </target>\r
     <target name="clean-unix" if="osfamily-unix">\r
@@ -113,7 +112,7 @@
     </target>\r
 \r
     <target name="deploy" depends="package"\r
-    description="deploy nuxeo client libs to ${jboss.server.cspace}">\r
+       description="deploy nuxeo client libs to ${jboss.server.cspace}">\r
         <copy todir="${jboss.server.cspace}/nuxeo-client/lib">\r
             <fileset dir="${basedir}/nuxeo-client/lib">\r
                 <include name="*.jar"/>\r
@@ -130,7 +129,7 @@
     </target>\r
 \r
     <target name="dist"\r
-    description="generate distribution for nuxeo client libs" depends="package">\r
+       description="generate distribution for nuxeo client libs" depends="package">\r
         <copy todir="${services.trunk}/${dist.server.cspace}/nuxeo-client">\r
             <fileset dir="${basedir}/nuxeo-client"/>\r
         </copy>\r

diff --git a/build.properties b/build.properties
index 7d84abde8b63889ed02c21d69b5bea0916ca51d5..4479f23b1e0d0b6d17c95691d8d814b938c5d2a0 100644 (file)
--- a/build.properties
+++ b/build.properties
@@ -16,6 +16,9 @@ nuxeo.system=${nuxeo.ear}/system
 dist=dist\r
 dist.cspace=${dist}/cspace\r
 dist.nuxeo=${dist}/nuxeo\r
+dist.installer=${dist}/installer\r
+dist.installer.services=${dist.installer}/services\r
+\r
 \r
 #dist cspace domain\r
 dist.domain.cspace=${domain.cspace}\r

diff --git a/build.xml b/build.xml
index 5c3c0d670eec6caf5abb6893431bdf8cf8ada7df..75e1ea8909e2ea8fc3f1f40c9dc0e738497b0d79 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -28,10 +28,12 @@
     description="generate cspace service distribution">\r
         <!-- Create the distribution directory -->\r
         <mkdir dir="${basedir}/dist"/>\r
+        \r
         <!-- copy db scripts, etc. -->\r
         <copy todir="${basedir}/${dist.server.cspace}/cspace/services">\r
             <fileset dir="${src}/main/resources/scripts"/>\r
         </copy>\r
+        \r
         <!-- copy datasources -->\r
         <copy todir="${basedir}/${dist.deploy.cspace}">\r
             <fileset dir="${src}/main/resources/config"/>\r
@@ -203,7 +205,7 @@
         <sql driver="com.mysql.jdbc.Driver"\r
         url="jdbc:mysql://localhost:3306/cspace"\r
         userid="root"\r
-        password="admin"\r
+        password=""\r
         src="${db.script.dir}/init_db.sql"\r
         >\r
             <classpath>\r
@@ -261,5 +263,14 @@
         </exec>\r
     </target>\r
 \r
+    <target name="dist_installer" depends="package"\r
+       description="Installer: Creates an installer distribution for the CollectionSpace services.">\r
+        <!-- copy install scripts, etc. -->\r
+        <copy todir="${basedir}/${dist.installer}">\r
+            <fileset dir="installer"/>\r
+            <fileset dir="${src}/main/resources/scripts"/>            \r
+        </copy>\r
+        <ant antfile="services/build.xml" target="dist_installer" inheritAll="false"/>\r
+    </target>\r
 \r
 </project>\r

diff --git a/installer/build.properties b/installer/build.properties
new file mode 100644 (file)
index 0000000..770a857
--- /dev/null
+++ b/installer/build.properties
@@ -0,0 +1,51 @@
+#cspace\r
+cspace.release=0.2\r
+cspace.services.release=cspace-services-${cspace.release}\r
+cspace.services.war=cspace-services.war\r
+domain.cspace=cspace\r
+domain.nuxeo=default\r
+\r
+#nuxeo\r
+#nuxeo.release=5.2.M4\r
+nuxeo.release=5.2.GA\r
+nuxeo.ear=nuxeo.ear\r
+nuxeo.system=${nuxeo.ear}/system\r
+\r
+#distribution\r
+dist=dist\r
+dist.cspace=${dist}/cspace\r
+dist.nuxeo=${dist}/nuxeo\r
+\r
+#dist cspace domain\r
+dist.domain.cspace=${domain.cspace}\r
+dist.server.cspace=${dist.cspace}/server/${jboss.domain.cspace}\r
+dist.deploy.cspace=${dist.server.cspace}/deploy\r
+dist.lib.cspace=${dist.server.cspace}/lib\r
+\r
+#dist nuxeo domain\r
+dist.domain.nuxeo=${domain.nuxeo}\r
+dist.server.nuxeo=${dist.nuxeo}/server/${jboss.domain.nuxeo}\r
+dist.deploy.nuxeo=${dist.server.nuxeo}/deploy\r
+dist.lib.nuxeo=${dist.server.nuxeo}/lib\r
+dist.deploy.nuxeo.system=${dist.deploy.nuxeo}/${nuxeo.system}\r
+\r
+#jboss\r
+#assumption: both nuxeo and cspace domains are using the same JBoss installation\r
+jboss.release=jboss-4.2.3.GA\r
+jboss.dir=C:/dev/${jboss.release}\r
+jboss.home=${jboss.dir}\r
+\r
+#jboss cspace domain\r
+jboss.domain.cspace=${domain.cspace}\r
+jboss.server.cspace=${jboss.home}/server/${jboss.domain.cspace}\r
+jboss.deploy.cspace=${jboss.server.cspace}/deploy\r
+jboss.lib.cspace=${jboss.server.cspace}/lib\r
+jboss.deploy.cspace.services=${jboss.server.cspace}/deploy/${cspace.services.war}\r
+\r
+#jboss nuxeo domain\r
+jboss.domain.nuxeo=${domain.nuxeo}\r
+jboss.server.nuxeo=${jboss.home}/server/${jboss.domain.nuxeo}\r
+jboss.deploy.nuxeo=${jboss.server.nuxeo}/deploy\r
+jboss.lib.nuxeo=${jboss.server.nuxeo}/lib\r
+jboss.deploy.nuxeo.system=${jboss.deploy.nuxeo}/${nuxeo.system}\r
+\r

diff --git a/installer/build.xml b/installer/build.xml
new file mode 100644 (file)
index 0000000..137fb3b
--- /dev/null
+++ b/installer/build.xml
@@ -0,0 +1,50 @@
+\r
+<project name="trunk-install" default="package" basedir=".">\r
+    <description>\r
+        collectionspace services\r
+    </description>\r
+  <!-- set global properties for this build -->\r
+    <property file="build.properties" />\r
+    <property name="src" location="src"/>\r
+\r
+    <property name="db" value="mysql"/>\r
+    <property name="db.script.dir" location="${basedir}/db/${db}"/>\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="setup">\r
+        <exec executable="echo">\r
+                       <arg value="Executing installer's &apos;setup&apos; target." />\r
+                               </exec>\r
+                               \r
+        <exec executable="echo">\r
+                       <arg value="Creating necessary databases and associated users and privileges." />\r
+                               </exec>\r
+        <sql driver="com.mysql.jdbc.Driver"\r
+        url="jdbc:mysql://localhost:3306/cspace"\r
+        userid="root"\r
+        password="admin"\r
+        src="${db.script.dir}/init_db.sql">\r
+            <classpath>\r
+                <pathelement path="${jboss.lib.cspace}/mysql-connector-java-5.1.7-bin.jar"/>\r
+            </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
+    </target>\r
+       \r
+    <target name="init">\r
+        <exec executable="echo">\r
+                       <arg value="Executing installer's &apos;init&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
+    </target>\r
+\r
+</project>\r

diff --git a/services/build.xml b/services/build.xml
index 754802ca14391a71adfd120788a202b27b5f655a..3902c2ecb3de19b2c4cbee2fe446e71af668de10 100644 (file)
--- a/services/build.xml
+++ b/services/build.xml
@@ -150,6 +150,27 @@
         <ant antfile="acquisition/build.xml" target="dist" inheritAll="false"/>\r
         <ant antfile="JaxRsServiceProvider/build.xml" target="dist" inheritAll="false"/>\r
     </target>\r
+    \r
+    <!-- this target is called in order based on the dependencies between the services -->\r
+    <target name="dist_installer"\r
+       description="create distribution for CollectionSpace installer">\r
+    \r
+        <!-- copy install scripts, etc. -->\r
+        <copy todir="${services.trunk}/${dist.installer.services}">\r
+            <fileset dir="./installer"/>\r
+        </copy>\r
+        <ant antfile="id/build.xml" target="dist_installer" inheritAll="false"/>\r
+        <ant antfile="collectionobject/build.xml" target="dist_installer" inheritAll="false"/>\r
+        <ant antfile="vocabulary/build.xml" target="dist_installer" inheritAll="false"/>    \r
+<!--\r
+        <ant antfile="common/build.xml" target="dist_installer" inheritAll="false"/>\r
+        <ant antfile="authentication/build.xml" target="dist_installer" inheritAll="false"/>\r
+        <ant antfile="relation/build.xml" target="dist_installer" inheritAll="false"/>\r
+        <ant antfile="intake/build.xml" target="dist_installer" inheritAll="false"/>\r
+        <ant antfile="acquisition/build.xml" target="dist_installer" inheritAll="false"/>\r
+        <ant antfile="JaxRsServiceProvider/build.xml" target="dist_installer" inheritAll="false"/>\r
+-->        \r
+    </target>    \r
 \r
     \r
 </project>\r

diff --git a/services/collectionobject/3rdparty/build.xml b/services/collectionobject/3rdparty/build.xml
index 6dfe3159f4f2071f335d32e6d7b5713c03c5e15b..2793588820e7a0e1a84c7714040babd4a1a7f7cb 100644 (file)
--- a/services/collectionobject/3rdparty/build.xml
+++ b/services/collectionobject/3rdparty/build.xml
@@ -123,4 +123,9 @@
         <ant antfile="nuxeo-platform-cs-collectionobject/build.xml" target="dist" inheritall="false"/>\r
     </target>\r
 \r
+    <target name="dist_installer"\r
+    description="generate distribution for collectionobject" depends="package">\r
+        <ant antfile="nuxeo-platform-cs-collectionobject/build.xml" target="dist_installer" inheritall="false"/>\r
+    </target>\r
+\r
 </project>\r

diff --git a/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/build.xml b/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/build.xml
index 543a96a640e1112d3681703eee72fc19bccb67a9..b335dec262065478242385ca163de8f596b049ad 100644 (file)
--- a/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/build.xml
+++ b/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/build.xml
@@ -124,10 +124,16 @@
     </target>\r
 \r
     <target name="dist"\r
-    description="generate distribution for collectionobject doctype" depends="package">\r
+       description="generate distribution for collectionobject doctype" depends="package">\r
         <copy todir="${services.trunk}/${dist.deploy.nuxeo.system}">\r
             <fileset file="${basedir}/target/${nuxeo.collectionobject.jar}"/>\r
         </copy>\r
     </target>\r
 \r
+    <target name="dist_installer"\r
+       description="Creates an installer distribution for CollectionObject doctype" depends="package">\r
+        <copy todir="${services.trunk}/${dist.installer.services}/collectionobject/nuxeo">\r
+            <fileset file="${basedir}/target/${nuxeo.collectionobject.jar}"/>\r
+        </copy>\r
+    </target>\r
 </project>\r

diff --git a/services/collectionobject/build.xml b/services/collectionobject/build.xml
index 8219b198010ee548bb1b352669cd11d6d997ac44..95d4e3f062d278fcbc2b4e656dd5250679822238 100644 (file)
--- a/services/collectionobject/build.xml
+++ b/services/collectionobject/build.xml
@@ -116,8 +116,19 @@
     </target>\r
 \r
     <target name="dist" depends="package"\r
-    description="distribute collectionobject service}">\r
+       description="distribute collectionobject service}">\r
         <ant antfile="3rdparty/build.xml" target="dist" inheritall="false"/>\r
     </target>\r
+        \r
+               <!-- Creates a distribution of artifacts for the installer. -->        \r
+    <target name="dist_installer" depends="package"\r
+       description="Creates a distribution of artifacts for the installer.">\r
+\r
+        <!-- copy install scripts, etc. -->\r
+        <copy todir="${services.trunk}/${dist.installer.services}/collectionobject">\r
+            <fileset dir="./installer"/>\r
+        </copy>    \r
+        <ant antfile="3rdparty/build.xml" target="dist_installer" inheritall="false"/>\r
+    </target>\r
 \r
 </project>\r

diff --git a/services/collectionobject/installer/build.xml b/services/collectionobject/installer/build.xml
new file mode 100644 (file)
index 0000000..3e78cfd
--- /dev/null
+++ b/services/collectionobject/installer/build.xml
@@ -0,0 +1,41 @@
+\r
+<project name="collectionobject-install" default="package" basedir=".">\r
+    <description>\r
+        collectionobject service install\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
+    <property name="build" location="build"/>\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="setup" description="">\r
+        <tstamp/>\r
+        <exec executable="echo">\r
+                       <arg value="Installer: Executing CollectionObject Service's &apos;setup&apos; target." />\r
+                               </exec>\r
+    </target>\r
+\r
+    <target name="takedown" description="">\r
+        <tstamp/>\r
+        <exec executable="echo">\r
+                       <arg value="Installer: Executing CollectionObject Service's &apos;takedown&apos; target." />\r
+                               </exec>\r
+    </target>\r
+    \r
+    <target name="init" description="">\r
+        <exec executable="echo">\r
+                       <arg value="Installer: Executing CollectionObject Service's &apos;init&apos; target." />\r
+                               </exec>         \r
+    </target>\r
+    \r
+\r
+</project>\r

diff --git a/services/id/build.xml b/services/id/build.xml
index 4ea6432b03bfa94b07d0910275f37f5ff48f8a9e..56d6c5c28438cbc0eb62bf5ae58f658161727709 100644 (file)
--- a/services/id/build.xml
+++ b/services/id/build.xml
@@ -7,7 +7,7 @@
     <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
+    <property name="src" location="service/src"/>\r
 \r
     <condition property="osfamily-unix">\r
         <os family="unix" />\r
@@ -119,5 +119,16 @@
         <ant antfile="service/build.xml" target="dist" inheritall="false"/>\r
     </target>\r
 \r
+    <target name="dist_installer"\r
+       description="generate distribution for id" depends="package">        \r
+        <!-- copy install scripts, etc. -->\r
+        <copy todir="${services.trunk}/${dist.installer.services}/id">\r
+            <fileset dir="${basedir}/installer/"/>\r
+        </copy>\r
+        <!-- copy db scripts, etc. -->\r
+        <copy todir="${services.trunk}/${dist.installer.services}/id/db/mysql">\r
+            <fileset dir="${src}/main/resources/db/mysql"/>\r
+        </copy>\r
+    </target>\r
 \r
 </project>\r

diff --git a/services/id/installer/build.xml b/services/id/installer/build.xml
new file mode 100644 (file)
index 0000000..49d9931
--- /dev/null
+++ b/services/id/installer/build.xml
@@ -0,0 +1,61 @@
+\r
+<project name="id-service-install" default="package" basedir=".">\r
+    <description>\r
+        CollectionSpace ID Service Installer Targets\r
+    </description>\r
+  <!-- set global properties for this build -->\r
+    <property file="${basedir}/../../build.properties" />    \r
+    <property name="src" location="src"/>\r
+\r
+    <property name="db" value="mysql"/>\r
+    <property name="db.script.dir" location="${basedir}/db/${db}"/>\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="setup">\r
+        <exec executable="echo">\r
+                       <arg value="Installer: Executing ID Service's &apos;setup&apos; target for the ID Service." />\r
+                               </exec>\r
+                               \r
+        <exec executable="echo">\r
+                       <arg value="Installer: Creating necessary database tables for the ID Service." />\r
+                               </exec>                         \r
+                               <!-- Create the tables -->\r
+        <sql driver="com.mysql.jdbc.Driver"\r
+                                       url="jdbc:mysql://localhost:3306/cspace"\r
+                                       userid="root"\r
+                                       password="admin"\r
+                                       src="${db.script.dir}/create_id_generators_table.sql">\r
+                                           <classpath>\r
+                                               <pathelement path="${jboss.lib.cspace}/mysql-connector-java-5.1.7-bin.jar"/>\r
+                                           </classpath>\r
+        </sql>\r
+               \r
+        <exec executable="echo">\r
+                       <arg value="Loading tables for the ID Service." />\r
+                               </exec>         \r
+                               \r
+                               <!-- Load the tables -->\r
+        <sql driver="com.mysql.jdbc.Driver"\r
+               url="jdbc:mysql://localhost:3306/cspace"\r
+               userid="root"\r
+               password="admin"\r
+               src="${db.script.dir}/load_id_generators.sql">\r
+                   <classpath>\r
+                       <pathelement path="${jboss.lib.cspace}/mysql-connector-java-5.1.7-bin.jar"/>\r
+                   </classpath>\r
+        </sql>         \r
+    </target>\r
+    \r
+    <target name="init" description="">\r
+        <exec executable="echo">\r
+                       <arg value="Installer: Executing ID Service's &apos;init&apos; target." />\r
+                               </exec>\r
+    </target>\r
+    \r
+</project>\r

diff --git a/services/installer/build.xml b/services/installer/build.xml
new file mode 100644 (file)
index 0000000..ef1b6a3
--- /dev/null
+++ b/services/installer/build.xml
@@ -0,0 +1,69 @@
+\r
+<project name="main-install" basedir=".">\r
+    <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="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
+    <!-- this target is called in order based on the dependencies between the services -->\r
+    <target name="setup" description="">\r
+        <exec executable="echo">\r
+                       <arg value="Installer: Executing services &apos;setup&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
+<!--        \r
+        <ant antfile="intake/build.xml" target="setup" inheritAll="false"/>\r
+        <ant antfile="acquisition/build.xml" target="setup" inheritAll="false"/>\r
+        <ant antfile="JaxRsServiceProvider/build.xml" target="setup" inheritAll="false"/>\r
+-->        \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>\r
+\r
+    <target name="init" description="">\r
+        <exec executable="echo">\r
+                       <arg value="Executing installer's services &apos;init&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
+<!--        \r
+        <ant antfile="intake/build.xml" target="setup" inheritAll="false"/>\r
+        <ant antfile="acquisition/build.xml" target="setup" inheritAll="false"/>\r
+        <ant antfile="JaxRsServiceProvider/build.xml" target="setup" inheritAll="false"/>\r
+-->        \r
+    </target>    \r
+</project>\r

diff --git a/services/vocabulary/3rdparty/build.xml b/services/vocabulary/3rdparty/build.xml
index e9023387696e6b8a7f2e9bd3179e8309b8462317..18d4c85899d800f7f7668abfef2c5bc89f878068 100644 (file)
--- a/services/vocabulary/3rdparty/build.xml
+++ b/services/vocabulary/3rdparty/build.xml
@@ -120,6 +120,10 @@
     description="generate distribution for vocabulary" depends="package">\r
         <ant antfile="nuxeo-platform-cs-vocabulary/build.xml" target="dist" inheritall="false"/>\r
     </target>\r
-\r
+    \r
+    <target name="dist_installer"\r
+    description="generate distribution for collectionobject" depends="package">\r
+        <ant antfile="nuxeo-platform-cs-vocabulary/build.xml" target="dist_installer" inheritall="false"/>\r
+    </target>\r
 \r
 </project>\r

diff --git a/services/vocabulary/3rdparty/nuxeo-platform-cs-vocabulary/build.xml b/services/vocabulary/3rdparty/nuxeo-platform-cs-vocabulary/build.xml
index 6697211c26ccbba415138c0e65c5e7d40eb7a5fa..8688b08017997fea6bc1dc5f2e9d998dddd6415c 100644 (file)
--- a/services/vocabulary/3rdparty/nuxeo-platform-cs-vocabulary/build.xml
+++ b/services/vocabulary/3rdparty/nuxeo-platform-cs-vocabulary/build.xml
@@ -118,7 +118,6 @@
         <delete file="${jboss.deploy.nuxeo.system}/${nuxeo.vocabulary.jar}"/>
     </target>
 
-
     <target name="dist"
     description="generate distribution for vocabulary doctype" depends="package">
         <copy todir="${services.trunk}/${dist.deploy.nuxeo.system}">
@@ -126,5 +125,12 @@
         </copy>
     </target>
 
+    <target name="dist_installer"
+       description="Creates an installer distribution for Vocabulary doctype" depends="package">
+        <copy todir="${services.trunk}/${dist.installer.services}/vocabulary/nuxeo">
+            <fileset file="${basedir}/target/${nuxeo.vocabulary.jar}"/>
+        </copy>
+    </target>
+
 </project>
 

diff --git a/services/vocabulary/build.xml b/services/vocabulary/build.xml
index 2cddc446aa74d6509a3037dddb7bd162c604d81d..afe421a90cdab3f64c7247f809eea36192455293 100644 (file)
--- a/services/vocabulary/build.xml
+++ b/services/vocabulary/build.xml
@@ -118,7 +118,17 @@
         description="distribute vocabulary service">\r
         <ant antfile="3rdparty/build.xml" target="dist" inheritall="false"/>        \r
         <ant antfile="client/build.xml" target="dist" inheritall="false"/>\r
-        \r
+        <ant antfile="import/build.xml" target="dist" inheritall="false"/>        \r
+    </target>\r
+\r
+    <target name="dist_installer" depends="package"\r
+        description="distribute vocabulary service">        \r
+        <!-- copy install scripts, etc. -->\r
+        <copy todir="${services.trunk}/${dist.installer.services}/vocabulary">\r
+            <fileset dir="${basedir}/installer/"/>\r
+        </copy>        \r
+        <ant antfile="3rdparty/build.xml" target="dist_installer" inheritall="false"/>        \r
+        <ant antfile="import/build.xml" target="dist_installer" inheritall="false"/>        \r
     </target>\r
 \r
 </project>\r

diff --git a/services/vocabulary/import/build.xml b/services/vocabulary/import/build.xml
index 68ffaf92182d09b7676a9fb4c17480b11ece6963..75761ad0d923b8289b4224511805cace725b8501 100644 (file)
--- a/services/vocabulary/import/build.xml
+++ b/services/vocabulary/import/build.xml
@@ -45,14 +45,16 @@
 \r
     <target name="dist" depends="package"\r
        description="distribute vocabulary service importer tool">\r
-        \r
+    </target>\r
+\r
+    <target name="dist_installer" depends="package"\r
+       description="distribute vocabulary service importer tool">        \r
         <!-- copy install scripts, etc. -->\r
-        <copy todir="${services.trunk}/dist/install/services/vocabulary/init">\r
+        <copy todir="${services.trunk}/${dist.installer.services}/vocabulary/init">\r
             <fileset dir="${basedir}/target">\r
                <include name="*with-dependencies*.jar"/>\r
             </fileset>\r
         </copy>\r
-        \r
     </target>\r
 \r
 </project>\r