CSPACE-723: Fixed a trivial naming discrepancy by renaming the "measuredUnit" field...

diff --git a/services/dimension/3rdparty/nuxeo-platform-cs-dimension/src/main/resources/OSGI-INF/layouts-contrib.xml b/services/dimension/3rdparty/nuxeo-platform-cs-dimension/src/main/resources/OSGI-INF/layouts-contrib.xml
index 089a24bdc953bc4f56f3fee557fecf2c52a856e0..c6da304ef16ff09ed110ad10154875f35333a1b1 100644 (file)
--- a/services/dimension/3rdparty/nuxeo-platform-cs-dimension/src/main/resources/OSGI-INF/layouts-contrib.xml
+++ b/services/dimension/3rdparty/nuxeo-platform-cs-dimension/src/main/resources/OSGI-INF/layouts-contrib.xml
@@ -12,7 +12,7 @@
       <rows>
         <row><widget>dimension</widget></row>
         <row><widget>measuredPart</widget></row>
-        <row><widget>measuredUnit</widget></row>
+        <row><widget>measurementUnit</widget></row>
         <row><widget>value</widget></row>
         <row><widget>valueDate</widget></row>
         <row><widget>valueQualifier</widget></row>
@@ -44,13 +44,13 @@
         </properties>
       </widget>
       
-      <widget name="measuredUnit" type="text">
+      <widget name="measurementUnit" type="text">
         <labels>
-          <label mode="any">measuredUnit</label>
+          <label mode="any">measurementUnit</label>
         </labels>
         <translated>true</translated>
         <fields>
-          <field schema="dimensions_common">measuredUnit</field>
+          <field schema="dimensions_common">measurementUnit</field>
         </fields>
         <properties widgetMode="edit">
           <property name="styleClass">dataInputText</property>

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 8dcfa5a7e97cddad25d6952921b1a3b36179030d..4d0dcf6a7af1779efc02f14185face0014aad9f8 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
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>\r
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>\r
 \r
 <!--\r
     Dimension schema (XSD)\r
@@ -23,7 +23,7 @@
 <!--  Object Entry Information Group -->\r
     <xs:element name="dimension" type="xs:string"/>\r
     <xs:element name="measuredPart" type="xs:string"/>\r
-    <xs:element name="measuredUnit" type="xs:string"/>\r
+    <xs:element name="measurementUnit" type="xs:string"/>\r
     <xs:element name="value" type="xs:string"/>\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/java/org/collectionspace/services/dimension/DimensionJAXBSchema.java b/services/dimension/jaxb/src/main/java/org/collectionspace/services/dimension/DimensionJAXBSchema.java
index b9d4defab33e9755a02d1f2cedee269d455b40f4..5007b71d1e421016f50b156e1d250ecc5fd8b41d 100644 (file)
--- a/services/dimension/jaxb/src/main/java/org/collectionspace/services/dimension/DimensionJAXBSchema.java
+++ b/services/dimension/jaxb/src/main/java/org/collectionspace/services/dimension/DimensionJAXBSchema.java
@@ -10,7 +10,7 @@ package org.collectionspace.services.dimension;
 public interface DimensionJAXBSchema {\r
        final static String DIMENSION = "dimension";\r
        final static String MEASURED_PART = "measuredPart";\r
-       final static String MEASURED_UNIT = "measuredUnit";\r
+       final static String MEASUREMENT_UNIT = "measurementUnit";\r
        final static String VALUE = "value";\r
        final static String VALUE_DATE = "valueDate";\r
        final static String VALUE_QUALIFIER = "valueQualifier";\r

diff --git a/services/dimension/jaxb/src/main/resources/dimensions-common.xsd b/services/dimension/jaxb/src/main/resources/dimensions-common.xsd
index db50b1063f265ae7899ea52d8e5265f959547761..5d5c25357f9a4781d3ebd1fe1848456d590deb07 100644 (file)
--- a/services/dimension/jaxb/src/main/resources/dimensions-common.xsd
+++ b/services/dimension/jaxb/src/main/resources/dimensions-common.xsd
@@ -32,7 +32,7 @@
                 <xs:element name="csid" type="xs:string" />
                 <xs:element name="dimension" type="xs:string"/>
                 <xs:element name="measuredPart" type="xs:string"/>
-                <xs:element name="measuredUnit" type="xs:string"/>
+                <xs:element name="measurementUnit" type="xs:string"/>
                 <xs:element name="value" type="xs:string"/>
                 <xs:element name="valueDate" type="xs:string"/>
                 <xs:element name="valueQualifier" type="xs:string"/>