CSPACE-4478,CSPACE-4479,CSPACE-4538: Uniformly added measuredBy, measuredPart, and...

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 830bbe8e0b5bf0bae61a88211f8d21eec8e14e38..a193c8843ae0d1ece2c87c2835c4ae885b04bf4a 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
@@ -11,7 +11,6 @@
     $LastChangedDate: 2011-05-12 17:36:23 -0700 (Thu, 12 May 2011) $\r
 -->\r
 \r
-\r
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"\r
     xmlns:ns="http://collectionspace.org/collectionobject/"\r
     xmlns="http://collectionspace.org/collectionobject/"\r
@@ -469,9 +468,11 @@
     </xs:complexType>\r
     <xs:complexType name="dimensionGroup">\r
         <xs:sequence>\r
-            <xs:element name="dimension" type="xs:string"/>\r
             <xs:element name="measuredPart" type="xs:string"/>\r
+            <xs:element name="dimension" type="xs:string"/>\r
+            <xs:element name="measuredBy" type="xs:string"/>\r
             <xs:element name="measurementUnit" type="xs:string"/>\r
+            <xs:element name="measurementMethod" type="xs:string"/>\r
             <xs:element name="value" type="xs:decimal"/>\r
             <xs:element name="valueDate" type="xs:string"/>\r
             <xs:element name="valueQualifier" type="xs:string"/>\r

diff --git a/services/collectionobject/jaxb/src/main/resources/collectionobjects_common.xsd b/services/collectionobject/jaxb/src/main/resources/collectionobjects_common.xsd
index 4a91f29e88f7952bf861eee8c64dffc62129b48c..d0c9d7c387ba0e726da6dd2e3b379fa4a6bcdfd3 100644 (file)
--- 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 592255838d0a7397f388338b653ec4fd05b2955e..4fc4c2c9cdecdcd5174b80ee33c23266a38341ab 100644 (file)
--- 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 @@
     \r
     <!-- See http://wiki.collectionspace.org/display/collectionspace/Dimension+Schema -->\r
 \r
-<!--  Object Entry Information Group -->\r
-    <xs:element name="dimension" type="xs:string"/>\r
     <xs:element name="measuredPart" type="xs:string"/>\r
+    <xs:element name="dimension" type="xs:string"/>\r
+    <xs:element name="measuredBy" type="xs:string"/>\r
     <xs:element name="measurementUnit" type="xs:string"/>\r
+    <xs:element name="measurementMethod" type="xs:string"/>\r
     <xs:element name="value" type="xs:decimal"/>\r
     <xs:element name="valueDate" type="xs:string"/>\r
     <xs:element name="valueQualifier" type="xs:string"/>\r

diff --git a/services/dimension/jaxb/src/main/resources/dimensions-common.xsd b/services/dimension/jaxb/src/main/resources/dimensions-common.xsd
index 6d16a4562da287830120fdd62ca9da0a71bf19a0..a23171c4169638d0aa65ddb8d5c3e8762c64d194 100644 (file)
--- 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"/>