CSPACE-3627: Committing Rick's patches to make a Title Translation sub-group within...

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 a193c8843ae0d1ece2c87c2835c4ae885b04bf4a..2a37ed571072285c4c1c99524982fb7cc77643fd 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
@@ -411,16 +411,30 @@
                 maxOccurs="unbounded"/>\r
         </xs:sequence>\r
     </xs:complexType>\r
+\r
     <xs:complexType name="titleGroup">\r
         <xs:sequence>\r
             <xs:element name="title" type="xs:string"/>\r
             <xs:element name="titleLanguage" type="xs:string"/>\r
-            <xs:element name="titleTranslation" type="xs:string"/>\r
-            <xs:element name="titleTranslationLanguage" type="xs:string"/>\r
             <xs:element name="titleType" type="xs:string"/>\r
+            <xs:element name="titleTranslationSubGroupList" type="titleTranslationSubGroupList"/>\r
         </xs:sequence>\r
     </xs:complexType>\r
 \r
+    <xs:complexType name="titleTranslationSubGroupList">\r
+        <xs:sequence>\r
+            <xs:element name="titleTranslationSubGroup" type="titleTranslationSubGroup" minOccurs="0"\r
+                maxOccurs="unbounded"/>\r
+        </xs:sequence>\r
+    </xs:complexType>\r
+\r
+    <xs:complexType name="titleTranslationSubGroup">\r
+        <xs:sequence>\r
+            <xs:element name="titleTranslation" type="xs:string"/>\r
+            <xs:element name="titleTranslationLanguage" type="xs:string"/>\r
+        </xs:sequence>\r
+     </xs:complexType>\r
+\r
     <xs:complexType name="contentEventNameGroupList">\r
         <xs:sequence>\r
             <xs:element name="contentEventNameGroup" type="contentEventNameGroup" minOccurs="0"\r

diff --git a/services/collectionobject/jaxb/src/main/resources/collectionobjects_common.xsd b/services/collectionobject/jaxb/src/main/resources/collectionobjects_common.xsd
index d0c9d7c387ba0e726da6dd2e3b379fa4a6bcdfd3..1101a1a4ad515a5ee3d16289d28a6c578b4bcd18 100644 (file)
--- a/services/collectionobject/jaxb/src/main/resources/collectionobjects_common.xsd
+++ b/services/collectionobject/jaxb/src/main/resources/collectionobjects_common.xsd
@@ -248,15 +248,29 @@
                 maxOccurs="unbounded"/>
         </xs:sequence>
     </xs:complexType>
+
     <xs:complexType name="titleGroup">
         <xs:sequence>
             <xs:element name="title" type="xs:string"/>
             <xs:element name="titleLanguage" type="xs:string"/>
-            <xs:element name="titleTranslation" type="xs:string"/>
-            <xs:element name="titleTranslationLanguage" type="xs:string"/>
+            <xs:element name="titleTranslationSubGroupList" type="titleTranslationSubGroupList"/>
             <xs:element name="titleType" type="xs:string"/>
         </xs:sequence>
     </xs:complexType>
+    
+    <xs:complexType name="titleTranslationSubGroupList">
+        <xs:sequence>
+            <xs:element name="titleTranslationSubGroup" type="titleTranslationSubGroup" minOccurs="0"
+                maxOccurs="unbounded"/>
+        </xs:sequence>
+    </xs:complexType>
+
+    <xs:complexType name="titleTranslationSubGroup">
+        <xs:sequence>
+            <xs:element name="titleTranslation" type="xs:string"/>
+            <xs:element name="titleTranslationLanguage" type="xs:string"/>
+        </xs:sequence>
+     </xs:complexType>
 
         <xs:complexType name="contentEventNameGroupList">
         <xs:sequence>