From: Aron Roberts <aron@socrates.berkeley.edu>
Date: Sat, 5 Jun 2010 18:09:00 +0000 (+0000)
Subject: CSPACE-2107: Added associatedObjectType field to CollectionObject schema, merging... 
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=7f8e191888260a1a18327e34673191372534663a;p=tmp%2Fjakarta-migration.git

CSPACE-2107: Added associatedObjectType field to CollectionObject schema, merging change made in 0.7 release branch into trunk.
---

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 b7d7ed206..a4e1dde2b 100644
--- 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" />
     <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" />
diff --git a/services/collectionobject/jaxb/src/main/resources/collectionobjects_common.xsd b/services/collectionobject/jaxb/src/main/resources/collectionobjects_common.xsd
index 0740bc382..471a965ec 100644
--- 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" />