From: Laramie Crocker <laramie@berkeley.edu>
Date: Sun, 17 Apr 2011 05:21:04 +0000 (+0000)
Subject: CSPACE-3780 including XmlReplay test of Relations in nightly run
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=d618f40d993db0adc48a73f0f194e6aebb2ded04;p=tmp%2Fjakarta-migration.git

CSPACE-3780 including XmlReplay test of Relations in nightly run
---

diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/xml-replay-master.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/xml-replay-master.xml
index af2ff30ac..19568b721 100755
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/xml-replay-master.xml
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/xml-replay-master.xml
@@ -27,6 +27,15 @@
     <!--<run controlFile="acquisitions/acquisitions.xml" testGroup="testList" />-->
 
     <!--<run controlFile="./organization.xml" testGroup="organization" />-->
-
+    
+    
+    <!-- ============================================= -->
+    <!-- XmlReplay now compatible with POX payloads.
+         File below this line have been ported. -->
+    <!-- ============================================= -->
+    
+    <run controlFile="person/person.xml" testGroup="updatePerson" />
+    <run controlFile="relation/relation.xml" testGroup="makeRelations" />
+    
 </xmlReplayMaster>
 
diff --git a/services/authority/src/main/java/org/collectionspace/services/common/vocabulary/nuxeo/AuthorityItemDocumentModelHandler.java b/services/authority/src/main/java/org/collectionspace/services/common/vocabulary/nuxeo/AuthorityItemDocumentModelHandler.java
index 64820ef53..db893dcd2 100644
--- a/services/authority/src/main/java/org/collectionspace/services/common/vocabulary/nuxeo/AuthorityItemDocumentModelHandler.java
+++ b/services/authority/src/main/java/org/collectionspace/services/common/vocabulary/nuxeo/AuthorityItemDocumentModelHandler.java
@@ -234,7 +234,7 @@ public abstract class AuthorityItemDocumentModelHandler<AICommon, AICommonList>
         RelationsCommonList relationsCommonListBody = (RelationsCommonList) part.getBody();
 
         ServiceContext ctx = getServiceContext();
-        MultivaluedMap queryParams = ctx.getQueryParamsPtr();
+        MultivaluedMap queryParams = ctx.getQueryParams();
        String predicate = RelationshipType.HAS_BROADER.value();
         queryParams.putSingle(IRelationsManager.PREDICATE_QP, predicate);
         queryParams.putSingle(IRelationsManager.SUBJECT_QP, null);
@@ -244,7 +244,7 @@ public abstract class AuthorityItemDocumentModelHandler<AICommon, AICommonList>
 
         RelationsCommonList childList = (new RelationResource()).getList(ctx.getUriInfo());    //magically knows all query params because they are in the context.
         for (RelationsCommonList.RelationListItem childListItem : childList.getRelationListItem()) {
-            System.out.println("    childListItem: " + childListItem);
+           // System.out.println("    childListItem: " + childListItem);
             //todo: if not found in update list, remove from system
             //todo: if update list item not found in child list, add to system.
         }
@@ -255,7 +255,7 @@ public abstract class AuthorityItemDocumentModelHandler<AICommon, AICommonList>
 
         RelationsCommonList parentList = (new RelationResource()).getList(ctx.getUriInfo());
         for (RelationsCommonList.RelationListItem parentListItem : parentList.getRelationListItem()) {
-            System.out.println("    parentListItem: " + parentListItem);
+           // System.out.println("    parentListItem: " + parentListItem);
             //todo: if num-parents > 1 then complain.
             //todo: if not found in update list, remove from system
             //todo: if update list item not found in parent list, add to system.
@@ -268,6 +268,8 @@ public abstract class AuthorityItemDocumentModelHandler<AICommon, AICommonList>
             rc.setDocumentId2(item.getObjectCsid());
             rc.setRelationshipType(item.getPredicate());
             //todo: is an enum:  rc.setPredicate(item.getPredicate());
+            rc.setDocumentType1(item.getSubject().getType());
+            rc.setDocumentType2(item.getObject().getType());
 
             PoxPayloadOut payloadOut = new PoxPayloadOut(RelationClient.SERVICE_PAYLOAD_NAME);
             PayloadOutputPart outputPart = new PayloadOutputPart(RelationClient.SERVICE_COMMONPART_NAME, rc);
diff --git a/services/common/src/main/java/org/collectionspace/services/common/ResourceBase.java b/services/common/src/main/java/org/collectionspace/services/common/ResourceBase.java
index b1554cb9e..6027625a3 100644
--- a/services/common/src/main/java/org/collectionspace/services/common/ResourceBase.java
+++ b/services/common/src/main/java/org/collectionspace/services/common/ResourceBase.java
@@ -99,7 +99,7 @@ extends AbstractMultiPartCollectionSpaceResourceImpl {
     		String xmlPayload) {
         try {
         	PoxPayloadIn input = new PoxPayloadIn(xmlPayload);
-            System.out.println("\r\n\r\n==============================\r\nxmlPayload:\r\n"+xmlPayload);
+            //System.out.println("\r\n\r\n==============================\r\nxmlPayload:\r\n"+xmlPayload);
         	ServiceContext<PoxPayloadIn, PoxPayloadOut> ctx = createServiceContext(input);
             return create(input, ctx);
         } catch (Exception e) {