From: Aron Roberts <aron@socrates.berkeley.edu>
Date: Tue, 15 Jun 2010 22:34:33 +0000 (+0000)
Subject: CSPACE-2135,CSPACE-1220: Updated Intake schema at the services layer to the Limited... 
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=669214edf52c4d894587a92cab79e4b69d77429c;p=tmp%2Fjakarta-migration.git

CSPACE-2135,CSPACE-1220: Updated Intake schema at the services layer to the Limited for 0.8 schema. Removed three fields and changed the names of two fields.
---

diff --git a/services/common/src/main/config/services/tenant-bindings.xml b/services/common/src/main/config/services/tenant-bindings.xml
index af3aa1feb..087088613 100644
--- a/services/common/src/main/config/services/tenant-bindings.xml
+++ b/services/common/src/main/config/services/tenant-bindings.xml
@@ -126,9 +126,8 @@
                     <service:properties>
                         <types:item><types:key>authRef</types:key><types:value>currentOwner</types:value></types:item>
                         <types:item><types:key>authRef</types:key><types:value>depositor</types:value></types:item>
-                        <types:item><types:key>authRef</types:key><types:value>conditionCheckAssesor</types:value></types:item>
+                        <types:item><types:key>authRef</types:key><types:value>conditionCheckerAssessor</types:value></types:item>
                         <types:item><types:key>authRef</types:key><types:value>insurer</types:value></types:item>
-                        <types:item><types:key>authRef</types:key><types:value>fieldCollector</types:value></types:item>
                         <types:item><types:key>authRef</types:key><types:value>valuer</types:value></types:item>
                     </service:properties>
                     <service:content contentType="application/xml">
@@ -1173,9 +1172,8 @@
                     <service:properties>
                         <types:item><types:key>authRef</types:key><types:value>currentOwner</types:value></types:item>
                         <types:item><types:key>authRef</types:key><types:value>depositor</types:value></types:item>
-                        <types:item><types:key>authRef</types:key><types:value>conditionCheckAssesor</types:value></types:item>
+                        <types:item><types:key>authRef</types:key><types:value>conditionCheckerAssessor</types:value></types:item>
                         <types:item><types:key>authRef</types:key><types:value>insurer</types:value></types:item>
-                        <types:item><types:key>authRef</types:key><types:value>fieldCollector</types:value></types:item>
                         <types:item><types:key>authRef</types:key><types:value>valuer</types:value></types:item>
                     </service:properties>
                     <service:content contentType="application/xml">
diff --git a/services/intake/3rdparty/nuxeo-platform-cs-intake/src/main/resources/schemas/intakes_common.xsd b/services/intake/3rdparty/nuxeo-platform-cs-intake/src/main/resources/schemas/intakes_common.xsd
index d27a2f408..d424b5910 100644
--- a/services/intake/3rdparty/nuxeo-platform-cs-intake/src/main/resources/schemas/intakes_common.xsd
+++ b/services/intake/3rdparty/nuxeo-platform-cs-intake/src/main/resources/schemas/intakes_common.xsd
@@ -2,7 +2,7 @@
 
 <!--
     Intake schema (XSD)
-    
+
     Entity  : Intake
     Part    : Common
     Used for: Nuxeo EP core document type
@@ -20,7 +20,7 @@
     
     <!-- See http://wiki.collectionspace.org/display/collectionspace/Intake+Schema -->
 
-<!--  Object Entry Information Group -->
+    <!--  Object Entry Information Group -->
     <xs:element name="currentOwner" type="xs:string"/>
     <xs:element name="depositor" type="xs:string"/>
     <xs:element name="depositorsRequirements" type="xs:string"/>
@@ -32,22 +32,8 @@
     <xs:element name="packingNote" type="xs:string"/>
     <xs:element name="returnDate" type="xs:string"/>
     
-<!--  Date Information Group -->
-    <xs:element name="associationDate" type="xs:string"/>
-    <xs:element name="earliestDate" type="xs:string"/>
-    <xs:element name="earliestDateCertainty" type="xs:string"/>
-    <xs:element name="earliestDateQualifier" type="xs:string"/>
-    <xs:element name="latestDate" type="xs:string"/>
-    <xs:element name="latestDateCertainty" type="xs:string"/>
-    <xs:element name="latestDateQualifier" type="xs:string"/>
-    <xs:element name="datePeriod" type="xs:string"/>
-    <xs:element name="dateText" type="xs:string"/>
-    
     <!--  Object Collection Information Group -->
-    <xs:element name="fieldCollectionDate" type="xs:string"/>
     <xs:element name="fieldCollectionEventName" type="xs:string"/>
-    <xs:element name="fieldCollectionNumber" type="xs:string"/>
-    <xs:element name="fieldCollector" type="xs:string"/>
 
     <!-- Valuation Information Group -->
     <xs:element name="valuationReferenceNumber" type="xs:string"/>
@@ -60,19 +46,31 @@
     <xs:element name="insuranceRenewalDate" type="xs:string"/>
     <xs:element name="insurer" type="xs:string"/>
     
-<!-- Object Location Information Group -->
+    <!-- Object Location Information Group -->
     <xs:element name="currentLocation" type="xs:string"/>
     <xs:element name="currentLocationFitness" type="xs:string"/>
     <xs:element name="currentLocationNote" type="xs:string"/>
     <xs:element name="locationDate" type="xs:string"/>
     <xs:element name="normalLocation" type="xs:string"/>
     
-<!-- Condition Check/Technical Assessment Information Group -->
+    <!-- Condition Check/Technical Assessment Information Group -->
     <xs:element name="conditionCheckDate" type="xs:string"/>
     <xs:element name="conditionCheckMethod" type="xs:string"/>
     <xs:element name="conditionCheckNote" type="xs:string"/>
     <xs:element name="conditionCheckReason" type="xs:string"/>
     <xs:element name="conditionCheckReferenceNumber" type="xs:string"/>
-    <xs:element name="conditionCheckAssesor" type="xs:string"/>
+    <xs:element name="conditionCheckerAssessor" type="xs:string"/>
+
+    <!--  Date Information Group -->
+    <!-- This appears to be a placeholder structured date -->
+    <xs:element name="dateAssociation" type="xs:string"/>
+    <xs:element name="earliestDate" type="xs:string"/>
+    <xs:element name="earliestDateCertainty" type="xs:string"/>
+    <xs:element name="earliestDateQualifier" type="xs:string"/>
+    <xs:element name="latestDate" type="xs:string"/>
+    <xs:element name="latestDateCertainty" type="xs:string"/>
+    <xs:element name="latestDateQualifier" type="xs:string"/>
+    <xs:element name="datePeriod" type="xs:string"/>
+    <xs:element name="dateText" type="xs:string"/>
     
 </xs:schema>
diff --git a/services/intake/client/src/test/java/org/collectionspace/services/client/test/IntakeAuthRefsTest.java b/services/intake/client/src/test/java/org/collectionspace/services/client/test/IntakeAuthRefsTest.java
index e0c0cd917..d3e7c09d4 100644
--- a/services/intake/client/src/test/java/org/collectionspace/services/client/test/IntakeAuthRefsTest.java
+++ b/services/intake/client/src/test/java/org/collectionspace/services/client/test/IntakeAuthRefsTest.java
@@ -72,11 +72,10 @@ public class IntakeAuthRefsTest extends BaseServiceTest {
     private String personAuthCSID = null; 
     private String currentOwnerRefName = null;
     private String depositorRefName = null;
-    private String conditionCheckAssesorRefName = null;
+    private String conditionCheckerAssessorRefName = null;
     private String insurerRefName = null;
-    private String fieldCollectorRefName = null;
     private String valuerRefName = null;
-    private final int NUM_AUTH_REFS_EXPECTED = 6;
+    private final int NUM_AUTH_REFS_EXPECTED = 5;
 
     /* (non-Javadoc)
      * @see org.collectionspace.services.client.test.BaseServiceTest#getClientInstance()
@@ -120,9 +119,8 @@ public class IntakeAuthRefsTest extends BaseServiceTest {
                 "entryDate-" + identifier,
                 currentOwnerRefName,
                 depositorRefName,
-                conditionCheckAssesorRefName,
+                conditionCheckerAssessorRefName,
                 insurerRefName,
-                fieldCollectorRefName,
                 valuerRefName );
         ClientResponse<Response> res = intakeClient.create(multipart);
 
@@ -177,18 +175,14 @@ public class IntakeAuthRefsTest extends BaseServiceTest {
 									authRefName, "Debbie Depositor", true);
         personIdsCreated.add(createPerson("Debbie", "Depositor", depositorRefName));
         
-        conditionCheckAssesorRefName = PersonAuthorityClientUtils.createPersonRefName(
-									authRefName, "Andrew Assessor", true);
-        personIdsCreated.add(createPerson("Andrew", "Assessor", conditionCheckAssesorRefName));
+        conditionCheckerAssessorRefName = PersonAuthorityClientUtils.createPersonRefName(
+									authRefName, "Andrew Checker-Assessor", true);
+        personIdsCreated.add(createPerson("Andrew", "Checker-Assessor", conditionCheckerAssessorRefName));
         
         insurerRefName = PersonAuthorityClientUtils.createPersonRefName(
 									authRefName, "Ingrid Insurer", true);
         personIdsCreated.add(createPerson("Ingrid", "Insurer", insurerRefName));
         
-        fieldCollectorRefName = PersonAuthorityClientUtils.createPersonRefName(
-									authRefName, "Connie Collector", true);
-        personIdsCreated.add(createPerson("Connie", "Collector", fieldCollectorRefName));
-        
         valuerRefName = PersonAuthorityClientUtils.createPersonRefName(
 									authRefName, "Vince Valuer", true);
         personIdsCreated.add(createPerson("Vince", "Valuer", valuerRefName));
@@ -333,21 +327,20 @@ public class IntakeAuthRefsTest extends BaseServiceTest {
     }
 
    private MultipartOutput createIntakeInstance(String entryNumber,
-    		String entryDate,
-				String currentOwner,
-				String depositor,
-				String conditionCheckAssesor,
-				String insurer,
-				String fieldCollector,
-				String Valuer ) {
+        String entryDate,
+        String currentOwner,
+        String depositor,
+        String conditionCheckerAssessor,
+        String insurer,
+        String Valuer ) {
+
         IntakesCommon intake = new IntakesCommon();
         intake.setEntryNumber(entryNumber);
         intake.setEntryDate(entryDate);
         intake.setCurrentOwner(currentOwner);
         intake.setDepositor(depositor);
-        intake.setConditionCheckAssesor(conditionCheckAssesor);
+        intake.setConditionCheckerAssessor(conditionCheckerAssessor);
         intake.setInsurer(insurer);
-        intake.setFieldCollector(fieldCollector);
         intake.setValuer(Valuer);
         MultipartOutput multipart = new MultipartOutput();
         OutputPart commonPart =
diff --git a/services/intake/client/src/test/java/org/collectionspace/services/client/test/OrganizationAuthRefDocsTest.java b/services/intake/client/src/test/java/org/collectionspace/services/client/test/OrganizationAuthRefDocsTest.java
index 7a4ecf7bb..1be1479c5 100644
--- a/services/intake/client/src/test/java/org/collectionspace/services/client/test/OrganizationAuthRefDocsTest.java
+++ b/services/intake/client/src/test/java/org/collectionspace/services/client/test/OrganizationAuthRefDocsTest.java
@@ -74,9 +74,8 @@ public class OrganizationAuthRefDocsTest extends BaseServiceTest {
     private String currentOwnerOrgCSID = null; 
     private String currentOwnerRefName = null;
     private String depositorRefName = null;
-    private String conditionCheckAssesorRefName = null;
+    private String conditionCheckerAssessorRefName = null;
     private String insurerRefName = null;
-    private String fieldCollectorRefName = null;
     private String valuerRefName = null;
     private final int NUM_AUTH_REF_DOCS_EXPECTED = 1;
 
@@ -121,9 +120,8 @@ public class OrganizationAuthRefDocsTest extends BaseServiceTest {
                 "entryDate-" + identifier,
 								currentOwnerRefName,
 								depositorRefName,
-								conditionCheckAssesorRefName,
+								conditionCheckerAssessorRefName,
 								insurerRefName,
-								fieldCollectorRefName,
 								valuerRefName );
 
         ClientResponse<Response> res = intakeClient.create(multipart);
@@ -186,18 +184,14 @@ public class OrganizationAuthRefDocsTest extends BaseServiceTest {
 									authRefName, "Debbie Depositor", true);
         orgIdsCreated.add(createOrganization("Debbie", "Depositor", depositorRefName));
         
-        conditionCheckAssesorRefName = OrgAuthorityClientUtils.createOrganizationRefName(
-									authRefName, "Andrew Assessor", true);
-        orgIdsCreated.add(createOrganization("Andrew", "Assessor", conditionCheckAssesorRefName));
+        conditionCheckerAssessorRefName = OrgAuthorityClientUtils.createOrganizationRefName(
+									authRefName, "Andrew Checker-Assessor", true);
+        orgIdsCreated.add(createOrganization("Andrew", "Checker-Assessor", conditionCheckerAssessorRefName));
         
         insurerRefName = OrgAuthorityClientUtils.createOrganizationRefName(
 									authRefName, "Ingrid Insurer", true);
         orgIdsCreated.add(createOrganization("Ingrid", "Insurer", insurerRefName));
         
-        fieldCollectorRefName = OrgAuthorityClientUtils.createOrganizationRefName(
-									authRefName, "Connie Collector", true);
-        orgIdsCreated.add(createOrganization("Connie", "Collector", fieldCollectorRefName));
-        
         valuerRefName = OrgAuthorityClientUtils.createOrganizationRefName(
 									authRefName, "Vince Valuer", true);
         orgIdsCreated.add(createOrganization("Vince", "Valuer", valuerRefName));
@@ -326,18 +320,16 @@ public class OrganizationAuthRefDocsTest extends BaseServiceTest {
     		String entryDate,
 				String currentOwner,
 				String depositor,
-				String conditionCheckAssesor,
+				String conditionCheckerAssessor,
 				String insurer,
-				String fieldCollector,
 				String Valuer ) {
         IntakesCommon intake = new IntakesCommon();
         intake.setEntryNumber(entryNumber);
         intake.setEntryDate(entryDate);
         intake.setCurrentOwner(currentOwner);
         intake.setDepositor(depositor);
-        intake.setConditionCheckAssesor(conditionCheckAssesor);
+        intake.setConditionCheckerAssessor(conditionCheckerAssessor);
         intake.setInsurer(insurer);
-        intake.setFieldCollector(fieldCollector);
         intake.setValuer(Valuer);
         MultipartOutput multipart = new MultipartOutput();
         OutputPart commonPart =
diff --git a/services/intake/client/src/test/java/org/collectionspace/services/client/test/PersonAuthRefDocsTest.java b/services/intake/client/src/test/java/org/collectionspace/services/client/test/PersonAuthRefDocsTest.java
index ae955825e..b600372d1 100644
--- a/services/intake/client/src/test/java/org/collectionspace/services/client/test/PersonAuthRefDocsTest.java
+++ b/services/intake/client/src/test/java/org/collectionspace/services/client/test/PersonAuthRefDocsTest.java
@@ -74,9 +74,8 @@ public class PersonAuthRefDocsTest extends BaseServiceTest {
     private String currentOwnerPersonCSID = null; 
     private String currentOwnerRefName = null;
     private String depositorRefName = null;
-    private String conditionCheckAssesorRefName = null;
+    private String conditionCheckerAssessorRefName = null;
     private String insurerRefName = null;
-    private String fieldCollectorRefName = null;
     private String valuerRefName = null;
     private final int NUM_AUTH_REF_DOCS_EXPECTED = 1;
 
@@ -119,12 +118,11 @@ public class PersonAuthRefDocsTest extends BaseServiceTest {
         MultipartOutput multipart = createIntakeInstance(
                 "entryNumber-" + identifier,
                 "entryDate-" + identifier,
-								currentOwnerRefName,
-								depositorRefName,
-								conditionCheckAssesorRefName,
-								insurerRefName,
-								fieldCollectorRefName,
-								valuerRefName );
+		currentOwnerRefName,
+		depositorRefName,
+		conditionCheckerAssessorRefName,
+		insurerRefName,
+		valuerRefName );
 
         ClientResponse<Response> res = intakeClient.create(multipart);
         try {
@@ -186,18 +184,14 @@ public class PersonAuthRefDocsTest extends BaseServiceTest {
 									authRefName, "Debbie Depositor", true);
         personIdsCreated.add(createPerson("Debbie", "Depositor", depositorRefName));
         
-        conditionCheckAssesorRefName = PersonAuthorityClientUtils.createPersonRefName(
-									authRefName, "Andrew Assessor", true);
-        personIdsCreated.add(createPerson("Andrew", "Assessor", conditionCheckAssesorRefName));
+        conditionCheckerAssessorRefName = PersonAuthorityClientUtils.createPersonRefName(
+									authRefName, "Andrew Checker-Assessor", true);
+        personIdsCreated.add(createPerson("Andrew", "Checker-Assessor", conditionCheckerAssessorRefName));
         
         insurerRefName = PersonAuthorityClientUtils.createPersonRefName(
 									authRefName, "Ingrid Insurer", true);
         personIdsCreated.add(createPerson("Ingrid", "Insurer", insurerRefName));
         
-        fieldCollectorRefName = PersonAuthorityClientUtils.createPersonRefName(
-									authRefName, "Connie Collector", true);
-        personIdsCreated.add(createPerson("Connie", "Collector", fieldCollectorRefName));
-        
         valuerRefName = PersonAuthorityClientUtils.createPersonRefName(
 									authRefName, "Vince Valuer", true);
         personIdsCreated.add(createPerson("Vince", "Valuer", valuerRefName));
@@ -326,18 +320,16 @@ public class PersonAuthRefDocsTest extends BaseServiceTest {
     		String entryDate,
 				String currentOwner,
 				String depositor,
-				String conditionCheckAssesor,
+				String conditionCheckerAssessor,
 				String insurer,
-				String fieldCollector,
 				String Valuer ) {
         IntakesCommon intake = new IntakesCommon();
         intake.setEntryNumber(entryNumber);
         intake.setEntryDate(entryDate);
         intake.setCurrentOwner(currentOwner);
         intake.setDepositor(depositor);
-        intake.setConditionCheckAssesor(conditionCheckAssesor);
+        intake.setConditionCheckerAssessor(conditionCheckerAssessor);
         intake.setInsurer(insurer);
-        intake.setFieldCollector(fieldCollector);
         intake.setValuer(Valuer);
         MultipartOutput multipart = new MultipartOutput();
         OutputPart commonPart =
diff --git a/services/intake/jaxb/src/main/resources/intakes-common.xsd b/services/intake/jaxb/src/main/resources/intakes-common.xsd
index 862d1c8d4..febe2e23d 100644
--- a/services/intake/jaxb/src/main/resources/intakes-common.xsd
+++ b/services/intake/jaxb/src/main/resources/intakes-common.xsd
@@ -44,49 +44,48 @@
                 <xs:element name="entryReason" type="xs:string"/>
                 <xs:element name="packingNote" type="xs:string"/>
                 <xs:element name="returnDate" type="xs:string"/>
-                
-                <!--  Date Information Group -->
-                <xs:element name="associationDate" type="xs:string"/>
-                <xs:element name="earliestDate" type="xs:string"/>
-                <xs:element name="earliestDateCertainty" type="xs:string"/>
-                <xs:element name="earliestDateQualifier" type="xs:string"/>
-                <xs:element name="latestDate" type="xs:string"/>
-                <xs:element name="latestDateCertainty" type="xs:string"/>
-                <xs:element name="latestDateQualifier" type="xs:string"/>
-                <xs:element name="datePeriod" type="xs:string"/>
-                <xs:element name="dateText" type="xs:string"/>
-                
+
                 <!--  Object Collection Information Group -->
-                <xs:element name="fieldCollectionDate" type="xs:string"/>
                 <xs:element name="fieldCollectionEventName" type="xs:string"/>
-                <xs:element name="fieldCollectionNumber" type="xs:string"/>
-                <xs:element name="fieldCollector" type="xs:string"/>
-                
+
                 <!-- Valuation Information Group -->
                 <xs:element name="valuationReferenceNumber" type="xs:string"/>
                 <xs:element name="valuer" type="xs:string"/>
-                
+
                 <!-- Insurance Information Group -->
                 <xs:element name="insuranceNote" type="xs:string"/>
                 <xs:element name="insurancePolicyNumber" type="xs:string"/>
                 <xs:element name="insuranceReferenceNumber" type="xs:string"/>
                 <xs:element name="insuranceRenewalDate" type="xs:string"/>
                 <xs:element name="insurer" type="xs:string"/>
-                
+
                 <!-- Object Location Information Group -->
                 <xs:element name="currentLocation" type="xs:string"/>
                 <xs:element name="currentLocationFitness" type="xs:string"/>
                 <xs:element name="currentLocationNote" type="xs:string"/>
                 <xs:element name="locationDate" type="xs:string"/>
                 <xs:element name="normalLocation" type="xs:string"/>
-                
+
                 <!-- Condition Check/Technical Assessment Information Group -->
                 <xs:element name="conditionCheckDate" type="xs:string"/>
                 <xs:element name="conditionCheckMethod" type="xs:string"/>
                 <xs:element name="conditionCheckNote" type="xs:string"/>
                 <xs:element name="conditionCheckReason" type="xs:string"/>
                 <xs:element name="conditionCheckReferenceNumber" type="xs:string"/>
-                <xs:element name="conditionCheckAssesor" type="xs:string"/>
+                <xs:element name="conditionCheckerAssessor" type="xs:string"/>
+
+                <!--  Date Information Group -->
+                <!-- This appears to be a placeholder structured date -->
+                <xs:element name="dateAssociation" type="xs:string"/>
+                <xs:element name="earliestDate" type="xs:string"/>
+                <xs:element name="earliestDateCertainty" type="xs:string"/>
+                <xs:element name="earliestDateQualifier" type="xs:string"/>
+                <xs:element name="latestDate" type="xs:string"/>
+                <xs:element name="latestDateCertainty" type="xs:string"/>
+                <xs:element name="latestDateQualifier" type="xs:string"/>
+                <xs:element name="datePeriod" type="xs:string"/>
+                <xs:element name="dateText" type="xs:string"/>
+
             </xs:sequence>
         </xs:complexType>
     </xs:element>