From 88baf2315bacdeffd935d51e4675ca448a66f0a3 Mon Sep 17 00:00:00 2001
From: Richard Millet <richard.millet@berkeley.edu>
Date: Fri, 13 Nov 2009 19:35:03 +0000
Subject: [PATCH] CSPACE-575: Adding new "installer" related ant targets,
 scripts, props etc.

---
 3rdparty/build.xml                            | 14 ++--
 3rdparty/nuxeo/build.xml                      | 11 ++-
 build.properties                              |  3 +
 build.xml                                     | 13 +++-
 installer/build.properties                    | 51 ++++++++++++++
 installer/build.xml                           | 50 ++++++++++++++
 services/build.xml                            | 21 ++++++
 services/collectionobject/3rdparty/build.xml  |  5 ++
 .../build.xml                                 |  8 ++-
 services/collectionobject/build.xml           | 13 +++-
 services/collectionobject/installer/build.xml | 41 +++++++++++
 services/id/build.xml                         | 13 +++-
 services/id/installer/build.xml               | 61 ++++++++++++++++
 services/installer/build.xml                  | 69 +++++++++++++++++++
 services/vocabulary/3rdparty/build.xml        |  6 +-
 .../nuxeo-platform-cs-vocabulary/build.xml    |  8 ++-
 services/vocabulary/build.xml                 | 12 +++-
 services/vocabulary/import/build.xml          |  8 ++-
 18 files changed, 383 insertions(+), 24 deletions(-)
 create mode 100644 installer/build.properties
 create mode 100644 installer/build.xml
 create mode 100644 services/collectionobject/installer/build.xml
 create mode 100644 services/id/installer/build.xml
 create mode 100644 services/installer/build.xml

diff --git a/3rdparty/build.xml b/3rdparty/build.xml
index d9def5db0..18747454a 100644
--- a/3rdparty/build.xml
+++ b/3rdparty/build.xml
@@ -23,12 +23,10 @@
         <tstamp/>
     <!-- Create the build directory structure used by compile -->
         <mkdir dir="${build}"/>
-
     </target>
 
-
     <target name="package" depends="package-unix,package-windows"
-  description="Package CollectionSpace Services" />
+  		description="Package CollectionSpace Services" />  		
     <target name="package-unix" if="osfamily-unix">
         <exec executable="mvn" failonerror="true">
             <arg value="package" />
@@ -53,7 +51,7 @@
     </target>
     
     <target name="install" depends="package,install-unix,install-windows"
-  description="Install" />
+    	description="Install" />
     <target name="install-unix" if="osfamily-unix">
         <exec executable="mvn" failonerror="true">
             <arg value="install" />
@@ -78,7 +76,7 @@
     </target>
 
     <target name="clean" depends="clean-unix,clean-windows"
-  description="Delete target directories" >
+    	description="Delete target directories" >
         <delete dir="${build}"/>
     </target>
     <target name="clean-unix" if="osfamily-unix">
@@ -113,17 +111,17 @@
     </target>
 
     <target name="deploy" depends="package"
-    description="deploy 3rdparty in ${jboss.server.cspace}">
+    	description="deploy 3rdparty in ${jboss.server.cspace}">
         <ant antfile="nuxeo/build.xml" target="deploy" inheritall="false"/>
     </target>
 
     <target name="undeploy"
-    description="undeploy 3rdparty from ${jboss.server.cspace}">
+    	description="undeploy 3rdparty from ${jboss.server.cspace}">
         <ant antfile="nuxeo/build.xml" target="undeploy" inheritall="false"/>
     </target>
 
     <target name="dist"
-    description="generate distribution for 3rdparty">
+    	description="generate distribution for 3rdparty">
         <ant antfile="nuxeo/build.xml" target="dist" inheritall="false"/>
     </target>
 
diff --git a/3rdparty/nuxeo/build.xml b/3rdparty/nuxeo/build.xml
index bd277ae16..3998dcfd5 100644
--- a/3rdparty/nuxeo/build.xml
+++ b/3rdparty/nuxeo/build.xml
@@ -26,9 +26,8 @@
 
     </target>
 
-
     <target name="package" depends="package-unix,package-windows"
-  description="Package CollectionSpace Services" />
+    	description="Package CollectionSpace Services" />
     <target name="package-unix" if="osfamily-unix">
         <exec executable="mvn" failonerror="true">
             <arg value="package" />
@@ -53,7 +52,7 @@
     </target>
 
     <target name="install" depends="package,install-unix,install-windows"
-  description="Install" />
+    	description="Install" />
     <target name="install-unix" if="osfamily-unix">
         <exec executable="mvn" failonerror="true">
             <arg value="install" />
@@ -78,7 +77,7 @@
     </target>
 
     <target name="clean" depends="clean-unix,clean-windows"
-  description="Delete target directories" >
+    	description="Delete target directories" >
         <delete dir="${build}"/>
     </target>
     <target name="clean-unix" if="osfamily-unix">
@@ -113,7 +112,7 @@
     </target>
 
     <target name="deploy" depends="package"
-    description="deploy nuxeo client libs to ${jboss.server.cspace}">
+    	description="deploy nuxeo client libs to ${jboss.server.cspace}">
         <copy todir="${jboss.server.cspace}/nuxeo-client/lib">
             <fileset dir="${basedir}/nuxeo-client/lib">
                 <include name="*.jar"/>
@@ -130,7 +129,7 @@
     </target>
 
     <target name="dist"
-    description="generate distribution for nuxeo client libs" depends="package">
+    	description="generate distribution for nuxeo client libs" depends="package">
         <copy todir="${services.trunk}/${dist.server.cspace}/nuxeo-client">
             <fileset dir="${basedir}/nuxeo-client"/>
         </copy>
diff --git a/build.properties b/build.properties
index 7d84abde8..4479f23b1 100644
--- a/build.properties
+++ b/build.properties
@@ -16,6 +16,9 @@ nuxeo.system=${nuxeo.ear}/system
 dist=dist
 dist.cspace=${dist}/cspace
 dist.nuxeo=${dist}/nuxeo
+dist.installer=${dist}/installer
+dist.installer.services=${dist.installer}/services
+
 
 #dist cspace domain
 dist.domain.cspace=${domain.cspace}
diff --git a/build.xml b/build.xml
index 5c3c0d670..75e1ea890 100644
--- a/build.xml
+++ b/build.xml
@@ -28,10 +28,12 @@
     description="generate cspace service distribution">
         <!-- Create the distribution directory -->
         <mkdir dir="${basedir}/dist"/>
+        
         <!-- copy db scripts, etc. -->
         <copy todir="${basedir}/${dist.server.cspace}/cspace/services">
             <fileset dir="${src}/main/resources/scripts"/>
         </copy>
+        
         <!-- copy datasources -->
         <copy todir="${basedir}/${dist.deploy.cspace}">
             <fileset dir="${src}/main/resources/config"/>
@@ -203,7 +205,7 @@
         <sql driver="com.mysql.jdbc.Driver"
         url="jdbc:mysql://localhost:3306/cspace"
         userid="root"
-        password="admin"
+        password=""
         src="${db.script.dir}/init_db.sql"
         >
             <classpath>
@@ -261,5 +263,14 @@
         </exec>
     </target>
 
+    <target name="dist_installer" depends="package"
+    	description="Installer: Creates an installer distribution for the CollectionSpace services.">
+        <!-- copy install scripts, etc. -->
+        <copy todir="${basedir}/${dist.installer}">
+            <fileset dir="installer"/>
+            <fileset dir="${src}/main/resources/scripts"/>            
+        </copy>
+        <ant antfile="services/build.xml" target="dist_installer" inheritAll="false"/>
+    </target>
 
 </project>
diff --git a/installer/build.properties b/installer/build.properties
new file mode 100644
index 000000000..770a857b1
--- /dev/null
+++ b/installer/build.properties
@@ -0,0 +1,51 @@
+#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
new file mode 100644
index 000000000..137fb3b2d
--- /dev/null
+++ b/installer/build.xml
@@ -0,0 +1,50 @@
+
+<project name="trunk-install" default="package" basedir=".">
+    <description>
+        collectionspace services
+    </description>
+  <!-- set global properties for this build -->
+    <property file="build.properties" />
+    <property name="src" location="src"/>
+
+    <property name="db" value="mysql"/>
+    <property name="db.script.dir" location="${basedir}/db/${db}"/>
+
+    <condition property="osfamily-unix">
+        <os family="unix" />
+    </condition>
+    <condition property="osfamily-windows">
+        <os family="windows" />
+    </condition>
+    
+    <target name="setup">
+        <exec executable="echo">
+        		<arg value="Executing installer's &apos;setup&apos; target." />
+				</exec>
+				
+        <exec executable="echo">
+        		<arg value="Creating necessary databases and associated users and privileges." />
+				</exec>
+        <sql driver="com.mysql.jdbc.Driver"
+        url="jdbc:mysql://localhost:3306/cspace"
+        userid="root"
+        password="admin"
+        src="${db.script.dir}/init_db.sql">
+            <classpath>
+                <pathelement path="${jboss.lib.cspace}/mysql-connector-java-5.1.7-bin.jar"/>
+            </classpath>
+        </sql>
+				
+				<!-- Now, invoke the "setup" target on each of the services' install directories -->
+        <ant antfile="services/build.xml" target="setup" inheritAll="false"/>        	
+    </target>
+    	
+    <target name="init">
+        <exec executable="echo">
+        		<arg value="Executing installer's &apos;init&apos; target." />
+				</exec>
+				<!-- Now, invoke the "setup" target on each of the services' install directories -->
+        <ant antfile="services/build.xml" target="init" inheritAll="false"/>        	
+    </target>
+
+</project>
diff --git a/services/build.xml b/services/build.xml
index 754802ca1..3902c2ecb 100644
--- a/services/build.xml
+++ b/services/build.xml
@@ -150,6 +150,27 @@
         <ant antfile="acquisition/build.xml" target="dist" inheritAll="false"/>
         <ant antfile="JaxRsServiceProvider/build.xml" target="dist" inheritAll="false"/>
     </target>
+    
+    <!-- this target is called in order based on the dependencies between the services -->
+    <target name="dist_installer"
+    	description="create distribution for CollectionSpace installer">
+    
+        <!-- copy install scripts, etc. -->
+        <copy todir="${services.trunk}/${dist.installer.services}">
+            <fileset dir="./installer"/>
+        </copy>
+        <ant antfile="id/build.xml" target="dist_installer" inheritAll="false"/>
+        <ant antfile="collectionobject/build.xml" target="dist_installer" inheritAll="false"/>
+        <ant antfile="vocabulary/build.xml" target="dist_installer" inheritAll="false"/>    
+<!--
+        <ant antfile="common/build.xml" target="dist_installer" inheritAll="false"/>
+        <ant antfile="authentication/build.xml" target="dist_installer" inheritAll="false"/>
+        <ant antfile="relation/build.xml" target="dist_installer" inheritAll="false"/>
+        <ant antfile="intake/build.xml" target="dist_installer" inheritAll="false"/>
+        <ant antfile="acquisition/build.xml" target="dist_installer" inheritAll="false"/>
+        <ant antfile="JaxRsServiceProvider/build.xml" target="dist_installer" inheritAll="false"/>
+-->        
+    </target>    
 
     
 </project>
diff --git a/services/collectionobject/3rdparty/build.xml b/services/collectionobject/3rdparty/build.xml
index 6dfe3159f..279358882 100644
--- 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"/>
     </target>
 
+    <target name="dist_installer"
+    description="generate distribution for collectionobject" depends="package">
+        <ant antfile="nuxeo-platform-cs-collectionobject/build.xml" target="dist_installer" inheritall="false"/>
+    </target>
+
 </project>
diff --git a/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/build.xml b/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/build.xml
index 543a96a64..b335dec26 100644
--- 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>
 
     <target name="dist"
-    description="generate distribution for collectionobject doctype" depends="package">
+    	description="generate distribution for collectionobject doctype" depends="package">
         <copy todir="${services.trunk}/${dist.deploy.nuxeo.system}">
             <fileset file="${basedir}/target/${nuxeo.collectionobject.jar}"/>
         </copy>
     </target>
 
+    <target name="dist_installer"
+    	description="Creates an installer distribution for CollectionObject doctype" depends="package">
+        <copy todir="${services.trunk}/${dist.installer.services}/collectionobject/nuxeo">
+            <fileset file="${basedir}/target/${nuxeo.collectionobject.jar}"/>
+        </copy>
+    </target>
 </project>
diff --git a/services/collectionobject/build.xml b/services/collectionobject/build.xml
index 8219b1980..95d4e3f06 100644
--- a/services/collectionobject/build.xml
+++ b/services/collectionobject/build.xml
@@ -116,8 +116,19 @@
     </target>
 
     <target name="dist" depends="package"
-    description="distribute collectionobject service}">
+    	description="distribute collectionobject service}">
         <ant antfile="3rdparty/build.xml" target="dist" inheritall="false"/>
     </target>
+        
+		<!-- Creates a distribution of artifacts for the installer. -->        
+    <target name="dist_installer" depends="package"
+    	description="Creates a distribution of artifacts for the installer.">
+
+        <!-- copy install scripts, etc. -->
+        <copy todir="${services.trunk}/${dist.installer.services}/collectionobject">
+            <fileset dir="./installer"/>
+        </copy>    
+        <ant antfile="3rdparty/build.xml" target="dist_installer" inheritall="false"/>
+    </target>
 
 </project>
diff --git a/services/collectionobject/installer/build.xml b/services/collectionobject/installer/build.xml
new file mode 100644
index 000000000..3e78cfdee
--- /dev/null
+++ b/services/collectionobject/installer/build.xml
@@ -0,0 +1,41 @@
+
+<project name="collectionobject-install" default="package" basedir=".">
+    <description>
+        collectionobject service install
+    </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"/>
+    <property name="build" location="build"/>
+
+    <condition property="osfamily-unix">
+        <os family="unix" />
+    </condition>
+    <condition property="osfamily-windows">
+        <os family="windows" />
+    </condition>
+
+    <target name="setup" description="">
+        <tstamp/>
+        <exec executable="echo">
+        		<arg value="Installer: Executing CollectionObject Service's &apos;setup&apos; target." />
+				</exec>
+    </target>
+
+    <target name="takedown" description="">
+        <tstamp/>
+        <exec executable="echo">
+        		<arg value="Installer: Executing CollectionObject Service's &apos;takedown&apos; target." />
+				</exec>
+    </target>
+    
+    <target name="init" description="">
+        <exec executable="echo">
+        		<arg value="Installer: Executing CollectionObject Service's &apos;init&apos; target." />
+				</exec>    	
+    </target>
+    
+
+</project>
diff --git a/services/id/build.xml b/services/id/build.xml
index 4ea6432b0..56d6c5c28 100644
--- a/services/id/build.xml
+++ b/services/id/build.xml
@@ -7,7 +7,7 @@
     <property name="services.trunk" value="../.."/>
     <property file="${services.trunk}/build.properties" />
     <property name="mvn.opts" value="" />
-    <property name="src" location="src"/>
+    <property name="src" location="service/src"/>
 
     <condition property="osfamily-unix">
         <os family="unix" />
@@ -119,5 +119,16 @@
         <ant antfile="service/build.xml" target="dist" inheritall="false"/>
     </target>
 
+    <target name="dist_installer"
+    	description="generate distribution for id" depends="package">        
+        <!-- copy install scripts, etc. -->
+        <copy todir="${services.trunk}/${dist.installer.services}/id">
+            <fileset dir="${basedir}/installer/"/>
+        </copy>
+        <!-- copy db scripts, etc. -->
+        <copy todir="${services.trunk}/${dist.installer.services}/id/db/mysql">
+            <fileset dir="${src}/main/resources/db/mysql"/>
+        </copy>
+    </target>
 
 </project>
diff --git a/services/id/installer/build.xml b/services/id/installer/build.xml
new file mode 100644
index 000000000..49d993128
--- /dev/null
+++ b/services/id/installer/build.xml
@@ -0,0 +1,61 @@
+
+<project name="id-service-install" default="package" basedir=".">
+    <description>
+        CollectionSpace ID Service Installer Targets
+    </description>
+  <!-- set global properties for this build -->
+    <property file="${basedir}/../../build.properties" />    
+    <property name="src" location="src"/>
+
+    <property name="db" value="mysql"/>
+    <property name="db.script.dir" location="${basedir}/db/${db}"/>
+
+    <condition property="osfamily-unix">
+        <os family="unix" />
+    </condition>
+    <condition property="osfamily-windows">
+        <os family="windows" />
+    </condition>
+
+    <target name="setup">
+        <exec executable="echo">
+        		<arg value="Installer: Executing ID Service's &apos;setup&apos; target for the ID Service." />
+				</exec>
+				
+        <exec executable="echo">
+        		<arg value="Installer: Creating necessary database tables for the ID Service." />
+				</exec>				
+				<!-- Create the tables -->
+        <sql driver="com.mysql.jdbc.Driver"
+					url="jdbc:mysql://localhost:3306/cspace"
+					userid="root"
+					password="admin"
+					src="${db.script.dir}/create_id_generators_table.sql">
+					    <classpath>
+					        <pathelement path="${jboss.lib.cspace}/mysql-connector-java-5.1.7-bin.jar"/>
+					    </classpath>
+        </sql>
+        	
+        <exec executable="echo">
+        		<arg value="Loading tables for the ID Service." />
+				</exec>        	
+				
+				<!-- Load the tables -->
+        <sql driver="com.mysql.jdbc.Driver"
+	        url="jdbc:mysql://localhost:3306/cspace"
+	        userid="root"
+	        password="admin"
+	        src="${db.script.dir}/load_id_generators.sql">
+	            <classpath>
+	                <pathelement path="${jboss.lib.cspace}/mysql-connector-java-5.1.7-bin.jar"/>
+	            </classpath>
+        </sql>        	
+    </target>
+    
+    <target name="init" description="">
+        <exec executable="echo">
+        		<arg value="Installer: Executing ID Service's &apos;init&apos; target." />
+				</exec>
+    </target>
+    
+</project>
diff --git a/services/installer/build.xml b/services/installer/build.xml
new file mode 100644
index 000000000..ef1b6a348
--- /dev/null
+++ b/services/installer/build.xml
@@ -0,0 +1,69 @@
+
+<project name="main-install" basedir=".">
+    <description>
+    </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>
+
+    <!-- this target is called in order based on the dependencies between the services -->
+    <target name="setup" description="">
+        <exec executable="echo">
+        		<arg value="Installer: Executing services &apos;setup&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="intake/build.xml" target="setup" inheritAll="false"/>
+        <ant antfile="acquisition/build.xml" target="setup" inheritAll="false"/>
+        <ant antfile="JaxRsServiceProvider/build.xml" target="setup" inheritAll="false"/>
+-->        
+    </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>
+
+    <target name="init" description="">
+        <exec executable="echo">
+        		<arg value="Executing installer's services &apos;init&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="intake/build.xml" target="setup" inheritAll="false"/>
+        <ant antfile="acquisition/build.xml" target="setup" inheritAll="false"/>
+        <ant antfile="JaxRsServiceProvider/build.xml" target="setup" inheritAll="false"/>
+-->        
+    </target>    
+</project>
diff --git a/services/vocabulary/3rdparty/build.xml b/services/vocabulary/3rdparty/build.xml
index e90233876..18d4c8589 100644
--- a/services/vocabulary/3rdparty/build.xml
+++ b/services/vocabulary/3rdparty/build.xml
@@ -120,6 +120,10 @@
     description="generate distribution for vocabulary" depends="package">
         <ant antfile="nuxeo-platform-cs-vocabulary/build.xml" target="dist" inheritall="false"/>
     </target>
-
+    
+    <target name="dist_installer"
+    description="generate distribution for collectionobject" depends="package">
+        <ant antfile="nuxeo-platform-cs-vocabulary/build.xml" target="dist_installer" inheritall="false"/>
+    </target>
 
 </project>
diff --git a/services/vocabulary/3rdparty/nuxeo-platform-cs-vocabulary/build.xml b/services/vocabulary/3rdparty/nuxeo-platform-cs-vocabulary/build.xml
index 6697211c2..8688b0801 100644
--- 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 2cddc446a..afe421a90 100644
--- a/services/vocabulary/build.xml
+++ b/services/vocabulary/build.xml
@@ -118,7 +118,17 @@
         description="distribute vocabulary service">
         <ant antfile="3rdparty/build.xml" target="dist" inheritall="false"/>        
         <ant antfile="client/build.xml" target="dist" inheritall="false"/>
-        
+        <ant antfile="import/build.xml" target="dist" inheritall="false"/>        
+    </target>
+
+    <target name="dist_installer" depends="package"
+        description="distribute vocabulary service">        
+        <!-- copy install scripts, etc. -->
+        <copy todir="${services.trunk}/${dist.installer.services}/vocabulary">
+            <fileset dir="${basedir}/installer/"/>
+        </copy>        
+        <ant antfile="3rdparty/build.xml" target="dist_installer" inheritall="false"/>        
+        <ant antfile="import/build.xml" target="dist_installer" inheritall="false"/>        
     </target>
 
 </project>
diff --git a/services/vocabulary/import/build.xml b/services/vocabulary/import/build.xml
index 68ffaf921..75761ad0d 100644
--- a/services/vocabulary/import/build.xml
+++ b/services/vocabulary/import/build.xml
@@ -45,14 +45,16 @@
 
     <target name="dist" depends="package"
     	description="distribute vocabulary service importer tool">
-        
+    </target>
+
+    <target name="dist_installer" depends="package"
+    	description="distribute vocabulary service importer tool">        
         <!-- copy install scripts, etc. -->
-        <copy todir="${services.trunk}/dist/install/services/vocabulary/init">
+        <copy todir="${services.trunk}/${dist.installer.services}/vocabulary/init">
             <fileset dir="${basedir}/target">
             	<include name="*with-dependencies*.jar"/>
             </fileset>
         </copy>
-        
     </target>
 
 </project>
-- 
2.47.3