CSPACE-3574: Missing merged code from the POX branch. Not sure why this did not...

diff --git a/services/organization/sample/pom.xml b/services/organization/sample/pom.xml
index 9a991a1d1273fc6af6a6d466b0319a60d1a4caf8..7b0c6509a6f877cb334b2ae324116339f50316fc 100644 (file)
--- a/services/organization/sample/pom.xml
+++ b/services/organization/sample/pom.xml
@@ -4,7 +4,7 @@
     <groupId>org.collectionspace.services</groupId>\r
     <artifactId>org.collectionspace.services.organization.client.samples</artifactId>\r
     <packaging>pom</packaging>\r
-    <version>1.0</version>\r
+    <version>1.5-SNAPSHOT</version>\r
     <name>organization.client.samples</name>\r
 \r
     <modules>\r

diff --git a/services/organization/sample/sample/pom.xml b/services/organization/sample/sample/pom.xml
index 86969629c9796ed9e981eca6f408973b2a4056e4..effb40815b747a8bc66fbdd3b6fc186e24d27109 100644 (file)
--- a/services/organization/sample/sample/pom.xml
+++ b/services/organization/sample/sample/pom.xml
@@ -4,24 +4,24 @@
     <groupId>org.collectionspace.services</groupId>\r
     <artifactId>org.collectionspace.services.organization.client.sample</artifactId>\r
     <packaging>jar</packaging>\r
-    <version>1.0</version>\r
+    <version>1.5-SNAPSHOT</version>\r
     <name>organization.client.sample</name>\r
     \r
     <dependencies>\r
         <dependency>\r
             <groupId>org.collectionspace.services</groupId>\r
             <artifactId>org.collectionspace.services.organization.jaxb</artifactId>\r
-            <version>1.5-SNAPSHOT</version>\r
+            <version>${project.version}</version>\r
         </dependency>\r
         <dependency>\r
             <groupId>org.collectionspace.services</groupId>\r
             <artifactId>org.collectionspace.services.client</artifactId>\r
-            <version>1.5-SNAPSHOT</version>\r
+            <version>${project.version}</version>\r
         </dependency>\r
         <dependency>\r
             <groupId>org.collectionspace.services</groupId>\r
             <artifactId>org.collectionspace.services.organization.client</artifactId>\r
-            <version>1.5-SNAPSHOT</version>\r
+            <version>${project.version}</version>\r
         </dependency>\r
     </dependencies>\r
     \r

diff --git a/services/person/sample/sample/src/main/java/org/collectionspace/services/person/client/sample/Sample.java b/services/person/sample/sample/src/main/java/org/collectionspace/services/person/client/sample/Sample.java
index bf7cc9856c43ca33868ab54941345ca0fe5efd33..3ff81ae99837a655f512866c287900ce2d89a2d3 100644 (file)
--- a/services/person/sample/sample/src/main/java/org/collectionspace/services/person/client/sample/Sample.java
+++ b/services/person/sample/sample/src/main/java/org/collectionspace/services/person/client/sample/Sample.java
@@ -37,6 +37,7 @@ import org.apache.log4j.BasicConfigurator;
 import org.collectionspace.services.PersonJAXBSchema;\r
 import org.collectionspace.services.client.PersonAuthorityClient;\r
 import org.collectionspace.services.client.PersonAuthorityClientUtils;\r
+import org.collectionspace.services.client.PoxPayloadIn;\r
 import org.collectionspace.services.client.PoxPayloadOut;\r
 import org.collectionspace.services.client.test.ServiceRequestType;\r
 import org.collectionspace.services.person.PersonauthoritiesCommon;\r
@@ -225,7 +226,7 @@ public class Sample {
                 throw new RuntimeException("Unexpected Status when reading " +\r
                     "personAuthority, Status:"+ statusCode);\r
             }\r
-            PoxPayloadIn input = (PoxPayloadIn) res.getEntity();\r
+            PoxPayloadIn input = new PoxPayloadIn(res.getEntity());\r
             personAuthority = (PersonauthoritiesCommon) extractPart(input,\r
                     client.getCommonPartName(), PersonauthoritiesCommon.class);\r
         } catch (Exception e) {\r

diff --git a/services/vocabulary/sample/sample/pom.xml b/services/vocabulary/sample/sample/pom.xml
index 37191750f689f680167a4c4c81fafb92881627f4..17fd4c4946de4b44c2afc558d5373d8639e5c90c 100644 (file)
--- a/services/vocabulary/sample/sample/pom.xml
+++ b/services/vocabulary/sample/sample/pom.xml
@@ -4,24 +4,24 @@
     <groupId>org.collectionspace.services</groupId>\r
     <artifactId>org.collectionspace.services.vocabulary.client.sample</artifactId>\r
     <packaging>jar</packaging>\r
-    <version>1.0</version>\r
+    <version>1.5-SNAPSHOT</version>\r
     <name>vocabulary.client.sample</name>\r
     \r
     <dependencies>\r
         <dependency>\r
             <groupId>org.collectionspace.services</groupId>\r
             <artifactId>org.collectionspace.services.vocabulary.jaxb</artifactId>\r
-            <version>1.5-SNAPSHOT</version>\r
+            <version>${project.version}</version>\r
         </dependency>\r
         <dependency>\r
             <groupId>org.collectionspace.services</groupId>\r
             <artifactId>org.collectionspace.services.client</artifactId>\r
-            <version>1.5-SNAPSHOT</version>\r
+            <version>${project.version}</version>\r
         </dependency>\r
         <dependency>\r
             <groupId>org.collectionspace.services</groupId>\r
             <artifactId>org.collectionspace.services.vocabulary.client</artifactId>\r
-            <version>1.5-SNAPSHOT</version>\r
+            <version>${project.version}</version>\r
         </dependency>\r
     </dependencies>\r
     \r

diff --git a/services/vocabulary/sample/sample/src/main/java/org/collectionspace/services/vocabulary/client/sample/Sample.java b/services/vocabulary/sample/sample/src/main/java/org/collectionspace/services/vocabulary/client/sample/Sample.java
index 7a8aa883957989453ae6cd823b9d8aa0483f3363..ee006622b566b8139a4ee8427c459ac1d8930d86 100644 (file)
--- a/services/vocabulary/sample/sample/src/main/java/org/collectionspace/services/vocabulary/client/sample/Sample.java
+++ b/services/vocabulary/sample/sample/src/main/java/org/collectionspace/services/vocabulary/client/sample/Sample.java
@@ -336,6 +336,8 @@ public class Sample {
     private Object extractPart(PoxPayloadIn input, String label,\r
         Class clazz) throws Exception {\r
         Object obj = null;\r
+        obj = input.getPart(label);\r
+        /*\r
         for(PayloadInputPart part : input.getParts()){\r
             String partLabel = part.getHeaders().getFirst("label");\r
             if(label.equalsIgnoreCase(partLabel)){\r
@@ -350,6 +352,7 @@ public class Sample {
                 break;\r
             }\r
         }\r
+        */\r
         return obj;\r
     }\r
 \r