CSPACE-2107: Added associatedObjectType field to CollectionObject schema, merging...

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 b7d7ed2065a0fff227d7baa5096aa5c3da384e93..a4e1dde2b869dbf8ab709ff4a9cd88e78baa211a 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
@@ -177,6 +177,7 @@
     <xs:element name="associatedEventPerson" type="xs:string" />\r
     <xs:element name="associatedEventPlace" type="xs:string" />\r
     <xs:element name="associatedObject" type="xs:string" />\r
+    <xs:element name="associatedObjectType" type="xs:string" />\r
     <xs:element name="associatedOrganization" type="xs:string" />\r
     <xs:element name="associatedPeople" type="xs:string" />\r
     <xs:element name="associatedPerson" type="xs:string" />\r

diff --git a/services/collectionobject/jaxb/src/main/resources/collectionobjects_common.xsd b/services/collectionobject/jaxb/src/main/resources/collectionobjects_common.xsd
index 0740bc382689600677cd9c0f36ae79da5edc1fac..471a965ec391edfca5f7f4223189659f58acc281 100644 (file)
--- a/services/collectionobject/jaxb/src/main/resources/collectionobjects_common.xsd
+++ b/services/collectionobject/jaxb/src/main/resources/collectionobjects_common.xsd
@@ -178,6 +178,7 @@
                 <xs:element name="associatedEventPerson" type="xs:string" />
                 <xs:element name="associatedEventPlace" type="xs:string" />
                 <xs:element name="associatedObject" type="xs:string" />
+                <xs:element name="associatedObjectType" type="xs:string" />
                 <xs:element name="associatedOrganization" type="xs:string" />
                 <xs:element name="associatedPeople" type="xs:string" />
                 <xs:element name="associatedPerson" type="xs:string" />