CSPACE-557 deploy target now depends upon install instead of package. This is possibl...

M    build.xml
M    services/authentication/service/build.xml
M    services/authentication/build.xml
M    services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/build.xml
M    services/collectionobject/3rdparty/build.xml
M    services/collectionobject/build.xml
M    services/JaxRsServiceProvider/build.xml
M    services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/build.xml
M    services/acquisition/3rdparty/build.xml
M    services/acquisition/build.xml
M    services/common/build.xml
M    services/id/build.xml
M    services/build.xml
M    services/vocabulary/3rdparty/nuxeo-platform-cs-vocabulary/build.xml
M    services/vocabulary/3rdparty/build.xml
M    services/vocabulary/build.xml
M    services/intake/3rdparty/nuxeo-platform-cs-intake/build.xml
M    services/intake/3rdparty/build.xml
M    services/intake/build.xml
M    services/relation/3rdparty/nuxeo-platform-cs-relation/build.xml
M    services/relation/3rdparty/build.xml
M    services/relation/build.xml

diff --git a/build.xml b/build.xml
index 9c14a3bb938fa44331081e5e496851f941092d0b..fcdb872e6f1562c9eaf8c50d0e5f3d77a5f2995b 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -212,7 +212,7 @@
         </sql>\r
     </target>\r
 \r
-    <target name="deploy" depends="package"\r
+    <target name="deploy" depends="install"\r
     description="deploy services in ${jboss.server.cspace}">\r
                 <!-- copy db scripts, etc. -->\r
         <copy todir="${jboss.server.cspace}/cspace/services">\r

diff --git a/services/JaxRsServiceProvider/build.xml b/services/JaxRsServiceProvider/build.xml
index 035d602b69a70e4a02988c2caaf02b0c428fd011..dff8d98144ea0a9153fee7a08b387876eaa460cd 100644 (file)
--- a/services/JaxRsServiceProvider/build.xml
+++ b/services/JaxRsServiceProvider/build.xml
@@ -108,7 +108,7 @@
         </exec>
     </target>
 
-    <target name="deploy" depends="package"
+    <target name="deploy" depends="install"
     description="deploy cspace services in ${jboss.server.cspace}">
         <copy file="${basedir}/target/${cspace-services.war}" todir="${jboss.server.cspace}/deploy"/>
     </target>

diff --git a/services/acquisition/3rdparty/build.xml b/services/acquisition/3rdparty/build.xml
index 31c5b8b6c117e1334cd9d571b582df1666217144..1acd417343065db2c766e30482d6309eba6da8c9 100644 (file)
--- a/services/acquisition/3rdparty/build.xml
+++ b/services/acquisition/3rdparty/build.xml
@@ -106,7 +106,7 @@
         </exec>\r
     </target>\r
 \r
-    <target name="deploy" depends="package"\r
+    <target name="deploy" depends="install"\r
         description="deploy acquisition in ${jboss.server.nuxeo}">\r
         <ant antfile="nuxeo-platform-cs-acquisition/build.xml" target="deploy" inheritall="false"/>\r
     </target>\r

diff --git a/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/build.xml b/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/build.xml
index 07ad941c01d45452cdd60f36b4a71049b0501fbd..95f83cf1e1cffaa75cf113b0015917a1cf918dd1 100644 (file)
--- a/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/build.xml
+++ b/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/build.xml
@@ -107,7 +107,7 @@
         </exec>
     </target>
 
-    <target name="deploy" depends="package"
+    <target name="deploy" depends="install"
         description="deploy acquisition doctype in ${jboss.server.nuxeo}">
         <copy file="${basedir}/target/${nuxeo.acquisition.jar}"
         todir="${jboss.deploy.nuxeo.system}"/>

diff --git a/services/acquisition/build.xml b/services/acquisition/build.xml
index 319f7961d1099d33bc4e5693d4a68ceb970d5d5d..fa283736faa39e11e331d4dd59259377e20ab8cc 100644 (file)
--- a/services/acquisition/build.xml
+++ b/services/acquisition/build.xml
@@ -104,7 +104,7 @@
         </exec>\r
     </target>\r
 \r
-    <target name="deploy" depends="package"\r
+    <target name="deploy" depends="install"\r
         description="deploy acquisition service">\r
         <ant antfile="3rdparty/build.xml" target="deploy" inheritall="false"/>\r
     </target>\r

diff --git a/services/authentication/build.xml b/services/authentication/build.xml
index b83e2f5f600d1b19ee18a912305c520fc9a88fd0..16f15b57345be5152b9b29cbde1b88bfdabf7617 100644 (file)
--- a/services/authentication/build.xml
+++ b/services/authentication/build.xml
@@ -105,7 +105,7 @@
         </exec>\r
     </target>\r
 \r
-    <target name="deploy" depends="package"\r
+    <target name="deploy" depends="install"\r
     description="deploy authentication service">\r
         <ant antfile="service/build.xml" target="deploy" inheritall="false"/>\r
     </target>\r

diff --git a/services/authentication/service/build.xml b/services/authentication/service/build.xml
index 4bda27abe76960b651f0cce22e3464c91cee82f9..5df18f8b32e05df0c867387ec908bd9b05f7f5a9 100644 (file)
--- a/services/authentication/service/build.xml
+++ b/services/authentication/service/build.xml
@@ -108,7 +108,7 @@
         </exec>\r
     </target>\r
 \r
-    <target name="deploy" depends="package"\r
+    <target name="deploy" depends="install"\r
     description="deploy authentication service in ${jboss.server.cspace}">\r
         <copy file="${basedir}/target/${authentication.jar}" todir="${jboss.server.cspace}/lib"/>\r
         <echo message="Add authentication-policy to ${jboss.server.cspace}/conf/login-config.xml"/>\r

diff --git a/services/build.xml b/services/build.xml
index fe66659d06847e142864628e97a52c45760d69fe..74f86b6b96bb76a40eb55deae55709cae1c448d1 100644 (file)
--- a/services/build.xml
+++ b/services/build.xml
@@ -105,7 +105,7 @@
     </target>\r
 \r
     <!-- this target is called in order based on the dependencies between the services -->\r
-    <target name="deploy" depends="package"\r
+    <target name="deploy" depends="install"\r
     description="deploy services in ${jboss.server.cspace}">\r
         <ant antfile="common/build.xml" target="deploy" inheritAll="false"/>\r
         <ant antfile="authentication/build.xml" target="deploy" inheritAll="false"/>\r

diff --git a/services/collectionobject/3rdparty/build.xml b/services/collectionobject/3rdparty/build.xml
index d5256ba26ced9db6cbdf9505dd2567bde473938d..6dfe3159f4f2071f335d32e6d7b5713c03c5e15b 100644 (file)
--- a/services/collectionobject/3rdparty/build.xml
+++ b/services/collectionobject/3rdparty/build.xml
@@ -108,7 +108,7 @@
         </exec>\r
     </target>\r
 \r
-    <target name="deploy" depends="package"\r
+    <target name="deploy" depends="install"\r
     description="deploy collectionobject in ${jboss.server.nuxeo}">\r
         <ant antfile="nuxeo-platform-cs-collectionobject/build.xml" target="deploy" inheritall="false"/>\r
     </target>\r

diff --git a/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/build.xml b/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/build.xml
index 44a3a46a628fe155b14688cbb7783005a61366ad..543a96a640e1112d3681703eee72fc19bccb67a9 100644 (file)
--- a/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/build.xml
+++ b/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/build.xml
@@ -112,7 +112,7 @@
         </exec>\r
     </target>\r
 \r
-    <target name="deploy" depends="package"\r
+    <target name="deploy" depends="install"\r
     description="deploy collectionobject doctype in ${jboss.server.nuxeo}">\r
         <copy file="${basedir}/target/${nuxeo.collectionobject.jar}"\r
         todir="${jboss.deploy.nuxeo.system}"/>\r

diff --git a/services/collectionobject/build.xml b/services/collectionobject/build.xml
index b365bdbad974119dae7e00e7d532c3a52709cefb..8219b198010ee548bb1b352669cd11d6d997ac44 100644 (file)
--- a/services/collectionobject/build.xml
+++ b/services/collectionobject/build.xml
@@ -105,7 +105,7 @@
         </exec>\r
     </target>\r
 \r
-    <target name="deploy" depends="package"\r
+    <target name="deploy" depends="install"\r
     description="deploy collectionobject service">\r
         <ant antfile="3rdparty/build.xml" target="deploy" inheritall="false"/>\r
     </target>\r

diff --git a/services/common/build.xml b/services/common/build.xml
index 13a59be0fc7322f091fa2c2172de3aade5b9c4f0..c162d1199253269021fa425ae46b6f8be6fe2f7e 100644 (file)
--- a/services/common/build.xml
+++ b/services/common/build.xml
@@ -107,7 +107,7 @@
         </exec>
     </target>
 
-    <target name="deploy" depends="package"
+    <target name="deploy" depends="install"
     description="deploy common elements in ${jboss.server.cspace}">
         <copy todir="${jboss.server.cspace}/cspace/config/services">
             <fileset dir="${basedir}/src/main/config"/>

diff --git a/services/id/build.xml b/services/id/build.xml
index 3fe6a2cadea4e86c3ba0dc283da378f34db47ca6..50fee874cb54ae56168d0aeb05fae6679dce85e2 100644 (file)
--- a/services/id/build.xml
+++ b/services/id/build.xml
@@ -104,7 +104,7 @@
         </exec>\r
     </target>\r
 \r
-    <target name="deploy" depends="package"\r
+    <target name="deploy" depends="install"\r
     description="deploy id service">\r
         \r
     </target>\r

diff --git a/services/intake/3rdparty/build.xml b/services/intake/3rdparty/build.xml
index ac71f96367d5e7f8995da5f8c43a2575305e6c88..2de95591f12ec1eb8a577f1a11c03b71c466e828 100644 (file)
--- a/services/intake/3rdparty/build.xml
+++ b/services/intake/3rdparty/build.xml
@@ -106,7 +106,7 @@
         </exec>\r
     </target>\r
 \r
-    <target name="deploy" depends="package"\r
+    <target name="deploy" depends="install"\r
     description="deploy intake in ${jboss.server.nuxeo}">\r
         <ant antfile="nuxeo-platform-cs-intake/build.xml" target="deploy" inheritall="false"/>\r
     </target>\r

diff --git a/services/intake/3rdparty/nuxeo-platform-cs-intake/build.xml b/services/intake/3rdparty/nuxeo-platform-cs-intake/build.xml
index f7a947b49cb21bd60b07f7a8668fe5ae457e29d2..1ce3256bc9a9044064b92ce246cf2ca98e699612 100644 (file)
--- a/services/intake/3rdparty/nuxeo-platform-cs-intake/build.xml
+++ b/services/intake/3rdparty/nuxeo-platform-cs-intake/build.xml
@@ -107,7 +107,7 @@
         </exec>
     </target>
 
-    <target name="deploy" depends="package"
+    <target name="deploy" depends="install"
     description="deploy intake doctype in ${jboss.server.nuxeo}">
         <copy file="${basedir}/target/${nuxeo.intake.jar}"
         todir="${jboss.deploy.nuxeo.system}"/>

diff --git a/services/intake/build.xml b/services/intake/build.xml
index d3728d366e454c556bb724c9ae46ea27b380e0e2..9d8b03f6c92f6563999af9d9b035b517657b76ed 100644 (file)
--- a/services/intake/build.xml
+++ b/services/intake/build.xml
@@ -104,7 +104,7 @@
         </exec>\r
     </target>\r
 \r
-    <target name="deploy" depends="package"\r
+    <target name="deploy" depends="install"\r
     description="deploy intake service">\r
         <ant antfile="3rdparty/build.xml" target="deploy" inheritall="false"/>\r
     </target>\r

diff --git a/services/relation/3rdparty/build.xml b/services/relation/3rdparty/build.xml
index def61c0d8606407cb6ff2a23bb81d17f88d51d9c..31f25efc23e17f16dcbdcbf8b9d0190cefe9573f 100644 (file)
--- a/services/relation/3rdparty/build.xml
+++ b/services/relation/3rdparty/build.xml
@@ -107,7 +107,7 @@
         </exec>\r
     </target>\r
 \r
-    <target name="deploy" depends="package"\r
+    <target name="deploy" depends="install"\r
     description="deploy relation in ${jboss.server.nuxeo}">\r
         <ant antfile="nuxeo-platform-cs-relation/build.xml" target="deploy" inheritall="false"/>\r
     </target>\r

diff --git a/services/relation/3rdparty/nuxeo-platform-cs-relation/build.xml b/services/relation/3rdparty/nuxeo-platform-cs-relation/build.xml
index 696ebfe30999bcb4381fbd14a59dde32d810795e..3adb7e9454ea48922456695c55d96affef6e3f50 100644 (file)
--- a/services/relation/3rdparty/nuxeo-platform-cs-relation/build.xml
+++ b/services/relation/3rdparty/nuxeo-platform-cs-relation/build.xml
@@ -107,7 +107,7 @@
         </exec>\r
     </target>\r
 \r
-    <target name="deploy" depends="package"\r
+    <target name="deploy" depends="install"\r
     description="deploy relation doctype in ${jboss.server.cspace}">\r
         <copy file="${basedir}/target/${nuxeo.relation.jar}"\r
         todir="${jboss.deploy.nuxeo.system}"/>\r

diff --git a/services/relation/build.xml b/services/relation/build.xml
index 52237f1d0e3e14ef53f5d60e2ba06dfb01da8bdc..abd1a7547a046c4ac67281d9e43764cf2b3410ad 100644 (file)
--- a/services/relation/build.xml
+++ b/services/relation/build.xml
@@ -104,7 +104,7 @@
         </exec>\r
     </target>\r
 \r
-    <target name="deploy" depends="package"\r
+    <target name="deploy" depends="install"\r
     description="deploy relation service">\r
         <ant antfile="3rdparty/build.xml" target="deploy" inheritall="false"/>\r
     </target>\r

diff --git a/services/vocabulary/3rdparty/build.xml b/services/vocabulary/3rdparty/build.xml
index 4222b92e2c8949a73df42276464efcfd653514b5..e9023387696e6b8a7f2e9bd3179e8309b8462317 100644 (file)
--- a/services/vocabulary/3rdparty/build.xml
+++ b/services/vocabulary/3rdparty/build.xml
@@ -106,7 +106,7 @@
         </exec>\r
     </target>\r
 \r
-    <target name="deploy" depends="package"\r
+    <target name="deploy" depends="install"\r
     description="deploy vocabulary in ${jboss.server.nuxeo}">\r
         <ant antfile="nuxeo-platform-cs-vocabulary/build.xml" target="deploy" inheritall="false"/>\r
     </target>\r

diff --git a/services/vocabulary/3rdparty/nuxeo-platform-cs-vocabulary/build.xml b/services/vocabulary/3rdparty/nuxeo-platform-cs-vocabulary/build.xml
index a9e56c3f7887b13a18ea25d44b0f079c7fe3139c..6697211c26ccbba415138c0e65c5e7d40eb7a5fa 100644 (file)
--- a/services/vocabulary/3rdparty/nuxeo-platform-cs-vocabulary/build.xml
+++ b/services/vocabulary/3rdparty/nuxeo-platform-cs-vocabulary/build.xml
@@ -107,7 +107,7 @@
         </exec>
     </target>
 
-    <target name="deploy" depends="package"
+    <target name="deploy" depends="install"
     description="deploy vocabulary doctype in ${jboss.server.nuxeo}">
         <copy file="${basedir}/target/${nuxeo.vocabulary.jar}"
         todir="${jboss.deploy.nuxeo.system}"/>

diff --git a/services/vocabulary/build.xml b/services/vocabulary/build.xml
index 38d809939463a523a38774eeab6e9f88e6b4644a..239c8d826f462568b765cce2755ce496925528d0 100644 (file)
--- a/services/vocabulary/build.xml
+++ b/services/vocabulary/build.xml
@@ -104,7 +104,7 @@
         </exec>\r
     </target>\r
 \r
-    <target name="deploy" depends="package"\r
+    <target name="deploy" depends="install"\r
         description="deploy vocabulary service">\r
         <ant antfile="3rdparty/build.xml" target="deploy" inheritall="false"/>\r
     </target>\r