From: Aron Roberts <aron@socrates.berkeley.edu>
Date: Thu, 5 Jan 2012 03:15:08 +0000 (+0000)
Subject: CSPACE-4727,CSPACE-4471,CSPACE-4472: Completely reviewed the extensive list of fields... 
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=36d5ffff712bbc274c04f07a47b77f1dfe45c083;p=tmp%2Fjakarta-migration.git

CSPACE-4727,CSPACE-4471,CSPACE-4472: Completely reviewed the extensive list of fields in Cataloging / CollectionObject that hold authority references (authRefs) and vocabulary term references (termRefs), and updated services prototype tenant bindings accordingly. Reordered these configuration entries to follow the pattern of the various wiki schema pages for information groups in Cataloging, for ease of future maintenance. Made a minor update to a services authRefs test to reflect these configuration changes.
---

diff --git a/services/collectionobject/client/src/test/java/org/collectionspace/services/client/test/CollectionObjectAuthRefsTest.java b/services/collectionobject/client/src/test/java/org/collectionspace/services/client/test/CollectionObjectAuthRefsTest.java
index 02ea7722a..6d4c1ec13 100644
--- a/services/collectionobject/client/src/test/java/org/collectionspace/services/client/test/CollectionObjectAuthRefsTest.java
+++ b/services/collectionobject/client/src/test/java/org/collectionspace/services/client/test/CollectionObjectAuthRefsTest.java
@@ -126,6 +126,13 @@ public class CollectionObjectAuthRefsTest extends BaseServiceTest {
     private String fieldCollectionSourceRefName = null;
     private String fieldCollectorRefName = null;
 
+    // FIXME: As of 2012-01-04, the two assocEvent... fields
+    // and the ownerRefName field have been commented out in
+    // the list of authRef fields in CollectionObject, in tenant bindings,
+    // because those fields fall within to-be-created repeatable groups,
+    // per CSPACE-3229.
+    // As a result, the number of authority references expected to be found
+    // is currently 4, rather than 7. - Aron
     public String toString(){
         String result = "CollectionObjectauthRefsTest: "
                         + "\r\npersonAuthCSID: "+personAuthCSID
@@ -146,7 +153,7 @@ public class CollectionObjectAuthRefsTest extends BaseServiceTest {
     }
 
     /** The number of authority references expected. */
-    private final int NUM_AUTH_REFS_EXPECTED = 7;
+    private final int NUM_AUTH_REFS_EXPECTED = 4;
 
     /* (non-Javadoc)
      * @see org.collectionspace.services.client.test.BaseServiceTest#getAbstractCommonList(org.jboss.resteasy.client.ClientResponse)
diff --git a/services/common/src/main/cspace/config/services/tenants/tenant-bindings-proto.xml b/services/common/src/main/cspace/config/services/tenants/tenant-bindings-proto.xml
index 982de8651..88d66ac0e 100644
--- a/services/common/src/main/cspace/config/services/tenants/tenant-bindings-proto.xml
+++ b/services/common/src/main/cspace/config/services/tenants/tenant-bindings-proto.xml
@@ -153,115 +153,99 @@
                 </service:part>
                 <service:part id="1" control_group="Managed" versionable="true" auditable="false" label="collectionobjects_common" updated="" order="1">
                     <service:properties>
-                        <!-- Concept authority -->
+                        <!-- Fields containing authority term references -->
+                        <!-- Object Identification Information group -->
+                        <!-- There are currently no authority term references in this group -->
+                        <!-- Object Description Information group -->
                         <types:item xmlns:types="http://collectionspace.org/services/common/types">
                             <types:key>authRef</types:key>
                             <types:value>contentActivities|contentActivity</types:value>
                         </types:item>
-                        <!-- Concept authority -->
                         <types:item xmlns:types="http://collectionspace.org/services/common/types">
                             <types:key>authRef</types:key>
                             <types:value>contentConcepts|contentConcept</types:value>
                         </types:item>
                         <types:item xmlns:types="http://collectionspace.org/services/common/types">
                             <types:key>authRef</types:key>
-                            <types:value>contentOrganizations|contentOrganization</types:value>
-                        </types:item>
-                        <types:item xmlns:types="http://collectionspace.org/services/common/types">
-                            <types:key>authRef</types:key>
-                            <types:value>contentPeoples|contentPeople</types:value>
-                        </types:item>
-                        <types:item xmlns:types="http://collectionspace.org/services/common/types">
-                            <types:key>authRef</types:key>
-                            <types:value>contentPersons|contentPerson</types:value>
-                        </types:item>
-                        <types:item xmlns:types="http://collectionspace.org/services/common/types">
-                            <types:key>authRef</types:key>
-                            <types:value>contentPlaces|contentPlace</types:value>
+                            <types:value>contentEventNameGroupList/*/contentEventName</types:value>
                         </types:item>
-                        <!-- Concept authority -->
                         <types:item xmlns:types="http://collectionspace.org/services/common/types">
                             <types:key>authRef</types:key>
-                            <types:value>styles|style</types:value>
+                            <types:value>contentEventNameGroupList/*/contentEventNameType</types:value>
                         </types:item>
                         <types:item xmlns:types="http://collectionspace.org/services/common/types">
                             <types:key>authRef</types:key>
-                            <types:value>assocEventOrganizations|assocEventOrganization</types:value>
+                            <types:value>contentOrganizations|contentOrganization</types:value>
                         </types:item>
                         <types:item xmlns:types="http://collectionspace.org/services/common/types">
                             <types:key>authRef</types:key>
-                            <types:value>assocEventPersons|assocEventPerson</types:value>
+                            <types:value>contentOtherGroupList/*/contentOther</types:value>
                         </types:item>
                         <types:item xmlns:types="http://collectionspace.org/services/common/types">
                             <types:key>authRef</types:key>
-                            <types:value>owners|owner</types:value>
+                            <types:value>contentOtherGroupList/*/contentOtherType</types:value>
                         </types:item>
-                        <!-- Place authority -->
                         <types:item xmlns:types="http://collectionspace.org/services/common/types">
                             <types:key>authRef</types:key>
-                            <types:value>fieldCollectionPlace</types:value>
+                            <types:value>contentPeoples|contentPeople</types:value>
                         </types:item>
                         <types:item xmlns:types="http://collectionspace.org/services/common/types">
                             <types:key>authRef</types:key>
-                            <types:value>fieldCollectionSources|fieldCollectionSource</types:value>
+                            <types:value>contentPersons|contentPerson</types:value>
                         </types:item>
                         <types:item xmlns:types="http://collectionspace.org/services/common/types">
                             <types:key>authRef</types:key>
-                            <types:value>fieldCollectors|fieldCollector</types:value>
+                            <types:value>contentPlaces|contentPlace</types:value>
                         </types:item>
-                        <!-- Field collection event authority -->
+                        <!-- Commented out until we verify the correct path format for sub-groups -->
+                        <!--
                         <types:item xmlns:types="http://collectionspace.org/services/common/types">
                             <types:key>authRef</types:key>
-                            <types:value>fieldColEventNames|fieldColEventName</types:value>
+                            <types:value>measuredPartGroupList/*/dimensionSubGroupList/*/measuredBy</types:value>
                         </types:item>
+                        -->
                         <types:item xmlns:types="http://collectionspace.org/services/common/types">
                             <types:key>authRef</types:key>
-                            <types:value>contentEventNameGroupList/*/contentEventName</types:value>
+                            <types:value>textualInscriptionGroupList/*/inscriptionContentInscriber</types:value>
                         </types:item>
                         <types:item xmlns:types="http://collectionspace.org/services/common/types">
                             <types:key>authRef</types:key>
-                            <types:value>contentEventNameGroupList/*/contentEventNameType</types:value>
+                            <types:value>textualInscriptionGroupList/*/inscriptionContentMethod</types:value>
                         </types:item>
                         <types:item xmlns:types="http://collectionspace.org/services/common/types">
                             <types:key>authRef</types:key>
-                            <types:value>contentObjectGroupList/*/contentObjectType</types:value>
+                            <types:value>nonTextualInscriptionGroupList/*/inscriptionDescriptionInscriber</types:value>
                         </types:item>
                         <types:item xmlns:types="http://collectionspace.org/services/common/types">
                             <types:key>authRef</types:key>
-                            <types:value>contentOtherGroupList/*/contentOtherType</types:value>
+                            <types:value>nonTextualInscriptionGroupList/*/inscriptionDescriptionMethod</types:value>
                         </types:item>
                         <types:item xmlns:types="http://collectionspace.org/services/common/types">
                             <types:key>authRef</types:key>
                             <types:value>materialGroupList/*/material</types:value>
                         </types:item>
+                        <!-- The following field may become part of a repeatable sub-group -->
+                        <!-- for materialComponent, per CSPACE-4563. -->
+                        <!-- Names of ancestor elements below are placeholders and subject to change. -->
+                        <!--
                         <types:item xmlns:types="http://collectionspace.org/services/common/types">
                             <types:key>authRef</types:key>
-                            <types:value>materialGroupList/*/materialComponent</types:value>
+                            <types:value>materialGroupList/*/materialComponentSubGroupList/*/materialComponent</types:value>
                         </types:item>
+                        -->
                         <types:item xmlns:types="http://collectionspace.org/services/common/types">
                             <types:key>authRef</types:key>
                             <types:value>materialGroupList/*/materialSource</types:value>
                         </types:item>
                         <types:item xmlns:types="http://collectionspace.org/services/common/types">
                             <types:key>authRef</types:key>
-                            <types:value>textualInscriptionGroupList/*/inscriptionContentInscriber</types:value>
-                        </types:item>
-                        <types:item xmlns:types="http://collectionspace.org/services/common/types">
-                            <types:key>authRef</types:key>
-                            <types:value>textualInscriptionGroupList/*/inscriptionContentMethod</types:value>
-                        </types:item>
-                        <types:item xmlns:types="http://collectionspace.org/services/common/types">
-                            <types:key>authRef</types:key>
-                            <types:value>nonTextualInscriptionGroupList/*/inscriptionDescriptionInscriber</types:value>
-                        </types:item>
-                        <types:item xmlns:types="http://collectionspace.org/services/common/types">
-                            <types:key>authRef</types:key>
-                            <types:value>nonTextualInscriptionGroupList/*/inscriptionDescriptionMethod</types:value>
+                            <types:value>styles|style</types:value>
                         </types:item>
-                        <types:item xmlns:types="http://collectionspace.org/services/common/types">
+                         <types:item xmlns:types="http://collectionspace.org/services/common/types">
                             <types:key>authRef</types:key>
                             <types:value>objectComponentGroupList/*/objectComponentName</types:value>
-                        </types:item>
+                        </types:item>  
+                        <!-- Object Production Information group -->
                         <types:item xmlns:types="http://collectionspace.org/services/common/types">
                             <types:key>authRef</types:key>
                             <types:value>objectProductionOrganizationGroupList/*/objectProductionOrganization</types:value>
@@ -274,6 +258,10 @@
                             <types:key>authRef</types:key>
                             <types:value>objectProductionPersonGroupList/*/objectProductionPerson</types:value>
                         </types:item>
+                        <types:item xmlns:types="http://collectionspace.org/services/common/types">
+                            <types:key>authRef</types:key>
+                            <types:value>objectProductionPlaceGroupList/*/objectProductionPlace</types:value>
+                        </types:item>
                         <types:item xmlns:types="http://collectionspace.org/services/common/types">
                             <types:key>authRef</types:key>
                             <types:value>techniqueGroupList/*/technique</types:value>
@@ -282,22 +270,28 @@
                             <types:key>authRef</types:key>
                             <types:value>techniqueGroupList/*/techniqueType</types:value>
                         </types:item>
+                        <!-- Object History and Association Information group -->
+                        <!-- The following fields may become part of a repeatable group -->
+                        <!-- for associatedEvent, per CSPACE-3229. -->
+                        <!-- Names of ancestor elements below are placeholders and subject to change. -->
+                        <!--
                         <types:item xmlns:types="http://collectionspace.org/services/common/types">
                             <types:key>authRef</types:key>
-                            <types:value>objectProductionPlaceGroupList/*/objectProductionPlace</types:value>
+                            <types:value>assocEventGroupList/*/assocEventOrganization</types:value>
                         </types:item>
                         <types:item xmlns:types="http://collectionspace.org/services/common/types">
                             <types:key>authRef</types:key>
-                            <types:value>assocActivityGroupList/*/assocActivity</types:value>
+                            <types:value>assocEventGroupList/*/assocEventPeople</types:value>
                         </types:item>
                         <types:item xmlns:types="http://collectionspace.org/services/common/types">
                             <types:key>authRef</types:key>
-                            <types:value>assocConceptGroupList/*/assocConcept</types:value>
+                            <types:value>assocEventGroupList/*/assocEventPerson</types:value>
                         </types:item>
                         <types:item xmlns:types="http://collectionspace.org/services/common/types">
                             <types:key>authRef</types:key>
-                            <types:value>assocCulturalContextGroupList/*/assocCulturalContext</types:value>
+                            <types:value>assocEventGroupList/*/assocEventPlace</types:value>
                         </types:item>
+                        -->
                         <types:item xmlns:types="http://collectionspace.org/services/common/types">
                             <types:key>authRef</types:key>
                             <types:value>assocOrganizationGroupList/*/assocOrganization</types:value>
@@ -314,164 +308,179 @@
                             <types:key>authRef</types:key>
                             <types:value>assocPlaceGroupList/*/assocPlace</types:value>
                         </types:item>
+                        <!-- The following fields may become part of a repeatable group -->
+                        <!-- for 'owner', per CSPACE-3229. -->
+                        <!-- Names of ancestor elements below are placeholders and subject to change. -->
+                        <!--
                         <types:item xmlns:types="http://collectionspace.org/services/common/types">
                             <types:key>authRef</types:key>
-                            <types:value>referenceGroupList/*/reference</types:value>
+                            <types:value>ownerGroupList/*/owner</types:value>
                         </types:item>
                         <types:item xmlns:types="http://collectionspace.org/services/common/types">
                             <types:key>authRef</types:key>
-                            <types:value>measuredPartGroupList/*/dimensionSubGroupList/*/measuredBy</types:value>
+                            <types:value>ownerGroupList/*/ownershipPlace</types:value>
                         </types:item>
-                        <!-- The following fields may become part of repeatable sub-groups for -->
-                        <!-- associatedEvent and for owner, respectively, per JIRA(s) spawned from CSPACE-4490. -->
-                        <!-- The names of ancestor elements below are anticipated, arbitrary and subject to change. -->
-                        <!--
+                        -->
+                        <!-- Object Owner's Contribution Information group -->
+                        <!-- There are currently no authority term references in this group -->
+                        <!-- Object Viewer's Contribution Information group -->
+                        <!-- There are currently no authority term references in this group -->
+                        <!-- Reference Information group -->
                         <types:item xmlns:types="http://collectionspace.org/services/common/types">
                             <types:key>authRef</types:key>
-                            <types:value>assocEventGroupList/*/assocEventOrganization</types:value>
+                            <types:value>referenceGroupList/*/reference</types:value>
                         </types:item>
+                        <!-- Object Collection Information group -->
                         <types:item xmlns:types="http://collectionspace.org/services/common/types">
                             <types:key>authRef</types:key>
-                            <types:value>assocEventGroupList/*/assocEventPeople</types:value>
+                            <types:value>fieldCollectionPlace</types:value>
                         </types:item>
                         <types:item xmlns:types="http://collectionspace.org/services/common/types">
                             <types:key>authRef</types:key>
-                            <types:value>assocEventGroupList/*/assocEventPerson</types:value>
+                            <types:value>fieldCollectionSources|fieldCollectionSource</types:value>
                         </types:item>
                         <types:item xmlns:types="http://collectionspace.org/services/common/types">
                             <types:key>authRef</types:key>
-                            <types:value>assocEventGroupList/*/assocEventPlace</types:value>
+                            <types:value>fieldCollectors|fieldCollector</types:value>
                         </types:item>
                         <types:item xmlns:types="http://collectionspace.org/services/common/types">
                             <types:key>authRef</types:key>
-                            <types:value>ownerGroupList/*/owner</types:value>
+                            <types:value>fieldColEventNames|fieldColEventName</types:value>
                         </types:item>
+                        <!-- ### -->
+                        <!-- Fields containing term list / controlled vocabulary references -->
+                        <!-- ### -->
+                        <!-- Object Identification Information group -->
                         <types:item xmlns:types="http://collectionspace.org/services/common/types">
-                            <types:key>authRef</types:key>
-                            <types:value>ownerGroupList/*/ownershipPlace</types:value>
+                            <types:key>termRef</types:key>
+                            <types:value>otherNumberList/*/numberType</types:value>
                         </types:item>
-                        -->
                         <types:item xmlns:types="http://collectionspace.org/services/common/types">
                             <types:key>termRef</types:key>
-                            <types:value>responsibleDepartments|responsibleDepartment</types:value>
+                            <types:value>objectNameList/*/objectNameCurrency</types:value>
                         </types:item>
                         <types:item xmlns:types="http://collectionspace.org/services/common/types">
                             <types:key>termRef</types:key>
-                            <types:value>collection</types:value>
+                            <types:value>objectNameList/*/objectNameLevel</types:value>
                         </types:item>
                         <types:item xmlns:types="http://collectionspace.org/services/common/types">
                             <types:key>termRef</types:key>
-                            <types:value>recordStatus</types:value>
+                            <types:value>objectNameList/*/objectNameSystem</types:value>
                         </types:item>
                         <types:item xmlns:types="http://collectionspace.org/services/common/types">
                             <types:key>termRef</types:key>
-                            <types:value>ageUnit</types:value>
+                            <types:value>objectNameList/*/objectNameType</types:value>
                         </types:item>
                         <types:item xmlns:types="http://collectionspace.org/services/common/types">
                             <types:key>termRef</types:key>
-                            <types:value>contentLanguages|contentLanguage</types:value>
+                            <types:value>objectNameList/*/objectNameLanguage</types:value>
                         </types:item>
                         <types:item xmlns:types="http://collectionspace.org/services/common/types">
                             <types:key>termRef</types:key>
-                            <types:value>contentPositions|contentPosition</types:value>
+                            <types:value>responsibleDepartments|responsibleDepartment</types:value>
                         </types:item>
                         <types:item xmlns:types="http://collectionspace.org/services/common/types">
                             <types:key>termRef</types:key>
-                            <types:value>contentScripts|contentScript</types:value>
+                            <types:value>collection</types:value>
                         </types:item>
+                        <!-- Commented out until we verify the correct path format for sub-groups -->
+                        <!--
                         <types:item xmlns:types="http://collectionspace.org/services/common/types">
                             <types:key>termRef</types:key>
-                            <types:value>forms|form</types:value>
+                            <types:value>titleGroupList/*/titleTranslationSubGroupList/*/titleLanguage</types:value>
                         </types:item>
                         <types:item xmlns:types="http://collectionspace.org/services/common/types">
                             <types:key>termRef</types:key>
-                            <types:value>objectStatusList|objectStatus</types:value>
+                            <types:value>titleGroupList/*/titleTranslationSubGroupList/*/titleTranslationLanguage</types:value>
                         </types:item>
+                        -->
                         <types:item xmlns:types="http://collectionspace.org/services/common/types">
                             <types:key>termRef</types:key>
-                            <types:value>phase</types:value>
+                            <types:value>titleGroupList/*/titleType</types:value>
                         </types:item>
                         <types:item xmlns:types="http://collectionspace.org/services/common/types">
                             <types:key>termRef</types:key>
-                            <types:value>sex</types:value>
+                            <types:value>recordStatus</types:value>
                         </types:item>
+                        <!-- Object Description Information group -->
                         <types:item xmlns:types="http://collectionspace.org/services/common/types">
                             <types:key>termRef</types:key>
-                            <types:value>fieldCollectionMethods|fieldCollectionMethod</types:value>
+                            <types:value>ageUnit</types:value>
                         </types:item>
-                        <!-- Commented out for now, as searching within a field in a complexType breaks searches -->
-                        <!--
                         <types:item xmlns:types="http://collectionspace.org/services/common/types">
                             <types:key>termRef</types:key>
-                            <types:value>otherNumberList/*/numberType</types:value>
+                            <types:value>contentLanguages|contentLanguage</types:value>
                         </types:item>
                         <types:item xmlns:types="http://collectionspace.org/services/common/types">
                             <types:key>termRef</types:key>
-                            <types:value>objectNameList/*/objectNameCurrency</types:value>
+                            <types:value>contentObjectGroupList/*/contentObjectType</types:value>
                         </types:item>
                         <types:item xmlns:types="http://collectionspace.org/services/common/types">
                             <types:key>termRef</types:key>
-                            <types:value>objectNameList/*/objectNameLevel</types:value>
+                            <types:value>contentPositions|contentPosition</types:value>
                         </types:item>
                         <types:item xmlns:types="http://collectionspace.org/services/common/types">
                             <types:key>termRef</types:key>
-                            <types:value>objectNameList/*/objectNameSystem</types:value>
+                            <types:value>contentScripts|contentScript</types:value>
                         </types:item>
                         <types:item xmlns:types="http://collectionspace.org/services/common/types">
                             <types:key>termRef</types:key>
-                            <types:value>objectNameList/*/objectNameType</types:value>
+                            <types:value>measuredPartGroupList/*/measuredPart</types:value>
                         </types:item>
+                        <!-- Commented out until we verify the correct path format for sub-groups -->
+                        <!--
                         <types:item xmlns:types="http://collectionspace.org/services/common/types">
                             <types:key>termRef</types:key>
-                            <types:value>objectNameList/*/objectNameLanguage</types:value>
+                            <types:value>measuredPartGroupList/*/dimensionSubGroupList/*/dimension</types:value>
                         </types:item>
                         <types:item xmlns:types="http://collectionspace.org/services/common/types">
                             <types:key>termRef</types:key>
-                            <types:value>titleGroupList/*/titleLanguage</types:value>
+                            <types:value>measuredPartGroupList/*/dimensionSubGroupList/*/measurementUnit</types:value>
                         </types:item>
                         <types:item xmlns:types="http://collectionspace.org/services/common/types">
                             <types:key>termRef</types:key>
-                            <types:value>titleGroupList/*/titleTranslationLanguage</types:value>
+                            <types:value>measuredPartGroupList/*/dimensionSubGroupList/*/measurementMethod</types:value>
                         </types:item>
+                        -->
                         <types:item xmlns:types="http://collectionspace.org/services/common/types">
                             <types:key>termRef</types:key>
-                            <types:value>contentObjectGroupList/*/contentObjectType</types:value>
+                            <types:value>forms|form</types:value>
                         </types:item>
                         <types:item xmlns:types="http://collectionspace.org/services/common/types">
                             <types:key>termRef</types:key>
-                            <types:value>titleGroupList/*/titleType</types:value>
+                            <types:value>textualInscriptionGroupList/*/inscriptionContentLanguage</types:value>
                         </types:item>
                         <types:item xmlns:types="http://collectionspace.org/services/common/types">
                             <types:key>termRef</types:key>
-                            <types:value>dimensionList/*/measuredPart</types:value>
+                            <types:value>textualInscriptionGroupList/*/inscriptionContentPosition</types:value>
                         </types:item>
                         <types:item xmlns:types="http://collectionspace.org/services/common/types">
                             <types:key>termRef</types:key>
-                            <types:value>textualInscriptionGroupList/*/inscriptionContentLanguage</types:value>
+                            <types:value>textualInscriptionGroupList/*/inscriptionContentScript</types:value>
                         </types:item>
                         <types:item xmlns:types="http://collectionspace.org/services/common/types">
                             <types:key>termRef</types:key>
-                            <types:value>textualInscriptionGroupList/*/inscriptionContentPosition</types:value>
+                            <types:value>textualInscriptionGroupList/*/inscriptionContentType</types:value>
                         </types:item>
                         <types:item xmlns:types="http://collectionspace.org/services/common/types">
                             <types:key>termRef</types:key>
-                            <types:value>textualInscriptionGroupList/*/inscriptionContentScript</types:value>
+                            <types:value>nonTextualInscriptionGroupList/*/inscriptionDescriptionPosition</types:value>
                         </types:item>
                         <types:item xmlns:types="http://collectionspace.org/services/common/types">
                             <types:key>termRef</types:key>
-                            <types:value>textualInscriptionGroupList/*/inscriptionContentType</types:value>
+                            <types:value>nonTextualInscriptionGroupList/*/inscriptionDescriptionType</types:value>
                         </types:item>
                         <types:item xmlns:types="http://collectionspace.org/services/common/types">
                             <types:key>termRef</types:key>
-                            <types:value>nonTextualInscriptionGroupList/*/inscriptionDescriptionLanguage</types:value>
+                            <types:value>objectStatusList|objectStatus</types:value>
                         </types:item>
                         <types:item xmlns:types="http://collectionspace.org/services/common/types">
                             <types:key>termRef</types:key>
-                            <types:value>nonTextualInscriptionGroupList/*/inscriptionDescriptionPosition</types:value>
+                            <types:value>phase</types:value>
                         </types:item>
                         <types:item xmlns:types="http://collectionspace.org/services/common/types">
                             <types:key>termRef</types:key>
-                            <types:value>nonTextualInscriptionGroupList/*/inscriptionDescriptionType</types:value>
+                            <types:value>sex</types:value>
                         </types:item>
                         <types:item xmlns:types="http://collectionspace.org/services/common/types">
                             <types:key>termRef</types:key>
@@ -485,50 +494,50 @@
                             <types:key>termRef</types:key>
                             <types:value>technicalAttributeGroupList/*/technicalAttributeMeasurementUnit</types:value>
                         </types:item>
-                        <types:item xmlns:types="http://collectionspace.org/services/common/types">
+                         <types:item xmlns:types="http://collectionspace.org/services/common/types">
                             <types:key>termRef</types:key>
-                            <types:value>assocObjectGroupList/*/assocObject</types:value>
-                        </types:item>
+                            <types:value>objectComponentGroupList/*/objectComponentInformation</types:value>
+                        </types:item>                       
+                        <!-- Object Production Information group -->
+                        <!-- There are currently no term references in this group -->
+                        <!-- Object History and Association Information group -->
                         <types:item xmlns:types="http://collectionspace.org/services/common/types">
                             <types:key>termRef</types:key>
-                            <types:value>assocObjectGroupList/*/assocObjectType</types:value>
+                            <types:value>assocActivityGroupList/*/assocActivity</types:value>
                         </types:item>
                         <types:item xmlns:types="http://collectionspace.org/services/common/types">
                             <types:key>termRef</types:key>
-                            <types:value>usageGroupList/*/usage</types:value>
+                            <types:value>assocConceptGroupList/*/assocConcept</types:value>
                         </types:item>
-                        -->
-                        
-                        <!-- The following fields have become part of a repeatable sub-group, per CSPACE-3686. -->
-                        <!-- Their parent field/hiearchical paths have changedfrom those below. -->
-                        <!--
                         <types:item xmlns:types="http://collectionspace.org/services/common/types">
                             <types:key>termRef</types:key>
-                            <types:value>dimensionList/*/dimension</types:value>
+                            <types:value>assocCulturalContextGroupList/*/assocCulturalContext</types:value>
                         </types:item>
+                        <!-- The following fields may become part of a repeatable group -->
+                        <!-- for associatedEvent, per CSPACE-3229. -->
+                        <!-- Names of ancestor elements below are placeholders and subject to change. -->
+                        <!--
                         <types:item xmlns:types="http://collectionspace.org/services/common/types">
                             <types:key>termRef</types:key>
-                            <types:value>dimensionList/*/measurementUnit</types:value>
+                            <types:value>assocEventGroupList/*/assocEventName</types:value>
                         </types:item>
                         <types:item xmlns:types="http://collectionspace.org/services/common/types">
                             <types:key>termRef</types:key>
-                            <types:value>dimensionList/*/measurementMethod</types:value>
+                            <types:value>assocEventGroupList/*/assocEventNameType</types:value>
                         </types:item>
                         -->
-
-                        <!-- The following fields related to Associated Event and Owner may become  -->
-                        <!-- part of a repeatable sub-group, per JIRA(s) spawned from CSPACE-4490. -->
-                        <!-- As a result, they will fall into complexType structures. -->
-                        <!-- The names of ancestor elements below are anticipated, arbitrary and subject to change. -->
-                        <!--
                         <types:item xmlns:types="http://collectionspace.org/services/common/types">
                             <types:key>termRef</types:key>
-                            <types:value>assocEventGroupList/*/assocEventName</types:value>
+                            <types:value>assocObjectGroupList/*/assocObject</types:value>
                         </types:item>
                         <types:item xmlns:types="http://collectionspace.org/services/common/types">
                             <types:key>termRef</types:key>
-                            <types:value>assocEventGroupList/*/assocEventNameType</types:value>
+                            <types:value>assocObjectGroupList/*/assocObjectType</types:value>
                         </types:item>
+                        <!-- The following fields may become part of a repeatable group -->
+                        <!-- for 'owner', per CSPACE-3229. -->
+                        <!-- Names of ancestor elements below are placeholders and subject to change. -->
+                        <!--
                         <types:item xmlns:types="http://collectionspace.org/services/common/types">
                             <types:key>termRef</types:key>
                             <types:value>ownerGroupList/*/ownershipAccess</types:value>
@@ -542,6 +551,21 @@
                             <types:value>ownerGroupList/*/ownershipExchangeMethod</types:value>
                         </types:item>
                         -->
+                        <types:item xmlns:types="http://collectionspace.org/services/common/types">
+                            <types:key>termRef</types:key>
+                            <types:value>usageGroupList/*/usage</types:value>
+                        </types:item>
+                        <!-- Object Owner's Contribution Information group -->
+                        <!-- There are currently no term references in this group -->
+                        <!-- Object Viewer's Contribution Information group -->
+                        <!-- There are currently no term references in this group -->
+                        <!-- Reference Information group -->
+                        <!-- There are currently no term references in this group -->
+                        <!-- Object Collection Information group -->
+                        <types:item xmlns:types="http://collectionspace.org/services/common/types">
+                            <types:key>termRef</types:key>
+                            <types:value>fieldCollectionMethods|fieldCollectionMethod</types:value>
+                        </types:item>
                     </service:properties>
                     <service:content contentType="application/xml">
                         <service:xmlContent namespaceURI="http://collectionspace.org/services/collectionobject" schemaLocation="http://collectionspace.org/services/collectionobject http://services.collectionspace.org/collectionobject/collectionobjects_common.xsd" />
@@ -1269,10 +1293,13 @@
                             <types:key>authRef</types:key>
                             <types:value>subjectList|subject</types:value>
                         </types:item>
+                        <!-- Commented out until we verify the correct path format for sub-groups -->
+                        <!--
                         <types:item xmlns:types="http://collectionspace.org/services/common/types">
                             <types:key>authRef</types:key>
                             <types:value>measuredPartGroupList/*/dimensionSubGroupList/*/measuredBy</types:value>
                         </types:item>
+                        -->
                         <types:item xmlns:types="http://collectionspace.org/services/common/types">
                             <types:key>termRef</types:key>
                             <types:value>languageList|language</types:value>