From 36792611b76742085e3f34da1abd82ba9d71bae8 Mon Sep 17 00:00:00 2001
From: Aron Roberts <aron@socrates.berkeley.edu>
Date: Mon, 11 Jan 2010 21:45:59 +0000
Subject: [PATCH] CSPACE-723: Fixed a trivial naming discrepancy by renaming
 the "measuredUnit" field in various places in the Dimensions service to
 "measurementUnit", to conform to the Dimensions schema.  (Since this affects
 the schema for a Nuxeo document type, to reflect this change you may need to
 shut down the nuxeo and cspace servers and, after a rebuild, perform an 'ant
 deploy'.)

---
 .../src/main/resources/OSGI-INF/layouts-contrib.xml       | 8 ++++----
 .../src/main/resources/schemas/dimensions_common.xsd      | 4 ++--
 .../services/dimension/DimensionJAXBSchema.java           | 2 +-
 .../jaxb/src/main/resources/dimensions-common.xsd         | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

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 089a24bdc..c6da304ef 100644
--- 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 8dcfa5a7e..4d0dcf6a7 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
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 
 <!--
     Dimension schema (XSD)
@@ -23,7 +23,7 @@
 <!--  Object Entry Information Group -->
     <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"/>
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 b9d4defab..5007b71d1 100644
--- 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 {
 	final static String DIMENSION = "dimension";
 	final static String MEASURED_PART = "measuredPart";
-	final static String MEASURED_UNIT = "measuredUnit";
+	final static String MEASUREMENT_UNIT = "measurementUnit";
 	final static String VALUE = "value";
 	final static String VALUE_DATE = "valueDate";
 	final static String VALUE_QUALIFIER = "valueQualifier";
diff --git a/services/dimension/jaxb/src/main/resources/dimensions-common.xsd b/services/dimension/jaxb/src/main/resources/dimensions-common.xsd
index db50b1063..5d5c25357 100644
--- 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"/>
-- 
2.47.3