CSPACE-5564: Cleaning up pom.xml files to place some of the dependencies into the...

diff --git a/services/blob/client/pom.xml b/services/blob/client/pom.xml
index c38c1d13de82697c01d93116093034ae3b207313..7d6ee47918617fc89d7d3f6d327376289d6991c7 100644 (file)
--- a/services/blob/client/pom.xml
+++ b/services/blob/client/pom.xml
@@ -5,11 +5,10 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.blob</artifactId>
-        <version>3.2.1-SNAPSHOT</version>
+        <version>3.2-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <groupId>org.collectionspace.services</groupId>
     <artifactId>org.collectionspace.services.blob.client</artifactId>
     <name>services.blob.client</name>
     

diff --git a/services/collectionobject/client/pom.xml b/services/collectionobject/client/pom.xml
index 07307daec86fc1dafef6917ccd7e9f6d25f1d8e9..2a532a5aa1031a0c913ffc1198974bee55391331 100644 (file)
--- a/services/collectionobject/client/pom.xml
+++ b/services/collectionobject/client/pom.xml
@@ -5,7 +5,7 @@
     <parent>\r
         <groupId>org.collectionspace.services</groupId>\r
         <artifactId>org.collectionspace.services.collectionobject</artifactId>\r
-        <version>3.2.1-SNAPSHOT</version>\r
+        <version>3.2-SNAPSHOT</version>\r
     </parent>\r
 \r
     <modelVersion>4.0.0</modelVersion>\r
@@ -55,11 +55,7 @@
             <groupId>org.collectionspace.services</groupId>\r
             <artifactId>org.collectionspace.services.organization.client</artifactId>\r
             <version>${project.version}</version>\r
-        </dependency>\r
-        <dependency>\r
-            <groupId>org.collectionspace.services</groupId>\r
-            <artifactId>org.collectionspace.services.person.client</artifactId>\r
-            <version>${project.version}</version>\r
+            <scope>test</scope>\r
         </dependency>\r
         <!-- External dependencies -->\r
         <dependency>\r

diff --git a/services/collectionobject/client/src/main/java/org/collectionspace/services/client/CollectionObjectFactory.java b/services/collectionobject/client/src/main/java/org/collectionspace/services/client/CollectionObjectFactory.java
index 498546f6a6499bbe1f83ef902dbde4034c056c41..2af0aa313b8603c8beb3c2de2a59ecbd62636706 100644 (file)
--- a/services/collectionobject/client/src/main/java/org/collectionspace/services/client/CollectionObjectFactory.java
+++ b/services/collectionobject/client/src/main/java/org/collectionspace/services/client/CollectionObjectFactory.java
@@ -24,7 +24,6 @@
 
 package org.collectionspace.services.client;
 
-import javax.ws.rs.core.MediaType;
 import org.collectionspace.services.client.PayloadOutputPart;
 import org.collectionspace.services.client.PoxPayloadOut;
 import org.collectionspace.services.collectionobject.CollectionobjectsCommon;
@@ -55,6 +54,15 @@ public class CollectionObjectFactory {
      * @return
      */
 
+    public static PoxPayloadOut createCollectionObjectInstance(String commonPartName,
+            CollectionobjectsCommon collectionObjectCommon) {
+
+        PoxPayloadOut multipart = new PoxPayloadOut(getServicePathComponent());
+        PayloadOutputPart commonPart =
+                multipart.addPart(commonPartName, collectionObjectCommon);
+
+        return multipart;
+    }    
     /**
      * Creates the collection object instance.
      *
@@ -71,13 +79,14 @@ public class CollectionObjectFactory {
 
         PoxPayloadOut multipart = new PoxPayloadOut(getServicePathComponent());
         PayloadOutputPart commonPart =
-                multipart.addPart(collectionObjectCommon, MediaType.APPLICATION_XML_TYPE);
+                multipart.addPart(commonPartName, collectionObjectCommon);
         commonPart.setLabel(commonPartName);
 
         if (conh != null) {
-            PayloadOutputPart nhPart = multipart.addPart(conh, MediaType.APPLICATION_XML_TYPE);
+            PayloadOutputPart nhPart = multipart.addPart(nhPartName, conh);
             nhPart.setLabel(nhPartName);
         }
+        
         return multipart;
     }