From 962842bf78817716d4d2077c6d51124a4432f02b Mon Sep 17 00:00:00 2001
From: Aron Roberts <aron@socrates.berkeley.edu>
Date: Wed, 2 Mar 2011 03:54:50 +0000
Subject: [PATCH] CSPACE-1384,CSPACE-3505,CSPACE-3584: Updated Media Handling
 schema in the services layer to conform to the wiki schema. Added dimension
 summary field, made dimension group repeatable, and made relation and type
 fields singly repeatable.

---
 .../main/resources/schemas/media_common.xsd   | 50 ++++++++++++++-----
 .../jaxb/src/main/resources/media_common.xsd  | 44 +++++++++++-----
 2 files changed, 70 insertions(+), 24 deletions(-)

diff --git a/services/media/3rdparty/nuxeo-platform-cs-media/src/main/resources/schemas/media_common.xsd b/services/media/3rdparty/nuxeo-platform-cs-media/src/main/resources/schemas/media_common.xsd
index 23b789183..464c10f09 100644
--- a/services/media/3rdparty/nuxeo-platform-cs-media/src/main/resources/schemas/media_common.xsd
+++ b/services/media/3rdparty/nuxeo-platform-cs-media/src/main/resources/schemas/media_common.xsd
@@ -26,7 +26,7 @@
     <xs:element name="copyrightStatement" type="xs:string"/>
     <xs:element name="coverage" type="xs:string"/>
     <xs:element name="creator" type="xs:string"/>
-    <xs:element name="dates">
+    <xs:element name="dateList">
         <xs:complexType>
             <xs:sequence>
                 <xs:element name="date" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
@@ -36,17 +36,12 @@
     <xs:element name="dateCreated" type="xs:string"/>
     <xs:element name="dateModified" type="xs:string"/>
     <xs:element name="description" type="xs:string"/>
-    <xs:element name="dimensions">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element name="dimension" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
+    <xs:element name="dimensionSummary" type="xs:string"/>
+    <xs:element name="dimensionGroupList" type="dimensionGroupList"/>
     <xs:element name="filename" type="xs:string"/>
     <xs:element name="format" type="xs:string"/>
     <xs:element name="identificationNumber" type="xs:string"/>
-    <xs:element name="languages">
+    <xs:element name="languageList">
         <xs:complexType>
             <xs:sequence>
                 <xs:element name="language" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
@@ -55,10 +50,16 @@
     </xs:element>
     <xs:element name="location" type="xs:string"/>
     <xs:element name="publisher" type="xs:string"/>
-    <xs:element name="relation" type="xs:string"/>
+    <xs:element name="relationList">
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element name="relation" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
     <xs:element name="rightsHolder" type="xs:string"/>
     <xs:element name="source" type="xs:string"/>
-    <xs:element name="subjects">
+    <xs:element name="subjectList">
         <xs:complexType>
             <xs:sequence>
                 <xs:element name="subject" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
@@ -66,8 +67,33 @@
         </xs:complexType>
     </xs:element>
     <xs:element name="title" type="xs:string"/>
-    <xs:element name="type" type="xs:string"/>
+    <xs:element name="typeList">
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element name="type" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
     <xs:element name="uri" type="xs:string" />
     <xs:element name="blobCsid" type="xs:string" />
 
+    <xs:complexType name="dimensionGroupList">
+        <xs:sequence>
+            <xs:element name="dimensionGroup" type="dimensionGroup" minOccurs="0"
+                maxOccurs="unbounded"/>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="dimensionGroup">
+        <xs:sequence>
+            <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:string"/>
+            <xs:element name="valueDate" type="xs:string"/>
+            <xs:element name="valueQualifier" type="xs:string"/>
+        </xs:sequence>
+    </xs:complexType>
+
 </xs:schema>
diff --git a/services/media/jaxb/src/main/resources/media_common.xsd b/services/media/jaxb/src/main/resources/media_common.xsd
index 7723e76cb..0d2c73c89 100644
--- a/services/media/jaxb/src/main/resources/media_common.xsd
+++ b/services/media/jaxb/src/main/resources/media_common.xsd
@@ -36,59 +36,79 @@
                 <xs:element name="copyrightStatement" type="xs:string"/>
                 <xs:element name="coverage" type="xs:string"/>
                 <xs:element name="creator" type="xs:string"/>
-                <xs:element name="dates" type="dates"/>
+                <xs:element name="dateList" type="dateList"/>
                 <xs:element name="dateCreated" type="xs:string"/>
                 <xs:element name="dateModified" type="xs:string"/>
                 <xs:element name="description" type="xs:string"/>
-                <xs:element name="dimensions" type="dimensions"/>
+                <xs:element name="dimensionSummary" type="xs:string"/>
+                <xs:element name="dimensionGroupList" type="dimensionGroupList"/>
                 <xs:element name="filename" type="xs:string"/>
                 <xs:element name="format" type="xs:string"/>
                 <xs:element name="identificationNumber" type="xs:string"/>
-                <xs:element name="languages" type="languages"/>
+                <xs:element name="languageList" type="languageList"/>
                 <xs:element name="location" type="xs:string"/>
                 <xs:element name="publisher" type="xs:string"/>
-                <xs:element name="relation" type="xs:string"/>
+                <xs:element name="relationList" type="relationList"/>
                 <xs:element name="rightsHolder" type="xs:string"/>
                 <xs:element name="source" type="xs:string"/>
-                <xs:element name="subjects" type="subjects"/>
+                <xs:element name="subjectList" type="subjectList"/>
                 <xs:element name="title" type="xs:string"/>
-                <xs:element name="type" type="xs:string"/>
+                <xs:element name="typeList" type="typeList"/>
                 <xs:element name="uri" type="xs:string" />
                 <xs:element name="blobCsid" type="xs:string" />
             </xs:sequence>
         </xs:complexType>
     </xs:element>
 
-    <xs:complexType name="dates">
+    <xs:complexType name="dateList">
         <xs:sequence>
             <xs:element name="date" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
         </xs:sequence>
     </xs:complexType>
 
-    <xs:complexType name="dimensions">
+    <xs:complexType name="dimensionGroupList">
         <xs:sequence>
-            <xs:element name="dimension" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
+            <xs:element name="dimensionGroup" type="dimensionGroup" minOccurs="0"
+                maxOccurs="unbounded"/>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="dimensionGroup">
+        <xs:sequence>
+            <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:string"/>
+            <xs:element name="valueDate" type="xs:string"/>
+            <xs:element name="valueQualifier" type="xs:string"/>
         </xs:sequence>
     </xs:complexType>
 
-    <xs:complexType name="languages">
+    <xs:complexType name="languageList">
         <xs:sequence>
             <xs:element name="language" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
         </xs:sequence>
     </xs:complexType>
 
-    <xs:complexType name="relations">
+    <xs:complexType name="relationList">
         <xs:sequence>
             <xs:element name="relation" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
         </xs:sequence>
     </xs:complexType>
 
-    <xs:complexType name="subjects">
+    <xs:complexType name="subjectList">
         <xs:sequence>
             <xs:element name="subject" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
         </xs:sequence>
     </xs:complexType>
 
+    <xs:complexType name="typeList">
+        <xs:sequence>
+            <xs:element name="type" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
+        </xs:sequence>
+    </xs:complexType>
+
     <!-- This is the base class for paginated lists -->
     <xs:complexType name="abstractCommonList">
         <xs:annotation>
-- 
2.47.3