From: Sanjay Dalal <sanjay.dalal@berkeley.edu>
Date: Fri, 13 Nov 2009 22:35:15 +0000 (+0000)
Subject: NOJIRA refactoring of common with regards to movement of document handling code.... 
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=d7887baee8d0dbf8457f00c190ec031d23171d49;p=tmp%2Fjakarta-migration.git

NOJIRA refactoring of common with regards to movement of document handling code. new pacakge document is created. also crud is pushed down to storage client from repository client.
test: at service level: mvn test successful (after ant clean deploy)

M    services/nbactions.xml
M    services/collectionobject/service/src/main/java/org/collectionspace/services/collectionobject/CollectionObjectResource.java
M    services/collectionobject/service/src/main/java/org/collectionspace/services/collectionobject/nuxeo/CollectionObjectDocumentModelHandler.java
M    services/collectionobject/service/src/main/java/org/collectionspace/services/collectionobject/nuxeo/CollectionObjectHandlerFactory.java
D    services/common/src/main/java/org/collectionspace/services/common/repository/DocumentUtils.java
D    services/common/src/main/java/org/collectionspace/services/common/repository/DocumentWrapper.java
D    services/common/src/main/java/org/collectionspace/services/common/repository/AbstractDocumentHandler.java
D    services/common/src/main/java/org/collectionspace/services/common/repository/DocumentHandlerFactory.java
D    services/common/src/main/java/org/collectionspace/services/common/repository/DocumentFilter.java
D    services/common/src/main/java/org/collectionspace/services/common/repository/DocumentNotFoundException.java
D    services/common/src/main/java/org/collectionspace/services/common/repository/DocumentHandler.java
D    services/common/src/main/java/org/collectionspace/services/common/repository/DocumentException.java
D    services/common/src/main/java/org/collectionspace/services/common/repository/BadRequestException.java
M    services/common/src/main/java/org/collectionspace/services/common/repository/RepositoryClient.java
M    services/common/src/main/java/org/collectionspace/services/common/CollectionSpaceResource.java
M    services/common/src/main/java/org/collectionspace/services/common/AbstractCollectionSpaceResource.java
M    services/common/src/main/java/org/collectionspace/services/common/context/RemoteServiceContextImpl.java
M    services/common/src/main/java/org/collectionspace/services/common/context/ServiceContext.java
M    services/common/src/main/java/org/collectionspace/services/common/context/AbstractServiceContext.java
A    services/common/src/main/java/org/collectionspace/services/common/storage
A    services/common/src/main/java/org/collectionspace/services/common/storage/StorageClient.java
M    services/common/src/main/java/org/collectionspace/services/common/relation/IRelationsManager.java
M    services/common/src/main/java/org/collectionspace/services/common/relation/nuxeo/RelationsUtils.java
A    services/common/src/main/java/org/collectionspace/services/common/document
AM + services/common/src/main/java/org/collectionspace/services/common/document/DocumentWrapper.java
AM + services/common/src/main/java/org/collectionspace/services/common/document/DocumentUtils.java
AM + services/common/src/main/java/org/collectionspace/services/common/document/AbstractDocumentHandler.java
AM + services/common/src/main/java/org/collectionspace/services/common/document/DocumentHandlerFactory.java
AM + services/common/src/main/java/org/collectionspace/services/common/document/DocumentFilter.java
AM + services/common/src/main/java/org/collectionspace/services/common/document/DocumentNotFoundException.java
AM + services/common/src/main/java/org/collectionspace/services/common/document/DocumentHandler.java
AM + services/common/src/main/java/org/collectionspace/services/common/document/DocumentException.java
AM + services/common/src/main/java/org/collectionspace/services/common/document/BadRequestException.java
M    services/common/src/main/java/org/collectionspace/services/nuxeo/util/NuxeoUtils.java
M    services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/DocumentModelWrapper.java
M    services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/RepositoryJavaClient.java
M    services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/RemoteDocumentModelHandler.java
M    services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/DocumentModelListWrapper.java
M    services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/DocumentModelHandler.java
M    services/acquisition/service/src/main/java/org/collectionspace/services/acquisition/AcquisitionResource.java
M    services/acquisition/service/src/main/java/org/collectionspace/services/acquisition/nuxeo/AcquisitionDocumentModelHandler.java
M    services/acquisition/service/src/main/java/org/collectionspace/services/acquisition/nuxeo/AcquisitionHandlerFactory.java
M    services/pom.xml
M    services/id/service/src/test/java/org/collectionspace/services/id/test/StringIDGeneratorPartTest.java
M    services/id/service/src/test/java/org/collectionspace/services/id/test/IDServiceJdbcImplTest.java
M    services/id/service/src/test/java/org/collectionspace/services/id/test/AlphabeticIDGeneratorPartTest.java
M    services/id/service/src/test/java/org/collectionspace/services/id/test/SettableIDGeneratorTest.java
M    services/id/service/src/test/java/org/collectionspace/services/id/test/YearIDGeneratorPartTest.java
M    services/id/service/src/test/java/org/collectionspace/services/id/test/IDGeneratorSerializerTest.java
M    services/id/service/src/test/java/org/collectionspace/services/id/test/NumericIDGeneratorPartTest.java
M    services/id/service/src/test/java/org/collectionspace/services/id/test/BaseIDGeneratorTest.java
M    services/id/service/src/main/java/org/collectionspace/services/id/IDResource.java
M    services/id/service/src/main/java/org/collectionspace/services/id/UUIDGeneratorPart.java
M    services/id/service/src/main/java/org/collectionspace/services/id/AlphabeticIDGeneratorPart.java
M    services/id/service/src/main/java/org/collectionspace/services/id/YearIDGeneratorPart.java
M    services/id/service/src/main/java/org/collectionspace/services/id/IDService.java
M    services/id/service/src/main/java/org/collectionspace/services/id/NumericIDGeneratorPart.java
M    services/id/service/src/main/java/org/collectionspace/services/id/StringIDGeneratorPart.java
M    services/id/service/src/main/java/org/collectionspace/services/id/IDServiceJdbcImpl.java
M    services/id/service/src/main/java/org/collectionspace/services/id/SettableIDGenerator.java
M    services/id/service/src/main/java/org/collectionspace/services/id/IDGeneratorPart.java
M    services/id/service/src/main/java/org/collectionspace/services/id/IDGeneratorSerializer.java
M    services/vocabulary/service/src/main/java/org/collectionspace/services/vocabulary/VocabularyResource.java
M    services/vocabulary/service/src/main/java/org/collectionspace/services/vocabulary/nuxeo/VocabularyItemDocumentModelHandler.java
M    services/vocabulary/service/src/main/java/org/collectionspace/services/vocabulary/nuxeo/VocabularyDocumentModelHandler.java
M    services/vocabulary/service/src/main/java/org/collectionspace/services/vocabulary/nuxeo/VocabularyItemHandlerFactory.java
M    services/vocabulary/service/src/main/java/org/collectionspace/services/vocabulary/nuxeo/VocabularyHandlerFactory.java
M    services/intake/service/src/main/java/org/collectionspace/services/intake/IntakeResource.java
M    services/intake/service/src/main/java/org/collectionspace/services/intake/nuxeo/IntakeHandlerFactory.java
M    services/intake/service/src/main/java/org/collectionspace/services/intake/nuxeo/IntakeDocumentModelHandler.java
M    services/relation/service/src/main/java/org/collectionspace/services/relation/NewRelationResource.java
M    services/relation/service/src/main/java/org/collectionspace/services/relation/nuxeo/RelationHandlerFactory.java
M    services/relation/service/src/main/java/org/collectionspace/services/relation/nuxeo/RelationDocumentModelHandler.java
---

diff --git a/services/acquisition/service/src/main/java/org/collectionspace/services/acquisition/AcquisitionResource.java b/services/acquisition/service/src/main/java/org/collectionspace/services/acquisition/AcquisitionResource.java
index d1178429e..8e606825f 100644
--- a/services/acquisition/service/src/main/java/org/collectionspace/services/acquisition/AcquisitionResource.java
+++ b/services/acquisition/service/src/main/java/org/collectionspace/services/acquisition/AcquisitionResource.java
@@ -41,8 +41,8 @@ import org.collectionspace.services.acquisition.nuxeo.AcquisitionHandlerFactory;
 import org.collectionspace.services.common.AbstractCollectionSpaceResource;
 import org.collectionspace.services.common.context.RemoteServiceContext;
 import org.collectionspace.services.common.context.ServiceContext;
-import org.collectionspace.services.common.repository.DocumentNotFoundException;
-import org.collectionspace.services.common.repository.DocumentHandler;
+import org.collectionspace.services.common.document.DocumentNotFoundException;
+import org.collectionspace.services.common.document.DocumentHandler;
 import org.jboss.resteasy.plugins.providers.multipart.MultipartInput;
 import org.jboss.resteasy.plugins.providers.multipart.MultipartOutput;
 import org.jboss.resteasy.util.HttpResponseCodes;
diff --git a/services/acquisition/service/src/main/java/org/collectionspace/services/acquisition/nuxeo/AcquisitionDocumentModelHandler.java b/services/acquisition/service/src/main/java/org/collectionspace/services/acquisition/nuxeo/AcquisitionDocumentModelHandler.java
index 829788493..2ffea0a22 100644
--- a/services/acquisition/service/src/main/java/org/collectionspace/services/acquisition/nuxeo/AcquisitionDocumentModelHandler.java
+++ b/services/acquisition/service/src/main/java/org/collectionspace/services/acquisition/nuxeo/AcquisitionDocumentModelHandler.java
@@ -27,12 +27,12 @@ import java.util.Iterator;
 import java.util.List;
 
 import org.collectionspace.services.AcquisitionJAXBSchema;
-import org.collectionspace.services.common.repository.DocumentWrapper;
+import org.collectionspace.services.common.document.DocumentWrapper;
 import org.collectionspace.services.acquisition.AcquisitionsCommon;
 import org.collectionspace.services.acquisition.AcquisitionsCommonList;
 import org.collectionspace.services.acquisition.AcquisitionsCommonList.AcquisitionListItem;
 
-import org.collectionspace.services.common.repository.DocumentHandler.Action;
+import org.collectionspace.services.common.document.DocumentHandler.Action;
 import org.collectionspace.services.nuxeo.client.java.RemoteDocumentModelHandler;
 import org.collectionspace.services.nuxeo.util.NuxeoUtils;
 import org.nuxeo.ecm.core.api.DocumentModel;
diff --git a/services/acquisition/service/src/main/java/org/collectionspace/services/acquisition/nuxeo/AcquisitionHandlerFactory.java b/services/acquisition/service/src/main/java/org/collectionspace/services/acquisition/nuxeo/AcquisitionHandlerFactory.java
index b1522e1e6..292719d08 100644
--- a/services/acquisition/service/src/main/java/org/collectionspace/services/acquisition/nuxeo/AcquisitionHandlerFactory.java
+++ b/services/acquisition/service/src/main/java/org/collectionspace/services/acquisition/nuxeo/AcquisitionHandlerFactory.java
@@ -24,8 +24,8 @@
 package org.collectionspace.services.acquisition.nuxeo;
 
 import org.collectionspace.services.common.ClientType;
-import org.collectionspace.services.common.repository.DocumentHandler;
-import org.collectionspace.services.common.repository.DocumentHandlerFactory;
+import org.collectionspace.services.common.document.DocumentHandler;
+import org.collectionspace.services.common.document.DocumentHandlerFactory;
 
 /**
  * AcquisitionHandlerFactory creates handlers for acquisition based
diff --git a/services/collectionobject/service/src/main/java/org/collectionspace/services/collectionobject/CollectionObjectResource.java b/services/collectionobject/service/src/main/java/org/collectionspace/services/collectionobject/CollectionObjectResource.java
index 91107383d..1d5fd147f 100644
--- a/services/collectionobject/service/src/main/java/org/collectionspace/services/collectionobject/CollectionObjectResource.java
+++ b/services/collectionobject/service/src/main/java/org/collectionspace/services/collectionobject/CollectionObjectResource.java
@@ -42,8 +42,8 @@ import org.collectionspace.services.collectionobject.nuxeo.CollectionObjectHandl
 import org.collectionspace.services.common.AbstractCollectionSpaceResource;
 import org.collectionspace.services.common.context.RemoteServiceContext;
 import org.collectionspace.services.common.context.ServiceContext;
-import org.collectionspace.services.common.repository.DocumentNotFoundException;
-import org.collectionspace.services.common.repository.DocumentHandler;
+import org.collectionspace.services.common.document.DocumentNotFoundException;
+import org.collectionspace.services.common.document.DocumentHandler;
 import org.jboss.resteasy.plugins.providers.multipart.MultipartInput;
 import org.jboss.resteasy.plugins.providers.multipart.MultipartOutput;
 import org.jboss.resteasy.util.HttpResponseCodes;
diff --git a/services/collectionobject/service/src/main/java/org/collectionspace/services/collectionobject/nuxeo/CollectionObjectDocumentModelHandler.java b/services/collectionobject/service/src/main/java/org/collectionspace/services/collectionobject/nuxeo/CollectionObjectDocumentModelHandler.java
index 53c1d39de..eea06dde5 100644
--- a/services/collectionobject/service/src/main/java/org/collectionspace/services/collectionobject/nuxeo/CollectionObjectDocumentModelHandler.java
+++ b/services/collectionobject/service/src/main/java/org/collectionspace/services/collectionobject/nuxeo/CollectionObjectDocumentModelHandler.java
@@ -30,7 +30,7 @@ import org.collectionspace.services.CollectionObjectListItemJAXBSchema;
 import org.collectionspace.services.collectionobject.CollectionobjectsCommon;
 import org.collectionspace.services.collectionobject.CollectionobjectsCommonList;
 import org.collectionspace.services.collectionobject.CollectionobjectsCommonList.CollectionObjectListItem;
-import org.collectionspace.services.common.repository.DocumentWrapper;
+import org.collectionspace.services.common.document.DocumentWrapper;
 import org.collectionspace.services.nuxeo.client.java.RemoteDocumentModelHandler;
 import org.collectionspace.services.nuxeo.util.NuxeoUtils;
 import org.nuxeo.ecm.core.api.DocumentModel;
diff --git a/services/collectionobject/service/src/main/java/org/collectionspace/services/collectionobject/nuxeo/CollectionObjectHandlerFactory.java b/services/collectionobject/service/src/main/java/org/collectionspace/services/collectionobject/nuxeo/CollectionObjectHandlerFactory.java
index df91d5468..a1fb1f111 100644
--- a/services/collectionobject/service/src/main/java/org/collectionspace/services/collectionobject/nuxeo/CollectionObjectHandlerFactory.java
+++ b/services/collectionobject/service/src/main/java/org/collectionspace/services/collectionobject/nuxeo/CollectionObjectHandlerFactory.java
@@ -24,8 +24,8 @@
 package org.collectionspace.services.collectionobject.nuxeo;
 
 import org.collectionspace.services.common.ClientType;
-import org.collectionspace.services.common.repository.DocumentHandler;
-import org.collectionspace.services.common.repository.DocumentHandlerFactory;
+import org.collectionspace.services.common.document.DocumentHandler;
+import org.collectionspace.services.common.document.DocumentHandlerFactory;
 
 /**
  * CollectionObjectHandlerFactory creates handlers for collectionobject based
diff --git a/services/common/src/main/java/org/collectionspace/services/common/AbstractCollectionSpaceResource.java b/services/common/src/main/java/org/collectionspace/services/common/AbstractCollectionSpaceResource.java
index bac653c5f..55041d1ff 100644
--- a/services/common/src/main/java/org/collectionspace/services/common/AbstractCollectionSpaceResource.java
+++ b/services/common/src/main/java/org/collectionspace/services/common/AbstractCollectionSpaceResource.java
@@ -26,7 +26,7 @@ package org.collectionspace.services.common;
 import org.collectionspace.services.common.context.RemoteServiceContext;
 import org.collectionspace.services.common.context.ServiceContext;
 import org.collectionspace.services.common.context.RemoteServiceContextImpl;
-import org.collectionspace.services.common.repository.DocumentHandler;
+import org.collectionspace.services.common.document.DocumentHandler;
 import org.collectionspace.services.common.repository.RepositoryClient;
 import org.collectionspace.services.common.repository.RepositoryClientFactory;
 import org.jboss.resteasy.plugins.providers.multipart.MultipartInput;
diff --git a/services/common/src/main/java/org/collectionspace/services/common/CollectionSpaceResource.java b/services/common/src/main/java/org/collectionspace/services/common/CollectionSpaceResource.java
index 1375dd72b..1bba85063 100644
--- a/services/common/src/main/java/org/collectionspace/services/common/CollectionSpaceResource.java
+++ b/services/common/src/main/java/org/collectionspace/services/common/CollectionSpaceResource.java
@@ -26,7 +26,7 @@ package org.collectionspace.services.common;
 
 import org.collectionspace.services.common.context.RemoteServiceContext;
 import org.collectionspace.services.common.context.ServiceContext;
-import org.collectionspace.services.common.repository.DocumentHandler;
+import org.collectionspace.services.common.document.DocumentHandler;
 import org.collectionspace.services.common.repository.RepositoryClient;
 import org.collectionspace.services.common.repository.RepositoryClientFactory;
 import org.jboss.resteasy.plugins.providers.multipart.MultipartInput;
diff --git a/services/common/src/main/java/org/collectionspace/services/common/context/AbstractServiceContext.java b/services/common/src/main/java/org/collectionspace/services/common/context/AbstractServiceContext.java
index 83696c710..78b1b106a 100644
--- a/services/common/src/main/java/org/collectionspace/services/common/context/AbstractServiceContext.java
+++ b/services/common/src/main/java/org/collectionspace/services/common/context/AbstractServiceContext.java
@@ -42,8 +42,8 @@ import org.slf4j.LoggerFactory;
  * $LastChangedRevision: $
  * $LastChangedDate: $
  */
-public abstract class AbstractServiceContext<T1, T2>
-        implements ServiceContext<T1, T2> {
+public abstract class AbstractServiceContext<IT, OT>
+        implements ServiceContext<IT, OT> {
 
     final Logger logger = LoggerFactory.getLogger(AbstractServiceContext.class);
     Map<String, ObjectPartType> objectPartMap = new HashMap<String, ObjectPartType>();
@@ -178,16 +178,16 @@ public abstract class AbstractServiceContext<T1, T2>
     }
 
     @Override
-    public abstract T1 getInput();
+    public abstract IT getInput();
 
     @Override
-    public abstract void setInput(T1 input) throws Exception;
+    public abstract void setInput(IT input) throws Exception;
 
     @Override
-    public abstract T2 getOutput();
+    public abstract OT getOutput();
 
     @Override
-    public abstract void setOutput(T2 output) throws Exception;
+    public abstract void setOutput(OT output) throws Exception;
 
     @Override
     public String toString() {
diff --git a/services/common/src/main/java/org/collectionspace/services/common/context/RemoteServiceContextImpl.java b/services/common/src/main/java/org/collectionspace/services/common/context/RemoteServiceContextImpl.java
index af6f5b492..4d6be9049 100644
--- a/services/common/src/main/java/org/collectionspace/services/common/context/RemoteServiceContextImpl.java
+++ b/services/common/src/main/java/org/collectionspace/services/common/context/RemoteServiceContextImpl.java
@@ -27,7 +27,7 @@ import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.lang.reflect.Constructor;
 import javax.ws.rs.core.MediaType;
-import org.collectionspace.services.common.repository.DocumentUtils;
+import org.collectionspace.services.common.document.DocumentUtils;
 import org.jboss.resteasy.plugins.providers.multipart.InputPart;
 import org.jboss.resteasy.plugins.providers.multipart.MultipartInput;
 import org.jboss.resteasy.plugins.providers.multipart.MultipartOutput;
diff --git a/services/common/src/main/java/org/collectionspace/services/common/context/ServiceContext.java b/services/common/src/main/java/org/collectionspace/services/common/context/ServiceContext.java
index 25147efdf..5b209ef8a 100644
--- a/services/common/src/main/java/org/collectionspace/services/common/context/ServiceContext.java
+++ b/services/common/src/main/java/org/collectionspace/services/common/context/ServiceContext.java
@@ -34,7 +34,7 @@ import org.collectionspace.services.common.service.ServiceBindingType;
  * between various components of the service framework while processing
  * a service request.
  */
-public interface ServiceContext<T1, T2> {
+public interface ServiceContext<IT, OT> {
 
     /**
      * The character used to separate the words in a part label
@@ -128,7 +128,7 @@ public interface ServiceContext<T1, T2> {
      * Get input parts as received over the wire from service consumer
      * @return the input
      */
-    public T1 getInput();
+    public IT getInput();
 
     /**
      * setInput is used to set request input before starting to
@@ -136,19 +136,19 @@ public interface ServiceContext<T1, T2> {
      * @param input
      * @exception Exception
      */
-    public void setInput(T1 input) throws Exception;
+    public void setInput(IT input) throws Exception;
 
     /**
      * Get output parts to send over the wire to service consumer
      * @return the output
      */
-    public T2 getOutput();
+    public OT getOutput();
 
     /**
      * setOutput set output
      * @param output
      */
-    public void setOutput(T2 output) throws Exception;
+    public void setOutput(OT output) throws Exception;
 
     /**
      * getPartsMetadata returns metadata for object parts used by the service
diff --git a/services/common/src/main/java/org/collectionspace/services/common/repository/AbstractDocumentHandler.java b/services/common/src/main/java/org/collectionspace/services/common/document/AbstractDocumentHandler.java
similarity index 99%
rename from services/common/src/main/java/org/collectionspace/services/common/repository/AbstractDocumentHandler.java
rename to services/common/src/main/java/org/collectionspace/services/common/document/AbstractDocumentHandler.java
index 15a037cd8..4dbab9200 100644
--- a/services/common/src/main/java/org/collectionspace/services/common/repository/AbstractDocumentHandler.java
+++ b/services/common/src/main/java/org/collectionspace/services/common/document/AbstractDocumentHandler.java
@@ -21,7 +21,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.collectionspace.services.common.repository;
+package org.collectionspace.services.common.document;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/services/common/src/main/java/org/collectionspace/services/common/repository/BadRequestException.java b/services/common/src/main/java/org/collectionspace/services/common/document/BadRequestException.java
similarity index 98%
rename from services/common/src/main/java/org/collectionspace/services/common/repository/BadRequestException.java
rename to services/common/src/main/java/org/collectionspace/services/common/document/BadRequestException.java
index af31a438f..11feb2605 100644
--- a/services/common/src/main/java/org/collectionspace/services/common/repository/BadRequestException.java
+++ b/services/common/src/main/java/org/collectionspace/services/common/document/BadRequestException.java
@@ -22,7 +22,7 @@
  *  limitations under the License.
  */
 
-package org.collectionspace.services.common.repository;
+package org.collectionspace.services.common.document;
 
 /**
  * BadRequestException
diff --git a/services/common/src/main/java/org/collectionspace/services/common/repository/DocumentException.java b/services/common/src/main/java/org/collectionspace/services/common/document/DocumentException.java
similarity index 98%
rename from services/common/src/main/java/org/collectionspace/services/common/repository/DocumentException.java
rename to services/common/src/main/java/org/collectionspace/services/common/document/DocumentException.java
index 826b7eb03..efead8212 100644
--- a/services/common/src/main/java/org/collectionspace/services/common/repository/DocumentException.java
+++ b/services/common/src/main/java/org/collectionspace/services/common/document/DocumentException.java
@@ -16,7 +16,7 @@
  *  https://source.collectionspace.org/collection-space/LICENSE.txt
  */
 
-package org.collectionspace.services.common.repository;
+package org.collectionspace.services.common.document;
 
 /**
  * DocumentException
diff --git a/services/common/src/main/java/org/collectionspace/services/common/repository/DocumentFilter.java b/services/common/src/main/java/org/collectionspace/services/common/document/DocumentFilter.java
similarity index 95%
rename from services/common/src/main/java/org/collectionspace/services/common/repository/DocumentFilter.java
rename to services/common/src/main/java/org/collectionspace/services/common/document/DocumentFilter.java
index ce8fe70cf..9c768be33 100644
--- a/services/common/src/main/java/org/collectionspace/services/common/repository/DocumentFilter.java
+++ b/services/common/src/main/java/org/collectionspace/services/common/document/DocumentFilter.java
@@ -15,7 +15,7 @@
 
  *  https://source.collectionspace.org/collection-space/LICENSE.txt
  */
-package org.collectionspace.services.common.repository;
+package org.collectionspace.services.common.document;
 
 import java.util.List;
 
diff --git a/services/common/src/main/java/org/collectionspace/services/common/repository/DocumentHandler.java b/services/common/src/main/java/org/collectionspace/services/common/document/DocumentHandler.java
similarity index 97%
rename from services/common/src/main/java/org/collectionspace/services/common/repository/DocumentHandler.java
rename to services/common/src/main/java/org/collectionspace/services/common/document/DocumentHandler.java
index 31aa51442..0972256bc 100644
--- a/services/common/src/main/java/org/collectionspace/services/common/repository/DocumentHandler.java
+++ b/services/common/src/main/java/org/collectionspace/services/common/document/DocumentHandler.java
@@ -15,7 +15,7 @@
 
  *  https://source.collectionspace.org/collection-space/LICENSE.txt
  */
-package org.collectionspace.services.common.repository;
+package org.collectionspace.services.common.document;
 
 import java.util.Map;
 import org.collectionspace.services.common.context.ServiceContext;
@@ -179,12 +179,6 @@ public interface DocumentHandler<T, TL> {
      */
     public void fillCommonPartList(TL obj, DocumentWrapper docWrap) throws Exception;
 
-    /**
-     * Gets the document type.
-     * 
-     * @return the document type
-     */
-    public String getDocumentType();
 
     /**
      * getProperties
diff --git a/services/common/src/main/java/org/collectionspace/services/common/repository/DocumentHandlerFactory.java b/services/common/src/main/java/org/collectionspace/services/common/document/DocumentHandlerFactory.java
similarity index 95%
rename from services/common/src/main/java/org/collectionspace/services/common/repository/DocumentHandlerFactory.java
rename to services/common/src/main/java/org/collectionspace/services/common/document/DocumentHandlerFactory.java
index 5d3fd2611..c02f83813 100644
--- a/services/common/src/main/java/org/collectionspace/services/common/repository/DocumentHandlerFactory.java
+++ b/services/common/src/main/java/org/collectionspace/services/common/document/DocumentHandlerFactory.java
@@ -21,7 +21,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.collectionspace.services.common.repository;
+package org.collectionspace.services.common.document;
 
 /**
  *
diff --git a/services/common/src/main/java/org/collectionspace/services/common/repository/DocumentNotFoundException.java b/services/common/src/main/java/org/collectionspace/services/common/document/DocumentNotFoundException.java
similarity index 97%
rename from services/common/src/main/java/org/collectionspace/services/common/repository/DocumentNotFoundException.java
rename to services/common/src/main/java/org/collectionspace/services/common/document/DocumentNotFoundException.java
index 5cb6ac7fe..403ffcdf5 100644
--- a/services/common/src/main/java/org/collectionspace/services/common/repository/DocumentNotFoundException.java
+++ b/services/common/src/main/java/org/collectionspace/services/common/document/DocumentNotFoundException.java
@@ -16,7 +16,7 @@
  *  https://source.collectionspace.org/collection-space/LICENSE.txt
  */
 
-package org.collectionspace.services.common.repository;
+package org.collectionspace.services.common.document;
 
 /**
  * DocumentNotFoundException
diff --git a/services/common/src/main/java/org/collectionspace/services/common/repository/DocumentUtils.java b/services/common/src/main/java/org/collectionspace/services/common/document/DocumentUtils.java
similarity index 99%
rename from services/common/src/main/java/org/collectionspace/services/common/repository/DocumentUtils.java
rename to services/common/src/main/java/org/collectionspace/services/common/document/DocumentUtils.java
index 0bfdc9c17..c3600db01 100644
--- a/services/common/src/main/java/org/collectionspace/services/common/repository/DocumentUtils.java
+++ b/services/common/src/main/java/org/collectionspace/services/common/document/DocumentUtils.java
@@ -21,7 +21,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.collectionspace.services.common.repository;
+package org.collectionspace.services.common.document;
 
 import java.io.InputStream;
 import java.io.OutputStream;
diff --git a/services/common/src/main/java/org/collectionspace/services/common/repository/DocumentWrapper.java b/services/common/src/main/java/org/collectionspace/services/common/document/DocumentWrapper.java
similarity index 95%
rename from services/common/src/main/java/org/collectionspace/services/common/repository/DocumentWrapper.java
rename to services/common/src/main/java/org/collectionspace/services/common/document/DocumentWrapper.java
index 43743ce13..76e0d3a5b 100644
--- a/services/common/src/main/java/org/collectionspace/services/common/repository/DocumentWrapper.java
+++ b/services/common/src/main/java/org/collectionspace/services/common/document/DocumentWrapper.java
@@ -22,7 +22,7 @@
  *  limitations under the License.
  */
 
-package org.collectionspace.services.common.repository;
+package org.collectionspace.services.common.document;
 
 /**
  *
diff --git a/services/common/src/main/java/org/collectionspace/services/common/relation/IRelationsManager.java b/services/common/src/main/java/org/collectionspace/services/common/relation/IRelationsManager.java
index 89d0816d2..65a8b62f7 100644
--- a/services/common/src/main/java/org/collectionspace/services/common/relation/IRelationsManager.java
+++ b/services/common/src/main/java/org/collectionspace/services/common/relation/IRelationsManager.java
@@ -29,7 +29,7 @@ package org.collectionspace.services.common.relation;
 import java.util.List;
 
 
-import org.collectionspace.services.common.repository.DocumentException;
+import org.collectionspace.services.common.document.DocumentException;
 import org.collectionspace.services.relation.RelationsCommon;
 import org.nuxeo.ecm.core.api.DocumentModel;
 
diff --git a/services/common/src/main/java/org/collectionspace/services/common/relation/nuxeo/RelationsUtils.java b/services/common/src/main/java/org/collectionspace/services/common/relation/nuxeo/RelationsUtils.java
index 3c49ff3e1..ebf47e26e 100644
--- a/services/common/src/main/java/org/collectionspace/services/common/relation/nuxeo/RelationsUtils.java
+++ b/services/common/src/main/java/org/collectionspace/services/common/relation/nuxeo/RelationsUtils.java
@@ -27,8 +27,8 @@ import java.util.Iterator;
 import java.util.List;
 
 import org.collectionspace.services.common.relation.RelationJAXBSchema;
-import org.collectionspace.services.common.repository.DocumentException;
-import org.collectionspace.services.common.repository.DocumentWrapper;
+import org.collectionspace.services.common.document.DocumentException;
+import org.collectionspace.services.common.document.DocumentWrapper;
 import org.collectionspace.services.nuxeo.util.NuxeoUtils;
 import org.collectionspace.services.relation.RelationsCommonList;
 import org.collectionspace.services.relation.RelationsCommonList.RelationListItem;
diff --git a/services/common/src/main/java/org/collectionspace/services/common/repository/RepositoryClient.java b/services/common/src/main/java/org/collectionspace/services/common/repository/RepositoryClient.java
index 1e70ddbf8..451c3518c 100644
--- a/services/common/src/main/java/org/collectionspace/services/common/repository/RepositoryClient.java
+++ b/services/common/src/main/java/org/collectionspace/services/common/repository/RepositoryClient.java
@@ -23,7 +23,7 @@
  */
 package org.collectionspace.services.common.repository;
 
-import org.collectionspace.services.common.context.ServiceContext;
+import org.collectionspace.services.common.storage.StorageClient;
 
 /**
  * RepositoryClient is a generic Document Repository client
@@ -35,66 +35,7 @@ import org.collectionspace.services.common.context.ServiceContext;
  * The repository client then calls handle on the handler
  * 
  */
-public interface RepositoryClient {
-
-    /**
-     * create document in the Document repository
-     * @param ctx service context under which this method is invoked
-     * @param handler should be used by the caller to provide and transform the document
-     * @return id in repository of the newly created document
-     * @throws BadRequestException data input is bad
-     * @throws DocumentException
-     */
-    String create(ServiceContext ctx, DocumentHandler handler) throws BadRequestException, DocumentException;
-
-    /**
-     * delete a document from the Document repository
-     * @param ctx service context under which this method is invoked
-     * @param id of the document
-     * @throws DocumentNotFoundException if document not found
-     * @throws DocumentException
-     */
-    void delete(ServiceContext ctx, String id) throws DocumentNotFoundException, DocumentException;
-
-    /**
-     * get document from the Document repository
-     * @param ctx service context under which this method is invoked
-     * @param id of the document to retrieve
-     * @param handler should be used by the caller to provide and transform the document
-     * @throws DocumentNotFoundException if document not found
-     * @throws DocumentException
-     */
-    void get(ServiceContext ctx, String id, DocumentHandler handler) throws DocumentNotFoundException, DocumentException;
-
-    /**
-     * getAll get all documents for an entity service from the Document repository
-     * @param ctx service context under which this method is invoked
-     * @param handler should be used by the caller to provide and transform the document
-     * @throws DocumentNotFoundException if workspace not found
-     * @throws DocumentException
-     */
-    void getAll(ServiceContext ctx, DocumentHandler handler) throws DocumentNotFoundException, DocumentException;
-
-    /**
-     * getFiltered get all documents for an entity service from the Document repository,
-     * given filter parameters specified by the handler. 
-     * @param ctx service context under which this method is invoked
-     * @param handler should be used by the caller to provide and transform the document
-     * @throws DocumentNotFoundException if workspace not found
-     * @throws DocumentException
-     */
-    void getFiltered(ServiceContext ctx, DocumentHandler handler) throws DocumentNotFoundException, DocumentException;
-
-    /**
-     * update given document in the Document repository
-     * @param ctx service context under which this method is invoked
-     * @param id of the document
-     * @param handler should be used by the caller to provide and transform the document
-     * @throws BadRequestException data input is bad
-     * @throws DocumentNotFoundException if document not found
-     * @throws DocumentException
-     */
-    void update(ServiceContext ctx, String id, DocumentHandler handler) throws BadRequestException, DocumentNotFoundException, DocumentException;
+public interface RepositoryClient extends StorageClient {
 
     /**
      * createWorkspace creates a workspace in default repository under given domain
diff --git a/services/common/src/main/java/org/collectionspace/services/common/storage/StorageClient.java b/services/common/src/main/java/org/collectionspace/services/common/storage/StorageClient.java
new file mode 100644
index 000000000..63474c34d
--- /dev/null
+++ b/services/common/src/main/java/org/collectionspace/services/common/storage/StorageClient.java
@@ -0,0 +1,91 @@
+/**
+ *  This entity is a part of the source code and related artifacts
+ *  for CollectionSpace, an open source collections management system
+ *  for museums and related institutions:
+
+ *  http://www.collectionspace.org
+ *  http://wiki.collectionspace.org
+
+ *  Copyright 2009 University of California at Berkeley
+
+ *  Licensed under the Educational Community License (ECL), Version 2.0.
+ *  You may not use this file except in compliance with this License.
+
+ *  You may obtain a copy of the ECL 2.0 License at
+
+ *  https://source.collectionspace.org/collection-space/LICENSE.txt
+ */
+package org.collectionspace.services.common.storage;
+
+import org.collectionspace.services.common.context.ServiceContext;
+import org.collectionspace.services.common.document.BadRequestException;
+import org.collectionspace.services.common.document.DocumentException;
+import org.collectionspace.services.common.document.DocumentHandler;
+import org.collectionspace.services.common.document.DocumentNotFoundException;
+
+/**
+ *
+ * @author
+ */
+public interface StorageClient {
+
+    /**
+     * create entity in the persistence store
+     * @param ctx service context under which this method is invoked
+     * @param handler should be used by the caller to provide and transform the entity
+     * @return id in persistence store of the newly created entity
+     * @throws BadRequestException data input is bad
+     * @throws DocumentException
+     */
+    String create(ServiceContext ctx, DocumentHandler handler) throws BadRequestException, DocumentException;
+
+    /**
+     * delete a entity from the persistence store
+     * @param ctx service context under which this method is invoked
+     * @param id of the entity
+     * @throws DocumentNotFoundException if entity not found
+     * @throws DocumentException
+     */
+    void delete(ServiceContext ctx, String id) throws DocumentNotFoundException, DocumentException;
+
+    /**
+     * get entity from the persistence store
+     * @param ctx service context under which this method is invoked
+     * @param id of the entity to retrieve
+     * @param handler should be used by the caller to provide and transform the entity
+     * @throws DocumentNotFoundException if entity not found
+     * @throws DocumentException
+     */
+    void get(ServiceContext ctx, String id, DocumentHandler handler) throws DocumentNotFoundException, DocumentException;
+
+    /**
+     * getAll get all entitys for an entity service from the persistence store
+     * @param ctx service context under which this method is invoked
+     * @param handler should be used by the caller to provide and transform the entity
+     * @throws DocumentNotFoundException if workspace not found
+     * @throws DocumentException
+     */
+    void getAll(ServiceContext ctx, DocumentHandler handler) throws DocumentNotFoundException, DocumentException;
+
+    /**
+     * getFiltered get all entitys for an entity service from the persistence store,
+     * given filter parameters specified by the handler.
+     * @param ctx service context under which this method is invoked
+     * @param handler should be used by the caller to provide and transform the entity
+     * @throws DocumentNotFoundException if workspace not found
+     * @throws DocumentException
+     */
+    void getFiltered(ServiceContext ctx, DocumentHandler handler) throws DocumentNotFoundException, DocumentException;
+
+    /**
+     * update given entity in the persistence store
+     * @param ctx service context under which this method is invoked
+     * @param id of the entity
+     * @param handler should be used by the caller to provide and transform the entity
+     * @throws BadRequestException data input is bad
+     * @throws DocumentNotFoundException if entity not found
+     * @throws DocumentException
+     */
+    void update(ServiceContext ctx, String id, DocumentHandler handler) throws BadRequestException, DocumentNotFoundException, DocumentException;
+
+}
diff --git a/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/DocumentModelHandler.java b/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/DocumentModelHandler.java
index 4c57ab22a..ec5cec310 100644
--- a/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/DocumentModelHandler.java
+++ b/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/DocumentModelHandler.java
@@ -23,8 +23,8 @@
  */
 package org.collectionspace.services.nuxeo.client.java;
 
-import org.collectionspace.services.common.repository.DocumentWrapper;
-import org.collectionspace.services.common.repository.AbstractDocumentHandler;
+import org.collectionspace.services.common.document.DocumentWrapper;
+import org.collectionspace.services.common.document.AbstractDocumentHandler;
 import org.collectionspace.services.nuxeo.client.*;
 import org.nuxeo.ecm.core.api.repository.RepositoryInstance;
 import org.slf4j.Logger;
@@ -110,10 +110,10 @@ public abstract class DocumentModelHandler<T, TL>
     @Override
     public abstract void setCommonPartList(TL obj);
 
-    /* (non-Javadoc)
-     * @see org.collectionspace.services.common.repository.DocumentHandler#getDocumentType()
+    /**
+     * Gets the document type.
+     *
+     * @return the document type
      */
-    @Override
     public abstract String getDocumentType();
-
 }
diff --git a/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/DocumentModelListWrapper.java b/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/DocumentModelListWrapper.java
index 9248c2154..c2b0096d1 100644
--- a/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/DocumentModelListWrapper.java
+++ b/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/DocumentModelListWrapper.java
@@ -24,7 +24,7 @@
 
 package org.collectionspace.services.nuxeo.client.java;
 
-import org.collectionspace.services.common.repository.DocumentWrapper;
+import org.collectionspace.services.common.document.DocumentWrapper;
 import org.nuxeo.ecm.core.api.DocumentModelList;
 
 /**
diff --git a/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/DocumentModelWrapper.java b/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/DocumentModelWrapper.java
index 75d993846..d12a93202 100644
--- a/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/DocumentModelWrapper.java
+++ b/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/DocumentModelWrapper.java
@@ -24,7 +24,7 @@
 
 package org.collectionspace.services.nuxeo.client.java;
 
-import org.collectionspace.services.common.repository.DocumentWrapper;
+import org.collectionspace.services.common.document.DocumentWrapper;
 import org.nuxeo.ecm.core.api.DocumentModel;
 
 /**
diff --git a/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/RemoteDocumentModelHandler.java b/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/RemoteDocumentModelHandler.java
index 0ecb3f9ef..ffb96279f 100644
--- a/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/RemoteDocumentModelHandler.java
+++ b/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/RemoteDocumentModelHandler.java
@@ -32,9 +32,9 @@ import java.util.Set;
 import javax.ws.rs.core.MediaType;
 import org.collectionspace.services.common.context.RemoteServiceContext;
 import org.collectionspace.services.common.context.ServiceContext;
-import org.collectionspace.services.common.repository.BadRequestException;
-import org.collectionspace.services.common.repository.DocumentUtils;
-import org.collectionspace.services.common.repository.DocumentWrapper;
+import org.collectionspace.services.common.document.BadRequestException;
+import org.collectionspace.services.common.document.DocumentUtils;
+import org.collectionspace.services.common.document.DocumentWrapper;
 import org.collectionspace.services.common.service.ObjectPartType;
 import org.jboss.resteasy.plugins.providers.multipart.InputPart;
 import org.jboss.resteasy.plugins.providers.multipart.MultipartInput;
diff --git a/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/RepositoryJavaClient.java b/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/RepositoryJavaClient.java
index 4b9626810..1a521eb6b 100644
--- a/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/RepositoryJavaClient.java
+++ b/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/RepositoryJavaClient.java
@@ -21,13 +21,13 @@ package org.collectionspace.services.nuxeo.client.java;
 import java.util.UUID;
 
 import org.collectionspace.services.common.context.ServiceContext;
-import org.collectionspace.services.common.repository.BadRequestException;
-import org.collectionspace.services.common.repository.DocumentException;
-import org.collectionspace.services.common.repository.DocumentFilter;
-import org.collectionspace.services.common.repository.DocumentHandler;
-import org.collectionspace.services.common.repository.DocumentNotFoundException;
+import org.collectionspace.services.common.document.BadRequestException;
+import org.collectionspace.services.common.document.DocumentException;
+import org.collectionspace.services.common.document.DocumentFilter;
+import org.collectionspace.services.common.document.DocumentHandler;
+import org.collectionspace.services.common.document.DocumentNotFoundException;
 import org.collectionspace.services.common.repository.RepositoryClient;
-import org.collectionspace.services.common.repository.DocumentHandler.Action;
+import org.collectionspace.services.common.document.DocumentHandler.Action;
 import org.collectionspace.services.nuxeo.util.NuxeoUtils;
 import org.nuxeo.common.utils.IdUtils;
 import org.nuxeo.ecm.core.api.ClientException;
@@ -72,7 +72,7 @@ public class RepositoryJavaClient implements RepositoryClient {
             DocumentHandler handler) throws BadRequestException,
             DocumentException {
 
-        if (handler.getDocumentType() == null) {
+        if (ctx.getDocumentType() == null) {
             throw new IllegalArgumentException(
                     "RemoteRepositoryClient.create: docType is missing");
         }
@@ -97,7 +97,7 @@ public class RepositoryJavaClient implements RepositoryClient {
             String id = IdUtils.generateId(UUID.randomUUID().toString());
             // create document model
             DocumentModel doc = repoSession.createDocumentModel(wspacePath, id,
-                    handler.getDocumentType());
+                    ctx.getDocumentType());
             ((DocumentModelHandler) handler).setRepositorySession(repoSession);
             DocumentModelWrapper wrapDoc = new DocumentModelWrapper(doc);
             handler.handle(Action.CREATE, wrapDoc);
diff --git a/services/common/src/main/java/org/collectionspace/services/nuxeo/util/NuxeoUtils.java b/services/common/src/main/java/org/collectionspace/services/nuxeo/util/NuxeoUtils.java
index f7b1e7ae6..2d8cbd30e 100644
--- a/services/common/src/main/java/org/collectionspace/services/nuxeo/util/NuxeoUtils.java
+++ b/services/common/src/main/java/org/collectionspace/services/nuxeo/util/NuxeoUtils.java
@@ -25,7 +25,7 @@ import java.io.Serializable;
 import java.util.Map;
 import java.util.StringTokenizer;
 import org.collectionspace.services.common.context.ServiceContext;
-import org.collectionspace.services.common.repository.DocumentException;
+import org.collectionspace.services.common.document.DocumentException;
 
 import org.dom4j.Document;
 import org.dom4j.io.SAXReader;
diff --git a/services/id/service/src/main/java/org/collectionspace/services/id/AlphabeticIDGeneratorPart.java b/services/id/service/src/main/java/org/collectionspace/services/id/AlphabeticIDGeneratorPart.java
index f23a30550..923165c9d 100644
--- a/services/id/service/src/main/java/org/collectionspace/services/id/AlphabeticIDGeneratorPart.java
+++ b/services/id/service/src/main/java/org/collectionspace/services/id/AlphabeticIDGeneratorPart.java
@@ -56,7 +56,7 @@ import java.util.Vector;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.collectionspace.services.common.repository.BadRequestException;
+import org.collectionspace.services.common.document.BadRequestException;
 
 /**
  * AlphabeticIDGeneratorPart
diff --git a/services/id/service/src/main/java/org/collectionspace/services/id/IDGeneratorPart.java b/services/id/service/src/main/java/org/collectionspace/services/id/IDGeneratorPart.java
index 901fbb01a..789bda822 100644
--- a/services/id/service/src/main/java/org/collectionspace/services/id/IDGeneratorPart.java
+++ b/services/id/service/src/main/java/org/collectionspace/services/id/IDGeneratorPart.java
@@ -29,7 +29,7 @@
  */
 package org.collectionspace.services.id;
 
-import org.collectionspace.services.common.repository.BadRequestException;
+import org.collectionspace.services.common.document.BadRequestException;
 
 public interface IDGeneratorPart {
     
diff --git a/services/id/service/src/main/java/org/collectionspace/services/id/IDGeneratorSerializer.java b/services/id/service/src/main/java/org/collectionspace/services/id/IDGeneratorSerializer.java
index d03faa992..8e80e4b51 100644
--- a/services/id/service/src/main/java/org/collectionspace/services/id/IDGeneratorSerializer.java
+++ b/services/id/service/src/main/java/org/collectionspace/services/id/IDGeneratorSerializer.java
@@ -27,7 +27,7 @@ import com.thoughtworks.xstream.XStream;
 import com.thoughtworks.xstream.XStreamException;
 import com.thoughtworks.xstream.io.xml.DomDriver;
 
-import org.collectionspace.services.common.repository.BadRequestException;
+import org.collectionspace.services.common.document.BadRequestException;
 
 
 /**
diff --git a/services/id/service/src/main/java/org/collectionspace/services/id/IDResource.java b/services/id/service/src/main/java/org/collectionspace/services/id/IDResource.java
index 1e1944d52..d651cc103 100644
--- a/services/id/service/src/main/java/org/collectionspace/services/id/IDResource.java
+++ b/services/id/service/src/main/java/org/collectionspace/services/id/IDResource.java
@@ -38,8 +38,8 @@ import javax.ws.rs.core.UriBuilder;
 
 // May at some point instead use
 // org.jboss.resteasy.spi.NotFoundException
-import org.collectionspace.services.common.repository.BadRequestException;
-import org.collectionspace.services.common.repository.DocumentNotFoundException;
+import org.collectionspace.services.common.document.BadRequestException;
+import org.collectionspace.services.common.document.DocumentNotFoundException;
 
 import org.dom4j.Document;
 import org.dom4j.DocumentException;
diff --git a/services/id/service/src/main/java/org/collectionspace/services/id/IDService.java b/services/id/service/src/main/java/org/collectionspace/services/id/IDService.java
index 76b850691..34a3dd994 100644
--- a/services/id/service/src/main/java/org/collectionspace/services/id/IDService.java
+++ b/services/id/service/src/main/java/org/collectionspace/services/id/IDService.java
@@ -20,8 +20,8 @@ package org.collectionspace.services.id;
 // May at some point instead use
 // org.jboss.resteasy.spi.NotFoundException
 import java.util.Map;
-import org.collectionspace.services.common.repository.DocumentNotFoundException;
-import org.collectionspace.services.common.repository.BadRequestException;
+import org.collectionspace.services.common.document.DocumentNotFoundException;
+import org.collectionspace.services.common.document.BadRequestException;
 
 
 /**
diff --git a/services/id/service/src/main/java/org/collectionspace/services/id/IDServiceJdbcImpl.java b/services/id/service/src/main/java/org/collectionspace/services/id/IDServiceJdbcImpl.java
index 535552655..2211960ca 100644
--- a/services/id/service/src/main/java/org/collectionspace/services/id/IDServiceJdbcImpl.java
+++ b/services/id/service/src/main/java/org/collectionspace/services/id/IDServiceJdbcImpl.java
@@ -88,8 +88,8 @@ import java.sql.Statement;
 // org.jboss.resteasy.spi.NotFoundException
 import java.util.LinkedHashMap;
 import java.util.Map;
-import org.collectionspace.services.common.repository.BadRequestException;
-import org.collectionspace.services.common.repository.DocumentNotFoundException;
+import org.collectionspace.services.common.document.BadRequestException;
+import org.collectionspace.services.common.document.DocumentNotFoundException;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/services/id/service/src/main/java/org/collectionspace/services/id/NumericIDGeneratorPart.java b/services/id/service/src/main/java/org/collectionspace/services/id/NumericIDGeneratorPart.java
index 38621cbea..cfa31d426 100644
--- a/services/id/service/src/main/java/org/collectionspace/services/id/NumericIDGeneratorPart.java
+++ b/services/id/service/src/main/java/org/collectionspace/services/id/NumericIDGeneratorPart.java
@@ -30,7 +30,7 @@ package org.collectionspace.services.id;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.collectionspace.services.common.repository.BadRequestException;
+import org.collectionspace.services.common.document.BadRequestException;
 
 /**  
  * NumericIDGeneratorPart
diff --git a/services/id/service/src/main/java/org/collectionspace/services/id/SettableIDGenerator.java b/services/id/service/src/main/java/org/collectionspace/services/id/SettableIDGenerator.java
index 05bd355f4..09fee83a1 100644
--- a/services/id/service/src/main/java/org/collectionspace/services/id/SettableIDGenerator.java
+++ b/services/id/service/src/main/java/org/collectionspace/services/id/SettableIDGenerator.java
@@ -33,7 +33,7 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import org.collectionspace.services.common.repository.BadRequestException;
+import org.collectionspace.services.common.document.BadRequestException;
 
 /**
  * SettableIDGenerator
diff --git a/services/id/service/src/main/java/org/collectionspace/services/id/StringIDGeneratorPart.java b/services/id/service/src/main/java/org/collectionspace/services/id/StringIDGeneratorPart.java
index fc2e5179d..cc728c230 100644
--- a/services/id/service/src/main/java/org/collectionspace/services/id/StringIDGeneratorPart.java
+++ b/services/id/service/src/main/java/org/collectionspace/services/id/StringIDGeneratorPart.java
@@ -30,7 +30,7 @@ package org.collectionspace.services.id;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.regex.PatternSyntaxException;
-import org.collectionspace.services.common.repository.BadRequestException;
+import org.collectionspace.services.common.document.BadRequestException;
 
 /**
  * StringIDGeneratorPart
diff --git a/services/id/service/src/main/java/org/collectionspace/services/id/UUIDGeneratorPart.java b/services/id/service/src/main/java/org/collectionspace/services/id/UUIDGeneratorPart.java
index 80a3f94fa..18dd6567d 100644
--- a/services/id/service/src/main/java/org/collectionspace/services/id/UUIDGeneratorPart.java
+++ b/services/id/service/src/main/java/org/collectionspace/services/id/UUIDGeneratorPart.java
@@ -28,7 +28,7 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import org.collectionspace.services.common.repository.BadRequestException;
+import org.collectionspace.services.common.document.BadRequestException;
 
 /**
  * UUIDGeneratorPart
diff --git a/services/id/service/src/main/java/org/collectionspace/services/id/YearIDGeneratorPart.java b/services/id/service/src/main/java/org/collectionspace/services/id/YearIDGeneratorPart.java
index d036e490a..7238bd2d4 100644
--- a/services/id/service/src/main/java/org/collectionspace/services/id/YearIDGeneratorPart.java
+++ b/services/id/service/src/main/java/org/collectionspace/services/id/YearIDGeneratorPart.java
@@ -48,7 +48,7 @@ import java.util.logging.Logger;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.collectionspace.services.common.repository.BadRequestException;
+import org.collectionspace.services.common.document.BadRequestException;
 
 /**
  * YearIDGeneratorPart
diff --git a/services/id/service/src/test/java/org/collectionspace/services/id/test/AlphabeticIDGeneratorPartTest.java b/services/id/service/src/test/java/org/collectionspace/services/id/test/AlphabeticIDGeneratorPartTest.java
index 594f91817..8553a8c71 100644
--- a/services/id/service/src/test/java/org/collectionspace/services/id/test/AlphabeticIDGeneratorPartTest.java
+++ b/services/id/service/src/test/java/org/collectionspace/services/id/test/AlphabeticIDGeneratorPartTest.java
@@ -23,7 +23,7 @@
 
 package org.collectionspace.services.id.test;
 
-import org.collectionspace.services.common.repository.BadRequestException;
+import org.collectionspace.services.common.document.BadRequestException;
 import org.collectionspace.services.id.AlphabeticIDGeneratorPart;
 import org.collectionspace.services.id.SequenceIDGeneratorPart;
 
diff --git a/services/id/service/src/test/java/org/collectionspace/services/id/test/BaseIDGeneratorTest.java b/services/id/service/src/test/java/org/collectionspace/services/id/test/BaseIDGeneratorTest.java
index 7e218d492..41309ff04 100644
--- a/services/id/service/src/test/java/org/collectionspace/services/id/test/BaseIDGeneratorTest.java
+++ b/services/id/service/src/test/java/org/collectionspace/services/id/test/BaseIDGeneratorTest.java
@@ -25,7 +25,7 @@ package org.collectionspace.services.id.test;
 
 import java.util.Vector;
 import junit.framework.TestCase;
-import org.collectionspace.services.common.repository.BadRequestException;
+import org.collectionspace.services.common.document.BadRequestException;
 import org.collectionspace.services.id.*;
 
 /**    
diff --git a/services/id/service/src/test/java/org/collectionspace/services/id/test/IDGeneratorSerializerTest.java b/services/id/service/src/test/java/org/collectionspace/services/id/test/IDGeneratorSerializerTest.java
index 156d36894..f8957d1c5 100644
--- a/services/id/service/src/test/java/org/collectionspace/services/id/test/IDGeneratorSerializerTest.java
+++ b/services/id/service/src/test/java/org/collectionspace/services/id/test/IDGeneratorSerializerTest.java
@@ -25,7 +25,7 @@ package org.collectionspace.services.id.test;
 
 import org.collectionspace.services.id.*;
 
-import org.collectionspace.services.common.repository.BadRequestException; 
+import org.collectionspace.services.common.document.BadRequestException;
 
 import junit.framework.TestCase;
 import static org.junit.Assert.*;
diff --git a/services/id/service/src/test/java/org/collectionspace/services/id/test/IDServiceJdbcImplTest.java b/services/id/service/src/test/java/org/collectionspace/services/id/test/IDServiceJdbcImplTest.java
index b3f7e3c57..e7fcd4226 100644
--- a/services/id/service/src/test/java/org/collectionspace/services/id/test/IDServiceJdbcImplTest.java
+++ b/services/id/service/src/test/java/org/collectionspace/services/id/test/IDServiceJdbcImplTest.java
@@ -24,8 +24,8 @@
 package org.collectionspace.services.id.test;
 
 import java.util.Map;
-import org.collectionspace.services.common.repository.BadRequestException;
-import org.collectionspace.services.common.repository.DocumentNotFoundException;
+import org.collectionspace.services.common.document.BadRequestException;
+import org.collectionspace.services.common.document.DocumentNotFoundException;
 
 import org.collectionspace.services.id.*;
 
diff --git a/services/id/service/src/test/java/org/collectionspace/services/id/test/NumericIDGeneratorPartTest.java b/services/id/service/src/test/java/org/collectionspace/services/id/test/NumericIDGeneratorPartTest.java
index c21bbf9a3..50377ad30 100644
--- a/services/id/service/src/test/java/org/collectionspace/services/id/test/NumericIDGeneratorPartTest.java
+++ b/services/id/service/src/test/java/org/collectionspace/services/id/test/NumericIDGeneratorPartTest.java
@@ -27,7 +27,7 @@
 
 package org.collectionspace.services.id.test;
 
-import org.collectionspace.services.common.repository.BadRequestException;
+import org.collectionspace.services.common.document.BadRequestException;
 import static org.junit.Assert.fail;
 import junit.framework.TestCase;
 import org.collectionspace.services.id.NumericIDGeneratorPart;
diff --git a/services/id/service/src/test/java/org/collectionspace/services/id/test/SettableIDGeneratorTest.java b/services/id/service/src/test/java/org/collectionspace/services/id/test/SettableIDGeneratorTest.java
index 2591bf38f..83fa82251 100644
--- a/services/id/service/src/test/java/org/collectionspace/services/id/test/SettableIDGeneratorTest.java
+++ b/services/id/service/src/test/java/org/collectionspace/services/id/test/SettableIDGeneratorTest.java
@@ -24,7 +24,7 @@
 package org.collectionspace.services.id.test;
 
 import junit.framework.TestCase;
-import org.collectionspace.services.common.repository.BadRequestException;
+import org.collectionspace.services.common.document.BadRequestException;
 import org.collectionspace.services.id.*;
 
 /**    
diff --git a/services/id/service/src/test/java/org/collectionspace/services/id/test/StringIDGeneratorPartTest.java b/services/id/service/src/test/java/org/collectionspace/services/id/test/StringIDGeneratorPartTest.java
index 9a14be2c4..3f4a3a7e8 100644
--- a/services/id/service/src/test/java/org/collectionspace/services/id/test/StringIDGeneratorPartTest.java
+++ b/services/id/service/src/test/java/org/collectionspace/services/id/test/StringIDGeneratorPartTest.java
@@ -24,7 +24,7 @@
 package org.collectionspace.services.id.test;
 
 import junit.framework.TestCase;
-import org.collectionspace.services.common.repository.BadRequestException;
+import org.collectionspace.services.common.document.BadRequestException;
 import org.collectionspace.services.id.StoredValueIDGeneratorPart;
 import org.collectionspace.services.id.StringIDGeneratorPart;
 
diff --git a/services/id/service/src/test/java/org/collectionspace/services/id/test/YearIDGeneratorPartTest.java b/services/id/service/src/test/java/org/collectionspace/services/id/test/YearIDGeneratorPartTest.java
index 3073dc667..a2f8b1389 100644
--- a/services/id/service/src/test/java/org/collectionspace/services/id/test/YearIDGeneratorPartTest.java
+++ b/services/id/service/src/test/java/org/collectionspace/services/id/test/YearIDGeneratorPartTest.java
@@ -23,7 +23,7 @@
 
 package org.collectionspace.services.id.test;
 
-import org.collectionspace.services.common.repository.BadRequestException;
+import org.collectionspace.services.common.document.BadRequestException;
 import static org.junit.Assert.fail;
 import java.util.Calendar;
 import java.util.GregorianCalendar;
diff --git a/services/intake/service/src/main/java/org/collectionspace/services/intake/IntakeResource.java b/services/intake/service/src/main/java/org/collectionspace/services/intake/IntakeResource.java
index 0c7d425e1..fd936e728 100644
--- a/services/intake/service/src/main/java/org/collectionspace/services/intake/IntakeResource.java
+++ b/services/intake/service/src/main/java/org/collectionspace/services/intake/IntakeResource.java
@@ -45,8 +45,8 @@ import org.collectionspace.services.common.ClientType;
 import org.collectionspace.services.common.ServiceMain;
 import org.collectionspace.services.common.context.RemoteServiceContext;
 import org.collectionspace.services.common.context.ServiceContext;
-import org.collectionspace.services.common.repository.DocumentNotFoundException;
-import org.collectionspace.services.common.repository.DocumentHandler;
+import org.collectionspace.services.common.document.DocumentNotFoundException;
+import org.collectionspace.services.common.document.DocumentHandler;
 import org.jboss.resteasy.plugins.providers.multipart.MultipartInput;
 import org.jboss.resteasy.plugins.providers.multipart.MultipartOutput;
 import org.jboss.resteasy.util.HttpResponseCodes;
diff --git a/services/intake/service/src/main/java/org/collectionspace/services/intake/nuxeo/IntakeDocumentModelHandler.java b/services/intake/service/src/main/java/org/collectionspace/services/intake/nuxeo/IntakeDocumentModelHandler.java
index 838db07cb..f3057a2ff 100644
--- a/services/intake/service/src/main/java/org/collectionspace/services/intake/nuxeo/IntakeDocumentModelHandler.java
+++ b/services/intake/service/src/main/java/org/collectionspace/services/intake/nuxeo/IntakeDocumentModelHandler.java
@@ -27,8 +27,8 @@ import java.util.Iterator;
 import java.util.List;
 
 import org.collectionspace.services.IntakeJAXBSchema;
-import org.collectionspace.services.common.repository.DocumentHandler.Action;
-import org.collectionspace.services.common.repository.DocumentWrapper;
+import org.collectionspace.services.common.document.DocumentHandler.Action;
+import org.collectionspace.services.common.document.DocumentWrapper;
 import org.collectionspace.services.intake.IntakesCommon;
 import org.collectionspace.services.intake.IntakesCommonList;
 import org.collectionspace.services.intake.IntakesCommonList.IntakeListItem;
diff --git a/services/intake/service/src/main/java/org/collectionspace/services/intake/nuxeo/IntakeHandlerFactory.java b/services/intake/service/src/main/java/org/collectionspace/services/intake/nuxeo/IntakeHandlerFactory.java
index a80dad8de..9e901be19 100644
--- a/services/intake/service/src/main/java/org/collectionspace/services/intake/nuxeo/IntakeHandlerFactory.java
+++ b/services/intake/service/src/main/java/org/collectionspace/services/intake/nuxeo/IntakeHandlerFactory.java
@@ -24,8 +24,8 @@
 package org.collectionspace.services.intake.nuxeo;
 
 import org.collectionspace.services.common.ClientType;
-import org.collectionspace.services.common.repository.DocumentHandler;
-import org.collectionspace.services.common.repository.DocumentHandlerFactory;
+import org.collectionspace.services.common.document.DocumentHandler;
+import org.collectionspace.services.common.document.DocumentHandlerFactory;
 
 /**
  * IntakeHandlerFactory creates handlers for collectionobject based
diff --git a/services/nbactions.xml b/services/nbactions.xml
index 458dbd096..3510de7d4 100644
--- a/services/nbactions.xml
+++ b/services/nbactions.xml
@@ -1,16 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<actions>
-        <action>
-            <actionName>rebuild</actionName>
-            <packagings>
-                <packaging>*</packaging>
-            </packagings>
-            <goals>
-                <goal>clean</goal>
-                <goal>install</goal>
-            </goals>
-            <properties>
-                <maven.test.skip>true</maven.test.skip>
-            </properties>
-        </action>
-    </actions>
+<?xml version="1.0" encoding="UTF-8"?>
+<actions>
+        <action>
+            <actionName>rebuild</actionName>
+            <goals>
+                <goal>clean</goal>
+                <goal>install</goal>
+            </goals>
+            <properties>
+                <maven.test.skip>true</maven.test.skip>
+            </properties>
+        </action>
+        <action>
+            <actionName>CUSTOM-hotdeploy</actionName>
+            <displayName>hotdeploy</displayName>
+            <goals>
+                <goal>hotdeploy</goal>
+            </goals>
+        </action>
+    </actions>
diff --git a/services/pom.xml b/services/pom.xml
index 82aa9806d..fe51aa74d 100644
--- a/services/pom.xml
+++ b/services/pom.xml
@@ -1,201 +1,216 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <parent>
-        <artifactId>org.collectionspace.services</artifactId>
-        <groupId>org.collectionspace.services</groupId>
-        <version>1.0</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>org.collectionspace.services</groupId>
-    <version>1.0</version>
-    <artifactId>org.collectionspace.services.main</artifactId>
-    <packaging>pom</packaging>
-    <name>services.main</name>
-
-    <modules>
-        <!-- add modules below in the order based on dependencies -->
-        <module>common</module>
-        <module>authentication</module>
-        <module>relation</module>
-        <!--module>query</module-->
-        <module>acquisition</module>
-        <module>vocabulary</module>
-        <module>id</module>
-        <module>collectionobject</module>
-        <module>intake</module>
-        <module>JaxRsServiceProvider</module>
-        <module>client</module>
-        <module>sdk</module>
-        <module>IntegrationTests</module>
-    </modules>
-
-    <repositories> </repositories>
-
-    <pluginRepositories>
-    </pluginRepositories>
-
-    <build>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-compiler-plugin</artifactId>
-                    <configuration>
-                        <source>1.5</source>
-                        <target>1.5</target>
-                    </configuration>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-site-plugin</artifactId>
-                    <configuration>
-                        <unzipCommand>/usr/bin/unzip -o &gt; err.txt</unzipCommand>
-                    </configuration>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-war-plugin</artifactId>
-                    <version>2.0.1</version>
-                    <configuration>
-                        <warSourceExcludes>WEB-INF/lib/*.jar</warSourceExcludes>
-                        <archive>
-                            <manifest>
-                                <addClasspath>true</addClasspath>
-
-                            </manifest>
-                        </archive>
-                    </configuration>
-                </plugin>
-
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-dependency-plugin</artifactId>
-                    <executions>
-                        <execution>
-                            <id>classpath</id>
-                            <goals>
-                                <goal>build-classpath</goal>
-                            </goals>
-                            <configuration>
-                                <outputFile>classpath</outputFile>
-                            </configuration>
-                        </execution>
-                    </executions>
-                </plugin>
-
-
-            </plugins>
-        </pluginManagement>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>2.0.2</version>
-                <configuration>
-                    <source>1.6</source>
-                    <target>1.6</target>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-    <reporting>
-        <plugins>
-            <!--plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>taglist-maven-plugin</artifactId>
-                <version>2.1</version>
-                <configuration>
-                    <tags>
-                        <tag>@FIXME</tag>
-                        <tag>@fixme</tag>
-                        <tag>FIXME</tag>
-                        <tag>fixme</tag>
-                        <tag>@TODO</tag>
-                        <tag>@todo</tag>
-                        <tag>TODO</tag>
-                        <tag>todo</tag>
-                    </tags>
-                     <onlyAnalyze>org.collectionspace.*</onlyAnalyze>
-                </configuration>
-            </plugin-->
-
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>findbugs-maven-plugin</artifactId>
-                <version>2.0.1</version>
-                <configuration>
-                    <onlyAnalyze>org.collectionspace.*</onlyAnalyze>
-                </configuration>
-            </plugin>
-        </plugins>
-    </reporting>
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>net.java.dev.jaxb2-commons</groupId>
-                <artifactId>jaxb-fluent-api</artifactId>
-                <version>2.0.1</version>
-            </dependency>
-            <dependency>
-                <groupId>org.testng</groupId>
-                <artifactId>testng</artifactId>
-                <version>5.6</version>
-                <scope>test</scope>
-                <classifier>jdk15</classifier>
-            </dependency>
-            <dependency>
-                <groupId>org.jboss.resteasy</groupId>
-                <artifactId>jaxrs-api</artifactId>
-                <version>1.1.GA</version>
-            </dependency>
-            <dependency>
-                <groupId>net.java.dev.jaxb2-commons</groupId>
-                <artifactId>jaxb-fluent-api</artifactId>
-                <version>2.0.1</version>
-            </dependency>
-            <dependency>
-                <groupId>org.jvnet.jaxb2-commons</groupId>
-                <artifactId>property-listener-injector</artifactId>
-                <version>1.0</version>
-            </dependency>
-            <dependency>
-                <groupId>org.jvnet.jaxb2_commons</groupId>
-                <artifactId>runtime</artifactId>
-                <version>0.4.1</version>
-            </dependency>
-            <dependency>
-                <groupId>org.jboss.resteasy</groupId>
-                <artifactId>resteasy-jaxrs</artifactId>
-                <version>1.1.GA</version>
-            </dependency>
-            <dependency>
-                <groupId>commons-httpclient</groupId>
-                <artifactId>commons-httpclient</artifactId>
-                <version>3.1</version>
-            </dependency>
-            <dependency>
-                <groupId>com.sun.xml.bind</groupId>
-                <artifactId>jaxb-impl</artifactId>
-                <version>2.1.9</version>
-            </dependency>
-            <dependency>
-                <groupId>org.slf4j</groupId>
-                <artifactId>slf4j-api</artifactId>
-                <version>1.5.2</version>
-            </dependency>
-            <dependency>
-                <groupId>org.slf4j</groupId>
-                <artifactId>slf4j-log4j12</artifactId>
-                <version>1.5.2</version>
-            </dependency>
-            <dependency>
-                <groupId>mysql</groupId>
-                <artifactId>mysql-connector-java</artifactId>
-                <version>5.1.5</version>
-                <scope>test</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <parent>
+        <artifactId>org.collectionspace.services</artifactId>
+        <groupId>org.collectionspace.services</groupId>
+        <version>1.0</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.collectionspace.services</groupId>
+    <version>1.0</version>
+    <artifactId>org.collectionspace.services.main</artifactId>
+    <packaging>pom</packaging>
+    <name>services.main</name>
+
+    <modules>
+        <!-- add modules below in the order based on dependencies -->
+        <module>common</module>
+        <module>authentication</module>
+        <module>relation</module>
+        <!--module>query</module-->
+        <module>acquisition</module>
+        <module>vocabulary</module>
+        <module>id</module>
+        <module>collectionobject</module>
+        <module>intake</module>
+        <module>JaxRsServiceProvider</module>
+        <module>client</module>
+        <module>sdk</module>
+        <module>IntegrationTests</module>
+    <!--module>account</module-->
+    </modules>
+
+    <repositories> </repositories>
+
+    <pluginRepositories>
+    </pluginRepositories>
+
+    <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-compiler-plugin</artifactId>
+                    <configuration>
+                        <source>1.5</source>
+                        <target>1.5</target>
+                    </configuration>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-site-plugin</artifactId>
+                    <configuration>
+                        <unzipCommand>/usr/bin/unzip -o &gt; err.txt</unzipCommand>
+                    </configuration>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-war-plugin</artifactId>
+                    <version>2.0.1</version>
+                    <configuration>
+                        <warSourceExcludes>WEB-INF/lib/*.jar</warSourceExcludes>
+                        <archive>
+                            <manifest>
+                                <addClasspath>true</addClasspath>
+
+                            </manifest>
+                        </archive>
+                    </configuration>
+                </plugin>
+
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-dependency-plugin</artifactId>
+                    <executions>
+                        <execution>
+                            <id>classpath</id>
+                            <goals>
+                                <goal>build-classpath</goal>
+                            </goals>
+                            <configuration>
+                                <outputFile>classpath</outputFile>
+                            </configuration>
+                        </execution>
+                    </executions>
+                </plugin>
+
+
+            </plugins>
+        </pluginManagement>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>2.0.2</version>
+                <configuration>
+                    <source>1.6</source>
+                    <target>1.6</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+    <reporting>
+        <plugins>
+            <!--plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>taglist-maven-plugin</artifactId>
+                <version>2.1</version>
+                <configuration>
+                    <tags>
+                        <tag>@FIXME</tag>
+                        <tag>@fixme</tag>
+                        <tag>FIXME</tag>
+                        <tag>fixme</tag>
+                        <tag>@TODO</tag>
+                        <tag>@todo</tag>
+                        <tag>TODO</tag>
+                        <tag>todo</tag>
+                    </tags>
+                     <onlyAnalyze>org.collectionspace.*</onlyAnalyze>
+                </configuration>
+            </plugin-->
+
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>findbugs-maven-plugin</artifactId>
+                <version>2.0.1</version>
+                <configuration>
+                    <onlyAnalyze>org.collectionspace.*</onlyAnalyze>
+                </configuration>
+            </plugin>
+        </plugins>
+    </reporting>
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>net.java.dev.jaxb2-commons</groupId>
+                <artifactId>jaxb-fluent-api</artifactId>
+                <version>2.0.1</version>
+            </dependency>
+            <dependency>
+                <groupId>org.testng</groupId>
+                <artifactId>testng</artifactId>
+                <version>5.6</version>
+                <scope>test</scope>
+                <classifier>jdk15</classifier>
+            </dependency>
+            <dependency>
+                <groupId>org.jboss.resteasy</groupId>
+                <artifactId>jaxrs-api</artifactId>
+                <version>1.1.GA</version>
+            </dependency>
+            <dependency>
+                <groupId>net.java.dev.jaxb2-commons</groupId>
+                <artifactId>jaxb-fluent-api</artifactId>
+                <version>2.0.1</version>
+            </dependency>
+            <dependency>
+                <groupId>org.jvnet.jaxb2-commons</groupId>
+                <artifactId>property-listener-injector</artifactId>
+                <version>1.0</version>
+            </dependency>
+            <dependency>
+                <groupId>org.jvnet.jaxb2_commons</groupId>
+                <artifactId>runtime</artifactId>
+                <version>0.4.1</version>
+            </dependency>
+            <dependency>
+                <groupId>org.jboss.resteasy</groupId>
+                <artifactId>resteasy-jaxrs</artifactId>
+                <version>1.1.GA</version>
+            </dependency>
+            <dependency>
+                <groupId>commons-httpclient</groupId>
+                <artifactId>commons-httpclient</artifactId>
+                <version>3.1</version>
+            </dependency>
+            <dependency>
+                <groupId>com.sun.xml.bind</groupId>
+                <artifactId>jaxb-impl</artifactId>
+                <version>2.1.9</version>
+            </dependency>
+            <dependency>
+                <groupId>org.slf4j</groupId>
+                <artifactId>slf4j-api</artifactId>
+                <version>1.5.2</version>
+            </dependency>
+            <dependency>
+                <groupId>org.slf4j</groupId>
+                <artifactId>slf4j-log4j12</artifactId>
+                <version>1.5.2</version>
+            </dependency>
+            <dependency>
+                <groupId>javax.persistence</groupId>
+                <artifactId>persistence-api</artifactId>
+                <version>1.0</version>
+            </dependency>
+            <dependency>
+                <groupId>org.hibernate</groupId>
+                <artifactId>hibernate-entitymanager</artifactId>
+                <version>3.4.0.GA</version>
+            </dependency>
+            <dependency>
+                <groupId>org.hibernate</groupId>
+                <artifactId>hibernate</artifactId>
+                <version>3.4.0.GA</version>
+            </dependency>
+
+            <dependency>
+                <groupId>mysql</groupId>
+                <artifactId>mysql-connector-java</artifactId>
+                <version>5.1.5</version>
+                <scope>test</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+</project>
\ No newline at end of file
diff --git a/services/relation/service/src/main/java/org/collectionspace/services/relation/NewRelationResource.java b/services/relation/service/src/main/java/org/collectionspace/services/relation/NewRelationResource.java
index a68481761..35ce07a8f 100644
--- a/services/relation/service/src/main/java/org/collectionspace/services/relation/NewRelationResource.java
+++ b/services/relation/service/src/main/java/org/collectionspace/services/relation/NewRelationResource.java
@@ -47,8 +47,8 @@ import org.collectionspace.services.common.AbstractCollectionSpaceResource;
 import org.collectionspace.services.common.context.RemoteServiceContext;
 import org.collectionspace.services.common.context.ServiceContext;
 import org.collectionspace.services.common.relation.IRelationsManager;
-import org.collectionspace.services.common.repository.DocumentNotFoundException;
-import org.collectionspace.services.common.repository.DocumentHandler;
+import org.collectionspace.services.common.document.DocumentNotFoundException;
+import org.collectionspace.services.common.document.DocumentHandler;
 import org.collectionspace.services.relation.nuxeo.RelationHandlerFactory;
 import org.jboss.resteasy.plugins.providers.multipart.MultipartInput;
 import org.jboss.resteasy.plugins.providers.multipart.MultipartOutput;
diff --git a/services/relation/service/src/main/java/org/collectionspace/services/relation/nuxeo/RelationDocumentModelHandler.java b/services/relation/service/src/main/java/org/collectionspace/services/relation/nuxeo/RelationDocumentModelHandler.java
index 48d8bb419..1c12971e8 100644
--- a/services/relation/service/src/main/java/org/collectionspace/services/relation/nuxeo/RelationDocumentModelHandler.java
+++ b/services/relation/service/src/main/java/org/collectionspace/services/relation/nuxeo/RelationDocumentModelHandler.java
@@ -31,12 +31,12 @@ import java.util.Map;
 import org.collectionspace.services.common.relation.IRelationsManager;
 import org.collectionspace.services.common.relation.nuxeo.RelationConstants;
 import org.collectionspace.services.common.relation.nuxeo.RelationsUtils;
-import org.collectionspace.services.common.repository.DocumentHandler.Action;
+import org.collectionspace.services.common.document.DocumentHandler.Action;
 import org.collectionspace.services.relation.RelationsCommon;
 import org.collectionspace.services.relation.RelationsCommonList;
 import org.collectionspace.services.relation.RelationsCommonList.RelationListItem;
 
-import org.collectionspace.services.common.repository.DocumentWrapper;
+import org.collectionspace.services.common.document.DocumentWrapper;
 import org.collectionspace.services.nuxeo.client.java.RemoteDocumentModelHandler;
 import org.nuxeo.ecm.core.api.DocumentModel;
 import org.nuxeo.ecm.core.api.DocumentModelList;
diff --git a/services/relation/service/src/main/java/org/collectionspace/services/relation/nuxeo/RelationHandlerFactory.java b/services/relation/service/src/main/java/org/collectionspace/services/relation/nuxeo/RelationHandlerFactory.java
index 557fbcf23..c669118ac 100644
--- a/services/relation/service/src/main/java/org/collectionspace/services/relation/nuxeo/RelationHandlerFactory.java
+++ b/services/relation/service/src/main/java/org/collectionspace/services/relation/nuxeo/RelationHandlerFactory.java
@@ -24,8 +24,8 @@
 package org.collectionspace.services.relation.nuxeo;
 
 import org.collectionspace.services.common.ClientType;
-import org.collectionspace.services.common.repository.DocumentHandler;
-import org.collectionspace.services.common.repository.DocumentHandlerFactory;
+import org.collectionspace.services.common.document.DocumentHandler;
+import org.collectionspace.services.common.document.DocumentHandlerFactory;
 
 /**
  * CollectionObjectHandlerFactory creates handlers for collectionobject based
diff --git a/services/vocabulary/service/src/main/java/org/collectionspace/services/vocabulary/VocabularyResource.java b/services/vocabulary/service/src/main/java/org/collectionspace/services/vocabulary/VocabularyResource.java
index 50e78b096..a9c7a263c 100644
--- a/services/vocabulary/service/src/main/java/org/collectionspace/services/vocabulary/VocabularyResource.java
+++ b/services/vocabulary/service/src/main/java/org/collectionspace/services/vocabulary/VocabularyResource.java
@@ -47,17 +47,15 @@ import org.collectionspace.services.common.ClientType;
 import org.collectionspace.services.common.ServiceMain;
 import org.collectionspace.services.common.context.RemoteServiceContext;
 import org.collectionspace.services.common.context.ServiceContext;
-import org.collectionspace.services.common.repository.DocumentFilter;
-import org.collectionspace.services.common.repository.DocumentHandler;
-import org.collectionspace.services.common.repository.DocumentNotFoundException;
+import org.collectionspace.services.common.document.DocumentFilter;
+import org.collectionspace.services.common.document.DocumentHandler;
+import org.collectionspace.services.common.document.DocumentNotFoundException;
 import org.collectionspace.services.vocabulary.nuxeo.VocabularyHandlerFactory;
 import org.collectionspace.services.vocabulary.nuxeo.VocabularyItemDocumentModelHandler;
 import org.collectionspace.services.vocabulary.nuxeo.VocabularyItemHandlerFactory;
 import org.jboss.resteasy.plugins.providers.multipart.MultipartInput;
 import org.jboss.resteasy.plugins.providers.multipart.MultipartOutput;
 import org.jboss.resteasy.util.HttpResponseCodes;
-import org.nuxeo.ecm.core.api.repository.RepositoryInstance;
-import org.nuxeo.ecm.core.client.NuxeoClient;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -377,7 +375,6 @@ public class VocabularyResource extends AbstractCollectionSpaceResource {
     		 @PathParam("csid") String parentcsid,
     		 @Context UriInfo ui) {
          VocabularyitemsCommonList vocabularyItemObjectList = new VocabularyitemsCommonList();
-         NuxeoClient client = null;
          try{
         	 // Note that docType defaults to the ServiceName, so we're fine with that.
              RemoteServiceContext ctx = createServiceContext(null, getItemServiceName());
diff --git a/services/vocabulary/service/src/main/java/org/collectionspace/services/vocabulary/nuxeo/VocabularyDocumentModelHandler.java b/services/vocabulary/service/src/main/java/org/collectionspace/services/vocabulary/nuxeo/VocabularyDocumentModelHandler.java
index 7385d6672..a6fc7845b 100644
--- a/services/vocabulary/service/src/main/java/org/collectionspace/services/vocabulary/nuxeo/VocabularyDocumentModelHandler.java
+++ b/services/vocabulary/service/src/main/java/org/collectionspace/services/vocabulary/nuxeo/VocabularyDocumentModelHandler.java
@@ -27,8 +27,8 @@ import java.util.Iterator;
 import java.util.List;
 
 import org.collectionspace.services.VocabularyJAXBSchema;
-import org.collectionspace.services.common.repository.DocumentHandler.Action;
-import org.collectionspace.services.common.repository.DocumentWrapper;
+import org.collectionspace.services.common.document.DocumentHandler.Action;
+import org.collectionspace.services.common.document.DocumentWrapper;
 import org.collectionspace.services.vocabulary.VocabulariesCommon;
 import org.collectionspace.services.vocabulary.VocabulariesCommonList;
 import org.collectionspace.services.vocabulary.VocabulariesCommonList.VocabularyListItem;
diff --git a/services/vocabulary/service/src/main/java/org/collectionspace/services/vocabulary/nuxeo/VocabularyHandlerFactory.java b/services/vocabulary/service/src/main/java/org/collectionspace/services/vocabulary/nuxeo/VocabularyHandlerFactory.java
index 709df73e5..9ee43b31e 100644
--- a/services/vocabulary/service/src/main/java/org/collectionspace/services/vocabulary/nuxeo/VocabularyHandlerFactory.java
+++ b/services/vocabulary/service/src/main/java/org/collectionspace/services/vocabulary/nuxeo/VocabularyHandlerFactory.java
@@ -24,8 +24,8 @@
 package org.collectionspace.services.vocabulary.nuxeo;
 
 import org.collectionspace.services.common.ClientType;
-import org.collectionspace.services.common.repository.DocumentHandler;
-import org.collectionspace.services.common.repository.DocumentHandlerFactory;
+import org.collectionspace.services.common.document.DocumentHandler;
+import org.collectionspace.services.common.document.DocumentHandlerFactory;
 
 
 /**
diff --git a/services/vocabulary/service/src/main/java/org/collectionspace/services/vocabulary/nuxeo/VocabularyItemDocumentModelHandler.java b/services/vocabulary/service/src/main/java/org/collectionspace/services/vocabulary/nuxeo/VocabularyItemDocumentModelHandler.java
index 03c1fb294..ff4d3c7e5 100644
--- a/services/vocabulary/service/src/main/java/org/collectionspace/services/vocabulary/nuxeo/VocabularyItemDocumentModelHandler.java
+++ b/services/vocabulary/service/src/main/java/org/collectionspace/services/vocabulary/nuxeo/VocabularyItemDocumentModelHandler.java
@@ -27,7 +27,7 @@ import java.util.Iterator;
 import java.util.List;
 
 import org.collectionspace.services.VocabularyItemJAXBSchema;
-import org.collectionspace.services.common.repository.DocumentWrapper;
+import org.collectionspace.services.common.document.DocumentWrapper;
 import org.collectionspace.services.nuxeo.client.java.RemoteDocumentModelHandler;
 import org.collectionspace.services.nuxeo.util.NuxeoUtils;
 import org.collectionspace.services.vocabulary.VocabularyitemsCommon;
diff --git a/services/vocabulary/service/src/main/java/org/collectionspace/services/vocabulary/nuxeo/VocabularyItemHandlerFactory.java b/services/vocabulary/service/src/main/java/org/collectionspace/services/vocabulary/nuxeo/VocabularyItemHandlerFactory.java
index 89440fadc..c973f1894 100644
--- a/services/vocabulary/service/src/main/java/org/collectionspace/services/vocabulary/nuxeo/VocabularyItemHandlerFactory.java
+++ b/services/vocabulary/service/src/main/java/org/collectionspace/services/vocabulary/nuxeo/VocabularyItemHandlerFactory.java
@@ -24,8 +24,8 @@
 package org.collectionspace.services.vocabulary.nuxeo;
 
 import org.collectionspace.services.common.ClientType;
-import org.collectionspace.services.common.repository.DocumentHandler;
-import org.collectionspace.services.common.repository.DocumentHandlerFactory;
+import org.collectionspace.services.common.document.DocumentHandler;
+import org.collectionspace.services.common.document.DocumentHandlerFactory;
 
 
 /**