CSPACE-3851 Added owner field to group schema, made it support authRefs in tenant...

diff --git a/services/common/src/main/cspace/config/services/tenants/collectionspace/tenant-bindings.xml b/services/common/src/main/cspace/config/services/tenants/collectionspace/tenant-bindings.xml
index f7a03a7d98231eff041e1bce01412e5cd254800d..8e5027587ac50a067812d95c58ac53cc7ae97a42 100644 (file)
--- a/services/common/src/main/cspace/config/services/tenants/collectionspace/tenant-bindings.xml
+++ b/services/common/src/main/cspace/config/services/tenants/collectionspace/tenant-bindings.xml
@@ -664,7 +664,9 @@
                 <service:part id="1" control_group="Managed"
                               versionable="true" auditable="false"
                               label="groups_common" updated="" order="1">
-                    <service:properties></service:properties>
+                    <service:properties>
+                        <types:item><types:key>authRef</types:key><types:value>owner</types:value></types:item>
+                   </service:properties>
                     <service:content contentType="application/xml">
                         <service:xmlContent
                             namespaceURI="http://collectionspace.org/services/group"

diff --git a/services/group/3rdparty/nuxeo-platform-cs-group/src/main/resources/schemas/groups_common.xsd b/services/group/3rdparty/nuxeo-platform-cs-group/src/main/resources/schemas/groups_common.xsd
index 745a89bd09155dc6fa8410f4e6df21a195e70fcb..d96cc1daa57866c489bdc2c316cf5e518924d60c 100644 (file)
--- a/services/group/3rdparty/nuxeo-platform-cs-group/src/main/resources/schemas/groups_common.xsd
+++ b/services/group/3rdparty/nuxeo-platform-cs-group/src/main/resources/schemas/groups_common.xsd
@@ -24,4 +24,5 @@
     <xs:element name="title" type="xs:string"/>\r
     <xs:element name="scopeNote" type="xs:string"/>\r
     <xs:element name="responsibleDepartment" type="xs:string"/>\r
+    <xs:element name="owner" type="xs:string"/>\r
 </xs:schema>\r

diff --git a/services/group/jaxb/src/main/resources/groups_common.xsd b/services/group/jaxb/src/main/resources/groups_common.xsd
index cd793092bd63ade3d14d310d38cc275bbd3c43c1..210494178c356c5e7a7cccc55e6d1a19ce61aef1 100644 (file)
--- a/services/group/jaxb/src/main/resources/groups_common.xsd
+++ b/services/group/jaxb/src/main/resources/groups_common.xsd
@@ -21,12 +21,6 @@
   version="0.1"
 >
 
-<!--
-    Avoid XmlRootElement nightmare:
-    See http://weblogs.java.net/blog/kohsuke/archive/2006/03/why_does_jaxb_p.html
--->
-<!-- See http://wiki.collectionspace.org/display/collectionspace/Loans+Out+Schema -->    
-    
     <!-- group -->
     <xs:element name="groups_common">
         <xs:complexType>
@@ -35,6 +29,7 @@
                 <xs:element name="title" type="xs:string"/>
                 <xs:element name="scopeNote" type="xs:string"/>
                 <xs:element name="responsibleDepartment" type="xs:string"/>
+                <xs:element name="owner" type="xs:string"/>
             </xs:sequence>
         </xs:complexType>
     </xs:element>