From: Aron Roberts <aron@socrates.berkeley.edu>
Date: Tue, 8 May 2012 02:28:33 +0000 (-0700)
Subject: Merge remote-tracking branch 'upstream/master' into cspace-4813
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=f069e5d77b7a8e6af42b2f10a375ab347c2133d1;p=tmp%2Fjakarta-migration.git

Merge remote-tracking branch 'upstream/master' into cspace-4813

Conflicts:
	services/common/src/main/cspace/config/services/tenants/tenant-bindings-proto.xml
---

f069e5d77b7a8e6af42b2f10a375ab347c2133d1
diff --cc services/common/src/main/cspace/config/services/tenants/tenant-bindings-proto.xml
index 045bc4e33,e1133f08f..58baaf6d8
--- 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
@@@ -944,52 -1023,56 +944,73 @@@
                      <types:value>loanOutNumber</types:value>
                  </types:item>
              </service:properties>
 -      <service:object xmlns:service="http://collectionspace.org/services/config/service" name="Loanout" version="0.1">
 -        <service:part id="0" control_group="Managed" versionable="true" auditable="false" label="loansout-system" updated="" order="0">
 -          <service:content contentType="application/xml">
 -            <service:xmlContent namespaceURI="http://collectionspace.org/services/config/system" schemaLocation="http://collectionspace.org/services/config/system http://collectionspace.org/services/config/system/system-response.xsd" />
 -          </service:content>
 -        </service:part>
 -        <service:part id="1" control_group="Managed" versionable="true" auditable="false" label="loansout_common" updated="" order="1">
 -          <service:properties>
 +            <service:object xmlns:service="http://collectionspace.org/services/config/service" name="Loanout" version="0.1">
 +                <service:part id="0" control_group="Managed" versionable="true" auditable="false" label="loansout-system" updated="" order="0">
 +                    <service:content contentType="application/xml">
 +                        <service:xmlContent namespaceURI="http://collectionspace.org/services/config/system" schemaLocation="http://collectionspace.org/services/config/system http://collectionspace.org/services/config/system/system-response.xsd" />
 +                    </service:content>
 +                </service:part>
 +                <service:part id="1" control_group="Managed" versionable="true" auditable="false" label="loansout_common" updated="" order="1">
 +                    <service:properties>
                          <!-- Fields containing authority term references -->
 -            <types:item xmlns:types="http://collectionspace.org/services/config/types">
 -              <types:key>authRef</types:key>
 -              <types:value>borrower</types:value>
 -            </types:item>
 -            <types:item xmlns:types="http://collectionspace.org/services/config/types">
 -              <types:key>authRef</types:key>
 -              <types:value>borrowersContact</types:value>
 -            </types:item>
 -            <types:item xmlns:types="http://collectionspace.org/services/config/types">
 -                <types:key>authRef</types:key>
 -                <types:value>borrowersAuthorizer</types:value>
 -            </types:item>
 -            <types:item xmlns:types="http://collectionspace.org/services/config/types">
 -              <types:key>authRef</types:key>
 -              <types:value>lendersAuthorizer</types:value>
 -            </types:item>
 -            <types:item xmlns:types="http://collectionspace.org/services/config/types">
 -              <types:key>authRef</types:key>
 -              <types:value>lendersContact</types:value>
 -            </types:item>
++<<<<<<< HEAD
 +                        <types:item xmlns:types="http://collectionspace.org/services/config/types">
 +                            <types:key>authRef</types:key>
 +                            <types:value>borrower</types:value>
 +                        </types:item>
 +                        <types:item xmlns:types="http://collectionspace.org/services/config/types">
 +                            <types:key>authRef</types:key>
 +                            <types:value>borrowersContact</types:value>
 +                        </types:item>
 +                        <types:item xmlns:types="http://collectionspace.org/services/config/types">
 +                            <types:key>authRef</types:key>
 +                            <types:value>lendersAuthorizer</types:value>
 +                        </types:item>
 +                        <types:item xmlns:types="http://collectionspace.org/services/config/types">
 +                            <types:key>authRef</types:key>
 +                            <types:value>lendersContact</types:value>
 +                        </types:item>
++                        <types:item xmlns:types="http://collectionspace.org/services/config/types">
++                            <types:key>authRef</types:key>
++                            <types:value>borrower</types:value>
++                        </types:item>
++                        <types:item xmlns:types="http://collectionspace.org/services/config/types">
++                            <types:key>authRef</types:key>
++                            <types:value>borrowersContact</types:value>
++                        </types:item>
++                        <types:item xmlns:types="http://collectionspace.org/services/config/types">
++                            <types:key>authRef</types:key>
++                            <types:value>borrowersAuthorizer</types:value>
++                        </types:item>
++                        <types:item xmlns:types="http://collectionspace.org/services/config/types">
++                            <types:key>authRef</types:key>
++                            <types:value>lendersAuthorizer</types:value>
++                        </types:item>
++                        <types:item xmlns:types="http://collectionspace.org/services/config/types">
++                            <types:key>authRef</types:key>
++                            <types:value>lendersContact</types:value>
++                        </types:item>
                          <!-- Fields containing term list / controlled vocabulary references -->
 -            <types:item xmlns:types="http://collectionspace.org/services/config/types">
 -              <types:key>termRef</types:key>
 -              <types:value>loanPurpose</types:value>
 -            </types:item>
 -            <types:item xmlns:types="http://collectionspace.org/services/config/types">
 -              <types:key>termRef</types:key>
 -							<types:value>loanStatusGroupList/*/loanStatus</types:value>
 -            </types:item>
 -          </service:properties>
 -          <service:content contentType="application/xml">
 -            <service:xmlContent namespaceURI="http://collectionspace.org/services/loanout" schemaLocation="http://collectionspace.org/services/loanout http://services.collectionspace.org/loanout/loansout_common.xsd" />
 -          </service:content>
 -        </service:part>
 -        <service:part id="2" control_group="Managed" versionable="true" auditable="false" label="collectionspace_core" updated="" order="2">
 -          <service:content contentType="application/xml">
 -            <service:xmlContent namespaceURI="http://collectionspace.org/collectionspace_core/" schemaLocation="http://collectionspace.org/collectionspace_core/ http://services.collectionspace.org/collectionspace_core.xsd" />
 -          </service:content>
 -        </service:part>
 -      </service:object>
 -    </tenant:serviceBindings>
 +                        <types:item xmlns:types="http://collectionspace.org/services/config/types">
 +                            <types:key>termRef</types:key>
 +                            <types:value>loanPurpose</types:value>
 +                        </types:item>
 +                        <types:item xmlns:types="http://collectionspace.org/services/config/types">
 +                            <types:key>termRef</types:key>
 +                            <types:value>loanStatusGroupList/*/loanStatus</types:value>
 +                        </types:item>
 +                    </service:properties>
 +                    <service:content contentType="application/xml">
 +                        <service:xmlContent namespaceURI="http://collectionspace.org/services/loanout" schemaLocation="http://collectionspace.org/services/loanout http://services.collectionspace.org/loanout/loansout_common.xsd" />
 +                    </service:content>
 +                </service:part>
 +                <service:part id="2" control_group="Managed" versionable="true" auditable="false" label="collectionspace_core" updated="" order="2">
 +                    <service:content contentType="application/xml">
 +                        <service:xmlContent namespaceURI="http://collectionspace.org/collectionspace_core/" schemaLocation="http://collectionspace.org/collectionspace_core/ http://services.collectionspace.org/collectionspace_core.xsd" />
 +                    </service:content>
 +                </service:part>
 +            </service:object>
 +        </tenant:serviceBindings>
      <!-- end loanout service meta-data -->
      
      <!-- begin objectexit service meta-data -->
@@@ -1880,121 -1960,117 +1901,121 @@@
                  /personauthorities/*/items/
              </service:uriPath>
              -->
 -      <service:repositoryDomain xmlns:service="http://collectionspace.org/services/config/service">default-domain</service:repositoryDomain>
 -      <service:documentHandler xmlns:service="http://collectionspace.org/services/config/service">org.collectionspace.services.person.nuxeo.PersonDocumentModelHandler</service:documentHandler>
 -      <service:DocHandlerParams xmlns:service="http://collectionspace.org/services/config/service">
 -        <service:params>
 -          <service:ListResultsFields>
 -					<!-- Omit the standard AuthorityItem items (they are handled by the code) -->
 -            <service:ListResultField>
 -              <service:element>foreName</service:element>
 -              <service:xpath>foreName</service:xpath>
 -            </service:ListResultField>
 -            <service:ListResultField>
 -              <service:element>surName</service:element>
 -              <service:xpath>surName</service:xpath>
 -            </service:ListResultField>
 -          </service:ListResultsFields>
 -        </service:params>
 -      </service:DocHandlerParams>
 -      <service:validatorHandler xmlns:service="http://collectionspace.org/services/config/service">org.collectionspace.services.person.nuxeo.PersonValidatorHandler</service:validatorHandler>
 -      <service:initHandler xmlns:service="http://collectionspace.org/services/config/service">
 -        <service:classname>org.collectionspace.services.common.init.AddIndices</service:classname>
 -        <service:params>
 -          <service:field>
 -            <service:table>persons_common</service:table>
 -            <service:col>inauthority</service:col>
 -          </service:field>
 -          <service:field>
 -            <service:table>persons_common</service:table>
 -            <service:col>displayname</service:col>
 -          </service:field>
 -          <service:field>
 -            <service:table>persons_common</service:table>
 -            <service:col>shortidentifier</service:col>
 -          </service:field>
 -        </service:params>
 -      </service:initHandler>
 -      <service:properties xmlns:service="http://collectionspace.org/services/config/service">
 -        <types:item xmlns:types="http://collectionspace.org/services/config/types">
 -          <types:key>objectNameProperty</types:key>
 -          <types:value>displayName</types:value>
 -        </types:item>
 -        <!-- there is no objectNumberProperty for persons -->
 -        <types:item xmlns:types="http://collectionspace.org/services/config/types">
 -          <types:key>objectNumberProperty</types:key>
 -          <types:value>shortIdentifier</types:value>
 -        </types:item>
 -      </service:properties>
 -      <service:object xmlns:service="http://collectionspace.org/services/config/service" id="1" name="Person" version="0.1">
 -        <service:part id="0" control_group="Managed" versionable="true" auditable="false" label="persons-system" updated="" order="0">
 -          <service:content contentType="application/xml">
 -            <service:xmlContent namespaceURI="http://collectionspace.org/services/config/system" schemaLocation="http://collectionspace.org/services/config/system http://collectionspace.org/services/config/system/system-response.xsd" />
 -          </service:content>
 -        </service:part>
 -        <service:part id="1" control_group="Managed" versionable="true" auditable="false" label="persons_common" updated="" order="1">
 -          <service:content contentType="application/xml">
 -            <service:xmlContent namespaceURI="http://collectionspace.org/services/person" schemaLocation="http://collectionspace.org/services/person http://services.collectionspace.org/person/persons_common.xsd" />
 -          </service:content>
 -          <service:properties>
 +            <service:repositoryDomain xmlns:service="http://collectionspace.org/services/config/service">default-domain</service:repositoryDomain>
 +            <service:documentHandler xmlns:service="http://collectionspace.org/services/config/service">org.collectionspace.services.person.nuxeo.PersonDocumentModelHandler</service:documentHandler>
 +            <service:DocHandlerParams xmlns:service="http://collectionspace.org/services/config/service">
 +                <service:params>
 +                    <service:ListResultsFields>
 +                        <!-- Omit the standard AuthorityItem items (they are handled by the code) -->
 +                        <service:ListResultField>
 +                            <service:element>foreName</service:element>
 +                            <service:xpath>personTermGroupList/[0]/foreName</service:xpath>
 +                        </service:ListResultField>
 +                        <service:ListResultField>
 +                            <service:element>surName</service:element>
 +                            <service:xpath>personTermGroupList/[0]/surName</service:xpath>
 +                        </service:ListResultField>
 +                    </service:ListResultsFields>
 +                </service:params>
 +            </service:DocHandlerParams>
 +            <service:validatorHandler xmlns:service="http://collectionspace.org/services/config/service">org.collectionspace.services.person.nuxeo.PersonValidatorHandler</service:validatorHandler>
 +            <service:initHandler xmlns:service="http://collectionspace.org/services/config/service">
 +                <service:classname>org.collectionspace.services.common.init.AddIndices</service:classname>
 +                <service:params>
 +                    <service:field>
 +                        <service:table>persons_common</service:table>
 +                        <service:col>inauthority</service:col>
 +                    </service:field>
 +                    <service:field>
 +                        <service:table>persontermgroup</service:table>
 +                        <service:col>termdisplayname</service:col>
 +                    </service:field>
 +                    <service:field>
 +                        <service:table>persons_common</service:table>
 +                        <service:col>shortidentifier</service:col>
 +                    </service:field>
 +                </service:params>
 +            </service:initHandler>
 +            <service:properties xmlns:service="http://collectionspace.org/services/config/service">
 +                <types:item xmlns:types="http://collectionspace.org/services/config/types">
 +                    <types:key>objectNameProperty</types:key>
 +                    <types:value>displayName</types:value>
 +                </types:item>
 +                <types:item xmlns:types="http://collectionspace.org/services/config/types">
 +                    <types:key>objectNumberProperty</types:key>
 +                    <types:value>shortIdentifier</types:value>
 +                </types:item>
 +            </service:properties>
 +            <service:object xmlns:service="http://collectionspace.org/services/config/service" id="1" name="Person" version="0.1">
 +                <service:part id="0" control_group="Managed" versionable="true" auditable="false" label="persons-system" updated="" order="0">
 +                    <service:content contentType="application/xml">
 +                        <service:xmlContent namespaceURI="http://collectionspace.org/services/config/system" schemaLocation="http://collectionspace.org/services/config/system http://collectionspace.org/services/config/system/system-response.xsd" />
 +                    </service:content>
 +                </service:part>
 +                <service:part id="1" control_group="Managed" versionable="true" auditable="false" label="persons_common" updated="" order="1">
 +                    <service:content contentType="application/xml">
 +                        <service:xmlContent namespaceURI="http://collectionspace.org/services/person" schemaLocation="http://collectionspace.org/services/person http://services.collectionspace.org/person/persons_common.xsd" />
 +                    </service:content>
 +                    <service:properties>
                          <!-- See CSPACE-3938 for potential additional authRef and termRef entries -->
 -            <types:item xmlns:types="http://collectionspace.org/services/config/types">
 -              <types:key>authRef</types:key>
 -              <types:value>birthPlace</types:value>
 -            </types:item>
 -            <types:item xmlns:types="http://collectionspace.org/services/config/types">
 -              <types:key>authRef</types:key>
 -              <types:value>deathPlace</types:value>
 -            </types:item>
 -            <!-- Uncomment when Concept authority is implemented in Services -->
 -            <!--
 -            <types:item xmlns:types="http://collectionspace.org/services/config/types">
 -              <types:key>authRef</types:key>
 -              <types:value>groups|group</types:value>
 -            </types:item>
 -            <types:item xmlns:types="http://collectionspace.org/services/config/types">
 -              <types:key>authRef</types:key>
 -              <types:value>nationalities|nationality</types:value>
 -            </types:item>
 -            <types:item xmlns:types="http://collectionspace.org/services/config/types">
 -              <types:key>authRef</types:key>
 -              <types:value>occupations|occupation</types:value>
 -            </types:item>
 -            <types:item xmlns:types="http://collectionspace.org/services/config/types">
 -              <types:key>authRef</types:key>
 -              <types:value>schoolsOrStyles|schoolOrStyle</types:value>
 -            </types:item>
 -            -->
 +                        <types:item xmlns:types="http://collectionspace.org/services/config/types">
 +                            <types:key>authRef</types:key>
 +                            <types:value>birthPlace</types:value>
 +                        </types:item>
 +                        <types:item xmlns:types="http://collectionspace.org/services/config/types">
 +                            <types:key>authRef</types:key>
 +                            <types:value>deathPlace</types:value>
 +                        </types:item>
 +                        <types:item xmlns:types="http://collectionspace.org/services/config/types">
 +                            <types:key>authRef</types:key>
 +                            <types:value>groups|group</types:value>
 +                        </types:item>
 +                        <types:item xmlns:types="http://collectionspace.org/services/config/types">
 +                            <types:key>authRef</types:key>
 +                            <types:value>nationalities|nationality</types:value>
 +                        </types:item>
 +                        <types:item xmlns:types="http://collectionspace.org/services/config/types">
 +                            <types:key>authRef</types:key>
 +                            <types:value>occupations|occupation</types:value>
 +                        </types:item>
 +                        <types:item xmlns:types="http://collectionspace.org/services/config/types">
 +                            <types:key>authRef</types:key>
 +                            <types:value>schoolsOrStyles|schoolOrStyle</types:value>
 +                        </types:item>
                          <!-- Fields containing term list / controlled vocabulary references -->
-                          <types:item xmlns:types="http://collectionspace.org/services/config/types">
 -            <types:item xmlns:types="http://collectionspace.org/services/config/types">
++                        <types:item xmlns:types="http://collectionspace.org/services/config/types">
                              <types:key>termRef</types:key>
 -              <types:value>salutation</types:value>
 -            </types:item>
 -            <types:item xmlns:types="http://collectionspace.org/services/config/types">
 +                            <types:value>personTermGroupList/*/termType</types:value>
 +                        </types:item>
 +                        <types:item xmlns:types="http://collectionspace.org/services/config/types">
                              <types:key>termRef</types:key>
 -              <types:value>title</types:value>
 -            </types:item>
 -            <types:item xmlns:types="http://collectionspace.org/services/config/types">
 +                            <types:value>personTermGroupList/*/termLanguage</types:value>
 +                        </types:item>
 +                        <types:item xmlns:types="http://collectionspace.org/services/config/types">
                              <types:key>termRef</types:key>
 -              <types:value>gender</types:value>
 -            </types:item>
 -            <types:item xmlns:types="http://collectionspace.org/services/config/types">
 +                            <types:value>personTermGroupList/*/termStatus</types:value>
 +                        </types:item>
 +                        <types:item xmlns:types="http://collectionspace.org/services/config/types">
                              <types:key>termRef</types:key>
 -                            <types:value>termStatus</types:value>
 -            </types:item>
 -          </service:properties>
 -        </service:part>
 -        <service:part id="2" control_group="Managed" versionable="true" auditable="false" label="collectionspace_core" updated="" order="2">
 -          <service:content contentType="application/xml">
 -            <service:xmlContent namespaceURI="http://collectionspace.org/collectionspace_core/" schemaLocation="http://collectionspace.org/collectionspace_core/ http://services.collectionspace.org/collectionspace_core.xsd" />
 -          </service:content>
 -        </service:part>
 -      </service:object>
 -    </tenant:serviceBindings>
 +                            <types:value>personTermGroupList/*/salutation</types:value>
 +                        </types:item>
 +                        <types:item xmlns:types="http://collectionspace.org/services/config/types">
 +                            <types:key>termRef</types:key>
 +                            <types:value>personTermGroupList/*/title</types:value>
 +                        </types:item>
 +                        <types:item xmlns:types="http://collectionspace.org/services/config/types">
 +                            <types:key>termRef</types:key>
 +                            <types:value>gender</types:value>
 +                        </types:item>
 +                    </service:properties>
 +                </service:part>
 +                <service:part id="2" control_group="Managed" versionable="true" auditable="false" label="collectionspace_core" updated="" order="2">
 +                    <service:content contentType="application/xml">
 +                        <service:xmlContent namespaceURI="http://collectionspace.org/collectionspace_core/" schemaLocation="http://collectionspace.org/collectionspace_core/ http://services.collectionspace.org/collectionspace_core.xsd" />
 +                    </service:content>
 +                </service:part>
 +            </service:object>
 +        </tenant:serviceBindings>
      <!-- end person service meta-data -->
          
      <!-- begin locationauthority service meta-data -->
@@@ -2936,31 -2291,81 +2957,59 @@@
                      </service:ListResultsFields>
                  </service:params>
              </service:DocHandlerParams>
 -            <service:validatorHandler xmlns:service="http://collectionspace.org/services/config/service">org.collectionspace.services.place.nuxeo.PlaceValidatorHandler</service:validatorHandler>
 -            <service:initHandler xmlns:service="http://collectionspace.org/services/config/service">
 -                <service:classname>org.collectionspace.services.common.init.AddIndices</service:classname>
 -                <service:params>
 -                    <service:field>
 -                        <service:table>places_common</service:table>
 -                        <service:col>inauthority</service:col>
 -                    </service:field>
 -                    <service:field>
 -                        <service:table>places_common</service:table>
 -                        <service:col>displayname</service:col>
 -                    </service:field>
 -                    <service:field>
 -                        <service:table>places_common</service:table>
 -                        <service:col>shortidentifier</service:col>
 -                    </service:field>
 -                </service:params>
 -            </service:initHandler>
 -            <service:properties xmlns:service="http://collectionspace.org/services/config/service">
 -                <types:item xmlns:types="http://collectionspace.org/services/config/types">
 -                    <types:key>objectNameProperty</types:key>
 -                    <types:value>displayName</types:value>
 -                </types:item>
 -                <types:item xmlns:types="http://collectionspace.org/services/config/types">
 -                    <types:key>objectNumberProperty</types:key>
 -                    <types:value>shortIdentifier</types:value>
 -                </types:item>
 -            </service:properties>
 -            <service:object xmlns:service="http://collectionspace.org/services/config/service" id="1" name="Placeitem" version="0.1">
 -                <service:part id="0" control_group="Managed" versionable="true" auditable="false" label="places-system" updated="" order="0">
 +            <service:object xmlns:service="http://collectionspace.org/services/config/service" name="Contact" version="0.1">
 +                <service:part id="0" control_group="Managed" versionable="true" auditable="false" label="contacts-system" updated="" order="0">
                      <service:content contentType="application/xml">
 -                        <service:xmlContent namespaceURI="http://collectionspace.org/services/config/system" schemaLocation="http://collectionspace.org/services/config/system http://collectionspace.org/services/config/system/system-response.xsd"/>
 +                        <service:xmlContent namespaceURI="http://collectionspace.org/services/config/system" schemaLocation="http://collectionspace.org/services/config/system http://collectionspace.org/services/config/system/system-response.xsd" />
                      </service:content>
                  </service:part>
 -                <service:part id="1" control_group="Managed" versionable="true" auditable="false" label="places_common" updated="" order="1">
 -                    <service:properties xmlns:service="http://collectionspace.org/services/config/service">
 +                <service:part id="1" control_group="Managed" versionable="true" auditable="false" label="contacts_common" updated="" order="1">
 +                    <service:properties>
 +                        <!-- Fields containing authority term references -->
                          <types:item xmlns:types="http://collectionspace.org/services/config/types">
                              <types:key>authRef</types:key>
++<<<<<<< HEAD
 +                            <types:value>addressGroupList/*/addressMunicipality</types:value>
++                            =======
+                             <types:value>placeOwnerGroupList/*/owner</types:value>
+                         </types:item>
+                         <types:item xmlns:types="http://collectionspace.org/services/config/types">
+                             <types:key>authRef</types:key>
+                             <types:value>placeGeoRefGroupList/*/geoReferencedBy</types:value>
+                         </types:item>
+                         <types:item xmlns:types="http://collectionspace.org/services/config/types">
+                             <types:key>termRef</types:key>
+                             <types:value>termStatus</types:value>
+                         </types:item>
+                         <types:item xmlns:types="http://collectionspace.org/services/config/types">
+                             <types:key>termRef</types:key>
+                             <types:value>placeType</types:value>
+                         </types:item>
+                         <types:item xmlns:types="http://collectionspace.org/services/config/types">
+                             <types:key>termRef</types:key>
+                             <types:value>placeNameGroupList/*/nameLanguage</types:value>
+                         </types:item>
+                         <types:item xmlns:types="http://collectionspace.org/services/config/types">
+                             <types:key>termRef</types:key>
+                             <types:value>placeNameGroupList/*/nameType</types:value>
+                         </types:item>
+                         <types:item xmlns:types="http://collectionspace.org/services/config/types">
+                             <types:key>termRef</types:key>
+                             <types:value>placeNameGroupList/*/nameStatus</types:value>
++                            >>>>>>> upstream/master
                          </types:item>
                          <types:item xmlns:types="http://collectionspace.org/services/config/types">
 -                            <types:key>termRef</types:key>
 -                            <types:value>placeNameGroupList/*/nameAdminStatus</types:value>
 +                            <types:key>authRef</types:key>
 +                            <types:value>addressGroupList/*/addressStateOrProvince</types:value>
                          </types:item>
                          <types:item xmlns:types="http://collectionspace.org/services/config/types">
 -                            <types:key>termRef</types:key>
 -                            <types:value>vCoordSys</types:value>
 +                            <types:key>authRef</types:key>
 +                            <types:value>addressGroupList/*/addressCountry</types:value>
                          </types:item>
 +                        <!-- Fields containing term list / controlled vocabulary references -->
                          <types:item xmlns:types="http://collectionspace.org/services/config/types">
                              <types:key>termRef</types:key>
 -                            <types:value>vSpatialReferenceSystem</types:value>
 +                            <types:value>emailGroupList/*/emailType</types:value>
                          </types:item>
                          <types:item xmlns:types="http://collectionspace.org/services/config/types">
                              <types:key>termRef</types:key>