From: Richard Millet <richard.millet@berkeley.edu>
Date: Thu, 17 Nov 2011 07:59:15 +0000 (+0000)
Subject: CSPACE-4526: Updated all Ant scripts and properties to reflect changes for an Apache... 
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=384ba978f24fb817ebb40ac5d5f91f0bf3b26eb7;p=tmp%2Fjakarta-migration.git

CSPACE-4526: Updated all Ant scripts and properties to reflect changes for an Apache Tomcat and embedded Nuxeo deployment environment.
---

diff --git a/3rdparty/build.xml b/3rdparty/build.xml
index 397b8e170..677e9ba61 100644
--- a/3rdparty/build.xml
+++ b/3rdparty/build.xml
@@ -113,12 +113,16 @@
     </target>
 
     <target name="deploy" depends="package"
-    	description="deploy 3rdparty in ${jboss.server.cspace}">
+    	description="deploy 3rdparty in ${jee.server.cspace}">
+        <copy todir="${db.base.dir}/jdbc_drivers">
+            <fileset dir="${basedir}/jdbc_drivers"/>
+        </copy>
+
         <ant antfile="nuxeo/build.xml" target="deploy" inheritall="false"/>
     </target>
 
     <target name="undeploy"
-    	description="undeploy 3rdparty from ${jboss.server.cspace}">
+    	description="undeploy 3rdparty from ${jee.server.cspace}">
         <ant antfile="nuxeo/build.xml" target="undeploy" inheritall="false"/>
     </target>
 
diff --git a/3rdparty/db_drivers/mysql-connector-java-5.1.7.jar b/3rdparty/db_drivers/mysql-connector-java-5.1.7.jar
deleted file mode 100644
index ebfe06861..000000000
Binary files a/3rdparty/db_drivers/mysql-connector-java-5.1.7.jar and /dev/null differ
diff --git a/3rdparty/db_drivers/postgresql-8.4-702.jdbc4.jar b/3rdparty/db_drivers/postgresql-8.4-702.jdbc4.jar
deleted file mode 100644
index 8b0c7616b..000000000
Binary files a/3rdparty/db_drivers/postgresql-8.4-702.jdbc4.jar and /dev/null differ
diff --git a/3rdparty/nuxeo/build.xml b/3rdparty/nuxeo/build.xml
index 1a6637ec1..75f9b1b34 100644
--- a/3rdparty/nuxeo/build.xml
+++ b/3rdparty/nuxeo/build.xml
@@ -114,9 +114,9 @@
     </target>
 
     <target name="deploy" depends="package"
-    	description="deploy nuxeo client libs to ${jboss.server.cspace}">
-        <copy todir="${jboss.server.cspace}/nuxeo-client">
-            <fileset dir="${basedir}/nuxeo-client/lib/${nuxeo.release}"/>
+    	description="deploy nuxeo client libs to ${jee.server.cspace}">
+        <copy todir="${jee.server.cspace}/nuxeo-server">
+            <fileset dir="${basedir}/nuxeo-server/${nuxeo.release}"/>
         </copy>
         <ant antfile="nuxeo-platform-collectionspace/build.xml" target="deploy" inheritall="false"/>
     	<!--
@@ -127,8 +127,8 @@
     </target>
 
     <target name="undeploy"
-    description="undeploy nuxeo client libs from ${jboss.server.cspace}">
-        <delete dir="${jboss.server.cspace}/nuxeo-client"/>
+    description="undeploy nuxeo client libs from ${jee.server.cspace}">
+        <delete dir="${jee.server.cspace}/nuxeo-client"/>
         <ant antfile="nuxeo-platform-collectionspace/build.xml" target="undeploy" inheritall="false"/>
 		<ant antfile="nuxeo-platform-quote/build.xml" target="undeploy" inheritall="false"/>
 		<ant antfile="nuxeo-platform-quote-api/build.xml" target="undeploy" inheritall="false"/>
diff --git a/3rdparty/nuxeo/nuxeo-database-templates/build.xml b/3rdparty/nuxeo/nuxeo-database-templates/build.xml
index 91e1d9c4b..0dd719f3e 100644
--- a/3rdparty/nuxeo/nuxeo-database-templates/build.xml
+++ b/3rdparty/nuxeo/nuxeo-database-templates/build.xml
@@ -38,7 +38,7 @@
         </copy>
     </target>
 
-		<!-- Set the value of the property pointing to the active templates directory
+	<!-- Set the value of the property pointing to the active templates directory
 		OBSOLETE - this is now handled by a deploy task at the root.
     <target name="update-nuxeo-config"
     	description="updates the active Nuxeo configuration file to specify the database template folder to use for CollectionSpace"
@@ -50,13 +50,13 @@
              <entry key="nuxeo.db.password" operation="=" value="${db.nuxeo.user.password}"/>
         </propertyfile>
     </target>
-		-->
+	-->
     
     <!-- Undeploy-related targets -->
 
     <target name="undeploy"
         description="undeploys CollectionSpace-specific Nuxeo database template folders"
-        depends="undeploy-template-dirs, reset-nuxeo-config">
+        depends="undeploy-template-dirs">
     </target>
     
     <target name="undeploy-template-dirs"
@@ -71,7 +71,9 @@
         </delete>
     </target>
     
-   <target name="reset-nuxeo-config"
+	<!-- We can't process templates anymore since we're using an Embedded Nuxeo EP server -->
+	<!--
+	<target name="reset-nuxeo-config"
     	description="resets the value of the database template folder in the active Nuxeo configuration file to an empty value"
         depends="check-propertyfile-task-exists, set-nuxeo-active-config, backup-nuxeo-config"
         if="has.propertyfile.task">
@@ -79,28 +81,41 @@
             <entry key="nuxeo.templates" operation="=" value=""/>
         </propertyfile>
     </target>
+	-->
     
     <!-- Utility targets -->
     
+	<!-- We can't process templates anymore since we're using an Embedded Nuxeo EP server -->
+	<!--
     <target name="set-nuxeo-active-config"
         description="Sets the path to the active Nuxeo configuration file"
         depends="set-nuxeo-active-config-with-env, set-nuxeo-active-config-without-env">
     </target>
+	-->
 
+	<!-- We can't process templates anymore since we're using an Embedded Nuxeo EP server -->
+	<!--
     <target name="set-nuxeo-active-config-with-env" if="env.NUXEO_CONF"
         description="Sets the path to the active Nuxeo configuration file, if set in the NUXEO_CONF environment variable">
         <property name="nuxeo.active.config.file" value="${env.NUXEO_CONF}"/>
     </target>
+	-->
 
+	<!-- We can't process templates anymore since we're using an Embedded Nuxeo EP server -->
+	<!--
     <target name="set-nuxeo-active-config-without-env" unless="env.NUXEO_CONF"
         description="Sets the path to the active Nuxeo configuration file, in the absence of a NUXEO_CONF environment variable">
         <property name="nuxeo.active.config.file" value="${nuxeo.main.config.file}"/>
     </target>
+	-->
 
+	<!-- We can't process templates anymore since we're using an Embedded Nuxeo EP server -->
+	<!--
     <target name="backup-nuxeo-config"
     	description="makes a single backup copy of the active, main Nuxeo configuration file, overwriting the previous backup">
         <copy file="${nuxeo.active.config.file}" tofile="${nuxeo.active.config.file}${backup.suffix}" overwrite="true"/>
     </target>
+	-->
     
     <target name="check-templates-dir-exists"
     	description="checks for the existence of a Nuxeo database template folder for the ${db} database">
diff --git a/3rdparty/nuxeo/nuxeo-platform-collectionspace/build.xml b/3rdparty/nuxeo/nuxeo-platform-collectionspace/build.xml
index d151266eb..15a16b5d5 100644
--- a/3rdparty/nuxeo/nuxeo-platform-collectionspace/build.xml
+++ b/3rdparty/nuxeo/nuxeo-platform-collectionspace/build.xml
@@ -81,19 +81,19 @@
   </target>
   
   <target name="deploy" depends="install"
-    description="deploy collectionspace core doctype in ${jboss.server.nuxeo}">
+    description="deploy collectionspace core doctype in ${jee.server.nuxeo}">
     <copy file="${basedir}/target/${nuxeo.collectionspace_core.jar}"
-      todir="${jboss.deploy.nuxeo.plugins}"/>
+      todir="${jee.deploy.nuxeo.plugins}"/>
   </target>
   
   <target name="undeploy"
-    description="undeploy collectionspace core doctype from ${jboss.server.nuxeo}">
+    description="undeploy collectionspace core doctype from ${jee.server.nuxeo}">
     <delete>
-      <fileset dir="${jboss.deploy.nuxeo.plugins}">
-        <include name="${nuxeo.collectionspace_core.jars.all}"/>
-      </fileset>
+      <fileset dir="${jee.deploy.nuxeo.plugins}">
+        <include name="${nuxeo.collectionspace_core.jars.all}"/>		
+      </fileset>	  
       <!-- Legacy deployment location through release 0.6 -->
-      <fileset dir="${jboss.deploy.nuxeo.system}">
+      <fileset dir="${jee.deploy.nuxeo.system}">
         <include name="${nuxeo.collectionspace_core.jars.all}"/>
       </fileset>
     </delete>
diff --git a/3rdparty/nuxeo/nuxeo-platform-collectionspace/pom.xml b/3rdparty/nuxeo/nuxeo-platform-collectionspace/pom.xml
index 9a97bab14..fe4c6340c 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>1.14-SNAPSHOT</version>
+    <version>2.0-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/3rdparty/nuxeo/nuxeo-platform-quote-api/build.xml b/3rdparty/nuxeo/nuxeo-platform-quote-api/build.xml
index 20c78bacc..d22e573e7 100644
--- a/3rdparty/nuxeo/nuxeo-platform-quote-api/build.xml
+++ b/3rdparty/nuxeo/nuxeo-platform-quote-api/build.xml
@@ -83,15 +83,15 @@
   </target>
   
   <target name="deploy" depends="install"
-    description="deploy collectionspace core doctype in ${jboss.server.nuxeo}">
+    description="deploy collectionspace core doctype in ${jee.server.nuxeo}">
     <copy file="${basedir}/target/${nuxeo.collectionspace.quote.jar}"
-      todir="${jboss.deploy.nuxeo.plugins}"/>
+      todir="${jee.deploy.nuxeo.plugins}"/>
   </target>
   
   <target name="undeploy"
-    description="undeploy collectionspace Quote service from ${jboss.server.nuxeo}">
+    description="undeploy collectionspace Quote service from ${jee.server.nuxeo}">
     <delete>
-      <fileset dir="${jboss.deploy.nuxeo.plugins}">
+      <fileset dir="${jee.deploy.nuxeo.plugins}">
         <include name="${nuxeo.collectionspace.quote.jar.all}"/>
       </fileset>
     </delete>
diff --git a/3rdparty/nuxeo/nuxeo-platform-quote-api/pom.xml b/3rdparty/nuxeo/nuxeo-platform-quote-api/pom.xml
index bbe97dcba..ce280fa33 100644
--- a/3rdparty/nuxeo/nuxeo-platform-quote-api/pom.xml
+++ b/3rdparty/nuxeo/nuxeo-platform-quote-api/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.collectionspace.services</groupId>
 		<artifactId>org.collectionspace.services.3rdparty.nuxeo</artifactId>
-		<version>1.14-SNAPSHOT</version>
+		<version>2.0-SNAPSHOT</version>
 	</parent>
 
 	<groupId>org.collectionspace.services</groupId>
diff --git a/3rdparty/nuxeo/nuxeo-platform-quote/build.xml b/3rdparty/nuxeo/nuxeo-platform-quote/build.xml
index c67bcfd9a..6cd3c4a2f 100644
--- a/3rdparty/nuxeo/nuxeo-platform-quote/build.xml
+++ b/3rdparty/nuxeo/nuxeo-platform-quote/build.xml
@@ -83,15 +83,15 @@
   </target>
   
   <target name="deploy" depends="install"
-    description="deploy collectionspace core doctype in ${jboss.server.nuxeo}">
+    description="deploy collectionspace core doctype in ${jee.server.nuxeo}">
     <copy file="${basedir}/target/${nuxeo.collectionspace.quote.jar}"
-      todir="${jboss.deploy.nuxeo.plugins}"/>
+      todir="${jee.deploy.nuxeo.plugins}"/>
   </target>
   
   <target name="undeploy"
-    description="undeploy collectionspace Quote service from ${jboss.server.nuxeo}">
+    description="undeploy collectionspace Quote service from ${jee.server.nuxeo}">
     <delete>
-      <fileset dir="${jboss.deploy.nuxeo.plugins}">
+      <fileset dir="${jee.deploy.nuxeo.plugins}">
         <include name="${nuxeo.collectionspace.quote.jar.all}"/>
       </fileset>
     </delete>
diff --git a/3rdparty/nuxeo/nuxeo-platform-quote/pom.xml b/3rdparty/nuxeo/nuxeo-platform-quote/pom.xml
index 4930589d9..7d146bbec 100644
--- a/3rdparty/nuxeo/nuxeo-platform-quote/pom.xml
+++ b/3rdparty/nuxeo/nuxeo-platform-quote/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.collectionspace.services</groupId>
 		<artifactId>org.collectionspace.services.3rdparty.nuxeo</artifactId>
-		<version>1.14-SNAPSHOT</version>
+		<version>2.0-SNAPSHOT</version>
 	</parent>
 
   <groupId>org.collectionspace.services</groupId>
diff --git a/3rdparty/nuxeo/pom.xml b/3rdparty/nuxeo/pom.xml
index 2b0a71057..cc749ef9d 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>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/3rdparty/pom.xml b/3rdparty/pom.xml
index 34ed2cf07..377ab7fb9 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>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>
diff --git a/HelloWorld/HelloWorldNuxeoService/build.xml b/HelloWorld/HelloWorldNuxeoService/build.xml
index cdba8639c..b25be4f08 100644
--- a/HelloWorld/HelloWorldNuxeoService/build.xml
+++ b/HelloWorld/HelloWorldNuxeoService/build.xml
@@ -5,7 +5,7 @@
 
 
   <target name="deploy" description="Deploy">
-    <copy todir="${jboss.dir}/server/default/deploy">
+    <copy todir="${jee.dir}/server/default/deploy">
       <fileset file="${basedir}/target/helloworld.war" />
     </copy>
   </target>
diff --git a/build.properties b/build.properties
index a6da0f62a..1adb4ed90 100644
--- a/build.properties
+++ b/build.properties
@@ -1,15 +1,17 @@
 host=127.0.0.1
 #cspace
-release.version=1.14
+release.version=2.0
 cspace.release=${release.version}-SNAPSHOT
 cspace.services.release=cspace-services-${cspace.release}
-cspace.services.war=cspace-services.war
 domain.cspace=cspace-services
+cspace.services.context=${domain.cspace}
+cspace.services.war=${cspace.services.context}.war
 domain.nuxeo=nuxeo-server
 
 #nuxeo
 #nuxeo.release=5.2.M4
 #nuxeo.release=5.3.2
+#nuxeo.release=5.5-I20111104_1115
 nuxeo.release=5.4.2-HF05
 nuxeo.ear=nuxeo.ear
 ## #old# nuxeo.system=${nuxeo.ear}/bundles
@@ -30,27 +32,25 @@ dist.installer.services=${dist.installer}/services
 
 ## #old# dist cspace domain
 dist.domain.cspace=${domain.cspace}
-dist.server.cspace=${dist.cspace}/server/${jboss.domain.cspace}
+dist.server.cspace=${dist.cspace}/server/${jee.domain.cspace}
 dist.deploy.cspace=${dist.server.cspace}/deploy
 dist.lib.cspace=${dist.server.cspace}/lib
 
 ## #old# dist nuxeo domain
 dist.domain.nuxeo=${domain.nuxeo}
-dist.server.nuxeo=${dist.nuxeo}/server/${jboss.domain.nuxeo}
+dist.server.nuxeo=${dist.nuxeo}/server/${jee.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
-#jboss.release=jboss-4.2.3.GA
+#JEE Application Server
 jee.release=tomcat-6
 jee.dir=${env.CSPACE_JEESERVER_HOME}
 jee.home=${jee.dir}
 jee.bin=${jee.home}/bin
 
-#jboss cspace domain
+#JEE Application Server cspace domain
 jee.domain.cspace=${domain.cspace}
 jee.domain.cspace.port=8180
 jee.server.cspace=${jee.home}
@@ -58,7 +58,7 @@ jee.deploy.cspace=${jee.server.cspace}/webapps
 jee.lib.cspace=${jee.server.cspace}/lib
 jee.deploy.cspace.services=${jee.deploy.cspace}/${cspace.services.war}
 
-#jboss nuxeo domain
+#JEE Application Server nuxeo domain
 jee.domain.nuxeo=${domain.nuxeo}
 ##old# #jee.domain.nuxeo.port=8080
 jee.server.nuxeo=${jee.home}/${jee.domain.nuxeo}
@@ -71,7 +71,11 @@ jee.deploy.nuxeo.plugins=${jee.deploy.nuxeo}/${nuxeo.plugins}
 ##old# nuxeo.templates.dir=${jboss.home}/${nuxeo.templates}
 
 #nuxeo main config file
-nuxeo.main.config.file=${jboss.bin}/nuxeo.conf
+nuxeo.main.config.file=${jee.bin}/nuxeo.conf
+#nuxeo database templates directory
+nuxeo.templates.dir=${jee.home}/${nuxeo.templates}
+
+db.base.dir=${jee.server.cspace}/cspace/services/db
 
 #database - select one or the other (not both!), and then uncomment the
 # appropriate section below the common settings
@@ -79,7 +83,7 @@ nuxeo.main.config.file=${jboss.bin}/nuxeo.conf
 db=mysql
 #For mysql, uncomment this, and comment out postgres section
 db.port=3306
-db.driver.jar=${jboss.lib.cspace}/mysql-connector-java-5.1.7-bin.jar
+db.driver.jar=${db.base.dir}/jdbc_drivers/mysql-connector-java-5.1.7.jar
 db.jdbc.driver.class=com.mysql.jdbc.Driver
 db.dialect=org.hibernate.dialect.MySQLDialect
 db.typemapping=mySQL
@@ -89,7 +93,7 @@ db.spring.acl.sidIdentityQuery=SELECT @@IDENTITY
 
 #For postgresql, uncomment this, and comment out mysql section
 #db.port=5432
-#db.driver.jar=${jboss.lib.cspace}/postgresql-8.4-702.jdbc4.jar
+#db.driver.jar=${db.base.dir}/jdbc_drivers/postgresql-8.4-702.jdbc4.jar
 #db.jdbc.driver.class=org.postgresql.Driver
 #db.dialect=org.hibernate.dialect.PostgreSQLDialect
 #db.typemapping=PostgreSQL 8.0
@@ -103,7 +107,7 @@ db.spring.acl.sidIdentityQuery=SELECT @@IDENTITY
 hibernate.dialect=${db.dialect}
 
 #database common settings
-db.script.dir=${jboss.server.cspace}/cspace/services/db/${db}
+db.script.dir=${jee.server.cspace}/cspace/services/db/${db}
 db.user=${env.DB_USER}
 db.user.password=${env.DB_PASSWORD}
 db.nuxeo.user=nuxeo
diff --git a/build.xml b/build.xml
index aba8309d0..b13f72358 100644
--- a/build.xml
+++ b/build.xml
@@ -40,73 +40,73 @@
         <ant antfile="services/build.xml" target="dist" inheritAll="false"/>
 
         <!-- bundle up everything -->
-        <tar destfile="${basedir}/dist/${cspace.services.release}-${jboss.release}.tar.gz" compression="gzip">
+        <tar destfile="${basedir}/dist/${cspace.services.release}-${jee.release}.tar.gz" compression="gzip">
             <tarfileset dir="${basedir}/dist/cspace"
                         preserveLeadingSlashes="true">
             </tarfileset>
         </tar>
     </target>
 
-    <target name="dist-jboss-domains" depends="init"
-            description="create jboss distributions for cspace and nuxeo">
-        <antcall target="dist-jboss-cspace"/>
-        <antcall target="dist-jboss-nuxeo"/>
+    <target name="dist-jee-domains" depends="init"
+            description="create JEE distributions for cspace and nuxeo">
+        <antcall target="dist-jee-cspace"/>
+        <antcall target="dist-jee-nuxeo"/>
     </target>
 
-    <target name="dist-jboss-cspace" depends="dist"
-            description="generate jboss distribution for cspace">
-        <fail message="JBoss is not installed or ${jboss.dir} not found">
+    <target name="dist-jee-cspace" depends="dist"
+            description="generate JEE distribution for cspace">
+        <fail message="JEE container is not installed or ${jee.dir} not found">
             <condition>
                 <not>
-                    <available file="${jboss.dir}" type="dir"/>
+                    <available file="${jee.dir}" type="dir"/>
                 </not>
             </condition>
         </fail>
 
-        <fail message="CSpace is not deployed or ${jboss.deploy.cspace.services} not found">
+        <fail message="CSpace is not deployed or ${jee.deploy.cspace.services} not found">
             <condition>
                 <not>
-                    <available file="${jboss.deploy.cspace.services}" type="file"/>
+                    <available file="${jee.deploy.cspace.services}" type="file"/>
                 </not>
             </condition>
         </fail>
 
-        <tar destfile="${basedir}/dist/${jboss.release}-${domain.cspace}-${release.version}.tar.gz" compression="gzip">
-            <tarfileset dir="${jboss.dir}"
-                        prefix="${jboss.release}"
+        <tar destfile="${basedir}/dist/${jee.release}-${domain.cspace}-${release.version}.tar.gz" compression="gzip">
+            <tarfileset dir="${jee.dir}"
+                        prefix="${jee.release}"
                         preserveLeadingSlashes="true">
-                <exclude name="server/${jboss.domain.nuxeo}/**"/>
-                <exclude name="server/${jboss.domain.cspace}/log/**"/>
-                <exclude name="server/${jboss.domain.cspace}/tmp/**"/>
+                <exclude name="server/${jee.domain.nuxeo}/**"/>
+                <exclude name="server/${jee.domain.cspace}/log/**"/>
+                <exclude name="server/${jee.domain.cspace}/tmp/**"/>
             </tarfileset>
         </tar>
     </target>
 
-    <target name="dist-jboss-nuxeo" depends="dist"
+    <target name="dist-jee-nuxeo" depends="dist"
             description="generate nuxeo domain distribution" >
-        <fail message="JBoss is not installed or ${jboss.dir} not found">
+        <fail message="JEE server is not installed or ${jee.dir} not found">
             <condition>
                 <not>
-                    <available file="${jboss.dir}" type="dir"/>
+                    <available file="${jee.dir}" type="dir"/>
                 </not>
             </condition>
         </fail>
 
-        <fail message="Nuxeo is not deployed or ${jboss.deploy.nuxeo.plugins} not found">
+        <fail message="Nuxeo is not deployed or ${jee.deploy.nuxeo.plugins} not found">
             <condition>
                 <not>
-                    <available file="${jboss.deploy.nuxeo.plugins}" type="dir"/>
+                    <available file="${jee.deploy.nuxeo.plugins}" type="dir"/>
                 </not>
             </condition>
         </fail>
 
-        <tar destfile="${basedir}/dist/${jboss.release}-${domain.nuxeo}-${release.version}.tar.gz" compression="gzip">
-            <tarfileset dir="${jboss.dir}"
-                        prefix="${jboss.release}"
+        <tar destfile="${basedir}/dist/${jee.release}-${domain.nuxeo}-${release.version}.tar.gz" compression="gzip">
+            <tarfileset dir="${jee.dir}"
+                        prefix="${jee.release}"
                         preserveLeadingSlashes="true">
-                <exclude name="server/${jboss.domain.cspace}/**"/>
-                <exclude name="server/${jboss.domain.nuxeo}/log/**"/>
-                <exclude name="server/${jboss.domain.nuxeo}/tmp/**"/>
+                <exclude name="server/${jee.domain.cspace}/**"/>
+                <exclude name="server/${jee.domain.nuxeo}/log/**"/>
+                <exclude name="server/${jee.domain.nuxeo}/tmp/**"/>
             </tarfileset>
         </tar>
     </target>
@@ -233,15 +233,15 @@
     </target>
 
     <target name="deploy" depends="checkvars,install,setup_nuxeo.conf,setup_cspaceds.cfg,setup_initdb.sql"
-            description="deploy services in ${jboss.server.cspace}">
+            description="deploy services in ${jee.server.cspace}">
         <!-- copy db scripts, etc. -->
-				<copy todir="${jboss.server.cspace}/cspace/services/scripts">
-					<fileset dir="${src}/main/resources/scripts/"/>
+		<copy todir="${jee.server.cspace}/cspace/services/scripts">
+			<fileset dir="${src}/main/resources/scripts/"/>
         </copy>
-        <!-- copy datasources, including default jboss ds -->
+        <!-- copy datasources, including default JEE datasource -->
 				<!--
 				Now handled in dependent targets
-        <copy todir="${jboss.deploy.cspace}">
+        <copy todir="${jee.deploy.cspace}">
 					<fileset dir="${src}/main/resources/config/${db}"/>
 				</copy>
 				-->
@@ -250,9 +250,9 @@
 
 			</target>
 
-		<target name="checkvars">
-				<fail unless="env.JBOSS_HOME" 
-							message="Required environment variable JBOSS_HOME has not been set."/>
+		<target name="checkvars">		
+				<fail unless="env.CSPACE_JEESERVER_HOME" 
+							message="Required environment variable CSPACE_JEESERVER_HOME has not been set."/>
 				<fail unless="env.DB_PASSWORD_CSPACE" 
 							message="Required environment variable DB_PASSWORD_CSPACE has not been set."/>
 				<fail unless="env.DB_PASSWORD_NUXEO" 
@@ -265,8 +265,8 @@
 		<target name="setup_nuxeo.conf"
 					 description="copy nuxeo.conf, replacing keyword to set DB dialect">
 			<property name="src.nuxeo.conf" value="${src}/main/resources/config/nuxeo.conf"/>
-			<delete file="${jboss.bin}/nuxeo.conf" failonerror="false" />
-			<copy file="${src.nuxeo.conf}" todir="${jboss.bin}">
+			<delete file="${jee.bin}/nuxeo.conf" failonerror="false" />
+			<copy file="${src.nuxeo.conf}" todir="${jee.bin}">
 				<filterset>
 					<filter token="DB" value="${db}" />
 					<filter token="NUXEO_USER" value="${db.nuxeo.user}" />
@@ -278,8 +278,8 @@
 		<target name="setup_cspaceds.cfg"
 					 description="copy cspace-ds.xml, replacing keywords">
 			<property name="src.cspaceds.cfg" value="${src}/main/resources/config/cspace-ds.xml"/>
-			<delete file="${jboss.deploy.cspace}/cspace-ds.xml" failonerror="false" />
-			<copy file="${src.cspaceds.cfg}" todir="${jboss.deploy.cspace}">
+			<delete file="${jee.deploy.cspace}/cspace-ds.xml" failonerror="false" />
+			<copy file="${src.cspaceds.cfg}" todir="${jee.deploy.cspace}">
 				<filterset>
 					<filter token="DB_CSPACE_URL" value="${db.jdbc.cspace.url}" />
 					<filter token="DB_NUXEO_URL" value="${db.jdbc.nuxeo.url}" />
@@ -296,16 +296,14 @@
     </target>
 
 		<target name="setup_initdb.sql" description="copy init_db scripts, replacing keywords">
-			<copy todir="${jboss.server.cspace}/cspace/services/db">
+			<copy todir="${jee.server.cspace}/cspace/services/db">
         <fileset dir="${src}/main/resources/db"/>
 				<filterset>
 					 <!-- Note: double-subs from ${db.xyz.password} fail -->
 					<filter token="DB_CSPACE_USER" value="${db.cspace.user}" />
 					<filter token="DB_NUXEO_USER" value="${db.nuxeo.user}" />
-					<filter token="DB_JBOSS_USER" value="${db.jboss.user}" />
 				  <filter token="DB_CSPACE_PASSWORD" value="${env.DB_PASSWORD_CSPACE}" />
 					<filter token="DB_NUXEO_PASSWORD" value="${env.DB_PASSWORD_NUXEO}" />
-					<filter token="DB_JBOSS_PASSWORD" value="${env.DB_PASSWORD_JBOSS}" />
 				</filterset>
 			</copy>
     </target>
@@ -313,20 +311,20 @@
  
 
     <target name="undeploy"
-            description="undeploy services from ${jboss.server.cspace}">
+            description="undeploy services from ${jee.server.cspace}">
         <ant antfile="services/build.xml" target="undeploy" inheritAll="false"/>
         <ant antfile="3rdparty/build.xml" target="undeploy" inheritAll="false"/>
 				<!-- Delete mysql-ds.xml to clean up pre-1.8 bundles -->
-				<delete failonerror="false" file="${jboss.deploy.cspace}/mysql-ds.xml"/>
-				<delete failonerror="false" file="${jboss.deploy.cspace}/jboss-ds.xml"/>
-        <delete failonerror="false" file="${jboss.deploy.cspace}/cspace-ds.xml"/>
-        <delete failonerror="false" dir="${jboss.server.cspace}/cspace/services"/>
-        <delete failonerror="false" dir="${jboss.server.cspace}/cspace/config/services"/>
+				<delete failonerror="false" file="${jee.deploy.cspace}/mysql-ds.xml"/>
+				<delete failonerror="false" file="${jee.deploy.cspace}/jee-ds.xml"/>
+        <delete failonerror="false" file="${jee.deploy.cspace}/cspace-ds.xml"/>
+        <delete failonerror="false" dir="${jee.server.cspace}/cspace/services"/>
+        <delete failonerror="false" dir="${jee.server.cspace}/cspace/config/services"/>
     </target>
 
 
     <target name="hotdeploy" depends="install"
-            description="deploy services in running ${jboss.server.cspace}">
+            description="deploy services in running ${jee.server.cspace}">
         <ant antfile="services/build.xml" target="hotdeploy" inheritAll="false"/>
     </target>
 
diff --git a/installer/build.xml b/installer/build.xml
index d02d54705..066cf84d3 100644
--- a/installer/build.xml
+++ b/installer/build.xml
@@ -18,27 +18,27 @@
     <target name="install"
     	description="Installer: Copy artifacts for CollectionSpace Nuxeo doctypes">
         <!-- cspace\server\cspace -->     
-        <copy todir="${jboss.server.cspace}/cspace">
+        <copy todir="${jee.server.cspace}/cspace">
             <fileset dir="${services.trunk}/${dist.server.cspace}/cspace"/>
         </copy>
         <!-- cspace\server\cspace\deploy -->     
-        <copy todir="${jboss.server.cspace}/deploy">
+        <copy todir="${jee.server.cspace}/deploy">
             <fileset dir="${services.trunk}/${dist.server.cspace}/deploy">
             	<include name="*"/>
             </fileset>
         </copy>
         <!-- cspace\server\cspace\lib -->      
-        <copy todir="${jboss.server.cspace}/lib">
+        <copy todir="${jee.server.cspace}/lib">
             <fileset dir="${services.trunk}/${dist.server.cspace}/lib"/>
         </copy>   
         <!-- cspace\server\cspace\nuxeo-client\lib -->     
-        <copy todir="${jboss.server.cspace}/nuxeo-client/lib">
+        <copy todir="${jee.server.cspace}/nuxeo-client/lib">
             <fileset dir="${services.trunk}/${dist.server.cspace}/nuxeo-client/lib">
             	<include name="*.jar"/>
 						</fileset>
         </copy>
         <!-- cspace\server\cspace\nuxeo-client\lib (5.2GA) -->      
-        <copy todir="${jboss.server.cspace}/nuxeo-client/lib">
+        <copy todir="${jee.server.cspace}/nuxeo-client/lib">
             <fileset dir="${services.trunk}/${dist.server.cspace}/nuxeo-client/lib/${nuxeo.release}">
             	<include name="*.jar"/>
 						</fileset>
diff --git a/pom.xml b/pom.xml
index fe5b7a62f..03ee7e911 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,415 +1,365 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>org.collectionspace.services</groupId>
-    <artifactId>org.collectionspace.services</artifactId>
-    <version>1.14-SNAPSHOT</version>
-    <packaging>pom</packaging>
-    <name>services</name>
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>org.collectionspace.services</groupId>
+	<artifactId>org.collectionspace.services</artifactId>
+	<version>2.0-SNAPSHOT</version>
+	<packaging>pom</packaging>
+	<name>services</name>
 
-    <properties>
-        <jboss.version>5.1.0.GA</jboss.version>
-        <jboss.ejb.version>3.0</jboss.ejb.version>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>		
-        <nuxeo.shell.version>5.4.2-HF05</nuxeo.shell.version>
+	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<nuxeo.shell.version>5.4.2-HF05</nuxeo.shell.version>
 		<nuxeo.platform.version>5.4.2-HF05</nuxeo.platform.version>
-        <nuxeo.core.version>5.4.2-HF05</nuxeo.core.version>
-        <cspace.services.version>1.14-SNAPSHOT</cspace.services.version>
-        <cspace.services.client.version>1.14-SNAPSHOT</cspace.services.client.version>
-    </properties>
+		<nuxeo.core.version>5.4.2-HF05</nuxeo.core.version>
+		<cspace.services.version>2.0-SNAPSHOT</cspace.services.version>
+		<cspace.services.client.version>2.0-SNAPSHOT</cspace.services.client.version>
+	</properties>
 
-    <distributionManagement>
-        <repository>
-            <id>libs-releases-local</id>
-            <name>libs-releases-local</name>
-            <url>http://source.collectionspace.org:8081/artifactory/libs-releases-local</url>
-        </repository>
-        <snapshotRepository>
-            <id>libs-snapshots-local</id>
-            <name>libs-snapshots-local</name>
-            <url>http://source.collectionspace.org:8081/artifactory/libs-snapshots-local</url>
-        </snapshotRepository>
-    </distributionManagement>
+	<distributionManagement>
+		<repository>
+			<id>libs-releases-local</id>
+			<name>libs-releases-local</name>
+			<url>http://source.collectionspace.org:8081/artifactory/libs-releases-local</url>
+		</repository>
+		<snapshotRepository>
+			<id>libs-snapshots-local</id>
+			<name>libs-snapshots-local</name>
+			<url>http://source.collectionspace.org:8081/artifactory/libs-snapshots-local</url>
+		</snapshotRepository>
+	</distributionManagement>
 
-    <modules>
-        <module>3rdparty</module>
-        <module>services</module>
-    </modules>
+	<modules>
+		<module>3rdparty</module>
+		<module>services</module>
+	</modules>
 
-    <repositories>
-        <repository>
-            <id>collectionspace-remote-repos</id>
-            <name>collectionspace-remote-repos</name>
-            <url>http://source.collectionspace.org:8081/artifactory/remote-repos</url>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>            
-        </repository>
-        <repository>
-            <id>repo1</id>
-            <name>Maven repo1</name>
-            <url>http://repo1.maven.org/maven2</url>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </repository>
-        <repository>
-            <id>repo2</id>
-            <name>Maven repo2</name>
-            <url>http://repo2.maven.org/maven2</url>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </repository>
-        <repository>
-            <id>maven2-repository.dev.java.net</id>
-            <name>Java.net Maven 2 Repository</name>
-            <url>http://download.java.net/maven/2</url>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </repository>
-<!--        <repository>
-            <id>maven1-repository.dev.java.net</id>
-            <name>Java.net Maven 1 Repository</name>
-            <url>http://download.java.net/maven/1</url>
-            <layout>legacy</layout>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </repository>-->
+	<repositories>
+		<repository>
+			<id>collectionspace-remote-repos</id>
+			<name>collectionspace-remote-repos</name>
+			<url>http://source.collectionspace.org:8081/artifactory/remote-repos</url>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+		</repository>
+		<repository>
+			<id>repo1</id>
+			<name>Maven repo1</name>
+			<url>http://repo1.maven.org/maven2</url>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+		</repository>
+		<repository>
+			<id>repo2</id>
+			<name>Maven repo2</name>
+			<url>http://repo2.maven.org/maven2</url>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+		</repository>
+		<repository>
+			<id>maven2-repository.dev.java.net</id>
+			<name>Java.net Maven 2 Repository</name>
+			<url>http://download.java.net/maven/2</url>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+		</repository>
+		<!-- <repository> <id>maven1-repository.dev.java.net</id> <name>Java.net 
+			Maven 1 Repository</name> <url>http://download.java.net/maven/1</url> <layout>legacy</layout> 
+			<snapshots> <enabled>false</enabled> </snapshots> </repository> -->
 
-        <repository>
-            <id>jboss.org</id>
-            <url>https://repository.jboss.org/nexus</url>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </repository>
-        <!-- some security binaries available under .com only perhaps due to licensing issues -->
-        <repository>
-            <id>jboss.com</id>
-            <url>http://repository.jboss.org/nexus/content/groups/public-jboss</url>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </repository>
+		<repository>
+			<id>jboss.org</id>
+			<url>https://repository.jboss.org/nexus</url>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+		</repository>
+		<!-- some security binaries available under .com only perhaps due to licensing 
+			issues -->
+		<repository>
+			<id>jboss.com</id>
+			<url>http://repository.jboss.org/nexus/content/groups/public-jboss</url>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+		</repository>
 
-        <repository>
-            <id>codehaus repo</id>
-            <name>codehaus repo</name>
-            <url>http://repository.codehaus.org</url>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </repository>
+		<repository>
+			<id>codehaus repo</id>
+			<name>codehaus repo</name>
+			<url>http://repository.codehaus.org</url>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+		</repository>
 
-        <repository>
-            <id>public-snapshot</id>
-            <url>http://maven.nuxeo.org/public-snapshot</url>
-            <!-- Nuxeo Snapshots Repository is disabled. -->
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-            <snapshots>
-                <enabled>false</enabled>
-                <!--<updatePolicy>never</updatePolicy>-->
-            </snapshots>
-        </repository>
+		<repository>
+			<id>public-snapshot</id>
+			<url>http://maven.nuxeo.org/public-snapshot</url>
+			<!-- Nuxeo Snapshots Repository is disabled. -->
+			<releases>
+				<enabled>false</enabled>
+			</releases>
+			<snapshots>
+				<enabled>false</enabled>
+				<!--<updatePolicy>never</updatePolicy> -->
+			</snapshots>
+		</repository>
 
-        <repository>
-            <id>public</id>
-            <url>http://maven.nuxeo.org/public</url>
-            <!-- Nuxeo Releases Repository is disabled. -->
-            <releases>
-                <enabled>true</enabled>
-            </releases>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </repository>
+		<repository>
+			<id>public</id>
+			<url>http://maven.nuxeo.org/public</url>
+			<!-- Nuxeo Releases Repository is disabled. -->
+			<releases>
+				<enabled>true</enabled>
+			</releases>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+		</repository>
 
-        <repository>
-            <id>nuxeo-public</id>
-            <name>nuxeo-public</name>
-            <url>http://source.collectionspace.org:8081/artifactory/nuxeo-public</url>
-            <releases>
-                <enabled>true</enabled>
-            </releases>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </repository>
-<!-- This should no longer be needed since we're using only "releases" artifacts        
-        <repository>
-            <id>nuxeo-public-snapshot</id>
-            <name>nuxeo-public-snapshot</name>
-            <url>http://source.collectionspace.org:8081/artifactory/nuxeo-public-snapshot</url>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-            <snapshots>
-                <enabled>true</enabled>
-                <updatePolicy>never</updatePolicy>
-            </snapshots>
-        </repository>
--->
+		<repository>
+			<id>nuxeo-public</id>
+			<name>nuxeo-public</name>
+			<url>http://source.collectionspace.org:8081/artifactory/nuxeo-public</url>
+			<releases>
+				<enabled>true</enabled>
+			</releases>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+		</repository>
+		<!-- This should no longer be needed since we're using only "releases" 
+			artifacts <repository> <id>nuxeo-public-snapshot</id> <name>nuxeo-public-snapshot</name> 
+			<url>http://source.collectionspace.org:8081/artifactory/nuxeo-public-snapshot</url> 
+			<releases> <enabled>false</enabled> </releases> <snapshots> <enabled>true</enabled> 
+			<updatePolicy>never</updatePolicy> </snapshots> </repository> -->
 
-        <repository>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-            <releases>
-                <enabled>true</enabled>
-            </releases>
-            <id>el4jReleaseRepositoryExternal</id>
-            <name>External release repository of the EL4J project</name>
-            <url>http://public-el4.elca-services.ch/el4j/maven2repository</url>
-        </repository>
-		
+		<repository>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+			<releases>
+				<enabled>true</enabled>
+			</releases>
+			<id>el4jReleaseRepositoryExternal</id>
+			<name>External release repository of the EL4J project</name>
+			<url>http://public-el4.elca-services.ch/el4j/maven2repository</url>
+		</repository>
 
-    </repositories>
 
-    <pluginRepositories>
-        <pluginRepository>
-            <id>collectionspace-plugins-remote-repos</id>
-            <name>collectionspace-plugins-remote-repos</name>
-            <url>http://source.collectionspace.org:8081/artifactory/plugins-remote-repos</url>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </pluginRepository>
-        <pluginRepository>
-            <id>repo1</id>
-            <name>Maven repo1</name>
-            <url>http://repo1.maven.org/maven2</url>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </pluginRepository>
-        <pluginRepository>
-            <id>maven repo</id>
-            <name>maven repo</name>
-            <url>http://repo2.maven.org/maven2</url>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </pluginRepository>
-        <pluginRepository>
-            <id>maven2-repository.dev.java.net</id>
-            <url>http://download.java.net/maven/2</url>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </pluginRepository>
-        <pluginRepository>
-            <id>Codehaus Repository</id>
-            <url>http://repository.codehaus.org/</url>
-            <releases>
-                <enabled>true</enabled>
-            </releases>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </pluginRepository>
-    </pluginRepositories>
+	</repositories>
 
-    <build>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-javadoc-plugin</artifactId>
-                    <version>2.6.1</version>
-                    <configuration>
-                        <show>public</show>
-                    </configuration>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>                    
-                    <artifactId>maven-compiler-plugin</artifactId>
-                    <version>2.3</version>
-                    <configuration>
-                        <source>1.6</source>
-                        <target>1.6</target>
-                    </configuration>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-assembly-plugin</artifactId>
-                    <configuration> </configuration>
-                </plugin>
-                <!--                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-site-plugin</artifactId>
-                    <configuration>
-                        <dependencyLocationEnabled>false</dependencyLocationEnabled>
-                        <unzipCommand>/usr/bin/unzip -o &gt; err.txt</unzipCommand>
-                    </configuration>
-                </plugin> -->
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-war-plugin</artifactId>
-                    <version>2.0</version>
-                    <configuration>
-                        <warSourceExcludes>WEB-INF/lib/*.jar</warSourceExcludes>
-                        <archive>
-                            <manifest>
-                                <addClasspath>true</addClasspath>
-                            </manifest>
-                        </archive>
-                    </configuration>
-                </plugin>
+	<pluginRepositories>
+		<pluginRepository>
+			<id>collectionspace-plugins-remote-repos</id>
+			<name>collectionspace-plugins-remote-repos</name>
+			<url>http://source.collectionspace.org:8081/artifactory/plugins-remote-repos</url>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+		</pluginRepository>
+		<pluginRepository>
+			<id>repo1</id>
+			<name>Maven repo1</name>
+			<url>http://repo1.maven.org/maven2</url>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+		</pluginRepository>
+		<pluginRepository>
+			<id>maven repo</id>
+			<name>maven repo</name>
+			<url>http://repo2.maven.org/maven2</url>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+		</pluginRepository>
+		<pluginRepository>
+			<id>maven2-repository.dev.java.net</id>
+			<url>http://download.java.net/maven/2</url>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+		</pluginRepository>
+		<pluginRepository>
+			<id>Codehaus Repository</id>
+			<url>http://repository.codehaus.org/</url>
+			<releases>
+				<enabled>true</enabled>
+			</releases>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+		</pluginRepository>
+	</pluginRepositories>
 
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-jar-plugin</artifactId>
-                    <version>2.2</version>
-                </plugin>
+	<build>
+		<pluginManagement>
+			<plugins>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-javadoc-plugin</artifactId>
+					<version>2.6.1</version>
+					<configuration>
+						<show>public</show>
+					</configuration>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-compiler-plugin</artifactId>
+					<version>2.3</version>
+					<configuration>
+						<source>1.6</source>
+						<target>1.6</target>
+					</configuration>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-assembly-plugin</artifactId>
+					<configuration>
+					</configuration>
+				</plugin>
+				<!-- <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-site-plugin</artifactId> 
+					<configuration> <dependencyLocationEnabled>false</dependencyLocationEnabled> 
+					<unzipCommand>/usr/bin/unzip -o &gt; err.txt</unzipCommand> </configuration> 
+					</plugin> -->
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-war-plugin</artifactId>
+					<version>2.0</version>
+					<configuration>
+						<warSourceExcludes>WEB-INF/lib/*.jar</warSourceExcludes>
+						<archive>
+							<manifest>
+								<addClasspath>true</addClasspath>
+							</manifest>
+						</archive>
+					</configuration>
+				</plugin>
 
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-dependency-plugin</artifactId>
-                    <executions>
-                        <execution>
-                            <id>classpath</id>
-                            <goals>
-                                <goal>build-classpath</goal>
-                            </goals>
-                            <configuration>
-                                <outputFile>classpath</outputFile>
-                            </configuration>
-                        </execution>
-                    </executions>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-    
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.slf4j</groupId>
-                <artifactId>slf4j-api</artifactId>
-                <version>1.5.8</version>
-            </dependency>
-            <dependency>
-                <groupId>org.slf4j</groupId>
-                <artifactId>slf4j-log4j12</artifactId>
-                <version>1.5.8</version>
-            </dependency>
-      <dependency>
-        <groupId>javax.ejb</groupId>
-        <artifactId>ejb</artifactId>
-        <version>${jboss.ejb.version}</version>
-        <scope>provided</scope>
-      </dependency>
-      <dependency>
-        <groupId>javax.annotation</groupId>
-        <artifactId>jsr250-api</artifactId>
-        <version>1.0</version>
-        <scope>provided</scope>
-      </dependency>
-      <dependency>
-        <groupId>javax.jms</groupId>
-        <artifactId>jms</artifactId>
-        <version>1.1</version>
-        <scope>provided</scope>
-      </dependency>
-      <dependency>
-        <groupId>javax.transaction</groupId>
-        <artifactId>jta</artifactId>
-        <version>1.1</version>
-        <scope>provided</scope>
-      </dependency>
-	  
-	<dependency>
-		<groupId>org.jboss.remoting</groupId>
-		<artifactId>jboss-remoting</artifactId>
-		<version>2.5.1</version>
-		<scope>provided</scope>
-	</dependency>
-	<dependency>
-		<groupId>jboss</groupId>
-		<artifactId>jboss-annotations-ejb3</artifactId>
-		<version>3.0-RC8</version>
-		<scope>provided</scope>
-	</dependency>	  
-	<dependency>
-		<groupId>org.jboss.javaee</groupId>
-		<artifactId>jboss-javaee</artifactId>
-		<version>5.0.1.GA</version>
-		<scope>provided</scope>
-	</dependency>
-	
-	<!--
-      <dependency>
-        <groupId>jboss</groupId>
-        <artifactId>jboss-j2ee</artifactId>
-        <version>${jboss.version}</version>
-        <scope>provided</scope>
-      </dependency>
-	  -->
-      <dependency>
-        <groupId>javax.ejb</groupId>
-        <artifactId>ejb-api</artifactId>
-        <version>3.0</version>
-        <scope>provided</scope>
-      </dependency>
-<!--            <dependency>
-                <groupId>net.java.dev.jaxb2-commons</groupId>
-                <artifactId>jaxb-fluent-api</artifactId>
-                <version>2.0.2</version>
-            </dependency> -->
-<!--`            <dependency>
-                <groupId>org.testng</groupId>
-                <artifactId>testng</artifactId>
-                <version>5.6</version>
-                <scope>test</scope>
-                <classifier>jdk15</classifier>
-            </dependency> -->
-<!--            <dependency>
-                <groupId>mysql</groupId>
-                <artifactId>mysql-connector-java</artifactId>
-                <version>5.1.5</version>
-                <scope>test</scope>
-            </dependency> -->
-        </dependencies>
-    </dependencyManagement>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-jar-plugin</artifactId>
+					<version>2.2</version>
+				</plugin>
 
-    <reporting>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-project-info-reports-plugin</artifactId>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-dependency-plugin</artifactId>
+					<executions>
+						<execution>
+							<id>classpath</id>
+							<goals>
+								<goal>build-classpath</goal>
+							</goals>
+							<configuration>
+								<outputFile>classpath</outputFile>
+							</configuration>
+						</execution>
+					</executions>
+				</plugin>
+			</plugins>
+		</pluginManagement>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+			</plugin>
+		</plugins>
+	</build>
+
+	<dependencyManagement>
+		<dependencies>
+			<dependency>
+				<groupId>org.slf4j</groupId>
+				<artifactId>slf4j-api</artifactId>
+				<version>1.5.8</version>
+			</dependency>
+			<dependency>
+				<groupId>org.slf4j</groupId>
+				<artifactId>slf4j-log4j12</artifactId>
+				<version>1.5.8</version>
+			</dependency>
+			<dependency>
+				<groupId>javax.ejb</groupId>
+				<artifactId>ejb</artifactId>
+				<version>${jboss.ejb.version}</version>
+				<scope>provided</scope>
+			</dependency>
+			<dependency>
+				<groupId>javax.annotation</groupId>
+				<artifactId>jsr250-api</artifactId>
+				<version>1.0</version>
+				<scope>provided</scope>
+			</dependency>
+			<dependency>
+				<groupId>javax.jms</groupId>
+				<artifactId>jms</artifactId>
+				<version>1.1</version>
+				<scope>provided</scope>
+			</dependency>
+			<dependency>
+				<groupId>javax.transaction</groupId>
+				<artifactId>jta</artifactId>
+				<version>1.1</version>
+				<scope>provided</scope>
+			</dependency>
+
+			<dependency>
+				<groupId>org.jboss.remoting</groupId>
+				<artifactId>jboss-remoting</artifactId>
+				<version>2.5.1</version>
+				<scope>provided</scope>
+			</dependency>
+			<dependency>
+				<groupId>jboss</groupId>
+				<artifactId>jboss-annotations-ejb3</artifactId>
+				<version>3.0-RC8</version>
+				<scope>provided</scope>
+			</dependency>
+			<dependency>
+				<groupId>org.jboss.javaee</groupId>
+				<artifactId>jboss-javaee</artifactId>
+				<version>5.0.1.GA</version>
+				<scope>provided</scope>
+			</dependency>
+
+			<dependency>
+				<groupId>javax.ejb</groupId>
+				<artifactId>ejb-api</artifactId>
+				<version>3.0</version>
+				<scope>provided</scope>
+			</dependency>
+		</dependencies>
+	</dependencyManagement>
+
+	<reporting>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-project-info-reports-plugin</artifactId>
 				<version>2.3.1</version>
-                <configuration> </configuration>
-                <reportSets>
-                    <reportSet>
-                        <reports>
-                            <report>dependencies</report>
-                        </reports>
-                    </reportSet>
-                </reportSets>
-            </plugin>
-            <!--            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.6.1</version>
-                <configuration>
-                    <show>public</show>
-                </configuration>
-            </plugin> -->
-        </plugins>
-    </reporting>
+				<configuration>
+				</configuration>
+				<reportSets>
+					<reportSet>
+						<reports>
+							<report>dependencies</report>
+						</reports>
+					</reportSet>
+				</reportSets>
+			</plugin>
+			<!-- <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> 
+				<version>2.6.1</version> <configuration> <show>public</show> </configuration> 
+				</plugin> -->
+		</plugins>
+	</reporting>
 
 </project>
diff --git a/services/IntegrationTests/pom.xml b/services/IntegrationTests/pom.xml
index 2dc4556b5..e90c7f5e8 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>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/JaxRsServiceProvider/build.xml b/services/JaxRsServiceProvider/build.xml
index 9956a7691..2dbb4083c 100644
--- a/services/JaxRsServiceProvider/build.xml
+++ b/services/JaxRsServiceProvider/build.xml
@@ -140,13 +140,15 @@
     </target>
 
     <target name="deploy" depends="package"
-    description="deploy cspace services in ${jboss.server.cspace}">
-        <copy file="${basedir}/target/${cspace-services.war}" todir="${jboss.server.cspace}/deploy"/>
+    description="deploy cspace services in ${jee.server.cspace}">
+		<delete dir="${jee.deploy.cspace}/${cspace.services.context}"/>
+        <copy file="${basedir}/target/${cspace-services.war}" todir="${jee.deploy.cspace}"/>
     </target>
 
     <target name="undeploy"
-    description="undeploy cspace services from ${jboss.server.cspace}">
-        <delete file="${jboss.server.cspace}/deploy/${cspace-services.war}"/>
+    description="undeploy cspace services from ${jee.server.cspace}">
+        <delete file="${jee.deploy.cspace}/${cspace-services.war}"/>
+		<delete dir="${jee.deploy.cspace}/${cspace.services.context}"/>
     </target>
 
     <target name="dist"
diff --git a/services/JaxRsServiceProvider/pom.xml b/services/JaxRsServiceProvider/pom.xml
index 3f6674e62..8dde18231 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>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/JaxRsServiceProvider/src/main/java/org/collectionspace/services/jaxrs/CSpaceResteasyBootstrap.java b/services/JaxRsServiceProvider/src/main/java/org/collectionspace/services/jaxrs/CSpaceResteasyBootstrap.java
index 69962a8e5..d5f022be5 100644
--- a/services/JaxRsServiceProvider/src/main/java/org/collectionspace/services/jaxrs/CSpaceResteasyBootstrap.java
+++ b/services/JaxRsServiceProvider/src/main/java/org/collectionspace/services/jaxrs/CSpaceResteasyBootstrap.java
@@ -9,23 +9,7 @@ import org.collectionspace.services.common.ServiceMain;
 
 public class CSpaceResteasyBootstrap extends ResteasyBootstrap {
 	
-	public void  contextInitialized(ServletContextEvent event) {
-    	if (true) {
-    		System.out.print("Pausing 1 seconds in RESTEasy bootstrap for you to attached the debugger");
-    		long startTime, currentTime;
-    		currentTime = startTime = System.currentTimeMillis();
-    		long stopTime = startTime + 1 * 1000; //5 seconds
-    		do {
-    			if (currentTime % 1000 == 0) {
-    				System.out.print(".");
-    			}
-    			currentTime = System.currentTimeMillis();
-    		} while (currentTime < stopTime);
-    			
-    		System.out.println();
-    		System.out.println("Resuming RESTEasy bootstrap initialization.");
-    	}
-				
+	public void  contextInitialized(ServletContextEvent event) {				
 		//
     	// This call to super instantiates and initializes our JAX-RS application class.
     	// The application class is org.collectionspace.services.jaxrs.CollectionSpaceJaxRsApplication.
diff --git a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/bundles/nuxeo-common-5.4.2-HF05.jar b/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/bundles/nuxeo-common-5.4.2-HF05.jar
deleted file mode 100644
index 965677768..000000000
Binary files a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/bundles/nuxeo-common-5.4.2-HF05.jar and /dev/null differ
diff --git a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/bundles/nuxeo-core-5.4.2-HF05.jar b/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/bundles/nuxeo-core-5.4.2-HF05.jar
deleted file mode 100644
index 149ce32ce..000000000
Binary files a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/bundles/nuxeo-core-5.4.2-HF05.jar and /dev/null differ
diff --git a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/bundles/nuxeo-core-api-5.4.2-HF05.jar b/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/bundles/nuxeo-core-api-5.4.2-HF05.jar
deleted file mode 100644
index e122927ef..000000000
Binary files a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/bundles/nuxeo-core-api-5.4.2-HF05.jar and /dev/null differ
diff --git a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/bundles/nuxeo-core-client-5.4.2-HF05.jar b/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/bundles/nuxeo-core-client-5.4.2-HF05.jar
deleted file mode 100644
index 6daa161f5..000000000
Binary files a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/bundles/nuxeo-core-client-5.4.2-HF05.jar and /dev/null differ
diff --git a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/bundles/nuxeo-core-convert-api-5.4.2-HF05.jar b/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/bundles/nuxeo-core-convert-api-5.4.2-HF05.jar
deleted file mode 100644
index 4b6e6c410..000000000
Binary files a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/bundles/nuxeo-core-convert-api-5.4.2-HF05.jar and /dev/null differ
diff --git a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/bundles/nuxeo-core-event-5.4.2-HF05.jar b/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/bundles/nuxeo-core-event-5.4.2-HF05.jar
deleted file mode 100644
index 03a358d91..000000000
Binary files a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/bundles/nuxeo-core-event-5.4.2-HF05.jar and /dev/null differ
diff --git a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/bundles/nuxeo-core-io-5.4.2-HF05.jar b/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/bundles/nuxeo-core-io-5.4.2-HF05.jar
deleted file mode 100644
index 626dd3b0e..000000000
Binary files a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/bundles/nuxeo-core-io-5.4.2-HF05.jar and /dev/null differ
diff --git a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/bundles/nuxeo-core-query-5.4.2-HF05.jar b/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/bundles/nuxeo-core-query-5.4.2-HF05.jar
deleted file mode 100644
index 1d5ca04f6..000000000
Binary files a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/bundles/nuxeo-core-query-5.4.2-HF05.jar and /dev/null differ
diff --git a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/bundles/nuxeo-core-schema-5.4.2-HF05.jar b/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/bundles/nuxeo-core-schema-5.4.2-HF05.jar
deleted file mode 100644
index 623098a8a..000000000
Binary files a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/bundles/nuxeo-core-schema-5.4.2-HF05.jar and /dev/null differ
diff --git a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/bundles/nuxeo-core-storage-sql-5.4.2-HF05.jar b/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/bundles/nuxeo-core-storage-sql-5.4.2-HF05.jar
deleted file mode 100644
index c00fda603..000000000
Binary files a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/bundles/nuxeo-core-storage-sql-5.4.2-HF05.jar and /dev/null differ
diff --git a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/bundles/nuxeo-core-storage-sql-extensions-5.4.2-HF05.jar b/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/bundles/nuxeo-core-storage-sql-extensions-5.4.2-HF05.jar
deleted file mode 100644
index 1ba9b1edf..000000000
Binary files a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/bundles/nuxeo-core-storage-sql-extensions-5.4.2-HF05.jar and /dev/null differ
diff --git a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/bundles/nuxeo-core-storage-sql-ra-5.4.2-HF05.jar b/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/bundles/nuxeo-core-storage-sql-ra-5.4.2-HF05.jar
deleted file mode 100644
index 22b5895cd..000000000
Binary files a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/bundles/nuxeo-core-storage-sql-ra-5.4.2-HF05.jar and /dev/null differ
diff --git a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/bundles/nuxeo-platform-api-5.4.2-HF05.jar b/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/bundles/nuxeo-platform-api-5.4.2-HF05.jar
deleted file mode 100644
index f37693f5d..000000000
Binary files a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/bundles/nuxeo-platform-api-5.4.2-HF05.jar and /dev/null differ
diff --git a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/bundles/nuxeo-platform-audit-api-5.4.2-HF05.jar b/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/bundles/nuxeo-platform-audit-api-5.4.2-HF05.jar
deleted file mode 100644
index cf13a4f26..000000000
Binary files a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/bundles/nuxeo-platform-audit-api-5.4.2-HF05.jar and /dev/null differ
diff --git a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/bundles/nuxeo-platform-directory-api-5.4.2-HF05.jar b/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/bundles/nuxeo-platform-directory-api-5.4.2-HF05.jar
deleted file mode 100644
index 983d4caa2..000000000
Binary files a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/bundles/nuxeo-platform-directory-api-5.4.2-HF05.jar and /dev/null differ
diff --git a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/bundles/nuxeo-platform-login-5.4.2-HF05.jar b/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/bundles/nuxeo-platform-login-5.4.2-HF05.jar
deleted file mode 100644
index 7dfd83181..000000000
Binary files a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/bundles/nuxeo-platform-login-5.4.2-HF05.jar and /dev/null differ
diff --git a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/bundles/nuxeo-platform-query-api-5.4.2-HF05.jar b/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/bundles/nuxeo-platform-query-api-5.4.2-HF05.jar
deleted file mode 100644
index 0f71e9109..000000000
Binary files a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/bundles/nuxeo-platform-query-api-5.4.2-HF05.jar and /dev/null differ
diff --git a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/bundles/nuxeo-platform-search-api-5.4.2-HF05.jar b/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/bundles/nuxeo-platform-search-api-5.4.2-HF05.jar
deleted file mode 100644
index 634e446ed..000000000
Binary files a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/bundles/nuxeo-platform-search-api-5.4.2-HF05.jar and /dev/null differ
diff --git a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/bundles/nuxeo-platform-usermanager-api-5.4.2-HF05.jar b/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/bundles/nuxeo-platform-usermanager-api-5.4.2-HF05.jar
deleted file mode 100644
index 7b11849e1..000000000
Binary files a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/bundles/nuxeo-platform-usermanager-api-5.4.2-HF05.jar and /dev/null differ
diff --git a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/bundles/nuxeo-runtime-5.4.2-HF05.jar b/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/bundles/nuxeo-runtime-5.4.2-HF05.jar
deleted file mode 100644
index 465ab18fa..000000000
Binary files a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/bundles/nuxeo-runtime-5.4.2-HF05.jar and /dev/null differ
diff --git a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/bundles/nuxeo-runtime-datasource-5.4.2-HF05.jar b/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/bundles/nuxeo-runtime-datasource-5.4.2-HF05.jar
deleted file mode 100644
index 4f91d3bb3..000000000
Binary files a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/bundles/nuxeo-runtime-datasource-5.4.2-HF05.jar and /dev/null differ
diff --git a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/bundles/nuxeo-runtime-jtajca-5.4.2-HF05.jar b/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/bundles/nuxeo-runtime-jtajca-5.4.2-HF05.jar
deleted file mode 100644
index cf9e034ee..000000000
Binary files a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/bundles/nuxeo-runtime-jtajca-5.4.2-HF05.jar and /dev/null differ
diff --git a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/bundles/nuxeo-runtime-management-5.4.2-HF05.jar b/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/bundles/nuxeo-runtime-management-5.4.2-HF05.jar
deleted file mode 100644
index 3c51de7b9..000000000
Binary files a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/bundles/nuxeo-runtime-management-5.4.2-HF05.jar and /dev/null differ
diff --git a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/bundles/nuxeo-runtime-osgi-5.4.2-HF05.jar b/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/bundles/nuxeo-runtime-osgi-5.4.2-HF05.jar
deleted file mode 100644
index eb6fff5e1..000000000
Binary files a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/bundles/nuxeo-runtime-osgi-5.4.2-HF05.jar and /dev/null differ
diff --git a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/bundles/nuxeo-runtime-remoting-5.4.2-HF05.jar b/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/bundles/nuxeo-runtime-remoting-5.4.2-HF05.jar
deleted file mode 100644
index 8e70518b3..000000000
Binary files a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/bundles/nuxeo-runtime-remoting-5.4.2-HF05.jar and /dev/null differ
diff --git a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/bundles/nuxeo-runtime-scripting-5.4.2-HF05.jar b/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/bundles/nuxeo-runtime-scripting-5.4.2-HF05.jar
deleted file mode 100644
index b74f50db7..000000000
Binary files a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/bundles/nuxeo-runtime-scripting-5.4.2-HF05.jar and /dev/null differ
diff --git a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/bundles/nuxeo-shell-ejb-core-5.4.2-HF05.jar b/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/bundles/nuxeo-shell-ejb-core-5.4.2-HF05.jar
deleted file mode 100644
index f0ce20c7b..000000000
Binary files a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/bundles/nuxeo-shell-ejb-core-5.4.2-HF05.jar and /dev/null differ
diff --git a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/bundles/nuxeo-shell-ejb-servlet-handlers-5.4.2-HF05.jar b/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/bundles/nuxeo-shell-ejb-servlet-handlers-5.4.2-HF05.jar
deleted file mode 100644
index 3cefcc2d3..000000000
Binary files a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/bundles/nuxeo-shell-ejb-servlet-handlers-5.4.2-HF05.jar and /dev/null differ
diff --git a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/config/datasources-config.xml b/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/config/datasources-config.xml
deleted file mode 100644
index a9d7b870e..000000000
--- a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/config/datasources-config.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0"?>
-<component name="config:datasources">
-  <extension target="org.nuxeo.runtime.datasource" point="datasources">
-    <datasource name="jdbc/nxaudit" xaDataSource="com.mysql.jdbc.jdbc2.optional.MysqlXADataSource"
-      maxActive="20" maxIdle="5">
-        <property name="databaseName">nuxeo</property>
-        <property name="user">nuxeo</property>
-        <property name="password">nuxpw</property>
-    </datasource>
-  </extension>
-</component>
diff --git a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/config/default-repo-config.xml b/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/config/default-repo-config.xml
deleted file mode 100644
index b44acc3fe..000000000
--- a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/config/default-repo-config.xml
+++ /dev/null
@@ -1,367 +0,0 @@
-<?xml version="1.0"?>
-<component name="config:default-repository">
-  <extension target="org.nuxeo.ecm.core.repository.RepositoryService"
-	point="repository">
-    <repository name="default"
-      factory="org.nuxeo.ecm.core.storage.sql.ra.PoolingRepositoryFactory">
-      <repository name="default">
-        <xa-datasource>com.mysql.jdbc.jdbc2.optional.MysqlXADataSource</xa-datasource>
-        <property name="URL">jdbc:mysql://localhost:3306/nuxeo?relaxAutoCommit=true</property>
-        <property name="User">nuxeo</property>
-        <property name="Password">nuxpw</property>
-		<schema>
-          <field type="largetext">imd:user_comment</field> <!-- Needed for large image metadata (image_metadata) that gets inserted here. -->
-          <field type="largetext">note</field>
-          <field type="largetext">webp:content</field>
-          <field type="largetext">webc:welcomeText</field>
-          <field type="largetext">comment:comment</field>
-          <field type="largetext">post</field>
-          <field type="largetext">mail:mail</field>
-          
-          <!-- Text fields that may possibly not require largetext -->
-          <!-- designation and might need further review are marked as follows: -->
-          <!-- * -->
-          
-          <!-- =========================================================== -->
-          <!-- Acquisition -->
-          <!-- =========================================================== -->
-
-          <field type="largetext">acquisitionFundingSourceProvisos</field>
-          <field type="largetext">acquisitions_common:acquisitionNote</field>
-          <field type="largetext">acquisitions_common:acquisitionProvisos</field>
-          <field type="largetext">acquisitions_common:acquisitionReason</field>
-          <field type="largetext">acquisitions_common:creditLine</field>
-
-          
-          <!-- =========================================================== -->
-          <!-- Blob -->
-          <!-- =========================================================== -->
-
-          <!-- No largetext fields identified to date -->
-
-
-          <!-- =========================================================== -->
-          <!-- CollectionObject / Cataloging -->
-          <!-- =========================================================== -->
-          
-          <!-- Object Identification Information -->
-          <!-- ================================= -->
-          
-          <!-- FIXME: The following field may be removed from this configuration when it is confirmed -->
-          <!-- that the App/UI layers are using a repeatable other number group. -->
-          <field type="largetext">collectionobjects_common:otherNumber</field> <!-- * -->
-
-          <!-- FIXME: Change this to otherNumberValue if and when the field name itself is so changed. -->
-          <field type="largetext">numberValue</field> <!-- * -->
-
-          <!-- FIXME: multivalued field - need to verify schema and field name -->
-          <field type="largetext">collectionobjects_common:briefDescriptions</field>
-         
-          <!-- FIXME: multivalued field - need to verify schema and field name -->
-          <field type="largetext">collectionobjects_common:comments</field>
-          
-          <field type="largetext">collectionobjects_common:distinguishingFeatures</field>
-          
-          <field type="largetext">objectNameNote</field>
-
-          <field type="largetext">title</field>
-          <field type="largetext">titleTranslation</field>
-                   
-          <!-- Object Description Information -->
-          <!-- ============================== -->
-
-          <field type="largetext">collectionobjects_common:ageQualifier</field>
-          <field type="largetext">collectionobjects_common:color</field>
-          <field type="largetext">collectionobjects_common:contentDescription</field>
-          <field type="largetext">collectionobjects_common:contentNote</field>
-          <field type="largetext">collectionobjects_common:contentObject</field>
-          <field type="largetext">collectionobjects_common:copyNumber</field> <!-- * -->
-          <field type="largetext">collectionobjects_common:editionNumber</field> <!-- * -->
-          
-          <!-- FIXME: Will become group repeatable in a post-1.3 release -->
-          <!-- Remove the schema name(s) from the value(s) below when this occurs. -->
-          <field type="largetext">collectionobjects_common:inscriptionContent</field>
-          <field type="largetext">collectionobjects_common:inscriptionContentInterpretation</field>
-          <field type="largetext">collectionobjects_common:inscriptionContentTranslation</field>
-          <field type="largetext">collectionobjects_common:inscriptionContentTransliteration</field>
-          
-          <!-- FIXME: Will become group repeatable in a post-1.3 release -->
-          <!-- Remove the schema name(s) from the value(s) below when this occurs. -->
-          <field type="largetext">collectionobjects_common:inscriptionDescriptionInterpretation</field>
-          
-          <field type="largetext">materialComponentNote</field>
-          <field type="largetext">materialName</field>  <!-- * -->
-          
-          <!-- FIXME: multivalued field - need to verify schema and field name -->
-          <field type="largetext">collectionobjects_common:physicalDescription</field>
-          
-          <field type="largetext">objectComponentInformation</field>
-
-          <!-- Object Production Information -->
-          <!-- ============================= -->
-          
-          <field type="largetext">collectionobjects_common:objectProductionNote</field>
-          
-          <!-- FIXME: multivalued field - need to verify schema and field name -->
-          <field type="largetext">collectionobjects_common:objectProductionReason</field>
-
-          <!-- Object History and Association Information -->
-          <!-- ========================================== -->
-          
-          <field type="largetext">assocActivityNote</field>
-          <field type="largetext">assocConceptNote</field>
-          <field type="largetext">assocCulturalContextNote</field>
-          <field type="largetext">assocDateNote</field>
-
-          <!-- FIXME: Will become group repeatable in a post-1.3 release. -->
-          <!-- Remove the schema name(s) from the value(s) below when this occurs. -->
-          <field type="largetext">collectionobjects_common:assocEventName</field>   <!-- * -->
-          <field type="largetext">collectionobjects_common:assocEventNote</field>
-          <field type="largetext">collectionobjects_common:assocEventType</field>   <!-- * -->
-
-          <field type="largetext">assocObject</field>
-          <field type="largetext">assocOrganizationNote</field>
-          <field type="largetext">assocPeopleNote</field>
-          <field type="largetext">assocPersonNote</field>
-          <field type="largetext">assocPlaceNote</field>
-          
-          <field type="largetext">collectionobjects_common:objectHistoryNote</field>
-          <field type="largetext">collectionobjects_common:ownershipExchangeNote</field>
-          <field type="largetext">usageNote</field>
-
-           <!-- Object Owner's Contribution Information -->
-           <!-- ======================================= -->  
-                
-          <field type="largetext">collectionobjects_common:ownersPersonalExperience</field>
-          <field type="largetext">collectionobjects_common:ownersPersonalResponse</field>
-          
-          <!-- FIXME: multivalued field - need to verify schema and field name -->
-          <field type="largetext">collectionobjects_common:ownersReference</field>
-          
-          <field type="largetext">collectionobjects_common:ownersContributionNote</field>
-         
-          <!-- Object Viewer's Contribution Information -->
-          <!-- ======================================== -->          
-          
-          <field type="largetext">collectionobjects_common:viewersRole</field>
-          <field type="largetext">collectionobjects_common:viewersPersonalExperience</field>
-          <field type="largetext">collectionobjects_common:viewersPersonalResponse</field>
-          
-          <!-- FIXME: multivalued field - need to verify schema and field name -->
-          <field type="largetext">collectionobjects_common:viewersReference</field>
-          
-          <field type="largetext">collectionobjects_common:viewersContributionNote</field>
-
-          <!-- Reference Information -->
-          <!-- ===================== -->
-          
-          <field type="largetext">collectionobjects_common:catalogNumber</field> <!-- * -->
-         
-          <!-- Object Collection Information -->
-          <!-- ============================= -->      
-
-          <field type="largetext">collectionobjects_common:fieldCollectionNote</field>
-          <field type="largetext">collectionobjects_common:fieldCollectionNumber</field> <!-- * -->
-          
-          <!--
-              Additional non-text fields configured as 'largetext' to
-              avoid the following error when Nuxeo is configured to use MySQL:
-              
-              com.mysql.jdbc.exceptions.jdbc4.MySQLSyntaxErrorException.
-              message: Row size too large. The maximum row size for the
-              used table type, not counting BLOBs, is 65535.
-              
-              Some of the fields below may be repeatable or in
-              repeatable groups, and the schema and field names
-              below might thus require verification to match actual values.
-          -->
-  
-          <field type="largetext">collectionobjects_common:objectNumber</field>
-          <field type="largetext">collectionobjects_common:otherNumber</field>
-          <field type="largetext">collectionobjects_common:otherNumberType</field>
-          <field type="largetext">collectionobjects_common:numberOfObjects</field>
-          <field type="largetext">collectionobjects_common:collection</field>
-          <field type="largetext">collectionobjects_common:recordStatus</field>
-          <field type="largetext">collectionobjects_common:age</field>
-          <field type="largetext">collectionobjects_common:ageQualifier</field>
-          <field type="largetext">collectionobjects_common:ageUnit</field>
-      
-          <field type="largetext">collectionobjects_common:contentDate</field>
-          <field type="largetext">collectionobjects_common:contentLanguages</field>
-          <field type="largetext">collectionobjects_common:contentOrganizations</field>
-          
-          <field type="largetext">collectionobjects_common:dimensionSummary</field>
- 
-          <!-- FIXME: The set of dimensions-related fields below may be removed -->
-          <!-- altogether when it is confirmed that the App/UI layers are using -->
-          <!-- a repeatable dimensions group. -->
-          <field type="largetext">collectionobjects_common:dimension</field>
-          <field type="largetext">collectionobjects_common:dimensionMeasuredPart</field>
-          <field type="largetext">collectionobjects_common:dimensionMeasurementUnit</field>
-          <field type="largetext">collectionobjects_common:dimensionValue</field>
-          <field type="largetext">collectionobjects_common:dimensionValueDate</field>
-          <field type="largetext">collectionobjects_common:dimensionValueQualifier</field>
-          
-          <field type="largetext">collectionobjects_common:editionNumber</field>
-
-          <field type="largetext">collectionobjects_common:inscriptionContentInscriber</field>
-          <field type="largetext">collectionobjects_common:inscriptionContentDate</field>
-          <field type="largetext">collectionobjects_common:inscriptionContentLanguage</field>
-          <field type="largetext">collectionobjects_common:inscriptionContentMethod</field>
-          <field type="largetext">collectionobjects_common:inscriptionContentPosition</field>
-          <field type="largetext">collectionobjects_common:inscriptionContentScript</field>
-          <field type="largetext">collectionobjects_common:inscriptionContentType</field>
-
-          <field type="largetext">collectionobjects_common:inscriptionDescription</field>
-          <field type="largetext">collectionobjects_common:inscriptionDescriptionInscriber</field>
-          <field type="largetext">collectionobjects_common:inscriptionDescriptionDate</field>
-          <field type="largetext">collectionobjects_common:inscriptionDescriptionMethod</field>
-          <field type="largetext">collectionobjects_common:inscriptionDescriptionPosition</field>
-          <field type="largetext">collectionobjects_common:inscriptionDescriptionType</field>
-
-          <field type="largetext">collectionobjects_common:objectStatus</field>
-          <field type="largetext">collectionobjects_common:phase</field>
-          <field type="largetext">collectionobjects_common:sex</field>
-          <field type="largetext">collectionobjects_common:ownershipAccess</field>
-          <field type="largetext">collectionobjects_common:ownershipCategory</field>
-          <field type="largetext">collectionobjects_common:ownershipDates</field>
-          <field type="largetext">collectionobjects_common:ownershipExchangeMethod</field>
-          <field type="largetext">collectionobjects_common:ownershipExchangePriceCurrency</field>
-          <field type="largetext">collectionobjects_common:ownershipExchangePriceValue</field>
-          <field type="largetext">collectionobjects_common:ownershipPlace</field>
-          <field type="largetext">collectionobjects_common:fieldCollectionNumber</field>
-          <field type="largetext">collectionobjects_common:fieldCollectionMethod</field>
-          <field type="largetext">collectionobjects_common:fieldCollectionPlace</field>
-          <field type="largetext">collectionobjects_common:fieldCollectionDate</field>
-       
-          <!-- FIXME: This sample set of date field can be removed when Cataloging -->
-          <!-- records are using structured date fields, or earlier when it is confirmed that -->
-          <!-- the App/UI layers are not using this vestigial part of the Cataloging schema. -->
-          <field type="largetext">collectionobjects_common:dateAssociation</field>
-          <field type="largetext">collectionobjects_common:dateEarliestSingle</field>
-          <field type="largetext">collectionobjects_common:dateEarliestSingleCertainty</field>
-          <field type="largetext">collectionobjects_common:dateEarliestSingleQualifier</field>
-          <field type="largetext">collectionobjects_common:dateLatest</field>
-          <field type="largetext">collectionobjects_common:dateLatestCertainty</field>
-          <field type="largetext">collectionobjects_common:dateLatestQualifier</field>
-          <field type="largetext">collectionobjects_common:datePeriod</field>
-          <field type="largetext">collectionobjects_common:dateText</field>
-
-
-          <!-- =========================================================== -->
-          <!-- Contact -->
-          <!-- =========================================================== -->
-          <field type="largetext">contacts_common:addressPlace</field>
-          
-
-          <!-- =========================================================== -->
-          <!-- Group -->
-          <!-- =========================================================== -->
-          <field type="largetext">groups_common:scopeNote</field>
-          
-
-          <!-- =========================================================== -->
-          <!-- Intake -->
-          <!-- =========================================================== -->
-          
-          <field type="largetext">intakes_common:entryNote</field>
-          <field type="largetext">intakes_common:packingNote</field>
-          <field type="largetext">intakes_common:fieldCollectionNote</field>
-          <field type="largetext">intakes_common:insuranceNote</field>
-          <field type="largetext">intakes_common:conditionCheckNote</field>
-          <field type="largetext">currentLocationNote</field>
-
-
-          <!-- =========================================================== -->
-          <!-- Loan In -->
-          <!-- =========================================================== -->
-          
-          <field type="largetext">loansin_common:loanInConditions</field>
-          <field type="largetext">loansin_common:loanInNote</field>
- 
- 
-          <!-- =========================================================== -->
-          <!-- Loan Out -->
-          <!-- =========================================================== -->
-          
-          <field type="largetext">loansout_common:specialConditionsOfLoan</field>
-          <field type="largetext">loansout_common:loanOutNote</field>      
-          <field type="largetext">loansout_common:loanPurpose</field>
-          <field type="largetext">loanedObjectStatusNote</field>
-
- 
-          <!-- =========================================================== -->
-          <!-- Movement / Location and Movement Control -->
-          <!-- =========================================================== -->
-          
-          <field type="largetext">movements_common:currentLocationNote</field>
-          <field type="largetext">movements_common:movementNote</field>
-
-
-          <!-- =========================================================== -->
-          <!-- Media / Media Handling -->
-          <!-- =========================================================== -->
-
-          <field type="largetext">media_common:copyrightStatement</field>
-          <field type="largetext">media_common:description</field>
-          <field type="largetext">media_common:title</field>
-
-
-          <!-- =========================================================== -->
-          <!-- Note -->
-          <!-- =========================================================== -->
-
-          <field type="largetext">notes_common:content</field>
-
-
-          <!-- =========================================================== -->
-          <!-- Object Exit -->
-          <!-- =========================================================== -->
-          
-          <field type="largetext">objectexit_common:exitNote</field>
-          <field type="largetext">objectexit_common:packingNote</field>
-
-
-          <!-- =========================================================== -->
-          <!-- Organization -->
-          <!-- =========================================================== -->
-          
-          <field type="largetext">shortName</field>
-          <field type="largetext">longName</field>
-          <field type="largetext">nameAdditions</field>
-          <field type="largetext">historyNote</field>
-
-
-          <!-- =========================================================== -->
-          <!-- Person -->
-          <!-- =========================================================== -->
-          <field type="largetext">persons_common:bioNote</field>
-          <field type="largetext">persons_common:nameNote</field>
-
-
-          <!-- =========================================================== -->
-          <!-- Relation -->
-          <!-- =========================================================== -->
-
-          <!-- No largetext fields identified to date -->
-
-
-          <!-- =========================================================== -->
-          <!-- Storage Location / Location -->
-          <!-- =========================================================== -->
-          <field type="largetext">locations_common:name</field>
-          <!-- conditionNote will be made part of a repeatable group of fields in a future release -->
-          <field type="largetext">locations_common:conditionNote</field>
-          <field type="largetext">locations_common:securityNote</field>
-          <field type="largetext">locations_common:accessNote</field>
-         
-        </schema>
-      </repository>
-    </repository>
-  </extension>
-  
-   <extension target="org.nuxeo.ecm.core.api.repository.RepositoryManager" point="repositories">
-    <documentation>The default repository</documentation>
-    <repository name="default" label="Default Repository" />
-  </extension>
-</component>
diff --git a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/config/log4j.xml b/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/config/log4j.xml
deleted file mode 100644
index 83ac32321..000000000
--- a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/config/log4j.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/"
-  debug="false">
-  <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
-    <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler" />
-    <!--    <param name="Target" value="System.out" />-->
-    <layout class="org.apache.log4j.PatternLayout">
-      <!-- <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n" /> -->
-      <param name="ConversionPattern" value="%m%n" />
-    </layout>
-  </appender>
-
-  <appender name="FILE" class="org.apache.log4j.RollingFileAppender">
-    <param name="File" value="log/nxshell.log" />
-    <param name="Append" value="false" />
-    <!--    <param name="MaxFileSize" value="10MB" />-->
-    <param name="MaxBackupIndex" value="3" />
-    <layout class="org.apache.log4j.PatternLayout">
-      <param name="ConversionPattern" value="%d{ISO8601} %-5p [%c] %m%n" />
-    </layout>
-  </appender>
-
-  <!-- Specific appenders for some important nxshell commands -->
-  <appender name="import" class="org.apache.log4j.RollingFileAppender">
-    <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler" />
-    <param name="File" value="log/import.log" />
-    <param name="Append" value="true" />
-    <param name="MaxFileSize" value="30MB" />
-    <param name="MaxBackupIndex" value="5" />
-    <layout class="org.apache.log4j.PatternLayout">
-      <param name="ConversionPattern" value="%d{ISO8601} %-5p [%c] %m%n" />
-    </layout>
-  </appender>
-
-  <!-- Main logger -->
-  <logger name="org.nuxeo">
-    <level value="INFO" />
-  </logger>
-  <!-- Console output -->
-  <logger name="org.nuxeo.ecm.shell">
-    <level value="INFO" />
-    <appender-ref ref="CONSOLE" />
-  </logger>
-  <!-- Loggers for import commands -->
-  <logger name="org.nuxeo.ecm.shell.commands.io.ImportCommand">
-    <level value="INFO" />
-    <appender-ref ref="import" />
-  </logger>
-  <logger name="org.nuxeo.ecm.shell.commands.repository.FSImportCommand">
-    <level value="INFO" />
-    <appender-ref ref="import" />
-  </logger>
-  <logger name="org.nuxeo.ecm.shell.commands.repository.MTFSImportCommand">
-    <level value="INFO" />
-    <appender-ref ref="import" />
-  </logger>
-  <logger name="org.nuxeo.ecm.shell.commands.repository.ThreadedImportTask">
-    <level value="INFO" />
-    <appender-ref ref="import" />
-  </logger>
-
-  <root>
-    <level value="WARN" />
-    <appender-ref ref="FILE" />
-  </root>
-
-</log4j:configuration>
diff --git a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/config/login-config.xml b/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/config/login-config.xml
deleted file mode 100644
index b8676d281..000000000
--- a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/config/login-config.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0"?>
-
-<component name="org.nuxeo.ecm.platform.login.LoginConfig" version="1.0">
-  <documentation>
-  Login modules used on JBoss
-  @author Bogdan Stefanescu (bs@nuxeo.com)
-  </documentation>
-
-
-  <extension target="org.nuxeo.runtime.LoginComponent" point="domains">
-
-          <domain name="nuxeo-system-login">
-            <login-module code="org.nuxeo.runtime.api.login.SystemLoginModule" flag="required"/>
-      <login-module code="org.nuxeo.ecm.core.api.local.ClientLoginModule" flag="required">
-        <option name="password-stacking">true</option>
-                          <option name="multi-threaded">true</option>
-          </login-module>
-          </domain>
-
-
-        <domain name="nuxeo-webengine">
-            <login-module code = "org.nuxeo.ecm.platform.login.NuxeoLoginModule"
-             flag = "required">
-              <option name="principalClassName">org.nuxeo.ecm.platform.login.NuxeoPrincipal</option>
-              <option name="useUserIdentificationInfoCB">true</option>
-      </login-module>
-      <!--login-module code="org.nuxeo.ecm.core.api.local.ClientLoginModule" flag="required">
-        <option name="password-stacking">true</option>
-        <option name="multi-threaded">true</option>
-      </login-module-->
-    </domain>
-
-  </extension>
-
-
-</component>
diff --git a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/config/nuxeo-container.properties b/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/config/nuxeo-container.properties
deleted file mode 100644
index 003c8ded2..000000000
--- a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/config/nuxeo-container.properties
+++ /dev/null
@@ -1 +0,0 @@
-NuxeoContainer.autoactivation=true
diff --git a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/config/nuxeo.properties b/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/config/nuxeo.properties
deleted file mode 100644
index 308ca3aff..000000000
--- a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/config/nuxeo.properties
+++ /dev/null
@@ -1,36 +0,0 @@
-# application instance config
-org.nuxeo.ecm.instance.host=localhost
-org.nuxeo.ecm.instance.name=Nuxeo 5.4
-org.nuxeo.ecm.instance.description=Nuxeo ECM server
-
-# product config
-org.nuxeo.ecm.product.name=Nuxeo 5.4
-org.nuxeo.ecm.product.version=5.4.2-SNAPSHOT
-
-# runtime remoting config
-org.nuxeo.runtime.server.enabled=false
-org.nuxeo.runtime.server.host=${org.nuxeo.ecm.instance.host}
-org.nuxeo.runtime.server.locator=socket://0.0.0.0:62474/?datatype=nuxeo
-
-# streaming config
-org.nuxeo.runtime.streaming.isServer=false
-org.nuxeo.runtime.streaming.serverLocator=socket://${org.nuxeo.ecm.instance.host}:62474/?datatype=nuxeo
-
-# which sample to run
-org.nuxeo.ecm.sample.class=org.nuxeo.ecm.sample.streaming.StreamingExample
-
-# needed for the JNDI auto configuration of clients
-# you need to change this if using JNDI through HTTP
-nuxeo-client-jndi.java.naming.provider.url=jnp://%s:%s
-nuxeo-client-jndi.java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
-nuxeo-client-jndi.java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
-
-# avoid initializing nuxeo relations at startup (for faster startup)
-org.nuxeo.ecm.platform.relations.initOnStartup=false
-
-# context path of the application
-org.nuxeo.ecm.contextPath=/nuxeo
-
-# cspace
-#nuxeo.client.on.jboss=true
-#org.nuxeo.client.remote=true
diff --git a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/launcher.properties b/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/launcher.properties
deleted file mode 100644
index 3629c1aa8..000000000
--- a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/launcher.properties
+++ /dev/null
@@ -1 +0,0 @@
-org.nuxeo.app.bundles=bundles/*:plugins/*
diff --git a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/activation-1.1.1.jar b/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/activation-1.1.1.jar
deleted file mode 100644
index b6efe1756..000000000
Binary files a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/activation-1.1.1.jar and /dev/null differ
diff --git a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/ant-1.7.0.jar b/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/ant-1.7.0.jar
deleted file mode 100644
index 0a56a58f9..000000000
Binary files a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/ant-1.7.0.jar and /dev/null differ
diff --git a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/ant-junit-1.7.0.jar b/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/ant-junit-1.7.0.jar
deleted file mode 100644
index fa43fb2f3..000000000
Binary files a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/ant-junit-1.7.0.jar and /dev/null differ
diff --git a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/ant-launcher-1.7.0.jar b/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/ant-launcher-1.7.0.jar
deleted file mode 100644
index 12a1e78d0..000000000
Binary files a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/ant-launcher-1.7.0.jar and /dev/null differ
diff --git a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/antlr-2.7.7.jar b/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/antlr-2.7.7.jar
deleted file mode 100644
index 5e5f14b35..000000000
Binary files a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/antlr-2.7.7.jar and /dev/null differ
diff --git a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/asm-2.2.3.jar b/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/asm-2.2.3.jar
deleted file mode 100644
index aca24ec07..000000000
Binary files a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/asm-2.2.3.jar and /dev/null differ
diff --git a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/asm-commons-2.2.3.jar b/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/asm-commons-2.2.3.jar
deleted file mode 100644
index bf892e7dc..000000000
Binary files a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/asm-commons-2.2.3.jar and /dev/null differ
diff --git a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/asm-tree-2.2.3.jar b/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/asm-tree-2.2.3.jar
deleted file mode 100644
index ba74b56c7..000000000
Binary files a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/asm-tree-2.2.3.jar and /dev/null differ
diff --git a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/avalon-framework-4.1.3.jar b/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/avalon-framework-4.1.3.jar
deleted file mode 100644
index fd72580d3..000000000
Binary files a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/avalon-framework-4.1.3.jar and /dev/null differ
diff --git a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/backport-util-concurrent-3.1.jar b/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/backport-util-concurrent-3.1.jar
deleted file mode 100644
index 3a4c2797a..000000000
Binary files a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/backport-util-concurrent-3.1.jar and /dev/null differ
diff --git a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/bcel-5.1.jar b/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/bcel-5.1.jar
deleted file mode 100644
index 524e375cf..000000000
Binary files a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/bcel-5.1.jar and /dev/null differ
diff --git a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/bsh-2.0b1.jar b/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/bsh-2.0b1.jar
deleted file mode 100644
index c005694c8..000000000
Binary files a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/bsh-2.0b1.jar and /dev/null differ
diff --git a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/bsh-engine-1.0.jar b/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/bsh-engine-1.0.jar
deleted file mode 100644
index 620cc1ceb..000000000
Binary files a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/bsh-engine-1.0.jar and /dev/null differ
diff --git a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/commons-beanutils-1.6.jar b/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/commons-beanutils-1.6.jar
deleted file mode 100644
index 16dcf6f44..000000000
Binary files a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/commons-beanutils-1.6.jar and /dev/null differ
diff --git a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/commons-codec-1.2.jar b/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/commons-codec-1.2.jar
deleted file mode 100644
index 67cb720f5..000000000
Binary files a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/commons-codec-1.2.jar and /dev/null differ
diff --git a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/commons-collections-3.1.jar b/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/commons-collections-3.1.jar
deleted file mode 100644
index 41e230fee..000000000
Binary files a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/commons-collections-3.1.jar and /dev/null differ
diff --git a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/commons-dbcp-1.3-RC1.jar b/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/commons-dbcp-1.3-RC1.jar
deleted file mode 100644
index f13d77f09..000000000
Binary files a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/commons-dbcp-1.3-RC1.jar and /dev/null differ
diff --git a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/commons-httpclient-3.1.jar b/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/commons-httpclient-3.1.jar
deleted file mode 100644
index 7c59774ae..000000000
Binary files a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/commons-httpclient-3.1.jar and /dev/null differ
diff --git a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/commons-io-1.4.jar b/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/commons-io-1.4.jar
deleted file mode 100644
index 133dc6cb3..000000000
Binary files a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/commons-io-1.4.jar and /dev/null differ
diff --git a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/commons-jexl-1.1.jar b/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/commons-jexl-1.1.jar
deleted file mode 100644
index be3a7232c..000000000
Binary files a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/commons-jexl-1.1.jar and /dev/null differ
diff --git a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/commons-lang-2.3.jar b/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/commons-lang-2.3.jar
deleted file mode 100644
index c33b3537b..000000000
Binary files a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/commons-lang-2.3.jar and /dev/null differ
diff --git a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/commons-logging-1.1.jar b/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/commons-logging-1.1.jar
deleted file mode 100644
index 2ff9bbd90..000000000
Binary files a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/commons-logging-1.1.jar and /dev/null differ
diff --git a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/concurrent-1.3.4-jboss-update1.jar b/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/concurrent-1.3.4-jboss-update1.jar
deleted file mode 100644
index 77d0cc685..000000000
Binary files a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/concurrent-1.3.4-jboss-update1.jar and /dev/null differ
diff --git a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/connector-api-1.5.jar b/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/connector-api-1.5.jar
deleted file mode 100644
index 634178973..000000000
Binary files a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/connector-api-1.5.jar and /dev/null differ
diff --git a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/dom4j-1.6.1.jar b/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/dom4j-1.6.1.jar
deleted file mode 100644
index c8c4dbb92..000000000
Binary files a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/dom4j-1.6.1.jar and /dev/null differ
diff --git a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/dtdparser121-1.2.1.jar b/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/dtdparser121-1.2.1.jar
deleted file mode 100644
index ddb33dc33..000000000
Binary files a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/dtdparser121-1.2.1.jar and /dev/null differ
diff --git a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/ejb-api-3.0.jar b/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/ejb-api-3.0.jar
deleted file mode 100644
index e9a86d1ae..000000000
Binary files a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/ejb-api-3.0.jar and /dev/null differ
diff --git a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/geronimo-connector-2.1.3-NX1.jar b/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/geronimo-connector-2.1.3-NX1.jar
deleted file mode 100644
index e37460d62..000000000
Binary files a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/geronimo-connector-2.1.3-NX1.jar and /dev/null differ
diff --git a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/geronimo-j2ee-connector_1.5_spec-2.0.0.jar b/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/geronimo-j2ee-connector_1.5_spec-2.0.0.jar
deleted file mode 100644
index 70e7ed4a9..000000000
Binary files a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/geronimo-j2ee-connector_1.5_spec-2.0.0.jar and /dev/null differ
diff --git a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/geronimo-jta_1.1_spec-1.1.1.jar b/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/geronimo-jta_1.1_spec-1.1.1.jar
deleted file mode 100644
index ee9963dfc..000000000
Binary files a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/geronimo-jta_1.1_spec-1.1.1.jar and /dev/null differ
diff --git a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/geronimo-transaction-2.1.3.jar b/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/geronimo-transaction-2.1.3.jar
deleted file mode 100644
index e1ec3dccf..000000000
Binary files a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/geronimo-transaction-2.1.3.jar and /dev/null differ
diff --git a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/groovy-all-1.5.7.jar b/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/groovy-all-1.5.7.jar
deleted file mode 100644
index a9080fb51..000000000
Binary files a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/groovy-all-1.5.7.jar and /dev/null differ
diff --git a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/groovy-engine-1.0.jar b/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/groovy-engine-1.0.jar
deleted file mode 100644
index 627d6e0e8..000000000
Binary files a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/groovy-engine-1.0.jar and /dev/null differ
diff --git a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/h2-1.1.114-nx.jar b/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/h2-1.1.114-nx.jar
deleted file mode 100644
index a3381e80e..000000000
Binary files a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/h2-1.1.114-nx.jar and /dev/null differ
diff --git a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/howl-1.0.1-1.jar b/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/howl-1.0.1-1.jar
deleted file mode 100644
index b4ea5c62a..000000000
Binary files a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/howl-1.0.1-1.jar and /dev/null differ
diff --git a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jaas-1.0.01.jar b/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jaas-1.0.01.jar
deleted file mode 100644
index 92216c008..000000000
Binary files a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jaas-1.0.01.jar and /dev/null differ
diff --git a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/java-cup-0.11a.jar b/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/java-cup-0.11a.jar
deleted file mode 100644
index 09548810d..000000000
Binary files a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/java-cup-0.11a.jar and /dev/null differ
diff --git a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/javasimon-core-2.5.0.jar b/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/javasimon-core-2.5.0.jar
deleted file mode 100644
index 35dd8ea70..000000000
Binary files a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/javasimon-core-2.5.0.jar and /dev/null differ
diff --git a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/javasimon-jdbc3-2.5.0.jar b/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/javasimon-jdbc3-2.5.0.jar
deleted file mode 100644
index 26644bcf9..000000000
Binary files a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/javasimon-jdbc3-2.5.0.jar and /dev/null differ
diff --git a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/javasimon-jmx-2.5.0.jar b/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/javasimon-jmx-2.5.0.jar
deleted file mode 100644
index d6698ed7b..000000000
Binary files a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/javasimon-jmx-2.5.0.jar and /dev/null differ
diff --git a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/javassist-3.10.0.GA.jar b/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/javassist-3.10.0.GA.jar
deleted file mode 100644
index 342ea8268..000000000
Binary files a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/javassist-3.10.0.GA.jar and /dev/null differ
diff --git a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jaxb-api-2.1.9.jar b/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jaxb-api-2.1.9.jar
deleted file mode 100644
index 5752f1946..000000000
Binary files a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jaxb-api-2.1.9.jar and /dev/null differ
diff --git a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jboss-aop-2.1.1.GA.jar b/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jboss-aop-2.1.1.GA.jar
deleted file mode 100644
index 2fe82baad..000000000
Binary files a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jboss-aop-2.1.1.GA.jar and /dev/null differ
diff --git a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jboss-aop-mc-int-2.0.6.GA.jar b/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jboss-aop-mc-int-2.0.6.GA.jar
deleted file mode 100644
index 053f022c3..000000000
Binary files a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jboss-aop-mc-int-2.0.6.GA.jar and /dev/null differ
diff --git a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jboss-as-j2se-5.1.0.GA.jar b/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jboss-as-j2se-5.1.0.GA.jar
deleted file mode 100644
index 787177c45..000000000
Binary files a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jboss-as-j2se-5.1.0.GA.jar and /dev/null differ
diff --git a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jboss-as-jbossas-remoting-5.1.0.GA.jar b/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jboss-as-jbossas-remoting-5.1.0.GA.jar
deleted file mode 100644
index d4e3020ef..000000000
Binary files a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jboss-as-jbossas-remoting-5.1.0.GA.jar and /dev/null differ
diff --git a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jboss-as-jmx-5.1.0.GA.jar b/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jboss-as-jmx-5.1.0.GA.jar
deleted file mode 100644
index 498baac7d..000000000
Binary files a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jboss-as-jmx-5.1.0.GA.jar and /dev/null differ
diff --git a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jboss-as-mbeans-5.1.0.GA.jar b/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jboss-as-mbeans-5.1.0.GA.jar
deleted file mode 100644
index ab7ee9a7d..000000000
Binary files a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jboss-as-mbeans-5.1.0.GA.jar and /dev/null differ
diff --git a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jboss-as-security-5.1.0.GA.jar b/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jboss-as-security-5.1.0.GA.jar
deleted file mode 100644
index d990a6e9b..000000000
Binary files a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jboss-as-security-5.1.0.GA.jar and /dev/null differ
diff --git a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jboss-as-system-5.1.0.GA.jar b/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jboss-as-system-5.1.0.GA.jar
deleted file mode 100644
index 618beb9a1..000000000
Binary files a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jboss-as-system-5.1.0.GA.jar and /dev/null differ
diff --git a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jboss-as-system-jmx-5.1.0.GA.jar b/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jboss-as-system-jmx-5.1.0.GA.jar
deleted file mode 100644
index aa7ce7693..000000000
Binary files a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jboss-as-system-jmx-5.1.0.GA.jar and /dev/null differ
diff --git a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jboss-bootstrap-1.0.0-Beta-3.jar b/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jboss-bootstrap-1.0.0-Beta-3.jar
deleted file mode 100644
index 40ea9788e..000000000
Binary files a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jboss-bootstrap-1.0.0-Beta-3.jar and /dev/null differ
diff --git a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jboss-classloader-2.0.6.GA.jar b/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jboss-classloader-2.0.6.GA.jar
deleted file mode 100644
index a3088b8d0..000000000
Binary files a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jboss-classloader-2.0.6.GA.jar and /dev/null differ
diff --git a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jboss-classloading-2.0.6.GA.jar b/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jboss-classloading-2.0.6.GA.jar
deleted file mode 100644
index 53bb8ed3e..000000000
Binary files a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jboss-classloading-2.0.6.GA.jar and /dev/null differ
diff --git a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jboss-classloading-spi-5.1.0.GA.jar b/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jboss-classloading-spi-5.1.0.GA.jar
deleted file mode 100644
index 4201c29ed..000000000
Binary files a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jboss-classloading-spi-5.1.0.GA.jar and /dev/null differ
diff --git a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jboss-classloading-vfs-2.0.6.GA.jar b/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jboss-classloading-vfs-2.0.6.GA.jar
deleted file mode 100644
index fa81c1cd3..000000000
Binary files a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jboss-classloading-vfs-2.0.6.GA.jar and /dev/null differ
diff --git a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jboss-common-core-2.2.14.GA.jar b/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jboss-common-core-2.2.14.GA.jar
deleted file mode 100644
index cf20897cc..000000000
Binary files a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jboss-common-core-2.2.14.GA.jar and /dev/null differ
diff --git a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jboss-dependency-2.0.6.GA.jar b/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jboss-dependency-2.0.6.GA.jar
deleted file mode 100644
index c31d15928..000000000
Binary files a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jboss-dependency-2.0.6.GA.jar and /dev/null differ
diff --git a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jboss-deployers-client-2.0.7.GA.jar b/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jboss-deployers-client-2.0.7.GA.jar
deleted file mode 100644
index f241b75d5..000000000
Binary files a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jboss-deployers-client-2.0.7.GA.jar and /dev/null differ
diff --git a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jboss-deployers-client-spi-2.0.7.GA.jar b/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jboss-deployers-client-spi-2.0.7.GA.jar
deleted file mode 100644
index 7706ebcd4..000000000
Binary files a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jboss-deployers-client-spi-2.0.7.GA.jar and /dev/null differ
diff --git a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jboss-deployers-core-2.0.7.GA.jar b/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jboss-deployers-core-2.0.7.GA.jar
deleted file mode 100644
index 9d6eb5138..000000000
Binary files a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jboss-deployers-core-2.0.7.GA.jar and /dev/null differ
diff --git a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jboss-deployers-core-spi-2.0.7.GA.jar b/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jboss-deployers-core-spi-2.0.7.GA.jar
deleted file mode 100644
index 33cf41558..000000000
Binary files a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jboss-deployers-core-spi-2.0.7.GA.jar and /dev/null differ
diff --git a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jboss-deployers-impl-2.0.7.GA.jar b/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jboss-deployers-impl-2.0.7.GA.jar
deleted file mode 100644
index aa2c3360d..000000000
Binary files a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jboss-deployers-impl-2.0.7.GA.jar and /dev/null differ
diff --git a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jboss-deployers-spi-2.0.7.GA.jar b/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jboss-deployers-spi-2.0.7.GA.jar
deleted file mode 100644
index ec57dab8a..000000000
Binary files a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jboss-deployers-spi-2.0.7.GA.jar and /dev/null differ
diff --git a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jboss-deployers-structure-spi-2.0.7.GA.jar b/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jboss-deployers-structure-spi-2.0.7.GA.jar
deleted file mode 100644
index ef14ee24d..000000000
Binary files a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jboss-deployers-structure-spi-2.0.7.GA.jar and /dev/null differ
diff --git a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jboss-deployers-vfs-2.0.7.GA.jar b/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jboss-deployers-vfs-2.0.7.GA.jar
deleted file mode 100644
index 7aca1d58c..000000000
Binary files a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jboss-deployers-vfs-2.0.7.GA.jar and /dev/null differ
diff --git a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jboss-deployers-vfs-spi-2.0.7.GA.jar b/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jboss-deployers-vfs-spi-2.0.7.GA.jar
deleted file mode 100644
index 7c3927855..000000000
Binary files a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jboss-deployers-vfs-spi-2.0.7.GA.jar and /dev/null differ
diff --git a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jboss-ejb-api-3.0.0.GA.jar b/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jboss-ejb-api-3.0.0.GA.jar
deleted file mode 100644
index 0b5faf017..000000000
Binary files a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jboss-ejb-api-3.0.0.GA.jar and /dev/null differ
diff --git a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jboss-jacc-api-1.1.0.GA_SP1.jar b/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jboss-jacc-api-1.1.0.GA_SP1.jar
deleted file mode 100644
index fbee31244..000000000
Binary files a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jboss-jacc-api-1.1.0.GA_SP1.jar and /dev/null differ
diff --git a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jboss-jaspi-api-1.0.0.GA.jar b/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jboss-jaspi-api-1.0.0.GA.jar
deleted file mode 100644
index 711be07f0..000000000
Binary files a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jboss-jaspi-api-1.0.0.GA.jar and /dev/null differ
diff --git a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jboss-kernel-2.0.6.GA.jar b/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jboss-kernel-2.0.6.GA.jar
deleted file mode 100644
index 922dc36e5..000000000
Binary files a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jboss-kernel-2.0.6.GA.jar and /dev/null differ
diff --git a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jboss-logging-log4j-2.0.5.GA.jar b/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jboss-logging-log4j-2.0.5.GA.jar
deleted file mode 100644
index 7d2ea518e..000000000
Binary files a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jboss-logging-log4j-2.0.5.GA.jar and /dev/null differ
diff --git a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jboss-logging-spi-2.1.0.GA.jar b/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jboss-logging-spi-2.1.0.GA.jar
deleted file mode 100644
index 18db908aa..000000000
Binary files a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jboss-logging-spi-2.1.0.GA.jar and /dev/null differ
diff --git a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jboss-managed-2.1.0.SP1.jar b/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jboss-managed-2.1.0.SP1.jar
deleted file mode 100644
index fd1d394db..000000000
Binary files a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jboss-managed-2.1.0.SP1.jar and /dev/null differ
diff --git a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jboss-mdr-2.0.1.GA.jar b/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jboss-mdr-2.0.1.GA.jar
deleted file mode 100644
index c69f449eb..000000000
Binary files a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jboss-mdr-2.0.1.GA.jar and /dev/null differ
diff --git a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jboss-metatype-2.1.0.SP1.jar b/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jboss-metatype-2.1.0.SP1.jar
deleted file mode 100644
index 361655fdb..000000000
Binary files a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jboss-metatype-2.1.0.SP1.jar and /dev/null differ
diff --git a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jboss-profiler-jvmti-1.0.0.CR5.jar b/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jboss-profiler-jvmti-1.0.0.CR5.jar
deleted file mode 100644
index bca6caff8..000000000
Binary files a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jboss-profiler-jvmti-1.0.0.CR5.jar and /dev/null differ
diff --git a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jboss-profileservice-spi-5.1.0.GA.jar b/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jboss-profileservice-spi-5.1.0.GA.jar
deleted file mode 100644
index c8945b292..000000000
Binary files a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jboss-profileservice-spi-5.1.0.GA.jar and /dev/null differ
diff --git a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jboss-reflect-2.0.2.GA.jar b/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jboss-reflect-2.0.2.GA.jar
deleted file mode 100644
index 18d5133e9..000000000
Binary files a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jboss-reflect-2.0.2.GA.jar and /dev/null differ
diff --git a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jboss-remoting-2.5.1.jar b/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jboss-remoting-2.5.1.jar
deleted file mode 100644
index 20eaa5474..000000000
Binary files a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jboss-remoting-2.5.1.jar and /dev/null differ
diff --git a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jboss-security-spi-2.0.3.SP1.jar b/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jboss-security-spi-2.0.3.SP1.jar
deleted file mode 100644
index da1758a3a..000000000
Binary files a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jboss-security-spi-2.0.3.SP1.jar and /dev/null differ
diff --git a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jboss-server-manager-1.0.2.GA.jar b/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jboss-server-manager-1.0.2.GA.jar
deleted file mode 100644
index d1c2973dd..000000000
Binary files a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jboss-server-manager-1.0.2.GA.jar and /dev/null differ
diff --git a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jboss-test-1.1.4.GA.jar b/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jboss-test-1.1.4.GA.jar
deleted file mode 100644
index 040597264..000000000
Binary files a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jboss-test-1.1.4.GA.jar and /dev/null differ
diff --git a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jboss-transaction-api-1.0.1.GA.jar b/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jboss-transaction-api-1.0.1.GA.jar
deleted file mode 100644
index 6d225b764..000000000
Binary files a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jboss-transaction-api-1.0.1.GA.jar and /dev/null differ
diff --git a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jboss-vfs-2.1.2.GA.jar b/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jboss-vfs-2.1.2.GA.jar
deleted file mode 100644
index 9c27f6092..000000000
Binary files a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jboss-vfs-2.1.2.GA.jar and /dev/null differ
diff --git a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jbosssx-2.0.3.SP1.jar b/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jbosssx-2.0.3.SP1.jar
deleted file mode 100644
index 1bf66e12e..000000000
Binary files a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jbosssx-2.0.3.SP1.jar and /dev/null differ
diff --git a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jbosssx-client-2.0.3.SP1.jar b/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jbosssx-client-2.0.3.SP1.jar
deleted file mode 100644
index 7fdce093d..000000000
Binary files a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jbosssx-client-2.0.3.SP1.jar and /dev/null differ
diff --git a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jbossws-native-jaxrpc-3.0.4.GA.jar b/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jbossws-native-jaxrpc-3.0.4.GA.jar
deleted file mode 100644
index 191e548ed..000000000
Binary files a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jbossws-native-jaxrpc-3.0.4.GA.jar and /dev/null differ
diff --git a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jbossws-native-saaj-3.0.4.GA.jar b/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jbossws-native-saaj-3.0.4.GA.jar
deleted file mode 100644
index 0a7a2510e..000000000
Binary files a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jbossws-native-saaj-3.0.4.GA.jar and /dev/null differ
diff --git a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jbossxacml-2.0.3.jar b/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jbossxacml-2.0.3.jar
deleted file mode 100644
index 1321e1340..000000000
Binary files a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jbossxacml-2.0.3.jar and /dev/null differ
diff --git a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jbossxb-2.0.1.GA.jar b/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jbossxb-2.0.1.GA.jar
deleted file mode 100644
index c562daedd..000000000
Binary files a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jbossxb-2.0.1.GA.jar and /dev/null differ
diff --git a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jetty-6.1.14.jar b/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jetty-6.1.14.jar
deleted file mode 100644
index 8c503bea2..000000000
Binary files a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jetty-6.1.14.jar and /dev/null differ
diff --git a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jetty-util-6.1.14.jar b/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jetty-util-6.1.14.jar
deleted file mode 100644
index 8f924bb14..000000000
Binary files a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jetty-util-6.1.14.jar and /dev/null differ
diff --git a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jexl-engine-1.0.jar b/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jexl-engine-1.0.jar
deleted file mode 100644
index a08dc6736..000000000
Binary files a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jexl-engine-1.0.jar and /dev/null differ
diff --git a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jline-0.9.94.jar b/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jline-0.9.94.jar
deleted file mode 100644
index dede3721d..000000000
Binary files a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jline-0.9.94.jar and /dev/null differ
diff --git a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jnp-client-5.0.3.GA.jar b/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jnp-client-5.0.3.GA.jar
deleted file mode 100644
index cc73d2000..000000000
Binary files a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jnp-client-5.0.3.GA.jar and /dev/null differ
diff --git a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/joda-time-1.6.jar b/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/joda-time-1.6.jar
deleted file mode 100644
index 68068a4bc..000000000
Binary files a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/joda-time-1.6.jar and /dev/null differ
diff --git a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jruby-1.0.3.jar b/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jruby-1.0.3.jar
deleted file mode 100644
index 71dba3351..000000000
Binary files a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jruby-1.0.3.jar and /dev/null differ
diff --git a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jruby-engine-1.0.jar b/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jruby-engine-1.0.jar
deleted file mode 100644
index 156843589..000000000
Binary files a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jruby-engine-1.0.jar and /dev/null differ
diff --git a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/js-1.7R1.jar b/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/js-1.7R1.jar
deleted file mode 100644
index c081d16b8..000000000
Binary files a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/js-1.7R1.jar and /dev/null differ
diff --git a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/js-engine-1.0.jar b/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/js-engine-1.0.jar
deleted file mode 100644
index fbbf2322c..000000000
Binary files a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/js-engine-1.0.jar and /dev/null differ
diff --git a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/junit-3.8.2.jar b/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/junit-3.8.2.jar
deleted file mode 100644
index c8f711d05..000000000
Binary files a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/junit-3.8.2.jar and /dev/null differ
diff --git a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jython-2.2.1.jar b/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jython-2.2.1.jar
deleted file mode 100644
index 12cd688c0..000000000
Binary files a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jython-2.2.1.jar and /dev/null differ
diff --git a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jython-engine-1.0.jar b/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jython-engine-1.0.jar
deleted file mode 100644
index 42cc8800e..000000000
Binary files a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/jython-engine-1.0.jar and /dev/null differ
diff --git a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/log4j-1.2.16.jar b/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/log4j-1.2.16.jar
deleted file mode 100644
index 5429a903e..000000000
Binary files a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/log4j-1.2.16.jar and /dev/null differ
diff --git a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/logkit-1.0.1.jar b/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/logkit-1.0.1.jar
deleted file mode 100644
index d3250ee64..000000000
Binary files a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/logkit-1.0.1.jar and /dev/null differ
diff --git a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/lucene-analyzers-2.3.2.jar b/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/lucene-analyzers-2.3.2.jar
deleted file mode 100644
index ebffd9a34..000000000
Binary files a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/lucene-analyzers-2.3.2.jar and /dev/null differ
diff --git a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/lucene-core-2.3.2.jar b/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/lucene-core-2.3.2.jar
deleted file mode 100644
index 639f750d2..000000000
Binary files a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/lucene-core-2.3.2.jar and /dev/null differ
diff --git a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/mvel2-2.0.19.jar b/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/mvel2-2.0.19.jar
deleted file mode 100644
index 03069a497..000000000
Binary files a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/mvel2-2.0.19.jar and /dev/null differ
diff --git a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/opencsv-2.1.jar b/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/opencsv-2.1.jar
deleted file mode 100644
index ee5f3ec20..000000000
Binary files a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/opencsv-2.1.jar and /dev/null differ
diff --git a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/osgi-core-4.1.jar b/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/osgi-core-4.1.jar
deleted file mode 100644
index 6999b1bae..000000000
Binary files a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/osgi-core-4.1.jar and /dev/null differ
diff --git a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/relaxngDatatype-1.0.jar b/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/relaxngDatatype-1.0.jar
deleted file mode 100644
index ffd0fc3be..000000000
Binary files a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/relaxngDatatype-1.0.jar and /dev/null differ
diff --git a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/script-api-1.0.jar b/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/script-api-1.0.jar
deleted file mode 100644
index b6e534669..000000000
Binary files a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/script-api-1.0.jar and /dev/null differ
diff --git a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/slf4j-api-1.6.0.jar b/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/slf4j-api-1.6.0.jar
deleted file mode 100644
index db92f9a74..000000000
Binary files a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/slf4j-api-1.6.0.jar and /dev/null differ
diff --git a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/slf4j-log4j12-1.6.0.jar b/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/slf4j-log4j12-1.6.0.jar
deleted file mode 100644
index 032ceac7d..000000000
Binary files a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/slf4j-log4j12-1.6.0.jar and /dev/null differ
diff --git a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/stax-api-1.0.1.jar b/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/stax-api-1.0.1.jar
deleted file mode 100644
index d9a166515..000000000
Binary files a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/stax-api-1.0.1.jar and /dev/null differ
diff --git a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/trove-2.1.1.jar b/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/trove-2.1.1.jar
deleted file mode 100644
index ac62eb35c..000000000
Binary files a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/trove-2.1.1.jar and /dev/null differ
diff --git a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/xercesImpl-2.9.1.jar b/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/xercesImpl-2.9.1.jar
deleted file mode 100644
index 547f56300..000000000
Binary files a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/xercesImpl-2.9.1.jar and /dev/null differ
diff --git a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/xml-apis-2.9.1.jar b/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/xml-apis-2.9.1.jar
deleted file mode 100644
index d42c0ea6c..000000000
Binary files a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/xml-apis-2.9.1.jar and /dev/null differ
diff --git a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/xmlsec-1.4.2.jar b/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/xmlsec-1.4.2.jar
deleted file mode 100644
index 6753cec3d..000000000
Binary files a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/xmlsec-1.4.2.jar and /dev/null differ
diff --git a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/xsom-20060306.jar b/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/xsom-20060306.jar
deleted file mode 100644
index ae1efa1bd..000000000
Binary files a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/xsom-20060306.jar and /dev/null differ
diff --git a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/xstream-1.3.1.jar b/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/xstream-1.3.1.jar
deleted file mode 100644
index 4ef4219c6..000000000
Binary files a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/lib/xstream-1.3.1.jar and /dev/null differ
diff --git a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/plugins/README.txt b/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/plugins/README.txt
deleted file mode 100644
index 4e594be67..000000000
--- a/services/JaxRsServiceProvider/src/main/webapp/nuxeo-client/plugins/README.txt
+++ /dev/null
@@ -1 +0,0 @@
-This folder contains the external modules on top of the nuxeo platform
\ No newline at end of file
diff --git a/services/PerformanceTests/pom.xml b/services/PerformanceTests/pom.xml
index 767602ab9..5cb1aa10e 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>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/account/client/build.xml b/services/account/client/build.xml
index 633b8e161..92e951b00 100644
--- a/services/account/client/build.xml
+++ b/services/account/client/build.xml
@@ -127,11 +127,11 @@
     </target>
 
     <target name="deploy" depends="install"
-            description="deploy account service in ${jboss.server.cspace}">
+            description="deploy account service in ${jee.server.cspace}">
     </target>
 
     <target name="undeploy"
-            description="undeploy account service from ${jboss.server.cspace}">
+            description="undeploy account service from ${jee.server.cspace}">
     </target>
 
     <target name="dist"
diff --git a/services/account/client/pom.xml b/services/account/client/pom.xml
index b434528b6..e2aec57e9 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>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/account/jaxb/pom.xml b/services/account/jaxb/pom.xml
index 79467ad12..9cb1dc782 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>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/account/pom.xml b/services/account/pom.xml
index 924c23d56..c88481875 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>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/account/pstore/build.xml b/services/account/pstore/build.xml
index 12827d730..71f391bb5 100644
--- a/services/account/pstore/build.xml
+++ b/services/account/pstore/build.xml
@@ -185,14 +185,14 @@
 					</sql> -->
     </target>
     <target name="deploy" depends="install"
-            description="deploy account service in ${jboss.server.cspace}">
-        <copy todir="${jboss.server.cspace}/cspace/services">
+            description="deploy account service in ${jee.server.cspace}">
+        <copy todir="${jee.server.cspace}/cspace/services">
             <fileset dir="${src}/main/resources/"/>
         </copy>
     </target>
 
     <target name="undeploy"
-            description="undeploy account service from ${jboss.server.cspace}"
+            description="undeploy account service from ${jee.server.cspace}"
             depends="check.db.scripts.deploy.dir" if="${db.scripts.deploy.dir.exists}">
         <delete>
             <fileset dir="${db.scripts.deploy.dir}"
@@ -209,7 +209,7 @@
     </target>
     
     <target name="check.db.scripts.deploy.dir">
-        <property name="db.scripts.deploy.dir" value="${jboss.server.cspace}/cspace/services/db/${db}"/>
+        <property name="db.scripts.deploy.dir" value="${jee.server.cspace}/cspace/services/db/${db}"/>
         <condition property="db.scripts.deploy.dir.exists">
             <available file="${db.scripts.deploy.dir}" type="dir"/>
         </condition>
diff --git a/services/account/pstore/pom.xml b/services/account/pstore/pom.xml
index 8026e43cc..808d2034f 100644
--- a/services/account/pstore/pom.xml
+++ b/services/account/pstore/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>org.collectionspace.services.account</artifactId>
 		<groupId>org.collectionspace.services</groupId>
-		<version>1.14-SNAPSHOT</version>
+		<version>2.0-SNAPSHOT</version>
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>
@@ -124,12 +124,10 @@
 							<dependency>
 								<groupId>mysql</groupId>
 								<artifactId>mysql-connector-java</artifactId>
-								<version>5.1.5</version>
 							</dependency>
 							<dependency>
 								<groupId>postgresql</groupId>
 								<artifactId>postgresql</artifactId>
-								<version>8.4-702.jdbc4</version>
 							</dependency>
 						</dependencies>
 					</plugin>
diff --git a/services/account/service/pom.xml b/services/account/service/pom.xml
index e712b95d4..e89caf48b 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>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/acquisition/3rdparty/build.xml b/services/acquisition/3rdparty/build.xml
index dd9a65196..cb70e9baa 100644
--- a/services/acquisition/3rdparty/build.xml
+++ b/services/acquisition/3rdparty/build.xml
@@ -109,12 +109,12 @@
     </target>
 
     <target name="deploy" depends="install"
-        description="deploy acquisition in ${jboss.server.nuxeo}">
+        description="deploy acquisition in ${jee.server.nuxeo}">
         <ant antfile="nuxeo-platform-cs-acquisition/build.xml" target="deploy" inheritall="false"/>
     </target>
 
     <target name="undeploy"
-        description="undeploy acquisition from ${jboss.server.nuxeo}">
+        description="undeploy acquisition from ${jee.server.nuxeo}">
         <ant antfile="nuxeo-platform-cs-acquisition/build.xml" target="undeploy" inheritall="false"/>
     </target>
 
diff --git a/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/build.xml b/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/build.xml
index a14848557..e2c9d81dc 100644
--- a/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/build.xml
+++ b/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/build.xml
@@ -113,19 +113,19 @@
     </target>
 
     <target name="deploy" depends="install"
-        description="deploy acquisition doctype in ${jboss.server.nuxeo}">
+        description="deploy acquisition doctype in ${jee.server.nuxeo}">
         <copy file="${basedir}/target/${nuxeo.acquisition.jar}"
-        todir="${jboss.deploy.nuxeo.plugins}"/>
+        todir="${jee.deploy.nuxeo.plugins}"/>
     </target>
 
     <target name="undeploy"
-        description="undeploy acquisition doctype from ${jboss.server.nuxeo}">
+        description="undeploy acquisition doctype from ${jee.server.nuxeo}">
         <delete>
-            <fileset dir="${jboss.deploy.nuxeo.plugins}">
+            <fileset dir="${jee.deploy.nuxeo.plugins}">
                 <include name="${nuxeo.acquisition.jars.all}"/>
             </fileset>
             <!-- Legacy deployment location through release 0.6 -->
-            <fileset dir="${jboss.deploy.nuxeo.system}">
+            <fileset dir="${jee.deploy.nuxeo.system}">
                 <include name="${nuxeo.acquisition.jars.all}"/>
             </fileset>
         </delete>
diff --git a/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/pom.xml b/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/pom.xml
index 646261a52..c5e455bed 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>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/acquisition/3rdparty/pom.xml b/services/acquisition/3rdparty/pom.xml
index 2eabe359a..f1c1b4c08 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>1.14-SNAPSHOT</version> 
+        <version>2.0-SNAPSHOT</version> 
     </parent>
     
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/acquisition/client/pom.xml b/services/acquisition/client/pom.xml
index ef0c24baf..ff2feac0d 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>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/acquisition/jaxb/pom.xml b/services/acquisition/jaxb/pom.xml
index 104002511..a33b97be9 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>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/acquisition/pom.xml b/services/acquisition/pom.xml
index 47bffd4a9..89d0b1fef 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>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/acquisition/service/pom.xml b/services/acquisition/service/pom.xml
index d96edf846..a352669aa 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>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/authentication/client/build.xml b/services/authentication/client/build.xml
index 26abbbff8..c0ab357ca 100644
--- a/services/authentication/client/build.xml
+++ b/services/authentication/client/build.xml
@@ -126,11 +126,11 @@
     </target>
     
     <target name="deploy" depends="install"
-    description="deploy authentication service in ${jboss.server.cspace}">
+    description="deploy authentication service in ${jee.server.cspace}">
     </target>
 
     <target name="undeploy"
-    description="undeploy authentication service from ${jboss.server.cspace}">
+    description="undeploy authentication service from ${jee.server.cspace}">
     </target>
 
     <target name="dist"
diff --git a/services/authentication/client/pom.xml b/services/authentication/client/pom.xml
index d937b5ff1..a6ab0c83b 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>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/authentication/jaxb/pom.xml b/services/authentication/jaxb/pom.xml
index 2620e50bc..86cfeafea 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>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/authentication/pom.xml b/services/authentication/pom.xml
index 534c0529f..f034066f4 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>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/authentication/pstore/build.xml b/services/authentication/pstore/build.xml
index 267d70d46..6d532cc3e 100644
--- a/services/authentication/pstore/build.xml
+++ b/services/authentication/pstore/build.xml
@@ -184,14 +184,14 @@
     </target>
 
     <target name="deploy" depends="install"
-            description="deploy authentication service in ${jboss.server.cspace}">
-        <copy todir="${jboss.server.cspace}/cspace/services">
+            description="deploy authentication service in ${jee.server.cspace}">
+        <copy todir="${jee.server.cspace}/cspace/services">
             <fileset dir="${src}/main/resources/"/>
         </copy>
     </target>
 
     <target name="undeploy"
-            description="undeploy authentication service from ${jboss.server.cspace}"
+            description="undeploy authentication service from ${jee.server.cspace}"
             depends="check.db.scripts.deploy.dir" if="${db.scripts.deploy.dir.exists}">
         <delete>
             <fileset dir="${db.scripts.deploy.dir}"
@@ -208,7 +208,7 @@
     </target>
     
     <target name="check.db.scripts.deploy.dir">
-        <property name="db.scripts.deploy.dir" value="${jboss.server.cspace}/cspace/services/db/${db}"/>
+        <property name="db.scripts.deploy.dir" value="${jee.server.cspace}/cspace/services/db/${db}"/>
         <condition property="db.scripts.deploy.dir.exists">
             <available file="${db.scripts.deploy.dir}" type="dir"/>
         </condition>
diff --git a/services/authentication/pstore/pom.xml b/services/authentication/pstore/pom.xml
index 2808fcc8c..01927ff9b 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>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
@@ -116,13 +116,11 @@
                             <dependency>
                                 <groupId>mysql</groupId>
                                 <artifactId>mysql-connector-java</artifactId>
-																<!-- <version>5.1.5</version> -->
                             </dependency>
-														<dependency>
-																<groupId>postgresql</groupId>
-																<artifactId>postgresql</artifactId>
-																<!-- <version>8.4-702.jdbc4</version> -->
-														</dependency>
+							<dependency>
+								<groupId>postgresql</groupId>
+								<artifactId>postgresql</artifactId>
+							</dependency>
                          </dependencies>
                     </plugin>
                     <plugin>
diff --git a/services/authentication/service/build.xml b/services/authentication/service/build.xml
index 4811157e6..625b5034d 100644
--- a/services/authentication/service/build.xml
+++ b/services/authentication/service/build.xml
@@ -111,27 +111,29 @@
     </target>
 
     <target name="deploy" depends="install"
-            description="deploy authentication service in ${jboss.server.cspace}">
-        <copy file="${basedir}/target/${authentication.jar}" todir="${jboss.server.cspace}/lib"/>
-        <copy tofile="${jboss.server.cspace}/conf/login-config.xml.org"
-              file="${jboss.server.cspace}/conf/login-config.xml"
-              overwrite="false"/>
-        
-        <copy tofile="${jboss.server.cspace}/conf/login-config.xml"
+            description="deploy authentication service in ${jee.server.cspace}">
+        <copy file="${basedir}/target/${authentication.jar}" todir="${jee.server.cspace}/lib"/>
+        <!-- This is JBoss specific and no longer needed
+		<copy tofile="${jee.server.cspace}/conf/login-config.xml.org"
+              file="${jee.server.cspace}/conf/login-config.xml"
+              overwrite="false"/> -->
+        <!-- This is JBoss specific and no longer needed
+        <copy tofile="${jee.server.cspace}/conf/login-config.xml"
               file="${src}/main/resources/config/login-config.xml"
-              overwrite="true"/>
-        <copy todir="${jboss.server.cspace}/cspace/services">
+              overwrite="true"/> -->
+        <copy todir="${jee.server.cspace}/cspace/services">
             <fileset dir="${src}/main/resources/"/>
         </copy>
         <echo message="Check out Authentication Service Configuration Guide on wiki.collectionspace.org for more details" />
     </target>
 
     <target name="undeploy"
-            description="undeploy authentication service from ${jboss.server.cspace}">
-        <delete file="${jboss.server.cspace}/lib/${authentication.jar}"/>
-        <copy tofile="${jboss.server.cspace}/conf/login-config.xml"
-              file="${jboss.server.cspace}/conf/login-config.xml.org"
-              overwrite="true" failonerror="false" />
+            description="undeploy authentication service from ${jee.server.cspace}">
+        <delete file="${jee.server.cspace}/lib/${authentication.jar}"/>
+		<!-- This is JBoss specific and no longer needed
+        <copy tofile="${jee.server.cspace}/conf/login-config.xml"
+              file="${jee.server.cspace}/conf/login-config.xml.org"
+              overwrite="true" failonerror="false" /> -->
         <echo message="Check out Authentication Service Configuration Guide on wiki.collectionspace.org for more details"/>
     </target>
 
diff --git a/services/authentication/service/pom.xml b/services/authentication/service/pom.xml
index 38aa471bc..4c1a24f12 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>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>
@@ -13,9 +13,7 @@
     <packaging>jar</packaging>
 
     <properties>
-<!--        <jboss.version>4.2.3.GA</jboss.version>
-        <jboss.ejb.version>3.0</jboss.ejb.version>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> -->
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <spring.security.version>3.0.2.RELEASE</spring.security.version>
     </properties>
 
diff --git a/services/authority/build.xml b/services/authority/build.xml
index 4d739bc53..09727eef7 100644
--- a/services/authority/build.xml
+++ b/services/authority/build.xml
@@ -118,11 +118,11 @@
     </target>
 
     <target name="deploy" depends="install"
-            description="deploy common elements in ${jboss.server.cspace}">    	
+            description="deploy common elements in ${jee.server.cspace}">    	
     </target>
 
     <target name="undeploy"
-            description="undeploy common elements from ${jboss.server.cspace}">
+            description="undeploy common elements from ${jee.server.cspace}">
     </target>
 
     <target name="dist"
diff --git a/services/authority/jaxb/pom.xml b/services/authority/jaxb/pom.xml
index 342de1d9c..32f5e9483 100644
--- a/services/authority/jaxb/pom.xml
+++ b/services/authority/jaxb/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>org.collectionspace.services.authority</artifactId>
         <groupId>org.collectionspace.services</groupId>
-        <version>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/authority/pom.xml b/services/authority/pom.xml
index a76f642f8..87a6a4278 100644
--- a/services/authority/pom.xml
+++ b/services/authority/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.main</artifactId>
-        <version>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/authority/service/pom.xml b/services/authority/service/pom.xml
index 53b6b334f..51bb364af 100644
--- a/services/authority/service/pom.xml
+++ b/services/authority/service/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.authority</artifactId>
-        <version>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/authorization-mgt/client/build.xml b/services/authorization-mgt/client/build.xml
index 9b0a3c2d6..a2185e69d 100644
--- a/services/authorization-mgt/client/build.xml
+++ b/services/authorization-mgt/client/build.xml
@@ -112,11 +112,11 @@
 
 
     <target name="deploy" depends="install"
-            description="deploy authorization-mgt service in ${jboss.server.cspace}">
+            description="deploy authorization-mgt service in ${jee.server.cspace}">
     </target>
 
     <target name="undeploy"
-            description="undeploy authorization-mgt service from ${jboss.server.cspace}">
+            description="undeploy authorization-mgt service from ${jee.server.cspace}">
     </target>
 
     <target name="dist"
diff --git a/services/authorization-mgt/client/pom.xml b/services/authorization-mgt/client/pom.xml
index 78d300dfe..396572c61 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>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/authorization-mgt/import/build.xml b/services/authorization-mgt/import/build.xml
index 03eb51d47..34bf953af 100644
--- a/services/authorization-mgt/import/build.xml
+++ b/services/authorization-mgt/import/build.xml
@@ -144,7 +144,7 @@
         <filter token="DB_URL" value="${db.jdbc.cspace.url}" />
         <filter token="DB_DRIVER_CLASS" value="${db.jdbc.driver.class}" />
         <filter token="DB_USER" value="${db.cspace.user}" /> <!-- double-sub from ${db.user} fails -->
-        <filter token="DB_PASSWORD" value="${env.DB_PASSWORD_CSPACE}" /> <!-- double-sub from ${db.jboss.user.password} fails -->
+        <filter token="DB_PASSWORD" value="${env.DB_PASSWORD_CSPACE}" /> <!-- double-sub from ${db.j2ee.user.password} fails -->
         <filter token="DB_DIALECT" value="${db.dialect}" />
         <filter token="CLASS_ID_QUERY" value="${db.spring.acl.classIdentityQuery}" />
         <filter token="SID_ID_QUERY" value="${db.spring.acl.sidIdentityQuery}" />
@@ -154,11 +154,11 @@
 
     
     <target name="deploy" depends="install"
-            description="deploy authorization-mgt import in ${jboss.server.cspace}">
+            description="deploy authorization-mgt import in ${jee.server.cspace}">
     </target>
 
     <target name="undeploy"
-            description="undeploy authorization-mgt import from ${jboss.server.cspace}">
+            description="undeploy authorization-mgt import from ${jee.server.cspace}">
     </target>
 
     <target name="dist"
diff --git a/services/authorization-mgt/import/pom.xml b/services/authorization-mgt/import/pom.xml
index 13b7bd4e8..27991d4db 100644
--- a/services/authorization-mgt/import/pom.xml
+++ b/services/authorization-mgt/import/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.authorization-mgt</artifactId>
-        <version>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
@@ -154,19 +154,19 @@
 					</resource>
 				</resources>
         <plugins>
-					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-resources-plugin</artifactId>
-						<version>2.5</version>
-						<executions>
-							<execution>
-								<phase>process-resources</phase>
-								<goals>
-									<goal>resources</goal>
-								</goals>
-							</execution>
-						</executions>
-					</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-resources-plugin</artifactId>
+				<version>2.5</version>
+				<executions>
+					<execution>
+						<phase>process-resources</phase>
+						<goals>
+							<goal>resources</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>exec-maven-plugin</artifactId>
@@ -197,18 +197,20 @@
                     <systemProperties>
                     </systemProperties>
                 </configuration>
+				
                 <dependencies>
                     <dependency>
                         <groupId>mysql</groupId>
                         <artifactId>mysql-connector-java</artifactId>
-												<version>5.1.5</version>
+						<version>${mysql.driver.version}</version>
                     </dependency>
-										<dependency>
-												<groupId>postgresql</groupId>
-												<artifactId>postgresql</artifactId>
-												<version>8.4-702.jdbc4</version>
-										</dependency>
+					<dependency>
+						<groupId>postgresql</groupId>
+						<artifactId>postgresql</artifactId>
+						<version>${postgres.driver.version}</version>
+					</dependency>
                 </dependencies>
+				
             </plugin>
         </plugins>
 
diff --git a/services/authorization-mgt/pom.xml b/services/authorization-mgt/pom.xml
index 891808cd6..e0d0fa878 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>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.collectionspace.services</groupId>
diff --git a/services/authorization-mgt/service/build.xml b/services/authorization-mgt/service/build.xml
index 5584b08fe..d0ee76f08 100644
--- a/services/authorization-mgt/service/build.xml
+++ b/services/authorization-mgt/service/build.xml
@@ -111,14 +111,14 @@
 
 <!--
     <target name="deploy" depends="install"
-            description="deploy authorization service in ${jboss.server.cspace}">
-        <copy file="${basedir}/target/${authorization.jar}" todir="${jboss.server.cspace}/lib"/>
+            description="deploy authorization service in ${jee.server.cspace}">
+        <copy file="${basedir}/target/${authorization.jar}" todir="${jee.server.cspace}/lib"/>
         <echo message="Check out authorization Service Configuration Guide on wiki.collectionspace.org for more details" />
     </target>
 
     <target name="undeploy"
-            description="undeploy authorization service from ${jboss.server.cspace}">
-        <delete file="${jboss.server.cspace}/lib/${authorization.jar}"/>
+            description="undeploy authorization service from ${jee.server.cspace}">
+        <delete file="${jee.server.cspace}/lib/${authorization.jar}"/>
         <echo message="Check out authorization Service Configuration Guide on wiki.collectionspace.org for more details"/>
     </target>
 -->    
diff --git a/services/authorization-mgt/service/pom.xml b/services/authorization-mgt/service/pom.xml
index e3d579f72..78d49fdf1 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>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
     <groupId>org.collectionspace.services</groupId>
     <artifactId>org.collectionspace.services.authorization-mgt.service</artifactId>
@@ -13,8 +13,6 @@
     <url>http://www.collectionspace.org</url>
 
     <properties>
-        <jboss.version>4.2.3.GA</jboss.version>
-        <jboss.ejb.version>3.0</jboss.ejb.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <spring.version>3.0.0.RELEASE</spring.version>
         <spring.security.version>3.0.2.RELEASE</spring.security.version>
diff --git a/services/authorization/jaxb/pom.xml b/services/authorization/jaxb/pom.xml
index ced6d2667..a792f440c 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>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/authorization/pom.xml b/services/authorization/pom.xml
index d532a2c14..0e836be0d 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>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
     <groupId>org.collectionspace.services</groupId>
     <artifactId>org.collectionspace.services.authorization</artifactId>
diff --git a/services/authorization/pstore/build.xml b/services/authorization/pstore/build.xml
index ef4ea09c5..9200c4b6d 100644
--- a/services/authorization/pstore/build.xml
+++ b/services/authorization/pstore/build.xml
@@ -195,14 +195,14 @@
     </target>
 
     <target name="deploy" depends="install"
-            description="deploy authorization service in ${jboss.server.cspace}">
-        <copy todir="${jboss.server.cspace}/cspace/services">
+            description="deploy authorization service in ${jee.server.cspace}">
+        <copy todir="${jee.server.cspace}/cspace/services">
             <fileset dir="${src}/main/resources/"/>
         </copy>
     </target>
 
     <target name="undeploy"
-            description="undeploy authorization service from ${jboss.server.cspace}"
+            description="undeploy authorization service from ${jee.server.cspace}"
             depends="check.db.scripts.deploy.dir" if="${db.scripts.deploy.dir.exists}">
         <delete>
             <fileset dir="${db.scripts.deploy.dir}"
@@ -219,7 +219,7 @@
     </target>
     
     <target name="check.db.scripts.deploy.dir">
-        <property name="db.scripts.deploy.dir" value="${jboss.server.cspace}/cspace/services/db/${db}"/>
+        <property name="db.scripts.deploy.dir" value="${jee.server.cspace}/cspace/services/db/${db}"/>
         <condition property="db.scripts.deploy.dir.exists">
             <available file="${db.scripts.deploy.dir}" type="dir"/>
         </condition>
diff --git a/services/authorization/pstore/pom.xml b/services/authorization/pstore/pom.xml
index 19f50e2aa..1764ee9b8 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>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
@@ -60,24 +60,24 @@
             <id>ddl</id>
             <build>
                 <plugins>
-										<plugin>
-											<groupId>org.codehaus.mojo</groupId>
-											<artifactId>properties-maven-plugin</artifactId>
-											<version>1.0-alpha-2</version>
-											<executions>
-												<execution>
-													<phase>initialize</phase>
-													<goals>
-														<goal>read-project-properties</goal>
-													</goals>
-													<configuration>
-														<files>
-															<file>${basedir}/../../../build.properties</file>
-														</files>
-													</configuration>
-												</execution>
-											</executions>
-										</plugin>
+					<plugin>
+						<groupId>org.codehaus.mojo</groupId>
+						<artifactId>properties-maven-plugin</artifactId>
+						<version>1.0-alpha-2</version>
+						<executions>
+							<execution>
+								<phase>initialize</phase>
+								<goals>
+									<goal>read-project-properties</goal>
+								</goals>
+								<configuration>
+									<files>
+										<file>${basedir}/../../../build.properties</file>
+									</files>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
                      <plugin>
                         <groupId>org.codehaus.mojo</groupId>
                         <artifactId>hibernate3-maven-plugin</artifactId>
@@ -111,13 +111,11 @@
                             <dependency>
                                 <groupId>mysql</groupId>
                                 <artifactId>mysql-connector-java</artifactId>
-																<!-- <version>5.1.5</version> -->
                             </dependency>
-														<dependency>
-																<groupId>postgresql</groupId>
-																<artifactId>postgresql</artifactId>
-																<!-- <version>8.4-702.jdbc4</version> -->
-														</dependency>
+							<dependency>
+								<groupId>postgresql</groupId>
+								<artifactId>postgresql</artifactId>
+							</dependency>
                          </dependencies>
                     </plugin>
                     <plugin>
@@ -127,7 +125,7 @@
                                 <phase>process-test-resources</phase>
                                 <configuration>
                                     <tasks>
- 																			<copy file="${basedir}/target/hibernate3/sql/${sql.file}" tofile="${sql.dir}/${db}/${sql.file}"/>
+										<copy file="${basedir}/target/hibernate3/sql/${sql.file}" tofile="${sql.dir}/${db}/${sql.file}"/>
                                     </tasks>
                                 </configuration>
                                 <goals>
diff --git a/services/authorization/service/build.xml b/services/authorization/service/build.xml
index 834a97ffd..992766b3d 100644
--- a/services/authorization/service/build.xml
+++ b/services/authorization/service/build.xml
@@ -110,14 +110,14 @@
     </target>
 
     <target name="deploy" depends="install"
-            description="deploy authorization service in ${jboss.server.cspace}">
-        <copy file="${basedir}/target/${authorization.jar}" todir="${jboss.server.cspace}/lib"/>
+            description="deploy authorization service in ${jee.server.cspace}">
+        <copy file="${basedir}/target/${authorization.jar}" todir="${jee.server.cspace}/lib"/>
         <echo message="Check out authorization Service Configuration Guide on wiki.collectionspace.org for more details" />
     </target>
 
     <target name="undeploy"
-            description="undeploy authorization service from ${jboss.server.cspace}">
-        <delete file="${jboss.server.cspace}/lib/${authorization.jar}"/>
+            description="undeploy authorization service from ${jee.server.cspace}">
+        <delete file="${jee.server.cspace}/lib/${authorization.jar}"/>
         <echo message="Check out authorization Service Configuration Guide on wiki.collectionspace.org for more details"/>
     </target>
 
diff --git a/services/authorization/service/pom.xml b/services/authorization/service/pom.xml
index bbb9cd01a..1e6508a6c 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>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
     <groupId>org.collectionspace.services</groupId>
     <artifactId>org.collectionspace.services.authorization.service</artifactId>
@@ -15,8 +15,6 @@
     <url>http://www.collectionspace.org</url>
 
     <properties>
-        <jboss.version>4.2.3.GA</jboss.version>
-        <jboss.ejb.version>3.0</jboss.ejb.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <spring.version>3.0.0.RELEASE</spring.version>
         <spring.security.version>3.0.2.RELEASE</spring.security.version>
diff --git a/services/batch/3rdparty/build.xml b/services/batch/3rdparty/build.xml
index bba913755..9cc58f80a 100644
--- a/services/batch/3rdparty/build.xml
+++ b/services/batch/3rdparty/build.xml
@@ -109,12 +109,12 @@
     </target>
 
     <target name="deploy" depends="install"
-    description="deploy batch in ${jboss.server.nuxeo}">
+    description="deploy batch in ${jee.server.nuxeo}">
         <ant antfile="nuxeo-platform-cs-batch/build.xml" target="deploy" inheritall="false"/>
     </target>
 
     <target name="undeploy"
-    description="undeploy batch from ${jboss.server.nuxeo}">
+    description="undeploy batch from ${jee.server.nuxeo}">
         <ant antfile="nuxeo-platform-cs-batch/build.xml" target="undeploy" inheritall="false"/>
     </target>
 
diff --git a/services/batch/3rdparty/nuxeo-platform-cs-batch/build.xml b/services/batch/3rdparty/nuxeo-platform-cs-batch/build.xml
index dda9125ca..514cd024b 100644
--- a/services/batch/3rdparty/nuxeo-platform-cs-batch/build.xml
+++ b/services/batch/3rdparty/nuxeo-platform-cs-batch/build.xml
@@ -113,19 +113,19 @@
     </target>
 
     <target name="deploy" depends="install"
-        description="deploy batch doctype in ${jboss.server.nuxeo}">
+        description="deploy batch doctype in ${jee.server.nuxeo}">
         <copy file="${basedir}/target/${nuxeo.batch.jar}"
-        todir="${jboss.deploy.nuxeo.plugins}"/>
+        todir="${jee.deploy.nuxeo.plugins}"/>
     </target>
 
     <target name="undeploy"
-        description="undeploy batch doctype from ${jboss.server.nuxeo}">
+        description="undeploy batch doctype from ${jee.server.nuxeo}">
         <delete>
-            <fileset dir="${jboss.deploy.nuxeo.plugins}">
+            <fileset dir="${jee.deploy.nuxeo.plugins}">
                 <include name="${nuxeo.batch.jars.all}"/>
             </fileset>
             <!-- Legacy deployment location through release 0.6 -->
-            <fileset dir="${jboss.deploy.nuxeo.system}">
+            <fileset dir="${jee.deploy.nuxeo.system}">
                 <include name="${nuxeo.batch.jars.all}"/>
             </fileset>
         </delete>
diff --git a/services/batch/3rdparty/nuxeo-platform-cs-batch/pom.xml b/services/batch/3rdparty/nuxeo-platform-cs-batch/pom.xml
index 982e20125..3a7e119d1 100644
--- a/services/batch/3rdparty/nuxeo-platform-cs-batch/pom.xml
+++ b/services/batch/3rdparty/nuxeo-platform-cs-batch/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.batch.3rdparty</artifactId>
-        <version>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/batch/3rdparty/pom.xml b/services/batch/3rdparty/pom.xml
index d63ff1699..cebc2607a 100644
--- a/services/batch/3rdparty/pom.xml
+++ b/services/batch/3rdparty/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>org.collectionspace.services.batch</artifactId>
         <groupId>org.collectionspace.services</groupId>
-        <version>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/batch/client/pom.xml b/services/batch/client/pom.xml
index d92e83a27..0d808544a 100644
--- a/services/batch/client/pom.xml
+++ b/services/batch/client/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.batch</artifactId>
-        <version>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/batch/jaxb/pom.xml b/services/batch/jaxb/pom.xml
index 84651dbeb..6ebf0d957 100644
--- a/services/batch/jaxb/pom.xml
+++ b/services/batch/jaxb/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>org.collectionspace.services.batch</artifactId>
         <groupId>org.collectionspace.services</groupId>
-        <version>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/batch/pom.xml b/services/batch/pom.xml
index 048921a9d..e1bb8ac4a 100644
--- a/services/batch/pom.xml
+++ b/services/batch/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.main</artifactId>
-        <version>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/batch/service/pom.xml b/services/batch/service/pom.xml
index d2a97717c..981ea1a08 100644
--- a/services/batch/service/pom.xml
+++ b/services/batch/service/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.batch</artifactId>        
-        <version>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/blob/3rdparty/build.xml b/services/blob/3rdparty/build.xml
index b1aca6ba0..d6695ca7f 100644
--- a/services/blob/3rdparty/build.xml
+++ b/services/blob/3rdparty/build.xml
@@ -109,12 +109,12 @@
     </target>
 
     <target name="deploy" depends="install"
-    description="deploy blob in ${jboss.server.nuxeo}">
+    description="deploy blob in ${jee.server.nuxeo}">
         <ant antfile="nuxeo-platform-cs-blob/build.xml" target="deploy" inheritall="false"/>
     </target>
 
     <target name="undeploy"
-    description="undeploy blob from ${jboss.server.nuxeo}">
+    description="undeploy blob from ${jee.server.nuxeo}">
         <ant antfile="nuxeo-platform-cs-blob/build.xml" target="undeploy" inheritall="false"/>
     </target>
 
diff --git a/services/blob/3rdparty/nuxeo-platform-cs-blob/build.xml b/services/blob/3rdparty/nuxeo-platform-cs-blob/build.xml
index c17cc92bf..2f017d927 100644
--- a/services/blob/3rdparty/nuxeo-platform-cs-blob/build.xml
+++ b/services/blob/3rdparty/nuxeo-platform-cs-blob/build.xml
@@ -113,19 +113,19 @@
     </target>
 
     <target name="deploy" depends="install"
-        description="deploy blob doctype in ${jboss.server.nuxeo}">
+        description="deploy blob doctype in ${jee.server.nuxeo}">
         <copy file="${basedir}/target/${nuxeo.blob.jar}"
-        todir="${jboss.deploy.nuxeo.plugins}"/>
+        todir="${jee.deploy.nuxeo.plugins}"/>
     </target>
 
     <target name="undeploy"
-        description="undeploy blob doctype from ${jboss.server.nuxeo}">
+        description="undeploy blob doctype from ${jee.server.nuxeo}">
         <delete>
-            <fileset dir="${jboss.deploy.nuxeo.plugins}">
+            <fileset dir="${jee.deploy.nuxeo.plugins}">
                 <include name="${nuxeo.blob.jars.all}"/>
             </fileset>
             <!-- Legacy deployment location through release 0.6 -->
-            <fileset dir="${jboss.deploy.nuxeo.system}">
+            <fileset dir="${jee.deploy.nuxeo.system}">
                 <include name="${nuxeo.blob.jars.all}"/>
             </fileset>
         </delete>
diff --git a/services/blob/3rdparty/nuxeo-platform-cs-blob/pom.xml b/services/blob/3rdparty/nuxeo-platform-cs-blob/pom.xml
index 09980d67c..31f412cbe 100644
--- a/services/blob/3rdparty/nuxeo-platform-cs-blob/pom.xml
+++ b/services/blob/3rdparty/nuxeo-platform-cs-blob/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.collectionspace.services</groupId>
 		<artifactId>org.collectionspace.services.blob.3rdparty</artifactId>
-		<version>1.14-SNAPSHOT</version>
+		<version>2.0-SNAPSHOT</version>
 	</parent>
     
     <groupId>org.collectionspace.services</groupId>
diff --git a/services/blob/3rdparty/pom.xml b/services/blob/3rdparty/pom.xml
index 0a12b270c..0be9e8459 100644
--- a/services/blob/3rdparty/pom.xml
+++ b/services/blob/3rdparty/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>org.collectionspace.services.blob</artifactId>
         <groupId>org.collectionspace.services</groupId>
-        <version>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/blob/client/pom.xml b/services/blob/client/pom.xml
index 40bf55d24..915ca82e7 100644
--- a/services/blob/client/pom.xml
+++ b/services/blob/client/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.blob</artifactId>
-        <version>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/blob/jaxb/pom.xml b/services/blob/jaxb/pom.xml
index 239455996..352113c71 100644
--- a/services/blob/jaxb/pom.xml
+++ b/services/blob/jaxb/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>org.collectionspace.services.blob</artifactId>
         <groupId>org.collectionspace.services</groupId>
-        <version>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/blob/pom.xml b/services/blob/pom.xml
index de9c809bc..3f9aaac4c 100644
--- a/services/blob/pom.xml
+++ b/services/blob/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>org.collectionspace.services.main</artifactId>
         <groupId>org.collectionspace.services</groupId>
-        <version>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
     
     <groupId>org.collectionspace.services</groupId>
@@ -16,7 +16,9 @@
     <modules>
         <module>service</module>
         <module>3rdparty</module>
+        <!-- Not working with embedded Nuxeo EP instance on Tomcat
         <module>client</module>
+         -->
     </modules>
 
 </project>
diff --git a/services/blob/service/pom.xml b/services/blob/service/pom.xml
index 10b6fc079..1390ed15b 100644
--- a/services/blob/service/pom.xml
+++ b/services/blob/service/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.blob</artifactId>        
-        <version>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/build.xml b/services/build.xml
index 1b4245c33..5cb7e9be8 100644
--- a/services/build.xml
+++ b/services/build.xml
@@ -146,7 +146,7 @@
 
     <!-- this target is called in order based on the dependencies between the services -->
     <target name="deploy" depends="install"
-            description="deploy services in ${jboss.server.cspace}">
+            description="deploy services in ${jee.server.cspace}">
         <ant antfile="authentication/build.xml" target="deploy" inheritAll="false"/>
         <ant antfile="authorization/build.xml" target="deploy" inheritAll="false"/>
         <ant antfile="authority/build.xml" target="deploy" inheritAll="false"/>
@@ -181,7 +181,7 @@
 
     <!-- this target is called in reverse order of deploy targets -->
     <target name="undeploy"
-            description="undeploy services from ${jboss.server.cspace}">
+            description="undeploy services from ${jee.server.cspace}">
         <ant antfile="JaxRsServiceProvider/build.xml" target="undeploy" inheritAll="false"/>
         <ant antfile="vocabulary/build.xml" target="undeploy" inheritAll="false"/>
         <ant antfile="organization/build.xml" target="undeploy" inheritAll="false"/>
@@ -199,6 +199,7 @@
         <ant antfile="loanin/build.xml" target="undeploy" inheritAll="false"/>
         <ant antfile="media/build.xml" target="undeploy" inheritAll="false"/>
         <ant antfile="intake/build.xml" target="undeploy" inheritAll="false"/>
+        <ant antfile="imports/build.xml" target="undeploy" inheritAll="false"/>
         <ant antfile="group/build.xml" target="undeploy" inheritAll="false"/>
         <ant antfile="collectionobject/build.xml" target="undeploy" inheritAll="false"/>
         <ant antfile="note/build.xml" target="undeploy" inheritAll="false"/>
@@ -215,7 +216,7 @@
     </target>
 
     <target name="hotdeploy" depends="install"
-            description="deploy services in running ${jboss.server.cspace}">
+            description="deploy services in running ${jee.server.cspace}">
         <ant antfile="JaxRsServiceProvider/build.xml" target="hotdeploy" inheritAll="false"/>
     </target>
 
diff --git a/services/client/pom.xml b/services/client/pom.xml
index 7ed7526cc..25fcde4b4 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>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/client/src/main/resources/collectionspace-client.properties b/services/client/src/main/resources/collectionspace-client.properties
index eefe496f6..332c68654 100644
--- a/services/client/src/main/resources/collectionspace-client.properties
+++ b/services/client/src/main/resources/collectionspace-client.properties
@@ -1,5 +1,5 @@
 #url of the collectionspace server
-cspace.url=http://localhost:8081/cspace-services/
+cspace.url=http://localhost:8180/cspace-services/
 #cspace.url=http://nightly.collectionspace.org:8180/cspace-services/
 
 #cspace.url=http://localhost:8200/cspace-services/
diff --git a/services/collectionobject/3rdparty/build.xml b/services/collectionobject/3rdparty/build.xml
index b86043b4f..25eded8e0 100644
--- a/services/collectionobject/3rdparty/build.xml
+++ b/services/collectionobject/3rdparty/build.xml
@@ -113,13 +113,13 @@
     </target>
 
     <target name="deploy" depends="install"
-    description="deploy collectionobject in ${jboss.server.nuxeo}">
+    description="deploy collectionobject in ${jee.server.nuxeo}">
         <ant antfile="${nuxeo-platform-collectionobject}/build.xml" target="deploy" inheritall="false"/>
         <ant antfile="${nuxeo-platform-collectionobject-lifesci}/build.xml" target="deploy" inheritall="false"/>
     </target>
 
     <target name="undeploy"
-    description="undeploy collectionobject from ${jboss.server.nuxeo}">
+    description="undeploy collectionobject from ${jee.server.nuxeo}">
         <ant antfile="${nuxeo-platform-collectionobject}/build.xml" target="undeploy" inheritall="false"/>
         <ant antfile="${nuxeo-platform-collectionobject-lifesci}/build.xml" target="undeploy" inheritall="false"/>
     </target>
diff --git a/services/collectionobject/3rdparty/nuxeo-platform-collectionobject-lifesci/build.xml b/services/collectionobject/3rdparty/nuxeo-platform-collectionobject-lifesci/build.xml
index 071e28a90..50ef5e524 100644
--- a/services/collectionobject/3rdparty/nuxeo-platform-collectionobject-lifesci/build.xml
+++ b/services/collectionobject/3rdparty/nuxeo-platform-collectionobject-lifesci/build.xml
@@ -117,19 +117,19 @@
     </target>
 
     <target name="deploy" depends="install"
-        description="deploy collectionobject doctype in ${jboss.server.nuxeo}">
+        description="deploy collectionobject doctype in ${jee.server.nuxeo}">
         <copy file="${basedir}/target/${nuxeo.collectionobject.jar}"
-        todir="${jboss.deploy.nuxeo.plugins}"/>
+        todir="${jee.deploy.nuxeo.plugins}"/>
     </target>
 
     <target name="undeploy"
-        description="undeploy collectionobject doctype from ${jboss.server.nuxeo}">
+        description="undeploy collectionobject doctype from ${jee.server.nuxeo}">
         <delete>
-            <fileset dir="${jboss.deploy.nuxeo.plugins}">
+            <fileset dir="${jee.deploy.nuxeo.plugins}">
                 <include name="${nuxeo.collectionobject.jars.all}"/>
             </fileset>
             <!-- Legacy deployment location through release 0.6 -->
-            <fileset dir="${jboss.deploy.nuxeo.system}">
+            <fileset dir="${jee.deploy.nuxeo.system}">
                 <include name="${nuxeo.collectionobject.jars.all}"/>
             </fileset>
         </delete>
diff --git a/services/collectionobject/3rdparty/nuxeo-platform-collectionobject-lifesci/pom.xml b/services/collectionobject/3rdparty/nuxeo-platform-collectionobject-lifesci/pom.xml
index 65ae2e55f..89ece0b29 100644
--- a/services/collectionobject/3rdparty/nuxeo-platform-collectionobject-lifesci/pom.xml
+++ b/services/collectionobject/3rdparty/nuxeo-platform-collectionobject-lifesci/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.collectionobject.3rdparty</artifactId>
-        <version>1.14-SNAPSHOT</version>
+        <version>2.0-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 ac93534b1..683923f6b 100644
--- a/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/build.xml
+++ b/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/build.xml
@@ -117,19 +117,19 @@
     </target>
 
     <target name="deploy" depends="install"
-        description="Deploy CollectionObjectsCommon doctype in ${jboss.server.nuxeo}">
+        description="Deploy CollectionObjectsCommon doctype in ${jee.server.nuxeo}">
         <copy file="${basedir}/target/${nuxeo.collectionobject.jar}"
-        todir="${jboss.deploy.nuxeo.plugins}"/>
+        todir="${jee.deploy.nuxeo.plugins}"/>
     </target>
 
     <target name="undeploy"
-        description="Undeploy CollectionObjectsCommon doctype from ${jboss.server.nuxeo}">
+        description="Undeploy CollectionObjectsCommon doctype from ${jee.server.nuxeo}">
         <delete>
-            <fileset dir="${jboss.deploy.nuxeo.plugins}">
+            <fileset dir="${jee.deploy.nuxeo.plugins}">
                 <include name="${nuxeo.collectionobject.jars.all}"/>
             </fileset>
             <!-- Legacy deployment location through release 0.6 -->
-            <fileset dir="${jboss.deploy.nuxeo.system}">
+            <fileset dir="${jee.deploy.nuxeo.system}">
                 <include name="${nuxeo.collectionobject.jars.all}"/>
             </fileset>
         </delete>
diff --git a/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/pom.xml b/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/pom.xml
index fa9c927f1..9869e21e5 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>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/src/main/resources/schemas/collectionobjects_common.xsd b/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/src/main/resources/schemas/collectionobjects_common.xsd
index 2a37ed571..c715c883a 100644
--- a/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/src/main/resources/schemas/collectionobjects_common.xsd
+++ b/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/src/main/resources/schemas/collectionobjects_common.xsd
@@ -27,11 +27,10 @@
     <xs:element name="otherNumber" type="xs:string"/>
     <xs:element name="otherNumberType" type="xs:string"/>
     <!-- end of two elements to be removed -->
-    <xs:element name="briefDescriptions" type="xs:string">
+    <xs:element name="briefDescriptions">
         <xs:complexType>
             <xs:sequence>
-                <xs:element name="briefDescription" type="xs:string"
-                    minOccurs="0" maxOccurs="unbounded"/>
+                <xs:element name="briefDescription" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
             </xs:sequence>
         </xs:complexType>
     </xs:element>
diff --git a/services/collectionobject/3rdparty/pom.xml b/services/collectionobject/3rdparty/pom.xml
index 86ef613b4..ee9376c9d 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>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/collectionobject/client/pom.xml b/services/collectionobject/client/pom.xml
index 008887720..aba4a9c3a 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>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/collectionobject/installer/build.xml b/services/collectionobject/installer/build.xml
index b17ccb065..645e1586e 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.plugins}">
+        <copy todir="${jee.deploy.nuxeo.plugins}">
             <fileset file="nuxeo/*.jar"/>
         </copy>
     </target>
diff --git a/services/collectionobject/jaxb/pom.xml b/services/collectionobject/jaxb/pom.xml
index f6a950130..6060b647a 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>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/collectionobject/pom.xml b/services/collectionobject/pom.xml
index 5e8dcf86c..860933b90 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>1.14-SNAPSHOT</version>        
+        <version>2.0-SNAPSHOT</version>        
     </parent>
     
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/collectionobject/sample/pom.xml b/services/collectionobject/sample/pom.xml
index c8d25ed81..bbc88e531 100644
--- a/services/collectionobject/sample/pom.xml
+++ b/services/collectionobject/sample/pom.xml
@@ -4,7 +4,7 @@
     <groupId>org.collectionspace.services</groupId>
     <artifactId>org.collectionspace.services.collectionobject.client.samples</artifactId>
     <packaging>pom</packaging>
-    <version>1.14-SNAPSHOT</version>
+    <version>2.0-SNAPSHOT</version>
     <name>collectionobject.client.samples</name>
 
     <modules>
diff --git a/services/collectionobject/sample/sample/pom.xml b/services/collectionobject/sample/sample/pom.xml
index 46780e3e4..969f2a7d4 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>1.14-SNAPSHOT</version>
+    <version>2.0-SNAPSHOT</version>
     
     <dependencies>
         <!-- keep slf4j dependencies on the top -->
diff --git a/services/collectionobject/service/pom.xml b/services/collectionobject/service/pom.xml
index 877716ef0..1afb7bc5a 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>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/common-api/pom.xml b/services/common-api/pom.xml
index 81bea1479..d96a30ed8 100755
--- a/services/common-api/pom.xml
+++ b/services/common-api/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.main</artifactId>
-        <version>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/common-test/pom.xml b/services/common-test/pom.xml
index 4d53ce551..4ec2ff3da 100644
--- a/services/common-test/pom.xml
+++ b/services/common-test/pom.xml
@@ -4,11 +4,11 @@
     <parent>
         <artifactId>org.collectionspace.services.main</artifactId>
         <groupId>org.collectionspace.services</groupId>
-        <version>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
     <groupId>org.collectionspace.services</groupId>
     <artifactId>org.collectionspace.services.common-test</artifactId>
-    <version>1.14-SNAPSHOT</version>
+    <version>2.0-SNAPSHOT</version>
     <name>services.common-test</name>
     <url>http://maven.apache.org</url>
     <packaging>jar</packaging>
diff --git a/services/common/build.xml b/services/common/build.xml
index 110f040af..98d9ac8bd 100644
--- a/services/common/build.xml
+++ b/services/common/build.xml
@@ -1,6 +1,6 @@
 <project name="common" default="package" basedir=".">
     <description>
-        collectionspace services common
+        Collectionspace Services common module
     </description>
     <!-- set global properties for this build -->
     <property name="services.trunk" value="../.."/>
@@ -117,101 +117,88 @@
         </exec>
     </target>
 
-    <target name="deploy_jpa" description="deploy jpa binaries in ${jboss.server.cspace}">
-        <move todir="${jboss.server.cspace}/jpa-upgrade/lib" overwrite="false">
-
-            <fileset dir="${jboss.server.cspace}/lib">
-              <include name="hibernate-annotations*.jar"/>
-              <include name="hibernate-entitymanager*.jar"/>
-              <include name="ejb3-persistence*.jar"/>
-            </fileset>
-        </move>
-        <copy todir="${jboss.server.cspace}/lib">
-            <fileset dir="${basedir}/lib/jpa-upgrade"/>
-        </copy>
-
-    </target>
-
     <target name="deploy_spring"
-            description="deploy spring binaries in ${jboss.server.cspace}">
-        <copy todir="${jboss.server.cspace}/lib">
+            description="deploy spring binaries in ${jee.server.cspace}">
+        <copy todir="${jee.server.cspace}/lib">
             <fileset dir="${basedir}/lib/spring"/>
         </copy>
     </target>
 
     <target name="deploy_slf4j"
-            description="deploy spring binaries in ${jboss.server.cspace}">
-        <copy todir="${jboss.server.cspace}/lib">
+            description="deploy spring binaries in ${jee.server.cspace}">
+        <copy todir="${jee.server.cspace}/lib">
             <fileset dir="${basedir}/lib/slf4j"/>
         </copy>
     </target>
 	
     <target name="deploy_xmlmerge"
-            description="deploy XMLMerge binaries in ${jboss.server.cspace}">
-        <copy todir="${jboss.server.cspace}/lib">
+            description="deploy XMLMerge binaries in ${jee.server.cspace}">
+        <copy todir="${jee.server.cspace}/lib">
             <fileset dir="${basedir}/lib/xmlmerge"/>
         </copy>
     </target>
 	
 
     <target name="deploy" depends="install"
-            description="deploy common elements in ${jboss.server.cspace}">
-        <copy tofile="${jboss.server.cspace}/conf/jboss-log4j.xml.org"
-              file="${jboss.server.cspace}/conf/jboss-log4j.xml"
+            description="deploy common elements in ${jee.server.cspace}">
+		<!--
+        <copy tofile="${jee.server.cspace}/conf/jboss-log4j.xml.org"
+              file="${jee.server.cspace}/conf/jboss-log4j.xml"
               overwrite="false"/>
-
-        <copy tofile="${jboss.server.cspace}/conf/jboss-log4j.xml"
+        <copy tofile="${jee.server.cspace}/conf/jboss-log4j.xml"
               file="${src}/main/cspace/config/log/jboss-log4j.xml"
               overwrite="true"/>
-        <copy todir="${jboss.server.cspace}/conf"
-              file="${src}/main/cspace/config/log/jboss-log4j-release.xml"
-              />
-        <antcall target="deploy_jpa" />
+        <copy todir="${jee.server.cspace}/conf"
+              file="${src}/main/cspace/config/log/jboss-log4j-release.xml"/>
+		-->
         <antcall target="deploy_spring" />
         <antcall target="deploy_slf4j" />
         <antcall target="deploy_xmlmerge" />
     	
-        <copy todir="${jboss.server.cspace}/cspace/config/services">
+        <copy todir="${jee.server.cspace}/cspace/config/services">
             <fileset dir="${basedir}/src/main/cspace/config/services"/>
         </copy>
     	
     </target>
 
     <target name="undeploy"
-            description="undeploy common elements from ${jboss.server.cspace}">
+            description="undeploy common elements from ${jee.server.cspace}">
         <antcall target="undeploy_spring" />
 		<antcall target="undeploy_slf4j" />
-        <copy tofile="${jboss.server.cspace}/conf/jboss-log4j.xml"
-              file="${jboss.server.cspace}/conf/jboss-log4j.xml.org"
+		<antcall target="undeploy_xmlmerge" />
+		<!--
+        <copy tofile="${jee.server.cspace}/conf/jboss-log4j.xml"
+              file="${jee.server.cspace}/conf/jboss-log4j.xml.org"
               overwrite="true" failonerror="false" />
-        <delete failonerror="false" file="${jboss.server.cspace}/conf/jboss-log4j-release.xml"/>
-        <delete failonerror="false" dir="${jboss.server.cspace}/cspace/config/services"/>
+		-->
+		<!--
+        <delete failonerror="false" file="${jee.server.cspace}/conf/jboss-log4j-release.xml"/>
+		-->
+        <delete failonerror="false" dir="${jee.server.cspace}/cspace/config/services"/>
     </target>
 
     <target name="undeploy_spring"
-            description="undeploy spring binaries from ${jboss.server.cspace}">
+            description="undeploy spring binaries from ${jee.server.cspace}">
         <delete>
-            <fileset dir="${jboss.server.cspace}/lib" includes="org.springframework.*.jar"/>
-            <fileset dir="${jboss.server.cspace}/lib" includes="spring-security*.jar"/>
+            <fileset dir="${jee.server.cspace}/lib" includes="org.springframework.*.jar"/>
+            <fileset dir="${jee.server.cspace}/lib" includes="spring-security*.jar"/>
         </delete>
     </target>
 	
     <target name="undeploy_slf4j"
-            description="undeploy spring binaries from ${jboss.server.cspace}">
+            description="undeploy SLF4J binaries from ${jee.server.cspace}">
         <delete>
-            <fileset dir="${jboss.server.cspace}/lib" includes="slf4j*.jar"/>
+            <fileset dir="${jee.server.cspace}/lib" includes="slf4j*.jar"/>
         </delete>
     </target>
 	
-
-    <target name="dist_jpa"
-            description="dist jpa binaries in ${dist.server.cspace}">
-        <copy todir="${services.trunk}/${dist.server.cspace}/lib">
-            <fileset dir="${basedir}/lib/jpa-upgrade"/>
-        </copy>
-
+    <target name="undeploy_xmlmerge"
+            description="undeploy XMLMerge binaries from ${jee.server.cspace}">
+        <delete>
+            <fileset dir="${jee.server.cspace}/lib" includes="module-xml_merge*.jar"/>
+        </delete>
     </target>
-
+	
     <target name="dist_spring"
             description="dist spring binaries in ${dist.server.cspace}">
         <copy todir="${services.trunk}/${dist.server.cspace}/lib">
@@ -221,8 +208,6 @@
 
     <target name="dist"
             description="generate distribution for common elements" depends="package">
-        <antcall target="dist_jpa" />
-
         <antcall target="dist_spring" />
         <copy todir="${services.trunk}/${dist.server.cspace}/cspace/config/services">
             <fileset dir="${basedir}/src/main/cspace/config/services"/>
diff --git a/services/common/pom.xml b/services/common/pom.xml
index 47ed90aba..b9c4f8378 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>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/common/src/main/java/org/collectionspace/services/common/ServiceMain.java b/services/common/src/main/java/org/collectionspace/services/common/ServiceMain.java
index a0e9086bf..8dbd7fe42 100644
--- a/services/common/src/main/java/org/collectionspace/services/common/ServiceMain.java
+++ b/services/common/src/main/java/org/collectionspace/services/common/ServiceMain.java
@@ -132,7 +132,7 @@ public class ServiceMain {
     }
 
     private void initialize() throws Exception {
-    	if (logger.isDebugEnabled() == true) {
+    	if (logger.isTraceEnabled() == true) {
     		System.out.print("Pausing 5 seconds for you to attached the debugger");
     		long startTime, currentTime;
     		currentTime = startTime = System.currentTimeMillis();
diff --git a/services/contact/3rdparty/build.xml b/services/contact/3rdparty/build.xml
index 721aa765b..c564b60d1 100644
--- a/services/contact/3rdparty/build.xml
+++ b/services/contact/3rdparty/build.xml
@@ -107,12 +107,12 @@
     </target>
 
     <target name="deploy" depends="install"
-    description="deploy contact in ${jboss.server.nuxeo}">
+    description="deploy contact in ${jee.server.nuxeo}">
         <ant antfile="nuxeo-platform-cs-contact/build.xml" target="deploy" inheritall="false"/>
     </target>
 
     <target name="undeploy"
-    description="undeploy contact from ${jboss.server.nuxeo}">
+    description="undeploy contact from ${jee.server.nuxeo}">
         <ant antfile="nuxeo-platform-cs-contact/build.xml" target="undeploy" inheritall="false"/>
     </target>
 
diff --git a/services/contact/3rdparty/nuxeo-platform-cs-contact/build.xml b/services/contact/3rdparty/nuxeo-platform-cs-contact/build.xml
index a5ce14f84..308221de5 100644
--- a/services/contact/3rdparty/nuxeo-platform-cs-contact/build.xml
+++ b/services/contact/3rdparty/nuxeo-platform-cs-contact/build.xml
@@ -115,19 +115,19 @@
     </target>
 
     <target name="deploy" depends="install"
-        description="deploy contact doctype in ${jboss.server.nuxeo}">
+        description="deploy contact doctype in ${jee.server.nuxeo}">
         <copy file="${basedir}/target/${nuxeo.contact.jar}"
-        todir="${jboss.deploy.nuxeo.plugins}"/>
+        todir="${jee.deploy.nuxeo.plugins}"/>
     </target>
 
     <target name="undeploy"
-        description="undeploy contact doctype from ${jboss.server.nuxeo}">
+        description="undeploy contact doctype from ${jee.server.nuxeo}">
         <delete>
-            <fileset dir="${jboss.deploy.nuxeo.plugins}">
+            <fileset dir="${jee.deploy.nuxeo.plugins}">
                 <include name="${nuxeo.contact.jars.all}"/>
             </fileset>
             <!-- Legacy deployment location through release 0.6 -->
-            <fileset dir="${jboss.deploy.nuxeo.system}">
+            <fileset dir="${jee.deploy.nuxeo.system}">
                 <include name="${nuxeo.contact.jars.all}"/>
             </fileset>
         </delete>
diff --git a/services/contact/3rdparty/nuxeo-platform-cs-contact/pom.xml b/services/contact/3rdparty/nuxeo-platform-cs-contact/pom.xml
index d934ded75..589ce13f1 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>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/contact/3rdparty/pom.xml b/services/contact/3rdparty/pom.xml
index cf91829d5..9dd704a50 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>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/contact/client/pom.xml b/services/contact/client/pom.xml
index 8844ab030..472fc44da 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>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/contact/jaxb/pom.xml b/services/contact/jaxb/pom.xml
index a3b45b781..32775e0ec 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>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/contact/pom.xml b/services/contact/pom.xml
index 1e8c9e041..5a9030be2 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>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/contact/service/pom.xml b/services/contact/service/pom.xml
index 3372cfbac..e0557eaf1 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>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/dimension/3rdparty/build.xml b/services/dimension/3rdparty/build.xml
index b64c0b630..f57360ccf 100644
--- a/services/dimension/3rdparty/build.xml
+++ b/services/dimension/3rdparty/build.xml
@@ -107,12 +107,12 @@
     </target>
 
     <target name="deploy" depends="install"
-    description="deploy dimension in ${jboss.server.nuxeo}">
+    description="deploy dimension in ${jee.server.nuxeo}">
         <ant antfile="nuxeo-platform-cs-dimension/build.xml" target="deploy" inheritall="false"/>
     </target>
 
     <target name="undeploy"
-    description="undeploy dimension from ${jboss.server.nuxeo}">
+    description="undeploy dimension from ${jee.server.nuxeo}">
         <ant antfile="nuxeo-platform-cs-dimension/build.xml" target="undeploy" inheritall="false"/>
     </target>
 
diff --git a/services/dimension/3rdparty/nuxeo-platform-cs-dimension/build.xml b/services/dimension/3rdparty/nuxeo-platform-cs-dimension/build.xml
index 647c71fc7..139ecc335 100644
--- a/services/dimension/3rdparty/nuxeo-platform-cs-dimension/build.xml
+++ b/services/dimension/3rdparty/nuxeo-platform-cs-dimension/build.xml
@@ -115,19 +115,19 @@
     </target>
 
     <target name="deploy" depends="install"
-        description="deploy dimension doctype in ${jboss.server.nuxeo}">
+        description="deploy dimension doctype in ${jee.server.nuxeo}">
         <copy file="${basedir}/target/${nuxeo.dimension.jar}"
-        todir="${jboss.deploy.nuxeo.plugins}"/>
+        todir="${jee.deploy.nuxeo.plugins}"/>
     </target>
 
     <target name="undeploy"
-        description="undeploy dimension doctype from ${jboss.server.nuxeo}">
+        description="undeploy dimension doctype from ${jee.server.nuxeo}">
         <delete>
-            <fileset dir="${jboss.deploy.nuxeo.plugins}">
+            <fileset dir="${jee.deploy.nuxeo.plugins}">
                 <include name="${nuxeo.dimension.jars.all}"/>
             </fileset>
             <!-- Legacy deployment location through release 0.6 -->
-            <fileset dir="${jboss.deploy.nuxeo.system}">
+            <fileset dir="${jee.deploy.nuxeo.system}">
                 <include name="${nuxeo.dimension.jars.all}"/>
             </fileset>
         </delete>
diff --git a/services/dimension/3rdparty/nuxeo-platform-cs-dimension/pom.xml b/services/dimension/3rdparty/nuxeo-platform-cs-dimension/pom.xml
index 55c1fed45..4958e5cfa 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>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/dimension/3rdparty/pom.xml b/services/dimension/3rdparty/pom.xml
index a1d437f12..39b87e94a 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>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/dimension/client/pom.xml b/services/dimension/client/pom.xml
index 032e94791..952902fa1 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>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/dimension/jaxb/pom.xml b/services/dimension/jaxb/pom.xml
index 816ecb6fc..e84c05c9b 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>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/dimension/pom.xml b/services/dimension/pom.xml
index 35654b915..f78a419eb 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>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/dimension/service/pom.xml b/services/dimension/service/pom.xml
index 7f96a6d07..ef72d6d51 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>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/group/3rdparty/build.xml b/services/group/3rdparty/build.xml
index 59882a47d..9d157281e 100644
--- a/services/group/3rdparty/build.xml
+++ b/services/group/3rdparty/build.xml
@@ -109,12 +109,12 @@
     </target>
 
     <target name="deploy" depends="install"
-    description="deploy group in ${jboss.server.nuxeo}">
+    description="deploy group in ${jee.server.nuxeo}">
         <ant antfile="nuxeo-platform-cs-group/build.xml" target="deploy" inheritall="false"/>
     </target>
 
     <target name="undeploy"
-    description="undeploy group from ${jboss.server.nuxeo}">
+    description="undeploy group from ${jee.server.nuxeo}">
         <ant antfile="nuxeo-platform-cs-group/build.xml" target="undeploy" inheritall="false"/>
     </target>
 
diff --git a/services/group/3rdparty/nuxeo-platform-cs-group/build.xml b/services/group/3rdparty/nuxeo-platform-cs-group/build.xml
index 03f1a75a7..efa1a635a 100644
--- a/services/group/3rdparty/nuxeo-platform-cs-group/build.xml
+++ b/services/group/3rdparty/nuxeo-platform-cs-group/build.xml
@@ -113,19 +113,19 @@
     </target>
 
     <target name="deploy" depends="install"
-        description="deploy group doctype in ${jboss.server.nuxeo}">
+        description="deploy group doctype in ${jee.server.nuxeo}">
         <copy file="${basedir}/target/${nuxeo.group.jar}"
-        todir="${jboss.deploy.nuxeo.plugins}"/>
+        todir="${jee.deploy.nuxeo.plugins}"/>
     </target>
 
     <target name="undeploy"
-        description="undeploy group doctype from ${jboss.server.nuxeo}">
+        description="undeploy group doctype from ${jee.server.nuxeo}">
         <delete>
-            <fileset dir="${jboss.deploy.nuxeo.plugins}">
+            <fileset dir="${jee.deploy.nuxeo.plugins}">
                 <include name="${nuxeo.group.jars.all}"/>
             </fileset>
             <!-- Legacy deployment location through release 0.6 -->
-            <fileset dir="${jboss.deploy.nuxeo.system}">
+            <fileset dir="${jee.deploy.nuxeo.system}">
                 <include name="${nuxeo.group.jars.all}"/>
             </fileset>
         </delete>
diff --git a/services/group/3rdparty/nuxeo-platform-cs-group/pom.xml b/services/group/3rdparty/nuxeo-platform-cs-group/pom.xml
index f7be7faa9..f52f71242 100644
--- a/services/group/3rdparty/nuxeo-platform-cs-group/pom.xml
+++ b/services/group/3rdparty/nuxeo-platform-cs-group/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.group.3rdparty</artifactId>
-        <version>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/group/3rdparty/pom.xml b/services/group/3rdparty/pom.xml
index 7b434f804..9eb02dbf0 100644
--- a/services/group/3rdparty/pom.xml
+++ b/services/group/3rdparty/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>org.collectionspace.services.group</artifactId>
         <groupId>org.collectionspace.services</groupId>
-        <version>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/group/client/pom.xml b/services/group/client/pom.xml
index 5c18f78a7..8feb78311 100644
--- a/services/group/client/pom.xml
+++ b/services/group/client/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.group</artifactId>
-        <version>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/group/jaxb/pom.xml b/services/group/jaxb/pom.xml
index bfee936d5..10cf3da9e 100644
--- a/services/group/jaxb/pom.xml
+++ b/services/group/jaxb/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>org.collectionspace.services.group</artifactId>
         <groupId>org.collectionspace.services</groupId>
-        <version>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/group/pom.xml b/services/group/pom.xml
index 15b84f841..039f13b31 100644
--- a/services/group/pom.xml
+++ b/services/group/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.main</artifactId>
-        <version>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/group/service/pom.xml b/services/group/service/pom.xml
index e1027372b..f51d6c914 100644
--- a/services/group/service/pom.xml
+++ b/services/group/service/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.group</artifactId>        
-        <version>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/hyperjaxb/pom.xml b/services/hyperjaxb/pom.xml
index 39a9a4311..bebbae3d4 100644
--- a/services/hyperjaxb/pom.xml
+++ b/services/hyperjaxb/pom.xml
@@ -26,7 +26,7 @@
   <parent>
     <groupId>org.collectionspace.services</groupId>
     <artifactId>org.collectionspace.services.main</artifactId>
-    <version>1.14-SNAPSHOT</version>
+    <version>2.0-SNAPSHOT</version>
   </parent>
   
   <modelVersion>4.0.0</modelVersion>
diff --git a/services/id/3rdparty/pom.xml b/services/id/3rdparty/pom.xml
index fcb054df9..0fa5e7e45 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>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
         
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/id/client/pom.xml b/services/id/client/pom.xml
index b3499bf27..0206fb2bf 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>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
@@ -22,7 +22,7 @@
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.id.service</artifactId>
-            <version>1.14-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>test</scope>
             <type>jar</type>
         </dependency>
diff --git a/services/id/jaxb/pom.xml b/services/id/jaxb/pom.xml
index 1c130c983..27321bb87 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>1.14-SNAPSHOT</version>
+    <version>2.0-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/services/id/pom.xml b/services/id/pom.xml
index 42535ac0b..dedb716e3 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>1.14-SNAPSHOT</version>
+    <version>2.0-SNAPSHOT</version>
   </parent>
   
   <modelVersion>4.0.0</modelVersion>
diff --git a/services/id/service/build.xml b/services/id/service/build.xml
index 3004393bb..5e069ac74 100644
--- a/services/id/service/build.xml
+++ b/services/id/service/build.xml
@@ -131,7 +131,7 @@
 
     <target name="deploy" depends="install"
     description="deploy id service">
-        <copy todir="${jboss.server.cspace}/cspace/services">
+        <copy todir="${jee.server.cspace}/cspace/services">
             <fileset dir="${src}/main/resources/"/>
         </copy>
     </target>
diff --git a/services/id/service/pom.xml b/services/id/service/pom.xml
index 6a202537e..7847549dd 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>1.14-SNAPSHOT</version>
+    <version>2.0-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/services/imports/3rdparty/build.xml b/services/imports/3rdparty/build.xml
index 4ba4cfc58..1c264e772 100755
--- a/services/imports/3rdparty/build.xml
+++ b/services/imports/3rdparty/build.xml
@@ -109,12 +109,12 @@
     </target>
 
     <target name="deploy" depends="install"
-    description="deploy imports in ${jboss.server.nuxeo}">
+    description="deploy imports in ${jee.server.nuxeo}">
         <ant antfile="nuxeo-platform-cs-imports/build.xml" target="deploy" inheritall="false"/>
     </target>
 
     <target name="undeploy"
-    description="undeploy imports from ${jboss.server.nuxeo}">
+    description="undeploy imports from ${jee.server.nuxeo}">
         <ant antfile="nuxeo-platform-cs-imports/build.xml" target="undeploy" inheritall="false"/>
     </target>
 
diff --git a/services/imports/3rdparty/nuxeo-platform-cs-imports/build.xml b/services/imports/3rdparty/nuxeo-platform-cs-imports/build.xml
index 6c38f00f1..de9fe342e 100755
--- a/services/imports/3rdparty/nuxeo-platform-cs-imports/build.xml
+++ b/services/imports/3rdparty/nuxeo-platform-cs-imports/build.xml
@@ -113,19 +113,19 @@
     </target>
 
     <target name="deploy" depends="install"
-        description="deploy imports doctype in ${jboss.server.nuxeo}">
+        description="deploy imports doctype in ${jee.server.nuxeo}">
         <copy file="${basedir}/target/${nuxeo.imports.jar}"
-        todir="${jboss.deploy.nuxeo.plugins}"/>
+        todir="${jee.deploy.nuxeo.plugins}"/>
     </target>
 
     <target name="undeploy"
-        description="undeploy imports doctype from ${jboss.server.nuxeo}">
+        description="undeploy imports doctype from ${jee.server.nuxeo}">
         <delete>
-            <fileset dir="${jboss.deploy.nuxeo.plugins}">
+            <fileset dir="${jee.deploy.nuxeo.plugins}">
                 <include name="${nuxeo.imports.jars.all}"/>
             </fileset>
             <!-- Legacy deployment location through release 0.6 -->
-            <fileset dir="${jboss.deploy.nuxeo.system}">
+            <fileset dir="${jee.deploy.nuxeo.system}">
                 <include name="${nuxeo.imports.jars.all}"/>
             </fileset>
         </delete>
diff --git a/services/imports/3rdparty/nuxeo-platform-cs-imports/pom.xml b/services/imports/3rdparty/nuxeo-platform-cs-imports/pom.xml
index f017e822b..ab9442505 100755
--- a/services/imports/3rdparty/nuxeo-platform-cs-imports/pom.xml
+++ b/services/imports/3rdparty/nuxeo-platform-cs-imports/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.imports.3rdparty</artifactId>
-        <version>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/imports/3rdparty/pom.xml b/services/imports/3rdparty/pom.xml
index bd217b96a..eea5c5ae0 100755
--- a/services/imports/3rdparty/pom.xml
+++ b/services/imports/3rdparty/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>org.collectionspace.services.imports</artifactId>
         <groupId>org.collectionspace.services</groupId>
-        <version>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/imports/build.xml b/services/imports/build.xml
index c3782e191..bcbc64719 100755
--- a/services/imports/build.xml
+++ b/services/imports/build.xml
@@ -110,7 +110,7 @@
     description="deploy imports service">
         <ant antfile="3rdparty/build.xml" target="deploy" inheritall="false"/>
     	<!-- REM - This logic should be pushed down into the "service" module -->
-    	<copy todir="${jboss.server.cspace}/cspace/config/services/resources/templates">
+    	<copy todir="${jee.server.cspace}/cspace/config/services/resources/templates">
             <fileset dir="${basedir}/service/src/main/resources/templates"/>
         </copy>
     </target>
diff --git a/services/imports/jaxb/pom.xml b/services/imports/jaxb/pom.xml
index 8b134b913..9bf23e5ff 100755
--- a/services/imports/jaxb/pom.xml
+++ b/services/imports/jaxb/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>org.collectionspace.services.imports</artifactId>
         <groupId>org.collectionspace.services</groupId>
-        <version>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/imports/pom.xml b/services/imports/pom.xml
index f6ade6a2d..4b2d32c49 100755
--- a/services/imports/pom.xml
+++ b/services/imports/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.main</artifactId>
-        <version>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/imports/service/pom.xml b/services/imports/service/pom.xml
index e2384d372..3a8eb0b03 100755
--- a/services/imports/service/pom.xml
+++ b/services/imports/service/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.imports</artifactId>        
-        <version>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/intake/3rdparty/build.xml b/services/intake/3rdparty/build.xml
index 2332b0d59..68ad666d5 100644
--- a/services/intake/3rdparty/build.xml
+++ b/services/intake/3rdparty/build.xml
@@ -109,12 +109,12 @@
     </target>
 
     <target name="deploy" depends="install"
-    description="deploy intake in ${jboss.server.nuxeo}">
+    description="deploy intake in ${jee.server.nuxeo}">
         <ant antfile="nuxeo-platform-cs-intake/build.xml" target="deploy" inheritall="false"/>
     </target>
 
     <target name="undeploy"
-    description="undeploy intake from ${jboss.server.nuxeo}">
+    description="undeploy intake from ${jee.server.nuxeo}">
         <ant antfile="nuxeo-platform-cs-intake/build.xml" target="undeploy" inheritall="false"/>
     </target>
 
diff --git a/services/intake/3rdparty/nuxeo-platform-cs-intake/build.xml b/services/intake/3rdparty/nuxeo-platform-cs-intake/build.xml
index 8eb9f1a05..e3750faa9 100644
--- a/services/intake/3rdparty/nuxeo-platform-cs-intake/build.xml
+++ b/services/intake/3rdparty/nuxeo-platform-cs-intake/build.xml
@@ -113,19 +113,19 @@
     </target>
 
     <target name="deploy" depends="install"
-        description="deploy intake doctype in ${jboss.server.nuxeo}">
+        description="deploy intake doctype in ${jee.server.nuxeo}">
         <copy file="${basedir}/target/${nuxeo.intake.jar}"
-        todir="${jboss.deploy.nuxeo.plugins}"/>
+        todir="${jee.deploy.nuxeo.plugins}"/>
     </target>
 
     <target name="undeploy"
-        description="undeploy intake doctype from ${jboss.server.nuxeo}">
+        description="undeploy intake doctype from ${jee.server.nuxeo}">
         <delete>
-            <fileset dir="${jboss.deploy.nuxeo.plugins}">
+            <fileset dir="${jee.deploy.nuxeo.plugins}">
                 <include name="${nuxeo.intake.jars.all}"/>
             </fileset>
             <!-- Legacy deployment location through release 0.6 -->
-            <fileset dir="${jboss.deploy.nuxeo.system}">
+            <fileset dir="${jee.deploy.nuxeo.system}">
                 <include name="${nuxeo.intake.jars.all}"/>
             </fileset>
         </delete>
diff --git a/services/intake/3rdparty/nuxeo-platform-cs-intake/pom.xml b/services/intake/3rdparty/nuxeo-platform-cs-intake/pom.xml
index 31e43b9d9..344661938 100644
--- a/services/intake/3rdparty/nuxeo-platform-cs-intake/pom.xml
+++ b/services/intake/3rdparty/nuxeo-platform-cs-intake/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.intake.3rdparty</artifactId>
-        <version>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/intake/3rdparty/pom.xml b/services/intake/3rdparty/pom.xml
index cb640fbf2..0d8f4dd42 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>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/intake/client/pom.xml b/services/intake/client/pom.xml
index 74ce9e9c4..86b57a3dd 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>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/intake/jaxb/pom.xml b/services/intake/jaxb/pom.xml
index 96c24c295..869cd9ce2 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>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/intake/pom.xml b/services/intake/pom.xml
index bff983dac..edc0b955c 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>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/intake/service/pom.xml b/services/intake/service/pom.xml
index 18e1aa726..4df78a38f 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>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/jaxb/pom.xml b/services/jaxb/pom.xml
index 4fc90d906..1cdbb7bf8 100644
--- a/services/jaxb/pom.xml
+++ b/services/jaxb/pom.xml
@@ -14,7 +14,7 @@
 	<parent>
 		<groupId>org.collectionspace.services</groupId>
 		<artifactId>org.collectionspace.services.main</artifactId>
-		<version>1.14-SNAPSHOT</version>
+		<version>2.0-SNAPSHOT</version>
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>
diff --git a/services/loanin/3rdparty/build.xml b/services/loanin/3rdparty/build.xml
index 8acd301e1..559b5d89e 100644
--- a/services/loanin/3rdparty/build.xml
+++ b/services/loanin/3rdparty/build.xml
@@ -109,12 +109,12 @@
     </target>
 
     <target name="deploy" depends="install"
-    description="deploy loanin in ${jboss.server.nuxeo}">
+    description="deploy loanin in ${jee.server.nuxeo}">
         <ant antfile="nuxeo-platform-cs-loanin/build.xml" target="deploy" inheritall="false"/>
     </target>
 
     <target name="undeploy"
-    description="undeploy loanin from ${jboss.server.nuxeo}">
+    description="undeploy loanin from ${jee.server.nuxeo}">
         <ant antfile="nuxeo-platform-cs-loanin/build.xml" target="undeploy" inheritall="false"/>
     </target>
 
diff --git a/services/loanin/3rdparty/nuxeo-platform-cs-loanin/build.xml b/services/loanin/3rdparty/nuxeo-platform-cs-loanin/build.xml
index fe213ee0a..2bccf241d 100644
--- a/services/loanin/3rdparty/nuxeo-platform-cs-loanin/build.xml
+++ b/services/loanin/3rdparty/nuxeo-platform-cs-loanin/build.xml
@@ -113,19 +113,19 @@
     </target>
 
     <target name="deploy" depends="install"
-        description="deploy loanin doctype in ${jboss.server.nuxeo}">
+        description="deploy loanin doctype in ${jee.server.nuxeo}">
         <copy file="${basedir}/target/${nuxeo.loanin.jar}"
-        todir="${jboss.deploy.nuxeo.plugins}"/>
+        todir="${jee.deploy.nuxeo.plugins}"/>
     </target>
 
     <target name="undeploy"
-        description="undeploy loanin doctype from ${jboss.server.nuxeo}">
+        description="undeploy loanin doctype from ${jee.server.nuxeo}">
         <delete>
-            <fileset dir="${jboss.deploy.nuxeo.plugins}">
+            <fileset dir="${jee.deploy.nuxeo.plugins}">
                 <include name="${nuxeo.loanin.jars.all}"/>
             </fileset>
             <!-- Legacy deployment location through release 0.6 -->
-            <fileset dir="${jboss.deploy.nuxeo.system}">
+            <fileset dir="${jee.deploy.nuxeo.system}">
                 <include name="${nuxeo.loanin.jars.all}"/>
             </fileset>
         </delete>
diff --git a/services/loanin/3rdparty/nuxeo-platform-cs-loanin/pom.xml b/services/loanin/3rdparty/nuxeo-platform-cs-loanin/pom.xml
index b1d88dc4c..6b3ce3446 100644
--- a/services/loanin/3rdparty/nuxeo-platform-cs-loanin/pom.xml
+++ b/services/loanin/3rdparty/nuxeo-platform-cs-loanin/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.loanin.3rdparty</artifactId>
-        <version>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/loanin/3rdparty/pom.xml b/services/loanin/3rdparty/pom.xml
index ec5578777..f4b53683c 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>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/loanin/client/pom.xml b/services/loanin/client/pom.xml
index f6c83afc2..1b81d312b 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>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/loanin/jaxb/pom.xml b/services/loanin/jaxb/pom.xml
index 9d2956962..fad1fd541 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>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/loanin/pom.xml b/services/loanin/pom.xml
index b756f6a1e..ca7973790 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>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/loanin/service/pom.xml b/services/loanin/service/pom.xml
index aac35f11c..bb9dff5d5 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>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/loanout/3rdparty/build.xml b/services/loanout/3rdparty/build.xml
index 4a351d9c3..0457d6473 100644
--- a/services/loanout/3rdparty/build.xml
+++ b/services/loanout/3rdparty/build.xml
@@ -109,12 +109,12 @@
     </target>
 
     <target name="deploy" depends="install"
-    description="deploy loanout in ${jboss.server.nuxeo}">
+    description="deploy loanout in ${jee.server.nuxeo}">
         <ant antfile="nuxeo-platform-cs-loanout/build.xml" target="deploy" inheritall="false"/>
     </target>
 
     <target name="undeploy"
-    description="undeploy loanout from ${jboss.server.nuxeo}">
+    description="undeploy loanout from ${jee.server.nuxeo}">
         <ant antfile="nuxeo-platform-cs-loanout/build.xml" target="undeploy" inheritall="false"/>
     </target>
 
diff --git a/services/loanout/3rdparty/nuxeo-platform-cs-loanout/build.xml b/services/loanout/3rdparty/nuxeo-platform-cs-loanout/build.xml
index 0ccd3bbaf..aaf4a9b7f 100644
--- a/services/loanout/3rdparty/nuxeo-platform-cs-loanout/build.xml
+++ b/services/loanout/3rdparty/nuxeo-platform-cs-loanout/build.xml
@@ -113,19 +113,19 @@
     </target>
 
     <target name="deploy" depends="install"
-        description="deploy loanout doctype in ${jboss.server.nuxeo}">
+        description="deploy loanout doctype in ${jee.server.nuxeo}">
         <copy file="${basedir}/target/${nuxeo.loanout.jar}"
-        todir="${jboss.deploy.nuxeo.plugins}"/>
+        todir="${jee.deploy.nuxeo.plugins}"/>
     </target>
 
     <target name="undeploy"
-        description="undeploy loanout doctype from ${jboss.server.nuxeo}">
+        description="undeploy loanout doctype from ${jee.server.nuxeo}">
         <delete>
-            <fileset dir="${jboss.deploy.nuxeo.plugins}">
+            <fileset dir="${jee.deploy.nuxeo.plugins}">
                 <include name="${nuxeo.loanout.jars.all}"/>
             </fileset>
             <!-- Legacy deployment location through release 0.6 -->
-            <fileset dir="${jboss.deploy.nuxeo.system}">
+            <fileset dir="${jee.deploy.nuxeo.system}">
                 <include name="${nuxeo.loanout.jars.all}"/>
             </fileset>
         </delete>
diff --git a/services/loanout/3rdparty/nuxeo-platform-cs-loanout/pom.xml b/services/loanout/3rdparty/nuxeo-platform-cs-loanout/pom.xml
index 353eca1f4..9f9e4e7b8 100644
--- a/services/loanout/3rdparty/nuxeo-platform-cs-loanout/pom.xml
+++ b/services/loanout/3rdparty/nuxeo-platform-cs-loanout/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.loanout.3rdparty</artifactId>
-        <version>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/loanout/3rdparty/pom.xml b/services/loanout/3rdparty/pom.xml
index 0d18891bd..3df4878d5 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>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/loanout/client/pom.xml b/services/loanout/client/pom.xml
index 376042377..1a9818861 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>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/loanout/jaxb/pom.xml b/services/loanout/jaxb/pom.xml
index 30e298d4c..c02eb3206 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>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/loanout/pom.xml b/services/loanout/pom.xml
index 189f6e8e8..ab5dab298 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>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/loanout/service/pom.xml b/services/loanout/service/pom.xml
index 5446bf33d..8ec92f9b0 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>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/location/3rdparty/build.xml b/services/location/3rdparty/build.xml
index fdc140c02..6396bc525 100644
--- a/services/location/3rdparty/build.xml
+++ b/services/location/3rdparty/build.xml
@@ -109,12 +109,12 @@
     </target>
 
     <target name="deploy" depends="install"
-    description="deploy location in ${jboss.server.nuxeo}">
+    description="deploy location in ${jee.server.nuxeo}">
         <ant antfile="nuxeo-platform-cs-location/build.xml" target="deploy" inheritall="false"/>
     </target>
 
     <target name="undeploy"
-    description="undeploy location from ${jboss.server.nuxeo}">
+    description="undeploy location from ${jee.server.nuxeo}">
         <ant antfile="nuxeo-platform-cs-location/build.xml" target="undeploy" inheritall="false"/>
     </target>
 
diff --git a/services/location/3rdparty/nuxeo-platform-cs-location/build.xml b/services/location/3rdparty/nuxeo-platform-cs-location/build.xml
index c0a26cd3c..54df2fbe9 100644
--- a/services/location/3rdparty/nuxeo-platform-cs-location/build.xml
+++ b/services/location/3rdparty/nuxeo-platform-cs-location/build.xml
@@ -113,19 +113,19 @@
     </target>
 
     <target name="deploy" depends="install"
-        description="deploy location doctype in ${jboss.server.nuxeo}">
+        description="deploy location doctype in ${jee.server.nuxeo}">
         <copy file="${basedir}/target/${nuxeo.location.jar}"
-        todir="${jboss.deploy.nuxeo.plugins}"/>
+        todir="${jee.deploy.nuxeo.plugins}"/>
     </target>
 
     <target name="undeploy"
-        description="undeploy location doctype from ${jboss.server.nuxeo}">
+        description="undeploy location doctype from ${jee.server.nuxeo}">
         <delete>
-            <fileset dir="${jboss.deploy.nuxeo.plugins}">
+            <fileset dir="${jee.deploy.nuxeo.plugins}">
                 <include name="${nuxeo.location.jars.all}"/>
             </fileset>
             <!-- Legacy deployment location through release 0.6 -->
-            <fileset dir="${jboss.deploy.nuxeo.system}">
+            <fileset dir="${jee.deploy.nuxeo.system}">
                 <include name="${nuxeo.location.jars.all}"/>
             </fileset>
         </delete>
diff --git a/services/location/3rdparty/nuxeo-platform-cs-location/pom.xml b/services/location/3rdparty/nuxeo-platform-cs-location/pom.xml
index 27f104689..36c4d3336 100644
--- a/services/location/3rdparty/nuxeo-platform-cs-location/pom.xml
+++ b/services/location/3rdparty/nuxeo-platform-cs-location/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.location.3rdparty</artifactId>
-        <version>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/location/3rdparty/pom.xml b/services/location/3rdparty/pom.xml
index fcf8cf12e..358322478 100644
--- a/services/location/3rdparty/pom.xml
+++ b/services/location/3rdparty/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.location</artifactId>
-        <version>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/location/client/pom.xml b/services/location/client/pom.xml
index 8a18152ca..ad7893b7a 100644
--- a/services/location/client/pom.xml
+++ b/services/location/client/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.location</artifactId>
-        <version>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/location/installer/build.xml b/services/location/installer/build.xml
index 3f8be51d8..6e46bd1b0 100644
--- a/services/location/installer/build.xml
+++ b/services/location/installer/build.xml
@@ -21,7 +21,7 @@
         		<arg value="Installer: Executing location Service's &apos;install&apos; target." />
 				</exec>
 				<!-- Copy the Nuxeo DocType jar files to the Nuxeo app server domain -->
-        <copy todir="${jboss.deploy.nuxeo.plugins}">
+        <copy todir="${jee.deploy.nuxeo.plugins}">
             <fileset file="nuxeo/*.jar"/>
         </copy>				
     </target>    
diff --git a/services/location/jaxb/pom.xml b/services/location/jaxb/pom.xml
index 3c47a6ff7..0a09631dd 100644
--- a/services/location/jaxb/pom.xml
+++ b/services/location/jaxb/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.location</artifactId>
-        <version>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/location/pom.xml b/services/location/pom.xml
index 4dae7693d..d3b91f058 100644
--- a/services/location/pom.xml
+++ b/services/location/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.main</artifactId>
-        <version>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/location/service/pom.xml b/services/location/service/pom.xml
index dc624b15e..a2cf6891c 100644
--- a/services/location/service/pom.xml
+++ b/services/location/service/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.location</artifactId>
-        <version>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/media/3rdparty/build.xml b/services/media/3rdparty/build.xml
index a074d60ed..61bc6becd 100644
--- a/services/media/3rdparty/build.xml
+++ b/services/media/3rdparty/build.xml
@@ -109,12 +109,12 @@
     </target>
 
     <target name="deploy" depends="install"
-    description="deploy media in ${jboss.server.nuxeo}">
+    description="deploy media in ${jee.server.nuxeo}">
         <ant antfile="nuxeo-platform-cs-media/build.xml" target="deploy" inheritall="false"/>
     </target>
 
     <target name="undeploy"
-    description="undeploy media from ${jboss.server.nuxeo}">
+    description="undeploy media from ${jee.server.nuxeo}">
         <ant antfile="nuxeo-platform-cs-media/build.xml" target="undeploy" inheritall="false"/>
     </target>
 
diff --git a/services/media/3rdparty/nuxeo-platform-cs-media/build.xml b/services/media/3rdparty/nuxeo-platform-cs-media/build.xml
index 1c2ee8e3f..87427cac4 100644
--- a/services/media/3rdparty/nuxeo-platform-cs-media/build.xml
+++ b/services/media/3rdparty/nuxeo-platform-cs-media/build.xml
@@ -113,19 +113,19 @@
     </target>
 
     <target name="deploy" depends="install"
-        description="deploy media doctype in ${jboss.server.nuxeo}">
+        description="deploy media doctype in ${jee.server.nuxeo}">
         <copy file="${basedir}/target/${nuxeo.media.jar}"
-        todir="${jboss.deploy.nuxeo.plugins}"/>
+        todir="${jee.deploy.nuxeo.plugins}"/>
     </target>
 
     <target name="undeploy"
-        description="undeploy media doctype from ${jboss.server.nuxeo}">
+        description="undeploy media doctype from ${jee.server.nuxeo}">
         <delete>
-            <fileset dir="${jboss.deploy.nuxeo.plugins}">
+            <fileset dir="${jee.deploy.nuxeo.plugins}">
                 <include name="${nuxeo.media.jars.all}"/>
             </fileset>
             <!-- Legacy deployment location through release 0.6 -->
-            <fileset dir="${jboss.deploy.nuxeo.system}">
+            <fileset dir="${jee.deploy.nuxeo.system}">
                 <include name="${nuxeo.media.jars.all}"/>
             </fileset>
         </delete>
diff --git a/services/media/3rdparty/nuxeo-platform-cs-media/pom.xml b/services/media/3rdparty/nuxeo-platform-cs-media/pom.xml
index 70743f961..1d91c5c12 100644
--- a/services/media/3rdparty/nuxeo-platform-cs-media/pom.xml
+++ b/services/media/3rdparty/nuxeo-platform-cs-media/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.media.3rdparty</artifactId>
-        <version>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/media/3rdparty/pom.xml b/services/media/3rdparty/pom.xml
index d0f851e94..37bc7db0c 100644
--- a/services/media/3rdparty/pom.xml
+++ b/services/media/3rdparty/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>org.collectionspace.services.media</artifactId>
         <groupId>org.collectionspace.services</groupId>
-        <version>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/media/client/pom.xml b/services/media/client/pom.xml
index 29dadefe8..127a9a019 100644
--- a/services/media/client/pom.xml
+++ b/services/media/client/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.media</artifactId>
-        <version>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/media/jaxb/pom.xml b/services/media/jaxb/pom.xml
index 65808457d..b137ba058 100644
--- a/services/media/jaxb/pom.xml
+++ b/services/media/jaxb/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>org.collectionspace.services.media</artifactId>
         <groupId>org.collectionspace.services</groupId>
-        <version>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/media/pom.xml b/services/media/pom.xml
index 33a6d4246..3cc7f10af 100644
--- a/services/media/pom.xml
+++ b/services/media/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.main</artifactId>
-        <version>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>
@@ -17,7 +17,9 @@
         <module>jaxb</module>
         <module>service</module>
         <module>3rdparty</module>
+        <!-- Not working with embedded Nuxeo EP instance on Tomcat
         <module>client</module>
+         -->
     </modules>
 
 </project>
diff --git a/services/media/service/pom.xml b/services/media/service/pom.xml
index 334bcce6c..88a20899c 100644
--- a/services/media/service/pom.xml
+++ b/services/media/service/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.media</artifactId>        
-        <version>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/movement/3rdparty/build.xml b/services/movement/3rdparty/build.xml
index 9f9da0488..710ac6531 100644
--- a/services/movement/3rdparty/build.xml
+++ b/services/movement/3rdparty/build.xml
@@ -109,12 +109,12 @@
     </target>
 
     <target name="deploy" depends="install"
-    description="deploy movement in ${jboss.server.nuxeo}">
+    description="deploy movement in ${jee.server.nuxeo}">
         <ant antfile="nuxeo-platform-cs-movement/build.xml" target="deploy" inheritall="false"/>
     </target>
 
     <target name="undeploy"
-    description="undeploy movement from ${jboss.server.nuxeo}">
+    description="undeploy movement from ${jee.server.nuxeo}">
         <ant antfile="nuxeo-platform-cs-movement/build.xml" target="undeploy" inheritall="false"/>
     </target>
 
diff --git a/services/movement/3rdparty/nuxeo-platform-cs-movement/build.xml b/services/movement/3rdparty/nuxeo-platform-cs-movement/build.xml
index a37c3c06a..8b3255a24 100644
--- a/services/movement/3rdparty/nuxeo-platform-cs-movement/build.xml
+++ b/services/movement/3rdparty/nuxeo-platform-cs-movement/build.xml
@@ -113,19 +113,19 @@
     </target>
 
     <target name="deploy" depends="install"
-        description="deploy movement doctype in ${jboss.server.nuxeo}">
+        description="deploy movement doctype in ${jee.server.nuxeo}">
         <copy file="${basedir}/target/${nuxeo.movement.jar}"
-        todir="${jboss.deploy.nuxeo.plugins}"/>
+        todir="${jee.deploy.nuxeo.plugins}"/>
     </target>
 
     <target name="undeploy"
-        description="undeploy movement doctype from ${jboss.server.nuxeo}">
+        description="undeploy movement doctype from ${jee.server.nuxeo}">
         <delete>
-            <fileset dir="${jboss.deploy.nuxeo.plugins}">
+            <fileset dir="${jee.deploy.nuxeo.plugins}">
                 <include name="${nuxeo.movement.jars.all}"/>
             </fileset>
             <!-- Legacy deployment location through release 0.6 -->
-            <fileset dir="${jboss.deploy.nuxeo.system}">
+            <fileset dir="${jee.deploy.nuxeo.system}">
                 <include name="${nuxeo.movement.jars.all}"/>
             </fileset>
         </delete>
diff --git a/services/movement/3rdparty/nuxeo-platform-cs-movement/pom.xml b/services/movement/3rdparty/nuxeo-platform-cs-movement/pom.xml
index 2d9e9be0c..b790369c9 100644
--- a/services/movement/3rdparty/nuxeo-platform-cs-movement/pom.xml
+++ b/services/movement/3rdparty/nuxeo-platform-cs-movement/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.movement.3rdparty</artifactId>
-        <version>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/movement/3rdparty/pom.xml b/services/movement/3rdparty/pom.xml
index 10a77b086..096215570 100644
--- a/services/movement/3rdparty/pom.xml
+++ b/services/movement/3rdparty/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>org.collectionspace.services.movement</artifactId>
         <groupId>org.collectionspace.services</groupId>
-        <version>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/movement/client/pom.xml b/services/movement/client/pom.xml
index 4027bfc48..dab18ef2f 100644
--- a/services/movement/client/pom.xml
+++ b/services/movement/client/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.movement</artifactId>
-        <version>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/movement/jaxb/pom.xml b/services/movement/jaxb/pom.xml
index ec41a7f20..81cddee4c 100644
--- a/services/movement/jaxb/pom.xml
+++ b/services/movement/jaxb/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>org.collectionspace.services.movement</artifactId>
         <groupId>org.collectionspace.services</groupId>
-        <version>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/movement/pom.xml b/services/movement/pom.xml
index 7d6a36431..0c492662c 100644
--- a/services/movement/pom.xml
+++ b/services/movement/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.main</artifactId>
-        <version>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/movement/service/pom.xml b/services/movement/service/pom.xml
index 30f89d461..2df097c80 100644
--- a/services/movement/service/pom.xml
+++ b/services/movement/service/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.movement</artifactId>        
-        <version>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/note/3rdparty/build.xml b/services/note/3rdparty/build.xml
index 82e81732c..288aeb593 100644
--- a/services/note/3rdparty/build.xml
+++ b/services/note/3rdparty/build.xml
@@ -107,12 +107,12 @@
     </target>
 
     <target name="deploy" depends="install"
-    description="deploy note in ${jboss.server.nuxeo}">
+    description="deploy note in ${jee.server.nuxeo}">
         <ant antfile="nuxeo-platform-cs-note/build.xml" target="deploy" inheritall="false"/>
     </target>
 
     <target name="undeploy"
-    description="undeploy note from ${jboss.server.nuxeo}">
+    description="undeploy note from ${jee.server.nuxeo}">
         <ant antfile="nuxeo-platform-cs-note/build.xml" target="undeploy" inheritall="false"/>
     </target>
 
diff --git a/services/note/3rdparty/nuxeo-platform-cs-note/build.xml b/services/note/3rdparty/nuxeo-platform-cs-note/build.xml
index 9d9262e0b..5dc24367a 100644
--- a/services/note/3rdparty/nuxeo-platform-cs-note/build.xml
+++ b/services/note/3rdparty/nuxeo-platform-cs-note/build.xml
@@ -115,19 +115,19 @@
     </target>
 
     <target name="deploy" depends="install"
-        description="deploy note doctype in ${jboss.server.nuxeo}">
+        description="deploy note doctype in ${jee.server.nuxeo}">
         <copy file="${basedir}/target/${nuxeo.note.jar}"
-        todir="${jboss.deploy.nuxeo.plugins}"/>
+        todir="${jee.deploy.nuxeo.plugins}"/>
     </target>
 
     <target name="undeploy"
-        description="undeploy note doctype from ${jboss.server.nuxeo}">
+        description="undeploy note doctype from ${jee.server.nuxeo}">
         <delete>
-            <fileset dir="${jboss.deploy.nuxeo.plugins}">
+            <fileset dir="${jee.deploy.nuxeo.plugins}">
                 <include name="${nuxeo.note.jars.all}"/>
             </fileset>
             <!-- Legacy deployment location through release 0.6 -->
-            <fileset dir="${jboss.deploy.nuxeo.system}">
+            <fileset dir="${jee.deploy.nuxeo.system}">
                 <include name="${nuxeo.note.jars.all}"/>
             </fileset>
         </delete>
diff --git a/services/note/3rdparty/nuxeo-platform-cs-note/pom.xml b/services/note/3rdparty/nuxeo-platform-cs-note/pom.xml
index 819b30811..5ddda4d0b 100644
--- a/services/note/3rdparty/nuxeo-platform-cs-note/pom.xml
+++ b/services/note/3rdparty/nuxeo-platform-cs-note/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.note.3rdparty</artifactId>
-        <version>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/note/3rdparty/pom.xml b/services/note/3rdparty/pom.xml
index a47fa511b..b56106a19 100644
--- a/services/note/3rdparty/pom.xml
+++ b/services/note/3rdparty/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.note</artifactId>
-        <version>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/note/client/pom.xml b/services/note/client/pom.xml
index 955d37c13..0858546b7 100644
--- a/services/note/client/pom.xml
+++ b/services/note/client/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>org.collectionspace.services.note</artifactId>
         <groupId>org.collectionspace.services</groupId>
-        <version>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/note/jaxb/pom.xml b/services/note/jaxb/pom.xml
index cd629f84b..e73a113fc 100644
--- a/services/note/jaxb/pom.xml
+++ b/services/note/jaxb/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.note</artifactId>
-        <version>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/note/pom.xml b/services/note/pom.xml
index dab7f915d..00eeb83d9 100644
--- a/services/note/pom.xml
+++ b/services/note/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>org.collectionspace.services.main</artifactId>
         <groupId>org.collectionspace.services</groupId>
-        <version>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/note/service/pom.xml b/services/note/service/pom.xml
index 722993f17..00142b301 100644
--- a/services/note/service/pom.xml
+++ b/services/note/service/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>org.collectionspace.services.note</artifactId>
         <groupId>org.collectionspace.services</groupId>
-        <version>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/objectexit/3rdparty/build.xml b/services/objectexit/3rdparty/build.xml
index e40126e64..574aec2c2 100644
--- a/services/objectexit/3rdparty/build.xml
+++ b/services/objectexit/3rdparty/build.xml
@@ -109,12 +109,12 @@
     </target>
 
     <target name="deploy" depends="install"
-    description="deploy objectexit in ${jboss.server.nuxeo}">
+    description="deploy objectexit in ${jee.server.nuxeo}">
         <ant antfile="nuxeo-platform-cs-objectexit/build.xml" target="deploy" inheritall="false"/>
     </target>
 
     <target name="undeploy"
-    description="undeploy objectexit from ${jboss.server.nuxeo}">
+    description="undeploy objectexit from ${jee.server.nuxeo}">
         <ant antfile="nuxeo-platform-cs-objectexit/build.xml" target="undeploy" inheritall="false"/>
     </target>
 
diff --git a/services/objectexit/3rdparty/nuxeo-platform-cs-objectexit/build.xml b/services/objectexit/3rdparty/nuxeo-platform-cs-objectexit/build.xml
index b3f141c03..8d1cc986d 100644
--- a/services/objectexit/3rdparty/nuxeo-platform-cs-objectexit/build.xml
+++ b/services/objectexit/3rdparty/nuxeo-platform-cs-objectexit/build.xml
@@ -113,19 +113,19 @@
     </target>
 
     <target name="deploy" depends="install"
-        description="deploy objectexit doctype in ${jboss.server.nuxeo}">
+        description="deploy objectexit doctype in ${jee.server.nuxeo}">
         <copy file="${basedir}/target/${nuxeo.objectexit.jar}"
-        todir="${jboss.deploy.nuxeo.plugins}"/>
+        todir="${jee.deploy.nuxeo.plugins}"/>
     </target>
 
     <target name="undeploy"
-        description="undeploy objectexit doctype from ${jboss.server.nuxeo}">
+        description="undeploy objectexit doctype from ${jee.server.nuxeo}">
         <delete>
-            <fileset dir="${jboss.deploy.nuxeo.plugins}">
+            <fileset dir="${jee.deploy.nuxeo.plugins}">
                 <include name="${nuxeo.objectexit.jars.all}"/>
             </fileset>
             <!-- Legacy deployment location through release 0.6 -->
-            <fileset dir="${jboss.deploy.nuxeo.system}">
+            <fileset dir="${jee.deploy.nuxeo.system}">
                 <include name="${nuxeo.objectexit.jars.all}"/>
             </fileset>
         </delete>
diff --git a/services/objectexit/3rdparty/nuxeo-platform-cs-objectexit/pom.xml b/services/objectexit/3rdparty/nuxeo-platform-cs-objectexit/pom.xml
index a1c638b3f..84502dae0 100644
--- a/services/objectexit/3rdparty/nuxeo-platform-cs-objectexit/pom.xml
+++ b/services/objectexit/3rdparty/nuxeo-platform-cs-objectexit/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.objectexit.3rdparty</artifactId>
-        <version>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/objectexit/3rdparty/pom.xml b/services/objectexit/3rdparty/pom.xml
index cad678159..d112bf17f 100644
--- a/services/objectexit/3rdparty/pom.xml
+++ b/services/objectexit/3rdparty/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>org.collectionspace.services.objectexit</artifactId>
         <groupId>org.collectionspace.services</groupId>
-        <version>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/objectexit/client/pom.xml b/services/objectexit/client/pom.xml
index 0937dcb66..a18136f3b 100644
--- a/services/objectexit/client/pom.xml
+++ b/services/objectexit/client/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.objectexit</artifactId>
-        <version>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/objectexit/jaxb/pom.xml b/services/objectexit/jaxb/pom.xml
index 196f1134e..8c8c7dcaf 100644
--- a/services/objectexit/jaxb/pom.xml
+++ b/services/objectexit/jaxb/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>org.collectionspace.services.objectexit</artifactId>
         <groupId>org.collectionspace.services</groupId>
-        <version>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/objectexit/pom.xml b/services/objectexit/pom.xml
index b6b8ee822..b9aa92be5 100644
--- a/services/objectexit/pom.xml
+++ b/services/objectexit/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.main</artifactId>
-        <version>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/objectexit/service/pom.xml b/services/objectexit/service/pom.xml
index 4e48276f9..ab38ebb01 100644
--- a/services/objectexit/service/pom.xml
+++ b/services/objectexit/service/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.objectexit</artifactId>        
-        <version>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/organization/3rdparty/build.xml b/services/organization/3rdparty/build.xml
index 0806798a3..15c59dcd2 100644
--- a/services/organization/3rdparty/build.xml
+++ b/services/organization/3rdparty/build.xml
@@ -109,12 +109,12 @@
     </target>
 
     <target name="deploy" depends="install"
-    description="deploy organization in ${jboss.server.nuxeo}">
+    description="deploy organization in ${jee.server.nuxeo}">
         <ant antfile="nuxeo-platform-cs-organization/build.xml" target="deploy" inheritall="false"/>
     </target>
 
     <target name="undeploy"
-    description="undeploy organization from ${jboss.server.nuxeo}">
+    description="undeploy organization from ${jee.server.nuxeo}">
         <ant antfile="nuxeo-platform-cs-organization/build.xml" target="undeploy" inheritall="false"/>
     </target>
 
diff --git a/services/organization/3rdparty/nuxeo-platform-cs-organization/build.xml b/services/organization/3rdparty/nuxeo-platform-cs-organization/build.xml
index 9421bece2..2b20ad25b 100644
--- a/services/organization/3rdparty/nuxeo-platform-cs-organization/build.xml
+++ b/services/organization/3rdparty/nuxeo-platform-cs-organization/build.xml
@@ -113,19 +113,19 @@
     </target>
 
     <target name="deploy" depends="install"
-        description="deploy organization doctype in ${jboss.server.nuxeo}">
+        description="deploy organization doctype in ${jee.server.nuxeo}">
         <copy file="${basedir}/target/${nuxeo.organization.jar}"
-        todir="${jboss.deploy.nuxeo.plugins}"/>
+        todir="${jee.deploy.nuxeo.plugins}"/>
     </target>
 
     <target name="undeploy"
-        description="undeploy organization doctype from ${jboss.server.nuxeo}">
+        description="undeploy organization doctype from ${jee.server.nuxeo}">
         <delete>
-            <fileset dir="${jboss.deploy.nuxeo.plugins}">
+            <fileset dir="${jee.deploy.nuxeo.plugins}">
                 <include name="${nuxeo.organization.jars.all}"/>
             </fileset>
             <!-- Legacy deployment location through release 0.6 -->
-            <fileset dir="${jboss.deploy.nuxeo.system}">
+            <fileset dir="${jee.deploy.nuxeo.system}">
                 <include name="${nuxeo.organization.jars.all}"/>
             </fileset>
         </delete>
diff --git a/services/organization/3rdparty/nuxeo-platform-cs-organization/pom.xml b/services/organization/3rdparty/nuxeo-platform-cs-organization/pom.xml
index 8aea6ec20..c0229dacd 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>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/organization/3rdparty/pom.xml b/services/organization/3rdparty/pom.xml
index b07efc75a..20a2359c2 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>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/organization/client/pom.xml b/services/organization/client/pom.xml
index 179af5ae4..7ff16173b 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>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/organization/installer/build.xml b/services/organization/installer/build.xml
index b2d4c83ef..d407750a6 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.plugins}">
+        <copy todir="${jee.deploy.nuxeo.plugins}">
             <fileset file="nuxeo/*.jar"/>
         </copy>				
     </target>    
diff --git a/services/organization/jaxb/pom.xml b/services/organization/jaxb/pom.xml
index 75ed734f2..09157740e 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>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/organization/pom.xml b/services/organization/pom.xml
index 0757d61e7..b88210942 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>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/organization/sample/pom.xml b/services/organization/sample/pom.xml
index fd7852ee2..9adbd2883 100644
--- a/services/organization/sample/pom.xml
+++ b/services/organization/sample/pom.xml
@@ -4,7 +4,7 @@
     <groupId>org.collectionspace.services</groupId>
     <artifactId>org.collectionspace.services.organization.client.samples</artifactId>
     <packaging>pom</packaging>
-    <version>1.14-SNAPSHOT</version>
+    <version>2.0-SNAPSHOT</version>
     <name>organization.client.samples</name>
 
     <modules>
diff --git a/services/organization/sample/sample/pom.xml b/services/organization/sample/sample/pom.xml
index a9c4c3010..79fcb15ec 100644
--- a/services/organization/sample/sample/pom.xml
+++ b/services/organization/sample/sample/pom.xml
@@ -4,7 +4,7 @@
     <groupId>org.collectionspace.services</groupId>
     <artifactId>org.collectionspace.services.organization.client.sample</artifactId>
     <packaging>jar</packaging>
-    <version>1.14-SNAPSHOT</version>
+    <version>2.0-SNAPSHOT</version>
     <name>organization.client.sample</name>
     
     <dependencies>
diff --git a/services/organization/service/pom.xml b/services/organization/service/pom.xml
index f2bf26f04..5e263194f 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>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/person/3rdparty/build.xml b/services/person/3rdparty/build.xml
index 7b9b82be2..fbc5416b0 100644
--- a/services/person/3rdparty/build.xml
+++ b/services/person/3rdparty/build.xml
@@ -109,12 +109,12 @@
     </target>
 
     <target name="deploy" depends="install"
-    description="deploy person in ${jboss.server.nuxeo}">
+    description="deploy person in ${jee.server.nuxeo}">
         <ant antfile="nuxeo-platform-cs-person/build.xml" target="deploy" inheritall="false"/>
     </target>
 
     <target name="undeploy"
-    description="undeploy person from ${jboss.server.nuxeo}">
+    description="undeploy person from ${jee.server.nuxeo}">
         <ant antfile="nuxeo-platform-cs-person/build.xml" target="undeploy" inheritall="false"/>
     </target>
 
diff --git a/services/person/3rdparty/nuxeo-platform-cs-person/build.xml b/services/person/3rdparty/nuxeo-platform-cs-person/build.xml
index 699adae2e..10e45f3a6 100644
--- a/services/person/3rdparty/nuxeo-platform-cs-person/build.xml
+++ b/services/person/3rdparty/nuxeo-platform-cs-person/build.xml
@@ -113,19 +113,19 @@
     </target>
 
     <target name="deploy" depends="install"
-        description="deploy person doctype in ${jboss.server.nuxeo}">
+        description="deploy person doctype in ${jee.server.nuxeo}">
         <copy file="${basedir}/target/${nuxeo.person.jar}"
-        todir="${jboss.deploy.nuxeo.plugins}"/>
+        todir="${jee.deploy.nuxeo.plugins}"/>
     </target>
 
     <target name="undeploy"
-        description="undeploy person doctype from ${jboss.server.nuxeo}">
+        description="undeploy person doctype from ${jee.server.nuxeo}">
         <delete>
-            <fileset dir="${jboss.deploy.nuxeo.plugins}">
+            <fileset dir="${jee.deploy.nuxeo.plugins}">
                 <include name="${nuxeo.person.jars.all}"/>
             </fileset>
             <!-- Legacy deployment location through release 0.6 -->
-            <fileset dir="${jboss.deploy.nuxeo.system}">
+            <fileset dir="${jee.deploy.nuxeo.system}">
                 <include name="${nuxeo.person.jars.all}"/>
             </fileset>
         </delete>
diff --git a/services/person/3rdparty/nuxeo-platform-cs-person/pom.xml b/services/person/3rdparty/nuxeo-platform-cs-person/pom.xml
index fe78afb83..8e1a14fe9 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>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/person/3rdparty/pom.xml b/services/person/3rdparty/pom.xml
index 4fcf814c7..5d80e34ce 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>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/person/client/pom.xml b/services/person/client/pom.xml
index e8968b02a..d8be62fd1 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>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/person/installer/build.xml b/services/person/installer/build.xml
index 19e7e17aa..e7b2e70b6 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.plugins}">
+        <copy todir="${jee.deploy.nuxeo.plugins}">
             <fileset file="nuxeo/*.jar"/>
         </copy>				
     </target>    
diff --git a/services/person/jaxb/pom.xml b/services/person/jaxb/pom.xml
index 9b1ff7413..fce4a815c 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>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/person/pom.xml b/services/person/pom.xml
index 888f4da6e..91e926eac 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>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/person/sample/sample/pom.xml b/services/person/sample/sample/pom.xml
index 1ca5bb974..32fd6c612 100644
--- a/services/person/sample/sample/pom.xml
+++ b/services/person/sample/sample/pom.xml
@@ -11,17 +11,17 @@
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.person.jaxb</artifactId>
-            <version>1.14-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.client</artifactId>
-            <version>1.14-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.person.client</artifactId>
-            <version>1.14-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
     
diff --git a/services/person/service/pom.xml b/services/person/service/pom.xml
index 1c22ab07f..c58a2f2ee 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>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/pom.xml b/services/pom.xml
index 5508476d1..3f3904844 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>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
@@ -17,6 +17,8 @@
 		<jaxb2-basics.version>0.6.2</jaxb2-basics.version>
 		<maven-jaxb2-plugin.version>0.8.0</maven-jaxb2-plugin.version>
 		<jaxb.version>2.2.4-1</jaxb.version>
+		<mysql.driver.version>5.1.7</mysql.driver.version>
+		<postgres.driver.version>8.4-702.jdbc4</postgres.driver.version>
 	</properties>
 
     <!--
@@ -30,9 +32,7 @@
         <module>common-api</module>
         <module>authentication</module>
         <module>authorization</module>
-        <!-- 
         <module>blob</module>
-         -->
         <module>client</module>
         <module>jaxb</module>
         <module>hyperjaxb</module>
@@ -54,9 +54,6 @@
         <module>intake</module>
         <module>loanin</module>
         <module>loanout</module>
-        <!-- 
-        <module>media</module>
-         -->
         <module>objectexit</module>
         <module>batch</module>
         <module>imports</module>
@@ -67,6 +64,7 @@
         <module>dimension</module>
         <module>contact</module>
         <module>workflow</module>
+		<module>media</module>
         <module>JaxRsServiceProvider</module>
         <!--module>sdk</module-->
         <module>IntegrationTests</module>
@@ -347,11 +345,6 @@
                 <artifactId>hibernate-entitymanager</artifactId>
                 <version>3.4.0.GA</version>
             </dependency>
-            <!--            <dependency>
-                <groupId>org.hibernate</groupId>
-                <artifactId>hibernate</artifactId>
-                <version>3.4.0.GA</version>
-            </dependency> -->
             <dependency>
                 <groupId>org.jvnet.hyperjaxb3</groupId>
                 <!-- for time type adapters -->
@@ -361,13 +354,13 @@
             <dependency>
                 <groupId>mysql</groupId>
                 <artifactId>mysql-connector-java</artifactId>
-                <version>5.1.5</version>
+                <version>${mysql.driver.version}</version>
             </dependency>
-						<dependency>
-								<groupId>postgresql</groupId>
-								<artifactId>postgresql</artifactId>
-								<version>8.4-702.jdbc4</version>
-						</dependency>
+			<dependency>
+				<groupId>postgresql</groupId>
+				<artifactId>postgresql</artifactId>
+				<version>${postgres.driver.version}</version>
+			</dependency>
         </dependencies>
     </dependencyManagement>
 </project>
diff --git a/services/query/pom.xml b/services/query/pom.xml
index dc670eb8c..3ad9fb0b1 100644
--- a/services/query/pom.xml
+++ b/services/query/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>org.collectionspace.services.main</artifactId>
         <groupId>org.collectionspace.services</groupId>
-        <version>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/query/service/pom.xml b/services/query/service/pom.xml
index a9307fd8d..16d342d63 100644
--- a/services/query/service/pom.xml
+++ b/services/query/service/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.query</artifactId>
-        <version>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/relation/3rdparty/build.xml b/services/relation/3rdparty/build.xml
index c0d275809..b39eb05c8 100644
--- a/services/relation/3rdparty/build.xml
+++ b/services/relation/3rdparty/build.xml
@@ -110,12 +110,12 @@
     </target>
 
     <target name="deploy" depends="install"
-    description="deploy relation in ${jboss.server.nuxeo}">
+    description="deploy relation in ${jee.server.nuxeo}">
         <ant antfile="nuxeo-platform-cs-relation/build.xml" target="deploy" inheritall="false"/>
     </target>
 
     <target name="undeploy"
-    description="undeploy relation from ${jboss.server.nuxeo}">
+    description="undeploy relation from ${jee.server.nuxeo}">
         <ant antfile="nuxeo-platform-cs-relation/build.xml" target="undeploy" inheritall="false"/>
     </target>
 
diff --git a/services/relation/3rdparty/nuxeo-platform-cs-relation/build.xml b/services/relation/3rdparty/nuxeo-platform-cs-relation/build.xml
index 154c0e2ba..32e0ae009 100644
--- a/services/relation/3rdparty/nuxeo-platform-cs-relation/build.xml
+++ b/services/relation/3rdparty/nuxeo-platform-cs-relation/build.xml
@@ -113,19 +113,19 @@
     </target>
 
     <target name="deploy" depends="install"
-        description="deploy relation doctype in ${jboss.server.cspace}">
+        description="deploy relation doctype in ${jee.server.cspace}">
         <copy file="${basedir}/target/${nuxeo.relation.jar}"
-        todir="${jboss.deploy.nuxeo.plugins}"/>
+        todir="${jee.deploy.nuxeo.plugins}"/>
     </target>
 
     <target name="undeploy"
-        description="undeploy relation doctype from ${jboss.server.cspace}">
+        description="undeploy relation doctype from ${jee.server.cspace}">
         <delete>
-            <fileset dir="${jboss.deploy.nuxeo.plugins}">
+            <fileset dir="${jee.deploy.nuxeo.plugins}">
                 <include name="${nuxeo.relation.jars.all}"/>
             </fileset>
             <!-- Legacy deployment location through release 0.6 -->
-            <fileset dir="${jboss.deploy.nuxeo.system}">
+            <fileset dir="${jee.deploy.nuxeo.system}">
                 <include name="${nuxeo.relation.jars.all}"/>
             </fileset>
         </delete>
diff --git a/services/relation/3rdparty/nuxeo-platform-cs-relation/pom.xml b/services/relation/3rdparty/nuxeo-platform-cs-relation/pom.xml
index f14841a34..536636281 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>1.14-SNAPSHOT</version>
+    <version>2.0-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/services/relation/3rdparty/pom.xml b/services/relation/3rdparty/pom.xml
index cb931b2e3..db91dbfe4 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>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/relation/client/pom.xml b/services/relation/client/pom.xml
index 24d12ede8..94baaade2 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>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/relation/pom.xml b/services/relation/pom.xml
index fed35bf13..3085591dc 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>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/relation/service/pom.xml b/services/relation/service/pom.xml
index b0ce0195f..a7eec9dce 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>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/report/3rdparty/build.xml b/services/report/3rdparty/build.xml
index 4929ee806..84f0d56a5 100644
--- a/services/report/3rdparty/build.xml
+++ b/services/report/3rdparty/build.xml
@@ -109,21 +109,21 @@
     </target>
 
 		<target name="deploy_jasper_samples" 
-			description="Copy sample jasper files to ${jboss.server.cspace}/cspace/reports">
-        <copy todir="${jboss.server.cspace}/cspace/reports">
+			description="Copy sample jasper files to ${jee.server.cspace}/cspace/reports">
+        <copy todir="${jee.server.cspace}/cspace/reports">
 					<fileset dir="${basedir}/jasper-cs-report/src/main/resources"
 									includes="*.jasper"/>
         </copy>
     </target>
 
     <target name="deploy" depends="install"
-    description="deploy report in ${jboss.server.nuxeo}">
+    description="deploy report in ${jee.server.nuxeo}">
         <ant antfile="nuxeo-platform-cs-report/build.xml" target="deploy" inheritall="false"/>
 				<antcall target="deploy_jasper_samples" />
     </target>
 
     <target name="undeploy"
-    description="undeploy report from ${jboss.server.nuxeo}">
+    description="undeploy report from ${jee.server.nuxeo}">
         <ant antfile="nuxeo-platform-cs-report/build.xml" target="undeploy" inheritall="false"/>
     </target>
 
diff --git a/services/report/3rdparty/nuxeo-platform-cs-report/build.xml b/services/report/3rdparty/nuxeo-platform-cs-report/build.xml
index 202d5b2f7..08b1d6acc 100644
--- a/services/report/3rdparty/nuxeo-platform-cs-report/build.xml
+++ b/services/report/3rdparty/nuxeo-platform-cs-report/build.xml
@@ -113,19 +113,19 @@
     </target>
 
     <target name="deploy" depends="install"
-        description="deploy report doctype in ${jboss.server.nuxeo}">
+        description="deploy report doctype in ${jee.server.nuxeo}">
         <copy file="${basedir}/target/${nuxeo.report.jar}"
-        todir="${jboss.deploy.nuxeo.plugins}"/>
+        todir="${jee.deploy.nuxeo.plugins}"/>
     </target>
 
     <target name="undeploy"
-        description="undeploy report doctype from ${jboss.server.nuxeo}">
+        description="undeploy report doctype from ${jee.server.nuxeo}">
         <delete>
-            <fileset dir="${jboss.deploy.nuxeo.plugins}">
+            <fileset dir="${jee.deploy.nuxeo.plugins}">
                 <include name="${nuxeo.report.jars.all}"/>
             </fileset>
             <!-- Legacy deployment location through release 0.6 -->
-            <fileset dir="${jboss.deploy.nuxeo.system}">
+            <fileset dir="${jee.deploy.nuxeo.system}">
                 <include name="${nuxeo.report.jars.all}"/>
             </fileset>
         </delete>
diff --git a/services/report/3rdparty/nuxeo-platform-cs-report/pom.xml b/services/report/3rdparty/nuxeo-platform-cs-report/pom.xml
index 096db11ce..c7e42c6c7 100644
--- a/services/report/3rdparty/nuxeo-platform-cs-report/pom.xml
+++ b/services/report/3rdparty/nuxeo-platform-cs-report/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.report.3rdparty</artifactId>
-        <version>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/report/3rdparty/pom.xml b/services/report/3rdparty/pom.xml
index 2ce9d9bb5..879612df9 100644
--- a/services/report/3rdparty/pom.xml
+++ b/services/report/3rdparty/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>org.collectionspace.services.report</artifactId>
         <groupId>org.collectionspace.services</groupId>
-        <version>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/report/client/pom.xml b/services/report/client/pom.xml
index 4c4502f85..bcb5af55b 100644
--- a/services/report/client/pom.xml
+++ b/services/report/client/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.report</artifactId>
-        <version>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/report/jaxb/pom.xml b/services/report/jaxb/pom.xml
index 041ab7740..54b2485bf 100644
--- a/services/report/jaxb/pom.xml
+++ b/services/report/jaxb/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>org.collectionspace.services.report</artifactId>
         <groupId>org.collectionspace.services</groupId>
-        <version>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/report/pom.xml b/services/report/pom.xml
index 5c7f05748..461887c95 100644
--- a/services/report/pom.xml
+++ b/services/report/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.main</artifactId>
-        <version>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/report/service/pom.xml b/services/report/service/pom.xml
index f7a425b6d..bcfd47362 100644
--- a/services/report/service/pom.xml
+++ b/services/report/service/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.report</artifactId>        
-        <version>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/sdk/pom.xml b/services/sdk/pom.xml
index 9939a8515..19891a3d3 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>1.14-SNAPSHOT</version>
+    <version>2.0-SNAPSHOT</version>
     
     <distributionManagement>
         <repository>
diff --git a/services/sdk/sample/pom.xml b/services/sdk/sample/pom.xml
index 2a206afca..3bbff203d 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>1.14-SNAPSHOT</version>
+    <version>2.0-SNAPSHOT</version>
     
     <dependencies>
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.collectionobject.client</artifactId>
-            <version>1.14-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
diff --git a/services/security/client/build.xml b/services/security/client/build.xml
index 9716c9a6e..2c292e91d 100644
--- a/services/security/client/build.xml
+++ b/services/security/client/build.xml
@@ -126,12 +126,12 @@
     </target>
 
     <target name="deploy" depends="install"
-    description="deploy security service in ${jboss.server.cspace}">
+    description="deploy security service in ${jee.server.cspace}">
         
     </target>
 
     <target name="undeploy"
-    description="undeploy security service from ${jboss.server.cspace}">
+    description="undeploy security service from ${jee.server.cspace}">
     </target>
 
     <target name="dist"
diff --git a/services/security/client/pom.xml b/services/security/client/pom.xml
index 7df244452..ba035bbea 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>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/security/pom.xml b/services/security/pom.xml
index e97f33731..350251400 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>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/taxonomy/3rdparty/build.xml b/services/taxonomy/3rdparty/build.xml
index d33b4bc0f..e47593f86 100644
--- a/services/taxonomy/3rdparty/build.xml
+++ b/services/taxonomy/3rdparty/build.xml
@@ -109,12 +109,12 @@
     </target>
 
     <target name="deploy" depends="install"
-    description="deploy taxonomy in ${jboss.server.nuxeo}">
+    description="deploy taxonomy in ${jee.server.nuxeo}">
         <ant antfile="nuxeo-platform-cs-taxonomy/build.xml" target="deploy" inheritall="false"/>
     </target>
 
     <target name="undeploy"
-    description="undeploy taxonomy from ${jboss.server.nuxeo}">
+    description="undeploy taxonomy from ${jee.server.nuxeo}">
         <ant antfile="nuxeo-platform-cs-taxonomy/build.xml" target="undeploy" inheritall="false"/>
     </target>
 
diff --git a/services/taxonomy/3rdparty/nuxeo-platform-cs-taxonomy/build.xml b/services/taxonomy/3rdparty/nuxeo-platform-cs-taxonomy/build.xml
index 3e3cbec57..082b459ce 100644
--- a/services/taxonomy/3rdparty/nuxeo-platform-cs-taxonomy/build.xml
+++ b/services/taxonomy/3rdparty/nuxeo-platform-cs-taxonomy/build.xml
@@ -113,19 +113,19 @@
     </target>
 
     <target name="deploy" depends="install"
-        description="deploy taxonomy doctype in ${jboss.server.nuxeo}">
+        description="deploy taxonomy doctype in ${jee.server.nuxeo}">
         <copy file="${basedir}/target/${nuxeo.taxonomy.jar}"
-        todir="${jboss.deploy.nuxeo.plugins}"/>
+        todir="${jee.deploy.nuxeo.plugins}"/>
     </target>
 
     <target name="undeploy"
-        description="undeploy taxonomy doctype from ${jboss.server.nuxeo}">
+        description="undeploy taxonomy doctype from ${jee.server.nuxeo}">
         <delete>
-            <fileset dir="${jboss.deploy.nuxeo.plugins}">
+            <fileset dir="${jee.deploy.nuxeo.plugins}">
                 <include name="${nuxeo.taxonomy.jars.all}"/>
             </fileset>
             <!-- Legacy deployment taxonomy through release 0.6 -->
-            <fileset dir="${jboss.deploy.nuxeo.system}">
+            <fileset dir="${jee.deploy.nuxeo.system}">
                 <include name="${nuxeo.taxonomy.jars.all}"/>
             </fileset>
         </delete>
diff --git a/services/taxonomy/3rdparty/nuxeo-platform-cs-taxonomy/pom.xml b/services/taxonomy/3rdparty/nuxeo-platform-cs-taxonomy/pom.xml
index 555446b59..8119363e6 100644
--- a/services/taxonomy/3rdparty/nuxeo-platform-cs-taxonomy/pom.xml
+++ b/services/taxonomy/3rdparty/nuxeo-platform-cs-taxonomy/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.taxonomy.3rdparty</artifactId>
-        <version>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/taxonomy/3rdparty/pom.xml b/services/taxonomy/3rdparty/pom.xml
index 7726db386..6b86bef88 100644
--- a/services/taxonomy/3rdparty/pom.xml
+++ b/services/taxonomy/3rdparty/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.taxonomy</artifactId>
-        <version>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/taxonomy/client/pom.xml b/services/taxonomy/client/pom.xml
index 5d66beb0a..220dc72d4 100644
--- a/services/taxonomy/client/pom.xml
+++ b/services/taxonomy/client/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.taxonomy</artifactId>
-        <version>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/taxonomy/jaxb/pom.xml b/services/taxonomy/jaxb/pom.xml
index 7e46cd942..0c1065500 100644
--- a/services/taxonomy/jaxb/pom.xml
+++ b/services/taxonomy/jaxb/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.taxonomy</artifactId>
-        <version>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/taxonomy/pom.xml b/services/taxonomy/pom.xml
index ba3332726..4efbf3f97 100644
--- a/services/taxonomy/pom.xml
+++ b/services/taxonomy/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.main</artifactId>
-        <version>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/taxonomy/service/pom.xml b/services/taxonomy/service/pom.xml
index 84c059467..50fdc5938 100644
--- a/services/taxonomy/service/pom.xml
+++ b/services/taxonomy/service/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.taxonomy</artifactId>
-        <version>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/vocabulary/3rdparty/build.xml b/services/vocabulary/3rdparty/build.xml
index 6f45b711b..82a17d6d2 100644
--- a/services/vocabulary/3rdparty/build.xml
+++ b/services/vocabulary/3rdparty/build.xml
@@ -109,12 +109,12 @@
     </target>
 
     <target name="deploy" depends="install"
-    description="deploy vocabulary in ${jboss.server.nuxeo}">
+    description="deploy vocabulary in ${jee.server.nuxeo}">
         <ant antfile="nuxeo-platform-cs-vocabulary/build.xml" target="deploy" inheritall="false"/>
     </target>
 
     <target name="undeploy"
-    description="undeploy vocabulary from ${jboss.server.nuxeo}">
+    description="undeploy vocabulary from ${jee.server.nuxeo}">
         <ant antfile="nuxeo-platform-cs-vocabulary/build.xml" target="undeploy" inheritall="false"/>
     </target>
 
diff --git a/services/vocabulary/3rdparty/nuxeo-platform-cs-vocabulary/build.xml b/services/vocabulary/3rdparty/nuxeo-platform-cs-vocabulary/build.xml
index 62259be9c..a1b7ff6d3 100644
--- a/services/vocabulary/3rdparty/nuxeo-platform-cs-vocabulary/build.xml
+++ b/services/vocabulary/3rdparty/nuxeo-platform-cs-vocabulary/build.xml
@@ -113,19 +113,19 @@
     </target>
 
     <target name="deploy" depends="install"
-        description="deploy vocabulary doctype in ${jboss.server.nuxeo}">
+        description="deploy vocabulary doctype in ${jee.server.nuxeo}">
         <copy file="${basedir}/target/${nuxeo.vocabulary.jar}"
-        todir="${jboss.deploy.nuxeo.plugins}"/>
+        todir="${jee.deploy.nuxeo.plugins}"/>
     </target>
 
     <target name="undeploy"
-        description="undeploy vocabulary doctype from ${jboss.server.nuxeo}">
+        description="undeploy vocabulary doctype from ${jee.server.nuxeo}">
         <delete>
-            <fileset dir="${jboss.deploy.nuxeo.plugins}">
+            <fileset dir="${jee.deploy.nuxeo.plugins}">
                 <include name="${nuxeo.vocabulary.jars.all}"/>
             </fileset>
             <!-- Legacy deployment location through release 0.6 -->
-            <fileset dir="${jboss.deploy.nuxeo.system}">
+            <fileset dir="${jee.deploy.nuxeo.system}">
                 <include name="${nuxeo.vocabulary.jars.all}"/>
             </fileset>
         </delete>
diff --git a/services/vocabulary/3rdparty/nuxeo-platform-cs-vocabulary/pom.xml b/services/vocabulary/3rdparty/nuxeo-platform-cs-vocabulary/pom.xml
index 72936fb2f..2b237fc8e 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>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/vocabulary/3rdparty/pom.xml b/services/vocabulary/3rdparty/pom.xml
index 45d1acc00..9edb42aa5 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>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/vocabulary/client/pom.xml b/services/vocabulary/client/pom.xml
index c03b512ce..3a88e2800 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>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/vocabulary/installer/build.xml b/services/vocabulary/installer/build.xml
index ab88a012a..55c54b446 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.plugins}">
+        <copy todir="${jee.deploy.nuxeo.plugins}">
             <fileset file="nuxeo/*.jar"/>
         </copy>				
     </target>    
diff --git a/services/vocabulary/jaxb/pom.xml b/services/vocabulary/jaxb/pom.xml
index dd6f9a98d..1e260e9d1 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>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/vocabulary/pom.xml b/services/vocabulary/pom.xml
index 062117f27..4ef2424b5 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>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/vocabulary/sample/sample/pom.xml b/services/vocabulary/sample/sample/pom.xml
index 92bfde0f2..def0c96f3 100644
--- a/services/vocabulary/sample/sample/pom.xml
+++ b/services/vocabulary/sample/sample/pom.xml
@@ -4,7 +4,7 @@
     <groupId>org.collectionspace.services</groupId>
     <artifactId>org.collectionspace.services.vocabulary.client.sample</artifactId>
     <packaging>jar</packaging>
-    <version>1.14-SNAPSHOT</version>
+    <version>2.0-SNAPSHOT</version>
     <name>vocabulary.client.sample</name>
     
     <dependencies>
diff --git a/services/vocabulary/service/pom.xml b/services/vocabulary/service/pom.xml
index 81e5d25b1..80703914d 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>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/workflow/3rdparty/build.xml b/services/workflow/3rdparty/build.xml
index aa1d77207..a40baae0d 100644
--- a/services/workflow/3rdparty/build.xml
+++ b/services/workflow/3rdparty/build.xml
@@ -109,12 +109,12 @@
     </target>
 
     <target name="deploy" depends="install"
-    description="deploy workflow in ${jboss.server.nuxeo}">
+    description="deploy workflow in ${jee.server.nuxeo}">
         <ant antfile="nuxeo-platform-cs-workflow/build.xml" target="deploy" inheritall="false"/>
     </target>
 
     <target name="undeploy"
-    description="undeploy workflow from ${jboss.server.nuxeo}">
+    description="undeploy workflow from ${jee.server.nuxeo}">
         <ant antfile="nuxeo-platform-cs-workflow/build.xml" target="undeploy" inheritall="false"/>
     </target>
 
diff --git a/services/workflow/3rdparty/nuxeo-platform-cs-workflow/build.xml b/services/workflow/3rdparty/nuxeo-platform-cs-workflow/build.xml
index 0e43e442d..de90f3d22 100644
--- a/services/workflow/3rdparty/nuxeo-platform-cs-workflow/build.xml
+++ b/services/workflow/3rdparty/nuxeo-platform-cs-workflow/build.xml
@@ -113,19 +113,19 @@
     </target>
 
     <target name="deploy" depends="install"
-        description="deploy workflow doctype in ${jboss.server.nuxeo}">
+        description="deploy workflow doctype in ${jee.server.nuxeo}">
         <copy file="${basedir}/target/${nuxeo.workflow.jar}"
-        todir="${jboss.deploy.nuxeo.plugins}"/>
+        todir="${jee.deploy.nuxeo.plugins}"/>
     </target>
 
     <target name="undeploy"
-        description="undeploy workflow doctype from ${jboss.server.nuxeo}">
+        description="undeploy workflow doctype from ${jee.server.nuxeo}">
         <delete>
-            <fileset dir="${jboss.deploy.nuxeo.plugins}">
+            <fileset dir="${jee.deploy.nuxeo.plugins}">
                 <include name="${nuxeo.workflow.jars.all}"/>
             </fileset>
             <!-- Legacy deployment location through release 0.6 -->
-            <fileset dir="${jboss.deploy.nuxeo.system}">
+            <fileset dir="${jee.deploy.nuxeo.system}">
                 <include name="${nuxeo.workflow.jars.all}"/>
             </fileset>
         </delete>
diff --git a/services/workflow/3rdparty/nuxeo-platform-cs-workflow/pom.xml b/services/workflow/3rdparty/nuxeo-platform-cs-workflow/pom.xml
index a48aa36d5..0c3b2907d 100644
--- a/services/workflow/3rdparty/nuxeo-platform-cs-workflow/pom.xml
+++ b/services/workflow/3rdparty/nuxeo-platform-cs-workflow/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.collectionspace.services</groupId>
 		<artifactId>org.collectionspace.services.workflow.3rdparty</artifactId>
-		<version>1.14-SNAPSHOT</version>
+		<version>2.0-SNAPSHOT</version>
 	</parent>
     
     <groupId>org.collectionspace.services</groupId>
diff --git a/services/workflow/3rdparty/pom.xml b/services/workflow/3rdparty/pom.xml
index 4288c58d5..f029e00c4 100644
--- a/services/workflow/3rdparty/pom.xml
+++ b/services/workflow/3rdparty/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>org.collectionspace.services.workflow</artifactId>
         <groupId>org.collectionspace.services</groupId>
-        <version>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/workflow/client/pom.xml b/services/workflow/client/pom.xml
index beae4104f..e3e892fae 100644
--- a/services/workflow/client/pom.xml
+++ b/services/workflow/client/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.workflow</artifactId>
-        <version>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/workflow/jaxb/pom.xml b/services/workflow/jaxb/pom.xml
index 5e7b8a01c..d98055f20 100644
--- a/services/workflow/jaxb/pom.xml
+++ b/services/workflow/jaxb/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>org.collectionspace.services.workflow</artifactId>
         <groupId>org.collectionspace.services</groupId>
-        <version>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/workflow/pom.xml b/services/workflow/pom.xml
index 74a4c44bc..19609ebe8 100644
--- a/services/workflow/pom.xml
+++ b/services/workflow/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.main</artifactId>
-        <version>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/workflow/service/pom.xml b/services/workflow/service/pom.xml
index 17e72e71d..d703b677d 100644
--- a/services/workflow/service/pom.xml
+++ b/services/workflow/service/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.workflow</artifactId>        
-        <version>1.14-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>