From: Aron Roberts <aron@socrates.berkeley.edu>
Date: Tue, 15 Jun 2010 01:19:50 +0000 (+0000)
Subject: CSPACE-2134: Updated Cataloging schema for release 0.8, adding one field and changing... 
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=492c75bf249f29bdc8f2d7e84b87a2eaf35a7677;p=tmp%2Fjakarta-migration.git

CSPACE-2134: Updated Cataloging schema for release 0.8, adding one field and changing the names of 12 others - two required by wiki schema changes, and ten for consistency with other layers / clarity.
---

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 79a709eeb..5f741a708 100644
--- 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
@@ -67,168 +67,168 @@
         </xs:complexType>
     </xs:element>
     <xs:element name="collection" type="xs:string"/>
-    <xs:element name="title" type="xs:string"/>
-    <xs:element name="objectTitleLanguage" type="xs:string"/>
-    <xs:element name="titleTranslation" type="xs:string"/>
-    <xs:element name="titleType" type="xs:string"/>
-    <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"/>
-
-    <!-- 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"/>
-
-    <!-- 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="editionNumber" type="xs:string"/>
-    <xs:element name="form" type="xs:string"/>
-
-    <!-- Object description: Inscription content information -->
-    <xs:element name="inscriptionContent" type="xs:string"/>
-    <xs:element name="inscriber" type="xs:string"/>
-    <xs:element name="inscriptionDate" type="xs:string"/>
-    <xs:element name="inscriptionInterpretation" type="xs:string"/>
-    <xs:element name="inscriptionLanguage" type="xs:string"/>
-    <xs:element name="inscriptionMethod" type="xs:string"/>
-    <xs:element name="inscriptionPosition" type="xs:string"/>
-    <xs:element name="inscriptionScript" type="xs:string"/>
-    <xs:element name="inscriptionTranslation" type="xs:string"/>
-    <xs:element name="inscriptionTransliteration" type="xs:string"/>
-    <xs:element name="inscriptionType" 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"/>
-
-    <!-- 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"/>
-
-    <!-- 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"/>
-
-    <!-- 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" />
-
-    <!-- Object History and Association Information - Association -->
-    <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" />
-
-    <!-- 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="ownershipExchangePriceDenomination" 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" />
-
-    <!-- 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" />
-
-    <!-- Reference Information -->
-    <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 Description Date Information -->
-    <!-- This appears to be a placeholder structured date -->
-
-    <!-- Object description: Date information -->
-    <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="title" type="xs:string"/>
+        <xs:element name="titleLanguage" type="xs:string"/>
+        <xs:element name="titleTranslation" type="xs:string"/>
+        <xs:element name="titleType" type="xs:string"/>
+        <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"/>
+
+        <!-- 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"/>
+
+        <!-- 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="editionNumber" type="xs:string"/>
+        <xs:element name="form" type="xs:string"/>
+
+        <!-- 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"/>
+
+        <!-- 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"/>
+
+        <!-- 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"/>
+
+        <!-- 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"/>
+
+        <!-- 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"/>
+
+        <!-- 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"/>
+
+        <!-- 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"/>
+
+        <!-- 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"/>
+
+        <!-- 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"/>
+
+        <!-- Reference Information -->
+        <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 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:schema>
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 9b5ece86d..9e4e1d006 100644
--- a/services/collectionobject/client/src/test/java/org/collectionspace/services/client/test/CollectionObjectAuthRefsTest.java
+++ b/services/collectionobject/client/src/test/java/org/collectionspace/services/client/test/CollectionObjectAuthRefsTest.java
@@ -94,7 +94,7 @@ public class CollectionObjectAuthRefsTest extends BaseServiceTest {
     private String contentPersonRefName = null;
     
     /** The inscriber ref name. */
-    private String inscriberRefName = null;
+    private String contentInscriberRefName = null;
     
     /** The number of authority references expected. */
     private final int NUM_AUTH_REFS_EXPECTED = 4;
@@ -147,7 +147,7 @@ public class CollectionObjectAuthRefsTest extends BaseServiceTest {
 								contentOrganizationRefName,
 								contentPeopleRefName,
 								contentPersonRefName,
-								inscriberRefName );
+								contentInscriberRefName );
 
         ClientResponse<Response> res = collectionObjectClient.create(multipart);
 
@@ -197,21 +197,21 @@ public class CollectionObjectAuthRefsTest extends BaseServiceTest {
         Assert.assertEquals(statusCode, STATUS_CREATED);
         personAuthCSID = extractId(res);
         
-        contentOrganizationRefName = PersonAuthorityClientUtils.createPersonRefName(
-        							authRefName, "Omni Org", true);
+        contentOrganizationRefName =
+            PersonAuthorityClientUtils.createPersonRefName(authRefName, "Omni Org", true);
         personIdsCreated.add(createPerson("Omni", "Org", contentOrganizationRefName));
         
-        contentPeopleRefName = PersonAuthorityClientUtils.createPersonRefName(
-									authRefName, "Pushy People", true);
+        contentPeopleRefName =
+            PersonAuthorityClientUtils.createPersonRefName(authRefName, "Pushy People", true);
         personIdsCreated.add(createPerson("Pushy", "People", contentPeopleRefName));
         
-        contentPersonRefName = PersonAuthorityClientUtils.createPersonRefName(
-									authRefName, "Connie ContactPerson", true);
+        contentPersonRefName =
+                PersonAuthorityClientUtils.createPersonRefName(authRefName, "Connie ContactPerson", true);
         personIdsCreated.add(createPerson("Connie", "ContactPerson", contentPersonRefName));
         
-        inscriberRefName = PersonAuthorityClientUtils.createPersonRefName(
-									authRefName, "Ingrid Inscriber", true);
-        personIdsCreated.add(createPerson("Ingrid", "Inscriber", inscriberRefName));
+        contentInscriberRefName =
+            PersonAuthorityClientUtils.createPersonRefName(authRefName, "Ingrid Inscriber", true);
+        personIdsCreated.add(createPerson("Ingrid", "Inscriber", contentInscriberRefName));
     }
     
     /**
@@ -276,7 +276,7 @@ public class CollectionObjectAuthRefsTest extends BaseServiceTest {
         Assert.assertNotNull(collectionObject);
         // Check a couple of fields
         Assert.assertEquals(collectionObject.getContentOrganization(), contentOrganizationRefName);
-        Assert.assertEquals(collectionObject.getInscriber(), inscriberRefName);
+        Assert.assertEquals(collectionObject.getInscriptionContentInscriber(), contentInscriberRefName);
         
         // Get the auth refs and check them
         ClientResponse<AuthorityRefList> res2 = collectionObjectClient.getAuthorityRefs(knownResourceId);
@@ -393,7 +393,7 @@ public class CollectionObjectAuthRefsTest extends BaseServiceTest {
         collectionObject.setContentOrganization(contentOrganization);
         collectionObject.setContentPeople(contentPeople);
         collectionObject.setContentPerson(contentPerson);
-        collectionObject.setInscriber(inscriber);
+        collectionObject.setInscriptionContentInscriber(inscriber);
         MultipartOutput multipart = new MultipartOutput();
         OutputPart commonPart =
             multipart.addPart(collectionObject, MediaType.APPLICATION_XML_TYPE);
diff --git a/services/collectionobject/client/src/test/java/org/collectionspace/services/client/test/CollectionObjectSearchTest.java b/services/collectionobject/client/src/test/java/org/collectionspace/services/client/test/CollectionObjectSearchTest.java
index 6aa258349..c2b4a3104 100644
--- a/services/collectionobject/client/src/test/java/org/collectionspace/services/client/test/CollectionObjectSearchTest.java
+++ b/services/collectionobject/client/src/test/java/org/collectionspace/services/client/test/CollectionObjectSearchTest.java
@@ -107,6 +107,7 @@ public class CollectionObjectSearchTest extends BaseServiceTest {
 
     // Success outcomes
 
+    // FIXME: Rename to searchWithOneKeyword
     @Test(dataProvider="testName", dataProviderClass=AbstractServiceTestImpl.class)
     public void keywordSearchOneWord(String testName) throws Exception {
 
@@ -159,12 +160,14 @@ public class CollectionObjectSearchTest extends BaseServiceTest {
 
     }
 
+    // FIXME: Rename to searchWithOneKeywordInRepeatableScalarField
     // @Test(dataProvider="testName", dataProviderClass=AbstractServiceTestImpl.class)
     public void keywordSearchRepeatableScalarField(String testName) throws Exception {
     }
 
     // Failure outcomes
 
+    // FIXME: Rename to searchWithNonExistentKeyword
     @Test(dataProvider="testName", dataProviderClass=AbstractServiceTestImpl.class)
     public void keywordSearchNonExistentKeyword(String testName) throws Exception {
 
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 8300737c0..d2946dba8 100644
--- a/services/collectionobject/client/src/test/resources/test-data/repfield_whitesp1.xml
+++ b/services/collectionobject/client/src/test/resources/test-data/repfield_whitesp1.xml
@@ -19,7 +19,7 @@
 <!-- test whitespace as first child node -->
 <responsibleDepartments> <responsibleDepartment> responsibleDept1</responsibleDepartment><responsibleDepartment>responsibleDept2</responsibleDepartment></responsibleDepartments>
 <title>title</title>
-<objectTitleLanguage>objectTitleLanguage</objectTitleLanguage>
+<titleLanguage>titleLanguage</titleLanguage>
 <titleTranslation>titleTranslation</titleTranslation>
 <titleType>titleType</titleType>
 <age>age</age>
@@ -54,16 +54,16 @@
 <editionNumber>editionNumber</editionNumber>
 <form>form</form>
 <inscriptionContent>inscriptionContent</inscriptionContent>
-<inscriber>inscriber</inscriber>
-<inscriptionDate>inscriptionDate</inscriptionDate>
-<inscriptionInterpretation>inscriptionInterpretation</inscriptionInterpretation>
-<inscriptionLanguage>inscriptionLanguage</inscriptionLanguage>
-<inscriptionMethod>inscriptionMethod</inscriptionMethod>
-<inscriptionPosition>inscriptionPosition</inscriptionPosition>
-<inscriptionScript>inscriptionScript</inscriptionScript>
-<inscriptionTranslation>inscriptionTranslation</inscriptionTranslation>
-<inscriptionTransliteration>inscriptionTransliteration</inscriptionTransliteration>
-<inscriptionType>inscriptionType</inscriptionType>
+<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>
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 fadcd2a88..237bf512f 100644
--- a/services/collectionobject/client/src/test/resources/test-data/repfield_whitesp2.xml
+++ b/services/collectionobject/client/src/test/resources/test-data/repfield_whitesp2.xml
@@ -26,7 +26,7 @@
 </responsibleDepartments>
 
 <title>title</title>
-<objectTitleLanguage>objectTitleLanguage</objectTitleLanguage>
+<titleLanguage>titleLanguage</titleLanguage>
 <titleTranslation>titleTranslation</titleTranslation>
 <titleType>titleType</titleType>
 <age>age</age>
@@ -61,16 +61,16 @@
 <editionNumber>editionNumber</editionNumber>
 <form>form</form>
 <inscriptionContent>inscriptionContent</inscriptionContent>
-<inscriber>inscriber</inscriber>
-<inscriptionDate>inscriptionDate</inscriptionDate>
-<inscriptionInterpretation>inscriptionInterpretation</inscriptionInterpretation>
-<inscriptionLanguage>inscriptionLanguage</inscriptionLanguage>
-<inscriptionMethod>inscriptionMethod</inscriptionMethod>
-<inscriptionPosition>inscriptionPosition</inscriptionPosition>
-<inscriptionScript>inscriptionScript</inscriptionScript>
-<inscriptionTranslation>inscriptionTranslation</inscriptionTranslation>
-<inscriptionTransliteration>inscriptionTransliteration</inscriptionTransliteration>
-<inscriptionType>inscriptionType</inscriptionType>
+<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>
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 29d8de6f2..485039eb5 100644
--- a/services/collectionobject/client/src/test/resources/test-data/repfield_whitesp3.xml
+++ b/services/collectionobject/client/src/test/resources/test-data/repfield_whitesp3.xml
@@ -29,7 +29,7 @@
 </responsibleDepartments>
 
 <title>title</title>
-<objectTitleLanguage>objectTitleLanguage</objectTitleLanguage>
+<titleLanguage>titleLanguage</titleLanguage>
 <titleTranslation>titleTranslation</titleTranslation>
 <titleType>titleType</titleType>
 <age>age</age>
@@ -64,16 +64,16 @@
 <editionNumber>editionNumber</editionNumber>
 <form>form</form>
 <inscriptionContent>inscriptionContent</inscriptionContent>
-<inscriber>inscriber</inscriber>
-<inscriptionDate>inscriptionDate</inscriptionDate>
-<inscriptionInterpretation>inscriptionInterpretation</inscriptionInterpretation>
-<inscriptionLanguage>inscriptionLanguage</inscriptionLanguage>
-<inscriptionMethod>inscriptionMethod</inscriptionMethod>
-<inscriptionPosition>inscriptionPosition</inscriptionPosition>
-<inscriptionScript>inscriptionScript</inscriptionScript>
-<inscriptionTranslation>inscriptionTranslation</inscriptionTranslation>
-<inscriptionTransliteration>inscriptionTransliteration</inscriptionTransliteration>
-<inscriptionType>inscriptionType</inscriptionType>
+<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>
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 72094ee21..9ad7216d9 100644
--- a/services/collectionobject/client/src/test/resources/test-data/repfield_whitesp4.xml
+++ b/services/collectionobject/client/src/test/resources/test-data/repfield_whitesp4.xml
@@ -26,7 +26,7 @@
 </responsibleDepartments>
 
 <title>title</title>
-<objectTitleLanguage>objectTitleLanguage</objectTitleLanguage>
+<titleLanguage>titleLanguage</titleLanguage>
 <titleTranslation>titleTranslation</titleTranslation>
 <titleType>titleType</titleType>
 <age>age</age>
@@ -61,16 +61,16 @@
 <editionNumber>editionNumber</editionNumber>
 <form>form</form>
 <inscriptionContent>inscriptionContent</inscriptionContent>
-<inscriber>inscriber</inscriber>
-<inscriptionDate>inscriptionDate</inscriptionDate>
-<inscriptionInterpretation>inscriptionInterpretation</inscriptionInterpretation>
-<inscriptionLanguage>inscriptionLanguage</inscriptionLanguage>
-<inscriptionMethod>inscriptionMethod</inscriptionMethod>
-<inscriptionPosition>inscriptionPosition</inscriptionPosition>
-<inscriptionScript>inscriptionScript</inscriptionScript>
-<inscriptionTranslation>inscriptionTranslation</inscriptionTranslation>
-<inscriptionTransliteration>inscriptionTransliteration</inscriptionTransliteration>
-<inscriptionType>inscriptionType</inscriptionType>
+<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>
diff --git a/services/collectionobject/client/src/test/resources/test-data/testCambridge.xml b/services/collectionobject/client/src/test/resources/test-data/testCambridge.xml
index ca2e0370b..c95d79a3f 100644
--- a/services/collectionobject/client/src/test/resources/test-data/testCambridge.xml
+++ b/services/collectionobject/client/src/test/resources/test-data/testCambridge.xml
@@ -64,20 +64,17 @@
 <dimensionValueQualifier>dimensionValueQualifier</dimensionValueQualifier>
   <editionNumber>editionNumber</editionNumber>
   <form>form</form>
-  <inscriptionContent>inscriptionContent</inscriptionContent>
-  <inscriber>inscriber</inscriber>
-  <inscriptionDate>inscriptionDate</inscriptionDate>
-
-<inscriptionInterpretation>inscriptionInterpretation</inscriptionInterpretation>
-  <inscriptionLanguage>inscriptionLanguage</inscriptionLanguage>
-  <inscriptionMethod>inscriptionMethod</inscriptionMethod>
-  <inscriptionPosition>inscriptionPosition</inscriptionPosition>
-  <inscriptionScript>inscriptionScript</inscriptionScript>
-  <inscriptionTranslation>inscriptionTranslation</inscriptionTranslation>
-
-<inscriptionTransliteration>inscriptionTransliteration</inscriptionTransliteration>
-  <inscriptionType>inscriptionType</inscriptionType>
-  <inscriptionDescription>inscriptionDescription</inscriptionDescription>
+ <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>
 
diff --git a/services/collectionobject/jaxb/src/main/resources/collectionobjects_common.xsd b/services/collectionobject/jaxb/src/main/resources/collectionobjects_common.xsd
index 8537ff458..c76e05917 100644
--- a/services/collectionobject/jaxb/src/main/resources/collectionobjects_common.xsd
+++ b/services/collectionobject/jaxb/src/main/resources/collectionobjects_common.xsd
@@ -69,7 +69,7 @@
                 <xs:element name="responsibleDepartments" type="responsibleDepartmentList"/>
                 <xs:element name="collection" type="xs:string"/>
                 <xs:element name="title" type="xs:string"/>
-                <xs:element name="objectTitleLanguage" type="xs:string"/>
+                <xs:element name="titleLanguage" type="xs:string"/>
                 <xs:element name="titleTranslation" type="xs:string"/>
                 <xs:element name="titleType" type="xs:string"/>
                 <xs:element name="recordStatus" type="xs:string"/>
@@ -115,16 +115,16 @@
 
                 <!-- Object description Inscription - Content Information -->
                 <xs:element name="inscriptionContent" type="xs:string" />
-                <xs:element name="inscriber" type="xs:string" />
-                <xs:element name="inscriptionDate" type="xs:string" />
-                <xs:element name="inscriptionInterpretation" type="xs:string" />
-                <xs:element name="inscriptionLanguage" type="xs:string" />
-                <xs:element name="inscriptionMethod" type="xs:string" />
-                <xs:element name="inscriptionPosition" type="xs:string" />
-                <xs:element name="inscriptionScript" type="xs:string" />
-                <xs:element name="inscriptionTranslation" type="xs:string" />
-                <xs:element name="inscriptionTransliteration" type="xs:string" />
-                <xs:element name="inscriptionType" 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" />
@@ -166,6 +166,7 @@
                 <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" />
@@ -193,7 +194,7 @@
                 <xs:element name="ownershipDates" type="xs:string" />
                 <xs:element name="ownershipExchangeMethod" type="xs:string" />
                 <xs:element name="ownershipExchangeNote" type="xs:string" />
-                <xs:element name="ownershipExchangePriceDenomination" 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" />
diff --git a/services/common/src/main/config/services/tenant-bindings.xml b/services/common/src/main/config/services/tenant-bindings.xml
index 2fdd37b86..06cb55674 100644
--- a/services/common/src/main/config/services/tenant-bindings.xml
+++ b/services/common/src/main/config/services/tenant-bindings.xml
@@ -66,7 +66,7 @@
                         <types:item><types:key>authRef</types:key><types:value>contentOrganization</types:value></types:item>
                         <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>inscriber</types:value></types:item>
+                        <types:item><types:key>authRef</types:key><types:value>inscriptionContentInscriber</types:value></types:item>
                     </service:properties>
                     <service:content contentType="application/xml">
                         <service:xmlContent
@@ -1114,7 +1114,7 @@
                         <types:item><types:key>authRef</types:key><types:value>contentOrganization</types:value></types:item>
                         <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>inscriber</types:value></types:item>
+                        <types:item><types:key>authRef</types:key><types:value>inscriptionContentInscriber</types:value></types:item>
                     </service:properties>
                     <service:content contentType="application/xml">
                         <service:xmlContent