From 460f934baab8e476b77e0c5d4281955a0a67b05a Mon Sep 17 00:00:00 2001
From: Aron Roberts <aron@socrates.berkeley.edu>
Date: Thu, 25 Feb 2010 22:22:30 +0000
Subject: [PATCH] CSPACE-1066,CSPACE-1067: Intake schema in services layer
 changed to conform to Intake schema on the project wiki. Eleven (11) Object
 Collecting Information Group fields have been removed. Also renamed three
 fields in the Intake schema for consistency with Service schema
 capitalization conventions: lowercase initial letter and interCaps. Due to
 changes in Nuxeo document type, will require running 'ant deploy' and a
 two-server restart.

---
 .../main/resources/schemas/intakes_common.xsd | 29 ++++++-------------
 .../src/main/resources/intakes-common.xsd     | 17 ++---------
 2 files changed, 12 insertions(+), 34 deletions(-)

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 ebf92ebd4..d27a2f408 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
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 
 <!--
     Intake schema (XSD)
@@ -43,31 +43,20 @@
     <xs:element name="datePeriod" type="xs:string"/>
     <xs:element name="dateText" type="xs:string"/>
     
-<!--  Object Collection Information Group -->
+    <!--  Object Collection Information Group -->
     <xs:element name="fieldCollectionDate" type="xs:string"/>
     <xs:element name="fieldCollectionEventName" type="xs:string"/>
-    <xs:element name="fieldCollectionEventRefNumber" type="xs:string"/>
-    <xs:element name="fieldCollectionMethod" type="xs:string"/>
-    <xs:element name="fieldCollectionNote" type="xs:string"/>
     <xs:element name="fieldCollectionNumber" type="xs:string"/>
-    <xs:element name="fieldCollectionPlace" type="xs:string"/>
-    <xs:element name="fieldCollectionSource" type="xs:string"/>
     <xs:element name="fieldCollector" type="xs:string"/>
-    <xs:element name="geologicalComplexName" type="xs:string"/>
-    <xs:element name="habitat" type="xs:string"/>
-    <xs:element name="habitatNote" type="xs:string"/>
-    <xs:element name="stratigraphicUnitName" type="xs:string"/>
-    <xs:element name="stratigraphicUnitType" type="xs:string"/>
-    <xs:element name="stratigraphicUnitNote" type="xs:string"/>
-    
-<!-- Valuation Information Group -->
-    <xs:element name="ValuationReferenceNumber" type="xs:string"/>
-    <xs:element name="Valuer" type="xs:string"/>
-    
-<!-- Insurance Information Group -->
+
+    <!-- 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="insuranceReferenceNumber" type="xs:string"/>
     <xs:element name="insuranceRenewalDate" type="xs:string"/>
     <xs:element name="insurer" type="xs:string"/>
     
diff --git a/services/intake/jaxb/src/main/resources/intakes-common.xsd b/services/intake/jaxb/src/main/resources/intakes-common.xsd
index e20eb2a40..1d2c578e7 100644
--- a/services/intake/jaxb/src/main/resources/intakes-common.xsd
+++ b/services/intake/jaxb/src/main/resources/intakes-common.xsd
@@ -57,28 +57,17 @@
                 <!--  Object Collection Information Group -->
                 <xs:element name="fieldCollectionDate" type="xs:string"/>
                 <xs:element name="fieldCollectionEventName" type="xs:string"/>
-                <xs:element name="fieldCollectionEventRefNumber" type="xs:string"/>
-                <xs:element name="fieldCollectionMethod" type="xs:string"/>
-                <xs:element name="fieldCollectionNote" type="xs:string"/>
                 <xs:element name="fieldCollectionNumber" type="xs:string"/>
-                <xs:element name="fieldCollectionPlace" type="xs:string"/>
-                <xs:element name="fieldCollectionSource" type="xs:string"/>
                 <xs:element name="fieldCollector" type="xs:string"/>
-                <xs:element name="geologicalComplexName" type="xs:string"/>
-                <xs:element name="habitat" type="xs:string"/>
-                <xs:element name="habitatNote" type="xs:string"/>
-                <xs:element name="stratigraphicUnitName" type="xs:string"/>
-                <xs:element name="stratigraphicUnitType" type="xs:string"/>
-                <xs:element name="stratigraphicUnitNote" type="xs:string"/>
                 
                 <!-- Valuation Information Group -->
-                <xs:element name="ValuationReferenceNumber" type="xs:string"/>
-                <xs:element name="Valuer" type="xs:string"/>
+                <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="insuranceReferenceNumber" type="xs:string"/>
                 <xs:element name="insuranceRenewalDate" type="xs:string"/>
                 <xs:element name="insurer" type="xs:string"/>
                 
-- 
2.47.3