From: Sanjay Dalal <sanjay.dalal@berkeley.edu>
Date: Fri, 23 Oct 2009 23:16:58 +0000 (+0000)
Subject: CSPACE-557 deploy target now depends upon install instead of package. This is possibl... 
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=6696059d5d0200b5f0a0690f5573e3524364c48b;p=tmp%2Fjakarta-migration.git

CSPACE-557 deploy target now depends upon install instead of package. This is possible because of fix for CSPACE-558 which now uses codehaus' cargo plugin for deployment

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 9c14a3bb9..fcdb872e6 100644
--- a/build.xml
+++ b/build.xml
@@ -212,7 +212,7 @@
         </sql>
     </target>
 
-    <target name="deploy" depends="package"
+    <target name="deploy" depends="install"
     description="deploy services in ${jboss.server.cspace}">
                 <!-- copy db scripts, etc. -->
         <copy todir="${jboss.server.cspace}/cspace/services">
diff --git a/services/JaxRsServiceProvider/build.xml b/services/JaxRsServiceProvider/build.xml
index 035d602b6..dff8d9814 100644
--- 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 31c5b8b6c..1acd41734 100644
--- a/services/acquisition/3rdparty/build.xml
+++ b/services/acquisition/3rdparty/build.xml
@@ -106,7 +106,7 @@
         </exec>
     </target>
 
-    <target name="deploy" depends="package"
+    <target name="deploy" depends="install"
         description="deploy acquisition in ${jboss.server.nuxeo}">
         <ant antfile="nuxeo-platform-cs-acquisition/build.xml" target="deploy" inheritall="false"/>
     </target>
diff --git a/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/build.xml b/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/build.xml
index 07ad941c0..95f83cf1e 100644
--- 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 319f7961d..fa283736f 100644
--- a/services/acquisition/build.xml
+++ b/services/acquisition/build.xml
@@ -104,7 +104,7 @@
         </exec>
     </target>
 
-    <target name="deploy" depends="package"
+    <target name="deploy" depends="install"
         description="deploy acquisition service">
         <ant antfile="3rdparty/build.xml" target="deploy" inheritall="false"/>
     </target>
diff --git a/services/authentication/build.xml b/services/authentication/build.xml
index b83e2f5f6..16f15b573 100644
--- a/services/authentication/build.xml
+++ b/services/authentication/build.xml
@@ -105,7 +105,7 @@
         </exec>
     </target>
 
-    <target name="deploy" depends="package"
+    <target name="deploy" depends="install"
     description="deploy authentication service">
         <ant antfile="service/build.xml" target="deploy" inheritall="false"/>
     </target>
diff --git a/services/authentication/service/build.xml b/services/authentication/service/build.xml
index 4bda27abe..5df18f8b3 100644
--- a/services/authentication/service/build.xml
+++ b/services/authentication/service/build.xml
@@ -108,7 +108,7 @@
         </exec>
     </target>
 
-    <target name="deploy" depends="package"
+    <target name="deploy" depends="install"
     description="deploy authentication service in ${jboss.server.cspace}">
         <copy file="${basedir}/target/${authentication.jar}" todir="${jboss.server.cspace}/lib"/>
         <echo message="Add authentication-policy to ${jboss.server.cspace}/conf/login-config.xml"/>
diff --git a/services/build.xml b/services/build.xml
index fe66659d0..74f86b6b9 100644
--- a/services/build.xml
+++ b/services/build.xml
@@ -105,7 +105,7 @@
     </target>
 
     <!-- this target is called in order based on the dependencies between the services -->
-    <target name="deploy" depends="package"
+    <target name="deploy" depends="install"
     description="deploy services in ${jboss.server.cspace}">
         <ant antfile="common/build.xml" target="deploy" inheritAll="false"/>
         <ant antfile="authentication/build.xml" target="deploy" inheritAll="false"/>
diff --git a/services/collectionobject/3rdparty/build.xml b/services/collectionobject/3rdparty/build.xml
index d5256ba26..6dfe3159f 100644
--- a/services/collectionobject/3rdparty/build.xml
+++ b/services/collectionobject/3rdparty/build.xml
@@ -108,7 +108,7 @@
         </exec>
     </target>
 
-    <target name="deploy" depends="package"
+    <target name="deploy" depends="install"
     description="deploy collectionobject in ${jboss.server.nuxeo}">
         <ant antfile="nuxeo-platform-cs-collectionobject/build.xml" target="deploy" inheritall="false"/>
     </target>
diff --git a/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/build.xml b/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/build.xml
index 44a3a46a6..543a96a64 100644
--- 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>
     </target>
 
-    <target name="deploy" depends="package"
+    <target name="deploy" depends="install"
     description="deploy collectionobject doctype in ${jboss.server.nuxeo}">
         <copy file="${basedir}/target/${nuxeo.collectionobject.jar}"
         todir="${jboss.deploy.nuxeo.system}"/>
diff --git a/services/collectionobject/build.xml b/services/collectionobject/build.xml
index b365bdbad..8219b1980 100644
--- a/services/collectionobject/build.xml
+++ b/services/collectionobject/build.xml
@@ -105,7 +105,7 @@
         </exec>
     </target>
 
-    <target name="deploy" depends="package"
+    <target name="deploy" depends="install"
     description="deploy collectionobject service">
         <ant antfile="3rdparty/build.xml" target="deploy" inheritall="false"/>
     </target>
diff --git a/services/common/build.xml b/services/common/build.xml
index 13a59be0f..c162d1199 100644
--- 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 3fe6a2cad..50fee874c 100644
--- a/services/id/build.xml
+++ b/services/id/build.xml
@@ -104,7 +104,7 @@
         </exec>
     </target>
 
-    <target name="deploy" depends="package"
+    <target name="deploy" depends="install"
     description="deploy id service">
         
     </target>
diff --git a/services/intake/3rdparty/build.xml b/services/intake/3rdparty/build.xml
index ac71f9636..2de95591f 100644
--- a/services/intake/3rdparty/build.xml
+++ b/services/intake/3rdparty/build.xml
@@ -106,7 +106,7 @@
         </exec>
     </target>
 
-    <target name="deploy" depends="package"
+    <target name="deploy" depends="install"
     description="deploy intake in ${jboss.server.nuxeo}">
         <ant antfile="nuxeo-platform-cs-intake/build.xml" target="deploy" inheritall="false"/>
     </target>
diff --git a/services/intake/3rdparty/nuxeo-platform-cs-intake/build.xml b/services/intake/3rdparty/nuxeo-platform-cs-intake/build.xml
index f7a947b49..1ce3256bc 100644
--- 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 d3728d366..9d8b03f6c 100644
--- a/services/intake/build.xml
+++ b/services/intake/build.xml
@@ -104,7 +104,7 @@
         </exec>
     </target>
 
-    <target name="deploy" depends="package"
+    <target name="deploy" depends="install"
     description="deploy intake service">
         <ant antfile="3rdparty/build.xml" target="deploy" inheritall="false"/>
     </target>
diff --git a/services/relation/3rdparty/build.xml b/services/relation/3rdparty/build.xml
index def61c0d8..31f25efc2 100644
--- a/services/relation/3rdparty/build.xml
+++ b/services/relation/3rdparty/build.xml
@@ -107,7 +107,7 @@
         </exec>
     </target>
 
-    <target name="deploy" depends="package"
+    <target name="deploy" depends="install"
     description="deploy relation in ${jboss.server.nuxeo}">
         <ant antfile="nuxeo-platform-cs-relation/build.xml" target="deploy" inheritall="false"/>
     </target>
diff --git a/services/relation/3rdparty/nuxeo-platform-cs-relation/build.xml b/services/relation/3rdparty/nuxeo-platform-cs-relation/build.xml
index 696ebfe30..3adb7e945 100644
--- 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>
     </target>
 
-    <target name="deploy" depends="package"
+    <target name="deploy" depends="install"
     description="deploy relation doctype in ${jboss.server.cspace}">
         <copy file="${basedir}/target/${nuxeo.relation.jar}"
         todir="${jboss.deploy.nuxeo.system}"/>
diff --git a/services/relation/build.xml b/services/relation/build.xml
index 52237f1d0..abd1a7547 100644
--- a/services/relation/build.xml
+++ b/services/relation/build.xml
@@ -104,7 +104,7 @@
         </exec>
     </target>
 
-    <target name="deploy" depends="package"
+    <target name="deploy" depends="install"
     description="deploy relation service">
         <ant antfile="3rdparty/build.xml" target="deploy" inheritall="false"/>
     </target>
diff --git a/services/vocabulary/3rdparty/build.xml b/services/vocabulary/3rdparty/build.xml
index 4222b92e2..e90233876 100644
--- a/services/vocabulary/3rdparty/build.xml
+++ b/services/vocabulary/3rdparty/build.xml
@@ -106,7 +106,7 @@
         </exec>
     </target>
 
-    <target name="deploy" depends="package"
+    <target name="deploy" depends="install"
     description="deploy vocabulary in ${jboss.server.nuxeo}">
         <ant antfile="nuxeo-platform-cs-vocabulary/build.xml" target="deploy" inheritall="false"/>
     </target>
diff --git a/services/vocabulary/3rdparty/nuxeo-platform-cs-vocabulary/build.xml b/services/vocabulary/3rdparty/nuxeo-platform-cs-vocabulary/build.xml
index a9e56c3f7..6697211c2 100644
--- 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 38d809939..239c8d826 100644
--- a/services/vocabulary/build.xml
+++ b/services/vocabulary/build.xml
@@ -104,7 +104,7 @@
         </exec>
     </target>
 
-    <target name="deploy" depends="package"
+    <target name="deploy" depends="install"
         description="deploy vocabulary service">
         <ant antfile="3rdparty/build.xml" target="deploy" inheritall="false"/>
     </target>