From: Richard Millet <richard.millet@berkeley.edu>
Date: Fri, 8 Apr 2011 21:47:43 +0000 (+0000)
Subject: NOJIRA: Eclipse project settings files.
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=66b096a30cbafd0dcd6a319903e13c3720e4956c;p=tmp%2Fjakarta-migration.git

NOJIRA: Eclipse project settings files.
---

diff --git a/services/IntegrationTests/.classpath b/services/IntegrationTests/.classpath
index 4839ef7d7..c46014740 100644
--- a/services/IntegrationTests/.classpath
+++ b/services/IntegrationTests/.classpath
@@ -228,6 +228,7 @@
   <classpathentry kind="src" path="/org.collectionspace.services.collectionobject.client"/>
   <classpathentry kind="src" path="/org.collectionspace.services.collectionobject.jaxb"/>
   <classpathentry kind="src" path="/org.collectionspace.services.common"/>
+  <classpathentry kind="src" path="/org.collectionspace.services.common-api"/>
   <classpathentry kind="src" path="/org.collectionspace.services.contact.client"/>
   <classpathentry kind="src" path="/org.collectionspace.services.contact.jaxb"/>
   <classpathentry kind="src" path="/org.collectionspace.services.hyperjaxb"/>
diff --git a/services/IntegrationTests/.project b/services/IntegrationTests/.project
index 4dfbe640b..9a63c7491 100644
--- a/services/IntegrationTests/.project
+++ b/services/IntegrationTests/.project
@@ -7,6 +7,7 @@
     <project>org.collectionspace.services.collectionobject.client</project>
     <project>org.collectionspace.services.collectionobject.jaxb</project>
     <project>org.collectionspace.services.common</project>
+    <project>org.collectionspace.services.common-api</project>
     <project>org.collectionspace.services.contact.client</project>
     <project>org.collectionspace.services.contact.jaxb</project>
     <project>org.collectionspace.services.hyperjaxb</project>
diff --git a/services/JaxRsServiceProvider/.classpath b/services/JaxRsServiceProvider/.classpath
index 6c03a89cd..2fa7f5c6c 100644
--- a/services/JaxRsServiceProvider/.classpath
+++ b/services/JaxRsServiceProvider/.classpath
@@ -4,10 +4,15 @@
   <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/>
   <classpathentry kind="output" path="target/classes"/>
   <classpathentry kind="var" path="M2_REPO/javax/activation/activation/1.1/activation-1.1.jar" sourcepath="M2_REPO/javax/activation/activation/1.1/activation-1.1-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/javax/script/bsh-engine/1.0/bsh-engine-1.0.jar"/>
   <classpathentry kind="var" path="M2_REPO/javax/media/jai_core/1.1.2_01/jai_core-1.1.2_01.jar"/>
   <classpathentry kind="var" path="M2_REPO/javax/xml/bind/jaxb-api/2.1/jaxb-api-2.1.jar" sourcepath="M2_REPO/javax/xml/bind/jaxb-api/2.1/jaxb-api-2.1-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/javax/script/jexl-engine/1.0/jexl-engine-1.0.jar"/>
+  <classpathentry kind="var" path="M2_REPO/javax/script/jruby-engine/1.0/jruby-engine-1.0.jar"/>
+  <classpathentry kind="var" path="M2_REPO/javax/script/js-engine/1.0/js-engine-1.0.jar"/>
   <classpathentry kind="var" path="M2_REPO/javax/annotation/jsr250-api/1.0/jsr250-api-1.0.jar" sourcepath="M2_REPO/javax/annotation/jsr250-api/1.0/jsr250-api-1.0-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/javax/transaction/jta/1.1/jta-1.1.jar" sourcepath="M2_REPO/javax/transaction/jta/1.1/jta-1.1-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/javax/script/jython-engine/1.0/jython-engine-1.0.jar"/>
   <classpathentry kind="var" path="M2_REPO/javax/mail/mail/1.4/mail-1.4.jar" sourcepath="M2_REPO/javax/mail/mail/1.4/mail-1.4-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/javax/persistence/persistence-api/1.0/persistence-api-1.0.jar" sourcepath="M2_REPO/javax/persistence/persistence-api/1.0/persistence-api-1.0-sources.jar">
     <attributes>
@@ -26,9 +31,13 @@
       <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/james/apache-mime4j/0.6/apache-mime4j-0.6-javadoc.jar!/" name="javadoc_location"/>
     </attributes>
   </classpathentry>
+  <classpathentry kind="var" path="M2_REPO/asm/asm/2.2.3/asm-2.2.3.jar"/>
+  <classpathentry kind="var" path="M2_REPO/asm/asm-commons/2.2.3/asm-commons-2.2.3.jar"/>
+  <classpathentry kind="var" path="M2_REPO/asm/asm-tree/2.2.3/asm-tree-2.2.3.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/aspectj/aspectjrt/1.6.8/aspectjrt-1.6.8.jar" sourcepath="M2_REPO/org/aspectj/aspectjrt/1.6.8/aspectjrt-1.6.8-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/aspectj/aspectjweaver/1.6.8/aspectjweaver-1.6.8.jar" sourcepath="M2_REPO/org/aspectj/aspectjweaver/1.6.8/aspectjweaver-1.6.8-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/avalon-framework/avalon-framework/4.1.3/avalon-framework-4.1.3.jar"/>
+  <classpathentry kind="var" path="M2_REPO/backport-util-concurrent/backport-util-concurrent/3.1/backport-util-concurrent-3.1.jar"/>
   <classpathentry kind="var" path="M2_REPO/bouncycastle/bcmail-jdk14/138/bcmail-jdk14-138.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/bouncycastle/bcmail-jdk14/1.38/bcmail-jdk14-1.38.jar"/>
   <classpathentry kind="var" path="M2_REPO/bouncycastle/bcprov-jdk14/138/bcprov-jdk14-138.jar"/>
@@ -120,6 +129,8 @@
   <classpathentry kind="var" path="M2_REPO/jfree/jfreechart/1.0.12/jfreechart-1.0.12.jar"/>
   <classpathentry kind="var" path="M2_REPO/jline/jline/0.9.94/jline-0.9.94.jar"/>
   <classpathentry kind="var" path="M2_REPO/joda-time/joda-time/1.6/joda-time-1.6.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jruby/jruby/1.0.3/jruby-1.0.3.jar"/>
+  <classpathentry kind="var" path="M2_REPO/rhino/js/1.7R1/js-1.7R1.jar"/>
   <classpathentry kind="var" path="M2_REPO/com/jcraft/jsch/0.1.27/jsch-0.1.27.jar" sourcepath="M2_REPO/com/jcraft/jsch/0.1.27/jsch-0.1.27-sources.jar">
     <attributes>
       <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/com/jcraft/jsch/0.1.27/jsch-0.1.27-javadoc.jar!/" name="javadoc_location"/>
@@ -131,6 +142,7 @@
       <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/junit/junit/4.1/junit-4.1-javadoc.jar!/" name="javadoc_location"/>
     </attributes>
   </classpathentry>
+  <classpathentry kind="var" path="M2_REPO/org/python/jython/2.2.1/jython-2.2.1.jar"/>
   <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14.jar" sourcepath="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/logkit/logkit/1.0.1/logkit-1.0.1.jar" sourcepath="M2_REPO/logkit/logkit/1.0.1/logkit-1.0.1-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-artifact/2.0.6/maven-artifact-2.0.6.jar" sourcepath="M2_REPO/org/apache/maven/maven-artifact/2.0.6/maven-artifact-2.0.6-sources.jar">
@@ -232,19 +244,26 @@
   <classpathentry kind="var" path="M2_REPO/org/nuxeo/ecm/core/nuxeo-core-query/1.6.2/nuxeo-core-query-1.6.2.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/nuxeo/ecm/core/nuxeo-core-schema/1.6.2/nuxeo-core-schema-1.6.2.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/nuxeo/ecm/core/nuxeo-core-storage-sql/1.6.2/nuxeo-core-storage-sql-1.6.2.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/nuxeo/ecm/platform/nuxeo-platform-api/5.3.2/nuxeo-platform-api-5.3.2.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/nuxeo/ecm/platform/nuxeo-platform-commandline-executor/5.3.2/nuxeo-platform-commandline-executor-5.3.2.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/nuxeo/ecm/platform/nuxeo-platform-directory-api/5.3.2/nuxeo-platform-directory-api-5.3.2.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/nuxeo/ecm/platform/nuxeo-platform-filemanager-api/5.3.2/nuxeo-platform-filemanager-api-5.3.2.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/nuxeo/ecm/platform/nuxeo-platform-filemanager-core/5.3.2/nuxeo-platform-filemanager-core-5.3.2.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/nuxeo/ecm/platform/nuxeo-platform-forms-layout-api/5.3.2/nuxeo-platform-forms-layout-api-5.3.2.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/nuxeo/ecm/platform/nuxeo-platform-imaging-api/5.3.2/nuxeo-platform-imaging-api-5.3.2.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/nuxeo/ecm/platform/nuxeo-platform-imaging-core/5.3.2/nuxeo-platform-imaging-core-5.3.2.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/nuxeo/ecm/platform/nuxeo-platform-login/5.3.2/nuxeo-platform-login-5.3.2.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/nuxeo/ecm/platform/nuxeo-platform-mimetype-api/5.3.2/nuxeo-platform-mimetype-api-5.3.2.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/nuxeo/ecm/platform/nuxeo-platform-search-api/5.3.2/nuxeo-platform-search-api-5.3.2.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/nuxeo/ecm/platform/nuxeo-platform-types-api/5.3.2/nuxeo-platform-types-api-5.3.2.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/nuxeo/ecm/platform/nuxeo-platform-usermanager-api/5.3.2/nuxeo-platform-usermanager-api-5.3.2.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/nuxeo/ecm/platform/nuxeo-platform-versioning-api/5.3.2/nuxeo-platform-versioning-api-5.3.2.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/nuxeo/runtime/nuxeo-runtime/1.6.2/nuxeo-runtime-1.6.2.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/nuxeo/runtime/nuxeo-runtime-jtajca/1.6.2/nuxeo-runtime-jtajca-1.6.2.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/nuxeo/runtime/nuxeo-runtime-management/1.6.2/nuxeo-runtime-management-1.6.2.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/nuxeo/runtime/nuxeo-runtime-osgi/1.6.2/nuxeo-runtime-osgi-1.6.2.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/nuxeo/runtime/nuxeo-runtime-scripting/1.6.2/nuxeo-runtime-scripting-1.6.2.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/nuxeo/ecm/platform/nuxeo-shell-core/5.3.2/nuxeo-shell-core-5.3.2.jar" sourcepath="M2_REPO/org/nuxeo/ecm/platform/nuxeo-shell-core/5.3.2/nuxeo-shell-core-5.3.2-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/net/java/dev/mistral/Operations/0.9.5/Operations-0.9.5.jar"/>
   <classpathentry kind="src" path="/org.collectionspace.services.3rdparty.nuxeo.quote-api"/>
   <classpathentry kind="src" path="/org.collectionspace.services.account.jaxb"/>
@@ -263,6 +282,7 @@
   <classpathentry kind="src" path="/org.collectionspace.services.collectionobject.jaxb"/>
   <classpathentry kind="src" path="/org.collectionspace.services.collectionobject.service"/>
   <classpathentry kind="src" path="/org.collectionspace.services.common"/>
+  <classpathentry kind="src" path="/org.collectionspace.services.common-api"/>
   <classpathentry kind="src" path="/org.collectionspace.services.contact.client"/>
   <classpathentry kind="src" path="/org.collectionspace.services.contact.jaxb"/>
   <classpathentry kind="src" path="/org.collectionspace.services.contact.service"/>
@@ -270,6 +290,8 @@
   <classpathentry kind="src" path="/org.collectionspace.services.dimension.service"/>
   <classpathentry kind="src" path="/org.collectionspace.services.hyperjaxb"/>
   <classpathentry kind="src" path="/org.collectionspace.services.id.service"/>
+  <classpathentry kind="src" path="/org.collectionspace.services.imports.jaxb"/>
+  <classpathentry kind="src" path="/org.collectionspace.services.imports.service"/>
   <classpathentry kind="src" path="/org.collectionspace.services.intake.client"/>
   <classpathentry kind="src" path="/org.collectionspace.services.intake.jaxb"/>
   <classpathentry kind="src" path="/org.collectionspace.services.intake.service"/>
diff --git a/services/JaxRsServiceProvider/.project b/services/JaxRsServiceProvider/.project
index 277d1eba9..b38b3320c 100644
--- a/services/JaxRsServiceProvider/.project
+++ b/services/JaxRsServiceProvider/.project
@@ -19,6 +19,7 @@
     <project>org.collectionspace.services.collectionobject.jaxb</project>
     <project>org.collectionspace.services.collectionobject.service</project>
     <project>org.collectionspace.services.common</project>
+    <project>org.collectionspace.services.common-api</project>
     <project>org.collectionspace.services.contact.client</project>
     <project>org.collectionspace.services.contact.jaxb</project>
     <project>org.collectionspace.services.contact.service</project>
@@ -26,6 +27,8 @@
     <project>org.collectionspace.services.dimension.service</project>
     <project>org.collectionspace.services.hyperjaxb</project>
     <project>org.collectionspace.services.id.service</project>
+    <project>org.collectionspace.services.imports.jaxb</project>
+    <project>org.collectionspace.services.imports.service</project>
     <project>org.collectionspace.services.intake.client</project>
     <project>org.collectionspace.services.intake.jaxb</project>
     <project>org.collectionspace.services.intake.service</project>
diff --git a/services/PerformanceTests/.classpath b/services/PerformanceTests/.classpath
index 79fd3a030..edf7444a6 100644
--- a/services/PerformanceTests/.classpath
+++ b/services/PerformanceTests/.classpath
@@ -224,6 +224,7 @@
   <classpathentry kind="src" path="/org.collectionspace.services.collectionobject.client"/>
   <classpathentry kind="src" path="/org.collectionspace.services.collectionobject.jaxb"/>
   <classpathentry kind="src" path="/org.collectionspace.services.common"/>
+  <classpathentry kind="src" path="/org.collectionspace.services.common-api"/>
   <classpathentry kind="src" path="/org.collectionspace.services.contact.client"/>
   <classpathentry kind="src" path="/org.collectionspace.services.contact.jaxb"/>
   <classpathentry kind="src" path="/org.collectionspace.services.hyperjaxb"/>
diff --git a/services/PerformanceTests/.project b/services/PerformanceTests/.project
index 272dacbb3..511b17d7c 100644
--- a/services/PerformanceTests/.project
+++ b/services/PerformanceTests/.project
@@ -7,6 +7,7 @@
     <project>org.collectionspace.services.collectionobject.client</project>
     <project>org.collectionspace.services.collectionobject.jaxb</project>
     <project>org.collectionspace.services.common</project>
+    <project>org.collectionspace.services.common-api</project>
     <project>org.collectionspace.services.contact.client</project>
     <project>org.collectionspace.services.contact.jaxb</project>
     <project>org.collectionspace.services.hyperjaxb</project>
diff --git a/services/account/service/.classpath b/services/account/service/.classpath
index 6e273edbf..581b38f71 100644
--- a/services/account/service/.classpath
+++ b/services/account/service/.classpath
@@ -230,6 +230,7 @@
   <classpathentry kind="src" path="/org.collectionspace.services.authorization.jaxb"/>
   <classpathentry kind="src" path="/org.collectionspace.services.client"/>
   <classpathentry kind="src" path="/org.collectionspace.services.common"/>
+  <classpathentry kind="src" path="/org.collectionspace.services.common-api"/>
   <classpathentry kind="src" path="/org.collectionspace.services.hyperjaxb"/>
   <classpathentry kind="src" path="/org.collectionspace.services.jaxb"/>
   <classpathentry kind="var" path="M2_REPO/org/osgi/org.osgi.core/4.1.0/org.osgi.core-4.1.0.jar"/>
diff --git a/services/account/service/.project b/services/account/service/.project
index cd240626c..1fe6dc802 100644
--- a/services/account/service/.project
+++ b/services/account/service/.project
@@ -8,6 +8,7 @@
     <project>org.collectionspace.services.authorization.jaxb</project>
     <project>org.collectionspace.services.client</project>
     <project>org.collectionspace.services.common</project>
+    <project>org.collectionspace.services.common-api</project>
     <project>org.collectionspace.services.hyperjaxb</project>
     <project>org.collectionspace.services.jaxb</project>
   </projects>
diff --git a/services/acquisition/client/.classpath b/services/acquisition/client/.classpath
index 5506e7b69..aa34b69bb 100644
--- a/services/acquisition/client/.classpath
+++ b/services/acquisition/client/.classpath
@@ -223,6 +223,7 @@
   <classpathentry kind="src" path="/org.collectionspace.services.acquisition.jaxb"/>
   <classpathentry kind="src" path="/org.collectionspace.services.client"/>
   <classpathentry kind="src" path="/org.collectionspace.services.common"/>
+  <classpathentry kind="src" path="/org.collectionspace.services.common-api"/>
   <classpathentry kind="src" path="/org.collectionspace.services.contact.client"/>
   <classpathentry kind="src" path="/org.collectionspace.services.contact.jaxb"/>
   <classpathentry kind="src" path="/org.collectionspace.services.hyperjaxb"/>
diff --git a/services/acquisition/client/.project b/services/acquisition/client/.project
index e799aeda3..e7a79adf5 100644
--- a/services/acquisition/client/.project
+++ b/services/acquisition/client/.project
@@ -6,6 +6,7 @@
     <project>org.collectionspace.services.acquisition.jaxb</project>
     <project>org.collectionspace.services.client</project>
     <project>org.collectionspace.services.common</project>
+    <project>org.collectionspace.services.common-api</project>
     <project>org.collectionspace.services.contact.client</project>
     <project>org.collectionspace.services.contact.jaxb</project>
     <project>org.collectionspace.services.hyperjaxb</project>
diff --git a/services/acquisition/service/.classpath b/services/acquisition/service/.classpath
index c4faa1f1c..b4bffddec 100644
--- a/services/acquisition/service/.classpath
+++ b/services/acquisition/service/.classpath
@@ -220,6 +220,7 @@
   <classpathentry kind="src" path="/org.collectionspace.services.acquisition.jaxb"/>
   <classpathentry kind="src" path="/org.collectionspace.services.client"/>
   <classpathentry kind="src" path="/org.collectionspace.services.common"/>
+  <classpathentry kind="src" path="/org.collectionspace.services.common-api"/>
   <classpathentry kind="src" path="/org.collectionspace.services.contact.client"/>
   <classpathentry kind="src" path="/org.collectionspace.services.contact.jaxb"/>
   <classpathentry kind="src" path="/org.collectionspace.services.hyperjaxb"/>
diff --git a/services/acquisition/service/.project b/services/acquisition/service/.project
index e79adb713..a74e99750 100644
--- a/services/acquisition/service/.project
+++ b/services/acquisition/service/.project
@@ -7,6 +7,7 @@
     <project>org.collectionspace.services.acquisition.jaxb</project>
     <project>org.collectionspace.services.client</project>
     <project>org.collectionspace.services.common</project>
+    <project>org.collectionspace.services.common-api</project>
     <project>org.collectionspace.services.contact.client</project>
     <project>org.collectionspace.services.contact.jaxb</project>
     <project>org.collectionspace.services.hyperjaxb</project>
diff --git a/services/authorization-mgt/import/.classpath b/services/authorization-mgt/import/.classpath
index 7f35f2720..2edce2ecd 100644
--- a/services/authorization-mgt/import/.classpath
+++ b/services/authorization-mgt/import/.classpath
@@ -231,6 +231,7 @@
   <classpathentry kind="src" path="/org.collectionspace.services.authorization.service"/>
   <classpathentry kind="src" path="/org.collectionspace.services.client"/>
   <classpathentry kind="src" path="/org.collectionspace.services.common"/>
+  <classpathentry kind="src" path="/org.collectionspace.services.common-api"/>
   <classpathentry kind="src" path="/org.collectionspace.services.hyperjaxb"/>
   <classpathentry kind="src" path="/org.collectionspace.services.jaxb"/>
   <classpathentry kind="var" path="M2_REPO/org/osgi/org.osgi.core/4.1.0/org.osgi.core-4.1.0.jar"/>
diff --git a/services/authorization-mgt/import/.project b/services/authorization-mgt/import/.project
index bdc79064f..97878744f 100644
--- a/services/authorization-mgt/import/.project
+++ b/services/authorization-mgt/import/.project
@@ -8,6 +8,7 @@
     <project>org.collectionspace.services.authorization.service</project>
     <project>org.collectionspace.services.client</project>
     <project>org.collectionspace.services.common</project>
+    <project>org.collectionspace.services.common-api</project>
     <project>org.collectionspace.services.hyperjaxb</project>
     <project>org.collectionspace.services.jaxb</project>
   </projects>
diff --git a/services/authorization-mgt/service/.classpath b/services/authorization-mgt/service/.classpath
index 82577d5a2..8a6ab1f6a 100644
--- a/services/authorization-mgt/service/.classpath
+++ b/services/authorization-mgt/service/.classpath
@@ -244,6 +244,7 @@
   <classpathentry kind="src" path="/org.collectionspace.services.authorization.service"/>
   <classpathentry kind="src" path="/org.collectionspace.services.client"/>
   <classpathentry kind="src" path="/org.collectionspace.services.common"/>
+  <classpathentry kind="src" path="/org.collectionspace.services.common-api"/>
   <classpathentry kind="src" path="/org.collectionspace.services.hyperjaxb"/>
   <classpathentry kind="src" path="/org.collectionspace.services.jaxb"/>
   <classpathentry kind="var" path="M2_REPO/org/osgi/org.osgi.core/4.1.0/org.osgi.core-4.1.0.jar"/>
diff --git a/services/authorization-mgt/service/.project b/services/authorization-mgt/service/.project
index f02482ebd..273509374 100644
--- a/services/authorization-mgt/service/.project
+++ b/services/authorization-mgt/service/.project
@@ -10,6 +10,7 @@
     <project>org.collectionspace.services.authorization.service</project>
     <project>org.collectionspace.services.client</project>
     <project>org.collectionspace.services.common</project>
+    <project>org.collectionspace.services.common-api</project>
     <project>org.collectionspace.services.hyperjaxb</project>
     <project>org.collectionspace.services.jaxb</project>
   </projects>
diff --git a/services/blob/client/.classpath b/services/blob/client/.classpath
index 333a4668f..843f62557 100644
--- a/services/blob/client/.classpath
+++ b/services/blob/client/.classpath
@@ -222,6 +222,7 @@
   <classpathentry kind="src" path="/org.collectionspace.services.3rdparty.nuxeo.quote-api"/>
   <classpathentry kind="src" path="/org.collectionspace.services.client"/>
   <classpathentry kind="src" path="/org.collectionspace.services.common"/>
+  <classpathentry kind="src" path="/org.collectionspace.services.common-api"/>
   <classpathentry kind="src" path="/org.collectionspace.services.contact.client"/>
   <classpathentry kind="src" path="/org.collectionspace.services.contact.jaxb"/>
   <classpathentry kind="src" path="/org.collectionspace.services.hyperjaxb"/>
diff --git a/services/blob/client/.project b/services/blob/client/.project
index 9de357e06..3add2868e 100644
--- a/services/blob/client/.project
+++ b/services/blob/client/.project
@@ -5,6 +5,7 @@
     <project>org.collectionspace.services.3rdparty.nuxeo.quote-api</project>
     <project>org.collectionspace.services.client</project>
     <project>org.collectionspace.services.common</project>
+    <project>org.collectionspace.services.common-api</project>
     <project>org.collectionspace.services.contact.client</project>
     <project>org.collectionspace.services.contact.jaxb</project>
     <project>org.collectionspace.services.hyperjaxb</project>
diff --git a/services/blob/service/.classpath b/services/blob/service/.classpath
index bf5b802e7..b4aa905a6 100644
--- a/services/blob/service/.classpath
+++ b/services/blob/service/.classpath
@@ -224,6 +224,7 @@
   <classpathentry kind="src" path="/org.collectionspace.services.blob.client"/>
   <classpathentry kind="src" path="/org.collectionspace.services.client"/>
   <classpathentry kind="src" path="/org.collectionspace.services.common"/>
+  <classpathentry kind="src" path="/org.collectionspace.services.common-api"/>
   <classpathentry kind="src" path="/org.collectionspace.services.contact.client"/>
   <classpathentry kind="src" path="/org.collectionspace.services.contact.jaxb"/>
   <classpathentry kind="src" path="/org.collectionspace.services.hyperjaxb"/>
diff --git a/services/blob/service/.project b/services/blob/service/.project
index 37160e5a9..1852bf4dc 100644
--- a/services/blob/service/.project
+++ b/services/blob/service/.project
@@ -6,6 +6,7 @@
     <project>org.collectionspace.services.blob.client</project>
     <project>org.collectionspace.services.client</project>
     <project>org.collectionspace.services.common</project>
+    <project>org.collectionspace.services.common-api</project>
     <project>org.collectionspace.services.contact.client</project>
     <project>org.collectionspace.services.contact.jaxb</project>
     <project>org.collectionspace.services.hyperjaxb</project>
diff --git a/services/collectionobject/client/.classpath b/services/collectionobject/client/.classpath
index 27fc35a00..8f2d07097 100644
--- a/services/collectionobject/client/.classpath
+++ b/services/collectionobject/client/.classpath
@@ -223,6 +223,7 @@
   <classpathentry kind="src" path="/org.collectionspace.services.client"/>
   <classpathentry kind="src" path="/org.collectionspace.services.collectionobject.jaxb"/>
   <classpathentry kind="src" path="/org.collectionspace.services.common"/>
+  <classpathentry kind="src" path="/org.collectionspace.services.common-api"/>
   <classpathentry kind="src" path="/org.collectionspace.services.contact.client"/>
   <classpathentry kind="src" path="/org.collectionspace.services.contact.jaxb"/>
   <classpathentry kind="src" path="/org.collectionspace.services.hyperjaxb"/>
diff --git a/services/collectionobject/client/.project b/services/collectionobject/client/.project
index e3b21d134..6e1c511a7 100644
--- a/services/collectionobject/client/.project
+++ b/services/collectionobject/client/.project
@@ -6,6 +6,7 @@
     <project>org.collectionspace.services.client</project>
     <project>org.collectionspace.services.collectionobject.jaxb</project>
     <project>org.collectionspace.services.common</project>
+    <project>org.collectionspace.services.common-api</project>
     <project>org.collectionspace.services.contact.client</project>
     <project>org.collectionspace.services.contact.jaxb</project>
     <project>org.collectionspace.services.hyperjaxb</project>
diff --git a/services/collectionobject/service/.classpath b/services/collectionobject/service/.classpath
index d7e70f81c..935160037 100644
--- a/services/collectionobject/service/.classpath
+++ b/services/collectionobject/service/.classpath
@@ -229,6 +229,7 @@
   <classpathentry kind="src" path="/org.collectionspace.services.collectionobject.client"/>
   <classpathentry kind="src" path="/org.collectionspace.services.collectionobject.jaxb"/>
   <classpathentry kind="src" path="/org.collectionspace.services.common"/>
+  <classpathentry kind="src" path="/org.collectionspace.services.common-api"/>
   <classpathentry kind="src" path="/org.collectionspace.services.contact.client"/>
   <classpathentry kind="src" path="/org.collectionspace.services.contact.jaxb"/>
   <classpathentry kind="src" path="/org.collectionspace.services.hyperjaxb"/>
diff --git a/services/collectionobject/service/.project b/services/collectionobject/service/.project
index 321ab691e..4a03f7036 100644
--- a/services/collectionobject/service/.project
+++ b/services/collectionobject/service/.project
@@ -7,6 +7,7 @@
     <project>org.collectionspace.services.collectionobject.client</project>
     <project>org.collectionspace.services.collectionobject.jaxb</project>
     <project>org.collectionspace.services.common</project>
+    <project>org.collectionspace.services.common-api</project>
     <project>org.collectionspace.services.contact.client</project>
     <project>org.collectionspace.services.contact.jaxb</project>
     <project>org.collectionspace.services.hyperjaxb</project>
diff --git a/services/common-api/.classpath b/services/common-api/.classpath
index 3cd424147..dc66cb02e 100755
--- a/services/common-api/.classpath
+++ b/services/common-api/.classpath
@@ -1,8 +1,13 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="src" path="/common-api/src/main/java"/>
-	<classpathentry kind="src" path="/common-api/src/test/java"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Maven: org.testng:testng:jdk15:5.6"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
+  <classpathentry kind="src" path="src/test/java" output="target/test-classes" including="**/*.java"/>
+  <classpathentry kind="src" path="src/main/java" including="**/*.java"/>
+  <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/>
+  <classpathentry kind="output" path="target/classes"/>
+  <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar" sourcepath="M2_REPO/junit/junit/3.8.1/junit-3.8.1-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14.jar" sourcepath="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.5.8/slf4j-api-1.5.8.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-log4j12/1.5.8/slf4j-log4j12-1.5.8.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/testng/testng/5.6/testng-5.6-jdk15.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/testng/testng/5.6/testng-5.6.jar"/>
+  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+</classpath>
\ No newline at end of file
diff --git a/services/common-api/.project b/services/common-api/.project
index a249472a9..131f99d43 100755
--- a/services/common-api/.project
+++ b/services/common-api/.project
@@ -1,23 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>common-api</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.maven.ide.eclipse.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.maven.ide.eclipse.maven2Nature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
+  <name>org.collectionspace.services.common-api</name>
+  <comment>NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.</comment>
+  <projects/>
+  <buildSpec>
+    <buildCommand>
+      <name>org.eclipse.jdt.core.javabuilder</name>
+    </buildCommand>
+    <buildCommand>
+      <name>org.maven.ide.eclipse.maven2Builder</name>
+    </buildCommand>
+  </buildSpec>
+  <natures>
+    <nature>org.maven.ide.eclipse.maven2Nature</nature>
+    <nature>org.eclipse.jdt.core.javanature</nature>
+  </natures>
+</projectDescription>
\ No newline at end of file
diff --git a/services/common/.classpath b/services/common/.classpath
index ace33dc4a..c141b087a 100644
--- a/services/common/.classpath
+++ b/services/common/.classpath
@@ -1,5 +1,6 @@
 <classpath>
   <classpathentry kind="src" path="src/test/java" output="target/test-classes" including="**/*.java"/>
+  <classpathentry kind="src" path="src/test/resources" output="target/test-classes" excluding="**/*.java"/>
   <classpathentry kind="src" path="src/main/java" including="**/*.java"/>
   <classpathentry kind="src" path="target/generated-sources/xjc"/>
   <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/>
@@ -231,6 +232,7 @@
   <classpathentry kind="src" path="/org.collectionspace.services.authorization.jaxb"/>
   <classpathentry kind="src" path="/org.collectionspace.services.authorization.service"/>
   <classpathentry kind="src" path="/org.collectionspace.services.client"/>
+  <classpathentry kind="src" path="/org.collectionspace.services.common-api"/>
   <classpathentry kind="src" path="/org.collectionspace.services.hyperjaxb"/>
   <classpathentry kind="src" path="/org.collectionspace.services.jaxb"/>
   <classpathentry kind="var" path="M2_REPO/org/osgi/org.osgi.core/4.1.0/org.osgi.core-4.1.0.jar"/>
diff --git a/services/common/.project b/services/common/.project
index ae2897973..4b38252ca 100644
--- a/services/common/.project
+++ b/services/common/.project
@@ -8,6 +8,7 @@
     <project>org.collectionspace.services.authorization.jaxb</project>
     <project>org.collectionspace.services.authorization.service</project>
     <project>org.collectionspace.services.client</project>
+    <project>org.collectionspace.services.common-api</project>
     <project>org.collectionspace.services.hyperjaxb</project>
     <project>org.collectionspace.services.jaxb</project>
   </projects>
diff --git a/services/contact/service/.classpath b/services/contact/service/.classpath
index 9065a4bec..f94df9b68 100644
--- a/services/contact/service/.classpath
+++ b/services/contact/service/.classpath
@@ -219,6 +219,7 @@
   <classpathentry kind="src" path="/org.collectionspace.services.3rdparty.nuxeo.quote-api"/>
   <classpathentry kind="src" path="/org.collectionspace.services.client"/>
   <classpathentry kind="src" path="/org.collectionspace.services.common"/>
+  <classpathentry kind="src" path="/org.collectionspace.services.common-api"/>
   <classpathentry kind="src" path="/org.collectionspace.services.contact.client"/>
   <classpathentry kind="src" path="/org.collectionspace.services.contact.jaxb"/>
   <classpathentry kind="src" path="/org.collectionspace.services.hyperjaxb"/>
diff --git a/services/contact/service/.project b/services/contact/service/.project
index ae6b995bf..d5ac49e21 100644
--- a/services/contact/service/.project
+++ b/services/contact/service/.project
@@ -5,6 +5,7 @@
     <project>org.collectionspace.services.3rdparty.nuxeo.quote-api</project>
     <project>org.collectionspace.services.client</project>
     <project>org.collectionspace.services.common</project>
+    <project>org.collectionspace.services.common-api</project>
     <project>org.collectionspace.services.contact.client</project>
     <project>org.collectionspace.services.contact.jaxb</project>
     <project>org.collectionspace.services.hyperjaxb</project>
diff --git a/services/dimension/client/.classpath b/services/dimension/client/.classpath
index a53847511..a5a814a27 100644
--- a/services/dimension/client/.classpath
+++ b/services/dimension/client/.classpath
@@ -224,6 +224,7 @@
   <classpathentry kind="src" path="/org.collectionspace.services.collectionobject.client"/>
   <classpathentry kind="src" path="/org.collectionspace.services.collectionobject.jaxb"/>
   <classpathentry kind="src" path="/org.collectionspace.services.common"/>
+  <classpathentry kind="src" path="/org.collectionspace.services.common-api"/>
   <classpathentry kind="src" path="/org.collectionspace.services.contact.client"/>
   <classpathentry kind="src" path="/org.collectionspace.services.contact.jaxb"/>
   <classpathentry kind="src" path="/org.collectionspace.services.dimension.jaxb"/>
diff --git a/services/dimension/client/.project b/services/dimension/client/.project
index e3233a62d..88df81506 100644
--- a/services/dimension/client/.project
+++ b/services/dimension/client/.project
@@ -7,6 +7,7 @@
     <project>org.collectionspace.services.collectionobject.client</project>
     <project>org.collectionspace.services.collectionobject.jaxb</project>
     <project>org.collectionspace.services.common</project>
+    <project>org.collectionspace.services.common-api</project>
     <project>org.collectionspace.services.contact.client</project>
     <project>org.collectionspace.services.contact.jaxb</project>
     <project>org.collectionspace.services.dimension.jaxb</project>
diff --git a/services/dimension/service/.classpath b/services/dimension/service/.classpath
index cd209d480..c05d70ded 100644
--- a/services/dimension/service/.classpath
+++ b/services/dimension/service/.classpath
@@ -223,6 +223,7 @@
   <classpathentry kind="src" path="/org.collectionspace.services.3rdparty.nuxeo.quote-api"/>
   <classpathentry kind="src" path="/org.collectionspace.services.client"/>
   <classpathentry kind="src" path="/org.collectionspace.services.common"/>
+  <classpathentry kind="src" path="/org.collectionspace.services.common-api"/>
   <classpathentry kind="src" path="/org.collectionspace.services.dimension.jaxb"/>
   <classpathentry kind="src" path="/org.collectionspace.services.hyperjaxb"/>
   <classpathentry kind="src" path="/org.collectionspace.services.jaxb"/>
diff --git a/services/dimension/service/.project b/services/dimension/service/.project
index 91a4f3b26..59ff51be1 100644
--- a/services/dimension/service/.project
+++ b/services/dimension/service/.project
@@ -5,6 +5,7 @@
     <project>org.collectionspace.services.3rdparty.nuxeo.quote-api</project>
     <project>org.collectionspace.services.client</project>
     <project>org.collectionspace.services.common</project>
+    <project>org.collectionspace.services.common-api</project>
     <project>org.collectionspace.services.dimension.jaxb</project>
     <project>org.collectionspace.services.hyperjaxb</project>
     <project>org.collectionspace.services.jaxb</project>
diff --git a/services/id/service/.classpath b/services/id/service/.classpath
index 4ba0cc031..9e2c6f126 100644
--- a/services/id/service/.classpath
+++ b/services/id/service/.classpath
@@ -223,6 +223,7 @@
   <classpathentry kind="src" path="/org.collectionspace.services.3rdparty.nuxeo.quote-api"/>
   <classpathentry kind="src" path="/org.collectionspace.services.client"/>
   <classpathentry kind="src" path="/org.collectionspace.services.common"/>
+  <classpathentry kind="src" path="/org.collectionspace.services.common-api"/>
   <classpathentry kind="src" path="/org.collectionspace.services.hyperjaxb"/>
   <classpathentry kind="src" path="/org.collectionspace.services.jaxb"/>
   <classpathentry kind="var" path="M2_REPO/org/osgi/org.osgi.core/4.1.0/org.osgi.core-4.1.0.jar"/>
diff --git a/services/id/service/.project b/services/id/service/.project
index a54c4e0e9..0f182aeb6 100644
--- a/services/id/service/.project
+++ b/services/id/service/.project
@@ -5,6 +5,7 @@
     <project>org.collectionspace.services.3rdparty.nuxeo.quote-api</project>
     <project>org.collectionspace.services.client</project>
     <project>org.collectionspace.services.common</project>
+    <project>org.collectionspace.services.common-api</project>
     <project>org.collectionspace.services.hyperjaxb</project>
     <project>org.collectionspace.services.jaxb</project>
   </projects>
diff --git a/services/imports/3rdparty/nuxeo-platform-cs-imports/.classpath b/services/imports/3rdparty/nuxeo-platform-cs-imports/.classpath
index 6fd3b8551..8ad8fad8e 100644
--- a/services/imports/3rdparty/nuxeo-platform-cs-imports/.classpath
+++ b/services/imports/3rdparty/nuxeo-platform-cs-imports/.classpath
@@ -1,7 +1,7 @@
 <classpath>
   <classpathentry kind="src" path="src/main/java" including="**/*.java"/>
   <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/>
-	<classpathentry kind="output" path="target/classes"/>
+  <classpathentry kind="output" path="target/classes"/>
   <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar" sourcepath="M2_REPO/junit/junit/3.8.1/junit-3.8.1-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/testng/testng/5.6/testng-5.6-jdk15.jar"/>
   <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
diff --git a/services/imports/3rdparty/nuxeo-platform-cs-imports/.project b/services/imports/3rdparty/nuxeo-platform-cs-imports/.project
index d2c371ceb..2b9e8ff61 100755
--- a/services/imports/3rdparty/nuxeo-platform-cs-imports/.project
+++ b/services/imports/3rdparty/nuxeo-platform-cs-imports/.project
@@ -1,17 +1,17 @@
 <projectDescription>
-	<name>org.collectionspace.services.imports.3rdparty.nuxeo</name>
+  <name>org.collectionspace.services.imports.3rdparty.nuxeo</name>
   <comment>Imports Nuxeo Document Type. NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.</comment>
   <projects/>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-		</buildCommand>
-		<buildCommand>
-			<name>org.maven.ide.eclipse.maven2Builder</name>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.maven.ide.eclipse.maven2Nature</nature>
-	</natures>
+  <buildSpec>
+    <buildCommand>
+      <name>org.eclipse.jdt.core.javabuilder</name>
+    </buildCommand>
+    <buildCommand>
+      <name>org.maven.ide.eclipse.maven2Builder</name>
+    </buildCommand>
+  </buildSpec>
+  <natures>
+    <nature>org.eclipse.jdt.core.javanature</nature>
+    <nature>org.maven.ide.eclipse.maven2Nature</nature>
+  </natures>
 </projectDescription>
\ No newline at end of file
diff --git a/services/imports/jaxb/.classpath b/services/imports/jaxb/.classpath
index 981c9add6..1674079c1 100644
--- a/services/imports/jaxb/.classpath
+++ b/services/imports/jaxb/.classpath
@@ -3,7 +3,7 @@
   <classpathentry kind="src" path="src/main/java" including="**/*.java"/>
   <classpathentry kind="src" path="target/generated-sources/xjc"/>
   <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/>
-	<classpathentry kind="output" path="target/classes"/>
+  <classpathentry kind="output" path="target/classes"/>
   <classpathentry kind="var" path="M2_REPO/javax/activation/activation/1.1/activation-1.1.jar" sourcepath="M2_REPO/javax/activation/activation/1.1/activation-1.1-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/javax/xml/bind/jaxb-api/2.1/jaxb-api-2.1.jar" sourcepath="M2_REPO/javax/xml/bind/jaxb-api/2.1/jaxb-api-2.1-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/javax/xml/stream/stax-api/1.0-2/stax-api-1.0-2.jar" sourcepath="M2_REPO/javax/xml/stream/stax-api/1.0-2/stax-api-1.0-2-sources.jar"/>
diff --git a/services/imports/jaxb/.project b/services/imports/jaxb/.project
index 9c5e7b8c3..461ca969c 100755
--- a/services/imports/jaxb/.project
+++ b/services/imports/jaxb/.project
@@ -1,19 +1,19 @@
 <projectDescription>
-	<name>org.collectionspace.services.imports.jaxb</name>
+  <name>org.collectionspace.services.imports.jaxb</name>
   <comment>NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.</comment>
-	<projects>
+  <projects>
     <project>org.collectionspace.services.jaxb</project>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-		</buildCommand>
-		<buildCommand>
-			<name>org.maven.ide.eclipse.maven2Builder</name>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.maven.ide.eclipse.maven2Nature</nature>
-	</natures>
+  </projects>
+  <buildSpec>
+    <buildCommand>
+      <name>org.eclipse.jdt.core.javabuilder</name>
+    </buildCommand>
+    <buildCommand>
+      <name>org.maven.ide.eclipse.maven2Builder</name>
+    </buildCommand>
+  </buildSpec>
+  <natures>
+    <nature>org.eclipse.jdt.core.javanature</nature>
+    <nature>org.maven.ide.eclipse.maven2Nature</nature>
+  </natures>
 </projectDescription>
\ No newline at end of file
diff --git a/services/imports/service/.classpath b/services/imports/service/.classpath
index 6e90c0fd1..9f95a7d78 100755
--- a/services/imports/service/.classpath
+++ b/services/imports/service/.classpath
@@ -3,13 +3,18 @@
   <classpathentry kind="src" path="src/test/resources" output="target/test-classes" excluding="**/*.java"/>
   <classpathentry kind="src" path="src/main/java" including="**/*.java"/>
   <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/>
-	<classpathentry kind="output" path="target/classes"/>
+  <classpathentry kind="output" path="target/classes"/>
   <classpathentry kind="var" path="M2_REPO/javax/activation/activation/1.1/activation-1.1.jar" sourcepath="M2_REPO/javax/activation/activation/1.1/activation-1.1-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/javax/script/bsh-engine/1.0/bsh-engine-1.0.jar"/>
   <classpathentry kind="var" path="M2_REPO/javax/security/jaas/1.0.01/jaas-1.0.01.jar"/>
   <classpathentry kind="var" path="M2_REPO/javax/media/jai_core/1.1.2_01/jai_core-1.1.2_01.jar"/>
   <classpathentry kind="var" path="M2_REPO/javax/xml/bind/jaxb-api/2.1/jaxb-api-2.1.jar" sourcepath="M2_REPO/javax/xml/bind/jaxb-api/2.1/jaxb-api-2.1-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/javax/script/jexl-engine/1.0/jexl-engine-1.0.jar"/>
+  <classpathentry kind="var" path="M2_REPO/javax/script/jruby-engine/1.0/jruby-engine-1.0.jar"/>
+  <classpathentry kind="var" path="M2_REPO/javax/script/js-engine/1.0/js-engine-1.0.jar"/>
   <classpathentry kind="var" path="M2_REPO/javax/annotation/jsr250-api/1.0/jsr250-api-1.0.jar" sourcepath="M2_REPO/javax/annotation/jsr250-api/1.0/jsr250-api-1.0-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/javax/transaction/jta/1.1/jta-1.1.jar" sourcepath="M2_REPO/javax/transaction/jta/1.1/jta-1.1-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/javax/script/jython-engine/1.0/jython-engine-1.0.jar"/>
   <classpathentry kind="var" path="M2_REPO/javax/mail/mail/1.4/mail-1.4.jar" sourcepath="M2_REPO/javax/mail/mail/1.4/mail-1.4-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/javax/persistence/persistence-api/1.0/persistence-api-1.0.jar" sourcepath="M2_REPO/javax/persistence/persistence-api/1.0/persistence-api-1.0-sources.jar">
     <attributes>
@@ -24,6 +29,10 @@
       <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/james/apache-mime4j/0.6/apache-mime4j-0.6-javadoc.jar!/" name="javadoc_location"/>
     </attributes>
   </classpathentry>
+  <classpathentry kind="var" path="M2_REPO/asm/asm/2.2.3/asm-2.2.3.jar"/>
+  <classpathentry kind="var" path="M2_REPO/asm/asm-commons/2.2.3/asm-commons-2.2.3.jar"/>
+  <classpathentry kind="var" path="M2_REPO/asm/asm-tree/2.2.3/asm-tree-2.2.3.jar"/>
+  <classpathentry kind="var" path="M2_REPO/backport-util-concurrent/backport-util-concurrent/3.1/backport-util-concurrent-3.1.jar"/>
   <classpathentry kind="var" path="M2_REPO/classworlds/classworlds/1.1/classworlds-1.1.jar" sourcepath="M2_REPO/classworlds/classworlds/1.1/classworlds-1.1-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/com/noelios/restlet/com.noelios.restlet/1.0.7/com.noelios.restlet-1.0.7.jar" sourcepath="M2_REPO/com/noelios/restlet/com.noelios.restlet/1.0.7/com.noelios.restlet-1.0.7-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/com/noelios/restlet/com.noelios.restlet.ext.httpclient/1.0.7/com.noelios.restlet.ext.httpclient-1.0.7.jar" sourcepath="M2_REPO/com/noelios/restlet/com.noelios.restlet.ext.httpclient/1.0.7/com.noelios.restlet.ext.httpclient-1.0.7-sources.jar"/>
@@ -94,7 +103,10 @@
   <classpathentry kind="var" path="M2_REPO/org/slf4j/jcl-over-slf4j/1.5.8/jcl-over-slf4j-1.5.8.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/mortbay/jetty/jetty/6.1H.7/jetty-6.1H.7.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/mortbay/jetty/jetty-util/6.1H.7/jetty-util-6.1H.7.jar"/>
+  <classpathentry kind="var" path="M2_REPO/jline/jline/0.9.94/jline-0.9.94.jar"/>
   <classpathentry kind="var" path="M2_REPO/joda-time/joda-time/1.6/joda-time-1.6.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jruby/jruby/1.0.3/jruby-1.0.3.jar"/>
+  <classpathentry kind="var" path="M2_REPO/rhino/js/1.7R1/js-1.7R1.jar"/>
   <classpathentry kind="var" path="M2_REPO/com/jcraft/jsch/0.1.27/jsch-0.1.27.jar" sourcepath="M2_REPO/com/jcraft/jsch/0.1.27/jsch-0.1.27-sources.jar">
     <attributes>
       <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/com/jcraft/jsch/0.1.27/jsch-0.1.27-javadoc.jar!/" name="javadoc_location"/>
@@ -106,7 +118,7 @@
       <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/junit/junit/4.1/junit-4.1-javadoc.jar!/" name="javadoc_location"/>
     </attributes>
   </classpathentry>
-  <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14.jar" sourcepath="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/python/jython/2.2.1/jython-2.2.1.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-artifact/2.0.6/maven-artifact-2.0.6.jar" sourcepath="M2_REPO/org/apache/maven/maven-artifact/2.0.6/maven-artifact-2.0.6-sources.jar">
     <attributes>
       <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/maven-artifact/2.0.6/maven-artifact-2.0.6-javadoc.jar!/" name="javadoc_location"/>
@@ -206,30 +218,35 @@
   <classpathentry kind="var" path="M2_REPO/org/nuxeo/ecm/core/nuxeo-core-query/1.6.2/nuxeo-core-query-1.6.2.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/nuxeo/ecm/core/nuxeo-core-schema/1.6.2/nuxeo-core-schema-1.6.2.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/nuxeo/ecm/core/nuxeo-core-storage-sql/1.6.2/nuxeo-core-storage-sql-1.6.2.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/nuxeo/ecm/platform/nuxeo-platform-api/5.3.2/nuxeo-platform-api-5.3.2.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/nuxeo/ecm/platform/nuxeo-platform-commandline-executor/5.3.2/nuxeo-platform-commandline-executor-5.3.2.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/nuxeo/ecm/platform/nuxeo-platform-directory-api/5.3.2/nuxeo-platform-directory-api-5.3.2.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/nuxeo/ecm/platform/nuxeo-platform-filemanager-api/5.3.2/nuxeo-platform-filemanager-api-5.3.2.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/nuxeo/ecm/platform/nuxeo-platform-filemanager-core/5.3.2/nuxeo-platform-filemanager-core-5.3.2.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/nuxeo/ecm/platform/nuxeo-platform-forms-layout-api/5.3.2/nuxeo-platform-forms-layout-api-5.3.2.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/nuxeo/ecm/platform/nuxeo-platform-imaging-api/5.3.2/nuxeo-platform-imaging-api-5.3.2.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/nuxeo/ecm/platform/nuxeo-platform-imaging-core/5.3.2/nuxeo-platform-imaging-core-5.3.2.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/nuxeo/ecm/platform/nuxeo-platform-login/5.3.2/nuxeo-platform-login-5.3.2.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/nuxeo/ecm/platform/nuxeo-platform-mimetype-api/5.3.2/nuxeo-platform-mimetype-api-5.3.2.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/nuxeo/ecm/platform/nuxeo-platform-search-api/5.3.2/nuxeo-platform-search-api-5.3.2.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/nuxeo/ecm/platform/nuxeo-platform-types-api/5.3.2/nuxeo-platform-types-api-5.3.2.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/nuxeo/ecm/platform/nuxeo-platform-usermanager-api/5.3.2/nuxeo-platform-usermanager-api-5.3.2.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/nuxeo/ecm/platform/nuxeo-platform-versioning-api/5.3.2/nuxeo-platform-versioning-api-5.3.2.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/nuxeo/runtime/nuxeo-runtime/1.6.2/nuxeo-runtime-1.6.2.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/nuxeo/runtime/nuxeo-runtime-jtajca/1.6.2/nuxeo-runtime-jtajca-1.6.2.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/nuxeo/runtime/nuxeo-runtime-management/1.6.2/nuxeo-runtime-management-1.6.2.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/nuxeo/runtime/nuxeo-runtime-osgi/1.6.2/nuxeo-runtime-osgi-1.6.2.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/nuxeo/runtime/nuxeo-runtime-scripting/1.6.2/nuxeo-runtime-scripting-1.6.2.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/nuxeo/ecm/platform/nuxeo-shell-core/5.3.2/nuxeo-shell-core-5.3.2.jar" sourcepath="M2_REPO/org/nuxeo/ecm/platform/nuxeo-shell-core/5.3.2/nuxeo-shell-core-5.3.2-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/net/java/dev/mistral/Operations/0.9.5/Operations-0.9.5.jar"/>
   <classpathentry kind="src" path="/org.collectionspace.services.3rdparty.nuxeo.quote-api"/>
+  <classpathentry kind="src" path="/org.collectionspace.services.client"/>
   <classpathentry kind="src" path="/org.collectionspace.services.collectionobject.jaxb"/>
   <classpathentry kind="src" path="/org.collectionspace.services.common"/>
-  <classpathentry kind="src" path="/org.collectionspace.services.contact.client"/>
-  <classpathentry kind="src" path="/org.collectionspace.services.contact.jaxb"/>
+  <classpathentry kind="src" path="/org.collectionspace.services.common-api"/>
   <classpathentry kind="src" path="/org.collectionspace.services.hyperjaxb"/>
-  <classpathentry kind="src" path="/org.collectionspace.services.jaxb"/>
   <classpathentry kind="src" path="/org.collectionspace.services.imports.jaxb"/>
-  <classpathentry kind="src" path="/org.collectionspace.services.person.client"/>
-  <classpathentry kind="src" path="/org.collectionspace.services.person.jaxb"/>
+  <classpathentry kind="src" path="/org.collectionspace.services.jaxb"/>
   <classpathentry kind="var" path="M2_REPO/org/osgi/org.osgi.core/4.1.0/org.osgi.core-4.1.0.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/restlet/org.restlet/1.0.7/org.restlet-1.0.7.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/codehaus/plexus/plexus-container-default/1.0-alpha-9-stable-1/plexus-container-default-1.0-alpha-9-stable-1.jar" sourcepath="M2_REPO/org/codehaus/plexus/plexus-container-default/1.0-alpha-9-stable-1/plexus-container-default-1.0-alpha-9-stable-1-sources.jar">
@@ -257,7 +274,6 @@
   <classpathentry kind="var" path="M2_REPO/org/mortbay/jetty/servlet-api-2.5/6.1H.7/servlet-api-2.5-6.1H.7.jar"/>
   <classpathentry kind="var" path="M2_REPO/com/sun/xml/stream/sjsxp/1.0.1/sjsxp-1.0.1.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.5.8/slf4j-api-1.5.8.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-log4j12/1.5.8/slf4j-log4j12-1.5.8.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-simple/1.5.8/slf4j-simple-1.5.8.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/apache/maven/surefire/surefire-api/2.4.3/surefire-api-2.4.3.jar" sourcepath="M2_REPO/org/apache/maven/surefire/surefire-api/2.4.3/surefire-api-2.4.3-sources.jar">
     <attributes>
diff --git a/services/imports/service/.project b/services/imports/service/.project
index a5e0530df..13ea934d7 100755
--- a/services/imports/service/.project
+++ b/services/imports/service/.project
@@ -1,28 +1,26 @@
 <projectDescription>
-	<name>org.collectionspace.services.imports.service</name>
+  <name>org.collectionspace.services.imports.service</name>
   <comment>NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.</comment>
-	<projects>
+  <projects>
     <project>org.collectionspace.services.3rdparty.nuxeo.quote-api</project>
+    <project>org.collectionspace.services.client</project>
     <project>org.collectionspace.services.collectionobject.jaxb</project>
     <project>org.collectionspace.services.common</project>
-    <project>org.collectionspace.services.contact.client</project>
-    <project>org.collectionspace.services.contact.jaxb</project>
+    <project>org.collectionspace.services.common-api</project>
     <project>org.collectionspace.services.hyperjaxb</project>
-    <project>org.collectionspace.services.jaxb</project>
     <project>org.collectionspace.services.imports.jaxb</project>
-    <project>org.collectionspace.services.person.client</project>
-    <project>org.collectionspace.services.person.jaxb</project>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-		</buildCommand>
-		<buildCommand>
-			<name>org.maven.ide.eclipse.maven2Builder</name>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.maven.ide.eclipse.maven2Nature</nature>
-	</natures>
+    <project>org.collectionspace.services.jaxb</project>
+  </projects>
+  <buildSpec>
+    <buildCommand>
+      <name>org.eclipse.jdt.core.javabuilder</name>
+    </buildCommand>
+    <buildCommand>
+      <name>org.maven.ide.eclipse.maven2Builder</name>
+    </buildCommand>
+  </buildSpec>
+  <natures>
+    <nature>org.eclipse.jdt.core.javanature</nature>
+    <nature>org.maven.ide.eclipse.maven2Nature</nature>
+  </natures>
 </projectDescription>
\ No newline at end of file
diff --git a/services/intake/client/.classpath b/services/intake/client/.classpath
index 77b1357ce..2a6fbbdd1 100644
--- a/services/intake/client/.classpath
+++ b/services/intake/client/.classpath
@@ -222,6 +222,7 @@
   <classpathentry kind="src" path="/org.collectionspace.services.3rdparty.nuxeo.quote-api"/>
   <classpathentry kind="src" path="/org.collectionspace.services.client"/>
   <classpathentry kind="src" path="/org.collectionspace.services.common"/>
+  <classpathentry kind="src" path="/org.collectionspace.services.common-api"/>
   <classpathentry kind="src" path="/org.collectionspace.services.contact.client"/>
   <classpathentry kind="src" path="/org.collectionspace.services.contact.jaxb"/>
   <classpathentry kind="src" path="/org.collectionspace.services.hyperjaxb"/>
diff --git a/services/intake/client/.project b/services/intake/client/.project
index 3b78877f1..9c869c7c8 100644
--- a/services/intake/client/.project
+++ b/services/intake/client/.project
@@ -5,6 +5,7 @@
     <project>org.collectionspace.services.3rdparty.nuxeo.quote-api</project>
     <project>org.collectionspace.services.client</project>
     <project>org.collectionspace.services.common</project>
+    <project>org.collectionspace.services.common-api</project>
     <project>org.collectionspace.services.contact.client</project>
     <project>org.collectionspace.services.contact.jaxb</project>
     <project>org.collectionspace.services.hyperjaxb</project>
diff --git a/services/intake/service/.classpath b/services/intake/service/.classpath
index b3934d16c..73541f76e 100644
--- a/services/intake/service/.classpath
+++ b/services/intake/service/.classpath
@@ -224,6 +224,7 @@
   <classpathentry kind="src" path="/org.collectionspace.services.client"/>
   <classpathentry kind="src" path="/org.collectionspace.services.collectionobject.jaxb"/>
   <classpathentry kind="src" path="/org.collectionspace.services.common"/>
+  <classpathentry kind="src" path="/org.collectionspace.services.common-api"/>
   <classpathentry kind="src" path="/org.collectionspace.services.contact.client"/>
   <classpathentry kind="src" path="/org.collectionspace.services.contact.jaxb"/>
   <classpathentry kind="src" path="/org.collectionspace.services.hyperjaxb"/>
diff --git a/services/intake/service/.project b/services/intake/service/.project
index 71ba8ebf3..85638c0d0 100644
--- a/services/intake/service/.project
+++ b/services/intake/service/.project
@@ -6,6 +6,7 @@
     <project>org.collectionspace.services.client</project>
     <project>org.collectionspace.services.collectionobject.jaxb</project>
     <project>org.collectionspace.services.common</project>
+    <project>org.collectionspace.services.common-api</project>
     <project>org.collectionspace.services.contact.client</project>
     <project>org.collectionspace.services.contact.jaxb</project>
     <project>org.collectionspace.services.hyperjaxb</project>
diff --git a/services/loanin/client/.classpath b/services/loanin/client/.classpath
index ef0a73edb..d1946ffc6 100644
--- a/services/loanin/client/.classpath
+++ b/services/loanin/client/.classpath
@@ -222,6 +222,7 @@
   <classpathentry kind="src" path="/org.collectionspace.services.3rdparty.nuxeo.quote-api"/>
   <classpathentry kind="src" path="/org.collectionspace.services.client"/>
   <classpathentry kind="src" path="/org.collectionspace.services.common"/>
+  <classpathentry kind="src" path="/org.collectionspace.services.common-api"/>
   <classpathentry kind="src" path="/org.collectionspace.services.contact.client"/>
   <classpathentry kind="src" path="/org.collectionspace.services.contact.jaxb"/>
   <classpathentry kind="src" path="/org.collectionspace.services.hyperjaxb"/>
diff --git a/services/loanin/client/.project b/services/loanin/client/.project
index 15255f64c..fc15277e9 100644
--- a/services/loanin/client/.project
+++ b/services/loanin/client/.project
@@ -5,6 +5,7 @@
     <project>org.collectionspace.services.3rdparty.nuxeo.quote-api</project>
     <project>org.collectionspace.services.client</project>
     <project>org.collectionspace.services.common</project>
+    <project>org.collectionspace.services.common-api</project>
     <project>org.collectionspace.services.contact.client</project>
     <project>org.collectionspace.services.contact.jaxb</project>
     <project>org.collectionspace.services.hyperjaxb</project>
diff --git a/services/loanin/service/.classpath b/services/loanin/service/.classpath
index 7d000121f..7577fffaa 100644
--- a/services/loanin/service/.classpath
+++ b/services/loanin/service/.classpath
@@ -223,6 +223,7 @@
   <classpathentry kind="src" path="/org.collectionspace.services.client"/>
   <classpathentry kind="src" path="/org.collectionspace.services.collectionobject.jaxb"/>
   <classpathentry kind="src" path="/org.collectionspace.services.common"/>
+  <classpathentry kind="src" path="/org.collectionspace.services.common-api"/>
   <classpathentry kind="src" path="/org.collectionspace.services.hyperjaxb"/>
   <classpathentry kind="src" path="/org.collectionspace.services.jaxb"/>
   <classpathentry kind="src" path="/org.collectionspace.services.loanin.jaxb"/>
diff --git a/services/loanin/service/.project b/services/loanin/service/.project
index 29358a23e..938b267e3 100644
--- a/services/loanin/service/.project
+++ b/services/loanin/service/.project
@@ -6,6 +6,7 @@
     <project>org.collectionspace.services.client</project>
     <project>org.collectionspace.services.collectionobject.jaxb</project>
     <project>org.collectionspace.services.common</project>
+    <project>org.collectionspace.services.common-api</project>
     <project>org.collectionspace.services.hyperjaxb</project>
     <project>org.collectionspace.services.jaxb</project>
     <project>org.collectionspace.services.loanin.jaxb</project>
diff --git a/services/loanout/client/.classpath b/services/loanout/client/.classpath
index dea726001..2a2845a5c 100644
--- a/services/loanout/client/.classpath
+++ b/services/loanout/client/.classpath
@@ -222,6 +222,7 @@
   <classpathentry kind="src" path="/org.collectionspace.services.3rdparty.nuxeo.quote-api"/>
   <classpathentry kind="src" path="/org.collectionspace.services.client"/>
   <classpathentry kind="src" path="/org.collectionspace.services.common"/>
+  <classpathentry kind="src" path="/org.collectionspace.services.common-api"/>
   <classpathentry kind="src" path="/org.collectionspace.services.contact.client"/>
   <classpathentry kind="src" path="/org.collectionspace.services.contact.jaxb"/>
   <classpathentry kind="src" path="/org.collectionspace.services.hyperjaxb"/>
diff --git a/services/loanout/client/.project b/services/loanout/client/.project
index d65904217..b7ecbdba8 100644
--- a/services/loanout/client/.project
+++ b/services/loanout/client/.project
@@ -5,6 +5,7 @@
     <project>org.collectionspace.services.3rdparty.nuxeo.quote-api</project>
     <project>org.collectionspace.services.client</project>
     <project>org.collectionspace.services.common</project>
+    <project>org.collectionspace.services.common-api</project>
     <project>org.collectionspace.services.contact.client</project>
     <project>org.collectionspace.services.contact.jaxb</project>
     <project>org.collectionspace.services.hyperjaxb</project>
diff --git a/services/loanout/service/.classpath b/services/loanout/service/.classpath
index 392ed8c3b..4d10ee233 100644
--- a/services/loanout/service/.classpath
+++ b/services/loanout/service/.classpath
@@ -223,6 +223,7 @@
   <classpathentry kind="src" path="/org.collectionspace.services.client"/>
   <classpathentry kind="src" path="/org.collectionspace.services.collectionobject.jaxb"/>
   <classpathentry kind="src" path="/org.collectionspace.services.common"/>
+  <classpathentry kind="src" path="/org.collectionspace.services.common-api"/>
   <classpathentry kind="src" path="/org.collectionspace.services.hyperjaxb"/>
   <classpathentry kind="src" path="/org.collectionspace.services.jaxb"/>
   <classpathentry kind="src" path="/org.collectionspace.services.loanout.jaxb"/>
diff --git a/services/loanout/service/.project b/services/loanout/service/.project
index fa0612f42..16de770fa 100644
--- a/services/loanout/service/.project
+++ b/services/loanout/service/.project
@@ -6,6 +6,7 @@
     <project>org.collectionspace.services.client</project>
     <project>org.collectionspace.services.collectionobject.jaxb</project>
     <project>org.collectionspace.services.common</project>
+    <project>org.collectionspace.services.common-api</project>
     <project>org.collectionspace.services.hyperjaxb</project>
     <project>org.collectionspace.services.jaxb</project>
     <project>org.collectionspace.services.loanout.jaxb</project>
diff --git a/services/location/client/.classpath b/services/location/client/.classpath
index 537376c62..f1604a141 100644
--- a/services/location/client/.classpath
+++ b/services/location/client/.classpath
@@ -222,6 +222,7 @@
   <classpathentry kind="src" path="/org.collectionspace.services.3rdparty.nuxeo.quote-api"/>
   <classpathentry kind="src" path="/org.collectionspace.services.client"/>
   <classpathentry kind="src" path="/org.collectionspace.services.common"/>
+  <classpathentry kind="src" path="/org.collectionspace.services.common-api"/>
   <classpathentry kind="src" path="/org.collectionspace.services.contact.client"/>
   <classpathentry kind="src" path="/org.collectionspace.services.contact.jaxb"/>
   <classpathentry kind="src" path="/org.collectionspace.services.hyperjaxb"/>
diff --git a/services/location/client/.project b/services/location/client/.project
index a4a6af99b..a404ef3ad 100644
--- a/services/location/client/.project
+++ b/services/location/client/.project
@@ -5,6 +5,7 @@
     <project>org.collectionspace.services.3rdparty.nuxeo.quote-api</project>
     <project>org.collectionspace.services.client</project>
     <project>org.collectionspace.services.common</project>
+    <project>org.collectionspace.services.common-api</project>
     <project>org.collectionspace.services.contact.client</project>
     <project>org.collectionspace.services.contact.jaxb</project>
     <project>org.collectionspace.services.hyperjaxb</project>
diff --git a/services/location/jaxb/.classpath b/services/location/jaxb/.classpath
index cee9a1505..7bf1230ad 100644
--- a/services/location/jaxb/.classpath
+++ b/services/location/jaxb/.classpath
@@ -218,6 +218,7 @@
   <classpathentry kind="src" path="/org.collectionspace.services.3rdparty.nuxeo.quote-api"/>
   <classpathentry kind="src" path="/org.collectionspace.services.client"/>
   <classpathentry kind="src" path="/org.collectionspace.services.common"/>
+  <classpathentry kind="src" path="/org.collectionspace.services.common-api"/>
   <classpathentry kind="src" path="/org.collectionspace.services.hyperjaxb"/>
   <classpathentry kind="src" path="/org.collectionspace.services.jaxb"/>
   <classpathentry kind="var" path="M2_REPO/org/osgi/org.osgi.core/4.1.0/org.osgi.core-4.1.0.jar"/>
diff --git a/services/location/jaxb/.project b/services/location/jaxb/.project
index 844dc46a2..6241fd4aa 100644
--- a/services/location/jaxb/.project
+++ b/services/location/jaxb/.project
@@ -5,6 +5,7 @@
     <project>org.collectionspace.services.3rdparty.nuxeo.quote-api</project>
     <project>org.collectionspace.services.client</project>
     <project>org.collectionspace.services.common</project>
+    <project>org.collectionspace.services.common-api</project>
     <project>org.collectionspace.services.hyperjaxb</project>
     <project>org.collectionspace.services.jaxb</project>
   </projects>
diff --git a/services/location/service/.classpath b/services/location/service/.classpath
index c3a821e3b..78a0f0efb 100644
--- a/services/location/service/.classpath
+++ b/services/location/service/.classpath
@@ -224,6 +224,7 @@
   <classpathentry kind="src" path="/org.collectionspace.services.3rdparty.nuxeo.quote-api"/>
   <classpathentry kind="src" path="/org.collectionspace.services.client"/>
   <classpathentry kind="src" path="/org.collectionspace.services.common"/>
+  <classpathentry kind="src" path="/org.collectionspace.services.common-api"/>
   <classpathentry kind="src" path="/org.collectionspace.services.contact.client"/>
   <classpathentry kind="src" path="/org.collectionspace.services.contact.jaxb"/>
   <classpathentry kind="src" path="/org.collectionspace.services.contact.service"/>
diff --git a/services/location/service/.project b/services/location/service/.project
index d0fec3d7a..2a7dc05e9 100644
--- a/services/location/service/.project
+++ b/services/location/service/.project
@@ -5,6 +5,7 @@
     <project>org.collectionspace.services.3rdparty.nuxeo.quote-api</project>
     <project>org.collectionspace.services.client</project>
     <project>org.collectionspace.services.common</project>
+    <project>org.collectionspace.services.common-api</project>
     <project>org.collectionspace.services.contact.client</project>
     <project>org.collectionspace.services.contact.jaxb</project>
     <project>org.collectionspace.services.contact.service</project>
diff --git a/services/media/client/.classpath b/services/media/client/.classpath
index 434e0e92f..3b101297c 100644
--- a/services/media/client/.classpath
+++ b/services/media/client/.classpath
@@ -223,6 +223,7 @@
   <classpathentry kind="src" path="/org.collectionspace.services.blob.client"/>
   <classpathentry kind="src" path="/org.collectionspace.services.client"/>
   <classpathentry kind="src" path="/org.collectionspace.services.common"/>
+  <classpathentry kind="src" path="/org.collectionspace.services.common-api"/>
   <classpathentry kind="src" path="/org.collectionspace.services.contact.client"/>
   <classpathentry kind="src" path="/org.collectionspace.services.contact.jaxb"/>
   <classpathentry kind="src" path="/org.collectionspace.services.hyperjaxb"/>
diff --git a/services/media/client/.project b/services/media/client/.project
index 34b941dfc..6bd9aa3ca 100644
--- a/services/media/client/.project
+++ b/services/media/client/.project
@@ -6,6 +6,7 @@
     <project>org.collectionspace.services.blob.client</project>
     <project>org.collectionspace.services.client</project>
     <project>org.collectionspace.services.common</project>
+    <project>org.collectionspace.services.common-api</project>
     <project>org.collectionspace.services.contact.client</project>
     <project>org.collectionspace.services.contact.jaxb</project>
     <project>org.collectionspace.services.hyperjaxb</project>
diff --git a/services/media/service/.classpath b/services/media/service/.classpath
index 8f441e58c..4e4d389d3 100644
--- a/services/media/service/.classpath
+++ b/services/media/service/.classpath
@@ -226,6 +226,7 @@
   <classpathentry kind="src" path="/org.collectionspace.services.client"/>
   <classpathentry kind="src" path="/org.collectionspace.services.collectionobject.jaxb"/>
   <classpathentry kind="src" path="/org.collectionspace.services.common"/>
+  <classpathentry kind="src" path="/org.collectionspace.services.common-api"/>
   <classpathentry kind="src" path="/org.collectionspace.services.contact.client"/>
   <classpathentry kind="src" path="/org.collectionspace.services.contact.jaxb"/>
   <classpathentry kind="src" path="/org.collectionspace.services.hyperjaxb"/>
diff --git a/services/media/service/.project b/services/media/service/.project
index 977951afc..1927ea583 100644
--- a/services/media/service/.project
+++ b/services/media/service/.project
@@ -8,6 +8,7 @@
     <project>org.collectionspace.services.client</project>
     <project>org.collectionspace.services.collectionobject.jaxb</project>
     <project>org.collectionspace.services.common</project>
+    <project>org.collectionspace.services.common-api</project>
     <project>org.collectionspace.services.contact.client</project>
     <project>org.collectionspace.services.contact.jaxb</project>
     <project>org.collectionspace.services.hyperjaxb</project>
diff --git a/services/movement/client/.classpath b/services/movement/client/.classpath
index 0a8ef65f0..2cebd10c8 100644
--- a/services/movement/client/.classpath
+++ b/services/movement/client/.classpath
@@ -222,6 +222,7 @@
   <classpathentry kind="src" path="/org.collectionspace.services.3rdparty.nuxeo.quote-api"/>
   <classpathentry kind="src" path="/org.collectionspace.services.client"/>
   <classpathentry kind="src" path="/org.collectionspace.services.common"/>
+  <classpathentry kind="src" path="/org.collectionspace.services.common-api"/>
   <classpathentry kind="src" path="/org.collectionspace.services.contact.client"/>
   <classpathentry kind="src" path="/org.collectionspace.services.contact.jaxb"/>
   <classpathentry kind="src" path="/org.collectionspace.services.hyperjaxb"/>
diff --git a/services/movement/client/.project b/services/movement/client/.project
index 9bdf08abc..fa4f4ed62 100644
--- a/services/movement/client/.project
+++ b/services/movement/client/.project
@@ -5,6 +5,7 @@
     <project>org.collectionspace.services.3rdparty.nuxeo.quote-api</project>
     <project>org.collectionspace.services.client</project>
     <project>org.collectionspace.services.common</project>
+    <project>org.collectionspace.services.common-api</project>
     <project>org.collectionspace.services.contact.client</project>
     <project>org.collectionspace.services.contact.jaxb</project>
     <project>org.collectionspace.services.hyperjaxb</project>
diff --git a/services/movement/service/.classpath b/services/movement/service/.classpath
index de60937f9..d0ecca7d6 100644
--- a/services/movement/service/.classpath
+++ b/services/movement/service/.classpath
@@ -223,6 +223,7 @@
   <classpathentry kind="src" path="/org.collectionspace.services.client"/>
   <classpathentry kind="src" path="/org.collectionspace.services.collectionobject.jaxb"/>
   <classpathentry kind="src" path="/org.collectionspace.services.common"/>
+  <classpathentry kind="src" path="/org.collectionspace.services.common-api"/>
   <classpathentry kind="src" path="/org.collectionspace.services.hyperjaxb"/>
   <classpathentry kind="src" path="/org.collectionspace.services.jaxb"/>
   <classpathentry kind="src" path="/org.collectionspace.services.movement.jaxb"/>
diff --git a/services/movement/service/.project b/services/movement/service/.project
index 76a211689..1f3d9d854 100644
--- a/services/movement/service/.project
+++ b/services/movement/service/.project
@@ -6,6 +6,7 @@
     <project>org.collectionspace.services.client</project>
     <project>org.collectionspace.services.collectionobject.jaxb</project>
     <project>org.collectionspace.services.common</project>
+    <project>org.collectionspace.services.common-api</project>
     <project>org.collectionspace.services.hyperjaxb</project>
     <project>org.collectionspace.services.jaxb</project>
     <project>org.collectionspace.services.movement.jaxb</project>
diff --git a/services/note/client/.classpath b/services/note/client/.classpath
index 1c7fc10c8..e907cf826 100644
--- a/services/note/client/.classpath
+++ b/services/note/client/.classpath
@@ -222,6 +222,7 @@
   <classpathentry kind="src" path="/org.collectionspace.services.3rdparty.nuxeo.quote-api"/>
   <classpathentry kind="src" path="/org.collectionspace.services.client"/>
   <classpathentry kind="src" path="/org.collectionspace.services.common"/>
+  <classpathentry kind="src" path="/org.collectionspace.services.common-api"/>
   <classpathentry kind="src" path="/org.collectionspace.services.hyperjaxb"/>
   <classpathentry kind="src" path="/org.collectionspace.services.jaxb"/>
   <classpathentry kind="src" path="/org.collectionspace.services.note.jaxb"/>
diff --git a/services/note/client/.project b/services/note/client/.project
index 236f14607..03eff6866 100644
--- a/services/note/client/.project
+++ b/services/note/client/.project
@@ -5,6 +5,7 @@
     <project>org.collectionspace.services.3rdparty.nuxeo.quote-api</project>
     <project>org.collectionspace.services.client</project>
     <project>org.collectionspace.services.common</project>
+    <project>org.collectionspace.services.common-api</project>
     <project>org.collectionspace.services.hyperjaxb</project>
     <project>org.collectionspace.services.jaxb</project>
     <project>org.collectionspace.services.note.jaxb</project>
diff --git a/services/note/service/.classpath b/services/note/service/.classpath
index 075a172bf..5af63aefe 100644
--- a/services/note/service/.classpath
+++ b/services/note/service/.classpath
@@ -218,6 +218,7 @@
   <classpathentry kind="src" path="/org.collectionspace.services.3rdparty.nuxeo.quote-api"/>
   <classpathentry kind="src" path="/org.collectionspace.services.client"/>
   <classpathentry kind="src" path="/org.collectionspace.services.common"/>
+  <classpathentry kind="src" path="/org.collectionspace.services.common-api"/>
   <classpathentry kind="src" path="/org.collectionspace.services.hyperjaxb"/>
   <classpathentry kind="src" path="/org.collectionspace.services.jaxb"/>
   <classpathentry kind="src" path="/org.collectionspace.services.note.jaxb"/>
diff --git a/services/note/service/.project b/services/note/service/.project
index 3403c1ac8..2ec65f14c 100644
--- a/services/note/service/.project
+++ b/services/note/service/.project
@@ -5,6 +5,7 @@
     <project>org.collectionspace.services.3rdparty.nuxeo.quote-api</project>
     <project>org.collectionspace.services.client</project>
     <project>org.collectionspace.services.common</project>
+    <project>org.collectionspace.services.common-api</project>
     <project>org.collectionspace.services.hyperjaxb</project>
     <project>org.collectionspace.services.jaxb</project>
     <project>org.collectionspace.services.note.jaxb</project>
diff --git a/services/objectexit/client/.classpath b/services/objectexit/client/.classpath
index 1e822df48..b8f40e6d1 100644
--- a/services/objectexit/client/.classpath
+++ b/services/objectexit/client/.classpath
@@ -222,6 +222,7 @@
   <classpathentry kind="src" path="/org.collectionspace.services.3rdparty.nuxeo.quote-api"/>
   <classpathentry kind="src" path="/org.collectionspace.services.client"/>
   <classpathentry kind="src" path="/org.collectionspace.services.common"/>
+  <classpathentry kind="src" path="/org.collectionspace.services.common-api"/>
   <classpathentry kind="src" path="/org.collectionspace.services.contact.client"/>
   <classpathentry kind="src" path="/org.collectionspace.services.contact.jaxb"/>
   <classpathentry kind="src" path="/org.collectionspace.services.hyperjaxb"/>
diff --git a/services/objectexit/client/.project b/services/objectexit/client/.project
index 350c4d0c2..07bffb00d 100644
--- a/services/objectexit/client/.project
+++ b/services/objectexit/client/.project
@@ -5,6 +5,7 @@
     <project>org.collectionspace.services.3rdparty.nuxeo.quote-api</project>
     <project>org.collectionspace.services.client</project>
     <project>org.collectionspace.services.common</project>
+    <project>org.collectionspace.services.common-api</project>
     <project>org.collectionspace.services.contact.client</project>
     <project>org.collectionspace.services.contact.jaxb</project>
     <project>org.collectionspace.services.hyperjaxb</project>
diff --git a/services/objectexit/service/.classpath b/services/objectexit/service/.classpath
index 75c1fbd9a..0448886f3 100644
--- a/services/objectexit/service/.classpath
+++ b/services/objectexit/service/.classpath
@@ -224,6 +224,7 @@
   <classpathentry kind="src" path="/org.collectionspace.services.client"/>
   <classpathentry kind="src" path="/org.collectionspace.services.collectionobject.jaxb"/>
   <classpathentry kind="src" path="/org.collectionspace.services.common"/>
+  <classpathentry kind="src" path="/org.collectionspace.services.common-api"/>
   <classpathentry kind="src" path="/org.collectionspace.services.contact.client"/>
   <classpathentry kind="src" path="/org.collectionspace.services.contact.jaxb"/>
   <classpathentry kind="src" path="/org.collectionspace.services.hyperjaxb"/>
diff --git a/services/objectexit/service/.project b/services/objectexit/service/.project
index 69c4537e9..229c95250 100644
--- a/services/objectexit/service/.project
+++ b/services/objectexit/service/.project
@@ -6,6 +6,7 @@
     <project>org.collectionspace.services.client</project>
     <project>org.collectionspace.services.collectionobject.jaxb</project>
     <project>org.collectionspace.services.common</project>
+    <project>org.collectionspace.services.common-api</project>
     <project>org.collectionspace.services.contact.client</project>
     <project>org.collectionspace.services.contact.jaxb</project>
     <project>org.collectionspace.services.hyperjaxb</project>
diff --git a/services/organization/client/.classpath b/services/organization/client/.classpath
index f3db35774..69da88ed7 100644
--- a/services/organization/client/.classpath
+++ b/services/organization/client/.classpath
@@ -222,6 +222,7 @@
   <classpathentry kind="src" path="/org.collectionspace.services.3rdparty.nuxeo.quote-api"/>
   <classpathentry kind="src" path="/org.collectionspace.services.client"/>
   <classpathentry kind="src" path="/org.collectionspace.services.common"/>
+  <classpathentry kind="src" path="/org.collectionspace.services.common-api"/>
   <classpathentry kind="src" path="/org.collectionspace.services.contact.client"/>
   <classpathentry kind="src" path="/org.collectionspace.services.contact.jaxb"/>
   <classpathentry kind="src" path="/org.collectionspace.services.hyperjaxb"/>
diff --git a/services/organization/client/.project b/services/organization/client/.project
index 594e2ea5b..a942cfc54 100644
--- a/services/organization/client/.project
+++ b/services/organization/client/.project
@@ -5,6 +5,7 @@
     <project>org.collectionspace.services.3rdparty.nuxeo.quote-api</project>
     <project>org.collectionspace.services.client</project>
     <project>org.collectionspace.services.common</project>
+    <project>org.collectionspace.services.common-api</project>
     <project>org.collectionspace.services.contact.client</project>
     <project>org.collectionspace.services.contact.jaxb</project>
     <project>org.collectionspace.services.hyperjaxb</project>
diff --git a/services/organization/jaxb/.classpath b/services/organization/jaxb/.classpath
index dec35912b..bad69b344 100644
--- a/services/organization/jaxb/.classpath
+++ b/services/organization/jaxb/.classpath
@@ -216,6 +216,7 @@
   <classpathentry kind="src" path="/org.collectionspace.services.3rdparty.nuxeo.quote-api"/>
   <classpathentry kind="src" path="/org.collectionspace.services.client"/>
   <classpathentry kind="src" path="/org.collectionspace.services.common"/>
+  <classpathentry kind="src" path="/org.collectionspace.services.common-api"/>
   <classpathentry kind="src" path="/org.collectionspace.services.hyperjaxb"/>
   <classpathentry kind="src" path="/org.collectionspace.services.jaxb"/>
   <classpathentry kind="var" path="M2_REPO/org/osgi/org.osgi.core/4.1.0/org.osgi.core-4.1.0.jar"/>
diff --git a/services/organization/jaxb/.project b/services/organization/jaxb/.project
index f8a2f5273..65ec42127 100644
--- a/services/organization/jaxb/.project
+++ b/services/organization/jaxb/.project
@@ -5,6 +5,7 @@
     <project>org.collectionspace.services.3rdparty.nuxeo.quote-api</project>
     <project>org.collectionspace.services.client</project>
     <project>org.collectionspace.services.common</project>
+    <project>org.collectionspace.services.common-api</project>
     <project>org.collectionspace.services.hyperjaxb</project>
     <project>org.collectionspace.services.jaxb</project>
   </projects>
diff --git a/services/organization/service/.classpath b/services/organization/service/.classpath
index 4dcf3830c..a8b35a443 100644
--- a/services/organization/service/.classpath
+++ b/services/organization/service/.classpath
@@ -227,6 +227,7 @@
   <classpathentry kind="src" path="/org.collectionspace.services.3rdparty.nuxeo.quote-api"/>
   <classpathentry kind="src" path="/org.collectionspace.services.client"/>
   <classpathentry kind="src" path="/org.collectionspace.services.common"/>
+  <classpathentry kind="src" path="/org.collectionspace.services.common-api"/>
   <classpathentry kind="src" path="/org.collectionspace.services.contact.client"/>
   <classpathentry kind="src" path="/org.collectionspace.services.contact.jaxb"/>
   <classpathentry kind="src" path="/org.collectionspace.services.contact.service"/>
diff --git a/services/organization/service/.project b/services/organization/service/.project
index fc80d1b2a..36ae2f12c 100644
--- a/services/organization/service/.project
+++ b/services/organization/service/.project
@@ -5,6 +5,7 @@
     <project>org.collectionspace.services.3rdparty.nuxeo.quote-api</project>
     <project>org.collectionspace.services.client</project>
     <project>org.collectionspace.services.common</project>
+    <project>org.collectionspace.services.common-api</project>
     <project>org.collectionspace.services.contact.client</project>
     <project>org.collectionspace.services.contact.jaxb</project>
     <project>org.collectionspace.services.contact.service</project>
diff --git a/services/person/client/.classpath b/services/person/client/.classpath
index eef77aa00..1e4d764af 100644
--- a/services/person/client/.classpath
+++ b/services/person/client/.classpath
@@ -222,6 +222,7 @@
   <classpathentry kind="src" path="/org.collectionspace.services.3rdparty.nuxeo.quote-api"/>
   <classpathentry kind="src" path="/org.collectionspace.services.client"/>
   <classpathentry kind="src" path="/org.collectionspace.services.common"/>
+  <classpathentry kind="src" path="/org.collectionspace.services.common-api"/>
   <classpathentry kind="src" path="/org.collectionspace.services.contact.client"/>
   <classpathentry kind="src" path="/org.collectionspace.services.contact.jaxb"/>
   <classpathentry kind="src" path="/org.collectionspace.services.hyperjaxb"/>
diff --git a/services/person/client/.project b/services/person/client/.project
index 08cd040a0..990223542 100644
--- a/services/person/client/.project
+++ b/services/person/client/.project
@@ -5,6 +5,7 @@
     <project>org.collectionspace.services.3rdparty.nuxeo.quote-api</project>
     <project>org.collectionspace.services.client</project>
     <project>org.collectionspace.services.common</project>
+    <project>org.collectionspace.services.common-api</project>
     <project>org.collectionspace.services.contact.client</project>
     <project>org.collectionspace.services.contact.jaxb</project>
     <project>org.collectionspace.services.hyperjaxb</project>
diff --git a/services/person/jaxb/.classpath b/services/person/jaxb/.classpath
index cee9a1505..7bf1230ad 100644
--- a/services/person/jaxb/.classpath
+++ b/services/person/jaxb/.classpath
@@ -218,6 +218,7 @@
   <classpathentry kind="src" path="/org.collectionspace.services.3rdparty.nuxeo.quote-api"/>
   <classpathentry kind="src" path="/org.collectionspace.services.client"/>
   <classpathentry kind="src" path="/org.collectionspace.services.common"/>
+  <classpathentry kind="src" path="/org.collectionspace.services.common-api"/>
   <classpathentry kind="src" path="/org.collectionspace.services.hyperjaxb"/>
   <classpathentry kind="src" path="/org.collectionspace.services.jaxb"/>
   <classpathentry kind="var" path="M2_REPO/org/osgi/org.osgi.core/4.1.0/org.osgi.core-4.1.0.jar"/>
diff --git a/services/person/jaxb/.project b/services/person/jaxb/.project
index 2c1cdee8d..289229c47 100644
--- a/services/person/jaxb/.project
+++ b/services/person/jaxb/.project
@@ -5,6 +5,7 @@
     <project>org.collectionspace.services.3rdparty.nuxeo.quote-api</project>
     <project>org.collectionspace.services.client</project>
     <project>org.collectionspace.services.common</project>
+    <project>org.collectionspace.services.common-api</project>
     <project>org.collectionspace.services.hyperjaxb</project>
     <project>org.collectionspace.services.jaxb</project>
   </projects>
diff --git a/services/person/service/.classpath b/services/person/service/.classpath
index 128fae90a..e8fe941a0 100644
--- a/services/person/service/.classpath
+++ b/services/person/service/.classpath
@@ -224,6 +224,7 @@
   <classpathentry kind="src" path="/org.collectionspace.services.3rdparty.nuxeo.quote-api"/>
   <classpathentry kind="src" path="/org.collectionspace.services.client"/>
   <classpathentry kind="src" path="/org.collectionspace.services.common"/>
+  <classpathentry kind="src" path="/org.collectionspace.services.common-api"/>
   <classpathentry kind="src" path="/org.collectionspace.services.contact.client"/>
   <classpathentry kind="src" path="/org.collectionspace.services.contact.jaxb"/>
   <classpathentry kind="src" path="/org.collectionspace.services.contact.service"/>
diff --git a/services/person/service/.project b/services/person/service/.project
index 0561e1489..8d25caafc 100644
--- a/services/person/service/.project
+++ b/services/person/service/.project
@@ -5,6 +5,7 @@
     <project>org.collectionspace.services.3rdparty.nuxeo.quote-api</project>
     <project>org.collectionspace.services.client</project>
     <project>org.collectionspace.services.common</project>
+    <project>org.collectionspace.services.common-api</project>
     <project>org.collectionspace.services.contact.client</project>
     <project>org.collectionspace.services.contact.jaxb</project>
     <project>org.collectionspace.services.contact.service</project>
diff --git a/services/query/service/.classpath b/services/query/service/.classpath
index 41989845e..802becad0 100644
--- a/services/query/service/.classpath
+++ b/services/query/service/.classpath
@@ -220,6 +220,7 @@
   <classpathentry kind="src" path="/org.collectionspace.services.3rdparty.nuxeo.quote-api"/>
   <classpathentry kind="src" path="/org.collectionspace.services.client"/>
   <classpathentry kind="src" path="/org.collectionspace.services.common"/>
+  <classpathentry kind="src" path="/org.collectionspace.services.common-api"/>
   <classpathentry kind="src" path="/org.collectionspace.services.hyperjaxb"/>
   <classpathentry kind="src" path="/org.collectionspace.services.jaxb"/>
   <classpathentry kind="var" path="M2_REPO/org/osgi/org.osgi.core/4.1.0/org.osgi.core-4.1.0.jar"/>
diff --git a/services/query/service/.project b/services/query/service/.project
index 7016bdda8..6f87b6ba1 100644
--- a/services/query/service/.project
+++ b/services/query/service/.project
@@ -5,6 +5,7 @@
     <project>org.collectionspace.services.3rdparty.nuxeo.quote-api</project>
     <project>org.collectionspace.services.client</project>
     <project>org.collectionspace.services.common</project>
+    <project>org.collectionspace.services.common-api</project>
     <project>org.collectionspace.services.hyperjaxb</project>
     <project>org.collectionspace.services.jaxb</project>
   </projects>
diff --git a/services/relation/client/.classpath b/services/relation/client/.classpath
index 58bc64042..0024b26e2 100644
--- a/services/relation/client/.classpath
+++ b/services/relation/client/.classpath
@@ -222,6 +222,7 @@
   <classpathentry kind="src" path="/org.collectionspace.services.3rdparty.nuxeo.quote-api"/>
   <classpathentry kind="src" path="/org.collectionspace.services.client"/>
   <classpathentry kind="src" path="/org.collectionspace.services.common"/>
+  <classpathentry kind="src" path="/org.collectionspace.services.common-api"/>
   <classpathentry kind="src" path="/org.collectionspace.services.hyperjaxb"/>
   <classpathentry kind="src" path="/org.collectionspace.services.jaxb"/>
   <classpathentry kind="var" path="M2_REPO/org/osgi/org.osgi.core/4.1.0/org.osgi.core-4.1.0.jar"/>
diff --git a/services/relation/client/.project b/services/relation/client/.project
index f8713c3dd..428490293 100644
--- a/services/relation/client/.project
+++ b/services/relation/client/.project
@@ -5,6 +5,7 @@
     <project>org.collectionspace.services.3rdparty.nuxeo.quote-api</project>
     <project>org.collectionspace.services.client</project>
     <project>org.collectionspace.services.common</project>
+    <project>org.collectionspace.services.common-api</project>
     <project>org.collectionspace.services.hyperjaxb</project>
     <project>org.collectionspace.services.jaxb</project>
   </projects>
diff --git a/services/relation/service/.classpath b/services/relation/service/.classpath
index 0ba80020e..8958eda90 100644
--- a/services/relation/service/.classpath
+++ b/services/relation/service/.classpath
@@ -222,6 +222,7 @@
   <classpathentry kind="src" path="/org.collectionspace.services.3rdparty.nuxeo.quote-api"/>
   <classpathentry kind="src" path="/org.collectionspace.services.client"/>
   <classpathentry kind="src" path="/org.collectionspace.services.common"/>
+  <classpathentry kind="src" path="/org.collectionspace.services.common-api"/>
   <classpathentry kind="src" path="/org.collectionspace.services.hyperjaxb"/>
   <classpathentry kind="src" path="/org.collectionspace.services.jaxb"/>
   <classpathentry kind="var" path="M2_REPO/org/osgi/org.osgi.core/4.1.0/org.osgi.core-4.1.0.jar"/>
diff --git a/services/relation/service/.project b/services/relation/service/.project
index 1159fc83e..06ec1d1cb 100644
--- a/services/relation/service/.project
+++ b/services/relation/service/.project
@@ -5,6 +5,7 @@
     <project>org.collectionspace.services.3rdparty.nuxeo.quote-api</project>
     <project>org.collectionspace.services.client</project>
     <project>org.collectionspace.services.common</project>
+    <project>org.collectionspace.services.common-api</project>
     <project>org.collectionspace.services.hyperjaxb</project>
     <project>org.collectionspace.services.jaxb</project>
   </projects>
diff --git a/services/report/client/.classpath b/services/report/client/.classpath
index 0b9f7a2fd..b475291ac 100644
--- a/services/report/client/.classpath
+++ b/services/report/client/.classpath
@@ -238,6 +238,7 @@
   <classpathentry kind="src" path="/org.collectionspace.services.3rdparty.nuxeo.quote-api"/>
   <classpathentry kind="src" path="/org.collectionspace.services.client"/>
   <classpathentry kind="src" path="/org.collectionspace.services.common"/>
+  <classpathentry kind="src" path="/org.collectionspace.services.common-api"/>
   <classpathentry kind="src" path="/org.collectionspace.services.contact.client"/>
   <classpathentry kind="src" path="/org.collectionspace.services.contact.jaxb"/>
   <classpathentry kind="src" path="/org.collectionspace.services.hyperjaxb"/>
diff --git a/services/report/client/.project b/services/report/client/.project
index 92cbb826d..ea62a4058 100644
--- a/services/report/client/.project
+++ b/services/report/client/.project
@@ -5,6 +5,7 @@
     <project>org.collectionspace.services.3rdparty.nuxeo.quote-api</project>
     <project>org.collectionspace.services.client</project>
     <project>org.collectionspace.services.common</project>
+    <project>org.collectionspace.services.common-api</project>
     <project>org.collectionspace.services.contact.client</project>
     <project>org.collectionspace.services.contact.jaxb</project>
     <project>org.collectionspace.services.hyperjaxb</project>
diff --git a/services/report/service/.classpath b/services/report/service/.classpath
index 0e3da4e8c..fcc7f28fc 100644
--- a/services/report/service/.classpath
+++ b/services/report/service/.classpath
@@ -235,6 +235,7 @@
   <classpathentry kind="src" path="/org.collectionspace.services.client"/>
   <classpathentry kind="src" path="/org.collectionspace.services.collectionobject.jaxb"/>
   <classpathentry kind="src" path="/org.collectionspace.services.common"/>
+  <classpathentry kind="src" path="/org.collectionspace.services.common-api"/>
   <classpathentry kind="src" path="/org.collectionspace.services.hyperjaxb"/>
   <classpathentry kind="src" path="/org.collectionspace.services.jaxb"/>
   <classpathentry kind="src" path="/org.collectionspace.services.report.jaxb"/>
diff --git a/services/report/service/.project b/services/report/service/.project
index 91ca75369..1e4701a5c 100644
--- a/services/report/service/.project
+++ b/services/report/service/.project
@@ -6,6 +6,7 @@
     <project>org.collectionspace.services.client</project>
     <project>org.collectionspace.services.collectionobject.jaxb</project>
     <project>org.collectionspace.services.common</project>
+    <project>org.collectionspace.services.common-api</project>
     <project>org.collectionspace.services.hyperjaxb</project>
     <project>org.collectionspace.services.jaxb</project>
     <project>org.collectionspace.services.report.jaxb</project>
diff --git a/services/security/client/.classpath b/services/security/client/.classpath
index c980830db..5d897ea93 100644
--- a/services/security/client/.classpath
+++ b/services/security/client/.classpath
@@ -226,6 +226,7 @@
   <classpathentry kind="src" path="/org.collectionspace.services.collectionobject.client"/>
   <classpathentry kind="src" path="/org.collectionspace.services.collectionobject.jaxb"/>
   <classpathentry kind="src" path="/org.collectionspace.services.common"/>
+  <classpathentry kind="src" path="/org.collectionspace.services.common-api"/>
   <classpathentry kind="src" path="/org.collectionspace.services.contact.client"/>
   <classpathentry kind="src" path="/org.collectionspace.services.contact.jaxb"/>
   <classpathentry kind="src" path="/org.collectionspace.services.dimension.client"/>
diff --git a/services/security/client/.project b/services/security/client/.project
index f48757eac..178e2abdb 100644
--- a/services/security/client/.project
+++ b/services/security/client/.project
@@ -11,6 +11,7 @@
     <project>org.collectionspace.services.collectionobject.client</project>
     <project>org.collectionspace.services.collectionobject.jaxb</project>
     <project>org.collectionspace.services.common</project>
+    <project>org.collectionspace.services.common-api</project>
     <project>org.collectionspace.services.contact.client</project>
     <project>org.collectionspace.services.contact.jaxb</project>
     <project>org.collectionspace.services.dimension.client</project>
diff --git a/services/vocabulary/client/.classpath b/services/vocabulary/client/.classpath
index 4c04a5a2f..808c067f9 100644
--- a/services/vocabulary/client/.classpath
+++ b/services/vocabulary/client/.classpath
@@ -222,6 +222,7 @@
   <classpathentry kind="src" path="/org.collectionspace.services.3rdparty.nuxeo.quote-api"/>
   <classpathentry kind="src" path="/org.collectionspace.services.client"/>
   <classpathentry kind="src" path="/org.collectionspace.services.common"/>
+  <classpathentry kind="src" path="/org.collectionspace.services.common-api"/>
   <classpathentry kind="src" path="/org.collectionspace.services.hyperjaxb"/>
   <classpathentry kind="src" path="/org.collectionspace.services.jaxb"/>
   <classpathentry kind="src" path="/org.collectionspace.services.vocabulary.jaxb"/>
diff --git a/services/vocabulary/client/.project b/services/vocabulary/client/.project
index e24f15bb5..5980a93a3 100644
--- a/services/vocabulary/client/.project
+++ b/services/vocabulary/client/.project
@@ -5,6 +5,7 @@
     <project>org.collectionspace.services.3rdparty.nuxeo.quote-api</project>
     <project>org.collectionspace.services.client</project>
     <project>org.collectionspace.services.common</project>
+    <project>org.collectionspace.services.common-api</project>
     <project>org.collectionspace.services.hyperjaxb</project>
     <project>org.collectionspace.services.jaxb</project>
     <project>org.collectionspace.services.vocabulary.jaxb</project>
diff --git a/services/vocabulary/jaxb/.classpath b/services/vocabulary/jaxb/.classpath
index dec35912b..bad69b344 100644
--- a/services/vocabulary/jaxb/.classpath
+++ b/services/vocabulary/jaxb/.classpath
@@ -216,6 +216,7 @@
   <classpathentry kind="src" path="/org.collectionspace.services.3rdparty.nuxeo.quote-api"/>
   <classpathentry kind="src" path="/org.collectionspace.services.client"/>
   <classpathentry kind="src" path="/org.collectionspace.services.common"/>
+  <classpathentry kind="src" path="/org.collectionspace.services.common-api"/>
   <classpathentry kind="src" path="/org.collectionspace.services.hyperjaxb"/>
   <classpathentry kind="src" path="/org.collectionspace.services.jaxb"/>
   <classpathentry kind="var" path="M2_REPO/org/osgi/org.osgi.core/4.1.0/org.osgi.core-4.1.0.jar"/>
diff --git a/services/vocabulary/jaxb/.project b/services/vocabulary/jaxb/.project
index 03474e0d0..2e848f2e1 100644
--- a/services/vocabulary/jaxb/.project
+++ b/services/vocabulary/jaxb/.project
@@ -5,6 +5,7 @@
     <project>org.collectionspace.services.3rdparty.nuxeo.quote-api</project>
     <project>org.collectionspace.services.client</project>
     <project>org.collectionspace.services.common</project>
+    <project>org.collectionspace.services.common-api</project>
     <project>org.collectionspace.services.hyperjaxb</project>
     <project>org.collectionspace.services.jaxb</project>
   </projects>
diff --git a/services/vocabulary/service/.classpath b/services/vocabulary/service/.classpath
index 48a5b115f..7461f6ac7 100644
--- a/services/vocabulary/service/.classpath
+++ b/services/vocabulary/service/.classpath
@@ -227,6 +227,7 @@
   <classpathentry kind="src" path="/org.collectionspace.services.3rdparty.nuxeo.quote-api"/>
   <classpathentry kind="src" path="/org.collectionspace.services.client"/>
   <classpathentry kind="src" path="/org.collectionspace.services.common"/>
+  <classpathentry kind="src" path="/org.collectionspace.services.common-api"/>
   <classpathentry kind="src" path="/org.collectionspace.services.hyperjaxb"/>
   <classpathentry kind="src" path="/org.collectionspace.services.jaxb"/>
   <classpathentry kind="src" path="/org.collectionspace.services.vocabulary.client"/>
diff --git a/services/vocabulary/service/.project b/services/vocabulary/service/.project
index 9154bc30b..6e0216a3a 100644
--- a/services/vocabulary/service/.project
+++ b/services/vocabulary/service/.project
@@ -5,6 +5,7 @@
     <project>org.collectionspace.services.3rdparty.nuxeo.quote-api</project>
     <project>org.collectionspace.services.client</project>
     <project>org.collectionspace.services.common</project>
+    <project>org.collectionspace.services.common-api</project>
     <project>org.collectionspace.services.hyperjaxb</project>
     <project>org.collectionspace.services.jaxb</project>
     <project>org.collectionspace.services.vocabulary.client</project>
diff --git a/services/workflow/service/.project b/services/workflow/service/.project
index 1d4d27430..5752f6444 100644
--- a/services/workflow/service/.project
+++ b/services/workflow/service/.project
@@ -5,6 +5,7 @@
     <project>org.collectionspace.services.3rdparty.nuxeo.quote-api</project>
     <project>org.collectionspace.services.client</project>
     <project>org.collectionspace.services.common</project>
+    <project>org.collectionspace.services.common-api</project>
     <project>org.collectionspace.services.hyperjaxb</project>
     <project>org.collectionspace.services.jaxb</project>
   </projects>