]> git.aero2k.de Git - tmp/jakarta-migration.git/commitdiff
NOJIRA refactoring of common with regards to movement of document handling code....
authorSanjay Dalal <sanjay.dalal@berkeley.edu>
Fri, 13 Nov 2009 22:35:15 +0000 (22:35 +0000)
committerSanjay Dalal <sanjay.dalal@berkeley.edu>
Fri, 13 Nov 2009 22:35:15 +0000 (22:35 +0000)
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

62 files changed:
services/acquisition/service/src/main/java/org/collectionspace/services/acquisition/AcquisitionResource.java
services/acquisition/service/src/main/java/org/collectionspace/services/acquisition/nuxeo/AcquisitionDocumentModelHandler.java
services/acquisition/service/src/main/java/org/collectionspace/services/acquisition/nuxeo/AcquisitionHandlerFactory.java
services/collectionobject/service/src/main/java/org/collectionspace/services/collectionobject/CollectionObjectResource.java
services/collectionobject/service/src/main/java/org/collectionspace/services/collectionobject/nuxeo/CollectionObjectDocumentModelHandler.java
services/collectionobject/service/src/main/java/org/collectionspace/services/collectionobject/nuxeo/CollectionObjectHandlerFactory.java
services/common/src/main/java/org/collectionspace/services/common/AbstractCollectionSpaceResource.java
services/common/src/main/java/org/collectionspace/services/common/CollectionSpaceResource.java
services/common/src/main/java/org/collectionspace/services/common/context/AbstractServiceContext.java
services/common/src/main/java/org/collectionspace/services/common/context/RemoteServiceContextImpl.java
services/common/src/main/java/org/collectionspace/services/common/context/ServiceContext.java
services/common/src/main/java/org/collectionspace/services/common/document/AbstractDocumentHandler.java [moved from services/common/src/main/java/org/collectionspace/services/common/repository/AbstractDocumentHandler.java with 99% similarity]
services/common/src/main/java/org/collectionspace/services/common/document/BadRequestException.java [moved from services/common/src/main/java/org/collectionspace/services/common/repository/BadRequestException.java with 98% similarity]
services/common/src/main/java/org/collectionspace/services/common/document/DocumentException.java [moved from services/common/src/main/java/org/collectionspace/services/common/repository/DocumentException.java with 98% similarity]
services/common/src/main/java/org/collectionspace/services/common/document/DocumentFilter.java [moved from services/common/src/main/java/org/collectionspace/services/common/repository/DocumentFilter.java with 95% similarity]
services/common/src/main/java/org/collectionspace/services/common/document/DocumentHandler.java [moved from services/common/src/main/java/org/collectionspace/services/common/repository/DocumentHandler.java with 97% similarity]
services/common/src/main/java/org/collectionspace/services/common/document/DocumentHandlerFactory.java [moved from services/common/src/main/java/org/collectionspace/services/common/repository/DocumentHandlerFactory.java with 95% similarity]
services/common/src/main/java/org/collectionspace/services/common/document/DocumentNotFoundException.java [moved from services/common/src/main/java/org/collectionspace/services/common/repository/DocumentNotFoundException.java with 97% similarity]
services/common/src/main/java/org/collectionspace/services/common/document/DocumentUtils.java [moved from services/common/src/main/java/org/collectionspace/services/common/repository/DocumentUtils.java with 99% similarity]
services/common/src/main/java/org/collectionspace/services/common/document/DocumentWrapper.java [moved from services/common/src/main/java/org/collectionspace/services/common/repository/DocumentWrapper.java with 95% similarity]
services/common/src/main/java/org/collectionspace/services/common/relation/IRelationsManager.java
services/common/src/main/java/org/collectionspace/services/common/relation/nuxeo/RelationsUtils.java
services/common/src/main/java/org/collectionspace/services/common/repository/RepositoryClient.java
services/common/src/main/java/org/collectionspace/services/common/storage/StorageClient.java [new file with mode: 0644]
services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/DocumentModelHandler.java
services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/DocumentModelListWrapper.java
services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/DocumentModelWrapper.java
services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/RemoteDocumentModelHandler.java
services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/RepositoryJavaClient.java
services/common/src/main/java/org/collectionspace/services/nuxeo/util/NuxeoUtils.java
services/id/service/src/main/java/org/collectionspace/services/id/AlphabeticIDGeneratorPart.java
services/id/service/src/main/java/org/collectionspace/services/id/IDGeneratorPart.java
services/id/service/src/main/java/org/collectionspace/services/id/IDGeneratorSerializer.java
services/id/service/src/main/java/org/collectionspace/services/id/IDResource.java
services/id/service/src/main/java/org/collectionspace/services/id/IDService.java
services/id/service/src/main/java/org/collectionspace/services/id/IDServiceJdbcImpl.java
services/id/service/src/main/java/org/collectionspace/services/id/NumericIDGeneratorPart.java
services/id/service/src/main/java/org/collectionspace/services/id/SettableIDGenerator.java
services/id/service/src/main/java/org/collectionspace/services/id/StringIDGeneratorPart.java
services/id/service/src/main/java/org/collectionspace/services/id/UUIDGeneratorPart.java
services/id/service/src/main/java/org/collectionspace/services/id/YearIDGeneratorPart.java
services/id/service/src/test/java/org/collectionspace/services/id/test/AlphabeticIDGeneratorPartTest.java
services/id/service/src/test/java/org/collectionspace/services/id/test/BaseIDGeneratorTest.java
services/id/service/src/test/java/org/collectionspace/services/id/test/IDGeneratorSerializerTest.java
services/id/service/src/test/java/org/collectionspace/services/id/test/IDServiceJdbcImplTest.java
services/id/service/src/test/java/org/collectionspace/services/id/test/NumericIDGeneratorPartTest.java
services/id/service/src/test/java/org/collectionspace/services/id/test/SettableIDGeneratorTest.java
services/id/service/src/test/java/org/collectionspace/services/id/test/StringIDGeneratorPartTest.java
services/id/service/src/test/java/org/collectionspace/services/id/test/YearIDGeneratorPartTest.java
services/intake/service/src/main/java/org/collectionspace/services/intake/IntakeResource.java
services/intake/service/src/main/java/org/collectionspace/services/intake/nuxeo/IntakeDocumentModelHandler.java
services/intake/service/src/main/java/org/collectionspace/services/intake/nuxeo/IntakeHandlerFactory.java
services/nbactions.xml
services/pom.xml
services/relation/service/src/main/java/org/collectionspace/services/relation/NewRelationResource.java
services/relation/service/src/main/java/org/collectionspace/services/relation/nuxeo/RelationDocumentModelHandler.java
services/relation/service/src/main/java/org/collectionspace/services/relation/nuxeo/RelationHandlerFactory.java
services/vocabulary/service/src/main/java/org/collectionspace/services/vocabulary/VocabularyResource.java
services/vocabulary/service/src/main/java/org/collectionspace/services/vocabulary/nuxeo/VocabularyDocumentModelHandler.java
services/vocabulary/service/src/main/java/org/collectionspace/services/vocabulary/nuxeo/VocabularyHandlerFactory.java
services/vocabulary/service/src/main/java/org/collectionspace/services/vocabulary/nuxeo/VocabularyItemDocumentModelHandler.java
services/vocabulary/service/src/main/java/org/collectionspace/services/vocabulary/nuxeo/VocabularyItemHandlerFactory.java

index d1178429e27b7a3b38e470aa7e5079a0c3b27392..8e606825f5b830a622a1e911e23aca3678c91d75 100644 (file)
@@ -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;
index 8297884937ece8e6e8752db706ee1ef1fb006b25..2ffea0a222fc922eafcde833ca937aa8ba5eb1ef 100644 (file)
@@ -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;
index b1522e1e6daf51214611dbdfdc9a77dd43083803..292719d08322f57c7668c74006002ddf3ff20e7f 100644 (file)
@@ -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
index 91107383dade9ac11fd68adcd3e46b5b5237bf12..1d5fd147f87f73ac7e7c5f28afd2a763912e8bed 100644 (file)
@@ -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;
index 53c1d39de77c3757c41d001edb3f4bc7923d9855..eea06dde56b420b84b387282694c9034464a36ad 100644 (file)
@@ -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;
index df91d5468adb5e97a13fcc599c9eed3741238cf8..a1fb1f1111f59e1b9c5d560204f51e0b50bff70f 100644 (file)
@@ -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
index bac653c5f6976df87def9958d6b6de52c9b4305b..55041d1ff3929417adad9e3d34485709e7d05933 100644 (file)
@@ -26,7 +26,7 @@ package org.collectionspace.services.common;
 import org.collectionspace.services.common.context.RemoteServiceContext;\r
 import org.collectionspace.services.common.context.ServiceContext;\r
 import org.collectionspace.services.common.context.RemoteServiceContextImpl;\r
-import org.collectionspace.services.common.repository.DocumentHandler;\r
+import org.collectionspace.services.common.document.DocumentHandler;\r
 import org.collectionspace.services.common.repository.RepositoryClient;\r
 import org.collectionspace.services.common.repository.RepositoryClientFactory;\r
 import org.jboss.resteasy.plugins.providers.multipart.MultipartInput;\r
index 1375dd72b4ea88d7d6726f57c1a9ae1803d27c87..1bba8506305f90fa70c46830796d1496ce06669f 100644 (file)
@@ -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;
index 83696c71094322c9c410f05987e49d340ebff701..78b1b106a0aefa68e2e3dff819a3e1e4fc140b1b 100644 (file)
@@ -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() {
index af6f5b49296cbc49f24bc0d63cf6b5a77d2ade9c..4d6be9049a307379d7659cc82e7fba6e7c29c8ea 100644 (file)
@@ -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;
index 25147efdf2e18d97760085de65527de938760983..5b209ef8a6e58f2319a073ff98193f2cf94b90cd 100644 (file)
@@ -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
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 15a037cd8d0becfc8a082b6753338c47e239c71c..4dbab9200e9ea1ce1eb6d6510b0e645592c0d217 100644 (file)
@@ -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;
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 826b7eb03ddce70d8f1c331bd6bd80415869b8eb..efead821209bd128aec87e07f3dff960808762fd 100644 (file)
@@ -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
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 ce8fe70cfca44e12c9010d41e48db83c80f90166..9c768be338a54df754765485b4515e04bbe36b13 100644 (file)
@@ -15,7 +15,7 @@
 \r
  *  https://source.collectionspace.org/collection-space/LICENSE.txt\r
  */\r
-package org.collectionspace.services.common.repository;\r
+package org.collectionspace.services.common.document;\r
 \r
 import java.util.List;\r
 \r
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 31aa51442504a7187d61f4ec185675aa7493e1e7..0972256bcd6e0de42d8d2bfa3ef26f1448450b03 100644 (file)
@@ -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
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 5d3fd2611d146262b5fc112402b5e422fe918521..c02f838131ab37c065f6eed506203dde90e619b1 100644 (file)
@@ -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;
 
 /**
  *
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 0bfdc9c172de11fa4af49c859d738f0f14f31c74..c3600db01c4be86e5eba18253fa059bf80c31649 100644 (file)
@@ -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;
index 89d0816d26e65dafe2b3f5ddfcae690242acb3b0..65a8b62f77b0f99c13774faef385d5b96c357892 100644 (file)
@@ -29,7 +29,7 @@ package org.collectionspace.services.common.relation;
 import java.util.List;\r
 \r
 \r
-import org.collectionspace.services.common.repository.DocumentException;\r
+import org.collectionspace.services.common.document.DocumentException;\r
 import org.collectionspace.services.relation.RelationsCommon;\r
 import org.nuxeo.ecm.core.api.DocumentModel;\r
 \r
index 3c49ff3e10b42d1f97c4c7033ce2a42badde68f8..ebf47e26ef272fc61cc65191e9e9b21993c87166 100644 (file)
@@ -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;
index 1e70ddbf8bd12b0cfc60844eab0329b0491d448d..451c3518c9ae8f8e3b1291ff3ab08a6bc5f2e491 100644 (file)
@@ -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 (file)
index 0000000..63474c3
--- /dev/null
@@ -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;
+
+}
index 4c57ab22a0692d419640942ea58e58a0f61b96f2..ec5cec310ce14507613771a2423882eb87c714d7 100644 (file)
@@ -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();
-
 }
index 9248c2154a363cb9169c2871a7316f19b00e401b..c2b0096d17e6142db8fe4156a1deaebf5bba1285 100644 (file)
@@ -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;
 
 /**
index 75d993846c4d9fc579ea5f4f01748821edc7acc9..d12a93202ed2122d1e4a46989378bdbabca263bf 100644 (file)
@@ -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;
 
 /**
index 0ecb3f9ef6b291995cf96074cbc1ecfeef5d6f5b..ffb96279f780759c8ed16a68a471e1d4a4d75f20 100644 (file)
@@ -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;
index 4b9626810893dcbea2e58eaecf35d9f515ab2849..1a521eb6bf110919199ba92db935a9a6549bf191 100644 (file)
@@ -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);
index f7b1e7ae6d9dde129a12dd928168c83bc4663de5..2d8cbd30e89c0a85bab9be6e1b405e3abd0fe2e6 100644 (file)
@@ -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;
index f23a3055071f7ee88684688e289a3d643c07fe81..923165c9d750921bc64c2c672c0a6490acfa144a 100644 (file)
@@ -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
index 901fbb01a343c28edb1daf792f5b0570a3a49869..789bda822ad012881fa888dd5bf0fabb01f1cc4e 100644 (file)
@@ -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 {
     
index d03faa99273d597bf5c5bc2f9f68eb997b1e1d9a..8e80e4b5151cff369eeeeeeca3e7a30d57bb9402 100644 (file)
@@ -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;
 
 
 /**
index 1e1944d52f960d8dbb4f1ad0eccdf596d1b4e255..d651cc1032d3b66ff10a31fdd35f2059ecdf6c12 100644 (file)
@@ -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;
index 76b8506910fde0724d7e897dd372d776e03a5961..34a3dd994f7f1c7289aae3eff66ca519cc28cd12 100644 (file)
@@ -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;
 
 
 /**
index 5355526555ff8970e422e681369f363b1299044f..2211960caac30947825b297dd7858c1a72d5706a 100644 (file)
@@ -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;
index 38621cbea3a81499f1a57d786a39566fec55c8c7..cfa31d4260ce81d95f8795f7dc56e0daf1bf7eed 100644 (file)
@@ -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
index 05bd355f492af36ef6692a936527f583499e69bc..09fee83a173c7dca1c4b627ca7f8097526c576f0 100644 (file)
@@ -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
index fc2e5179d375339c969537122f4303b1e7dc3aea..cc728c230f7f573d6cbfdd938243eacf9ae4e0fc 100644 (file)
@@ -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
index 80a3f94fa6053632110b727cf2b33017a92f1e41..18dd6567d95314fbc1b397912b3afaf1e9f015bd 100644 (file)
@@ -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
index d036e490abcb3c409971f005e03182bb80b250ce..7238bd2d46879f92765c90fdf70f7a961ceb0789 100644 (file)
@@ -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
index 594f9181716ae217340b448e9bd9a72782720b49..8553a8c7143742c1ecedfa02357c6af6fde38e48 100644 (file)
@@ -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;
 
index 7e218d492aac06908c54e6c4d0be1ac582bb6c89..41309ff043172ecf4e5ca76f5476820cd4cee347 100644 (file)
@@ -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.*;
 
 /**    
index 156d36894a051b9a577cac2ac7f2d8462152475f..f8957d1c56618fb685eed03418f31b5561115e8e 100644 (file)
@@ -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.*;
index b3f7e3c57a546e7406d1dd85655a8a1ce1cb0c1e..e7fcd422614ce2dc8edfa3ef324e365e3b13942a 100644 (file)
@@ -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.*;
 
index c21bbf9a3658aa3288b4efb01dc397a7a5fffa7e..50377ad30402328734ca99718276091bdd5ff6d5 100644 (file)
@@ -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;
index 2591bf38fcde16244bfbede8039dbcf68c409644..83fa82251ae57e0c4cbd311e25bc822897a43c40 100644 (file)
@@ -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.*;
 
 /**    
index 9a14be2c4e78035c4751d41b7ed2b361af484f00..3f4a3a7e8108123d468beb129b6a4f014c3825b8 100644 (file)
@@ -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;
 
index 3073dc66786164080bad7114a753bdf32fa3abe5..a2f8b1389914d6d4f483738780a01dc7d046ea41 100644 (file)
@@ -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;
index 0c7d425e1758f0035bcf1cb0fdfac475189bfd4e..fd936e728ec0fb621284e44f0180246c893942a5 100644 (file)
@@ -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;
index 838db07cbafee625c15125fbe83b812fc96c0d7c..f3057a2ffd939afeff96f235ee2e89180db0aba3 100644 (file)
@@ -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;
index a80dad8de17c2dfa227e8a47d87d7ac1a2af834f..9e901be19a9458cd47e846b85af880021af9b9ab 100644 (file)
@@ -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
index 458dbd0969b74487ee893682e8132829ae6efd7e..3510de7d464536cc68d29df07167f1e2947ffc8d 100644 (file)
@@ -1,16 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<actions>\r
-        <action>\r
-            <actionName>rebuild</actionName>\r
-            <packagings>\r
-                <packaging>*</packaging>\r
-            </packagings>\r
-            <goals>\r
-                <goal>clean</goal>\r
-                <goal>install</goal>\r
-            </goals>\r
-            <properties>\r
-                <maven.test.skip>true</maven.test.skip>\r
-            </properties>\r
-        </action>\r
-    </actions>\r
+<?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>
index 82aa9806deca3efba4b9b97b2dd56253d1b304ad..fe51aa74d58aee7c89956b3419cd309e639b82a1 100644 (file)
-<?xml version="1.0" encoding="UTF-8"?>\r
-<project xmlns="http://maven.apache.org/POM/4.0.0"\r
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">\r
-    <parent>\r
-        <artifactId>org.collectionspace.services</artifactId>\r
-        <groupId>org.collectionspace.services</groupId>\r
-        <version>1.0</version>\r
-    </parent>\r
-    <modelVersion>4.0.0</modelVersion>\r
-    <groupId>org.collectionspace.services</groupId>\r
-    <version>1.0</version>\r
-    <artifactId>org.collectionspace.services.main</artifactId>\r
-    <packaging>pom</packaging>\r
-    <name>services.main</name>\r
-\r
-    <modules>\r
-        <!-- add modules below in the order based on dependencies -->\r
-        <module>common</module>\r
-        <module>authentication</module>\r
-        <module>relation</module>\r
-        <!--module>query</module-->\r
-        <module>acquisition</module>\r
-        <module>vocabulary</module>\r
-        <module>id</module>\r
-        <module>collectionobject</module>\r
-        <module>intake</module>\r
-        <module>JaxRsServiceProvider</module>\r
-        <module>client</module>\r
-        <module>sdk</module>\r
-        <module>IntegrationTests</module>\r
-    </modules>\r
-\r
-    <repositories> </repositories>\r
-\r
-    <pluginRepositories>\r
-    </pluginRepositories>\r
-\r
-    <build>\r
-        <pluginManagement>\r
-            <plugins>\r
-                <plugin>\r
-                    <groupId>org.apache.maven.plugins</groupId>\r
-                    <artifactId>maven-compiler-plugin</artifactId>\r
-                    <configuration>\r
-                        <source>1.5</source>\r
-                        <target>1.5</target>\r
-                    </configuration>\r
-                </plugin>\r
-                <plugin>\r
-                    <groupId>org.apache.maven.plugins</groupId>\r
-                    <artifactId>maven-site-plugin</artifactId>\r
-                    <configuration>\r
-                        <unzipCommand>/usr/bin/unzip -o &gt; err.txt</unzipCommand>\r
-                    </configuration>\r
-                </plugin>\r
-                <plugin>\r
-                    <groupId>org.apache.maven.plugins</groupId>\r
-                    <artifactId>maven-war-plugin</artifactId>\r
-                    <version>2.0.1</version>\r
-                    <configuration>\r
-                        <warSourceExcludes>WEB-INF/lib/*.jar</warSourceExcludes>\r
-                        <archive>\r
-                            <manifest>\r
-                                <addClasspath>true</addClasspath>\r
-\r
-                            </manifest>\r
-                        </archive>\r
-                    </configuration>\r
-                </plugin>\r
-\r
-                <plugin>\r
-                    <groupId>org.apache.maven.plugins</groupId>\r
-                    <artifactId>maven-dependency-plugin</artifactId>\r
-                    <executions>\r
-                        <execution>\r
-                            <id>classpath</id>\r
-                            <goals>\r
-                                <goal>build-classpath</goal>\r
-                            </goals>\r
-                            <configuration>\r
-                                <outputFile>classpath</outputFile>\r
-                            </configuration>\r
-                        </execution>\r
-                    </executions>\r
-                </plugin>\r
-\r
-\r
-            </plugins>\r
-        </pluginManagement>\r
-        <plugins>\r
-            <plugin>\r
-                <groupId>org.apache.maven.plugins</groupId>\r
-                <artifactId>maven-compiler-plugin</artifactId>\r
-                <version>2.0.2</version>\r
-                <configuration>\r
-                    <source>1.6</source>\r
-                    <target>1.6</target>\r
-                </configuration>\r
-            </plugin>\r
-        </plugins>\r
-    </build>\r
-    <reporting>\r
-        <plugins>\r
-            <!--plugin>\r
-                <groupId>org.codehaus.mojo</groupId>\r
-                <artifactId>taglist-maven-plugin</artifactId>\r
-                <version>2.1</version>\r
-                <configuration>\r
-                    <tags>\r
-                        <tag>@FIXME</tag>\r
-                        <tag>@fixme</tag>\r
-                        <tag>FIXME</tag>\r
-                        <tag>fixme</tag>\r
-                        <tag>@TODO</tag>\r
-                        <tag>@todo</tag>\r
-                        <tag>TODO</tag>\r
-                        <tag>todo</tag>\r
-                    </tags>\r
-                     <onlyAnalyze>org.collectionspace.*</onlyAnalyze>\r
-                </configuration>\r
-            </plugin-->\r
-\r
-            <plugin>\r
-                <groupId>org.codehaus.mojo</groupId>\r
-                <artifactId>findbugs-maven-plugin</artifactId>\r
-                <version>2.0.1</version>\r
-                <configuration>\r
-                    <onlyAnalyze>org.collectionspace.*</onlyAnalyze>\r
-                </configuration>\r
-            </plugin>\r
-        </plugins>\r
-    </reporting>\r
-    <dependencyManagement>\r
-        <dependencies>\r
-            <dependency>\r
-                <groupId>net.java.dev.jaxb2-commons</groupId>\r
-                <artifactId>jaxb-fluent-api</artifactId>\r
-                <version>2.0.1</version>\r
-            </dependency>\r
-            <dependency>\r
-                <groupId>org.testng</groupId>\r
-                <artifactId>testng</artifactId>\r
-                <version>5.6</version>\r
-                <scope>test</scope>\r
-                <classifier>jdk15</classifier>\r
-            </dependency>\r
-            <dependency>\r
-                <groupId>org.jboss.resteasy</groupId>\r
-                <artifactId>jaxrs-api</artifactId>\r
-                <version>1.1.GA</version>\r
-            </dependency>\r
-            <dependency>\r
-                <groupId>net.java.dev.jaxb2-commons</groupId>\r
-                <artifactId>jaxb-fluent-api</artifactId>\r
-                <version>2.0.1</version>\r
-            </dependency>\r
-            <dependency>\r
-                <groupId>org.jvnet.jaxb2-commons</groupId>\r
-                <artifactId>property-listener-injector</artifactId>\r
-                <version>1.0</version>\r
-            </dependency>\r
-            <dependency>\r
-                <groupId>org.jvnet.jaxb2_commons</groupId>\r
-                <artifactId>runtime</artifactId>\r
-                <version>0.4.1</version>\r
-            </dependency>\r
-            <dependency>\r
-                <groupId>org.jboss.resteasy</groupId>\r
-                <artifactId>resteasy-jaxrs</artifactId>\r
-                <version>1.1.GA</version>\r
-            </dependency>\r
-            <dependency>\r
-                <groupId>commons-httpclient</groupId>\r
-                <artifactId>commons-httpclient</artifactId>\r
-                <version>3.1</version>\r
-            </dependency>\r
-            <dependency>\r
-                <groupId>com.sun.xml.bind</groupId>\r
-                <artifactId>jaxb-impl</artifactId>\r
-                <version>2.1.9</version>\r
-            </dependency>\r
-            <dependency>\r
-                <groupId>org.slf4j</groupId>\r
-                <artifactId>slf4j-api</artifactId>\r
-                <version>1.5.2</version>\r
-            </dependency>\r
-            <dependency>\r
-                <groupId>org.slf4j</groupId>\r
-                <artifactId>slf4j-log4j12</artifactId>\r
-                <version>1.5.2</version>\r
-            </dependency>\r
-            <dependency>\r
-                <groupId>mysql</groupId>\r
-                <artifactId>mysql-connector-java</artifactId>\r
-                <version>5.1.5</version>\r
-                <scope>test</scope>\r
-            </dependency>\r
-        </dependencies>\r
-    </dependencyManagement>\r
-</project>\r
+<?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
index a68481761ebad99a43e590c5ba00df939da1195b..35ce07a8f1fcada98c41f3d9a9b4744fd21f9c1a 100644 (file)
@@ -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;
index 48d8bb4195f1a85a8efda30f9e96c0d8ca0064b4..1c12971e88c5283eeeb6cf4e9552b4d9445a153f 100644 (file)
@@ -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;
index 557fbcf23bab27cc5ac8ffe713832da1c676b4fa..c669118ac84bc71c6ae083483bf31ff6053e4464 100644 (file)
@@ -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
index 50e78b096eb5a663aa6ccab53db1f58e3ce91944..a9c7a263cc83d485483d0408351b8ef60b064042 100644 (file)
@@ -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());
index 7385d6672e6b0f35400213ec3571f84d8951b21a..a6fc7845b7d0f8acfdfeb9a3ca232682eb427f7c 100644 (file)
@@ -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;
index 709df73e54313bc6a17ab3b047c64cfa6a04783b..9ee43b31e701f7010a8ea96086b8548041a11ff8 100644 (file)
@@ -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;
 
 
 /**
index 03c1fb294ceaa1748a31b6f7d970d4447b12aa26..ff4d3c7e580365745215a208163a8da4d8eee02e 100644 (file)
@@ -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;
index 89440fadc58561d37e3759c0b8cb041a22611e8a..c973f189483ebc78058e9ac8797b614d2d2c92e9 100644 (file)
@@ -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;
 
 
 /**