]> git.aero2k.de Git - tmp/jakarta-migration.git/commitdiff
projects / tmp / jakarta-migration.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 47a071c)
CSPACE-2501,CSPACE-2451: Added multiple new fields to the CollectionObject schema...
authorAron Roberts <aron@socrates.berkeley.edu>
Wed, 28 Jul 2010 23:12:00 +0000 (23:12 +0000)
committerAron Roberts <aron@socrates.berkeley.edu>
Wed, 28 Jul 2010 23:12:00 +0000 (23:12 +0000)
services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/src/main/resources/OSGI-INF/layouts-contrib.xml patch | blob | history
services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/src/main/resources/schemas/collectionobjects_common.xsd patch | blob | history
services/collectionobject/client/src/test/java/org/collectionspace/services/client/test/CollectionObjectAuthRefsTest.java patch | blob | history
services/collectionobject/client/src/test/resources/test-data/repfield_whitesp1.xml patch | blob | history
services/collectionobject/client/src/test/resources/test-data/repfield_whitesp2.xml patch | blob | history
services/collectionobject/client/src/test/resources/test-data/repfield_whitesp3.xml patch | blob | history
services/collectionobject/client/src/test/resources/test-data/repfield_whitesp4.xml patch | blob | history
services/collectionobject/jaxb/src/main/resources/collectionobjects_common.xsd patch | blob | history
services/common/src/main/config/services/tenant-bindings.xml patch | blob | history

diff --git a/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/src/main/resources/OSGI-INF/layouts-contrib.xml b/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/src/main/resources/OSGI-INF/layouts-contrib.xml
index 11e69e9f2c5331abc196562dc3e6430523fa1b89..0267b47a53dc4407a1826521beabd04259b0bf2d 100644 (file)
--- a/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/src/main/resources/OSGI-INF/layouts-contrib.xml
+++ b/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/src/main/resources/OSGI-INF/layouts-contrib.xml
@@ -13,8 +13,11 @@
         <row><widget>objectNumber</widget></row>
         <row><widget>otherNumber</widget></row>
         <row><widget>otherNumberType</widget></row>
-        <row><widget>briefDescription</widget></row>
-        <row><widget>comments</widget></row>
+        <!-- Repeatable fields are commented out for now until we -->
+        <!-- identify how to represent these complex types in layouts. -->
+        <!-- <row><widget>entryMethod</widget></row> -->
+        <!--<row><widget>briefDescription</widget></row>-->
+        <!--<row><widget>comments</widget></row>-->
         <row><widget>distinguishingFeatures</widget></row>
         <row><widget>numberOfObjects</widget></row>
         
@@ -26,7 +29,7 @@
         <row><widget>objectNameType</widget></row>
         <row><widget>objectNameLanguage</widget></row>
         
-        <row><widget>responsibleDepartment</widget></row>
+        <!--<row><widget>responsibleDepartment</widget></row>-->
         <row><widget>title</widget></row>
         <row><widget>objectTitleLanguage</widget></row>
         <row><widget>titleTranslation</widget></row>
@@ -71,7 +74,7 @@
           <property name="styleClass">dataInputText</property>
         </properties>
       </widget>
-      
+<!--
       <widget name="briefDescription" type="text">
         <labels>
           <label mode="any">briefDescription</label>
@@ -84,8 +87,8 @@
           <property name="styleClass">dataInputText</property>
         </properties>
       </widget>
-      
-      <widget name="comments" type="text">
+
+     <widget name="comments" type="text">
         <labels>
           <label mode="any">comments</label>
         </labels>
@@ -97,6 +100,7 @@
           <property name="styleClass">dataInputText</property>
         </properties>
       </widget>
+-->
 
       <widget name="distinguishingFeatures" type="text">
         <labels>
@@ -123,7 +127,7 @@
           <property name="styleClass">dataInputText</property>
         </properties>
       </widget>
-
+<!--
       <widget name="responsibleDepartment" type="text">
         <labels>
           <label mode="any">responsibleDepartment</label>
@@ -137,6 +141,8 @@
         </properties>
       </widget>
 
+-->
+
       <widget name="title" type="text">
         <labels>
           <label mode="any">title</label>
diff --git a/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/src/main/resources/schemas/collectionobjects_common.xsd b/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/src/main/resources/schemas/collectionobjects_common.xsd
index 5f741a7087bbfbe88a95c0e533f4ab39c651177c..b0c3f0779778a04c1edb58f1b93a06b09d183d0f 100644 (file)
--- a/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/src/main/resources/schemas/collectionobjects_common.xsd
+++ b/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/src/main/resources/schemas/collectionobjects_common.xsd
@@ -47,8 +47,13 @@
             </xs:sequence>\r
         </xs:complexType>\r
     </xs:element>\r
-    \r
-    <xs:element name="comments" type="xs:string"/>\r
+    <xs:element name="comments">\r
+        <xs:complexType>\r
+            <xs:sequence>\r
+                <xs:element name="comment" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>\r
+            </xs:sequence>\r
+        </xs:complexType>\r
+    </xs:element>\r
     <xs:element name="distinguishingFeatures" type="xs:string"/>\r
     <xs:element name="numberOfObjects" type="xs:string"/>\r
     <xs:element name="objectName" type="xs:string"/>\r
@@ -67,168 +72,333 @@
         </xs:complexType>\r
     </xs:element>\r
     <xs:element name="collection" type="xs:string"/>\r
-        <xs:element name="title" type="xs:string"/>\r
-        <xs:element name="titleLanguage" type="xs:string"/>\r
-        <xs:element name="titleTranslation" type="xs:string"/>\r
-        <xs:element name="titleType" type="xs:string"/>\r
-        <xs:element name="recordStatus" type="xs:string"/>\r
-\r
-        <!-- Object Description Information -->\r
-        <xs:element name="age" type="xs:string"/>\r
-        <xs:element name="ageQualifier" type="xs:string"/>\r
-        <xs:element name="ageUnit" type="xs:string"/>\r
-        <xs:element name="color" type="xs:string"/>\r
-\r
-        <!-- Object Description - Content Information -->\r
-        <xs:element name="contentActivity" type="xs:string"/>\r
-        <xs:element name="contentConcept" type="xs:string"/>\r
-        <xs:element name="contentDate" type="xs:string"/>\r
-        <xs:element name="contentDescription" type="xs:string"/>\r
-        <xs:element name="contentEventName" type="xs:string"/>\r
-        <xs:element name="contentEventNameType" type="xs:string"/>\r
-        <xs:element name="contentNote" type="xs:string"/>\r
-        <xs:element name="contentLanguage" type="xs:string"/>\r
-        <xs:element name="contentObject" type="xs:string"/>\r
-        <xs:element name="contentObjectType" type="xs:string"/>\r
-        <xs:element name="contentOrganization" type="xs:string"/>\r
-        <xs:element name="contentOther" type="xs:string"/>\r
-        <xs:element name="contentOtherType" type="xs:string"/>\r
-        <xs:element name="contentPeople" type="xs:string"/>\r
-        <xs:element name="contentPerson" type="xs:string"/>\r
-        <xs:element name="contentPlace" type="xs:string"/>\r
-        <xs:element name="contentPosition" type="xs:string"/>\r
-        <xs:element name="contentScript" type="xs:string"/>\r
-\r
-        <xs:element name="copyNumber" type="xs:string"/>\r
-\r
-        <!-- Object Description - Dimension Information -->\r
-        <xs:element name="dimension" type="xs:string"/>\r
-        <xs:element name="dimensionMeasuredPart" type="xs:string"/>\r
-        <xs:element name="dimensionMeasurementUnit" type="xs:string"/>\r
-        <xs:element name="dimensionValue" type="xs:string"/>\r
-        <xs:element name="dimensionValueDate" type="xs:string"/>\r
-        <xs:element name="dimensionValueQualifier" type="xs:string"/>\r
-\r
-        <xs:element name="editionNumber" type="xs:string"/>\r
-        <xs:element name="form" type="xs:string"/>\r
-\r
-        <!-- Object description Inscription - Content Information -->\r
-        <xs:element name="inscriptionContent" type="xs:string"/>\r
-        <xs:element name="inscriptionContentInscriber" type="xs:string"/>\r
-        <xs:element name="inscriptionContentDate" type="xs:string"/>\r
-        <xs:element name="inscriptionContentInterpretation" type="xs:string"/>\r
-        <xs:element name="inscriptionContentLanguage" type="xs:string"/>\r
-        <xs:element name="inscriptionContentMethod" type="xs:string"/>\r
-        <xs:element name="inscriptionContentPosition" type="xs:string"/>\r
-        <xs:element name="inscriptionContentScript" type="xs:string"/>\r
-        <xs:element name="inscriptionContentTranslation" type="xs:string"/>\r
-        <xs:element name="inscriptionContentTransliteration" type="xs:string"/>\r
-        <xs:element name="inscriptionContentType" type="xs:string"/>\r
-\r
-        <!-- Object Description Inscription - Description Information -->\r
-        <xs:element name="inscriptionDescription" type="xs:string"/>\r
-        <xs:element name="inscriptionDescriptionInscriber" type="xs:string"/>\r
-        <xs:element name="inscriptionDescriptionDate" type="xs:string"/>\r
-        <xs:element name="inscriptionDescriptionInterpretation" type="xs:string"/>\r
-        <xs:element name="inscriptionDescriptionMethod" type="xs:string"/>\r
-        <xs:element name="inscriptionDescriptionPosition" type="xs:string"/>\r
-        <xs:element name="inscriptionDescriptionType" type="xs:string"/>\r
-\r
-        <!-- Object Description Material Information -->\r
-        <xs:element name="material" type="xs:string"/>\r
-        <xs:element name="materialComponent" type="xs:string"/>\r
-        <xs:element name="materialComponentNote" type="xs:string"/>\r
-        <xs:element name="materialName" type="xs:string"/>\r
-        <xs:element name="materialSource" type="xs:string"/>\r
-\r
-        <!-- Misc Object Description Information -->\r
-        <xs:element name="objectStatus" type="xs:string"/>\r
-        <xs:element name="phase" type="xs:string"/>\r
-        <xs:element name="physicalDescription" type="xs:string"/>\r
-        <xs:element name="sex" type="xs:string"/>\r
-        <xs:element name="style" type="xs:string"/>\r
-        <xs:element name="technicalAttribute" type="xs:string"/>\r
-        <xs:element name="technicalAttributeMeasurement" type="xs:string"/>\r
-        <xs:element name="technicalAttributeMeasurementUnit" type="xs:string"/>\r
-        <xs:element name="objectComponentName" type="xs:string"/>\r
-        <xs:element name="objectComponentInformation" type="xs:string"/>\r
-\r
-        <!-- Object Production Information -->\r
-        <xs:element name="objectProductionDate" type="xs:string"/>\r
-        <xs:element name="objectProductionNote" type="xs:string"/>\r
-        <xs:element name="objectProductionOrganization" type="xs:string"/>\r
-        <xs:element name="objectProductionPeople" type="xs:string"/>\r
-        <xs:element name="objectProductionPerson" type="xs:string"/>\r
-        <xs:element name="objectProductionPlace" type="xs:string"/>\r
-        <xs:element name="objectProductionReason" type="xs:string"/>\r
-        <xs:element name="technique" type="xs:string"/>\r
-        <xs:element name="techniqueType" type="xs:string"/>\r
-\r
-        <!-- Object History and Association Information - Association -->\r
-        <xs:element name="associatedActivity" type="xs:string"/>\r
-        <xs:element name="associatedActivityNote" type="xs:string"/>\r
-        <xs:element name="associatedConcept" type="xs:string"/>\r
-        <xs:element name="associatedCulturalAffinity" type="xs:string"/>\r
-        <xs:element name="associatedDate" type="xs:string"/>\r
-        <xs:element name="associatedEventName" type="xs:string"/>\r
-        <xs:element name="associatedEventNameType" type="xs:string"/>\r
-        <xs:element name="associatedEventOrganization" type="xs:string"/>\r
-        <xs:element name="associatedEventPeople" type="xs:string"/>\r
-        <xs:element name="associatedEventPerson" type="xs:string"/>\r
-        <xs:element name="associatedEventPlace" type="xs:string"/>\r
-        <xs:element name="associatedObject" type="xs:string"/>\r
-        <xs:element name="associatedObjectType" type="xs:string"/>\r
-        <xs:element name="associatedOrganization" type="xs:string"/>\r
-        <xs:element name="associatedPeople" type="xs:string"/>\r
-        <xs:element name="associatedPerson" type="xs:string"/>\r
-        <xs:element name="associatedPlace" type="xs:string"/>\r
-        <xs:element name="associationNote" type="xs:string"/>\r
-        <xs:element name="associationType" type="xs:string"/>\r
-\r
-        <!-- Object History and Association Information - History -->\r
-        <xs:element name="objectHistoryNote" type="xs:string"/>\r
-        <xs:element name="owner" type="xs:string"/>\r
-        <xs:element name="ownershipAccess" type="xs:string"/>\r
-        <xs:element name="ownershipCategory" type="xs:string"/>\r
-        <xs:element name="ownershipDates" type="xs:string"/>\r
-        <xs:element name="ownershipExchangeMethod" type="xs:string"/>\r
-        <xs:element name="ownershipExchangeNote" type="xs:string"/>\r
-        <xs:element name="ownershipExchangePriceCurrency" type="xs:string"/>\r
-        <xs:element name="ownershipExchangePriceValue" type="xs:string"/>\r
-        <xs:element name="ownershipPlace" type="xs:string"/>\r
-        <xs:element name="usage" type="xs:string"/>\r
-        <xs:element name="usageNote" type="xs:string"/>\r
-\r
-        <!-- Object Owner's Contribution Information -->\r
-        <xs:element name="ownersPersonalExperience" type="xs:string"/>\r
-        <xs:element name="ownersPersonalResponse" type="xs:string"/>\r
-        <xs:element name="ownersReference" type="xs:string"/>\r
-        <xs:element name="ownersContributionNote" type="xs:string"/>\r
-\r
-        <!-- Object Viewers Contribution Information -->\r
-        <xs:element name="viewersRole" type="xs:string"/>\r
-        <xs:element name="viewersPersonalExperience" type="xs:string"/>\r
-        <xs:element name="viewersPersonalResponse" type="xs:string"/>\r
-        <xs:element name="viewersReference" type="xs:string"/>\r
-        <xs:element name="viewersContributionNote" type="xs:string"/>\r
-\r
-        <!-- Reference Information -->\r
-        <xs:element name="reference" type="xs:string"/>\r
-        <xs:element name="catalogNumber" type="xs:string"/>\r
-\r
-        <!-- Object Collection Information -->\r
-        <xs:element name="fieldCollectionEventName" type="xs:string"/>\r
-\r
-        <!-- Object Description Date Information -->\r
-        <!-- This appears to be a placeholder structured date -->\r
-        <xs:element name="dateAssociation" type="xs:string"/>\r
-        <xs:element name="dateEarliestSingle" type="xs:string"/>\r
-        <xs:element name="dateEarliestSingleCertainty" type="xs:string"/>\r
-        <xs:element name="dateEarliestSingleQualifier" type="xs:string"/>\r
-        <xs:element name="dateLatest" type="xs:string"/>\r
-        <xs:element name="dateLatestCertainty" type="xs:string"/>\r
-        <xs:element name="dateLatestQualifier" type="xs:string"/>\r
-        <xs:element name="datePeriod" type="xs:string"/>\r
-        <xs:element name="dateText" type="xs:string"/>\r
+    <xs:element name="title" type="xs:string"/>\r
+    <xs:element name="titleLanguage" type="xs:string"/>\r
+    <xs:element name="titleTranslation" type="xs:string"/>\r
+    <xs:element name="titleType" type="xs:string"/>\r
+    <xs:element name="recordStatus" type="xs:string"/>\r
+\r
+    <!-- Object Description Information -->\r
+    <xs:element name="age" type="xs:string"/>\r
+    <xs:element name="ageQualifier" type="xs:string"/>\r
+    <xs:element name="ageUnit" type="xs:string"/>\r
+    <xs:element name="colors">\r
+        <xs:complexType>\r
+            <xs:sequence>\r
+                <xs:element name="color" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>\r
+            </xs:sequence>\r
+        </xs:complexType>\r
+    </xs:element>\r
+\r
+    <!-- Object Description - Content Information -->\r
+    <xs:element name="contentActivities">\r
+        <xs:complexType>\r
+            <xs:sequence>\r
+                <xs:element name="contentActivity" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>\r
+            </xs:sequence>\r
+        </xs:complexType>\r
+    </xs:element>\r
+    <xs:element name="contentConcepts">\r
+        <xs:complexType>\r
+            <xs:sequence>\r
+                <xs:element name="contentConcept" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>\r
+            </xs:sequence>\r
+        </xs:complexType>\r
+    </xs:element>\r
+    <xs:element name="contentDate" type="xs:string"/>\r
+    <xs:element name="contentDescription" type="xs:string"/>\r
+    <xs:element name="contentEventName" type="xs:string"/>\r
+    <xs:element name="contentEventNameType" type="xs:string"/>\r
+    <xs:element name="contentNote" type="xs:string"/>\r
+    <xs:element name="contentLanguages">\r
+        <xs:complexType>\r
+            <xs:sequence>\r
+                <xs:element name="contentLanguage" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>\r
+            </xs:sequence>\r
+        </xs:complexType>\r
+    </xs:element>\r
+    <xs:element name="contentObject" type="xs:string"/>\r
+    <xs:element name="contentObjectType" type="xs:string"/>\r
+    <xs:element name="contentOrganizations">\r
+        <xs:complexType>\r
+            <xs:sequence>\r
+                <xs:element name="contentOrganization" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>\r
+            </xs:sequence>\r
+        </xs:complexType>\r
+    </xs:element>\r
+    <xs:element name="contentOther" type="xs:string"/>\r
+    <xs:element name="contentOtherType" type="xs:string"/>\r
+    <xs:element name="contentPeoples">\r
+        <xs:complexType>\r
+            <xs:sequence>\r
+                <xs:element name="contentPeople" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>\r
+            </xs:sequence>\r
+        </xs:complexType>\r
+    </xs:element>\r
+    <xs:element name="contentPersons">\r
+        <xs:complexType>\r
+            <xs:sequence>\r
+                <xs:element name="contentPerson" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>\r
+            </xs:sequence>\r
+        </xs:complexType>\r
+    </xs:element>\r
+    <xs:element name="contentPlaces">\r
+        <xs:complexType>\r
+            <xs:sequence>\r
+                <xs:element name="contentPlace" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>\r
+            </xs:sequence>\r
+        </xs:complexType>\r
+    </xs:element>\r
+    <xs:element name="contentPosition" type="xs:string"/>\r
+    <xs:element name="contentScripts">\r
+        <xs:complexType>\r
+            <xs:sequence>\r
+                <xs:element name="contentScript" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>\r
+            </xs:sequence>\r
+        </xs:complexType>\r
+    </xs:element>\r
+\r
+    <xs:element name="copyNumber" type="xs:string"/>\r
+\r
+    <!-- Object Description - Dimension Information -->\r
+    <xs:element name="dimension" type="xs:string"/>\r
+    <xs:element name="dimensionMeasuredPart" type="xs:string"/>\r
+    <xs:element name="dimensionMeasurementUnit" type="xs:string"/>\r
+    <xs:element name="dimensionValue" type="xs:string"/>\r
+    <xs:element name="dimensionValueDate" type="xs:string"/>\r
+    <xs:element name="dimensionValueQualifier" type="xs:string"/>\r
+\r
+    <xs:element name="editionNumber" type="xs:string"/>\r
+    <xs:element name="forms">\r
+        <xs:complexType>\r
+            <xs:sequence>\r
+                <xs:element name="form" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>\r
+            </xs:sequence>\r
+        </xs:complexType>\r
+    </xs:element>\r
+\r
+    <!-- Object description Inscription - Content Information -->\r
+    <xs:element name="inscriptionContent" type="xs:string"/>\r
+    <xs:element name="inscriptionContentInscriber" type="xs:string"/>\r
+    <xs:element name="inscriptionContentDate" type="xs:string"/>\r
+    <xs:element name="inscriptionContentInterpretation" type="xs:string"/>\r
+    <xs:element name="inscriptionContentLanguage" type="xs:string"/>\r
+    <xs:element name="inscriptionContentMethod" type="xs:string"/>\r
+    <xs:element name="inscriptionContentPosition" type="xs:string"/>\r
+    <xs:element name="inscriptionContentScript" type="xs:string"/>\r
+    <xs:element name="inscriptionContentTranslation" type="xs:string"/>\r
+    <xs:element name="inscriptionContentTransliteration" type="xs:string"/>\r
+    <xs:element name="inscriptionContentType" type="xs:string"/>\r
+\r
+    <!-- Object Description Inscription - Description Information -->\r
+    <xs:element name="inscriptionDescription" type="xs:string"/>\r
+    <xs:element name="inscriptionDescriptionInscriber" type="xs:string"/>\r
+    <xs:element name="inscriptionDescriptionDate" type="xs:string"/>\r
+    <xs:element name="inscriptionDescriptionInterpretation" type="xs:string"/>\r
+    <xs:element name="inscriptionDescriptionMethod" type="xs:string"/>\r
+    <xs:element name="inscriptionDescriptionPosition" type="xs:string"/>\r
+    <xs:element name="inscriptionDescriptionType" type="xs:string"/>\r
+\r
+    <!-- Object Description Material Information -->\r
+    <xs:element name="material" type="xs:string"/>\r
+    <xs:element name="materialComponent" type="xs:string"/>\r
+    <xs:element name="materialComponentNote" type="xs:string"/>\r
+    <xs:element name="materialName" type="xs:string"/>\r
+    <xs:element name="materialSource" type="xs:string"/>\r
+\r
+    <!-- Misc Object Description Information -->\r
+    <xs:element name="objectStatus" type="xs:string"/>\r
+    <xs:element name="phase" type="xs:string"/>\r
+    <xs:element name="physicalDescription" type="xs:string"/>\r
+    <xs:element name="sex" type="xs:string"/>\r
+    <xs:element name="styles">\r
+        <xs:complexType>\r
+            <xs:sequence>\r
+                <xs:element name="style" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>\r
+            </xs:sequence>\r
+        </xs:complexType>\r
+    </xs:element>\r
+    <xs:element name="technicalAttribute" type="xs:string"/>\r
+    <xs:element name="technicalAttributeMeasurement" type="xs:string"/>\r
+    <xs:element name="technicalAttributeMeasurementUnit" type="xs:string"/>\r
+    <xs:element name="objectComponentName" type="xs:string"/>\r
+    <xs:element name="objectComponentInformation" type="xs:string"/>\r
+\r
+    <!-- Object Production Information -->\r
+    <xs:element name="objectProductionDate" type="xs:string"/>\r
+    <xs:element name="objectProductionNote" type="xs:string"/>\r
+    <xs:element name="objectProductionOrganization" type="xs:string"/>\r
+    <xs:element name="objectProductionOrganizationRole" type="xs:string"/>\r
+    <xs:element name="objectProductionPeople" type="xs:string"/>\r
+    <xs:element name="objectProductionPeopleRole" type="xs:string"/>\r
+    <xs:element name="objectProductionPerson" type="xs:string"/>\r
+    <xs:element name="objectProductionPersonRole" type="xs:string"/>\r
+    <xs:element name="objectProductionPlace" type="xs:string"/>\r
+    <xs:element name="objectProductionPlaceRole" type="xs:string"/>\r
+    <xs:element name="objectProductionReason" type="xs:string"/>\r
+    <xs:element name="technique" type="xs:string"/>\r
+    <xs:element name="techniqueType" type="xs:string"/>\r
+\r
+    <!-- Object History and Association Information - Association -->\r
+\r
+    <!-- In the following field names, "assoc" is an abbreviation for "association". -->\r
+    <!-- See the comments to CSPACE-2501 for a discussion of the database identifier -->\r
+    <!-- length limit that made this abbreviation necessary. -->\r
+    <xs:element name="assocActivity" type="xs:string"/>\r
+    <xs:element name="assocActivityNote" type="xs:string"/>\r
+    <xs:element name="assocConcepts">\r
+        <xs:complexType>\r
+            <xs:sequence>\r
+                <xs:element name="assocConcept" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>\r
+            </xs:sequence>\r
+        </xs:complexType>\r
+    </xs:element>\r
+    <xs:element name="assocCulturalContexts">\r
+        <xs:complexType>\r
+            <xs:sequence>\r
+                <xs:element name="assocCulturalContext" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>\r
+            </xs:sequence>\r
+        </xs:complexType>\r
+    </xs:element>\r
+    <xs:element name="assocDate" type="xs:string"/>\r
+    <xs:element name="assocEventName" type="xs:string"/>\r
+    <xs:element name="assocEventNameType" type="xs:string"/>\r
+    <xs:element name="assocEventOrganizations">\r
+        <xs:complexType>\r
+            <xs:sequence>\r
+                <xs:element name="assocEventOrganization" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>\r
+            </xs:sequence>\r
+        </xs:complexType>\r
+    </xs:element>\r
+    <xs:element name="assocEventPeoples">\r
+        <xs:complexType>\r
+            <xs:sequence>\r
+                <xs:element name="assocEventPeople" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>\r
+            </xs:sequence>\r
+        </xs:complexType>\r
+    </xs:element>\r
+    <xs:element name="assocEventPersons">\r
+        <xs:complexType>\r
+            <xs:sequence>\r
+                <xs:element name="assocEventPerson" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>\r
+            </xs:sequence>\r
+        </xs:complexType>\r
+    </xs:element>\r
+    <xs:element name="assocEventPlaces">\r
+        <xs:complexType>\r
+            <xs:sequence>\r
+                <xs:element name="assocEventPlace" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>\r
+            </xs:sequence>\r
+        </xs:complexType>\r
+    </xs:element>\r
+    <xs:element name="assocObject" type="xs:string"/>\r
+    <xs:element name="assocObjectType" type="xs:string"/>\r
+    <xs:element name="assocOrganizations">\r
+        <xs:complexType>\r
+            <xs:sequence>\r
+                <xs:element name="assocOrganization" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>\r
+            </xs:sequence>\r
+        </xs:complexType>\r
+    </xs:element>\r
+    <xs:element name="assocPeoples">\r
+        <xs:complexType>\r
+            <xs:sequence>\r
+                <xs:element name="assocPeople" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>\r
+            </xs:sequence>\r
+        </xs:complexType>\r
+    </xs:element>\r
+    <xs:element name="assocPersons">\r
+        <xs:complexType>\r
+            <xs:sequence>\r
+                <xs:element name="assocPerson" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>\r
+            </xs:sequence>\r
+        </xs:complexType>\r
+    </xs:element>\r
+    <xs:element name="assocPlaces">\r
+        <xs:complexType>\r
+            <xs:sequence>\r
+                <xs:element name="assocPlace" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>\r
+            </xs:sequence>\r
+        </xs:complexType>\r
+    </xs:element>\r
+    <xs:element name="associationNote" type="xs:string"/>\r
+    <xs:element name="associationType" type="xs:string"/>\r
+\r
+    <!-- Object History and Association Information - History -->\r
+    <xs:element name="objectHistoryNote" type="xs:string"/>\r
+    <xs:element name="owners">\r
+        <xs:complexType>\r
+            <xs:sequence>\r
+                <xs:element name="owner" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>\r
+            </xs:sequence>\r
+        </xs:complexType>\r
+    </xs:element>\r
+    <xs:element name="ownershipAccess" type="xs:string"/>\r
+    <xs:element name="ownershipCategory" type="xs:string"/>\r
+    <xs:element name="ownershipDates" type="xs:string"/>\r
+    <xs:element name="ownershipExchangeMethod" type="xs:string"/>\r
+    <xs:element name="ownershipExchangeNote" type="xs:string"/>\r
+    <xs:element name="ownershipExchangePriceCurrency" type="xs:string"/>\r
+    <xs:element name="ownershipExchangePriceValue" type="xs:string"/>\r
+    <xs:element name="ownershipPlace" type="xs:string"/>\r
+    <xs:element name="usage" type="xs:string"/>\r
+    <xs:element name="usageNote" type="xs:string"/>\r
+\r
+    <!-- Object Owner's Contribution Information -->\r
+    <xs:element name="ownersPersonalExperience" type="xs:string"/>\r
+    <xs:element name="ownersPersonalResponse" type="xs:string"/>\r
+    <xs:element name="ownersReference" type="xs:string"/>\r
+    <xs:element name="ownersContributionNote" type="xs:string"/>\r
+\r
+    <!-- Object Viewers Contribution Information -->\r
+    <xs:element name="viewersRole" type="xs:string"/>\r
+    <xs:element name="viewersPersonalExperience" type="xs:string"/>\r
+    <xs:element name="viewersPersonalResponse" type="xs:string"/>\r
+    <xs:element name="viewersReference" type="xs:string"/>\r
+    <xs:element name="viewersContributionNote" type="xs:string"/>\r
+\r
+    <!-- Reference Information -->\r
+    <xs:element name="reference" type="xs:string"/>\r
+    <xs:element name="catalogNumber" type="xs:string"/>\r
+\r
+    <!--  Object Collection Information Group -->\r
+    <xs:element name="fieldCollectionDate" type="xs:string"/>\r
+    <xs:element name="fieldCollectionMethods">\r
+        <xs:complexType>\r
+            <xs:sequence>\r
+                <xs:element name="fieldCollectionMethod" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>\r
+            </xs:sequence>\r
+        </xs:complexType>\r
+    </xs:element>\r
+    <xs:element name="fieldCollectionNote" type="xs:string"/>\r
+    <xs:element name="fieldCollectionNumber" type="xs:string"/>\r
+    <xs:element name="fieldCollectionPlace" type="xs:string"/>\r
+    <xs:element name="fieldCollectionSources">\r
+        <xs:complexType>\r
+            <xs:sequence>\r
+                <xs:element name="fieldCollectionSource" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>\r
+            </xs:sequence>\r
+        </xs:complexType>\r
+    </xs:element>\r
+    <xs:element name="fieldCollectors">\r
+        <xs:complexType>\r
+            <xs:sequence>\r
+                <xs:element name="fieldCollector" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>\r
+            </xs:sequence>\r
+        </xs:complexType>\r
+    </xs:element>\r
+    <xs:element name="fieldCollectionEventName" type="xs:string"/>\r
+\r
+    <!-- Object Description Date Information -->\r
+    <!-- This appears to be a placeholder structured date -->\r
+    <xs:element name="dateAssociation" type="xs:string"/>\r
+    <xs:element name="dateEarliestSingle" type="xs:string"/>\r
+    <xs:element name="dateEarliestSingleCertainty" type="xs:string"/>\r
+    <xs:element name="dateEarliestSingleQualifier" type="xs:string"/>\r
+    <xs:element name="dateLatest" type="xs:string"/>\r
+    <xs:element name="dateLatestCertainty" type="xs:string"/>\r
+    <xs:element name="dateLatestQualifier" type="xs:string"/>\r
+    <xs:element name="datePeriod" type="xs:string"/>\r
+    <xs:element name="dateText" type="xs:string"/>\r
 \r
 </xs:schema>\r
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 19b7dd9ffde977f3bf49fc4594762a226c9b0c36..13db2d40b26be99114d003c79a93634f76ba24f0 100644 (file)
--- 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
@@ -39,7 +39,16 @@ import org.collectionspace.services.client.OrgAuthorityClientUtils;
 import org.collectionspace.services.client.PersonAuthorityClient;
 import org.collectionspace.services.client.PersonAuthorityClientUtils;
 import org.collectionspace.services.common.authorityref.AuthorityRefList;
+import org.collectionspace.services.collectionobject.AssocEventOrganizationList;
+import org.collectionspace.services.collectionobject.AssocEventPersonList;
+import org.collectionspace.services.collectionobject.AssocOrganizationList;
+import org.collectionspace.services.collectionobject.AssocPersonList;
 import org.collectionspace.services.collectionobject.CollectionobjectsCommon;
+import org.collectionspace.services.collectionobject.ContentOrganizationList;
+import org.collectionspace.services.collectionobject.ContentPersonList;
+import org.collectionspace.services.collectionobject.FieldCollectionSourceList;
+import org.collectionspace.services.collectionobject.FieldCollectorList;
+import org.collectionspace.services.collectionobject.OwnerList;
 import org.collectionspace.services.jaxb.AbstractCommonList;
 
 import org.jboss.resteasy.client.ClientResponse;
@@ -97,25 +106,20 @@ public class CollectionObjectAuthRefsTest extends BaseServiceTest {
     private String orgAuthCSID = null;
     private String orgAuthRefName = null;
     
-    /** The content organization ref name. */
     private String contentOrganizationRefName = null;
-        
-    /** The content person ref name. */
     private String contentPersonRefName = null;
-    
-    /** The inscriber ref names. */
     private String contentInscriberRefName = null;
     private String descriptionInscriberRefName = null;
-
-    /** The object history and association ref names. */
-    private String associatedEventOrganizationRefName = null;
-    private String associatedEventPersonRefName = null;
-    private String associatedOrganizationRefName = null;
-    private String associatedPersonRefName = null;
+    private String assocEventOrganizationRefName = null;
+    private String assocEventPersonRefName = null;
+    private String assocOrganizationRefName = null;
+    private String assocPersonRefName = null;
     private String ownerRefName = null;
+    private String fieldCollectionSourceRefName = null;
+    private String fieldCollectorRefName = null;
 
     /** The number of authority references expected. */
-    private final int NUM_AUTH_REFS_EXPECTED = 9;
+    private final int NUM_AUTH_REFS_EXPECTED = 11;
 
     /* (non-Javadoc)
      * @see org.collectionspace.services.client.test.BaseServiceTest#getClientInstance()
@@ -169,11 +173,13 @@ public class CollectionObjectAuthRefsTest extends BaseServiceTest {
                 contentPersonRefName,
                 contentInscriberRefName,
                 descriptionInscriberRefName,
-                associatedEventOrganizationRefName,
-                associatedEventPersonRefName,
-                associatedOrganizationRefName,
-                associatedPersonRefName,
-                ownerRefName
+                assocEventOrganizationRefName,
+                assocEventPersonRefName,
+                assocOrganizationRefName,
+                assocPersonRefName,
+                ownerRefName,
+                fieldCollectionSourceRefName,
+                fieldCollectorRefName
             );
 
         // Submit the request to the service and store the response.
@@ -279,16 +285,24 @@ public class CollectionObjectAuthRefsTest extends BaseServiceTest {
         personIdsCreated.add(csid);
 
         csid = createPerson("Asok", "AssociatedEventPerson", "asokAssociatedEventPerson");
-        associatedEventPersonRefName = PersonAuthorityClientUtils.getPersonRefName(personAuthCSID, csid, null);
+        assocEventPersonRefName = PersonAuthorityClientUtils.getPersonRefName(personAuthCSID, csid, null);
         personIdsCreated.add(csid);
         
         csid = createPerson("Andrew", "AssociatedPerson", "andrewAssociatedPerson");
-        associatedPersonRefName = PersonAuthorityClientUtils.getPersonRefName(personAuthCSID, csid, null);
+        assocPersonRefName = PersonAuthorityClientUtils.getPersonRefName(personAuthCSID, csid, null);
         personIdsCreated.add(csid);
 
         csid = createPerson("Owen", "Owner", "owenOwner");
         ownerRefName = PersonAuthorityClientUtils.getPersonRefName(personAuthCSID, csid, null);
         personIdsCreated.add(csid);
+
+        csid = createPerson("Sally", "Field-CollectionSource", "sallyFieldCollectionSource");
+        fieldCollectionSourceRefName = PersonAuthorityClientUtils.getPersonRefName(personAuthCSID, csid, null);
+        personIdsCreated.add(csid);
+
+        csid = createPerson("Fred", "Lector", "fredLector");
+        fieldCollectorRefName = PersonAuthorityClientUtils.getPersonRefName(personAuthCSID, csid, null);
+        personIdsCreated.add(csid);
     }
     
     /**
@@ -353,11 +367,11 @@ public class CollectionObjectAuthRefsTest extends BaseServiceTest {
         orgIdsCreated.add(csid);
 
         csid = createOrganization("Associated Event Org", "Associated Event Org City", "associatedEventOrg");
-        associatedEventOrganizationRefName = OrgAuthorityClientUtils.getOrgRefName(orgAuthCSID, csid, null);
+        assocEventOrganizationRefName = OrgAuthorityClientUtils.getOrgRefName(orgAuthCSID, csid, null);
         orgIdsCreated.add(csid);
 
         csid = createOrganization("Associated Org", "Associated Org City", "associatedOrg");
-        associatedOrganizationRefName = OrgAuthorityClientUtils.getOrgRefName(orgAuthCSID, csid, null);
+        assocOrganizationRefName = OrgAuthorityClientUtils.getOrgRefName(orgAuthCSID, csid, null);
         orgIdsCreated.add(csid);
     }
 
@@ -400,12 +414,13 @@ public class CollectionObjectAuthRefsTest extends BaseServiceTest {
 
         // Check a sample of one or more person authority ref fields
         Assert.assertEquals(collectionObject.getInscriptionContentInscriber(), contentInscriberRefName);
-        Assert.assertEquals(collectionObject.getAssociatedPerson(), associatedPersonRefName);
-        Assert.assertEquals(collectionObject.getOwner(), ownerRefName);
+        Assert.assertEquals(collectionObject.getAssocPersons().getAssocPerson().get(0), assocPersonRefName);
+        Assert.assertEquals(collectionObject.getOwners().getOwner().get(0), ownerRefName);
+        Assert.assertEquals(collectionObject.getFieldCollectionSources().getFieldCollectionSource().get(0), fieldCollectionSourceRefName);
 
         // Check a sample of one or more organization authority ref fields
-        Assert.assertEquals(collectionObject.getContentOrganization(), contentOrganizationRefName);
-        Assert.assertEquals(collectionObject.getAssociatedEventOrganization(), associatedEventOrganizationRefName);
+        Assert.assertEquals(collectionObject.getContentOrganizations().getContentOrganization().get(0), contentOrganizationRefName);
+        Assert.assertEquals(collectionObject.getAssocEventOrganizations().getAssocEventOrganization().get(0), assocEventOrganizationRefName);
 
         // Get all of the auth refs and check that the expected number is returned
         ClientResponse<AuthorityRefList> res2 = collectionObjectClient.getAuthorityRefs(knownResourceId);
@@ -524,23 +539,64 @@ public class CollectionObjectAuthRefsTest extends BaseServiceTest {
                 String contentPerson,
                 String contentInscriber,
                 String descriptionInscriber,
-                String associatedEventOrganization,
-                String associatedEventPerson,
-                String associatedOrganization,
-                String associatedPerson,
-                String owner ) {
+                String assocEventOrganization,
+                String assocEventPerson,
+                String assocOrganization,
+                String assocPerson,
+                String owner,
+                String fieldCollectionSource,
+                String fieldCollector ) {
         CollectionobjectsCommon collectionObject = new CollectionobjectsCommon();
         collectionObject.setTitle(title);
         collectionObject.setObjectNumber(objNum);
-        collectionObject.setContentOrganization(contentOrganization);
-        collectionObject.setContentPerson(contentPerson);
         collectionObject.setInscriptionContentInscriber(contentInscriber);
         collectionObject.setInscriptionDescriptionInscriber(descriptionInscriber);
-        collectionObject.setAssociatedEventOrganization(associatedEventOrganization);
-        collectionObject.setAssociatedEventPerson(associatedEventPerson);
-        collectionObject.setAssociatedOrganization(associatedOrganization);
-        collectionObject.setAssociatedPerson(associatedPerson);
-        collectionObject.setOwner(owner);
+
+        ContentOrganizationList contentOrganizationList = new ContentOrganizationList();
+        List<String> contentOrganizations = contentOrganizationList.getContentOrganization();
+        contentOrganizations.add(contentOrganization);
+        collectionObject.setContentOrganizations(contentOrganizationList);
+
+        ContentPersonList contentPersonList = new ContentPersonList();
+        List<String> contentPersons = contentPersonList.getContentPerson();
+        contentPersons.add(contentPerson);
+        collectionObject.setContentPersons(contentPersonList);
+
+        AssocEventOrganizationList assocEventOrganizationList = new AssocEventOrganizationList();
+        List<String> assocEventOrganizations = assocEventOrganizationList.getAssocEventOrganization();
+        assocEventOrganizations.add(assocEventOrganization);
+        collectionObject.setAssocEventOrganizations(assocEventOrganizationList);
+
+        AssocEventPersonList assocEventPersonList = new AssocEventPersonList();
+        List<String> assocEventPersons = assocEventPersonList.getAssocEventPerson();
+        assocEventPersons.add(assocEventPerson);
+        collectionObject.setAssocEventPersons(assocEventPersonList);
+
+        AssocOrganizationList assocOrganizationList = new AssocOrganizationList();
+        List<String> assocOrganizations = assocOrganizationList.getAssocOrganization();
+        assocOrganizations.add(assocOrganization);
+        collectionObject.setAssocOrganizations(assocOrganizationList);
+
+        AssocPersonList assocPersonList = new AssocPersonList();
+        List<String> assocPersons = assocPersonList.getAssocPerson();
+        assocPersons.add(assocPerson);
+        collectionObject.setAssocPersons(assocPersonList);
+        
+        OwnerList ownerList = new OwnerList();
+        List<String> owners = ownerList.getOwner();
+        owners.add(owner);
+        collectionObject.setOwners(ownerList);
+        
+        FieldCollectionSourceList fieldCollectionSourceList = new FieldCollectionSourceList();
+        List<String> fieldCollectionSources = fieldCollectionSourceList.getFieldCollectionSource();
+        fieldCollectionSources.add(fieldCollectionSource);
+        collectionObject.setFieldCollectionSources(fieldCollectionSourceList);
+        
+        FieldCollectorList FieldCollectorList = new FieldCollectorList();
+        List<String> fieldCollectors = FieldCollectorList.getFieldCollector();
+        fieldCollectors.add(fieldCollector);
+        collectionObject.setFieldCollectors(FieldCollectorList);
+
         MultipartOutput multipart = new MultipartOutput();
         OutputPart commonPart =
             multipart.addPart(collectionObject, MediaType.APPLICATION_XML_TYPE);
diff --git a/services/collectionobject/client/src/test/resources/test-data/repfield_whitesp1.xml b/services/collectionobject/client/src/test/resources/test-data/repfield_whitesp1.xml
index d2946dba821e70539edcdbd58e715c1d72e613d8..5660ba962e7f9f54b562de3963b7cb4f80778b33 100644 (file)
--- a/services/collectionobject/client/src/test/resources/test-data/repfield_whitesp1.xml
+++ b/services/collectionobject/client/src/test/resources/test-data/repfield_whitesp1.xml
@@ -5,7 +5,6 @@
 <otherNumber>XXX</otherNumber>
 <otherNumberType>otherNumberType</otherNumberType>
 <briefDescriptions> <briefDescription> briefDescription</briefDescription></briefDescriptions>
-<comments>comments</comments>
 <distinguishingFeatures>distFeatures</distinguishingFeatures>
 <numberOfObjects>numberOfObjects</numberOfObjects>
 <objectName>objectName</objectName>
@@ -19,80 +18,4 @@
 <!-- test whitespace as first child node -->
 <responsibleDepartments> <responsibleDepartment> responsibleDept1</responsibleDepartment><responsibleDepartment>responsibleDept2</responsibleDepartment></responsibleDepartments>
 <title>title</title>
-<titleLanguage>titleLanguage</titleLanguage>
-<titleTranslation>titleTranslation</titleTranslation>
-<titleType>titleType</titleType>
-<age>age</age>
-<ageQualifier>ageQualifier</ageQualifier>
-<ageUnit>ageUnit</ageUnit>
-<color>color</color>
-<contentActivity>contentActivity</contentActivity>
-<contentConcept>contentConcept</contentConcept>
-<contentDate>XXX</contentDate>
-<contentDescription>contentDescription</contentDescription>
-<contentEventName>contentEventName</contentEventName>
-<contentEventNameType>contentEventNameType</contentEventNameType>
-<contentNote>contentNote</contentNote>
-<contentLanguage>contentLanguage</contentLanguage>
-<contentObject>contentObject</contentObject>
-<contentObjectType>contentObjectType</contentObjectType>
-<contentOrganization>contentOrganization</contentOrganization>
-<contentOther>contentOther</contentOther>
-<contentOtherType>contentOtherType</contentOtherType>
-<contentPeople>contentPeople</contentPeople>
-<contentPerson>contentPerson</contentPerson>
-<contentPlace>contentPlace</contentPlace>
-<contentPosition>contentPosition</contentPosition>
-<contentScript>XXX</contentScript>
-<copyNumber>copyNumber</copyNumber>
-<dimension>dimension</dimension>
-<dimensionMeasuredPart>dimensionMeasuredPart</dimensionMeasuredPart>
-<dimensionMeasurementUnit>dimensionMeasurementUnit</dimensionMeasurementUnit>
-<dimensionValue>dimensionValue</dimensionValue>
-<dimensionValueDate>XXX</dimensionValueDate>
-<dimensionValueQualifier>dimensionValueQualifier</dimensionValueQualifier>
-<editionNumber>editionNumber</editionNumber>
-<form>form</form>
-<inscriptionContent>inscriptionContent</inscriptionContent>
-<inscriptionContentInscriber>inscriptionContentInscriber</inscriptionContentInscriber>
-<inscriptionContentDate>inscriptionContentDate</inscriptionContentDate>
-<inscriptionContentInterpretation>inscriptionContentInterpretation</inscriptionContentInterpretation>
-<inscriptionContentLanguage>inscriptionContentLanguage</inscriptionContentLanguage>
-<inscriptionContentMethod>inscriptionContentMethod</inscriptionContentMethod>
-<inscriptionContentPosition>inscriptionContentPosition</inscriptionContentPosition>
-<inscriptionContentScript>inscriptionContentScript</inscriptionContentScript>
-<inscriptionContentTranslation>inscriptionContentTranslation</inscriptionContentTranslation>
-<inscriptionContentTransliteration>inscriptionContentTransliteration</inscriptionContentTransliteration>
-<inscriptionContentType>inscriptionContentType</inscriptionContentType>
-<inscriptionDescription>inscriptionDescription</inscriptionDescription>
-<inscriptionDescriptionInscriber>inscriptionDescriptionInscriber</inscriptionDescriptionInscriber>
-<inscriptionDescriptionDate>inscriptionDescriptionDate</inscriptionDescriptionDate>
-<inscriptionDescriptionInterpretation>inscriptionDescriptionInterpretation</inscriptionDescriptionInterpretation>
-<inscriptionDescriptionMethod>inscriptionDescriptionMethod</inscriptionDescriptionMethod>
-<inscriptionDescriptionPosition>inscriptionDescriptionPosition</inscriptionDescriptionPosition>
-<inscriptionDescriptionType>inscriptionDescriptionType</inscriptionDescriptionType>
-<material>material</material>
-<materialComponent>materialComponent</materialComponent>
-<materialComponentNote>materialComponentNote</materialComponentNote>
-<materialName>materialName</materialName>
-<materialSource>materialSource</materialSource>
-<objectStatus>objectStatus</objectStatus>
-<phase>phase</phase>
-<physicalDescription>physicalDescription</physicalDescription>
-<sex>sex</sex>
-<style>style</style>
-<technicalAttribute>technicalAttribute</technicalAttribute>
-<technicalAttributeMeasurement>technicalAttributeMeasurement</technicalAttributeMeasurement>
-<technicalAttributeMeasurementUnit>technicalAttributeMeasurementUnit</technicalAttributeMeasurementUnit>
-<objectComponentName>objectComponentName</objectComponentName>
-<objectComponentInformation>objectComponentInformation</objectComponentInformation>
-<dateAssociation>dateAssociation</dateAssociation>
-<dateEarliestSingle>{"level":"objectLevel","content-script":"descContentScript","content-method":"descContentMethod","otherNumber":"otherNumber"}</dateEarliestSingle>
-<dateEarliestSingleCertainty>dateEarliestSingleCertainty</dateEarliestSingleCertainty>
-<dateEarliestSingleQualifier>dateEarlierstSingleQualifier</dateEarliestSingleQualifier>
-<dateLatest>XXX</dateLatest>
-<dateLatestCertainty>dateLatestCertainty</dateLatestCertainty>
-<dateLatestQualifier>dateLatestQualifier</dateLatestQualifier>
-<datePeriod>datePeriod</datePeriod>
-<dateText>dateText</dateText>
 </ns2:collectionobjects_common> 
diff --git a/services/collectionobject/client/src/test/resources/test-data/repfield_whitesp2.xml b/services/collectionobject/client/src/test/resources/test-data/repfield_whitesp2.xml
index 237bf512fcb23d76efc72c9cc8e5d5550bba155c..c55a973e79079f732e32d3689f15a69de4dea0d6 100644 (file)
--- a/services/collectionobject/client/src/test/resources/test-data/repfield_whitesp2.xml
+++ b/services/collectionobject/client/src/test/resources/test-data/repfield_whitesp2.xml
@@ -8,7 +8,6 @@
 <briefDescription>briefDescription1</briefDescription>
 <briefDescription>briefDescription2</briefDescription>
 </briefDescriptions>
-<comments>comments</comments>
 <distinguishingFeatures>distFeatures</distinguishingFeatures>
 <numberOfObjects>numberOfObjects</numberOfObjects>
 <objectName>objectName</objectName>
@@ -26,80 +25,4 @@
 </responsibleDepartments>
 
 <title>title</title>
-<titleLanguage>titleLanguage</titleLanguage>
-<titleTranslation>titleTranslation</titleTranslation>
-<titleType>titleType</titleType>
-<age>age</age>
-<ageQualifier>ageQualifier</ageQualifier>
-<ageUnit>ageUnit</ageUnit>
-<color>color</color>
-<contentActivity>contentActivity</contentActivity>
-<contentConcept>contentConcept</contentConcept>
-<contentDate>XXX</contentDate>
-<contentDescription>contentDescription</contentDescription>
-<contentEventName>contentEventName</contentEventName>
-<contentEventNameType>contentEventNameType</contentEventNameType>
-<contentNote>contentNote</contentNote>
-<contentLanguage>contentLanguage</contentLanguage>
-<contentObject>contentObject</contentObject>
-<contentObjectType>contentObjectType</contentObjectType>
-<contentOrganization>contentOrganization</contentOrganization>
-<contentOther>contentOther</contentOther>
-<contentOtherType>contentOtherType</contentOtherType>
-<contentPeople>contentPeople</contentPeople>
-<contentPerson>contentPerson</contentPerson>
-<contentPlace>contentPlace</contentPlace>
-<contentPosition>contentPosition</contentPosition>
-<contentScript>XXX</contentScript>
-<copyNumber>copyNumber</copyNumber>
-<dimension>dimension</dimension>
-<dimensionMeasuredPart>dimensionMeasuredPart</dimensionMeasuredPart>
-<dimensionMeasurementUnit>dimensionMeasurementUnit</dimensionMeasurementUnit>
-<dimensionValue>dimensionValue</dimensionValue>
-<dimensionValueDate>XXX</dimensionValueDate>
-<dimensionValueQualifier>dimensionValueQualifier</dimensionValueQualifier>
-<editionNumber>editionNumber</editionNumber>
-<form>form</form>
-<inscriptionContent>inscriptionContent</inscriptionContent>
-<inscriptionContentInscriber>inscriptionContentInscriber</inscriptionContentInscriber>
-<inscriptionContentDate>inscriptionContentDate</inscriptionContentDate>
-<inscriptionContentInterpretation>inscriptionContentInterpretation</inscriptionContentInterpretation>
-<inscriptionContentLanguage>inscriptionContentLanguage</inscriptionContentLanguage>
-<inscriptionContentMethod>inscriptionContentMethod</inscriptionContentMethod>
-<inscriptionContentPosition>inscriptionContentPosition</inscriptionContentPosition>
-<inscriptionContentScript>inscriptionContentScript</inscriptionContentScript>
-<inscriptionContentTranslation>inscriptionContentTranslation</inscriptionContentTranslation>
-<inscriptionContentTransliteration>inscriptionContentTransliteration</inscriptionContentTransliteration>
-<inscriptionContentType>inscriptionContentType</inscriptionContentType>
-<inscriptionDescription>inscriptionDescription</inscriptionDescription>
-<inscriptionDescriptionInscriber>inscriptionDescriptionInscriber</inscriptionDescriptionInscriber>
-<inscriptionDescriptionDate>inscriptionDescriptionDate</inscriptionDescriptionDate>
-<inscriptionDescriptionInterpretation>inscriptionDescriptionInterpretation</inscriptionDescriptionInterpretation>
-<inscriptionDescriptionMethod>inscriptionDescriptionMethod</inscriptionDescriptionMethod>
-<inscriptionDescriptionPosition>inscriptionDescriptionPosition</inscriptionDescriptionPosition>
-<inscriptionDescriptionType>inscriptionDescriptionType</inscriptionDescriptionType>
-<material>material</material>
-<materialComponent>materialComponent</materialComponent>
-<materialComponentNote>materialComponentNote</materialComponentNote>
-<materialName>materialName</materialName>
-<materialSource>materialSource</materialSource>
-<objectStatus>objectStatus</objectStatus>
-<phase>phase</phase>
-<physicalDescription>physicalDescription</physicalDescription>
-<sex>sex</sex>
-<style>style</style>
-<technicalAttribute>technicalAttribute</technicalAttribute>
-<technicalAttributeMeasurement>technicalAttributeMeasurement</technicalAttributeMeasurement>
-<technicalAttributeMeasurementUnit>technicalAttributeMeasurementUnit</technicalAttributeMeasurementUnit>
-<objectComponentName>objectComponentName</objectComponentName>
-<objectComponentInformation>objectComponentInformation</objectComponentInformation>
-<dateAssociation>dateAssociation</dateAssociation>
-<dateEarliestSingle>{"level":"objectLevel","content-script":"descContentScript","content-method":"descContentMethod","otherNumber":"otherNumber"}</dateEarliestSingle>
-<dateEarliestSingleCertainty>dateEarliestSingleCertainty</dateEarliestSingleCertainty>
-<dateEarliestSingleQualifier>dateEarlierstSingleQualifier</dateEarliestSingleQualifier>
-<dateLatest>XXX</dateLatest>
-<dateLatestCertainty>dateLatestCertainty</dateLatestCertainty>
-<dateLatestQualifier>dateLatestQualifier</dateLatestQualifier>
-<datePeriod>datePeriod</datePeriod>
-<dateText>dateText</dateText>
 </ns2:collectionobjects_common> 
diff --git a/services/collectionobject/client/src/test/resources/test-data/repfield_whitesp3.xml b/services/collectionobject/client/src/test/resources/test-data/repfield_whitesp3.xml
index 485039eb5bf934543e11ee53aff7996cf8e84f1f..cf90657b43136d9ead2b6c859bd07c07b5d3ca19 100644 (file)
--- a/services/collectionobject/client/src/test/resources/test-data/repfield_whitesp3.xml
+++ b/services/collectionobject/client/src/test/resources/test-data/repfield_whitesp3.xml
@@ -10,7 +10,6 @@
 <briefDescription>briefDescription2</briefDescription>
 </briefDescriptions>
 
-<comments>comments</comments>
 <distinguishingFeatures>distFeatures</distinguishingFeatures>
 <numberOfObjects>numberOfObjects</numberOfObjects>
 <objectName>objectName</objectName>
@@ -29,80 +28,4 @@
 </responsibleDepartments>
 
 <title>title</title>
-<titleLanguage>titleLanguage</titleLanguage>
-<titleTranslation>titleTranslation</titleTranslation>
-<titleType>titleType</titleType>
-<age>age</age>
-<ageQualifier>ageQualifier</ageQualifier>
-<ageUnit>ageUnit</ageUnit>
-<color>color</color>
-<contentActivity>contentActivity</contentActivity>
-<contentConcept>contentConcept</contentConcept>
-<contentDate>XXX</contentDate>
-<contentDescription>contentDescription</contentDescription>
-<contentEventName>contentEventName</contentEventName>
-<contentEventNameType>contentEventNameType</contentEventNameType>
-<contentNote>contentNote</contentNote>
-<contentLanguage>contentLanguage</contentLanguage>
-<contentObject>contentObject</contentObject>
-<contentObjectType>contentObjectType</contentObjectType>
-<contentOrganization>contentOrganization</contentOrganization>
-<contentOther>contentOther</contentOther>
-<contentOtherType>contentOtherType</contentOtherType>
-<contentPeople>contentPeople</contentPeople>
-<contentPerson>contentPerson</contentPerson>
-<contentPlace>contentPlace</contentPlace>
-<contentPosition>contentPosition</contentPosition>
-<contentScript>XXX</contentScript>
-<copyNumber>copyNumber</copyNumber>
-<dimension>dimension</dimension>
-<dimensionMeasuredPart>dimensionMeasuredPart</dimensionMeasuredPart>
-<dimensionMeasurementUnit>dimensionMeasurementUnit</dimensionMeasurementUnit>
-<dimensionValue>dimensionValue</dimensionValue>
-<dimensionValueDate>XXX</dimensionValueDate>
-<dimensionValueQualifier>dimensionValueQualifier</dimensionValueQualifier>
-<editionNumber>editionNumber</editionNumber>
-<form>form</form>
-<inscriptionContent>inscriptionContent</inscriptionContent>
-<inscriptionContentInscriber>inscriptionContentInscriber</inscriptionContentInscriber>
-<inscriptionContentDate>inscriptionContentDate</inscriptionContentDate>
-<inscriptionContentInterpretation>inscriptionContentInterpretation</inscriptionContentInterpretation>
-<inscriptionContentLanguage>inscriptionContentLanguage</inscriptionContentLanguage>
-<inscriptionContentMethod>inscriptionContentMethod</inscriptionContentMethod>
-<inscriptionContentPosition>inscriptionContentPosition</inscriptionContentPosition>
-<inscriptionContentScript>inscriptionContentScript</inscriptionContentScript>
-<inscriptionContentTranslation>inscriptionContentTranslation</inscriptionContentTranslation>
-<inscriptionContentTransliteration>inscriptionContentTransliteration</inscriptionContentTransliteration>
-<inscriptionContentType>inscriptionContentType</inscriptionContentType>
-<inscriptionDescription>inscriptionDescription</inscriptionDescription>
-<inscriptionDescriptionInscriber>inscriptionDescriptionInscriber</inscriptionDescriptionInscriber>
-<inscriptionDescriptionDate>inscriptionDescriptionDate</inscriptionDescriptionDate>
-<inscriptionDescriptionInterpretation>inscriptionDescriptionInterpretation</inscriptionDescriptionInterpretation>
-<inscriptionDescriptionMethod>inscriptionDescriptionMethod</inscriptionDescriptionMethod>
-<inscriptionDescriptionPosition>inscriptionDescriptionPosition</inscriptionDescriptionPosition>
-<inscriptionDescriptionType>inscriptionDescriptionType</inscriptionDescriptionType>
-<material>material</material>
-<materialComponent>materialComponent</materialComponent>
-<materialComponentNote>materialComponentNote</materialComponentNote>
-<materialName>materialName</materialName>
-<materialSource>materialSource</materialSource>
-<objectStatus>objectStatus</objectStatus>
-<phase>phase</phase>
-<physicalDescription>physicalDescription</physicalDescription>
-<sex>sex</sex>
-<style>style</style>
-<technicalAttribute>technicalAttribute</technicalAttribute>
-<technicalAttributeMeasurement>technicalAttributeMeasurement</technicalAttributeMeasurement>
-<technicalAttributeMeasurementUnit>technicalAttributeMeasurementUnit</technicalAttributeMeasurementUnit>
-<objectComponentName>objectComponentName</objectComponentName>
-<objectComponentInformation>objectComponentInformation</objectComponentInformation>
-<dateAssociation>dateAssociation</dateAssociation>
-<dateEarliestSingle>{"level":"objectLevel","content-script":"descContentScript","content-method":"descContentMethod","otherNumber":"otherNumber"}</dateEarliestSingle>
-<dateEarliestSingleCertainty>dateEarliestSingleCertainty</dateEarliestSingleCertainty>
-<dateEarliestSingleQualifier>dateEarlierstSingleQualifier</dateEarliestSingleQualifier>
-<dateLatest>XXX</dateLatest>
-<dateLatestCertainty>dateLatestCertainty</dateLatestCertainty>
-<dateLatestQualifier>dateLatestQualifier</dateLatestQualifier>
-<datePeriod>datePeriod</datePeriod>
-<dateText>dateText</dateText>
 </ns2:collectionobjects_common> 
diff --git a/services/collectionobject/client/src/test/resources/test-data/repfield_whitesp4.xml b/services/collectionobject/client/src/test/resources/test-data/repfield_whitesp4.xml
index 9ad7216d9675651ea1241860d16ac183bcc56eb7..3e9184c60e95ab973aaded1a1d5dd020a5224a5d 100644 (file)
--- a/services/collectionobject/client/src/test/resources/test-data/repfield_whitesp4.xml
+++ b/services/collectionobject/client/src/test/resources/test-data/repfield_whitesp4.xml
@@ -8,7 +8,6 @@
     <briefDescription>briefDescription1</briefDescription>
     <briefDescription>briefDescription2</briefDescription>
 </briefDescriptions>
-<comments>comments</comments>
 <distinguishingFeatures>distFeatures</distinguishingFeatures>
 <numberOfObjects>numberOfObjects</numberOfObjects>
 <objectName>objectName</objectName>
@@ -26,80 +25,4 @@
 </responsibleDepartments>
 
 <title>title</title>
-<titleLanguage>titleLanguage</titleLanguage>
-<titleTranslation>titleTranslation</titleTranslation>
-<titleType>titleType</titleType>
-<age>age</age>
-<ageQualifier>ageQualifier</ageQualifier>
-<ageUnit>ageUnit</ageUnit>
-<color>color</color>
-<contentActivity>contentActivity</contentActivity>
-<contentConcept>contentConcept</contentConcept>
-<contentDate>XXX</contentDate>
-<contentDescription>contentDescription</contentDescription>
-<contentEventName>contentEventName</contentEventName>
-<contentEventNameType>contentEventNameType</contentEventNameType>
-<contentNote>contentNote</contentNote>
-<contentLanguage>contentLanguage</contentLanguage>
-<contentObject>contentObject</contentObject>
-<contentObjectType>contentObjectType</contentObjectType>
-<contentOrganization>contentOrganization</contentOrganization>
-<contentOther>contentOther</contentOther>
-<contentOtherType>contentOtherType</contentOtherType>
-<contentPeople>contentPeople</contentPeople>
-<contentPerson>contentPerson</contentPerson>
-<contentPlace>contentPlace</contentPlace>
-<contentPosition>contentPosition</contentPosition>
-<contentScript>XXX</contentScript>
-<copyNumber>copyNumber</copyNumber>
-<dimension>dimension</dimension>
-<dimensionMeasuredPart>dimensionMeasuredPart</dimensionMeasuredPart>
-<dimensionMeasurementUnit>dimensionMeasurementUnit</dimensionMeasurementUnit>
-<dimensionValue>dimensionValue</dimensionValue>
-<dimensionValueDate>XXX</dimensionValueDate>
-<dimensionValueQualifier>dimensionValueQualifier</dimensionValueQualifier>
-<editionNumber>editionNumber</editionNumber>
-<form>form</form>
-<inscriptionContent>inscriptionContent</inscriptionContent>
-<inscriptionContentInscriber>inscriptionContentInscriber</inscriptionContentInscriber>
-<inscriptionContentDate>inscriptionContentDate</inscriptionContentDate>
-<inscriptionContentInterpretation>inscriptionContentInterpretation</inscriptionContentInterpretation>
-<inscriptionContentLanguage>inscriptionContentLanguage</inscriptionContentLanguage>
-<inscriptionContentMethod>inscriptionContentMethod</inscriptionContentMethod>
-<inscriptionContentPosition>inscriptionContentPosition</inscriptionContentPosition>
-<inscriptionContentScript>inscriptionContentScript</inscriptionContentScript>
-<inscriptionContentTranslation>inscriptionContentTranslation</inscriptionContentTranslation>
-<inscriptionContentTransliteration>inscriptionContentTransliteration</inscriptionContentTransliteration>
-<inscriptionContentType>inscriptionContentType</inscriptionContentType>
-<inscriptionDescription>inscriptionDescription</inscriptionDescription>
-<inscriptionDescriptionInscriber>inscriptionDescriptionInscriber</inscriptionDescriptionInscriber>
-<inscriptionDescriptionDate>inscriptionDescriptionDate</inscriptionDescriptionDate>
-<inscriptionDescriptionInterpretation>inscriptionDescriptionInterpretation</inscriptionDescriptionInterpretation>
-<inscriptionDescriptionMethod>inscriptionDescriptionMethod</inscriptionDescriptionMethod>
-<inscriptionDescriptionPosition>inscriptionDescriptionPosition</inscriptionDescriptionPosition>
-<inscriptionDescriptionType>inscriptionDescriptionType</inscriptionDescriptionType>
-<material>material</material>
-<materialComponent>materialComponent</materialComponent>
-<materialComponentNote>materialComponentNote</materialComponentNote>
-<materialName>materialName</materialName>
-<materialSource>materialSource</materialSource>
-<objectStatus>objectStatus</objectStatus>
-<phase>phase</phase>
-<physicalDescription>physicalDescription</physicalDescription>
-<sex>sex</sex>
-<style>style</style>
-<technicalAttribute>technicalAttribute</technicalAttribute>
-<technicalAttributeMeasurement>technicalAttributeMeasurement</technicalAttributeMeasurement>
-<technicalAttributeMeasurementUnit>technicalAttributeMeasurementUnit</technicalAttributeMeasurementUnit>
-<objectComponentName>objectComponentName</objectComponentName>
-<objectComponentInformation>objectComponentInformation</objectComponentInformation>
-<dateAssociation>dateAssociation</dateAssociation>
-<dateEarliestSingle>{"level":"objectLevel","content-script":"descContentScript","content-method":"descContentMethod","otherNumber":"otherNumber"}</dateEarliestSingle>
-<dateEarliestSingleCertainty>dateEarliestSingleCertainty</dateEarliestSingleCertainty>
-<dateEarliestSingleQualifier>dateEarlierstSingleQualifier</dateEarliestSingleQualifier>
-<dateLatest>XXX</dateLatest>
-<dateLatestCertainty>dateLatestCertainty</dateLatestCertainty>
-<dateLatestQualifier>dateLatestQualifier</dateLatestQualifier>
-<datePeriod>datePeriod</datePeriod>
-<dateText>dateText</dateText>
 </ns2:collectionobjects_common> 
diff --git a/services/collectionobject/jaxb/src/main/resources/collectionobjects_common.xsd b/services/collectionobject/jaxb/src/main/resources/collectionobjects_common.xsd
index c76e0591788972b138de3dd0a0a9e3ff8c23e156..6518e79e5d20610702ba86072ffb9782c9656150 100644 (file)
--- a/services/collectionobject/jaxb/src/main/resources/collectionobjects_common.xsd
+++ b/services/collectionobject/jaxb/src/main/resources/collectionobjects_common.xsd
@@ -22,7 +22,7 @@
 
     <xs:complexType name="otherNumberList">
         <xs:sequence>
-            <xs:element name="otherNumber" type="ns:otherNumber" minOccurs="0" maxOccurs="unbounded" />
+            <xs:element name="otherNumber" type="ns:otherNumber" minOccurs="0" maxOccurs="unbounded"/>
         </xs:sequence>
     </xs:complexType>
     
@@ -43,11 +43,11 @@
     <xs:element name="collectionobjects_common">
         <xs:complexType>
             <xs:sequence>
-                <xs:element name="csid" type="xs:string" />
+                <xs:element name="csid" type="xs:string"/>
                 
                 <!-- Object Identification Information -->
                 <xs:element name="objectNumber" type="xs:string"/>
-                <xs:element name="otherNumberList" type="ns:otherNumberList" />
+                <xs:element name="otherNumberList" type="ns:otherNumberList"/>
                 
                 <!-- Remove these two elements when the App/UI layer is -->
                 <!-- using the new repeatable 'otherNumbers' field -->
@@ -56,7 +56,7 @@
 
                 <xs:element name="briefDescriptions" type="briefDescriptionList"/>
 
-                <xs:element name="comments" type="xs:string"/>
+                <xs:element name="comments" type="commentList"/>
                 <xs:element name="distinguishingFeatures" type="xs:string"/>
                 <xs:element name="numberOfObjects" type="xs:string"/>
                 <xs:element name="objectName" type="xs:string"/>
@@ -75,162 +75,177 @@
                 <xs:element name="recordStatus" type="xs:string"/>
 
                 <!-- Object Description Information -->
-                <xs:element name="age" type="xs:string" />
-                <xs:element name="ageQualifier" type="xs:string" />
-                <xs:element name="ageUnit" type="xs:string" />
-                <xs:element name="color" type="xs:string" />
+                <xs:element name="age" type="xs:string"/>
+                <xs:element name="ageQualifier" type="xs:string"/>
+                <xs:element name="ageUnit" type="xs:string"/>
+                <xs:element name="colors" type="colorList"/>
 
                 <!-- Object Description - Content Information -->
-                <xs:element name="contentActivity" type="xs:string" />
-                <xs:element name="contentConcept" type="xs:string" />
-                <xs:element name="contentDate" type="xs:string" />
-                <xs:element name="contentDescription" type="xs:string" />
-                <xs:element name="contentEventName" type="xs:string" />
-                <xs:element name="contentEventNameType" type="xs:string" />
-                <xs:element name="contentNote" type="xs:string" />
-                <xs:element name="contentLanguage" type="xs:string" />
-                <xs:element name="contentObject" type="xs:string" />
-                <xs:element name="contentObjectType" type="xs:string" />
-                <xs:element name="contentOrganization" type="xs:string" />
-                <xs:element name="contentOther" type="xs:string" />
-                <xs:element name="contentOtherType" type="xs:string" />
-                <xs:element name="contentPeople" type="xs:string" />
-                <xs:element name="contentPerson" type="xs:string" />
-                <xs:element name="contentPlace" type="xs:string" />
-                <xs:element name="contentPosition" type="xs:string" />
-                <xs:element name="contentScript" type="xs:string" />
-
-                <xs:element name="copyNumber" type="xs:string" />
+                <xs:element name="contentActivities" type="contentActivityList"/>
+                <xs:element name="contentConcepts" type="contentConceptList"/>
+                <xs:element name="contentDate" type="xs:string"/>
+                <xs:element name="contentDescription" type="xs:string"/>
+                <xs:element name="contentEventName" type="xs:string"/>
+                <xs:element name="contentEventNameType" type="xs:string"/>
+                <xs:element name="contentNote" type="xs:string"/>
+                <xs:element name="contentLanguages" type="contentLanguageList"/>
+                <xs:element name="contentObject" type="xs:string"/>
+                <xs:element name="contentObjectType" type="xs:string"/>
+                <xs:element name="contentOrganizations" type="contentOrganizationList"/>
+                <xs:element name="contentOther" type="xs:string"/>
+                <xs:element name="contentOtherType" type="xs:string"/>
+                <xs:element name="contentPeoples" type="contentPeopleList"/>
+                <xs:element name="contentPersons" type="contentPersonList"/>
+                <xs:element name="contentPlaces" type="contentPlaceList"/>
+                <xs:element name="contentPosition" type="xs:string"/>
+                <xs:element name="contentScripts" type="contentScriptList"/>
+
+                <xs:element name="copyNumber" type="xs:string"/>
 
                 <!-- Object Description - Dimension Information -->
-                <xs:element name="dimension" type="xs:string" />
-                <xs:element name="dimensionMeasuredPart" type="xs:string" />
-                <xs:element name="dimensionMeasurementUnit" type="xs:string" />
-                <xs:element name="dimensionValue" type="xs:string" />
-                <xs:element name="dimensionValueDate" type="xs:string" />
-                <xs:element name="dimensionValueQualifier" type="xs:string" />
+                <xs:element name="dimension" type="xs:string"/>
+                <xs:element name="dimensionMeasuredPart" type="xs:string"/>
+                <xs:element name="dimensionMeasurementUnit" type="xs:string"/>
+                <xs:element name="dimensionValue" type="xs:string"/>
+                <xs:element name="dimensionValueDate" type="xs:string"/>
+                <xs:element name="dimensionValueQualifier" type="xs:string"/>
                 
-                <xs:element name="editionNumber" type="xs:string" />
-                <xs:element name="form" type="xs:string" />
+                <xs:element name="editionNumber" type="xs:string"/>
+                <xs:element name="forms" type="formList"/>
 
                 <!-- Object description Inscription - Content Information -->
-                <xs:element name="inscriptionContent" type="xs:string" />
-                <xs:element name="inscriptionContentInscriber" type="xs:string" />
-                <xs:element name="inscriptionContentDate" type="xs:string" />
-                <xs:element name="inscriptionContentInterpretation" type="xs:string" />
-                <xs:element name="inscriptionContentLanguage" type="xs:string" />
-                <xs:element name="inscriptionContentMethod" type="xs:string" />
-                <xs:element name="inscriptionContentPosition" type="xs:string" />
-                <xs:element name="inscriptionContentScript" type="xs:string" />
-                <xs:element name="inscriptionContentTranslation" type="xs:string" />
-                <xs:element name="inscriptionContentTransliteration" type="xs:string" />
-                <xs:element name="inscriptionContentType" type="xs:string" />
+                <xs:element name="inscriptionContent" type="xs:string"/>
+                <xs:element name="inscriptionContentInscriber" type="xs:string"/>
+                <xs:element name="inscriptionContentDate" type="xs:string"/>
+                <xs:element name="inscriptionContentInterpretation" type="xs:string"/>
+                <xs:element name="inscriptionContentLanguage" type="xs:string"/>
+                <xs:element name="inscriptionContentMethod" type="xs:string"/>
+                <xs:element name="inscriptionContentPosition" type="xs:string"/>
+                <xs:element name="inscriptionContentScript" type="xs:string"/>
+                <xs:element name="inscriptionContentTranslation" type="xs:string"/>
+                <xs:element name="inscriptionContentTransliteration" type="xs:string"/>
+                <xs:element name="inscriptionContentType" type="xs:string"/>
                 
                 <!-- Object Description Inscription - Description Information -->
-                <xs:element name="inscriptionDescription" type="xs:string" />
-                <xs:element name="inscriptionDescriptionInscriber" type="xs:string" />
-                <xs:element name="inscriptionDescriptionDate" type="xs:string" />
-                <xs:element name="inscriptionDescriptionInterpretation" type="xs:string" />
-                <xs:element name="inscriptionDescriptionMethod" type="xs:string" />
-                <xs:element name="inscriptionDescriptionPosition" type="xs:string" />
-                <xs:element name="inscriptionDescriptionType" type="xs:string" />
+                <xs:element name="inscriptionDescription" type="xs:string"/>
+                <xs:element name="inscriptionDescriptionInscriber" type="xs:string"/>
+                <xs:element name="inscriptionDescriptionDate" type="xs:string"/>
+                <xs:element name="inscriptionDescriptionInterpretation" type="xs:string"/>
+                <xs:element name="inscriptionDescriptionMethod" type="xs:string"/>
+                <xs:element name="inscriptionDescriptionPosition" type="xs:string"/>
+                <xs:element name="inscriptionDescriptionType" type="xs:string"/>
 
                 <!-- Object Description Material Information -->
-                <xs:element name="material" type="xs:string" />
-                <xs:element name="materialComponent" type="xs:string" />
-                <xs:element name="materialComponentNote" type="xs:string" />
-                <xs:element name="materialName" type="xs:string" />
-                <xs:element name="materialSource" type="xs:string" />
+                <xs:element name="material" type="xs:string"/>
+                <xs:element name="materialComponent" type="xs:string"/>
+                <xs:element name="materialComponentNote" type="xs:string"/>
+                <xs:element name="materialName" type="xs:string"/>
+                <xs:element name="materialSource" type="xs:string"/>
 
                 <!-- Misc Object Description Information -->
-                <xs:element name="objectStatus" type="xs:string" />
-                <xs:element name="phase" type="xs:string" />
-                <xs:element name="physicalDescription" type="xs:string" />
-                <xs:element name="sex" type="xs:string" />
-                <xs:element name="style" type="xs:string" />
-                <xs:element name="technicalAttribute" type="xs:string" />
-                <xs:element name="technicalAttributeMeasurement" type="xs:string" />
-                <xs:element name="technicalAttributeMeasurementUnit" type="xs:string" />
-                <xs:element name="objectComponentName" type="xs:string" />
-                <xs:element name="objectComponentInformation" type="xs:string" />
+                <xs:element name="objectStatus" type="xs:string"/>
+                <xs:element name="phase" type="xs:string"/>
+                <xs:element name="physicalDescription" type="xs:string"/>
+                <xs:element name="sex" type="xs:string"/>
+                <xs:element name="styles" type="styleList"/>
+                <xs:element name="technicalAttribute" type="xs:string"/>
+                <xs:element name="technicalAttributeMeasurement" type="xs:string"/>
+                <xs:element name="technicalAttributeMeasurementUnit" type="xs:string"/>
+                <xs:element name="objectComponentName" type="xs:string"/>
+                <xs:element name="objectComponentInformation" type="xs:string"/>
 
                 <!-- Object Production Information -->
-                <xs:element name="objectProductionDate" type="xs:string" />
-                <xs:element name="objectProductionNote" type="xs:string" />
-                <xs:element name="objectProductionOrganization" type="xs:string" />
-                <xs:element name="objectProductionPeople" type="xs:string" />
-                <xs:element name="objectProductionPerson" type="xs:string" />
-                <xs:element name="objectProductionPlace" type="xs:string" />
-                <xs:element name="objectProductionReason" type="xs:string" />
-                <xs:element name="technique" type="xs:string" />
-                <xs:element name="techniqueType" type="xs:string" />
+                <xs:element name="objectProductionDate" type="xs:string"/>
+                <xs:element name="objectProductionNote" type="xs:string"/>
+                <xs:element name="objectProductionOrganization" type="xs:string"/>
+                <xs:element name="objectProductionOrganizationRole" type="xs:string"/>
+                <xs:element name="objectProductionPeople" type="xs:string"/>
+                <xs:element name="objectProductionPeopleRole" type="xs:string"/>
+                <xs:element name="objectProductionPerson" type="xs:string"/>
+                <xs:element name="objectProductionPersonRole" type="xs:string"/>
+                <xs:element name="objectProductionPlace" type="xs:string"/>
+                <xs:element name="objectProductionPlaceRole" type="xs:string"/>
+                <xs:element name="objectProductionReason" type="xs:string"/>
+                <xs:element name="technique" type="xs:string"/>
+                <xs:element name="techniqueType" type="xs:string"/>
 
                 <!-- Object History and Association Information - Association -->
-                <xs:element name="associatedActivity" type="xs:string" />
-                <xs:element name="associatedActivityNote" type="xs:string" />
-                <xs:element name="associatedConcept" type="xs:string" />
-                <xs:element name="associatedCulturalAffinity" type="xs:string" />
-                <xs:element name="associatedDate" type="xs:string" />
-                <xs:element name="associatedEventName" type="xs:string" />
-                <xs:element name="associatedEventNameType" type="xs:string" />
-                <xs:element name="associatedEventOrganization" type="xs:string" />
-                <xs:element name="associatedEventPeople" type="xs:string" />
-                <xs:element name="associatedEventPerson" type="xs:string" />
-                <xs:element name="associatedEventPlace" type="xs:string" />
-                <xs:element name="associatedObject" type="xs:string" />
-                <xs:element name="associatedObjectType" type="xs:string" />
-                <xs:element name="associatedOrganization" type="xs:string" />
-                <xs:element name="associatedPeople" type="xs:string" />
-                <xs:element name="associatedPerson" type="xs:string" />
-                <xs:element name="associatedPlace" type="xs:string" />
-                <xs:element name="associationNote" type="xs:string" />
-                <xs:element name="associationType" type="xs:string" />
+
+                <!-- In the following field names, "assoc" is an abbreviation for "association". -->
+                <!-- See the comments to CSPACE-2501 for a discussion of the database identifier -->
+                <!-- length limit that made this abbreviation necessary. -->
+                <xs:element name="assocActivity" type="xs:string"/>
+                <xs:element name="assocActivityNote" type="xs:string"/>
+                <xs:element name="assocConcepts" type="assocConceptList"/>
+                <xs:element name="assocCulturalContexts" type="assocCulturalContextList"/>
+                <xs:element name="assocDate" type="xs:string"/>
+                <xs:element name="assocEventName" type="xs:string"/>
+                <xs:element name="assocEventNameType" type="xs:string"/>
+                <xs:element name="assocEventOrganizations" type="assocEventOrganizationList"/>
+                <xs:element name="assocEventPeoples" type="assocEventPeopleList"/>
+                <xs:element name="assocEventPersons" type="assocEventPersonList"/>
+                <xs:element name="assocEventPlaces" type="assocEventPlaceList"/>
+                <xs:element name="assocObject" type="xs:string"/>
+                <xs:element name="assocObjectType" type="xs:string"/>
+                <xs:element name="assocOrganizations" type="assocOrganizationList"/>
+                <xs:element name="assocPeoples" type="assocPeopleList"/>
+                <xs:element name="assocPersons" type="assocPersonList"/>
+                <xs:element name="assocPlaces" type="assocPlaceList"/>
+                <xs:element name="associationNote" type="xs:string"/>
+                <xs:element name="associationType" type="xs:string"/>
 
                 <!-- Object History and Association Information - History -->
-                <xs:element name="objectHistoryNote" type="xs:string" />
-                <xs:element name="owner" type="xs:string" />
-                <xs:element name="ownershipAccess" type="xs:string" />
-                <xs:element name="ownershipCategory" type="xs:string" />
-                <xs:element name="ownershipDates" type="xs:string" />
-                <xs:element name="ownershipExchangeMethod" type="xs:string" />
-                <xs:element name="ownershipExchangeNote" type="xs:string" />
-                <xs:element name="ownershipExchangePriceCurrency" type="xs:string" />
-                <xs:element name="ownershipExchangePriceValue" type="xs:string" />
-                <xs:element name="ownershipPlace" type="xs:string" />
-                <xs:element name="usage" type="xs:string" />
-                <xs:element name="usageNote" type="xs:string" />
+                <xs:element name="objectHistoryNote" type="xs:string"/>
+                <xs:element name="owners" type="ownerList"/>
+                <xs:element name="ownershipAccess" type="xs:string"/>
+                <xs:element name="ownershipCategory" type="xs:string"/>
+                <xs:element name="ownershipDates" type="xs:string"/>
+                <xs:element name="ownershipExchangeMethod" type="xs:string"/>
+                <xs:element name="ownershipExchangeNote" type="xs:string"/>
+                <xs:element name="ownershipExchangePriceCurrency" type="xs:string"/>
+                <xs:element name="ownershipExchangePriceValue" type="xs:string"/>
+                <xs:element name="ownershipPlace" type="xs:string"/>
+                <xs:element name="usage" type="xs:string"/>
+                <xs:element name="usageNote" type="xs:string"/>
 
                 <!-- Object Owner's Contribution Information -->
-                <xs:element name="ownersPersonalExperience" type="xs:string" />
-                <xs:element name="ownersPersonalResponse" type="xs:string" />
-                <xs:element name="ownersReference" type="xs:string" />
-                <xs:element name="ownersContributionNote" type="xs:string" />
+                <xs:element name="ownersPersonalExperience" type="xs:string"/>
+                <xs:element name="ownersPersonalResponse" type="xs:string"/>
+                <xs:element name="ownersReference" type="xs:string"/>
+                <xs:element name="ownersContributionNote" type="xs:string"/>
 
                 <!-- Object Viewers Contribution Information -->
-                <xs:element name="viewersRole" type="xs:string" />
-                <xs:element name="viewersPersonalExperience" type="xs:string" />
-                <xs:element name="viewersPersonalResponse" type="xs:string" />
-                <xs:element name="viewersReference" type="xs:string" />
-                <xs:element name="viewersContributionNote" type="xs:string" />
+                <xs:element name="viewersRole" type="xs:string"/>
+                <xs:element name="viewersPersonalExperience" type="xs:string"/>
+                <xs:element name="viewersPersonalResponse" type="xs:string"/>
+                <xs:element name="viewersReference" type="xs:string"/>
+                <xs:element name="viewersContributionNote" type="xs:string"/>
 
                 <!-- Reference Information -->
-                <xs:element name="reference" type="xs:string" />
-                <xs:element name="catalogNumber" type="xs:string" />
+                <xs:element name="reference" type="xs:string"/>
+                <xs:element name="catalogNumber" type="xs:string"/>
 
-                <!-- Object Collection Information -->
-                <xs:element name="fieldCollectionEventName" type="xs:string" />
+                <!--  Object Collection Information Group -->
+                <xs:element name="fieldCollectionDate" type="xs:string"/>
+                <xs:element name="fieldCollectionMethods" type="fieldCollectionMethodList"/>
+                <xs:element name="fieldCollectionNote" type="xs:string"/>
+                <xs:element name="fieldCollectionNumber" type="xs:string"/>
+                <xs:element name="fieldCollectionPlace" type="xs:string"/>
+                <xs:element name="fieldCollectionSources" type="fieldCollectionSourceList"/>
+                <xs:element name="fieldCollectors" type="fieldCollectorList"/>
+                <xs:element name="fieldCollectionEventName" type="xs:string"/>
                                
                 <!-- Object Description Date Information -->
                 <!-- This appears to be a placeholder structured date -->
-                <xs:element name="dateAssociation" type="xs:string" />
-                <xs:element name="dateEarliestSingle" type="xs:string" />
-                <xs:element name="dateEarliestSingleCertainty" type="xs:string" />
-                <xs:element name="dateEarliestSingleQualifier" type="xs:string" />
-                <xs:element name="dateLatest" type="xs:string" />
-                <xs:element name="dateLatestCertainty" type="xs:string" />
-                <xs:element name="dateLatestQualifier" type="xs:string" />
-                <xs:element name="datePeriod" type="xs:string" />
-                <xs:element name="dateText" type="xs:string" />
+                <xs:element name="dateAssociation" type="xs:string"/>
+                <xs:element name="dateEarliestSingle" type="xs:string"/>
+                <xs:element name="dateEarliestSingleCertainty" type="xs:string"/>
+                <xs:element name="dateEarliestSingleQualifier" type="xs:string"/>
+                <xs:element name="dateLatest" type="xs:string"/>
+                <xs:element name="dateLatestCertainty" type="xs:string"/>
+                <xs:element name="dateLatestQualifier" type="xs:string"/>
+                <xs:element name="datePeriod" type="xs:string"/>
+                <xs:element name="dateText" type="xs:string"/>
                 
             </xs:sequence>
         </xs:complexType>
@@ -242,12 +257,168 @@
         </xs:sequence>
     </xs:complexType>
 
+    <xs:complexType name="commentList">
+        <xs:sequence>
+            <xs:element name="comment" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
+        </xs:sequence>
+    </xs:complexType>
+    
     <xs:complexType name="briefDescriptionList">
         <xs:sequence>
-            <xs:element name="briefDescription" type="xs:string" minOccurs="0" maxOccurs="unbounded" />
+            <xs:element name="briefDescription" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
+        </xs:sequence>
+    </xs:complexType>
+
+    <xs:complexType name="colorList">
+        <xs:sequence>
+            <xs:element name="color" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
+        </xs:sequence>
+    </xs:complexType>
+    
+    <xs:complexType name="contentActivityList">
+        <xs:sequence>
+            <xs:element name="contentActivity" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
+        </xs:sequence>
+    </xs:complexType>
+
+    <xs:complexType name="contentConceptList">
+        <xs:sequence>
+            <xs:element name="contentConcept" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
+        </xs:sequence>
+    </xs:complexType>
+
+    <xs:complexType name="contentLanguageList">
+        <xs:sequence>
+            <xs:element name="contentLanguage" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
+        </xs:sequence>
+    </xs:complexType>
+
+    <xs:complexType name="contentOrganizationList">
+        <xs:sequence>
+            <xs:element name="contentOrganization" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
+        </xs:sequence>
+    </xs:complexType>
+
+    <xs:complexType name="contentPeopleList">
+        <xs:sequence>
+            <xs:element name="contentPeople" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
+        </xs:sequence>
+    </xs:complexType>
+
+    <xs:complexType name="contentPersonList">
+        <xs:sequence>
+            <xs:element name="contentPerson" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
+        </xs:sequence>
+    </xs:complexType>
+
+    <xs:complexType name="contentPlaceList">
+        <xs:sequence>
+            <xs:element name="contentPlace" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
+        </xs:sequence>
+    </xs:complexType>
+
+    <xs:complexType name="contentScriptList">
+        <xs:sequence>
+            <xs:element name="contentScript" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
+        </xs:sequence>
+    </xs:complexType>
+
+    <xs:complexType name="formList">
+        <xs:sequence>
+            <xs:element name="form" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
+        </xs:sequence>
+    </xs:complexType>
+
+    <xs:complexType name="styleList">
+        <xs:sequence>
+            <xs:element name="style" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
+        </xs:sequence>
+    </xs:complexType>
+
+    <xs:complexType name="assocConceptList">
+        <xs:sequence>
+            <xs:element name="assocConcept" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
+        </xs:sequence>
+    </xs:complexType>
+
+    <xs:complexType name="assocCulturalContextList">
+        <xs:sequence>
+            <xs:element name="assocCulturalContext" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
+        </xs:sequence>
+    </xs:complexType>
+    
+    <xs:complexType name="assocEventOrganizationList">
+        <xs:sequence>
+            <xs:element name="assocEventOrganization" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
         </xs:sequence>
     </xs:complexType>
     
+    <xs:complexType name="assocEventPeopleList">
+        <xs:sequence>
+            <xs:element name="assocEventPeople" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
+        </xs:sequence>
+    </xs:complexType>
+    
+    <xs:complexType name="assocEventPersonList">
+        <xs:sequence>
+            <xs:element name="assocEventPerson" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
+        </xs:sequence>
+    </xs:complexType>
+    
+    <xs:complexType name="assocEventPlaceList">
+        <xs:sequence>
+            <xs:element name="assocEventPlace" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
+        </xs:sequence>
+    </xs:complexType>
+
+    <xs:complexType name="assocOrganizationList">
+        <xs:sequence>
+            <xs:element name="assocOrganization" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
+        </xs:sequence>
+    </xs:complexType>
+
+    <xs:complexType name="assocPeopleList">
+        <xs:sequence>
+            <xs:element name="assocPeople" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
+        </xs:sequence>
+    </xs:complexType>
+
+    <xs:complexType name="assocPersonList">
+        <xs:sequence>
+            <xs:element name="assocPerson" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
+        </xs:sequence>
+    </xs:complexType>
+
+    <xs:complexType name="assocPlaceList">
+        <xs:sequence>
+            <xs:element name="assocPlace" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
+        </xs:sequence>
+    </xs:complexType>
+
+    <xs:complexType name="ownerList">
+        <xs:sequence>
+            <xs:element name="owner" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
+        </xs:sequence>
+    </xs:complexType>
+
+    <xs:complexType name="fieldCollectionMethodList">
+        <xs:sequence>
+            <xs:element name="fieldCollectionMethod" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
+        </xs:sequence>
+    </xs:complexType>
+
+    <xs:complexType name="fieldCollectionSourceList">
+        <xs:sequence>
+            <xs:element name="fieldCollectionSource" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
+        </xs:sequence>
+    </xs:complexType>
+
+    <xs:complexType name="fieldCollectorList">
+        <xs:sequence>
+            <xs:element name="fieldCollector" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
+        </xs:sequence>
+    </xs:complexType>
+
     <!-- This is the base class for paginated lists -->
     <xs:complexType name="abstractCommonList">
         <xs:annotation>
@@ -266,14 +437,14 @@
                             <xs:complexType>
                                 <xs:sequence>
                                     <xs:element name="objectNumber" type="xs:string"
-                                        minOccurs="1" />
+                                        minOccurs="1"/>
                                     <xs:element name="title" type="xs:string"
-                                        minOccurs="1" />
+                                        minOccurs="1"/>
                                     <!-- uri to retrive collection object details -->
                                     <xs:element name="uri" type="xs:anyURI"
-                                        minOccurs="1" />
+                                        minOccurs="1"/>
                                     <xs:element name="csid" type="xs:string"
-                                        minOccurs="1" />
+                                        minOccurs="1"/>
                                 </xs:sequence>
                             </xs:complexType>
                         </xs:element>
diff --git a/services/common/src/main/config/services/tenant-bindings.xml b/services/common/src/main/config/services/tenant-bindings.xml
index b71e9adccb1391aa2569a614161ebeac202eb9f1..21726d3f116cdd278cadd607f54618b2621a420b 100644 (file)
--- a/services/common/src/main/config/services/tenant-bindings.xml
+++ b/services/common/src/main/config/services/tenant-bindings.xml
@@ -63,17 +63,17 @@
                               versionable="true" auditable="false"
                               label="collectionobjects_common" updated="" order="1">
                     <service:properties>
-                        <types:item><types:key>authRef</types:key><types:value>contentOrganization</types:value></types:item>
-                        <!-- Not a Person field, but a People field, not yet implemented -->
-                        <!-- <types:item><types:key>authRef</types:key><types:value>contentPeople</types:value></types:item -->
-                        <types:item><types:key>authRef</types:key><types:value>contentPerson</types:value></types:item>
+                        <types:item><types:key>authRef</types:key><types:value>contentOrganizations</types:value></types:item>
+                        <types:item><types:key>authRef</types:key><types:value>contentPersons</types:value></types:item>
                         <types:item><types:key>authRef</types:key><types:value>inscriptionContentInscriber</types:value></types:item>
                         <types:item><types:key>authRef</types:key><types:value>inscriptionDescriptionInscriber</types:value></types:item>
-                        <types:item><types:key>authRef</types:key><types:value>associatedEventOrganization</types:value></types:item>
-                        <types:item><types:key>authRef</types:key><types:value>associatedEventPerson</types:value></types:item>
-                        <types:item><types:key>authRef</types:key><types:value>associatedOrganization</types:value></types:item>
-                        <types:item><types:key>authRef</types:key><types:value>associatedPerson</types:value></types:item>
-                        <types:item><types:key>authRef</types:key><types:value>owner</types:value></types:item>
+                        <types:item><types:key>authRef</types:key><types:value>assocEventOrganizations</types:value></types:item>
+                        <types:item><types:key>authRef</types:key><types:value>assocEventPersons</types:value></types:item>
+                        <types:item><types:key>authRef</types:key><types:value>assocOrganizations</types:value></types:item>
+                        <types:item><types:key>authRef</types:key><types:value>assocPersons</types:value></types:item>
+                        <types:item><types:key>authRef</types:key><types:value>owners</types:value></types:item>
+                        <types:item><types:key>authRef</types:key><types:value>fieldCollectionSources</types:value></types:item>
+                        <types:item><types:key>authRef</types:key><types:value>fieldCollectors</types:value></types:item>
                     </service:properties>
                     <service:content contentType="application/xml">
                         <service:xmlContent
@@ -1162,16 +1162,17 @@
                               versionable="true" auditable="false"
                               label="collectionobjects_common" updated="" order="1">
                     <service:properties>
-                        <types:item><types:key>authRef</types:key><types:value>contentOrganization</types:value></types:item>
-                        <!-- Not a Person field, but a People field, not yet implemented -->
-                        <!-- <types:item><types:key>authRef</types:key><types:value>contentPeople</types:value></types:item -->                        <types:item><types:key>authRef</types:key><types:value>contentPerson</types:value></types:item>
+                        <types:item><types:key>authRef</types:key><types:value>contentOrganizations</types:value></types:item>
+                        <types:item><types:key>authRef</types:key><types:value>contentPersons</types:value></types:item>
                         <types:item><types:key>authRef</types:key><types:value>inscriptionContentInscriber</types:value></types:item>
                         <types:item><types:key>authRef</types:key><types:value>inscriptionDescriptionInscriber</types:value></types:item>
-                        <types:item><types:key>authRef</types:key><types:value>associatedEventOrganization</types:value></types:item>
-                        <types:item><types:key>authRef</types:key><types:value>associatedEventPerson</types:value></types:item>
-                        <types:item><types:key>authRef</types:key><types:value>associatedOrganization</types:value></types:item>
-                        <types:item><types:key>authRef</types:key><types:value>associatedPerson</types:value></types:item>
-                        <types:item><types:key>authRef</types:key><types:value>owner</types:value></types:item>
+                        <types:item><types:key>authRef</types:key><types:value>assocEventOrganizations</types:value></types:item>
+                        <types:item><types:key>authRef</types:key><types:value>assocEventPersons</types:value></types:item>
+                        <types:item><types:key>authRef</types:key><types:value>assocOrganizations</types:value></types:item>
+                        <types:item><types:key>authRef</types:key><types:value>assocPersons</types:value></types:item>
+                        <types:item><types:key>authRef</types:key><types:value>owners</types:value></types:item>
+                        <types:item><types:key>authRef</types:key><types:value>fieldCollectionSources</types:value></types:item>
+                        <types:item><types:key>authRef</types:key><types:value>fieldCollectors</types:value></types:item>
                     </service:properties>
                     <service:content contentType="application/xml">
                         <service:xmlContent