From 1b786d405d884c12854393e394ff09e37aeaa5a7 Mon Sep 17 00:00:00 2001
From: Patrick Schmitz <pschmitz@berkeley.edu>
Date: Wed, 29 Sep 2010 00:14:53 +0000
Subject: [PATCH] CSPACE-2723 Added information about the fields returned in
 list results. Returned as a string of concatenated field names delimited with
 '|' chars.

---
 .../AcquisitionDocumentModelHandler.java      |  3 ++
 .../CollectionObjectDocumentModelHandler.java |  3 ++
 .../nuxeo/DimensionDocumentModelHandler.java  |  3 ++
 .../nuxeo/IntakeDocumentModelHandler.java     |  3 ++
 .../src/main/resources/AbstractCommonList.xsd |  3 +-
 .../src/main/resources/authorityrefdocs.xsd   | 44 -------------------
 .../nuxeo/LoaninDocumentModelHandler.java     |  3 ++
 .../nuxeo/LoanoutDocumentModelHandler.java    |  3 ++
 ...LocationAuthorityDocumentModelHandler.java |  3 ++
 .../nuxeo/LocationDocumentModelHandler.java   |  3 ++
 .../nuxeo/MovementDocumentModelHandler.java   |  3 ++
 .../nuxeo/ObjectExitDocumentModelHandler.java |  3 ++
 .../OrgAuthorityDocumentModelHandler.java     |  3 ++
 .../OrganizationDocumentModelHandler.java     |  3 ++
 .../PersonAuthorityDocumentModelHandler.java  |  3 ++
 .../nuxeo/PersonDocumentModelHandler.java     |  3 ++
 .../nuxeo/RelationDocumentModelHandler.java   |  3 ++
 .../nuxeo/ReportDocumentModelHandler.java     |  3 ++
 .../nuxeo/VocabularyDocumentModelHandler.java |  3 ++
 .../VocabularyItemDocumentModelHandler.java   |  3 ++
 20 files changed, 56 insertions(+), 45 deletions(-)
 delete mode 100644 services/jaxb/src/main/resources/authorityrefdocs.xsd

diff --git a/services/acquisition/service/src/main/java/org/collectionspace/services/acquisition/nuxeo/AcquisitionDocumentModelHandler.java b/services/acquisition/service/src/main/java/org/collectionspace/services/acquisition/nuxeo/AcquisitionDocumentModelHandler.java
index f06bbc3e6..a643066c0 100644
--- a/services/acquisition/service/src/main/java/org/collectionspace/services/acquisition/nuxeo/AcquisitionDocumentModelHandler.java
+++ b/services/acquisition/service/src/main/java/org/collectionspace/services/acquisition/nuxeo/AcquisitionDocumentModelHandler.java
@@ -35,6 +35,7 @@ import org.collectionspace.services.acquisition.AcquisitionsCommonList.Acquisiti
 import org.collectionspace.services.acquisition.AcquisitionSourceList;
 import org.collectionspace.services.acquisition.OwnerList;
 import org.collectionspace.services.common.document.DocumentHandler.Action;
+import org.collectionspace.services.jaxb.AbstractCommonList;
 import org.collectionspace.services.nuxeo.client.java.RemoteDocumentModelHandlerImpl;
 import org.collectionspace.services.nuxeo.util.NuxeoUtils;
 import org.nuxeo.ecm.core.api.DocumentModel;
@@ -110,6 +111,8 @@ public class AcquisitionDocumentModelHandler
     @Override
     public AcquisitionsCommonList extractCommonPartList(DocumentWrapper<DocumentModelList> wrapDoc) throws Exception {
         AcquisitionsCommonList coList = this.extractPagingInfo(new AcquisitionsCommonList(), wrapDoc);
+        AbstractCommonList commonList = (AbstractCommonList) coList;
+        commonList.setFieldsReturned("acquisitionReferenceNumber|acquisitionSources|owners|uri|csid");
         List<AcquisitionsCommonList.AcquisitionListItem> list = coList.getAcquisitionListItem();
         Iterator<DocumentModel> iter = wrapDoc.getWrappedObject().iterator();
         String label = getServiceContext().getCommonPartLabel();
diff --git a/services/collectionobject/service/src/main/java/org/collectionspace/services/collectionobject/nuxeo/CollectionObjectDocumentModelHandler.java b/services/collectionobject/service/src/main/java/org/collectionspace/services/collectionobject/nuxeo/CollectionObjectDocumentModelHandler.java
index cf4559f30..54bb6cee1 100644
--- a/services/collectionobject/service/src/main/java/org/collectionspace/services/collectionobject/nuxeo/CollectionObjectDocumentModelHandler.java
+++ b/services/collectionobject/service/src/main/java/org/collectionspace/services/collectionobject/nuxeo/CollectionObjectDocumentModelHandler.java
@@ -35,6 +35,7 @@ import org.collectionspace.services.collectionobject.CollectionobjectsCommonList
 import org.collectionspace.services.collectionobject.CollectionobjectsCommonList.CollectionObjectListItem;
 import org.collectionspace.services.common.document.DocumentUtils;
 import org.collectionspace.services.common.document.DocumentWrapper;
+import org.collectionspace.services.jaxb.AbstractCommonList;
 import org.collectionspace.services.nuxeo.client.java.RemoteDocumentModelHandlerImpl;
 import org.collectionspace.services.nuxeo.util.NuxeoUtils;
 import org.nuxeo.ecm.core.api.DocumentModel;
@@ -124,6 +125,8 @@ public class CollectionObjectDocumentModelHandler
     public CollectionobjectsCommonList extractCommonPartList(DocumentWrapper<DocumentModelList> wrapDoc) throws Exception {
         CollectionobjectsCommonList coList = this.extractPagingInfo(new CollectionobjectsCommonList(),
         		wrapDoc);
+        AbstractCommonList commonList = (AbstractCommonList) coList;
+        commonList.setFieldsReturned("objectNumber|objectName|title|responsibleDepartment|uri|csid");
         List<CollectionobjectsCommonList.CollectionObjectListItem> list = coList.getCollectionObjectListItem();
         Iterator<DocumentModel> iter = wrapDoc.getWrappedObject().iterator();
         String label = getServiceContext().getCommonPartLabel();
diff --git a/services/dimension/service/src/main/java/org/collectionspace/services/dimension/nuxeo/DimensionDocumentModelHandler.java b/services/dimension/service/src/main/java/org/collectionspace/services/dimension/nuxeo/DimensionDocumentModelHandler.java
index 4f2d68c6f..eb6d52e8f 100644
--- a/services/dimension/service/src/main/java/org/collectionspace/services/dimension/nuxeo/DimensionDocumentModelHandler.java
+++ b/services/dimension/service/src/main/java/org/collectionspace/services/dimension/nuxeo/DimensionDocumentModelHandler.java
@@ -33,6 +33,7 @@ import org.collectionspace.services.dimension.DimensionsCommon;
 import org.collectionspace.services.dimension.DimensionsCommonList;
 import org.collectionspace.services.dimension.DimensionsCommonList.DimensionListItem;
 
+import org.collectionspace.services.jaxb.AbstractCommonList;
 import org.collectionspace.services.nuxeo.client.java.RemoteDocumentModelHandlerImpl;
 import org.collectionspace.services.nuxeo.util.NuxeoUtils;
 import org.nuxeo.ecm.core.api.DocumentModel;
@@ -108,6 +109,8 @@ public class DimensionDocumentModelHandler
     @Override
     public DimensionsCommonList extractCommonPartList(DocumentWrapper<DocumentModelList> wrapDoc) throws Exception {
         DimensionsCommonList coList = extractPagingInfo(new DimensionsCommonList(), wrapDoc) ;
+        AbstractCommonList commonList = (AbstractCommonList) coList;
+        commonList.setFieldsReturned("dimension|uri|csid");
         List<DimensionsCommonList.DimensionListItem> list = coList.getDimensionListItem();
         Iterator<DocumentModel> iter = wrapDoc.getWrappedObject().iterator();
         while(iter.hasNext()){
diff --git a/services/intake/service/src/main/java/org/collectionspace/services/intake/nuxeo/IntakeDocumentModelHandler.java b/services/intake/service/src/main/java/org/collectionspace/services/intake/nuxeo/IntakeDocumentModelHandler.java
index 21bf178ad..8cb9468bc 100644
--- a/services/intake/service/src/main/java/org/collectionspace/services/intake/nuxeo/IntakeDocumentModelHandler.java
+++ b/services/intake/service/src/main/java/org/collectionspace/services/intake/nuxeo/IntakeDocumentModelHandler.java
@@ -31,6 +31,7 @@ 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;
+import org.collectionspace.services.jaxb.AbstractCommonList;
 import org.collectionspace.services.nuxeo.client.java.RemoteDocumentModelHandlerImpl;
 import org.collectionspace.services.nuxeo.util.NuxeoUtils;
 import org.nuxeo.ecm.core.api.DocumentModel;
@@ -119,6 +120,8 @@ public class IntakeDocumentModelHandler
     @Override
     public IntakesCommonList extractCommonPartList(DocumentWrapper<DocumentModelList> wrapDoc) throws Exception {
         IntakesCommonList coList = this.extractPagingInfo(new IntakesCommonList(), wrapDoc);
+        AbstractCommonList commonList = (AbstractCommonList) coList;
+        commonList.setFieldsReturned("entryNumber|depositor|currentOwner|uri|csid");
         List<IntakesCommonList.IntakeListItem> list = coList.getIntakeListItem();
         Iterator<DocumentModel> iter = wrapDoc.getWrappedObject().iterator();
         String label = getServiceContext().getCommonPartLabel();
diff --git a/services/jaxb/src/main/resources/AbstractCommonList.xsd b/services/jaxb/src/main/resources/AbstractCommonList.xsd
index 947f111a5..790271ae6 100644
--- a/services/jaxb/src/main/resources/AbstractCommonList.xsd
+++ b/services/jaxb/src/main/resources/AbstractCommonList.xsd
@@ -20,8 +20,9 @@
                 <!-- "itemsInPage" is useful to our testing framework's unit tests -->
                 <xs:element name="itemsInPage" type="xs:unsignedInt" />
                 <xs:element name="totalItems" type="xs:unsignedInt" />
+                <xs:element name="fieldsReturned" type="xs:string" />
             </xs:sequence>
         </xs:complexType>
     </xs:element>
     
-</xs:schema>
\ No newline at end of file
+</xs:schema>
diff --git a/services/jaxb/src/main/resources/authorityrefdocs.xsd b/services/jaxb/src/main/resources/authorityrefdocs.xsd
deleted file mode 100644
index 906bace83..000000000
--- a/services/jaxb/src/main/resources/authorityrefdocs.xsd
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-	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
-
-	Document   : authorityrefdocs.xsd
-	Revision   : $LastChangedRevision: 1292 $
-	Created on : $LastChangedDate: 2010-01-29 14:55:28 -0800 (Fri, 29 Jan 2010) $
-	Author     : $LastChangedBy: $
-	Description: AuthorityRefDocs describes a list of values that describe
-								document (CollectionObject, Intake, etc.) 
-								references to a given authority term.
--->
-<xs:schema
-	xmlns:xs="http://www.w3.org/2001/XMLSchema"
-	xmlns="http://collectionspace.org/services/common/authorityref"
-	targetNamespace="http://collectionspace.org/services/common/authorityref"
-	version="0.1"
-	>
-
-	<xs:element name="authority-ref-doc-list">
-		<xs:complexType>
-			<xs:sequence>
-				 <xs:element name="authority-ref-doc-item" maxOccurs="unbounded">
-					<xs:complexType>
-						<xs:sequence>
-							<xs:element name="docType"         type="xs:string" minOccurs="1" />
-							<xs:element name="docId"           type="xs:string" minOccurs="1" />
-							<xs:element name="docNumber"       type="xs:string" minOccurs="0" />
-							<xs:element name="docName"         type="xs:string" minOccurs="0" />
-							<xs:element name="sourceField"     type="xs:string" minOccurs="1" />
-							<xs:element name="uri"             type="xs:anyURI" minOccurs="1" />
-						</xs:sequence>
-					</xs:complexType>
-				</xs:element>
-			</xs:sequence>
-		</xs:complexType>
-	</xs:element>
-
-</xs:schema>
diff --git a/services/loanin/service/src/main/java/org/collectionspace/services/loanin/nuxeo/LoaninDocumentModelHandler.java b/services/loanin/service/src/main/java/org/collectionspace/services/loanin/nuxeo/LoaninDocumentModelHandler.java
index bee2c58f7..4632d3230 100644
--- a/services/loanin/service/src/main/java/org/collectionspace/services/loanin/nuxeo/LoaninDocumentModelHandler.java
+++ b/services/loanin/service/src/main/java/org/collectionspace/services/loanin/nuxeo/LoaninDocumentModelHandler.java
@@ -29,6 +29,7 @@ import java.util.List;
 import org.collectionspace.services.LoaninJAXBSchema;
 import org.collectionspace.services.LoaninListItemJAXBSchema;
 import org.collectionspace.services.common.document.DocumentWrapper;
+import org.collectionspace.services.jaxb.AbstractCommonList;
 import org.collectionspace.services.loanin.LoansinCommon;
 import org.collectionspace.services.loanin.LoansinCommonList;
 import org.collectionspace.services.loanin.LoansinCommonList.LoaninListItem;
@@ -119,6 +120,8 @@ public class LoaninDocumentModelHandler
     @Override
     public LoansinCommonList extractCommonPartList(DocumentWrapper<DocumentModelList> wrapDoc) throws Exception {
         LoansinCommonList coList = extractPagingInfo(new LoansinCommonList(), wrapDoc);
+        AbstractCommonList commonList = (AbstractCommonList) coList;
+        commonList.setFieldsReturned("loanInNumber|lender|loanReturnDate|uri|csid");
         List<LoansinCommonList.LoaninListItem> list = coList.getLoaninListItem();
         Iterator<DocumentModel> iter = wrapDoc.getWrappedObject().iterator();
         String label = getServiceContext().getCommonPartLabel();
diff --git a/services/loanout/service/src/main/java/org/collectionspace/services/loanout/nuxeo/LoanoutDocumentModelHandler.java b/services/loanout/service/src/main/java/org/collectionspace/services/loanout/nuxeo/LoanoutDocumentModelHandler.java
index 1007ef117..d609c23a4 100644
--- a/services/loanout/service/src/main/java/org/collectionspace/services/loanout/nuxeo/LoanoutDocumentModelHandler.java
+++ b/services/loanout/service/src/main/java/org/collectionspace/services/loanout/nuxeo/LoanoutDocumentModelHandler.java
@@ -28,6 +28,7 @@ import java.util.List;
 
 import org.collectionspace.services.LoanoutJAXBSchema;
 import org.collectionspace.services.common.document.DocumentWrapper;
+import org.collectionspace.services.jaxb.AbstractCommonList;
 import org.collectionspace.services.loanout.LoansoutCommon;
 import org.collectionspace.services.loanout.LoansoutCommonList;
 import org.collectionspace.services.loanout.LoansoutCommonList.LoanoutListItem;
@@ -129,6 +130,8 @@ public class LoanoutDocumentModelHandler
     @Override
     public LoansoutCommonList extractCommonPartList(DocumentWrapper<DocumentModelList> wrapDoc) throws Exception {
         LoansoutCommonList coList = extractPagingInfo(new LoansoutCommonList(), wrapDoc);
+        AbstractCommonList commonList = (AbstractCommonList) coList;
+        commonList.setFieldsReturned("loanOutNumber|borrower|loanReturnDate|uri|csid");
         List<LoansoutCommonList.LoanoutListItem> list = coList.getLoanoutListItem();
         Iterator<DocumentModel> iter = wrapDoc.getWrappedObject().iterator();
         String label = getServiceContext().getCommonPartLabel();
diff --git a/services/location/service/src/main/java/org/collectionspace/services/location/nuxeo/LocationAuthorityDocumentModelHandler.java b/services/location/service/src/main/java/org/collectionspace/services/location/nuxeo/LocationAuthorityDocumentModelHandler.java
index d228da68c..2a92aca65 100644
--- a/services/location/service/src/main/java/org/collectionspace/services/location/nuxeo/LocationAuthorityDocumentModelHandler.java
+++ b/services/location/service/src/main/java/org/collectionspace/services/location/nuxeo/LocationAuthorityDocumentModelHandler.java
@@ -31,6 +31,7 @@ import org.collectionspace.services.common.document.DocumentFilter;
 import org.collectionspace.services.common.document.DocumentWrapper;
 import org.collectionspace.services.common.vocabulary.AuthorityJAXBSchema;
 import org.collectionspace.services.common.vocabulary.nuxeo.AuthorityDocumentModelHandler;
+import org.collectionspace.services.jaxb.AbstractCommonList;
 import org.collectionspace.services.location.LocationauthoritiesCommon;
 import org.collectionspace.services.location.LocationauthoritiesCommonList;
 import org.collectionspace.services.location.LocationauthoritiesCommonList.LocationauthorityListItem;
@@ -64,6 +65,8 @@ public class LocationAuthorityDocumentModelHandler
     public LocationauthoritiesCommonList extractCommonPartList(DocumentWrapper<DocumentModelList> wrapDoc) throws Exception {
         LocationauthoritiesCommonList coList = extractPagingInfo(new LocationauthoritiesCommonList(),
         		wrapDoc);
+        AbstractCommonList commonList = (AbstractCommonList) coList;
+        commonList.setFieldsReturned("displayName|refName|shortIdentifier|vocabType|uri|csid");
 
         //FIXME: iterating over a long list of documents is not a long term
         //strategy...need to change to more efficient iterating in future
diff --git a/services/location/service/src/main/java/org/collectionspace/services/location/nuxeo/LocationDocumentModelHandler.java b/services/location/service/src/main/java/org/collectionspace/services/location/nuxeo/LocationDocumentModelHandler.java
index 4dcccdf27..752aff356 100644
--- a/services/location/service/src/main/java/org/collectionspace/services/location/nuxeo/LocationDocumentModelHandler.java
+++ b/services/location/service/src/main/java/org/collectionspace/services/location/nuxeo/LocationDocumentModelHandler.java
@@ -36,6 +36,7 @@ import org.collectionspace.services.common.service.ObjectPartType;
 import org.collectionspace.services.common.vocabulary.nuxeo.AuthorityItemDocumentModelHandler;
 import org.collectionspace.services.nuxeo.client.java.RemoteDocumentModelHandlerImpl;
 import org.collectionspace.services.nuxeo.util.NuxeoUtils;
+import org.collectionspace.services.jaxb.AbstractCommonList;
 import org.collectionspace.services.location.LocationsCommon;
 import org.collectionspace.services.location.LocationsCommonList;
 import org.collectionspace.services.location.LocationsCommonList.LocationListItem;
@@ -132,6 +133,8 @@ public class LocationDocumentModelHandler
 	public LocationsCommonList extractCommonPartList(
 			DocumentWrapper<DocumentModelList> wrapDoc) throws Exception {
 		LocationsCommonList coList = extractPagingInfo(new LocationsCommonList(), wrapDoc);
+        AbstractCommonList commonList = (AbstractCommonList) coList;
+        commonList.setFieldsReturned("displayName|refName|uri|csid");
 		List<LocationsCommonList.LocationListItem> list = coList.getLocationListItem();
 		Iterator<DocumentModel> iter = wrapDoc.getWrappedObject().iterator();
 		String commonPartLabel = getServiceContext().getCommonPartLabel(
diff --git a/services/movement/service/src/main/java/org/collectionspace/services/movement/nuxeo/MovementDocumentModelHandler.java b/services/movement/service/src/main/java/org/collectionspace/services/movement/nuxeo/MovementDocumentModelHandler.java
index 002414ba5..07f225ee8 100644
--- a/services/movement/service/src/main/java/org/collectionspace/services/movement/nuxeo/MovementDocumentModelHandler.java
+++ b/services/movement/service/src/main/java/org/collectionspace/services/movement/nuxeo/MovementDocumentModelHandler.java
@@ -30,6 +30,7 @@ import java.util.List;
 import org.collectionspace.services.MovementJAXBSchema;
 import org.collectionspace.services.common.datetime.DateTimeFormatUtils;
 import org.collectionspace.services.common.document.DocumentWrapper;
+import org.collectionspace.services.jaxb.AbstractCommonList;
 import org.collectionspace.services.movement.MovementsCommon;
 import org.collectionspace.services.movement.MovementsCommonList;
 import org.collectionspace.services.movement.MovementsCommonList.MovementListItem;
@@ -133,6 +134,8 @@ public class MovementDocumentModelHandler
     @Override
     public MovementsCommonList extractCommonPartList(DocumentWrapper<DocumentModelList> wrapDoc) throws Exception {
         MovementsCommonList coList = extractPagingInfo(new MovementsCommonList(), wrapDoc);
+        AbstractCommonList commonList = (AbstractCommonList) coList;
+        commonList.setFieldsReturned("movementReferenceNumber|currentLocation|locationDate|uri|csid");
         List<MovementsCommonList.MovementListItem> list = coList.getMovementListItem();
         Iterator<DocumentModel> iter = wrapDoc.getWrappedObject().iterator();
         String label = getServiceContext().getCommonPartLabel();
diff --git a/services/objectexit/service/src/main/java/org/collectionspace/services/objectexit/nuxeo/ObjectExitDocumentModelHandler.java b/services/objectexit/service/src/main/java/org/collectionspace/services/objectexit/nuxeo/ObjectExitDocumentModelHandler.java
index 39b9a8c2a..3c235ffc8 100644
--- a/services/objectexit/service/src/main/java/org/collectionspace/services/objectexit/nuxeo/ObjectExitDocumentModelHandler.java
+++ b/services/objectexit/service/src/main/java/org/collectionspace/services/objectexit/nuxeo/ObjectExitDocumentModelHandler.java
@@ -31,6 +31,7 @@ import org.collectionspace.services.common.document.DocumentWrapper;
 import org.collectionspace.services.objectexit.ObjectexitCommon;
 import org.collectionspace.services.objectexit.ObjectexitCommonList;
 import org.collectionspace.services.objectexit.ObjectexitCommonList.ObjectexitListItem;
+import org.collectionspace.services.jaxb.AbstractCommonList;
 import org.collectionspace.services.nuxeo.client.java.RemoteDocumentModelHandlerImpl;
 import org.collectionspace.services.nuxeo.util.NuxeoUtils;
 import org.nuxeo.ecm.core.api.DocumentModel;
@@ -129,6 +130,8 @@ public class ObjectExitDocumentModelHandler
     @Override
     public ObjectexitCommonList extractCommonPartList(DocumentWrapper<DocumentModelList> wrapDoc) throws Exception {
         ObjectexitCommonList coList = extractPagingInfo(new ObjectexitCommonList(), wrapDoc);
+        AbstractCommonList commonList = (AbstractCommonList) coList;
+        commonList.setFieldsReturned("currentOwner|depositor|exitDate|exitMethod|exitNote|exitNumber|exitReason|packingNote|uri|csid");
         List<ObjectexitCommonList.ObjectexitListItem> list = coList.getObjectexitListItem();
         Iterator<DocumentModel> iter = wrapDoc.getWrappedObject().iterator();
         while(iter.hasNext()){
diff --git a/services/organization/service/src/main/java/org/collectionspace/services/organization/nuxeo/OrgAuthorityDocumentModelHandler.java b/services/organization/service/src/main/java/org/collectionspace/services/organization/nuxeo/OrgAuthorityDocumentModelHandler.java
index 6c33ac988..5bd2e9e35 100644
--- a/services/organization/service/src/main/java/org/collectionspace/services/organization/nuxeo/OrgAuthorityDocumentModelHandler.java
+++ b/services/organization/service/src/main/java/org/collectionspace/services/organization/nuxeo/OrgAuthorityDocumentModelHandler.java
@@ -33,6 +33,7 @@ import org.collectionspace.services.organization.OrgauthoritiesCommonList;
 import org.collectionspace.services.organization.OrgauthoritiesCommonList.OrgauthorityListItem;
 
 import org.collectionspace.services.common.vocabulary.nuxeo.AuthorityDocumentModelHandler;
+import org.collectionspace.services.jaxb.AbstractCommonList;
 import org.collectionspace.services.nuxeo.util.NuxeoUtils;
 import org.nuxeo.ecm.core.api.DocumentModel;
 import org.nuxeo.ecm.core.api.DocumentModelList;
@@ -63,6 +64,8 @@ public class OrgAuthorityDocumentModelHandler
     @Override
     public OrgauthoritiesCommonList extractCommonPartList(DocumentWrapper<DocumentModelList> wrapDoc) throws Exception {
         OrgauthoritiesCommonList coList = this.extractPagingInfo(new OrgauthoritiesCommonList(), wrapDoc);
+        AbstractCommonList commonList = (AbstractCommonList) coList;
+        commonList.setFieldsReturned("displayName|refName|shortIdentifier|vocabType|uri|csid");
     	List<OrgauthoritiesCommonList.OrgauthorityListItem> list = coList.getOrgauthorityListItem();
     	Iterator<DocumentModel> iter = wrapDoc.getWrappedObject().iterator();
         String label = getServiceContext().getCommonPartLabel();
diff --git a/services/organization/service/src/main/java/org/collectionspace/services/organization/nuxeo/OrganizationDocumentModelHandler.java b/services/organization/service/src/main/java/org/collectionspace/services/organization/nuxeo/OrganizationDocumentModelHandler.java
index d78da2e50..d11dc16b5 100644
--- a/services/organization/service/src/main/java/org/collectionspace/services/organization/nuxeo/OrganizationDocumentModelHandler.java
+++ b/services/organization/service/src/main/java/org/collectionspace/services/organization/nuxeo/OrganizationDocumentModelHandler.java
@@ -31,6 +31,7 @@ import org.collectionspace.services.common.vocabulary.nuxeo.AuthorityItemDocumen
 import org.collectionspace.services.OrganizationJAXBSchema;
 import org.collectionspace.services.common.document.DocumentWrapper;
 import org.collectionspace.services.common.service.ObjectPartType;
+import org.collectionspace.services.jaxb.AbstractCommonList;
 import org.collectionspace.services.nuxeo.util.NuxeoUtils;
 import org.collectionspace.services.organization.OrganizationsCommon;
 import org.collectionspace.services.organization.OrganizationsCommonList;
@@ -135,6 +136,8 @@ public class OrganizationDocumentModelHandler
     public OrganizationsCommonList extractCommonPartList(DocumentWrapper<DocumentModelList> wrapDoc) 
     		throws Exception {
         OrganizationsCommonList coList = this.extractPagingInfo(new OrganizationsCommonList(), wrapDoc);
+        AbstractCommonList commonList = (AbstractCommonList) coList;
+        commonList.setFieldsReturned("displayName|refName|uri|csid");
         List<OrganizationsCommonList.OrganizationListItem> list = coList.getOrganizationListItem();
         Iterator<DocumentModel> iter = wrapDoc.getWrappedObject().iterator();
         String commonPartLabel = getServiceContext().getCommonPartLabel("organizations");
diff --git a/services/person/service/src/main/java/org/collectionspace/services/person/nuxeo/PersonAuthorityDocumentModelHandler.java b/services/person/service/src/main/java/org/collectionspace/services/person/nuxeo/PersonAuthorityDocumentModelHandler.java
index 3e5bee782..24821da18 100644
--- a/services/person/service/src/main/java/org/collectionspace/services/person/nuxeo/PersonAuthorityDocumentModelHandler.java
+++ b/services/person/service/src/main/java/org/collectionspace/services/person/nuxeo/PersonAuthorityDocumentModelHandler.java
@@ -28,6 +28,7 @@ import java.util.List;
 
 import org.collectionspace.services.common.vocabulary.AuthorityJAXBSchema;
 import org.collectionspace.services.common.document.DocumentWrapper;
+import org.collectionspace.services.jaxb.AbstractCommonList;
 import org.collectionspace.services.person.PersonauthoritiesCommon;
 import org.collectionspace.services.person.PersonauthoritiesCommonList;
 import org.collectionspace.services.person.PersonauthoritiesCommonList.PersonauthorityListItem;
@@ -61,6 +62,8 @@ public class PersonAuthorityDocumentModelHandler
     public PersonauthoritiesCommonList extractCommonPartList(DocumentWrapper<DocumentModelList> wrapDoc) throws Exception {
         PersonauthoritiesCommonList coList = extractPagingInfo(new PersonauthoritiesCommonList(),
         		wrapDoc);
+        AbstractCommonList commonList = (AbstractCommonList) coList;
+        commonList.setFieldsReturned("displayName|refName|shortIdentifier|vocabType|uri|csid");
 
         //FIXME: iterating over a long list of documents is not a long term
         //strategy...need to change to more efficient iterating in future
diff --git a/services/person/service/src/main/java/org/collectionspace/services/person/nuxeo/PersonDocumentModelHandler.java b/services/person/service/src/main/java/org/collectionspace/services/person/nuxeo/PersonDocumentModelHandler.java
index cf3b5e124..b83e0d89d 100644
--- a/services/person/service/src/main/java/org/collectionspace/services/person/nuxeo/PersonDocumentModelHandler.java
+++ b/services/person/service/src/main/java/org/collectionspace/services/person/nuxeo/PersonDocumentModelHandler.java
@@ -33,6 +33,7 @@ import org.collectionspace.services.PersonJAXBSchema;
 import org.collectionspace.services.common.document.DocumentWrapper;
 import org.collectionspace.services.common.service.ObjectPartType;
 import org.collectionspace.services.nuxeo.util.NuxeoUtils;
+import org.collectionspace.services.jaxb.AbstractCommonList;
 import org.collectionspace.services.person.PersonsCommon;
 import org.collectionspace.services.person.PersonsCommonList;
 import org.collectionspace.services.person.PersonsCommonList.PersonListItem;
@@ -188,6 +189,8 @@ public class PersonDocumentModelHandler
 	public PersonsCommonList extractCommonPartList(
 			DocumentWrapper<DocumentModelList> wrapDoc) throws Exception {
 		PersonsCommonList coList = extractPagingInfo(new PersonsCommonList(), wrapDoc);
+        AbstractCommonList commonList = (AbstractCommonList) coList;
+        commonList.setFieldsReturned("displayName|refName|uri|csid");
 		List<PersonsCommonList.PersonListItem> list = coList.getPersonListItem();
 		Iterator<DocumentModel> iter = wrapDoc.getWrappedObject().iterator();
 		String commonPartLabel = getServiceContext().getCommonPartLabel(
diff --git a/services/relation/service/src/main/java/org/collectionspace/services/relation/nuxeo/RelationDocumentModelHandler.java b/services/relation/service/src/main/java/org/collectionspace/services/relation/nuxeo/RelationDocumentModelHandler.java
index 07903e350..b9ebb4e6c 100644
--- a/services/relation/service/src/main/java/org/collectionspace/services/relation/nuxeo/RelationDocumentModelHandler.java
+++ b/services/relation/service/src/main/java/org/collectionspace/services/relation/nuxeo/RelationDocumentModelHandler.java
@@ -34,6 +34,7 @@ import org.collectionspace.services.relation.RelationsCommonList;
 import org.collectionspace.services.relation.RelationsCommonList.RelationListItem;
 
 import org.collectionspace.services.common.document.DocumentWrapper;
+import org.collectionspace.services.jaxb.AbstractCommonList;
 import org.collectionspace.services.nuxeo.client.java.RemoteDocumentModelHandlerImpl;
 import org.collectionspace.services.nuxeo.util.NuxeoUtils;
 import org.jboss.resteasy.plugins.providers.multipart.MultipartInput;
@@ -124,6 +125,8 @@ public class RelationDocumentModelHandler
     @Override
     public RelationsCommonList extractCommonPartList(DocumentWrapper<DocumentModelList> wrapDoc) throws Exception {
         RelationsCommonList relList = this.extractPagingInfo(new RelationsCommonList(), wrapDoc) ;
+        AbstractCommonList commonList = (AbstractCommonList) relList;
+        commonList.setFieldsReturned("subjectCsid|relationshipType|predicateDisplayName|objectCsid|uri|csid");
         List<RelationsCommonList.RelationListItem> itemList = relList.getRelationListItem();
         Iterator<DocumentModel> iter = wrapDoc.getWrappedObject().iterator();
         while(iter.hasNext()){
diff --git a/services/report/service/src/main/java/org/collectionspace/services/report/nuxeo/ReportDocumentModelHandler.java b/services/report/service/src/main/java/org/collectionspace/services/report/nuxeo/ReportDocumentModelHandler.java
index a3f2f47c4..9077fc0ba 100644
--- a/services/report/service/src/main/java/org/collectionspace/services/report/nuxeo/ReportDocumentModelHandler.java
+++ b/services/report/service/src/main/java/org/collectionspace/services/report/nuxeo/ReportDocumentModelHandler.java
@@ -28,6 +28,7 @@ import java.util.List;
 
 import org.collectionspace.services.ReportJAXBSchema;
 import org.collectionspace.services.common.document.DocumentWrapper;
+import org.collectionspace.services.jaxb.AbstractCommonList;
 import org.collectionspace.services.report.ReportsCommon;
 import org.collectionspace.services.report.ReportsCommonList;
 import org.collectionspace.services.report.ReportsCommonList.ReportListItem;
@@ -119,6 +120,8 @@ public class ReportDocumentModelHandler
     @Override
     public ReportsCommonList extractCommonPartList(DocumentWrapper<DocumentModelList> wrapDoc) throws Exception {
         ReportsCommonList coList = this.extractPagingInfo(new ReportsCommonList(), wrapDoc);
+        AbstractCommonList commonList = (AbstractCommonList) coList;
+        commonList.setFieldsReturned("name|outputMIME|forDocType|forSingleDoc|uri|csid");
         List<ReportsCommonList.ReportListItem> list = coList.getReportListItem();
         Iterator<DocumentModel> iter = wrapDoc.getWrappedObject().iterator();
 				String label = getServiceContext().getCommonPartLabel();
diff --git a/services/vocabulary/service/src/main/java/org/collectionspace/services/vocabulary/nuxeo/VocabularyDocumentModelHandler.java b/services/vocabulary/service/src/main/java/org/collectionspace/services/vocabulary/nuxeo/VocabularyDocumentModelHandler.java
index 81bc5b5b4..cbb6af7b0 100644
--- a/services/vocabulary/service/src/main/java/org/collectionspace/services/vocabulary/nuxeo/VocabularyDocumentModelHandler.java
+++ b/services/vocabulary/service/src/main/java/org/collectionspace/services/vocabulary/nuxeo/VocabularyDocumentModelHandler.java
@@ -34,6 +34,7 @@ import org.collectionspace.services.vocabulary.VocabulariesCommonList;
 import org.collectionspace.services.vocabulary.VocabulariesCommonList.VocabularyListItem;
 
 import org.collectionspace.services.nuxeo.util.NuxeoUtils;
+import org.collectionspace.services.jaxb.AbstractCommonList;
 import org.nuxeo.ecm.core.api.DocumentModel;
 import org.nuxeo.ecm.core.api.DocumentModelList;
 import org.slf4j.Logger;
@@ -65,6 +66,8 @@ public class VocabularyDocumentModelHandler
     		DocumentWrapper<DocumentModelList> wrapDoc) throws Exception {
 		String label = getServiceContext().getCommonPartLabel();
         VocabulariesCommonList coList = extractPagingInfo(new VocabulariesCommonList(), wrapDoc);
+        AbstractCommonList commonList = (AbstractCommonList) coList;
+        commonList.setFieldsReturned("displayName|refName|shortIdentifier|vocabType|uri|csid");
         List<VocabulariesCommonList.VocabularyListItem> list = coList.getVocabularyListItem();
         Iterator<DocumentModel> iter = wrapDoc.getWrappedObject().iterator();
         while(iter.hasNext()){
diff --git a/services/vocabulary/service/src/main/java/org/collectionspace/services/vocabulary/nuxeo/VocabularyItemDocumentModelHandler.java b/services/vocabulary/service/src/main/java/org/collectionspace/services/vocabulary/nuxeo/VocabularyItemDocumentModelHandler.java
index 8585c63ec..93302aa6d 100644
--- a/services/vocabulary/service/src/main/java/org/collectionspace/services/vocabulary/nuxeo/VocabularyItemDocumentModelHandler.java
+++ b/services/vocabulary/service/src/main/java/org/collectionspace/services/vocabulary/nuxeo/VocabularyItemDocumentModelHandler.java
@@ -30,6 +30,7 @@ import org.collectionspace.services.common.vocabulary.AuthorityItemJAXBSchema;
 import org.collectionspace.services.common.document.DocumentWrapper;
 import org.collectionspace.services.common.vocabulary.nuxeo.AuthorityItemDocumentModelHandler;
 import org.collectionspace.services.nuxeo.util.NuxeoUtils;
+import org.collectionspace.services.jaxb.AbstractCommonList;
 import org.collectionspace.services.vocabulary.VocabularyitemsCommon;
 import org.collectionspace.services.vocabulary.VocabularyitemsCommonList;
 import org.collectionspace.services.vocabulary.VocabularyitemsCommonList.VocabularyitemListItem;
@@ -60,6 +61,8 @@ public class VocabularyItemDocumentModelHandler
 	public VocabularyitemsCommonList extractCommonPartList(
 			DocumentWrapper<DocumentModelList> wrapDoc) throws Exception {
 		VocabularyitemsCommonList coList = extractPagingInfo(new VocabularyitemsCommonList(), wrapDoc);
+        AbstractCommonList commonList = (AbstractCommonList) coList;
+        commonList.setFieldsReturned("displayName|refName|uri|csid");
 		
 		List<VocabularyitemsCommonList.VocabularyitemListItem> list = coList.getVocabularyitemListItem();
 		Iterator<DocumentModel> iter = wrapDoc.getWrappedObject().iterator();
-- 
2.47.3