From: Aron Roberts <aron@socrates.berkeley.edu>
Date: Fri, 28 Oct 2011 01:13:24 +0000 (+0000)
Subject: CSPACE-4478,CSPACE-4479,CSPACE-4538: Uniformly added measuredBy, measuredPart, and... 
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=d06da4df4caca3e4a8cfeb46908827c8514d06dd;p=tmp%2Fjakarta-migration.git

CSPACE-4478,CSPACE-4479,CSPACE-4538: Uniformly added measuredBy, measuredPart, and measurementMethod fields to dimensions repeatable groups in the services, in CollectionObject / Cataloging records and Dimensions records, matching both the dimensions repeatable group already present in Media records and the wiki Dimensions schema.  This schema change simply adds fields to an existing repeatable group, matching the wiki wireframe and the current UI layout, and doesn't attempt to address any requirements for sub-repeatability as per CSPACE-3686.
---

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 830bbe8e0..a193c8843 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
@@ -11,7 +11,6 @@
     $LastChangedDate: 2011-05-12 17:36:23 -0700 (Thu, 12 May 2011) $
 -->
 
-
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
     xmlns:ns="http://collectionspace.org/collectionobject/"
     xmlns="http://collectionspace.org/collectionobject/"
@@ -469,9 +468,11 @@
     </xs:complexType>
     <xs:complexType name="dimensionGroup">
         <xs:sequence>
-            <xs:element name="dimension" type="xs:string"/>
             <xs:element name="measuredPart" type="xs:string"/>
+            <xs:element name="dimension" type="xs:string"/>
+            <xs:element name="measuredBy" type="xs:string"/>
             <xs:element name="measurementUnit" type="xs:string"/>
+            <xs:element name="measurementMethod" type="xs:string"/>
             <xs:element name="value" type="xs:decimal"/>
             <xs:element name="valueDate" type="xs:string"/>
             <xs:element name="valueQualifier" type="xs:string"/>
diff --git a/services/collectionobject/jaxb/src/main/resources/collectionobjects_common.xsd b/services/collectionobject/jaxb/src/main/resources/collectionobjects_common.xsd
index 4a91f29e8..d0c9d7c38 100644
--- a/services/collectionobject/jaxb/src/main/resources/collectionobjects_common.xsd
+++ b/services/collectionobject/jaxb/src/main/resources/collectionobjects_common.xsd
@@ -383,9 +383,11 @@
     </xs:complexType>
     <xs:complexType name="dimensionGroup">
         <xs:sequence>
-            <xs:element name="dimension" type="xs:string"/>
             <xs:element name="measuredPart" type="xs:string"/>
+            <xs:element name="dimension" type="xs:string"/>
+            <xs:element name="measuredBy" type="xs:string"/>
             <xs:element name="measurementUnit" type="xs:string"/>
+            <xs:element name="measurementMethod" type="xs:string"/>
             <xs:element name="value" type="xs:decimal"/>
             <xs:element name="valueDate" type="xs:string"/>
             <xs:element name="valueQualifier" type="xs:string"/>
diff --git a/services/dimension/3rdparty/nuxeo-platform-cs-dimension/src/main/resources/schemas/dimensions_common.xsd b/services/dimension/3rdparty/nuxeo-platform-cs-dimension/src/main/resources/schemas/dimensions_common.xsd
index 592255838..4fc4c2c9c 100644
--- a/services/dimension/3rdparty/nuxeo-platform-cs-dimension/src/main/resources/schemas/dimensions_common.xsd
+++ b/services/dimension/3rdparty/nuxeo-platform-cs-dimension/src/main/resources/schemas/dimensions_common.xsd
@@ -20,10 +20,11 @@
     
     <!-- See http://wiki.collectionspace.org/display/collectionspace/Dimension+Schema -->
 
-<!--  Object Entry Information Group -->
-    <xs:element name="dimension" type="xs:string"/>
     <xs:element name="measuredPart" type="xs:string"/>
+    <xs:element name="dimension" type="xs:string"/>
+    <xs:element name="measuredBy" type="xs:string"/>
     <xs:element name="measurementUnit" type="xs:string"/>
+    <xs:element name="measurementMethod" type="xs:string"/>
     <xs:element name="value" type="xs:decimal"/>
     <xs:element name="valueDate" type="xs:string"/>
     <xs:element name="valueQualifier" type="xs:string"/>
diff --git a/services/dimension/jaxb/src/main/resources/dimensions-common.xsd b/services/dimension/jaxb/src/main/resources/dimensions-common.xsd
index 6d16a4562..a23171c41 100644
--- a/services/dimension/jaxb/src/main/resources/dimensions-common.xsd
+++ b/services/dimension/jaxb/src/main/resources/dimensions-common.xsd
@@ -31,9 +31,11 @@
         <xs:complexType>
             <xs:sequence>
                 <xs:element name="csid" type="xs:string" />
-                <xs:element name="dimension" type="xs:string"/>
                 <xs:element name="measuredPart" type="xs:string"/>
+                <xs:element name="dimension" type="xs:string"/>
+                <xs:element name="measuredBy" type="xs:string"/>
                 <xs:element name="measurementUnit" type="xs:string"/>
+                <xs:element name="measurementMethod" type="xs:string"/>
                 <xs:element name="value" type="xs:decimal"/>
                 <xs:element name="valueDate" type="xs:string"/>
                 <xs:element name="valueQualifier" type="xs:string"/>