From: Aron Roberts <aron@socrates.berkeley.edu>
Date: Sat, 1 May 2010 00:38:18 +0000 (+0000)
Subject: CSPACE-1456,CSPACE-533: Services Layer version updated to 0.7-SNAPSHOT (from 0.6... 
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=1c5ec7bd3a0fe9d23de021b4c85f2a23ac0873d3;p=tmp%2Fjakarta-migration.git

CSPACE-1456,CSPACE-533: Services Layer version updated to 0.7-SNAPSHOT (from 0.6-SNAPSHOT) in all POMs. Ant 'undeploy' targets now remove all relevant services JARs, regardless of version, via a wildcard/glob. Nuxeo doctype JARs are now deployed to the 'plugins' directory, rather than the 'system' directory, of nuxeo.ear.  'undeploy' tasks check for and remove Nuxeo doctype JARs both from the 'plugins' directory and from the old, legacy 'system' directory.
---

diff --git a/3rdparty/nuxeo/nuxeo-platform-collectionspace/pom.xml b/3rdparty/nuxeo/nuxeo-platform-collectionspace/pom.xml
index 1fd6cf281..e1bab3098 100644
--- a/3rdparty/nuxeo/nuxeo-platform-collectionspace/pom.xml
+++ b/3rdparty/nuxeo/nuxeo-platform-collectionspace/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.collectionspace.services</groupId>
     <artifactId>org.collectionspace.services.3rdparty.nuxeo</artifactId>
-    <version>0.6-SNAPSHOT</version>
+    <version>0.7-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/3rdparty/nuxeo/pom.xml b/3rdparty/nuxeo/pom.xml
index d835c08bc..09b6d94b0 100644
--- a/3rdparty/nuxeo/pom.xml
+++ b/3rdparty/nuxeo/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.3rdparty</artifactId>
-        <version>0.6-SNAPSHOT</version>
+        <version>0.7-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/3rdparty/pom.xml b/3rdparty/pom.xml
index f0c1b9c51..50224fe0d 100644
--- 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 02aa390a1..3d42c0fe7 100644
--- a/build.properties
+++ b/build.properties
@@ -1,6 +1,6 @@
 host=127.0.0.1
 #cspace
-cspace.release=0.6-SNAPSHOT
+cspace.release=0.7-SNAPSHOT
 cspace.services.release=cspace-services-${cspace.release}
 cspace.services.war=cspace-services.war
 domain.cspace=cspace
@@ -11,6 +11,7 @@ domain.nuxeo=default
 nuxeo.release=5.2.GA
 nuxeo.ear=nuxeo.ear
 nuxeo.system=${nuxeo.ear}/system
+nuxeo.plugins=${nuxeo.ear}/plugins
 
 #distribution
 dist=dist
@@ -32,6 +33,7 @@ dist.server.nuxeo=${dist.nuxeo}/server/${jboss.domain.nuxeo}
 dist.deploy.nuxeo=${dist.server.nuxeo}/deploy
 dist.lib.nuxeo=${dist.server.nuxeo}/lib
 dist.deploy.nuxeo.system=${dist.deploy.nuxeo}/${nuxeo.system}
+dist.deploy.nuxeo.plugins=${dist.deploy.nuxeo}/${nuxeo.plugins}
 
 #jboss
 #assumption: both nuxeo and cspace domains are using the same JBoss installation
@@ -54,6 +56,7 @@ jboss.server.nuxeo=${jboss.home}/server/${jboss.domain.nuxeo}
 jboss.deploy.nuxeo=${jboss.server.nuxeo}/deploy
 jboss.lib.nuxeo=${jboss.server.nuxeo}/lib
 jboss.deploy.nuxeo.system=${jboss.deploy.nuxeo}/${nuxeo.system}
+jboss.deploy.nuxeo.plugins=${jboss.deploy.nuxeo}/${nuxeo.plugins}
 
 #database
 db=mysql
diff --git a/build.xml b/build.xml
index f54cbf994..0e51cdb26 100644
--- a/build.xml
+++ b/build.xml
@@ -3,7 +3,7 @@
     <description>
         collectionspace services
     </description>
-    <!-- enviornment should be declared before reading build.properties -->
+    <!-- environment should be declared before reading build.properties -->
     <property environment="env" />
     <!-- set global properties for this build -->
     <property file="build.properties" />
@@ -92,10 +92,10 @@
             </condition>
         </fail>
 
-        <fail message="Nuxeo is not deployed or ${jboss.deploy.nuxeo.systemy} not found">
+        <fail message="Nuxeo is not deployed or ${jboss.deploy.nuxeo.plugins} not found">
             <condition>
                 <not>
-                    <available file="${jboss.deploy.nuxeo.system}" type="dir"/>
+                    <available file="${jboss.deploy.nuxeo.plugins}" type="dir"/>
                 </not>
             </condition>
         </fail>
diff --git a/pom.xml b/pom.xml
index f5c55220e..bb21b85f7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.collectionspace.services</groupId>
     <artifactId>org.collectionspace.services</artifactId>
-    <version>0.6-SNAPSHOT</version>
+    <version>0.7-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>services</name>
 
@@ -16,8 +16,8 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <nuxeo.version.5.2>5.2.1-SNAPSHOT</nuxeo.version.5.2>
         <nuxeo.version.1.5>1.5.1-SNAPSHOT</nuxeo.version.1.5>
-        <cspace.services.version>0.6-SNAPSHOT</cspace.services.version>
-        <cspace.services.client.version>0.6.1-SNAPSHOT</cspace.services.client.version>
+        <cspace.services.version>0.7-SNAPSHOT</cspace.services.version>
+        <cspace.services.client.version>0.7-SNAPSHOT</cspace.services.client.version>
     </properties>
 
     <distributionManagement>
diff --git a/services/IntegrationTests/pom.xml b/services/IntegrationTests/pom.xml
index 1cb6c0870..3ef491151 100644
--- a/services/IntegrationTests/pom.xml
+++ b/services/IntegrationTests/pom.xml
@@ -3,7 +3,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/JaxRsServiceProvider/pom.xml b/services/JaxRsServiceProvider/pom.xml
index f4e4f6ab7..74ff2a90e 100644
--- a/services/JaxRsServiceProvider/pom.xml
+++ b/services/JaxRsServiceProvider/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/PerformanceTests/pom.xml b/services/PerformanceTests/pom.xml
index 76ef91dac..12a80903d 100644
--- a/services/PerformanceTests/pom.xml
+++ b/services/PerformanceTests/pom.xml
@@ -3,7 +3,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/account/client/pom.xml b/services/account/client/pom.xml
index 1c823a79f..3ab03a0d3 100644
--- a/services/account/client/pom.xml
+++ b/services/account/client/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/jaxb/pom.xml b/services/account/jaxb/pom.xml
index 76f2d73d3..a34cc35e4 100644
--- 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 1b3f94a5b..ff02090a7 100644
--- a/services/account/pom.xml
+++ b/services/account/pom.xml
@@ -3,7 +3,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/account/pstore/pom.xml b/services/account/pstore/pom.xml
index 698c3786d..de62cfaef 100644
--- a/services/account/pstore/pom.xml
+++ b/services/account/pstore/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>org.collectionspace.services.account</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/account/service/pom.xml b/services/account/service/pom.xml
index aa53e8861..e20edc616 100644
--- a/services/account/service/pom.xml
+++ b/services/account/service/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>org.collectionspace.services.account</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/3rdparty/nuxeo-platform-cs-acquisition/build.xml b/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/build.xml
index 98a5f77a3..a14848557 100644
--- 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 031a6c72d..825d867d4 100644
--- 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 09478e0fc..25e1fadc9 100644
--- a/services/acquisition/3rdparty/pom.xml
+++ b/services/acquisition/3rdparty/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.acquisition</artifactId>
-        <version>0.6-SNAPSHOT</version> 
+        <version>0.7-SNAPSHOT</version> 
     </parent>
     
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/acquisition/client/pom.xml b/services/acquisition/client/pom.xml
index 091e9678f..57cd84708 100644
--- a/services/acquisition/client/pom.xml
+++ b/services/acquisition/client/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.acquisition</artifactId>
-        <version>0.6-SNAPSHOT</version>
+        <version>0.7-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/acquisition/jaxb/pom.xml b/services/acquisition/jaxb/pom.xml
index b9c6e6867..4ef02f045 100644
--- 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 c9187f832..dd768e050 100644
--- a/services/acquisition/pom.xml
+++ b/services/acquisition/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/acquisition/service/pom.xml b/services/acquisition/service/pom.xml
index ecbeed9ec..6f495d025 100644
--- a/services/acquisition/service/pom.xml
+++ b/services/acquisition/service/pom.xml
@@ -3,7 +3,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/authentication/client/pom.xml b/services/authentication/client/pom.xml
index 1e02f0502..b5749e5f2 100644
--- a/services/authentication/client/pom.xml
+++ b/services/authentication/client/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/jaxb/pom.xml b/services/authentication/jaxb/pom.xml
index 9651a17e2..09fcc8f9d 100644
--- 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 449ba7f21..b2fb60ea3 100644
--- a/services/authentication/pom.xml
+++ b/services/authentication/pom.xml
@@ -3,7 +3,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/authentication/pstore/pom.xml b/services/authentication/pstore/pom.xml
index e20859e3f..3ae36e40a 100644
--- a/services/authentication/pstore/pom.xml
+++ b/services/authentication/pstore/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/service/pom.xml b/services/authentication/service/pom.xml
index 4f4bfdfa1..af226b5b0 100644
--- 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 bc2952f84..d7c217344 100644
--- a/services/authorization-mgt/client/pom.xml
+++ b/services/authorization-mgt/client/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.authorization-mgt</artifactId>
-        <version>0.6-SNAPSHOT</version>
+        <version>0.7-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/authorization-mgt/pom.xml b/services/authorization-mgt/pom.xml
index af4e16a9c..b9ac621b2 100644
--- 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 7245c6bec..f33ad5da7 100644
--- a/services/authorization-mgt/service/pom.xml
+++ b/services/authorization-mgt/service/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>org.collectionspace.services.authorization-mgt</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-mgt.service</artifactId>
diff --git a/services/authorization/jaxb/pom.xml b/services/authorization/jaxb/pom.xml
index ada195a8b..a35118ad9 100644
--- a/services/authorization/jaxb/pom.xml
+++ b/services/authorization/jaxb/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>org.collectionspace.services.authorization</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/authorization/pom.xml b/services/authorization/pom.xml
index c0dbf2059..a90f7fcc8 100644
--- 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 149e607ff..af81ef2cb 100644
--- a/services/authorization/pstore/pom.xml
+++ b/services/authorization/pstore/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>org.collectionspace.services.authorization</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/authorization/service/pom.xml b/services/authorization/service/pom.xml
index da17e0845..981a48cb1 100644
--- 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 a2e688b5e..5e9181e5c 100644
--- a/services/client/pom.xml
+++ b/services/client/pom.xml
@@ -3,7 +3,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/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/build.xml b/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/build.xml
index a8d21320d..a8213066f 100644
--- 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>
         collectionobject 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.collectionobject.jar" value="org.collectionspace.services.collectionobject.3rdparty.nuxeo-${cspace.release}.jar"/>
+    <property name="nuxeo.collectionobject.jar"
+        value="org.collectionspace.services.collectionobject.3rdparty.nuxeo-${cspace.release}.jar"/>
+    <property name="nuxeo.collectionobject.jars.all"
+        value="org.collectionspace.services.collectionobject.3rdparty.nuxeo-*.jar"/>
 
     <condition property="osfamily-unix">
         <os family="unix" />
@@ -22,15 +25,14 @@
     </condition>
 
     <target name="init" >
-    <!-- Create the time stamp -->
+        <!-- Create the time stamp -->
         <tstamp/>
-    <!-- Create the build directory structure used by compile -->
+        <!-- Create the build directory structure used by compile -->
         <mkdir dir="${build}"/>
-
     </target>
 
     <target name="package" depends="package-unix,package-windows"
-  description="Package CollectionSpace Services" />
+        description="Package CollectionSpace Services" />
     <target name="package-unix" if="osfamily-unix">
         <exec executable="mvn" failonerror="true">
             <arg value="package" />
@@ -80,7 +82,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">
@@ -115,19 +117,27 @@
     </target>
 
     <target name="deploy" depends="install"
-    description="deploy collectionobject doctype in ${jboss.server.nuxeo}">
+        description="deploy collectionobject doctype in ${jboss.server.nuxeo}">
         <copy file="${basedir}/target/${nuxeo.collectionobject.jar}"
-        todir="${jboss.deploy.nuxeo.system}"/>
+        todir="${jboss.deploy.nuxeo.plugins}"/>
     </target>
 
     <target name="undeploy"
-    description="undeploy collectionobject doctype from ${jboss.server.nuxeo}">
-        <delete file="${jboss.deploy.nuxeo.system}/${nuxeo.collectionobject.jar}"/>
+        description="undeploy collectionobject doctype from ${jboss.server.nuxeo}">
+        <delete>
+            <fileset dir="${jboss.deploy.nuxeo.plugins}">
+                <include name="${nuxeo.collectionobject.jars.all}"/>
+            </fileset>
+            <!-- Legacy deployment location through release 0.6 -->
+            <fileset dir="${jboss.deploy.nuxeo.system}">
+                <include name="${nuxeo.collectionobject.jars.all}"/>
+            </fileset>
+        </delete>
     </target>
 
     <target name="dist"
     	description="generate distribution for collectionobject doctype" depends="package">
-        <copy todir="${services.trunk}/${dist.deploy.nuxeo.system}">
+        <copy todir="${services.trunk}/${dist.deploy.nuxeo.plugins}">
             <fileset file="${basedir}/target/${nuxeo.collectionobject.jar}"/>
         </copy>
     </target>
diff --git a/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/pom.xml b/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/pom.xml
index 41682aef3..dc146afc8 100644
--- 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 1e63800ce..b4492ad67 100644
--- a/services/collectionobject/3rdparty/pom.xml
+++ b/services/collectionobject/3rdparty/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/client/pom.xml b/services/collectionobject/client/pom.xml
index dea32b831..ad63562c7 100644
--- a/services/collectionobject/client/pom.xml
+++ b/services/collectionobject/client/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>
@@ -105,4 +105,4 @@
         </plugins>
         
     </build>
-</project>
\ No newline at end of file
+</project>
diff --git a/services/collectionobject/installer/build.xml b/services/collectionobject/installer/build.xml
index 0c1c4d5ee..b17ccb065 100644
--- a/services/collectionobject/installer/build.xml
+++ b/services/collectionobject/installer/build.xml
@@ -21,7 +21,7 @@
         <exec executable="echo">
         		<arg value="Installer: Executing CollectionObject Service's &apos;install&apos; target." />
 				</exec>
-        <copy todir="${jboss.deploy.nuxeo.system}">
+        <copy todir="${jboss.deploy.nuxeo.plugins}">
             <fileset file="nuxeo/*.jar"/>
         </copy>
     </target>
diff --git a/services/collectionobject/jaxb/pom.xml b/services/collectionobject/jaxb/pom.xml
index da8c113b8..b0d1a42a7 100644
--- 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 5c3f6fbc1..b1628ed31 100644
--- a/services/collectionobject/pom.xml
+++ b/services/collectionobject/pom.xml
@@ -3,7 +3,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/collectionobject/sample/sample/pom.xml b/services/collectionobject/sample/sample/pom.xml
index 56134bedc..50b83f094 100644
--- 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 9079f9406..50ea8c6df 100644
--- a/services/collectionobject/service/pom.xml
+++ b/services/collectionobject/service/pom.xml
@@ -3,7 +3,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/common/pom.xml b/services/common/pom.xml
index 503808fa0..bbabacf5d 100644
--- a/services/common/pom.xml
+++ b/services/common/pom.xml
@@ -3,7 +3,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/contact/3rdparty/nuxeo-platform-cs-contact/build.xml b/services/contact/3rdparty/nuxeo-platform-cs-contact/build.xml
index 28d9f083a..a5ce14f84 100644
--- 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 350e1b429..f571592bc 100644
--- 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 272058fc7..e86e9bdca 100644
--- 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 b7fe75747..5d4473176 100644
--- 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 9449813d6..0ec88d7ee 100644
--- 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 0fdd89c94..d0b555824 100644
--- 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 13f1007cb..bbe6e44b4 100644
--- 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 5ad7d273b..647c71fc7 100644
--- 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 1e12e7795..b8ea18fee 100644
--- 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 aae31ccc8..e95c7dd2b 100644
--- a/services/dimension/3rdparty/pom.xml
+++ b/services/dimension/3rdparty/pom.xml
@@ -5,7 +5,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/client/pom.xml b/services/dimension/client/pom.xml
index f2b9a9773..ecd144b2a 100644
--- a/services/dimension/client/pom.xml
+++ b/services/dimension/client/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/jaxb/pom.xml b/services/dimension/jaxb/pom.xml
index ccd5849d4..cd90019d8 100644
--- 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 f79ad2fad..9416ddc79 100644
--- a/services/dimension/pom.xml
+++ b/services/dimension/pom.xml
@@ -5,7 +5,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/dimension/service/pom.xml b/services/dimension/service/pom.xml
index f9fd0f45b..289b15ba7 100644
--- a/services/dimension/service/pom.xml
+++ b/services/dimension/service/pom.xml
@@ -4,7 +4,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/id/3rdparty/pom.xml b/services/id/3rdparty/pom.xml
index ba67c97b6..c4672e6f0 100644
--- 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 23917b6a7..34ad26e9f 100644
--- 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 a64567d03..8636bed9e 100644
--- 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 085b8982a..82bee525f 100644
--- 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 45d265ff6..0b6ab8dd1 100644
--- 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 a9b2e6bf7..8eb9f1a05 100644
--- 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 529a0553c..02ffb7399 100644
--- 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 417e1097d..b3b89cf50 100644
--- a/services/intake/3rdparty/pom.xml
+++ b/services/intake/3rdparty/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/client/pom.xml b/services/intake/client/pom.xml
index 1fc96a5ca..e7487b6b6 100644
--- a/services/intake/client/pom.xml
+++ b/services/intake/client/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.intake</artifactId>
-        <version>0.6-SNAPSHOT</version>
+        <version>0.7-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/intake/jaxb/pom.xml b/services/intake/jaxb/pom.xml
index c20ccf711..066f9c3bb 100644
--- 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 9f4e6ffa3..fcf8a1376 100644
--- a/services/intake/pom.xml
+++ b/services/intake/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/intake/service/pom.xml b/services/intake/service/pom.xml
index 13efb3e4b..1ccf37416 100644
--- a/services/intake/service/pom.xml
+++ b/services/intake/service/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.intake</artifactId>        
-        <version>0.6-SNAPSHOT</version>
+        <version>0.7-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/jaxb/pom.xml b/services/jaxb/pom.xml
index 557f34eeb..80504f67e 100644
--- a/services/jaxb/pom.xml
+++ b/services/jaxb/pom.xml
@@ -26,7 +26,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/3rdparty/nuxeo-platform-cs-loanin/build.xml b/services/loanin/3rdparty/nuxeo-platform-cs-loanin/build.xml
index d13a9a3f5..fe213ee0a 100644
--- 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 1fd5f95a7..3f8fa3133 100644
--- 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 30eb2a0b3..070091d2a 100644
--- 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 f81ebb84b..b64917c61 100644
--- 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 807629ca7..4dc8fd1fb 100644
--- 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 4a72a4d00..8a0f95e79 100644
--- 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 3cf6146fb..6c2ff720f 100644
--- 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 1f0554440..8b8bb7762 100644
--- 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 7f686e138..9deb8b93e 100644
--- 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 faa723714..0ccd3bbaf 100644
--- 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 4b2800bc9..e7dbd6691 100644
--- 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 bdaa4e88f..207e51ce5 100644
--- 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 cd0d3224a..93f2e0f05 100644
--- 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 601164f06..324f180f4 100644
--- 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 45f1ffa52..7f2d4e094 100644
--- 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 4e0dee16c..3fd62547f 100644
--- 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 0d659f651..9421bece2 100644
--- 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 3fdb0afc8..040a85ef4 100644
--- 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 3ade652d6..c691f086b 100644
--- a/services/organization/3rdparty/pom.xml
+++ b/services/organization/3rdparty/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.organization</artifactId>
-        <version>0.6-SNAPSHOT</version>
+        <version>0.7-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/organization/client/pom.xml b/services/organization/client/pom.xml
index 3c370a1f5..39416b426 100644
--- a/services/organization/client/pom.xml
+++ b/services/organization/client/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.organization</artifactId>
-        <version>0.6-SNAPSHOT</version>
+        <version>0.7-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/organization/import/pom.xml b/services/organization/import/pom.xml
index bd9da2fc1..2e3886da3 100644
--- a/services/organization/import/pom.xml
+++ b/services/organization/import/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.organization</artifactId>
-        <version>0.6-SNAPSHOT</version>
+        <version>0.7-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/organization/installer/build.xml b/services/organization/installer/build.xml
index 250fa2a51..b2d4c83ef 100644
--- 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." />
 				</exec>
 				<!-- Copy the Nuxeo DocType jar files to the Nuxeo app server domain -->
-        <copy todir="${jboss.deploy.nuxeo.system}">
+        <copy todir="${jboss.deploy.nuxeo.plugins}">
             <fileset file="nuxeo/*.jar"/>
         </copy>				
     </target>    
diff --git a/services/organization/jaxb/pom.xml b/services/organization/jaxb/pom.xml
index 18ffc00e7..4e830b4bb 100644
--- 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 f8eadb7c7..4953c184e 100644
--- a/services/organization/pom.xml
+++ b/services/organization/pom.xml
@@ -3,7 +3,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/organization/service/pom.xml b/services/organization/service/pom.xml
index c967d8312..7cdf7380d 100644
--- a/services/organization/service/pom.xml
+++ b/services/organization/service/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.organization</artifactId>
-        <version>0.6-SNAPSHOT</version>
+        <version>0.7-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/person/3rdparty/nuxeo-platform-cs-person/build.xml b/services/person/3rdparty/nuxeo-platform-cs-person/build.xml
index 518f463fc..699adae2e 100644
--- 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 a42b62e64..997533dce 100644
--- 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 08c37777b..416e6ed4e 100644
--- a/services/person/3rdparty/pom.xml
+++ b/services/person/3rdparty/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/client/pom.xml b/services/person/client/pom.xml
index 674dc76a8..d2da2f27a 100644
--- a/services/person/client/pom.xml
+++ b/services/person/client/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/import/pom.xml b/services/person/import/pom.xml
index ad7f10425..70a687d2a 100644
--- a/services/person/import/pom.xml
+++ b/services/person/import/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/installer/build.xml b/services/person/installer/build.xml
index 506af7be4..19e7e17aa 100644
--- 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." />
 				</exec>
 				<!-- Copy the Nuxeo DocType jar files to the Nuxeo app server domain -->
-        <copy todir="${jboss.deploy.nuxeo.system}">
+        <copy todir="${jboss.deploy.nuxeo.plugins}">
             <fileset file="nuxeo/*.jar"/>
         </copy>				
     </target>    
diff --git a/services/person/jaxb/pom.xml b/services/person/jaxb/pom.xml
index 59ccc89d7..f1af45197 100644
--- 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 bb04e5a26..18cbc8e18 100644
--- a/services/person/pom.xml
+++ b/services/person/pom.xml
@@ -3,7 +3,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/person/service/pom.xml b/services/person/service/pom.xml
index ea225889b..3e6c73fa6 100644
--- a/services/person/service/pom.xml
+++ b/services/person/service/pom.xml
@@ -3,7 +3,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/pom.xml b/services/pom.xml
index 0304b58d9..607685dd7 100644
--- 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 8df95b279..154c0e2ba 100644
--- 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>
         relation 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.relation.jar" value="org.collectionspace.services.relation.3rdparty.nuxeo-${cspace.release}.jar"/>
+    <property name="nuxeo.relation.jar"
+        value="org.collectionspace.services.relation.3rdparty.nuxeo-${cspace.release}.jar"/>
+    <property name="nuxeo.relation.jars.all"
+        value="org.collectionspace.services.relation.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 relation doctype in ${jboss.server.cspace}">
+        description="deploy relation doctype in ${jboss.server.cspace}">
         <copy file="${basedir}/target/${nuxeo.relation.jar}"
-        todir="${jboss.deploy.nuxeo.system}"/>
+        todir="${jboss.deploy.nuxeo.plugins}"/>
     </target>
 
     <target name="undeploy"
-    description="undeploy relation doctype from ${jboss.server.cspace}">
-        <delete file="${jboss.deploy.nuxeo.system}/${nuxeo.relation.jar}"/>
+        description="undeploy relation doctype from ${jboss.server.cspace}">
+        <delete>
+            <fileset dir="${jboss.deploy.nuxeo.plugins}">
+                <include name="${nuxeo.relation.jars.all}"/>
+            </fileset>
+            <!-- Legacy deployment location through release 0.6 -->
+            <fileset dir="${jboss.deploy.nuxeo.system}">
+                <include name="${nuxeo.relation.jars.all}"/>
+            </fileset>
+        </delete>
     </target>
 
-
     <target name="dist"
-    description="generate distribution for relation doctype" depends="package">
-        <copy todir="${services.trunk}/${dist.deploy.nuxeo.system}">
+        description="generate distribution for relation doctype" depends="package">
+        <copy todir="${services.trunk}/${dist.deploy.nuxeo.plugins}">
             <fileset file="${basedir}/target/${nuxeo.relation.jar}"/>
         </copy>
     </target>
diff --git a/services/relation/3rdparty/nuxeo-platform-cs-relation/pom.xml b/services/relation/3rdparty/nuxeo-platform-cs-relation/pom.xml
index a4f500a92..996567f73 100644
--- 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>
     <groupId>org.collectionspace.services</groupId>
     <artifactId>org.collectionspace.services.relation.3rdparty</artifactId>
-    <version>0.6-SNAPSHOT</version>
+    <version>0.7-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/services/relation/3rdparty/pom.xml b/services/relation/3rdparty/pom.xml
index bacfaae35..d6b72175c 100644
--- 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 087d90c63..672a7943b 100644
--- a/services/relation/client/pom.xml
+++ b/services/relation/client/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.relation</artifactId>
-        <version>0.6-SNAPSHOT</version>
+        <version>0.7-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/relation/pom.xml b/services/relation/pom.xml
index 2982bdab0..e17748bb2 100644
--- a/services/relation/pom.xml
+++ b/services/relation/pom.xml
@@ -3,7 +3,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/relation/service/pom.xml b/services/relation/service/pom.xml
index 3770752fb..d000ae1e1 100644
--- a/services/relation/service/pom.xml
+++ b/services/relation/service/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.relation</artifactId>
-        <version>0.6-SNAPSHOT</version>
+        <version>0.7-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/sdk/pom.xml b/services/sdk/pom.xml
index b376fb3c4..5f1344873 100644
--- a/services/sdk/pom.xml
+++ b/services/sdk/pom.xml
@@ -5,7 +5,7 @@
     <artifactId>org.collectionspace.services.sdk</artifactId>
     <packaging>pom</packaging>
     <name>services.sdk</name>
-    <version>0.6-SNAPSHOT</version>
+    <version>0.7-SNAPSHOT</version>
     
     <distributionManagement>
         <repository>
diff --git a/services/sdk/sample/pom.xml b/services/sdk/sample/pom.xml
index dea1fbae3..33f098ac1 100644
--- a/services/sdk/sample/pom.xml
+++ b/services/sdk/sample/pom.xml
@@ -5,13 +5,13 @@
     <artifactId>org.collectionspace.services.client.sample</artifactId>
     <packaging>jar</packaging>
     <name>client.sample</name>
-    <version>0.6-SNAPSHOT</version>
+    <version>0.7-SNAPSHOT</version>
     
     <dependencies>
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.collectionobject.client</artifactId>
-            <version>0.6-SNAPSHOT</version>
+            <version>0.7-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
diff --git a/services/security/client/pom.xml b/services/security/client/pom.xml
index e9b946171..69fa3cb16 100644
--- a/services/security/client/pom.xml
+++ b/services/security/client/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>org.collectionspace.services.security</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/security/pom.xml b/services/security/pom.xml
index 2fc7b7b22..8823cf3ec 100644
--- a/services/security/pom.xml
+++ b/services/security/pom.xml
@@ -3,7 +3,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/vocabulary/3rdparty/nuxeo-platform-cs-vocabulary/build.xml b/services/vocabulary/3rdparty/nuxeo-platform-cs-vocabulary/build.xml
index 473adccef..62259be9c 100644
--- 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 79680c10d..6271a48a3 100644
--- 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 4d81b9372..d8c724310 100644
--- a/services/vocabulary/3rdparty/pom.xml
+++ b/services/vocabulary/3rdparty/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/client/pom.xml b/services/vocabulary/client/pom.xml
index 96f1bf873..f4722277c 100644
--- a/services/vocabulary/client/pom.xml
+++ b/services/vocabulary/client/pom.xml
@@ -6,7 +6,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/import/pom.xml b/services/vocabulary/import/pom.xml
index 2803614a3..7ab80d45e 100644
--- a/services/vocabulary/import/pom.xml
+++ b/services/vocabulary/import/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/installer/build.xml b/services/vocabulary/installer/build.xml
index 1e0443396..ab88a012a 100644
--- 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." />
 				</exec>
 				<!-- Copy the Nuxeo DocType jar files to the Nuxeo app server domain -->
-        <copy todir="${jboss.deploy.nuxeo.system}">
+        <copy todir="${jboss.deploy.nuxeo.plugins}">
             <fileset file="nuxeo/*.jar"/>
         </copy>				
     </target>    
diff --git a/services/vocabulary/jaxb/pom.xml b/services/vocabulary/jaxb/pom.xml
index d5939a6a3..f6026988e 100644
--- 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 50b8109f3..223731deb 100644
--- a/services/vocabulary/pom.xml
+++ b/services/vocabulary/pom.xml
@@ -5,7 +5,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/vocabulary/service/pom.xml b/services/vocabulary/service/pom.xml
index 7b1560e4a..25c28669c 100644
--- a/services/vocabulary/service/pom.xml
+++ b/services/vocabulary/service/pom.xml
@@ -3,7 +3,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>