CSPACE-1384,CSPACE-3505,CSPACE-3584: Updated Media Handling schema in the services...

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 23b789183037daf9eb44c398e1dc14b2450c678a..464c10f09dcb1093d4a017efc281acb4d004f9a8 100644 (file)
--- 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"/>\r
     <xs:element name="coverage" type="xs:string"/>\r
     <xs:element name="creator" type="xs:string"/>\r
-    <xs:element name="dates">\r
+    <xs:element name="dateList">\r
         <xs:complexType>\r
             <xs:sequence>\r
                 <xs:element name="date" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>\r
@@ -36,17 +36,12 @@
     <xs:element name="dateCreated" type="xs:string"/>\r
     <xs:element name="dateModified" type="xs:string"/>\r
     <xs:element name="description" type="xs:string"/>\r
-    <xs:element name="dimensions">\r
-        <xs:complexType>\r
-            <xs:sequence>\r
-                <xs:element name="dimension" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>\r
-            </xs:sequence>\r
-        </xs:complexType>\r
-    </xs:element>\r
+    <xs:element name="dimensionSummary" type="xs:string"/>\r
+    <xs:element name="dimensionGroupList" type="dimensionGroupList"/>\r
     <xs:element name="filename" type="xs:string"/>\r
     <xs:element name="format" type="xs:string"/>\r
     <xs:element name="identificationNumber" type="xs:string"/>\r
-    <xs:element name="languages">\r
+    <xs:element name="languageList">\r
         <xs:complexType>\r
             <xs:sequence>\r
                 <xs:element name="language" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>\r
@@ -55,10 +50,16 @@
     </xs:element>\r
     <xs:element name="location" type="xs:string"/>\r
     <xs:element name="publisher" type="xs:string"/>\r
-    <xs:element name="relation" type="xs:string"/>\r
+    <xs:element name="relationList">\r
+        <xs:complexType>\r
+            <xs:sequence>\r
+                <xs:element name="relation" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>\r
+            </xs:sequence>\r
+        </xs:complexType>\r
+    </xs:element>\r
     <xs:element name="rightsHolder" type="xs:string"/>\r
     <xs:element name="source" type="xs:string"/>\r
-    <xs:element name="subjects">\r
+    <xs:element name="subjectList">\r
         <xs:complexType>\r
             <xs:sequence>\r
                 <xs:element name="subject" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>\r
@@ -66,8 +67,33 @@
         </xs:complexType>\r
     </xs:element>\r
     <xs:element name="title" type="xs:string"/>\r
-    <xs:element name="type" type="xs:string"/>\r
+    <xs:element name="typeList">\r
+        <xs:complexType>\r
+            <xs:sequence>\r
+                <xs:element name="type" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>\r
+            </xs:sequence>\r
+        </xs:complexType>\r
+    </xs:element>\r
     <xs:element name="uri" type="xs:string" />\r
     <xs:element name="blobCsid" type="xs:string" />\r
 \r
+    <xs:complexType name="dimensionGroupList">\r
+        <xs:sequence>\r
+            <xs:element name="dimensionGroup" type="dimensionGroup" minOccurs="0"\r
+                maxOccurs="unbounded"/>\r
+        </xs:sequence>\r
+    </xs:complexType>\r
+    <xs:complexType name="dimensionGroup">\r
+        <xs:sequence>\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:string"/>\r
+            <xs:element name="valueDate" type="xs:string"/>\r
+            <xs:element name="valueQualifier" type="xs:string"/>\r
+        </xs:sequence>\r
+    </xs:complexType>\r
+\r
 </xs:schema>\r

diff --git a/services/media/jaxb/src/main/resources/media_common.xsd b/services/media/jaxb/src/main/resources/media_common.xsd
index 7723e76cb3cadfde5a534322df2cdd291a87fa69..0d2c73c8998fc88b2d6cccd883f2780590f6c3ab 100644 (file)
--- 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>