CSPACE-1456,CSPACE-533: Services Layer version updated to 0.7-SNAPSHOT (from 0.6...

diff --git a/3rdparty/nuxeo/nuxeo-platform-collectionspace/pom.xml b/3rdparty/nuxeo/nuxeo-platform-collectionspace/pom.xml
index 1fd6cf2816c94750df68fe3c7b39a05d3f428314..e1bab3098e9f815d68c0eeee9b7591326ab59476 100644 (file)
--- a/3rdparty/nuxeo/nuxeo-platform-collectionspace/pom.xml
+++ b/3rdparty/nuxeo/nuxeo-platform-collectionspace/pom.xml
@@ -5,7 +5,7 @@
   <parent>\r
     <groupId>org.collectionspace.services</groupId>\r
     <artifactId>org.collectionspace.services.3rdparty.nuxeo</artifactId>\r
-    <version>0.6-SNAPSHOT</version>\r
+    <version>0.7-SNAPSHOT</version>\r
   </parent>\r
 \r
   <modelVersion>4.0.0</modelVersion>\r

diff --git a/3rdparty/nuxeo/pom.xml b/3rdparty/nuxeo/pom.xml
index d835c08bca0b4a4e21aec8bb3dd4590b2b7f1451..09b6d94b0e68b65e848a0fb6eb17c2320a3d4836 100644 (file)
--- a/3rdparty/nuxeo/pom.xml
+++ b/3rdparty/nuxeo/pom.xml
@@ -4,7 +4,7 @@
     <parent>\r
         <groupId>org.collectionspace.services</groupId>\r
         <artifactId>org.collectionspace.services.3rdparty</artifactId>\r
-        <version>0.6-SNAPSHOT</version>\r
+        <version>0.7-SNAPSHOT</version>\r
     </parent>\r
 \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/3rdparty/pom.xml b/3rdparty/pom.xml
index f0c1b9c51b61b691139a518207088c1885ebdeaa..50224fe0de710bee356f349ffecaba76bc9dd057 100644 (file)
--- a/3rdparty/pom.xml
+++ b/3rdparty/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>org.collectionspace.services</artifactId>
         <groupId>org.collectionspace.services</groupId>
-        <version>0.6-SNAPSHOT</version>
+        <version>0.7-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>

diff --git a/build.properties b/build.properties
index 02aa390a17821b371dc146f63644ce04d0252a0e..3d42c0fe7b2909b56734846be6fe6c235f0b00ee 100644 (file)
--- a/build.properties
+++ b/build.properties
@@ -1,6 +1,6 @@
 host=127.0.0.1\r
 #cspace\r
-cspace.release=0.6-SNAPSHOT\r
+cspace.release=0.7-SNAPSHOT\r
 cspace.services.release=cspace-services-${cspace.release}\r
 cspace.services.war=cspace-services.war\r
 domain.cspace=cspace\r
@@ -11,6 +11,7 @@ domain.nuxeo=default
 nuxeo.release=5.2.GA\r
 nuxeo.ear=nuxeo.ear\r
 nuxeo.system=${nuxeo.ear}/system\r
+nuxeo.plugins=${nuxeo.ear}/plugins\r
 \r
 #distribution\r
 dist=dist\r
@@ -32,6 +33,7 @@ dist.server.nuxeo=${dist.nuxeo}/server/${jboss.domain.nuxeo}
 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
+dist.deploy.nuxeo.plugins=${dist.deploy.nuxeo}/${nuxeo.plugins}\r
 \r
 #jboss\r
 #assumption: both nuxeo and cspace domains are using the same JBoss installation\r
@@ -54,6 +56,7 @@ jboss.server.nuxeo=${jboss.home}/server/${jboss.domain.nuxeo}
 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
+jboss.deploy.nuxeo.plugins=${jboss.deploy.nuxeo}/${nuxeo.plugins}\r
 \r
 #database\r
 db=mysql\r

diff --git a/build.xml b/build.xml
index f54cbf9947fe4556ed8af38d20318c7f11921091..0e51cdb26d7b64dbaf632c55b0d6b052dd4126c1 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -3,7 +3,7 @@
     <description>\r
         collectionspace services\r
     </description>\r
-    <!-- enviornment should be declared before reading build.properties -->\r
+    <!-- environment should be declared before reading build.properties -->\r
     <property environment="env" />\r
     <!-- set global properties for this build -->\r
     <property file="build.properties" />\r
@@ -92,10 +92,10 @@
             </condition>\r
         </fail>\r
 \r
-        <fail message="Nuxeo is not deployed or ${jboss.deploy.nuxeo.systemy} not found">\r
+        <fail message="Nuxeo is not deployed or ${jboss.deploy.nuxeo.plugins} not found">\r
             <condition>\r
                 <not>\r
-                    <available file="${jboss.deploy.nuxeo.system}" type="dir"/>\r
+                    <available file="${jboss.deploy.nuxeo.plugins}" type="dir"/>\r
                 </not>\r
             </condition>\r
         </fail>\r

diff --git a/pom.xml b/pom.xml
index f5c55220eaa334c0be0f895c81fb3015c121742a..bb21b85f7ab2d28b204a06a388496fffd10a8f0c 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
     <modelVersion>4.0.0</modelVersion>\r
     <groupId>org.collectionspace.services</groupId>\r
     <artifactId>org.collectionspace.services</artifactId>\r
-    <version>0.6-SNAPSHOT</version>\r
+    <version>0.7-SNAPSHOT</version>\r
     <packaging>pom</packaging>\r
     <name>services</name>\r
 \r
@@ -16,8 +16,8 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>\r
         <nuxeo.version.5.2>5.2.1-SNAPSHOT</nuxeo.version.5.2>\r
         <nuxeo.version.1.5>1.5.1-SNAPSHOT</nuxeo.version.1.5>\r
-        <cspace.services.version>0.6-SNAPSHOT</cspace.services.version>\r
-        <cspace.services.client.version>0.6.1-SNAPSHOT</cspace.services.client.version>\r
+        <cspace.services.version>0.7-SNAPSHOT</cspace.services.version>\r
+        <cspace.services.client.version>0.7-SNAPSHOT</cspace.services.client.version>\r
     </properties>\r
 \r
     <distributionManagement>\r

diff --git a/services/IntegrationTests/pom.xml b/services/IntegrationTests/pom.xml
index 1cb6c08700f59979ab80fd93e6c49523fb407e40..3ef491151ffb2400f6a47d05739c0e6253d0ac4a 100644 (file)
--- a/services/IntegrationTests/pom.xml
+++ b/services/IntegrationTests/pom.xml
@@ -3,7 +3,7 @@
     <parent>\r
         <groupId>org.collectionspace.services</groupId>\r
         <artifactId>org.collectionspace.services.main</artifactId>\r
-        <version>0.6-SNAPSHOT</version>\r
+        <version>0.7-SNAPSHOT</version>\r
     </parent>\r
     \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/JaxRsServiceProvider/pom.xml b/services/JaxRsServiceProvider/pom.xml
index f4e4f6ab7f816afbb79c24bbd7b46ed42377dda3..74ff2a90ebf849abbf3d6481af50648a80e9ddc9 100644 (file)
--- a/services/JaxRsServiceProvider/pom.xml
+++ b/services/JaxRsServiceProvider/pom.xml
@@ -4,7 +4,7 @@
     <parent>\r
         <artifactId>org.collectionspace.services.main</artifactId>\r
         <groupId>org.collectionspace.services</groupId>\r
-        <version>0.6-SNAPSHOT</version>\r
+        <version>0.7-SNAPSHOT</version>\r
     </parent>\r
 \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/PerformanceTests/pom.xml b/services/PerformanceTests/pom.xml
index 76ef91dac610e41116690e80f1e3e2097b89eaa8..12a80903d9ab102a2035d5a3dd036871e1b3a61c 100644 (file)
--- a/services/PerformanceTests/pom.xml
+++ b/services/PerformanceTests/pom.xml
@@ -3,7 +3,7 @@
     <parent>\r
         <artifactId>org.collectionspace.services.main</artifactId>\r
         <groupId>org.collectionspace.services</groupId>\r
-        <version>0.6-SNAPSHOT</version>\r
+        <version>0.7-SNAPSHOT</version>\r
     </parent>\r
     \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/account/client/pom.xml b/services/account/client/pom.xml
index 1c823a79fc9966f4435d1ab1e284874bd568210a..3ab03a0d371d7b41751978f954b7d3d71d45e0ae 100644 (file)
--- a/services/account/client/pom.xml
+++ b/services/account/client/pom.xml
@@ -5,7 +5,7 @@
     <parent>\r
         <groupId>org.collectionspace.services</groupId>\r
         <artifactId>org.collectionspace.services.account</artifactId>\r
-        <version>0.6-SNAPSHOT</version>\r
+        <version>0.7-SNAPSHOT</version>\r
     </parent>\r
 \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/account/jaxb/pom.xml b/services/account/jaxb/pom.xml
index 76f2d73d37e28aa402fb7825245605ab5c561dd8..a34cc35e4183ac3032c338e07e04a73ead6ecde9 100644 (file)
--- a/services/account/jaxb/pom.xml
+++ b/services/account/jaxb/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.account</artifactId>
-        <version>0.6-SNAPSHOT</version>
+        <version>0.7-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/account/pom.xml b/services/account/pom.xml
index 1b3f94a5bfb93938ea3ce9bf29ad1d55f7471d48..ff02090a75f971e8e66ad1ae3d781f744ca23323 100644 (file)
--- a/services/account/pom.xml
+++ b/services/account/pom.xml
@@ -3,7 +3,7 @@
     <parent>\r
         <groupId>org.collectionspace.services</groupId>\r
         <artifactId>org.collectionspace.services.main</artifactId>\r
-        <version>0.6-SNAPSHOT</version>\r
+        <version>0.7-SNAPSHOT</version>\r
     </parent>\r
     \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/account/pstore/pom.xml b/services/account/pstore/pom.xml
index 698c3786df8e850b2c670e319cffb3015173f2ad..de62cfaefb919824180732dcc4fcc00fcb9cef77 100644 (file)
--- a/services/account/pstore/pom.xml
+++ b/services/account/pstore/pom.xml
@@ -5,7 +5,7 @@
     <parent>\r
         <artifactId>org.collectionspace.services.account</artifactId>\r
         <groupId>org.collectionspace.services</groupId>\r
-        <version>0.6-SNAPSHOT</version>\r
+        <version>0.7-SNAPSHOT</version>\r
     </parent>\r
 \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/account/service/pom.xml b/services/account/service/pom.xml
index aa53e88615638b0fc276975276709d0999a8a04c..e20edc616bd9c04f64cab9c4d3bc0ce9851c4dea 100644 (file)
--- a/services/account/service/pom.xml
+++ b/services/account/service/pom.xml
@@ -3,7 +3,7 @@
     <parent>\r
         <artifactId>org.collectionspace.services.account</artifactId>\r
         <groupId>org.collectionspace.services</groupId>\r
-        <version>0.6-SNAPSHOT</version>\r
+        <version>0.7-SNAPSHOT</version>\r
     </parent>\r
 \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/build.xml b/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/build.xml
index 98a5f77a3c618809ae2619c0ec1098943d60d98a..a14848557eb9c0ed0cf6a67666f30c0706a5c44d 100644 (file)
--- a/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/build.xml
+++ b/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/build.xml
@@ -3,14 +3,17 @@
     <description>
         acquisition nuxeo document type
     </description>
-  <!-- set global properties for this build -->
+    <!-- set global properties for this build -->
     <property name="services.trunk" value="../../../.."/>
-    <!-- enviornment should be declared before reading build.properties -->
+    <!-- environment should be declared before reading build.properties -->
     <property environment="env" />
     <property file="${services.trunk}/build.properties" />
     <property name="mvn.opts" value="" />
     <property name="src" location="src"/>
-    <property name="nuxeo.acquisition.jar" value="org.collectionspace.services.acquisition.3rdparty.nuxeo-${cspace.release}.jar"/>
+    <property name="nuxeo.acquisition.jar"
+        value="org.collectionspace.services.acquisition.3rdparty.nuxeo-${cspace.release}.jar"/>
+    <property name="nuxeo.acquisition.jars.all"
+        value="org.collectionspace.services.acquisition.3rdparty.nuxeo-*.jar"/>
 
     <condition property="osfamily-unix">
         <os family="unix" />
@@ -20,12 +23,12 @@
     </condition>
 
     <target name="init" >
-    <!-- Create the time stamp -->
+        <!-- Create the time stamp -->
         <tstamp/>
     </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" />
@@ -50,7 +53,7 @@
     </target>
 
     <target name="install" depends="install-unix,install-windows"
-  description="Install" />
+        description="Install" />
     <target name="install-unix" if="osfamily-unix">
         <exec executable="mvn" failonerror="true">
             <arg value="install" />
@@ -75,7 +78,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">
@@ -112,18 +115,25 @@
     <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}"/>
+        todir="${jboss.deploy.nuxeo.plugins}"/>
     </target>
 
     <target name="undeploy"
         description="undeploy acquisition doctype from ${jboss.server.nuxeo}">
-        <delete file="${jboss.deploy.nuxeo.system}/${nuxeo.acquisition.jar}"/>
+        <delete>
+            <fileset dir="${jboss.deploy.nuxeo.plugins}">
+                <include name="${nuxeo.acquisition.jars.all}"/>
+            </fileset>
+            <!-- Legacy deployment location through release 0.6 -->
+            <fileset dir="${jboss.deploy.nuxeo.system}">
+                <include name="${nuxeo.acquisition.jars.all}"/>
+            </fileset>
+        </delete>
     </target>
 
-
     <target name="dist"
         description="generate distribution for acquisition doctype" depends="package">
-        <copy todir="${services.trunk}/${dist.deploy.nuxeo.system}">
+        <copy todir="${services.trunk}/${dist.deploy.nuxeo.plugins}">
             <fileset file="${basedir}/target/${nuxeo.acquisition.jar}"/>
         </copy>
     </target>

diff --git a/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/pom.xml b/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/pom.xml
index 031a6c72da0892ff592aac34fb7c002b0f796c5a..825d867d4c49747df6df2a61f28346b45aeddf60 100644 (file)
--- a/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/pom.xml
+++ b/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.acquisition.3rdparty</artifactId>
-        <version>0.6-SNAPSHOT</version>
+        <version>0.7-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/acquisition/3rdparty/pom.xml b/services/acquisition/3rdparty/pom.xml
index 09478e0fc68befebc68723873b38f7e9f4da2994..25e1fadc9c0077d72fb9004cabdb7f9eef78ac1c 100644 (file)
--- a/services/acquisition/3rdparty/pom.xml
+++ b/services/acquisition/3rdparty/pom.xml
@@ -5,7 +5,7 @@
     <parent>\r
         <groupId>org.collectionspace.services</groupId>\r
         <artifactId>org.collectionspace.services.acquisition</artifactId>\r
-        <version>0.6-SNAPSHOT</version> \r
+        <version>0.7-SNAPSHOT</version> \r
     </parent>\r
     \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/acquisition/client/pom.xml b/services/acquisition/client/pom.xml
index 091e9678f9d7145193cb2a49b1d8bbb280d4f6dd..57cd847089a04e1c0403d27f6a634adf1302b263 100644 (file)
--- a/services/acquisition/client/pom.xml
+++ b/services/acquisition/client/pom.xml
@@ -5,7 +5,7 @@
     <parent>\r
         <groupId>org.collectionspace.services</groupId>\r
         <artifactId>org.collectionspace.services.acquisition</artifactId>\r
-        <version>0.6-SNAPSHOT</version>\r
+        <version>0.7-SNAPSHOT</version>\r
     </parent>\r
 \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/acquisition/jaxb/pom.xml b/services/acquisition/jaxb/pom.xml
index b9c6e686736cf618707c63bd5a98f92cf23703a1..4ef02f04568efccf0945ac7ed353e0581e07c498 100644 (file)
--- a/services/acquisition/jaxb/pom.xml
+++ b/services/acquisition/jaxb/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>org.collectionspace.services.acquisition</artifactId>
         <groupId>org.collectionspace.services</groupId>
-        <version>0.6-SNAPSHOT</version>
+        <version>0.7-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/acquisition/pom.xml b/services/acquisition/pom.xml
index c9187f83271631e8894a83c25f43900cdfc9848d..dd768e0504bef7f4153cc100d5fab58b3081fc68 100644 (file)
--- a/services/acquisition/pom.xml
+++ b/services/acquisition/pom.xml
@@ -4,7 +4,7 @@
     <parent>\r
         <groupId>org.collectionspace.services</groupId>\r
         <artifactId>org.collectionspace.services.main</artifactId>\r
-        <version>0.6-SNAPSHOT</version>\r
+        <version>0.7-SNAPSHOT</version>\r
     </parent>\r
 \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/acquisition/service/pom.xml b/services/acquisition/service/pom.xml
index ecbeed9ec2b8bf1bfd77e25a724c8998310a747c..6f495d0259d642860f7d2af1514ba25211718eb2 100644 (file)
--- a/services/acquisition/service/pom.xml
+++ b/services/acquisition/service/pom.xml
@@ -3,7 +3,7 @@
     <parent>\r
         <artifactId>org.collectionspace.services.acquisition</artifactId>\r
         <groupId>org.collectionspace.services</groupId>\r
-        <version>0.6-SNAPSHOT</version>\r
+        <version>0.7-SNAPSHOT</version>\r
     </parent>\r
     \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/authentication/client/pom.xml b/services/authentication/client/pom.xml
index 1e02f05024a6ee1f03b1d075edd436b1161744f9..b5749e5f29851f08d211cc5e2982eb959cf90c0f 100644 (file)
--- a/services/authentication/client/pom.xml
+++ b/services/authentication/client/pom.xml
@@ -6,7 +6,7 @@
     <parent>\r
         <groupId>org.collectionspace.services</groupId>\r
         <artifactId>org.collectionspace.services.authentication</artifactId>\r
-        <version>0.6-SNAPSHOT</version>\r
+        <version>0.7-SNAPSHOT</version>\r
     </parent>\r
 \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/authentication/jaxb/pom.xml b/services/authentication/jaxb/pom.xml
index 9651a17e23071127552db8c0edb22058e6499eb8..09fcc8f9dc9f7779ef5f72831eefd9c3a9e1dcbe 100644 (file)
--- a/services/authentication/jaxb/pom.xml
+++ b/services/authentication/jaxb/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.authentication</artifactId>
-        <version>0.6-SNAPSHOT</version>
+        <version>0.7-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/authentication/pom.xml b/services/authentication/pom.xml
index 449ba7f21858abae54db3b2372901476d2a1a0d6..b2fb60ea3ee073a1b02cfc1b994f6bd3dec8ea4b 100644 (file)
--- a/services/authentication/pom.xml
+++ b/services/authentication/pom.xml
@@ -3,7 +3,7 @@
     <parent>\r
         <groupId>org.collectionspace.services</groupId>\r
         <artifactId>org.collectionspace.services.main</artifactId>\r
-        <version>0.6-SNAPSHOT</version>\r
+        <version>0.7-SNAPSHOT</version>\r
     </parent>\r
     \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/authentication/pstore/pom.xml b/services/authentication/pstore/pom.xml
index e20859e3ff6e4b8b17abf2cb7ab0aa3d4f0218d5..3ae36e40ae1ac9ecea54c4c3babdecb3be011e78 100644 (file)
--- a/services/authentication/pstore/pom.xml
+++ b/services/authentication/pstore/pom.xml
@@ -6,7 +6,7 @@
     <parent>\r
         <groupId>org.collectionspace.services</groupId>\r
         <artifactId>org.collectionspace.services.authentication</artifactId>\r
-        <version>0.6-SNAPSHOT</version>\r
+        <version>0.7-SNAPSHOT</version>\r
     </parent>\r
 \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/authentication/service/pom.xml b/services/authentication/service/pom.xml
index 4f4bfdfa1aefa910b5a157f8c6138bf00e6653c5..af226b5b0fb5f2c81d495a07a92b1af77921b1c4 100644 (file)
--- a/services/authentication/service/pom.xml
+++ b/services/authentication/service/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.authentication</artifactId>
-        <version>0.6-SNAPSHOT</version>
+        <version>0.7-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/authorization-mgt/client/pom.xml b/services/authorization-mgt/client/pom.xml
index bc2952f846b536dda3fa3ce4c3f6b7c257d66181..d7c21734460d14dce053107c5960c7bface15582 100644 (file)
--- a/services/authorization-mgt/client/pom.xml
+++ b/services/authorization-mgt/client/pom.xml
@@ -5,7 +5,7 @@
     <parent>\r
         <groupId>org.collectionspace.services</groupId>\r
         <artifactId>org.collectionspace.services.authorization-mgt</artifactId>\r
-        <version>0.6-SNAPSHOT</version>\r
+        <version>0.7-SNAPSHOT</version>\r
     </parent>\r
 \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/authorization-mgt/pom.xml b/services/authorization-mgt/pom.xml
index af4e16a9cc9c2b694b04b14c904ce477d5466319..b9ac621b296af6e9477dc097b02c389d2f98e4e2 100644 (file)
--- a/services/authorization-mgt/pom.xml
+++ b/services/authorization-mgt/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>org.collectionspace.services.main</artifactId>
         <groupId>org.collectionspace.services</groupId>
-        <version>0.6-SNAPSHOT</version>
+        <version>0.7-SNAPSHOT</version>
     </parent>
 
     <groupId>org.collectionspace.services</groupId>

diff --git a/services/authorization-mgt/service/pom.xml b/services/authorization-mgt/service/pom.xml
index 7245c6bec9c193ad129ea53acad1adc89f9bf340..f33ad5da751e8bba853c1818f6ab637d08f1ed85 100644 (file)
--- a/services/authorization-mgt/service/pom.xml
+++ b/services/authorization-mgt/service/pom.xml
@@ -4,7 +4,7 @@
     <parent>\r
         <artifactId>org.collectionspace.services.authorization-mgt</artifactId>\r
         <groupId>org.collectionspace.services</groupId>\r
-        <version>0.6-SNAPSHOT</version>\r
+        <version>0.7-SNAPSHOT</version>\r
     </parent>\r
     <groupId>org.collectionspace.services</groupId>\r
     <artifactId>org.collectionspace.services.authorization-mgt.service</artifactId>\r

diff --git a/services/authorization/jaxb/pom.xml b/services/authorization/jaxb/pom.xml
index ada195a8b0a18727d673067a7143778b7293d3cf..a35118ad96a118ca3328aa9205c0970b4fddb231 100644 (file)
--- a/services/authorization/jaxb/pom.xml
+++ b/services/authorization/jaxb/pom.xml
@@ -4,7 +4,7 @@
     <parent>\r
         <artifactId>org.collectionspace.services.authorization</artifactId>\r
         <groupId>org.collectionspace.services</groupId>\r
-        <version>0.6-SNAPSHOT</version>\r
+        <version>0.7-SNAPSHOT</version>\r
     </parent>\r
 \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/authorization/pom.xml b/services/authorization/pom.xml
index c0dbf2059b9feff7721a76cfea3287f7147c4290..a90f7fcc83fb168c9b9858b8f28fc4cb131116a5 100644 (file)
--- a/services/authorization/pom.xml
+++ b/services/authorization/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>org.collectionspace.services.main</artifactId>
         <groupId>org.collectionspace.services</groupId>
-        <version>0.6-SNAPSHOT</version>
+        <version>0.7-SNAPSHOT</version>
     </parent>
     <groupId>org.collectionspace.services</groupId>
     <artifactId>org.collectionspace.services.authorization</artifactId>

diff --git a/services/authorization/pstore/pom.xml b/services/authorization/pstore/pom.xml
index 149e607ff96f3f60473bb3cd8dc83123923c0118..af81ef2cbae25fa986b5b26b3dfb4ed8d773947d 100644 (file)
--- a/services/authorization/pstore/pom.xml
+++ b/services/authorization/pstore/pom.xml
@@ -4,7 +4,7 @@
     <parent>\r
         <artifactId>org.collectionspace.services.authorization</artifactId>\r
         <groupId>org.collectionspace.services</groupId>\r
-        <version>0.6-SNAPSHOT</version>\r
+        <version>0.7-SNAPSHOT</version>\r
     </parent>\r
 \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/authorization/service/pom.xml b/services/authorization/service/pom.xml
index da17e08458b74d65b16047e5618b93d493a94a53..981a48cb1335a7979eb50d9e9a978015b871a642 100644 (file)
--- a/services/authorization/service/pom.xml
+++ b/services/authorization/service/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <artifactId>org.collectionspace.services.authorization</artifactId>
         <groupId>org.collectionspace.services</groupId>
-        <version>0.6-SNAPSHOT</version>
+        <version>0.7-SNAPSHOT</version>
     </parent>
     <groupId>org.collectionspace.services</groupId>
     <artifactId>org.collectionspace.services.authorization.service</artifactId>

diff --git a/services/client/pom.xml b/services/client/pom.xml
index a2e688b5ef4cedfa0a9ad7020884cb2a72a5b58c..5e9181e5c6b70676fdc84007521c695b409cf4a9 100644 (file)
--- a/services/client/pom.xml
+++ b/services/client/pom.xml
@@ -3,7 +3,7 @@
     <parent>\r
         <groupId>org.collectionspace.services</groupId>\r
         <artifactId>org.collectionspace.services.main</artifactId>\r
-        <version>0.6-SNAPSHOT</version>\r
+        <version>0.7-SNAPSHOT</version>\r
     </parent>\r
 \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/build.xml b/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/build.xml
index a8d21320d2b69d1c6dc60704249e147e9e7b8618..a8213066f1be5b9a5072eaa3536f1320279878e7 100644 (file)
--- a/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/build.xml
+++ b/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/build.xml
@@ -3,16 +3,19 @@
     <description>\r
         collectionobject nuxeo document type\r
     </description>\r
-  <!-- set global properties for this build -->\r
+    <!-- set global properties for this build -->\r
     <property name="services.trunk" value="../../../.."/>\r
-    <!-- enviornment should be declared before reading build.properties -->\r
+    <!-- environment should be declared before reading build.properties -->\r
     <property environment="env" />\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
     <property name="dist"  location="dist"/>\r
-    <property name="nuxeo.collectionobject.jar" value="org.collectionspace.services.collectionobject.3rdparty.nuxeo-${cspace.release}.jar"/>\r
+    <property name="nuxeo.collectionobject.jar"\r
+        value="org.collectionspace.services.collectionobject.3rdparty.nuxeo-${cspace.release}.jar"/>\r
+    <property name="nuxeo.collectionobject.jars.all"\r
+        value="org.collectionspace.services.collectionobject.3rdparty.nuxeo-*.jar"/>\r
 \r
     <condition property="osfamily-unix">\r
         <os family="unix" />\r
@@ -22,15 +25,14 @@
     </condition>\r
 \r
     <target name="init" >\r
-    <!-- Create the time stamp -->\r
+        <!-- Create the time stamp -->\r
         <tstamp/>\r
-    <!-- Create the build directory structure used by compile -->\r
+        <!-- Create the build directory structure used by compile -->\r
         <mkdir dir="${build}"/>\r
-\r
     </target>\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
@@ -80,7 +82,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
@@ -115,19 +117,27 @@
     </target>\r
 \r
     <target name="deploy" depends="install"\r
-    description="deploy collectionobject doctype in ${jboss.server.nuxeo}">\r
+        description="deploy collectionobject doctype in ${jboss.server.nuxeo}">\r
         <copy file="${basedir}/target/${nuxeo.collectionobject.jar}"\r
-        todir="${jboss.deploy.nuxeo.system}"/>\r
+        todir="${jboss.deploy.nuxeo.plugins}"/>\r
     </target>\r
 \r
     <target name="undeploy"\r
-    description="undeploy collectionobject doctype from ${jboss.server.nuxeo}">\r
-        <delete file="${jboss.deploy.nuxeo.system}/${nuxeo.collectionobject.jar}"/>\r
+        description="undeploy collectionobject doctype from ${jboss.server.nuxeo}">\r
+        <delete>\r
+            <fileset dir="${jboss.deploy.nuxeo.plugins}">\r
+                <include name="${nuxeo.collectionobject.jars.all}"/>\r
+            </fileset>\r
+            <!-- Legacy deployment location through release 0.6 -->\r
+            <fileset dir="${jboss.deploy.nuxeo.system}">\r
+                <include name="${nuxeo.collectionobject.jars.all}"/>\r
+            </fileset>\r
+        </delete>\r
     </target>\r
 \r
     <target name="dist"\r
        description="generate distribution for collectionobject doctype" depends="package">\r
-        <copy todir="${services.trunk}/${dist.deploy.nuxeo.system}">\r
+        <copy todir="${services.trunk}/${dist.deploy.nuxeo.plugins}">\r
             <fileset file="${basedir}/target/${nuxeo.collectionobject.jar}"/>\r
         </copy>\r
     </target>\r

diff --git a/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/pom.xml b/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/pom.xml
index 41682aef303bf28b1467fd6baa730d13db55a386..dc146afc8984ef8d94180a81acd981f77e5ef775 100644 (file)
--- a/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/pom.xml
+++ b/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.collectionobject.3rdparty</artifactId>
-        <version>0.6-SNAPSHOT</version>
+        <version>0.7-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/collectionobject/3rdparty/pom.xml b/services/collectionobject/3rdparty/pom.xml
index 1e63800ce04f1da84888c570987b60c89370c11e..b4492ad67944ce651ed62d9c9a569b75a3046b01 100644 (file)
--- a/services/collectionobject/3rdparty/pom.xml
+++ b/services/collectionobject/3rdparty/pom.xml
@@ -5,7 +5,7 @@
     <parent>\r
         <groupId>org.collectionspace.services</groupId>\r
         <artifactId>org.collectionspace.services.collectionobject</artifactId>\r
-        <version>0.6-SNAPSHOT</version>\r
+        <version>0.7-SNAPSHOT</version>\r
     </parent>\r
 \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/collectionobject/client/pom.xml b/services/collectionobject/client/pom.xml
index dea32b8318f137c1b6558654b20fcb81a797ab75..ad63562c75563393b0bbf70bdb59d5b786719635 100644 (file)
--- a/services/collectionobject/client/pom.xml
+++ b/services/collectionobject/client/pom.xml
@@ -5,7 +5,7 @@
     <parent>\r
         <groupId>org.collectionspace.services</groupId>\r
         <artifactId>org.collectionspace.services.collectionobject</artifactId>\r
-        <version>0.6-SNAPSHOT</version>\r
+        <version>0.7-SNAPSHOT</version>\r
     </parent>\r
 \r
     <modelVersion>4.0.0</modelVersion>\r
@@ -105,4 +105,4 @@
         </plugins>\r
         \r
     </build>\r
-</project>
\ No newline at end of file
+</project>\r

diff --git a/services/collectionobject/installer/build.xml b/services/collectionobject/installer/build.xml
index 0c1c4d5ee52fd8074355c67f66b2b8479d41339c..b17ccb065cd2de8a4806fa70c300e218221bc120 100644 (file)
--- a/services/collectionobject/installer/build.xml
+++ b/services/collectionobject/installer/build.xml
@@ -21,7 +21,7 @@
         <exec executable="echo">\r
                        <arg value="Installer: Executing CollectionObject Service's &apos;install&apos; target." />\r
                                </exec>\r
-        <copy todir="${jboss.deploy.nuxeo.system}">\r
+        <copy todir="${jboss.deploy.nuxeo.plugins}">\r
             <fileset file="nuxeo/*.jar"/>\r
         </copy>\r
     </target>\r

diff --git a/services/collectionobject/jaxb/pom.xml b/services/collectionobject/jaxb/pom.xml
index da8c113b8c6d3a13d7fa31b7f80d34ddc812b9de..b0d1a42a775eddd9b1561c5bedd3d7e9c6890ad4 100644 (file)
--- a/services/collectionobject/jaxb/pom.xml
+++ b/services/collectionobject/jaxb/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.collectionobject</artifactId>
-        <version>0.6-SNAPSHOT</version>
+        <version>0.7-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/collectionobject/pom.xml b/services/collectionobject/pom.xml
index 5c3f6fbc1fc40b76b5b89683877d474fd2311d96..b1628ed3107068c4b01c7a0794af0e34873a2721 100644 (file)
--- a/services/collectionobject/pom.xml
+++ b/services/collectionobject/pom.xml
@@ -3,7 +3,7 @@
     <parent>\r
         <groupId>org.collectionspace.services</groupId>\r
         <artifactId>org.collectionspace.services.main</artifactId>\r
-        <version>0.6-SNAPSHOT</version>        \r
+        <version>0.7-SNAPSHOT</version>        \r
     </parent>\r
     \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/collectionobject/sample/sample/pom.xml b/services/collectionobject/sample/sample/pom.xml
index 56134bedcf3bca1f45e626e4f35044e285a348b4..50b83f094e41a1af4cfb59f88782225eb5937b61 100644 (file)
--- a/services/collectionobject/sample/sample/pom.xml
+++ b/services/collectionobject/sample/sample/pom.xml
@@ -5,7 +5,7 @@
     <artifactId>org.collectionspace.services.collectionobject.client.sample</artifactId>
     <packaging>jar</packaging>
     <name>collectionobject.client.sample</name>
-    <version>0.6-SNAPSHOT</version>
+    <version>0.7-SNAPSHOT</version>
     
     <dependencies>
         <dependency>

diff --git a/services/collectionobject/service/pom.xml b/services/collectionobject/service/pom.xml
index 9079f9406756a9e7f0dcd6d2f60ffdd7b0a32300..50ea8c6dfb9728eb677949bead8a21e15dfc6ab5 100644 (file)
--- a/services/collectionobject/service/pom.xml
+++ b/services/collectionobject/service/pom.xml
@@ -3,7 +3,7 @@
     <parent>\r
         <groupId>org.collectionspace.services</groupId>\r
         <artifactId>org.collectionspace.services.collectionobject</artifactId>\r
-        <version>0.6-SNAPSHOT</version>\r
+        <version>0.7-SNAPSHOT</version>\r
     </parent>\r
     \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/common/pom.xml b/services/common/pom.xml
index 503808fa024dbb8c107486a4821016efa1516c2c..bbabacf5d0e0de1210edabc0466bb5fb575599c3 100644 (file)
--- a/services/common/pom.xml
+++ b/services/common/pom.xml
@@ -3,7 +3,7 @@
     <parent>\r
         <groupId>org.collectionspace.services</groupId>\r
         <artifactId>org.collectionspace.services.main</artifactId>\r
-        <version>0.6-SNAPSHOT</version>\r
+        <version>0.7-SNAPSHOT</version>\r
     </parent>\r
 \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/contact/3rdparty/nuxeo-platform-cs-contact/build.xml b/services/contact/3rdparty/nuxeo-platform-cs-contact/build.xml
index 28d9f083ac038025a053503038995de8addfe72a..a5ce14f84f9517a225b6edf182a6a3723d114c87 100644 (file)
--- a/services/contact/3rdparty/nuxeo-platform-cs-contact/build.xml
+++ b/services/contact/3rdparty/nuxeo-platform-cs-contact/build.xml
@@ -3,16 +3,19 @@
     <description>
         contact nuxeo document type
     </description>
-  <!-- set global properties for this build -->
+    <!-- set global properties for this build -->
     <property name="services.trunk" value="../../../.."/>
-    <!-- enviornment should be declared before reading build.properties -->
+    <!-- environment should be declared before reading build.properties -->
     <property environment="env" />
     <property file="${services.trunk}/build.properties" />
     <property name="mvn.opts" value="" />
     <property name="src" location="src"/>
     <property name="build" location="build"/>
     <property name="dist"  location="dist"/>
-    <property name="nuxeo.contact.jar" value="org.collectionspace.services.contact.3rdparty.nuxeo-${cspace.release}.jar"/>
+    <property name="nuxeo.contact.jar"
+        value="org.collectionspace.services.contact.3rdparty.nuxeo-${cspace.release}.jar"/>
+    <property name="nuxeo.contact.jars.all"
+        value="org.collectionspace.services.contact.3rdparty.nuxeo-*.jar"/>
 
     <condition property="osfamily-unix">
         <os family="unix" />
@@ -22,12 +25,12 @@
     </condition>
 
     <target name="init" >
-    <!-- Create the time stamp -->
+        <!-- Create the time stamp -->
         <tstamp/>
     </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" />
@@ -52,7 +55,7 @@
     </target>
 
     <target name="install" depends="install-unix,install-windows"
-  description="Install" />
+        description="Install" />
     <target name="install-unix" if="osfamily-unix">
         <exec executable="mvn" failonerror="true">
             <arg value="install" />
@@ -77,7 +80,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">
@@ -112,20 +115,27 @@
     </target>
 
     <target name="deploy" depends="install"
-    description="deploy contact doctype in ${jboss.server.nuxeo}">
+        description="deploy contact doctype in ${jboss.server.nuxeo}">
         <copy file="${basedir}/target/${nuxeo.contact.jar}"
-        todir="${jboss.deploy.nuxeo.system}"/>
+        todir="${jboss.deploy.nuxeo.plugins}"/>
     </target>
 
     <target name="undeploy"
-    description="undeploy contact doctype from ${jboss.server.nuxeo}">
-        <delete file="${jboss.deploy.nuxeo.system}/${nuxeo.contact.jar}"/>
+        description="undeploy contact doctype from ${jboss.server.nuxeo}">
+        <delete>
+            <fileset dir="${jboss.deploy.nuxeo.plugins}">
+                <include name="${nuxeo.contact.jars.all}"/>
+            </fileset>
+            <!-- Legacy deployment location through release 0.6 -->
+            <fileset dir="${jboss.deploy.nuxeo.system}">
+                <include name="${nuxeo.contact.jars.all}"/>
+            </fileset>
+        </delete>
     </target>
 
-
     <target name="dist"
-    description="generate distribution for contact doctype" depends="package">
-        <copy todir="${services.trunk}/${dist.deploy.nuxeo.system}">
+        description="generate distribution for contact doctype" depends="package">
+        <copy todir="${services.trunk}/${dist.deploy.nuxeo.plugins}">
             <fileset file="${basedir}/target/${nuxeo.contact.jar}"/>
         </copy>
     </target>

diff --git a/services/contact/3rdparty/nuxeo-platform-cs-contact/pom.xml b/services/contact/3rdparty/nuxeo-platform-cs-contact/pom.xml
index 350e1b4298f6e2a01bb6721d940ef96860b07959..f571592bcafbdb53005ead9bb1e40eb429bd6af1 100644 (file)
--- a/services/contact/3rdparty/nuxeo-platform-cs-contact/pom.xml
+++ b/services/contact/3rdparty/nuxeo-platform-cs-contact/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.contact.3rdparty</artifactId>
-        <version>0.6-SNAPSHOT</version>
+        <version>0.7-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/contact/3rdparty/pom.xml b/services/contact/3rdparty/pom.xml
index 272058fc717005a8397b27569ff93cb748ca8809..e86e9bdca2927663e43716c2585ec39a6da6f18e 100644 (file)
--- a/services/contact/3rdparty/pom.xml
+++ b/services/contact/3rdparty/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.contact</artifactId>
-        <version>0.6-SNAPSHOT</version>
+        <version>0.7-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/contact/client/pom.xml b/services/contact/client/pom.xml
index b7fe757477a2a77588bf957ef0290c9fca94882e..5d447317626a795977ba984879ad53ecdca9321e 100644 (file)
--- a/services/contact/client/pom.xml
+++ b/services/contact/client/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>org.collectionspace.services.contact</artifactId>
         <groupId>org.collectionspace.services</groupId>
-        <version>0.6-SNAPSHOT</version>
+        <version>0.7-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/contact/jaxb/pom.xml b/services/contact/jaxb/pom.xml
index 9449813d625bea044cc50f1921007a6e9c8f162f..0ec88d7ee81a24fd8cda3c440d1378ca56397196 100644 (file)
--- a/services/contact/jaxb/pom.xml
+++ b/services/contact/jaxb/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.contact</artifactId>
-        <version>0.6-SNAPSHOT</version>
+        <version>0.7-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/contact/pom.xml b/services/contact/pom.xml
index 0fdd89c94bd57ca89e1c91ed1b7592758e851d70..d0b555824a3e90b63af0d5026e37c2f3bacd9748 100644 (file)
--- a/services/contact/pom.xml
+++ b/services/contact/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>org.collectionspace.services.main</artifactId>
         <groupId>org.collectionspace.services</groupId>
-        <version>0.6-SNAPSHOT</version>
+        <version>0.7-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/contact/service/pom.xml b/services/contact/service/pom.xml
index 13f1007cbb8a225909271d44e9e27930f9322f5d..bbe6e44b462b5527d2513f7d483def367489f29a 100644 (file)
--- a/services/contact/service/pom.xml
+++ b/services/contact/service/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>org.collectionspace.services.contact</artifactId>
         <groupId>org.collectionspace.services</groupId>
-        <version>0.6-SNAPSHOT</version>
+        <version>0.7-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/dimension/3rdparty/nuxeo-platform-cs-dimension/build.xml b/services/dimension/3rdparty/nuxeo-platform-cs-dimension/build.xml
index 5ad7d273b7861b418bddbc6bb3f7acdbcc8388df..647c71fc786ec682f410a1f617e9ffa1f304eb0b 100644 (file)
--- a/services/dimension/3rdparty/nuxeo-platform-cs-dimension/build.xml
+++ b/services/dimension/3rdparty/nuxeo-platform-cs-dimension/build.xml
@@ -3,16 +3,19 @@
     <description>
         dimension nuxeo document type
     </description>
-  <!-- set global properties for this build -->
+    <!-- set global properties for this build -->
     <property name="services.trunk" value="../../../.."/>
-    <!-- enviornment should be declared before reading build.properties -->
+    <!-- environment should be declared before reading build.properties -->
     <property environment="env" />
     <property file="${services.trunk}/build.properties" />
     <property name="mvn.opts" value="" />
     <property name="src" location="src"/>
     <property name="build" location="build"/>
     <property name="dist"  location="dist"/>
-    <property name="nuxeo.dimension.jar" value="org.collectionspace.services.dimension.3rdparty.nuxeo-${cspace.release}.jar"/>
+    <property name="nuxeo.dimension.jar"
+        value="org.collectionspace.services.dimension.3rdparty.nuxeo-${cspace.release}.jar"/>
+    <property name="nuxeo.dimension.jars.all"
+        value="org.collectionspace.services.dimension.3rdparty.nuxeo-*.jar"/>
 
     <condition property="osfamily-unix">
         <os family="unix" />
@@ -22,12 +25,12 @@
     </condition>
 
     <target name="init" >
-    <!-- Create the time stamp -->
+        <!-- Create the time stamp -->
         <tstamp/>
     </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" />
@@ -52,7 +55,7 @@
     </target>
 
     <target name="install" depends="install-unix,install-windows"
-  description="Install" />
+        description="Install" />
     <target name="install-unix" if="osfamily-unix">
         <exec executable="mvn" failonerror="true">
             <arg value="install" />
@@ -112,20 +115,27 @@
     </target>
 
     <target name="deploy" depends="install"
-    description="deploy dimension doctype in ${jboss.server.nuxeo}">
+        description="deploy dimension doctype in ${jboss.server.nuxeo}">
         <copy file="${basedir}/target/${nuxeo.dimension.jar}"
-        todir="${jboss.deploy.nuxeo.system}"/>
+        todir="${jboss.deploy.nuxeo.plugins}"/>
     </target>
 
     <target name="undeploy"
-    description="undeploy dimension doctype from ${jboss.server.nuxeo}">
-        <delete file="${jboss.deploy.nuxeo.system}/${nuxeo.dimension.jar}"/>
+        description="undeploy dimension doctype from ${jboss.server.nuxeo}">
+        <delete>
+            <fileset dir="${jboss.deploy.nuxeo.plugins}">
+                <include name="${nuxeo.dimension.jars.all}"/>
+            </fileset>
+            <!-- Legacy deployment location through release 0.6 -->
+            <fileset dir="${jboss.deploy.nuxeo.system}">
+                <include name="${nuxeo.dimension.jars.all}"/>
+            </fileset>
+        </delete>
     </target>
 
-
     <target name="dist"
-    description="generate distribution for dimension doctype" depends="package">
-        <copy todir="${services.trunk}/${dist.deploy.nuxeo.system}">
+        description="generate distribution for dimension doctype" depends="package">
+        <copy todir="${services.trunk}/${dist.deploy.nuxeo.plugins}">
             <fileset file="${basedir}/target/${nuxeo.dimension.jar}"/>
         </copy>
     </target>

diff --git a/services/dimension/3rdparty/nuxeo-platform-cs-dimension/pom.xml b/services/dimension/3rdparty/nuxeo-platform-cs-dimension/pom.xml
index 1e12e77952253ffb629685573b7f594a6dc944a6..b8ea18fee1c03b3c8db25f18b2fe6182fb24f513 100644 (file)
--- a/services/dimension/3rdparty/nuxeo-platform-cs-dimension/pom.xml
+++ b/services/dimension/3rdparty/nuxeo-platform-cs-dimension/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.dimension.3rdparty</artifactId>
-        <version>0.6-SNAPSHOT</version>
+        <version>0.7-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/dimension/3rdparty/pom.xml b/services/dimension/3rdparty/pom.xml
index aae31ccc87da15679868d841ce506efa9b5f6aac..e95c7dd2b98d559a9fdf19ebc1e632f6781faed6 100644 (file)
--- a/services/dimension/3rdparty/pom.xml
+++ b/services/dimension/3rdparty/pom.xml
@@ -5,7 +5,7 @@
     <parent>\r
         <groupId>org.collectionspace.services</groupId>\r
         <artifactId>org.collectionspace.services.dimension</artifactId>\r
-        <version>0.6-SNAPSHOT</version>\r
+        <version>0.7-SNAPSHOT</version>\r
     </parent>\r
     \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/dimension/client/pom.xml b/services/dimension/client/pom.xml
index f2b9a97732e46c9415e83f64d3881371543be721..ecd144b2aff7150f9b634196ef347929257eba28 100644 (file)
--- a/services/dimension/client/pom.xml
+++ b/services/dimension/client/pom.xml
@@ -6,7 +6,7 @@
     <parent>\r
         <groupId>org.collectionspace.services</groupId>\r
         <artifactId>org.collectionspace.services.dimension</artifactId>\r
-        <version>0.6-SNAPSHOT</version>\r
+        <version>0.7-SNAPSHOT</version>\r
     </parent>\r
 \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/dimension/jaxb/pom.xml b/services/dimension/jaxb/pom.xml
index ccd5849d4f94c22926f54e3a94ecc74ae4bd680f..cd90019d82411de98a19e8228c6986fd52c3258a 100644 (file)
--- a/services/dimension/jaxb/pom.xml
+++ b/services/dimension/jaxb/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.dimension</artifactId>
-        <version>0.6-SNAPSHOT</version>
+        <version>0.7-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/dimension/pom.xml b/services/dimension/pom.xml
index f79ad2fade25b818ef5fdaba8343fa90fc749158..9416ddc79c2985c72ce743e4b1cbb0fab544d5c3 100644 (file)
--- a/services/dimension/pom.xml
+++ b/services/dimension/pom.xml
@@ -5,7 +5,7 @@
     <parent>\r
         <artifactId>org.collectionspace.services.main</artifactId>\r
         <groupId>org.collectionspace.services</groupId>\r
-        <version>0.6-SNAPSHOT</version>\r
+        <version>0.7-SNAPSHOT</version>\r
     </parent>\r
 \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/dimension/service/pom.xml b/services/dimension/service/pom.xml
index f9fd0f45bcbf81b86ec1a1feaf2c7ce286399682..289b15ba7961117155964399c6d7a87acc9be047 100644 (file)
--- a/services/dimension/service/pom.xml
+++ b/services/dimension/service/pom.xml
@@ -4,7 +4,7 @@
     <parent>\r
         <groupId>org.collectionspace.services</groupId>\r
         <artifactId>org.collectionspace.services.dimension</artifactId>\r
-        <version>0.6-SNAPSHOT</version>\r
+        <version>0.7-SNAPSHOT</version>\r
     </parent>\r
     \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/id/3rdparty/pom.xml b/services/id/3rdparty/pom.xml
index ba67c97b6996259399b740dc60a0aed17bf62b66..c4672e6f0fd09dddff661576161378da7e80fc78 100644 (file)
--- a/services/id/3rdparty/pom.xml
+++ b/services/id/3rdparty/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.id</artifactId>
-        <version>0.6-SNAPSHOT</version>
+        <version>0.7-SNAPSHOT</version>
     </parent>
         
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/id/client/pom.xml b/services/id/client/pom.xml
index 23917b6a7b52864b86eeaf3ddbdd1922102b5dde..34ad26e9f978a8479df64b9113572e3d55075175 100644 (file)
--- a/services/id/client/pom.xml
+++ b/services/id/client/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.id</artifactId>
-        <version>0.6-SNAPSHOT</version>
+        <version>0.7-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/id/jaxb/pom.xml b/services/id/jaxb/pom.xml
index a64567d03f7f78135e39cbfe715aea8ddabf2536..8636bed9ee2d799c154de5786b898465c2d8946e 100644 (file)
--- a/services/id/jaxb/pom.xml
+++ b/services/id/jaxb/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.collectionspace.services</groupId>
     <artifactId>org.collectionspace.services.id</artifactId>
-    <version>0.6-SNAPSHOT</version>
+    <version>0.7-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

diff --git a/services/id/pom.xml b/services/id/pom.xml
index 085b8982a6c26346aeee6025ce41085fe7465898..82bee525f05fc4b3b9f31d9edcd20dd5ac9247bc 100644 (file)
--- a/services/id/pom.xml
+++ b/services/id/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.collectionspace.services</groupId>
     <artifactId>org.collectionspace.services.main</artifactId>
-    <version>0.6-SNAPSHOT</version>
+    <version>0.7-SNAPSHOT</version>
   </parent>
   
   <modelVersion>4.0.0</modelVersion>

diff --git a/services/id/service/pom.xml b/services/id/service/pom.xml
index 45d265ff63e48cf4b64a0ab18bb1458e807a65fa..0b6ab8dd1584862c5f328bc280f541add8148103 100644 (file)
--- a/services/id/service/pom.xml
+++ b/services/id/service/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <artifactId>org.collectionspace.services.id</artifactId>
     <groupId>org.collectionspace.services</groupId>
-    <version>0.6-SNAPSHOT</version>
+    <version>0.7-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

diff --git a/services/intake/3rdparty/nuxeo-platform-cs-intake/build.xml b/services/intake/3rdparty/nuxeo-platform-cs-intake/build.xml
index a9b2e6bf750218ff365612a6c82e37c145856bc1..8eb9f1a053fa0df5b12f3daee8af6792e60032f0 100644 (file)
--- a/services/intake/3rdparty/nuxeo-platform-cs-intake/build.xml
+++ b/services/intake/3rdparty/nuxeo-platform-cs-intake/build.xml
@@ -3,14 +3,17 @@
     <description>
         intake nuxeo document type
     </description>
-  <!-- set global properties for this build -->
+    <!-- set global properties for this build -->
     <property name="services.trunk" value="../../../.."/>
-    <!-- enviornment should be declared before reading build.properties -->
+    <!-- environment should be declared before reading build.properties -->
     <property environment="env" />
     <property file="${services.trunk}/build.properties" />
     <property name="mvn.opts" value="" />
     <property name="src" location="src"/>
-    <property name="nuxeo.intake.jar" value="org.collectionspace.services.intake.3rdparty.nuxeo-${cspace.release}.jar"/>
+    <property name="nuxeo.intake.jar"
+        value="org.collectionspace.services.intake.3rdparty.nuxeo-${cspace.release}.jar"/>
+    <property name="nuxeo.intake.jars.all"
+        value="org.collectionspace.services.intake.3rdparty.nuxeo-*.jar"/>
 
     <condition property="osfamily-unix">
         <os family="unix" />
@@ -20,12 +23,12 @@
     </condition>
 
     <target name="init" >
-    <!-- Create the time stamp -->
+        <!-- Create the time stamp -->
         <tstamp/>
     </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" />
@@ -50,7 +53,7 @@
     </target>
 
     <target name="install" depends="install-unix,install-windows"
-  description="Install" />
+        description="Install" />
     <target name="install-unix" if="osfamily-unix">
         <exec executable="mvn" failonerror="true">
             <arg value="install" />
@@ -75,7 +78,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">
@@ -110,20 +113,27 @@
     </target>
 
     <target name="deploy" depends="install"
-    description="deploy intake doctype in ${jboss.server.nuxeo}">
+        description="deploy intake doctype in ${jboss.server.nuxeo}">
         <copy file="${basedir}/target/${nuxeo.intake.jar}"
-        todir="${jboss.deploy.nuxeo.system}"/>
+        todir="${jboss.deploy.nuxeo.plugins}"/>
     </target>
 
     <target name="undeploy"
-    description="undeploy intake doctype from ${jboss.server.nuxeo}">
-        <delete file="${jboss.deploy.nuxeo.system}/${nuxeo.intake.jar}"/>
+        description="undeploy intake doctype from ${jboss.server.nuxeo}">
+        <delete>
+            <fileset dir="${jboss.deploy.nuxeo.plugins}">
+                <include name="${nuxeo.intake.jars.all}"/>
+            </fileset>
+            <!-- Legacy deployment location through release 0.6 -->
+            <fileset dir="${jboss.deploy.nuxeo.system}">
+                <include name="${nuxeo.intake.jars.all}"/>
+            </fileset>
+        </delete>
     </target>
 
-
     <target name="dist"
-    description="generate distribution for intake doctype" depends="package">
-        <copy todir="${services.trunk}/${dist.deploy.nuxeo.system}">
+        description="generate distribution for intake doctype" depends="package">
+        <copy todir="${services.trunk}/${dist.deploy.nuxeo.plugins}">
             <fileset file="${basedir}/target/${nuxeo.intake.jar}"/>
         </copy>
     </target>

diff --git a/services/intake/3rdparty/nuxeo-platform-cs-intake/pom.xml b/services/intake/3rdparty/nuxeo-platform-cs-intake/pom.xml
index 529a0553c0c39ff03b5e3dda0f56ec7ffbab7cd6..02ffb7399e06434a4607345ae54ad98b83e87d5c 100644 (file)
--- a/services/intake/3rdparty/nuxeo-platform-cs-intake/pom.xml
+++ b/services/intake/3rdparty/nuxeo-platform-cs-intake/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.intake.3rdparty</artifactId>
-        <version>0.6-SNAPSHOT</version>
+        <version>0.7-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/intake/3rdparty/pom.xml b/services/intake/3rdparty/pom.xml
index 417e1097d24abbe856a3aa74e181618d8a3f43c1..b3b89cf50eb802d6342c4826162a62a53bd8bade 100644 (file)
--- a/services/intake/3rdparty/pom.xml
+++ b/services/intake/3rdparty/pom.xml
@@ -5,7 +5,7 @@
     <parent>\r
         <artifactId>org.collectionspace.services.intake</artifactId>\r
         <groupId>org.collectionspace.services</groupId>\r
-        <version>0.6-SNAPSHOT</version>\r
+        <version>0.7-SNAPSHOT</version>\r
     </parent>\r
     \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/intake/client/pom.xml b/services/intake/client/pom.xml
index 1fc96a5cacb835255e0cf539e26b840af7a4839d..e7487b6b6b46b331a3f620b721fc5258d1de644d 100644 (file)
--- a/services/intake/client/pom.xml
+++ b/services/intake/client/pom.xml
@@ -5,7 +5,7 @@
     <parent>\r
         <groupId>org.collectionspace.services</groupId>\r
         <artifactId>org.collectionspace.services.intake</artifactId>\r
-        <version>0.6-SNAPSHOT</version>\r
+        <version>0.7-SNAPSHOT</version>\r
     </parent>\r
 \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/intake/jaxb/pom.xml b/services/intake/jaxb/pom.xml
index c20ccf711f3d4af16970fb123428045bd34fcfae..066f9c3bbea67f92a3e7bcf38b8d008bb1757749 100644 (file)
--- a/services/intake/jaxb/pom.xml
+++ b/services/intake/jaxb/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>org.collectionspace.services.intake</artifactId>
         <groupId>org.collectionspace.services</groupId>
-        <version>0.6-SNAPSHOT</version>
+        <version>0.7-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/intake/pom.xml b/services/intake/pom.xml
index 9f4e6ffa374b9a7e63fcd6c2503443650b9ebf9e..fcf8a13761c3ec2940b10d93405017fa120bd340 100644 (file)
--- a/services/intake/pom.xml
+++ b/services/intake/pom.xml
@@ -4,7 +4,7 @@
     <parent>\r
         <groupId>org.collectionspace.services</groupId>\r
         <artifactId>org.collectionspace.services.main</artifactId>\r
-        <version>0.6-SNAPSHOT</version>\r
+        <version>0.7-SNAPSHOT</version>\r
     </parent>\r
     \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/intake/service/pom.xml b/services/intake/service/pom.xml
index 13efb3e4b49ead32f3129abd9e3c145dee513444..1ccf374165527ce943b60ca42001c1be2bad06f1 100644 (file)
--- a/services/intake/service/pom.xml
+++ b/services/intake/service/pom.xml
@@ -4,7 +4,7 @@
     <parent>\r
         <groupId>org.collectionspace.services</groupId>\r
         <artifactId>org.collectionspace.services.intake</artifactId>        \r
-        <version>0.6-SNAPSHOT</version>\r
+        <version>0.7-SNAPSHOT</version>\r
     </parent>\r
     \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/jaxb/pom.xml b/services/jaxb/pom.xml
index 557f34eeb41ce84c919f0998e7c1b2da4cbb153a..80504f67ecbcc164bed6da9708f8146bea5f2269 100644 (file)
--- a/services/jaxb/pom.xml
+++ b/services/jaxb/pom.xml
@@ -26,7 +26,7 @@
   <parent>\r
     <groupId>org.collectionspace.services</groupId>\r
     <artifactId>org.collectionspace.services.main</artifactId>\r
-    <version>0.6-SNAPSHOT</version>\r
+    <version>0.7-SNAPSHOT</version>\r
   </parent>\r
   \r
   <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/loanin/3rdparty/nuxeo-platform-cs-loanin/build.xml b/services/loanin/3rdparty/nuxeo-platform-cs-loanin/build.xml
index d13a9a3f5fa8ed730d5027ae79ad32e9a84ad4e2..fe213ee0a7182b47df374aba15712f84a213c76b 100644 (file)
--- a/services/loanin/3rdparty/nuxeo-platform-cs-loanin/build.xml
+++ b/services/loanin/3rdparty/nuxeo-platform-cs-loanin/build.xml
@@ -3,14 +3,17 @@
     <description>
         loanin nuxeo document type
     </description>
-  <!-- set global properties for this build -->
+    <!-- set global properties for this build -->
     <property name="services.trunk" value="../../../.."/>
-    <!-- enviornment should be declared before reading build.properties -->
+    <!-- environment should be declared before reading build.properties -->
     <property environment="env" />
     <property file="${services.trunk}/build.properties" />
     <property name="mvn.opts" value="" />
     <property name="src" location="src"/>
-    <property name="nuxeo.loanin.jar" value="org.collectionspace.services.loanin.3rdparty.nuxeo-${cspace.release}.jar"/>
+    <property name="nuxeo.loanin.jar"
+        value="org.collectionspace.services.loanin.3rdparty.nuxeo-${cspace.release}.jar"/>
+    <property name="nuxeo.loanin.jars.all"
+        value="org.collectionspace.services.loanin.3rdparty.nuxeo-*.jar"/>
 
     <condition property="osfamily-unix">
         <os family="unix" />
@@ -20,12 +23,12 @@
     </condition>
 
     <target name="init" >
-    <!-- Create the time stamp -->
+        <!-- Create the time stamp -->
         <tstamp/>
     </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" />
@@ -50,7 +53,7 @@
     </target>
 
     <target name="install" depends="install-unix,install-windows"
-  description="Install" />
+        description="Install" />
     <target name="install-unix" if="osfamily-unix">
         <exec executable="mvn" failonerror="true">
             <arg value="install" />
@@ -75,7 +78,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">
@@ -110,20 +113,27 @@
     </target>
 
     <target name="deploy" depends="install"
-    description="deploy loanin doctype in ${jboss.server.nuxeo}">
+        description="deploy loanin doctype in ${jboss.server.nuxeo}">
         <copy file="${basedir}/target/${nuxeo.loanin.jar}"
-        todir="${jboss.deploy.nuxeo.system}"/>
+        todir="${jboss.deploy.nuxeo.plugins}"/>
     </target>
 
     <target name="undeploy"
-    description="undeploy loanin doctype from ${jboss.server.nuxeo}">
-        <delete file="${jboss.deploy.nuxeo.system}/${nuxeo.loanin.jar}"/>
+        description="undeploy loanin doctype from ${jboss.server.nuxeo}">
+        <delete>
+            <fileset dir="${jboss.deploy.nuxeo.plugins}">
+                <include name="${nuxeo.loanin.jars.all}"/>
+            </fileset>
+            <!-- Legacy deployment location through release 0.6 -->
+            <fileset dir="${jboss.deploy.nuxeo.system}">
+                <include name="${nuxeo.loanin.jars.all}"/>
+            </fileset>
+        </delete>
     </target>
 
-
     <target name="dist"
-    description="generate distribution for loanin doctype" depends="package">
-        <copy todir="${services.trunk}/${dist.deploy.nuxeo.system}">
+        description="generate distribution for loanin doctype" depends="package">
+        <copy todir="${services.trunk}/${dist.deploy.nuxeo.plugins}">
             <fileset file="${basedir}/target/${nuxeo.loanin.jar}"/>
         </copy>
     </target>

diff --git a/services/loanin/3rdparty/nuxeo-platform-cs-loanin/pom.xml b/services/loanin/3rdparty/nuxeo-platform-cs-loanin/pom.xml
index 1fd5f95a7f50ae741879b554108f6289c30b06e6..3f8fa31336c06c9d52e96465235f8fecec8bac3d 100644 (file)
--- a/services/loanin/3rdparty/nuxeo-platform-cs-loanin/pom.xml
+++ b/services/loanin/3rdparty/nuxeo-platform-cs-loanin/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.loanin.3rdparty</artifactId>
-        <version>0.6-SNAPSHOT</version>
+        <version>0.7-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/loanin/3rdparty/pom.xml b/services/loanin/3rdparty/pom.xml
index 30eb2a0b3ba6f1285c20762e25246e78648f54a9..070091d2a3fba6c405b11a20167c74240019c29f 100644 (file)
--- a/services/loanin/3rdparty/pom.xml
+++ b/services/loanin/3rdparty/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>org.collectionspace.services.loanin</artifactId>
         <groupId>org.collectionspace.services</groupId>
-        <version>0.6-SNAPSHOT</version>
+        <version>0.7-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/loanin/client/pom.xml b/services/loanin/client/pom.xml
index f81ebb84b656a1cbcc2a2f506369a99e97857e86..b64917c617d2766a0a561881053342075aabb69a 100644 (file)
--- a/services/loanin/client/pom.xml
+++ b/services/loanin/client/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.loanin</artifactId>
-        <version>0.6-SNAPSHOT</version>
+        <version>0.7-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/loanin/client/src/test/java/org/collectionspace/services/client/test/LoaninAuthRefsTest.java b/services/loanin/client/src/test/java/org/collectionspace/services/client/test/LoaninAuthRefsTest.java
index 807629ca76145b78fa68d24a7ae75f6930347afa..4dc8fd1fb296d0de9228e003c63906dcba5f2215 100644 (file)
--- a/services/loanin/client/src/test/java/org/collectionspace/services/client/test/LoaninAuthRefsTest.java
+++ b/services/loanin/client/src/test/java/org/collectionspace/services/client/test/LoaninAuthRefsTest.java
@@ -313,13 +313,13 @@ public class LoaninAuthRefsTest extends BaseServiceTest {
                String returnDate,
                 String lendersAuthorizer,
                 String lendersContact,
-                String loanInContact) {
+                String loaninContact) {
         LoansinCommon loanin = new LoansinCommon();
         loanin.setLoanInNumber(loaninNumber);
         loanin.setLoanInNumber(returnDate);
         loanin.setLendersAuthorizer(lendersAuthorizer);
         loanin.setLendersContact(lendersContact);
-        loanin.setLoanInContact(loanInContact);
+        loanin.setLoanInContact(loaninContact);
         MultipartOutput multipart = new MultipartOutput();
         OutputPart commonPart =
             multipart.addPart(loanin, MediaType.APPLICATION_XML_TYPE);

diff --git a/services/loanin/client/src/test/java/org/collectionspace/services/client/test/LoaninServiceTest.java b/services/loanin/client/src/test/java/org/collectionspace/services/client/test/LoaninServiceTest.java
index 4a72a4d005944514b5f04c85c6cd7b2db51aab14..8a0f95e79f62aa13711b3e9b1976877ae0b9f867 100644 (file)
--- a/services/loanin/client/src/test/java/org/collectionspace/services/client/test/LoaninServiceTest.java
+++ b/services/loanin/client/src/test/java/org/collectionspace/services/client/test/LoaninServiceTest.java
@@ -615,14 +615,14 @@ public class LoaninServiceTest extends AbstractServiceTestImpl {
 
     private MultipartOutput createLoaninInstance(String identifier) {
         return createLoaninInstance(
-                "entryNumber-" + identifier,
-                "entryDate-" + identifier);
+                "loaninNumber-" + identifier,
+                "returnDate-" + identifier);
     }
 
-    private MultipartOutput createLoaninInstance(String loanInNumber,
+    private MultipartOutput createLoaninInstance(String loaninNumber,
                String returnDate) {
         LoansinCommon loanin = new LoansinCommon();
-        loanin.setLoanInNumber(loanInNumber);
+        loanin.setLoanInNumber(loaninNumber);
         loanin.setLoanReturnDate(returnDate);
         LenderList lenderList = new LenderList();
         lenderList.getLender().add(

diff --git a/services/loanin/jaxb/pom.xml b/services/loanin/jaxb/pom.xml
index 3cf6146fb42a7f9f36d0b271fa1041bb75fcdb02..6c2ff720fc8bca3a27c08006160a3483c02e934c 100644 (file)
--- a/services/loanin/jaxb/pom.xml
+++ b/services/loanin/jaxb/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>org.collectionspace.services.loanin</artifactId>
         <groupId>org.collectionspace.services</groupId>
-        <version>0.6-SNAPSHOT</version>
+        <version>0.7-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/loanin/pom.xml b/services/loanin/pom.xml
index 1f055444012362a9caa760cdabb1ea45a39f7977..8b8bb77626c02f506d4812afc5fe948145a01168 100644 (file)
--- a/services/loanin/pom.xml
+++ b/services/loanin/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.main</artifactId>
-        <version>0.6-SNAPSHOT</version>
+        <version>0.7-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/loanin/service/pom.xml b/services/loanin/service/pom.xml
index 7f686e138abb6f5a3005f2aef0f861763648450d..9deb8b93ef95710892fde91c9f875693d9f7e856 100644 (file)
--- a/services/loanin/service/pom.xml
+++ b/services/loanin/service/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.loanin</artifactId>        
-        <version>0.6-SNAPSHOT</version>
+        <version>0.7-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/loanout/3rdparty/nuxeo-platform-cs-loanout/build.xml b/services/loanout/3rdparty/nuxeo-platform-cs-loanout/build.xml
index faa7237143f3c7856335d2d2c75f719869cf671f..0ccd3bbafdce65158361ab90192c2fb7d18e7aa4 100644 (file)
--- a/services/loanout/3rdparty/nuxeo-platform-cs-loanout/build.xml
+++ b/services/loanout/3rdparty/nuxeo-platform-cs-loanout/build.xml
@@ -3,14 +3,17 @@
     <description>
         loanout nuxeo document type
     </description>
-  <!-- set global properties for this build -->
+    <!-- set global properties for this build -->
     <property name="services.trunk" value="../../../.."/>
-    <!-- enviornment should be declared before reading build.properties -->
+    <!-- environment should be declared before reading build.properties -->
     <property environment="env" />
     <property file="${services.trunk}/build.properties" />
     <property name="mvn.opts" value="" />
     <property name="src" location="src"/>
-    <property name="nuxeo.loanout.jar" value="org.collectionspace.services.loanout.3rdparty.nuxeo-${cspace.release}.jar"/>
+    <property name="nuxeo.loanout.jar"
+        value="org.collectionspace.services.loanout.3rdparty.nuxeo-${cspace.release}.jar"/>
+    <property name="nuxeo.loanout.jars.all"
+        value="org.collectionspace.services.loanout.3rdparty.nuxeo-*.jar"/>
 
     <condition property="osfamily-unix">
         <os family="unix" />
@@ -20,12 +23,12 @@
     </condition>
 
     <target name="init" >
-    <!-- Create the time stamp -->
+        <!-- Create the time stamp -->
         <tstamp/>
     </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" />
@@ -50,7 +53,7 @@
     </target>
 
     <target name="install" depends="install-unix,install-windows"
-  description="Install" />
+        description="Install" />
     <target name="install-unix" if="osfamily-unix">
         <exec executable="mvn" failonerror="true">
             <arg value="install" />
@@ -75,7 +78,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">
@@ -110,20 +113,28 @@
     </target>
 
     <target name="deploy" depends="install"
-    description="deploy loanout doctype in ${jboss.server.nuxeo}">
+        description="deploy loanout doctype in ${jboss.server.nuxeo}">
         <copy file="${basedir}/target/${nuxeo.loanout.jar}"
-        todir="${jboss.deploy.nuxeo.system}"/>
+        todir="${jboss.deploy.nuxeo.plugins}"/>
     </target>
 
     <target name="undeploy"
-    description="undeploy loanout doctype from ${jboss.server.nuxeo}">
-        <delete file="${jboss.deploy.nuxeo.system}/${nuxeo.loanout.jar}"/>
+        description="undeploy loanout doctype from ${jboss.server.nuxeo}">
+        <delete>
+            <fileset dir="${jboss.deploy.nuxeo.plugins}">
+                <include name="${nuxeo.loanout.jars.all}"/>
+            </fileset>
+            <!-- Legacy deployment location through release 0.6 -->
+            <fileset dir="${jboss.deploy.nuxeo.system}">
+                <include name="${nuxeo.loanout.jars.all}"/>
+            </fileset>
+        </delete>
     </target>
 
 
     <target name="dist"
-    description="generate distribution for loanout doctype" depends="package">
-        <copy todir="${services.trunk}/${dist.deploy.nuxeo.system}">
+        description="generate distribution for loanout doctype" depends="package">
+        <copy todir="${services.trunk}/${dist.deploy.nuxeo.plugins}">
             <fileset file="${basedir}/target/${nuxeo.loanout.jar}"/>
         </copy>
     </target>

diff --git a/services/loanout/3rdparty/nuxeo-platform-cs-loanout/pom.xml b/services/loanout/3rdparty/nuxeo-platform-cs-loanout/pom.xml
index 4b2800bc94ad9e59f899315028e581a54dbc7f2a..e7dbd669130e76aef31a57acb5877fcea58ef100 100644 (file)
--- a/services/loanout/3rdparty/nuxeo-platform-cs-loanout/pom.xml
+++ b/services/loanout/3rdparty/nuxeo-platform-cs-loanout/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.loanout.3rdparty</artifactId>
-        <version>0.6-SNAPSHOT</version>
+        <version>0.7-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/loanout/3rdparty/pom.xml b/services/loanout/3rdparty/pom.xml
index bdaa4e88f70e473bc9505614c6e85874b4c5272f..207e51ce5b115867116e50af219947a3864e63a9 100644 (file)
--- a/services/loanout/3rdparty/pom.xml
+++ b/services/loanout/3rdparty/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>org.collectionspace.services.loanout</artifactId>
         <groupId>org.collectionspace.services</groupId>
-        <version>0.6-SNAPSHOT</version>
+        <version>0.7-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/loanout/client/pom.xml b/services/loanout/client/pom.xml
index cd0d3224ad97b954951b7f92ba1d2ac2f87a6d42..93f2e0f05b4337e8fa370ae09a91c1f1d33028ca 100644 (file)
--- a/services/loanout/client/pom.xml
+++ b/services/loanout/client/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.loanout</artifactId>
-        <version>0.6-SNAPSHOT</version>
+        <version>0.7-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/loanout/jaxb/pom.xml b/services/loanout/jaxb/pom.xml
index 601164f0662aaa269858d4b1479a75ffa7ef0973..324f180f4b4a430a8ee6cd7abb6c8966bcc7d0ab 100644 (file)
--- a/services/loanout/jaxb/pom.xml
+++ b/services/loanout/jaxb/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>org.collectionspace.services.loanout</artifactId>
         <groupId>org.collectionspace.services</groupId>
-        <version>0.6-SNAPSHOT</version>
+        <version>0.7-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/loanout/pom.xml b/services/loanout/pom.xml
index 45f1ffa52b78d6e019a19c25e4fada900030265d..7f2d4e094cf12c36cb8e94e3dadaa2d848f8dec3 100644 (file)
--- a/services/loanout/pom.xml
+++ b/services/loanout/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.main</artifactId>
-        <version>0.6-SNAPSHOT</version>
+        <version>0.7-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/loanout/service/pom.xml b/services/loanout/service/pom.xml
index 4e0dee16c82e2bf4bd597bb77597b09320ce95b1..3fd62547fe1d51b1451bab606a95e3145aa3f9ae 100644 (file)
--- a/services/loanout/service/pom.xml
+++ b/services/loanout/service/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.loanout</artifactId>        
-        <version>0.6-SNAPSHOT</version>
+        <version>0.7-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/organization/3rdparty/nuxeo-platform-cs-organization/build.xml b/services/organization/3rdparty/nuxeo-platform-cs-organization/build.xml
index 0d659f651d8bf3c7b809c466f677fdebcc3aafd4..9421bece212ce7fc09a9b67979bdb412bea32d22 100644 (file)
--- a/services/organization/3rdparty/nuxeo-platform-cs-organization/build.xml
+++ b/services/organization/3rdparty/nuxeo-platform-cs-organization/build.xml
@@ -3,14 +3,17 @@
     <description>
         organization nuxeo document type
     </description>
-  <!-- set global properties for this build -->
+    <!-- set global properties for this build -->
     <property name="services.trunk" value="../../../.."/>
-    <!-- enviornment should be declared before reading build.properties -->
+    <!-- environment should be declared before reading build.properties -->
     <property environment="env" />
     <property file="${services.trunk}/build.properties" />
     <property name="mvn.opts" value="" />
     <property name="src" location="src"/>
-    <property name="nuxeo.organization.jar" value="org.collectionspace.services.organization.3rdparty.nuxeo-${cspace.release}.jar"/>
+    <property name="nuxeo.organization.jar"
+        value="org.collectionspace.services.organization.3rdparty.nuxeo-${cspace.release}.jar"/>
+    <property name="nuxeo.organization.jars.all"
+        value="org.collectionspace.services.organization.3rdparty.nuxeo-*.jar"/>
 
     <condition property="osfamily-unix">
         <os family="unix" />
@@ -20,12 +23,12 @@
     </condition>
 
     <target name="init" >
-    <!-- Create the time stamp -->
+        <!-- Create the time stamp -->
         <tstamp/>
     </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" />
@@ -50,7 +53,7 @@
     </target>
 
     <target name="install" depends="install-unix,install-windows"
-  description="Install" />
+        description="Install" />
     <target name="install-unix" if="osfamily-unix">
         <exec executable="mvn" failonerror="true">
             <arg value="install" />
@@ -75,7 +78,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">
@@ -110,19 +113,27 @@
     </target>
 
     <target name="deploy" depends="install"
-    description="deploy organization doctype in ${jboss.server.nuxeo}">
+        description="deploy organization doctype in ${jboss.server.nuxeo}">
         <copy file="${basedir}/target/${nuxeo.organization.jar}"
-        todir="${jboss.deploy.nuxeo.system}"/>
+        todir="${jboss.deploy.nuxeo.plugins}"/>
     </target>
 
     <target name="undeploy"
-    description="undeploy organization doctype from ${jboss.server.nuxeo}">
-        <delete file="${jboss.deploy.nuxeo.system}/${nuxeo.organization.jar}"/>
+        description="undeploy organization doctype from ${jboss.server.nuxeo}">
+        <delete>
+            <fileset dir="${jboss.deploy.nuxeo.plugins}">
+                <include name="${nuxeo.organization.jars.all}"/>
+            </fileset>
+            <!-- Legacy deployment location through release 0.6 -->
+            <fileset dir="${jboss.deploy.nuxeo.system}">
+                <include name="${nuxeo.organization.jars.all}"/>
+            </fileset>
+        </delete>
     </target>
 
     <target name="dist"
-    description="generate distribution for organization doctype" depends="package">
-        <copy todir="${services.trunk}/${dist.deploy.nuxeo.system}">
+        description="generate distribution for organization doctype" depends="package">
+        <copy todir="${services.trunk}/${dist.deploy.nuxeo.plugins}">
             <fileset file="${basedir}/target/${nuxeo.organization.jar}"/>
         </copy>
     </target>

diff --git a/services/organization/3rdparty/nuxeo-platform-cs-organization/pom.xml b/services/organization/3rdparty/nuxeo-platform-cs-organization/pom.xml
index 3fdb0afc8341a472f3e9514eade9f4232c6f49f2..040a85ef43e2a4a63d589543a3b14e2ac38901c0 100644 (file)
--- a/services/organization/3rdparty/nuxeo-platform-cs-organization/pom.xml
+++ b/services/organization/3rdparty/nuxeo-platform-cs-organization/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.organization.3rdparty</artifactId>
-        <version>0.6-SNAPSHOT</version>
+        <version>0.7-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/organization/3rdparty/pom.xml b/services/organization/3rdparty/pom.xml
index 3ade652d6419c73f2a6bac818f524da1106aad32..c691f086b892adb0e906c372f3de91326cae40f3 100644 (file)
--- a/services/organization/3rdparty/pom.xml
+++ b/services/organization/3rdparty/pom.xml
@@ -5,7 +5,7 @@
     <parent>\r
         <groupId>org.collectionspace.services</groupId>\r
         <artifactId>org.collectionspace.services.organization</artifactId>\r
-        <version>0.6-SNAPSHOT</version>\r
+        <version>0.7-SNAPSHOT</version>\r
     </parent>\r
     \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/organization/client/pom.xml b/services/organization/client/pom.xml
index 3c370a1f50b259134228a189b5b7cbeb7ac81d91..39416b42676553c8ed78e6605db478422d8ad827 100644 (file)
--- a/services/organization/client/pom.xml
+++ b/services/organization/client/pom.xml
@@ -5,7 +5,7 @@
     <parent>\r
         <groupId>org.collectionspace.services</groupId>\r
         <artifactId>org.collectionspace.services.organization</artifactId>\r
-        <version>0.6-SNAPSHOT</version>\r
+        <version>0.7-SNAPSHOT</version>\r
     </parent>\r
 \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/organization/import/pom.xml b/services/organization/import/pom.xml
index bd9da2fc16b83a8f6d273f78e1ea22f0d2ffb824..2e3886da3ef58bfbdff8ecaa0c483286fcccf345 100644 (file)
--- a/services/organization/import/pom.xml
+++ b/services/organization/import/pom.xml
@@ -5,7 +5,7 @@
     <parent>\r
         <groupId>org.collectionspace.services</groupId>\r
         <artifactId>org.collectionspace.services.organization</artifactId>\r
-        <version>0.6-SNAPSHOT</version>\r
+        <version>0.7-SNAPSHOT</version>\r
     </parent>\r
 \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/organization/installer/build.xml b/services/organization/installer/build.xml
index 250fa2a514b810a88f8aa1227258de6e9b99d539..b2d4c83ef990a9a7cf874cbb2fbc7303962c5afe 100644 (file)
--- a/services/organization/installer/build.xml
+++ b/services/organization/installer/build.xml
@@ -21,7 +21,7 @@
                        <arg value="Installer: Executing Organization 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
+        <copy todir="${jboss.deploy.nuxeo.plugins}">\r
             <fileset file="nuxeo/*.jar"/>\r
         </copy>                                \r
     </target>    \r

diff --git a/services/organization/jaxb/pom.xml b/services/organization/jaxb/pom.xml
index 18ffc00e7fa3c90fc1b65e67ccde9dc54630c81f..4e830b4bb72b613e06c436ada027ea6714e16fc5 100644 (file)
--- a/services/organization/jaxb/pom.xml
+++ b/services/organization/jaxb/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>org.collectionspace.services.organization</artifactId>
         <groupId>org.collectionspace.services</groupId>
-        <version>0.6-SNAPSHOT</version>
+        <version>0.7-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/organization/pom.xml b/services/organization/pom.xml
index f8eadb7c7b147103d5bba5fffc65a27deff93706..4953c184ece3e639e98368ea2427bee2ea5fdee5 100644 (file)
--- a/services/organization/pom.xml
+++ b/services/organization/pom.xml
@@ -3,7 +3,7 @@
     <parent>\r
         <groupId>org.collectionspace.services</groupId>\r
         <artifactId>org.collectionspace.services.main</artifactId>\r
-        <version>0.6-SNAPSHOT</version>\r
+        <version>0.7-SNAPSHOT</version>\r
     </parent>\r
 \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/organization/service/pom.xml b/services/organization/service/pom.xml
index c967d8312f99d3a77b4f20be57a3f3f5600e93c1..7cdf7380d527f6e8286a107401651446cade29d0 100644 (file)
--- a/services/organization/service/pom.xml
+++ b/services/organization/service/pom.xml
@@ -3,7 +3,7 @@
     <parent>\r
         <groupId>org.collectionspace.services</groupId>\r
         <artifactId>org.collectionspace.services.organization</artifactId>\r
-        <version>0.6-SNAPSHOT</version>\r
+        <version>0.7-SNAPSHOT</version>\r
     </parent>\r
     \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/person/3rdparty/nuxeo-platform-cs-person/build.xml b/services/person/3rdparty/nuxeo-platform-cs-person/build.xml
index 518f463fced1dc1abf9ef71be5cb0ea4f5fa1308..699adae2e27f9bd25269b729531935ebf9de3ee8 100644 (file)
--- a/services/person/3rdparty/nuxeo-platform-cs-person/build.xml
+++ b/services/person/3rdparty/nuxeo-platform-cs-person/build.xml
@@ -3,14 +3,17 @@
     <description>
         person nuxeo document type
     </description>
-  <!-- set global properties for this build -->
+    <!-- set global properties for this build -->
     <property name="services.trunk" value="../../../.."/>
-    <!-- enviornment should be declared before reading build.properties -->
+    <!-- environment should be declared before reading build.properties -->
     <property environment="env" />
     <property file="${services.trunk}/build.properties" />
     <property name="mvn.opts" value="" />
     <property name="src" location="src"/>
-    <property name="nuxeo.person.jar" value="org.collectionspace.services.person.3rdparty.nuxeo-${cspace.release}.jar"/>
+    <property name="nuxeo.person.jar"
+        value="org.collectionspace.services.person.3rdparty.nuxeo-${cspace.release}.jar"/>
+    <property name="nuxeo.person.jars.all"
+        value="org.collectionspace.services.person.3rdparty.nuxeo-*.jar"/>
 
     <condition property="osfamily-unix">
         <os family="unix" />
@@ -20,12 +23,12 @@
     </condition>
 
     <target name="init" >
-    <!-- Create the time stamp -->
+        <!-- Create the time stamp -->
         <tstamp/>
     </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" />
@@ -50,7 +53,7 @@
     </target>
 
     <target name="install" depends="install-unix,install-windows"
-  description="Install" />
+        description="Install" />
     <target name="install-unix" if="osfamily-unix">
         <exec executable="mvn" failonerror="true">
             <arg value="install" />
@@ -75,7 +78,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">
@@ -110,19 +113,27 @@
     </target>
 
     <target name="deploy" depends="install"
-    description="deploy person doctype in ${jboss.server.nuxeo}">
+        description="deploy person doctype in ${jboss.server.nuxeo}">
         <copy file="${basedir}/target/${nuxeo.person.jar}"
-        todir="${jboss.deploy.nuxeo.system}"/>
+        todir="${jboss.deploy.nuxeo.plugins}"/>
     </target>
 
     <target name="undeploy"
-    description="undeploy person doctype from ${jboss.server.nuxeo}">
-        <delete file="${jboss.deploy.nuxeo.system}/${nuxeo.person.jar}"/>
+        description="undeploy person doctype from ${jboss.server.nuxeo}">
+        <delete>
+            <fileset dir="${jboss.deploy.nuxeo.plugins}">
+                <include name="${nuxeo.person.jars.all}"/>
+            </fileset>
+            <!-- Legacy deployment location through release 0.6 -->
+            <fileset dir="${jboss.deploy.nuxeo.system}">
+                <include name="${nuxeo.person.jars.all}"/>
+            </fileset>
+        </delete>
     </target>
 
     <target name="dist"
-    description="generate distribution for person doctype" depends="package">
-        <copy todir="${services.trunk}/${dist.deploy.nuxeo.system}">
+        description="generate distribution for person doctype" depends="package">
+        <copy todir="${services.trunk}/${dist.deploy.nuxeo.plugins}">
             <fileset file="${basedir}/target/${nuxeo.person.jar}"/>
         </copy>
     </target>

diff --git a/services/person/3rdparty/nuxeo-platform-cs-person/pom.xml b/services/person/3rdparty/nuxeo-platform-cs-person/pom.xml
index a42b62e649bd39d2271be9b4d0530d902c47efd7..997533dcea959d31cd5689739ad5e7eef7c574cb 100644 (file)
--- a/services/person/3rdparty/nuxeo-platform-cs-person/pom.xml
+++ b/services/person/3rdparty/nuxeo-platform-cs-person/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.person.3rdparty</artifactId>
-        <version>0.6-SNAPSHOT</version>
+        <version>0.7-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/person/3rdparty/pom.xml b/services/person/3rdparty/pom.xml
index 08c37777bc2fa306905d0c5de837fbd7e9006874..416e6ed4e5482d34f9291c21396ca3c9994445fb 100644 (file)
--- a/services/person/3rdparty/pom.xml
+++ b/services/person/3rdparty/pom.xml
@@ -5,7 +5,7 @@
     <parent>\r
         <groupId>org.collectionspace.services</groupId>\r
         <artifactId>org.collectionspace.services.person</artifactId>\r
-        <version>0.6-SNAPSHOT</version>\r
+        <version>0.7-SNAPSHOT</version>\r
     </parent>\r
     \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/person/client/pom.xml b/services/person/client/pom.xml
index 674dc76a8ad538b401a06f0114b3a4b82b5d6cf5..d2da2f27a4f69c7be56b40c8138d3f0adc2b3f16 100644 (file)
--- a/services/person/client/pom.xml
+++ b/services/person/client/pom.xml
@@ -5,7 +5,7 @@
     <parent>\r
         <groupId>org.collectionspace.services</groupId>\r
         <artifactId>org.collectionspace.services.person</artifactId>\r
-        <version>0.6-SNAPSHOT</version>\r
+        <version>0.7-SNAPSHOT</version>\r
     </parent>\r
 \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/person/import/pom.xml b/services/person/import/pom.xml
index ad7f104250c003760afdc4379d09ceb92ee9dfc1..70a687d2af9522f07d34ea770ef3df170ae0c7a1 100644 (file)
--- a/services/person/import/pom.xml
+++ b/services/person/import/pom.xml
@@ -5,7 +5,7 @@
     <parent>\r
         <groupId>org.collectionspace.services</groupId>\r
         <artifactId>org.collectionspace.services.person</artifactId>\r
-        <version>0.6-SNAPSHOT</version>\r
+        <version>0.7-SNAPSHOT</version>\r
     </parent>\r
 \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/person/installer/build.xml b/services/person/installer/build.xml
index 506af7be4d07cfae1904a7c0a398d32761bf1288..19e7e17aa7b242a62b188c529261acf6293c66cd 100644 (file)
--- a/services/person/installer/build.xml
+++ b/services/person/installer/build.xml
@@ -21,7 +21,7 @@
                        <arg value="Installer: Executing person 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
+        <copy todir="${jboss.deploy.nuxeo.plugins}">\r
             <fileset file="nuxeo/*.jar"/>\r
         </copy>                                \r
     </target>    \r

diff --git a/services/person/jaxb/pom.xml b/services/person/jaxb/pom.xml
index 59ccc89d7d185fd8661f922ad4e4e71c7a443cae..f1af451977a8725153198774f884ee7d5407c016 100644 (file)
--- a/services/person/jaxb/pom.xml
+++ b/services/person/jaxb/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.person</artifactId>
-        <version>0.6-SNAPSHOT</version>
+        <version>0.7-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/person/pom.xml b/services/person/pom.xml
index bb04e5a26effb1d72fa2564c50fee037485b82f6..18cbc8e188ad22a972014711f99895d5e71a7a99 100644 (file)
--- a/services/person/pom.xml
+++ b/services/person/pom.xml
@@ -3,7 +3,7 @@
     <parent>\r
         <groupId>org.collectionspace.services</groupId>\r
         <artifactId>org.collectionspace.services.main</artifactId>\r
-        <version>0.6-SNAPSHOT</version>\r
+        <version>0.7-SNAPSHOT</version>\r
     </parent>\r
 \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/person/service/pom.xml b/services/person/service/pom.xml
index ea225889bf1dbba06a5aed9ee5860e8718d4104c..3e6c73fa6f8ba7f5af7952e66bf674e65bc63987 100644 (file)
--- a/services/person/service/pom.xml
+++ b/services/person/service/pom.xml
@@ -3,7 +3,7 @@
     <parent>\r
         <groupId>org.collectionspace.services</groupId>\r
         <artifactId>org.collectionspace.services.person</artifactId>\r
-        <version>0.6-SNAPSHOT</version>\r
+        <version>0.7-SNAPSHOT</version>\r
     </parent>\r
     \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/pom.xml b/services/pom.xml
index 0304b58d964bdc099452b7082c2a50d806734792..607685dd752e3fa1018c5c9f61dbc5e0bf82b5ab 100644 (file)
--- a/services/pom.xml
+++ b/services/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services</artifactId>
-        <version>0.6-SNAPSHOT</version>
+        <version>0.7-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/relation/3rdparty/nuxeo-platform-cs-relation/build.xml b/services/relation/3rdparty/nuxeo-platform-cs-relation/build.xml
index 8df95b279484e8197b5872f6bb7895f9527f1571..154c0e2baf4050da578281c94952191e887e571e 100644 (file)
--- a/services/relation/3rdparty/nuxeo-platform-cs-relation/build.xml
+++ b/services/relation/3rdparty/nuxeo-platform-cs-relation/build.xml
@@ -3,14 +3,17 @@
     <description>\r
         relation nuxeo document type\r
     </description>\r
-  <!-- set global properties for this build -->\r
+    <!-- set global properties for this build -->\r
     <property name="services.trunk" value="../../../.."/>\r
-    <!-- enviornment should be declared before reading build.properties -->\r
+    <!-- environment should be declared before reading build.properties -->\r
     <property environment="env" />\r
     <property file="${services.trunk}/build.properties" />\r
     <property name="mvn.opts" value="" />\r
     <property name="src" location="src"/>\r
-    <property name="nuxeo.relation.jar" value="org.collectionspace.services.relation.3rdparty.nuxeo-${cspace.release}.jar"/>\r
+    <property name="nuxeo.relation.jar"\r
+        value="org.collectionspace.services.relation.3rdparty.nuxeo-${cspace.release}.jar"/>\r
+    <property name="nuxeo.relation.jars.all"\r
+        value="org.collectionspace.services.relation.3rdparty.nuxeo-*.jar"/>\r
 \r
     <condition property="osfamily-unix">\r
         <os family="unix" />\r
@@ -20,12 +23,12 @@
     </condition>\r
 \r
     <target name="init" >\r
-    <!-- Create the time stamp -->\r
+        <!-- Create the time stamp -->\r
         <tstamp/>\r
     </target>\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
@@ -50,7 +53,7 @@
     </target>\r
 \r
     <target name="install" depends="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
@@ -75,7 +78,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
@@ -110,20 +113,27 @@
     </target>\r
 \r
     <target name="deploy" depends="install"\r
-    description="deploy relation doctype in ${jboss.server.cspace}">\r
+        description="deploy relation doctype in ${jboss.server.cspace}">\r
         <copy file="${basedir}/target/${nuxeo.relation.jar}"\r
-        todir="${jboss.deploy.nuxeo.system}"/>\r
+        todir="${jboss.deploy.nuxeo.plugins}"/>\r
     </target>\r
 \r
     <target name="undeploy"\r
-    description="undeploy relation doctype from ${jboss.server.cspace}">\r
-        <delete file="${jboss.deploy.nuxeo.system}/${nuxeo.relation.jar}"/>\r
+        description="undeploy relation doctype from ${jboss.server.cspace}">\r
+        <delete>\r
+            <fileset dir="${jboss.deploy.nuxeo.plugins}">\r
+                <include name="${nuxeo.relation.jars.all}"/>\r
+            </fileset>\r
+            <!-- Legacy deployment location through release 0.6 -->\r
+            <fileset dir="${jboss.deploy.nuxeo.system}">\r
+                <include name="${nuxeo.relation.jars.all}"/>\r
+            </fileset>\r
+        </delete>\r
     </target>\r
 \r
-\r
     <target name="dist"\r
-    description="generate distribution for relation doctype" depends="package">\r
-        <copy todir="${services.trunk}/${dist.deploy.nuxeo.system}">\r
+        description="generate distribution for relation doctype" depends="package">\r
+        <copy todir="${services.trunk}/${dist.deploy.nuxeo.plugins}">\r
             <fileset file="${basedir}/target/${nuxeo.relation.jar}"/>\r
         </copy>\r
     </target>\r

diff --git a/services/relation/3rdparty/nuxeo-platform-cs-relation/pom.xml b/services/relation/3rdparty/nuxeo-platform-cs-relation/pom.xml
index a4f500a925cac34f2f515847153ae054993af9f7..996567f738e87c4bf5e9629fd997a353bb15bcc0 100644 (file)
--- a/services/relation/3rdparty/nuxeo-platform-cs-relation/pom.xml
+++ b/services/relation/3rdparty/nuxeo-platform-cs-relation/pom.xml
@@ -4,7 +4,7 @@
   <parent>\r
     <groupId>org.collectionspace.services</groupId>\r
     <artifactId>org.collectionspace.services.relation.3rdparty</artifactId>\r
-    <version>0.6-SNAPSHOT</version>\r
+    <version>0.7-SNAPSHOT</version>\r
   </parent>\r
 \r
   <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/relation/3rdparty/pom.xml b/services/relation/3rdparty/pom.xml
index bacfaae35425eb8c6c7e332d6620dc1b7ef7e71a..d6b72175c0c9b667d093abfb396a1ae2e921385b 100644 (file)
--- a/services/relation/3rdparty/pom.xml
+++ b/services/relation/3rdparty/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>org.collectionspace.services.relation</artifactId>
         <groupId>org.collectionspace.services</groupId>
-        <version>0.6-SNAPSHOT</version>
+        <version>0.7-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/relation/client/pom.xml b/services/relation/client/pom.xml
index 087d90c632ec7c8c4c4cad47d36d5562e7a40750..672a7943bcfd5d2556bd931c3e2a14f536fa94a0 100644 (file)
--- a/services/relation/client/pom.xml
+++ b/services/relation/client/pom.xml
@@ -5,7 +5,7 @@
     <parent>\r
         <groupId>org.collectionspace.services</groupId>\r
         <artifactId>org.collectionspace.services.relation</artifactId>\r
-        <version>0.6-SNAPSHOT</version>\r
+        <version>0.7-SNAPSHOT</version>\r
     </parent>\r
 \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/relation/pom.xml b/services/relation/pom.xml
index 2982bdab05451fd231ce819d5cc21b2a4a34a7e9..e17748bb29cfb22c7e8d1a9b5bcb667ac4d26895 100644 (file)
--- a/services/relation/pom.xml
+++ b/services/relation/pom.xml
@@ -3,7 +3,7 @@
     <parent>\r
         <groupId>org.collectionspace.services</groupId>\r
         <artifactId>org.collectionspace.services.main</artifactId>\r
-        <version>0.6-SNAPSHOT</version>\r
+        <version>0.7-SNAPSHOT</version>\r
     </parent>\r
     \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/relation/service/pom.xml b/services/relation/service/pom.xml
index 3770752fb196903618efe34064aab6993dc766aa..d000ae1e1286bf9a569cc6115947b2e9b4e00915 100644 (file)
--- a/services/relation/service/pom.xml
+++ b/services/relation/service/pom.xml
@@ -3,7 +3,7 @@
     <parent>\r
         <groupId>org.collectionspace.services</groupId>\r
         <artifactId>org.collectionspace.services.relation</artifactId>\r
-        <version>0.6-SNAPSHOT</version>\r
+        <version>0.7-SNAPSHOT</version>\r
     </parent>\r
     \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/sdk/pom.xml b/services/sdk/pom.xml
index b376fb3c4203206e14ff7e64be3ba608d4feea0e..5f1344873534400385e1252f46305c9300da5f7f 100644 (file)
--- a/services/sdk/pom.xml
+++ b/services/sdk/pom.xml
@@ -5,7 +5,7 @@
     <artifactId>org.collectionspace.services.sdk</artifactId>\r
     <packaging>pom</packaging>\r
     <name>services.sdk</name>\r
-    <version>0.6-SNAPSHOT</version>\r
+    <version>0.7-SNAPSHOT</version>\r
     \r
     <distributionManagement>\r
         <repository>\r

diff --git a/services/sdk/sample/pom.xml b/services/sdk/sample/pom.xml
index dea1fbae31b73794bc0be9766374b56ed2c4ad37..33f098ac14628282ae16cc6727bc337c104814a1 100644 (file)
--- a/services/sdk/sample/pom.xml
+++ b/services/sdk/sample/pom.xml
@@ -5,13 +5,13 @@
     <artifactId>org.collectionspace.services.client.sample</artifactId>\r
     <packaging>jar</packaging>\r
     <name>client.sample</name>\r
-    <version>0.6-SNAPSHOT</version>\r
+    <version>0.7-SNAPSHOT</version>\r
     \r
     <dependencies>\r
         <dependency>\r
             <groupId>org.collectionspace.services</groupId>\r
             <artifactId>org.collectionspace.services.collectionobject.client</artifactId>\r
-            <version>0.6-SNAPSHOT</version>\r
+            <version>0.7-SNAPSHOT</version>\r
         </dependency>\r
         <dependency>\r
             <groupId>org.slf4j</groupId>\r

diff --git a/services/security/client/pom.xml b/services/security/client/pom.xml
index e9b9461710d2453b0178fcebcc00fe943ddbc3b3..69fa3cb165e87c63d198b974880cb4aeca7f7eb0 100644 (file)
--- a/services/security/client/pom.xml
+++ b/services/security/client/pom.xml
@@ -5,7 +5,7 @@
     <parent>\r
         <artifactId>org.collectionspace.services.security</artifactId>\r
         <groupId>org.collectionspace.services</groupId>\r
-        <version>0.6-SNAPSHOT</version>\r
+        <version>0.7-SNAPSHOT</version>\r
     </parent>\r
 \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/security/pom.xml b/services/security/pom.xml
index 2fc7b7b22be2967c7c91b8f2d219553c1c779331..8823cf3ecd3df04f41ebec31c579cc7974c5b401 100644 (file)
--- a/services/security/pom.xml
+++ b/services/security/pom.xml
@@ -3,7 +3,7 @@
     <parent>\r
         <artifactId>org.collectionspace.services.main</artifactId>\r
         <groupId>org.collectionspace.services</groupId>\r
-        <version>0.6-SNAPSHOT</version>\r
+        <version>0.7-SNAPSHOT</version>\r
     </parent>\r
     \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/vocabulary/3rdparty/nuxeo-platform-cs-vocabulary/build.xml b/services/vocabulary/3rdparty/nuxeo-platform-cs-vocabulary/build.xml
index 473adccef3659474b617952125588a2d2ac5812e..62259be9c341a740441a95de3c96a1cff9c2bf88 100644 (file)
--- a/services/vocabulary/3rdparty/nuxeo-platform-cs-vocabulary/build.xml
+++ b/services/vocabulary/3rdparty/nuxeo-platform-cs-vocabulary/build.xml
@@ -3,14 +3,17 @@
     <description>
         vocabulary nuxeo document type
     </description>
-  <!-- set global properties for this build -->
+    <!-- set global properties for this build -->
     <property name="services.trunk" value="../../../.."/>
-    <!-- enviornment should be declared before reading build.properties -->
+    <!-- environment should be declared before reading build.properties -->
     <property environment="env" />
     <property file="${services.trunk}/build.properties" />
     <property name="mvn.opts" value="" />
     <property name="src" location="src"/>
-    <property name="nuxeo.vocabulary.jar" value="org.collectionspace.services.vocabulary.3rdparty.nuxeo-${cspace.release}.jar"/>
+    <property name="nuxeo.vocabulary.jar"
+        value="org.collectionspace.services.vocabulary.3rdparty.nuxeo-${cspace.release}.jar"/>
+    <property name="nuxeo.vocabulary.jars.all"
+        value="org.collectionspace.services.vocabulary.3rdparty.nuxeo-*.jar"/>
 
     <condition property="osfamily-unix">
         <os family="unix" />
@@ -20,12 +23,12 @@
     </condition>
 
     <target name="init" >
-    <!-- Create the time stamp -->
+        <!-- Create the time stamp -->
         <tstamp/>
     </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" />
@@ -50,7 +53,7 @@
     </target>
 
     <target name="install" depends="install-unix,install-windows"
-  description="Install" />
+        description="Install" />
     <target name="install-unix" if="osfamily-unix">
         <exec executable="mvn" failonerror="true">
             <arg value="install" />
@@ -75,7 +78,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">
@@ -110,19 +113,27 @@
     </target>
 
     <target name="deploy" depends="install"
-    description="deploy vocabulary doctype in ${jboss.server.nuxeo}">
+        description="deploy vocabulary doctype in ${jboss.server.nuxeo}">
         <copy file="${basedir}/target/${nuxeo.vocabulary.jar}"
-        todir="${jboss.deploy.nuxeo.system}"/>
+        todir="${jboss.deploy.nuxeo.plugins}"/>
     </target>
 
     <target name="undeploy"
-    description="undeploy vocabulary doctype from ${jboss.server.nuxeo}">
-        <delete file="${jboss.deploy.nuxeo.system}/${nuxeo.vocabulary.jar}"/>
+        description="undeploy vocabulary doctype from ${jboss.server.nuxeo}">
+        <delete>
+            <fileset dir="${jboss.deploy.nuxeo.plugins}">
+                <include name="${nuxeo.vocabulary.jars.all}"/>
+            </fileset>
+            <!-- Legacy deployment location through release 0.6 -->
+            <fileset dir="${jboss.deploy.nuxeo.system}">
+                <include name="${nuxeo.vocabulary.jars.all}"/>
+            </fileset>
+        </delete>
     </target>
 
     <target name="dist"
-    description="generate distribution for vocabulary doctype" depends="package">
-        <copy todir="${services.trunk}/${dist.deploy.nuxeo.system}">
+        description="generate distribution for vocabulary doctype" depends="package">
+        <copy todir="${services.trunk}/${dist.deploy.nuxeo.plugins}">
             <fileset file="${basedir}/target/${nuxeo.vocabulary.jar}"/>
         </copy>
     </target>

diff --git a/services/vocabulary/3rdparty/nuxeo-platform-cs-vocabulary/pom.xml b/services/vocabulary/3rdparty/nuxeo-platform-cs-vocabulary/pom.xml
index 79680c10df6594d2126eadc8f227557760bc4ad8..6271a48a375dcfafe70b00ce2675c3bc53aaa47f 100644 (file)
--- a/services/vocabulary/3rdparty/nuxeo-platform-cs-vocabulary/pom.xml
+++ b/services/vocabulary/3rdparty/nuxeo-platform-cs-vocabulary/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.vocabulary.3rdparty</artifactId>
-        <version>0.6-SNAPSHOT</version>
+        <version>0.7-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/vocabulary/3rdparty/pom.xml b/services/vocabulary/3rdparty/pom.xml
index 4d81b937215bc58ad2e333953a9b936effe33c9d..d8c724310f5fc14b55fb5edac3f1213f5f44a620 100644 (file)
--- a/services/vocabulary/3rdparty/pom.xml
+++ b/services/vocabulary/3rdparty/pom.xml
@@ -5,7 +5,7 @@
     <parent>\r
         <groupId>org.collectionspace.services</groupId>\r
         <artifactId>org.collectionspace.services.vocabulary</artifactId>\r
-        <version>0.6-SNAPSHOT</version>\r
+        <version>0.7-SNAPSHOT</version>\r
     </parent>\r
 \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/vocabulary/client/pom.xml b/services/vocabulary/client/pom.xml
index 96f1bf873bcf5a8e70d433a8d934a0207bddb65d..f4722277c1eae787cfbd0dbd968935584d0b98f2 100644 (file)
--- a/services/vocabulary/client/pom.xml
+++ b/services/vocabulary/client/pom.xml
@@ -6,7 +6,7 @@
     <parent>\r
         <groupId>org.collectionspace.services</groupId>\r
         <artifactId>org.collectionspace.services.vocabulary</artifactId>\r
-        <version>0.6-SNAPSHOT</version>\r
+        <version>0.7-SNAPSHOT</version>\r
     </parent>\r
 \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/vocabulary/import/pom.xml b/services/vocabulary/import/pom.xml
index 2803614a3f9f4bc8636a67cb12df76967705ac41..7ab80d45e777116f7a7875aecddfb0e9318cafc5 100644 (file)
--- a/services/vocabulary/import/pom.xml
+++ b/services/vocabulary/import/pom.xml
@@ -5,7 +5,7 @@
     <parent>\r
         <groupId>org.collectionspace.services</groupId>\r
         <artifactId>org.collectionspace.services.vocabulary</artifactId>\r
-        <version>0.6-SNAPSHOT</version>\r
+        <version>0.7-SNAPSHOT</version>\r
     </parent>\r
 \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/vocabulary/installer/build.xml b/services/vocabulary/installer/build.xml
index 1e04433966434aa27e5b8d549892385aeddce6ac..ab88a012a08f6eef6b48c8f544ee891b4c818520 100644 (file)
--- a/services/vocabulary/installer/build.xml
+++ b/services/vocabulary/installer/build.xml
@@ -21,7 +21,7 @@
                        <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
+        <copy todir="${jboss.deploy.nuxeo.plugins}">\r
             <fileset file="nuxeo/*.jar"/>\r
         </copy>                                \r
     </target>    \r

diff --git a/services/vocabulary/jaxb/pom.xml b/services/vocabulary/jaxb/pom.xml
index d5939a6a3ee01a10fda9785f01cc40e961419ecc..f6026988e90517d708b22a41990f635b0ec74eac 100644 (file)
--- a/services/vocabulary/jaxb/pom.xml
+++ b/services/vocabulary/jaxb/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.vocabulary</artifactId>
-        <version>0.6-SNAPSHOT</version>
+        <version>0.7-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/vocabulary/pom.xml b/services/vocabulary/pom.xml
index 50b8109f36bbbe567c8b5b4a1c40b3a491168734..223731deb9dcbe18ce572e5a8684ee6398017db2 100644 (file)
--- a/services/vocabulary/pom.xml
+++ b/services/vocabulary/pom.xml
@@ -5,7 +5,7 @@
     <parent>\r
         <artifactId>org.collectionspace.services.main</artifactId>\r
         <groupId>org.collectionspace.services</groupId>\r
-        <version>0.6-SNAPSHOT</version>\r
+        <version>0.7-SNAPSHOT</version>\r
     </parent>\r
 \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/vocabulary/service/pom.xml b/services/vocabulary/service/pom.xml
index 7b1560e4a039c5112ffb1cac6b39fd7f4f2c75e2..25c28669c5f260bbdb48b0f45c9575d998298055 100644 (file)
--- a/services/vocabulary/service/pom.xml
+++ b/services/vocabulary/service/pom.xml
@@ -3,7 +3,7 @@
     <parent>\r
         <groupId>org.collectionspace.services</groupId>\r
         <artifactId>org.collectionspace.services.vocabulary</artifactId>\r
-        <version>0.6-SNAPSHOT</version>\r
+        <version>0.7-SNAPSHOT</version>\r
     </parent>\r
     \r
     <modelVersion>4.0.0</modelVersion>\r