CSPACE-5678: Updating Nuxeo related schema and bundle modules to reflect new code...

diff --git a/3rdparty/nuxeo/nuxeo-platform-collectionspace/src/main/resources/META-INF/MANIFEST.MF b/3rdparty/nuxeo/nuxeo-platform-collectionspace/src/main/resources/META-INF/MANIFEST.MF
index 22c7df63dfc8c6c0f1645f5e2be2a0e5bb1dbf8e..7d63efb52e73c770a5f5098956bf4ffea55045b6 100644 (file)
--- a/3rdparty/nuxeo/nuxeo-platform-collectionspace/src/main/resources/META-INF/MANIFEST.MF
+++ b/3rdparty/nuxeo/nuxeo-platform-collectionspace/src/main/resources/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0 \r
 Bundle-ManifestVersion: 1 \r
-Bundle-Name: org.collectionspace.collectionspace_core\r
-Bundle-SymbolicName: org.collectionspace.collectionspace_core;singleton:=true \r
+Bundle-Name: org.collectionspace.shared\r
+Bundle-SymbolicName: org.collectionspace.shared;singleton:=true \r
 Bundle-Version: 1.0.0\r
 Bundle-Localization: plugin\r
 Bundle-Vendor: Nuxeo\r
@@ -9,10 +9,11 @@ Require-Bundle: org.nuxeo.runtime,
  org.nuxeo.ecm.core.api,\r
  org.nuxeo.ecm.core,\r
  org.nuxeo.ecm.webapp.core\r
-Provide-Package: org.collectionspace.collectionspace_core\r
+Provide-Package: org.collectionspace.shared\r
 Nuxeo-Component: OSGI-INF/core-types-contrib.xml,\r
  OSGI-INF/default-life-cycle-contrib.xml,\r
  OSGI-INF/ecm-types-contrib.xml,\r
- OSGI-INF/layouts-contrib.xml\r
+ OSGI-INF/layouts-contrib.xml,\r
+ OSGI-INF/querymodel-contrib.xml\r
 \r
 \r

diff --git a/3rdparty/nuxeo/nuxeo-platform-collectionspace/src/main/resources/OSGI-INF/core-types-contrib.xml b/3rdparty/nuxeo/nuxeo-platform-collectionspace/src/main/resources/OSGI-INF/core-types-contrib.xml
index eeb93c7335fc447189a5f4a24eebba0934b56439..7ef7f07d6649c042aa986b0a4aba45e596c9038e 100644 (file)
--- a/3rdparty/nuxeo/nuxeo-platform-collectionspace/src/main/resources/OSGI-INF/core-types-contrib.xml
+++ b/3rdparty/nuxeo/nuxeo-platform-collectionspace/src/main/resources/OSGI-INF/core-types-contrib.xml
@@ -1,11 +1,6 @@
 <?xml version="1.0"?>
-<component name="org.collectionspace.collectionspace_core.coreTypes">
-       <extension target="org.nuxeo.ecm.core.schema.TypeService"
-               point="schema">
-               <schema name="collectionspace_core" prefix="collectionspace_core"
-                       src="schemas/collectionspace_core.xsd" />
-               <schema name="subitem" prefix="subitem" src="schemas/subitem.xsd" />
-       </extension>
+<component name="org.collectionspace.shared.core.types">
+       <!-- A common ancestor for all CollectionSpace document types -->
        <extension target="org.nuxeo.ecm.core.schema.TypeService"
                point="doctype">
                <doctype name="CollectionSpaceDocument" extends="Document">
@@ -14,17 +9,14 @@
                        <schema name="collectionspace_core" />
                </doctype>
        </extension>
+       <!-- A schema def and doctype def for the "Subitem" document type. -->
        <extension target="org.nuxeo.ecm.core.schema.TypeService"
-               point="doctype">
-               <doctype name="CollectionSpace_Core" extends="Document">
-                       <schema name="common" />
-                       <schema name="dublincore" />
-                       <schema name="collectionspace_core" />
-               </doctype>
+               point="schema">
+               <schema name="subitem" prefix="subitem" src="schemas/subitem.xsd" />
        </extension>
        <extension target="org.nuxeo.ecm.core.schema.TypeService"
                point="doctype">
-               <doctype name="Subitem" extends="Document">
+               <doctype name="Subitem" extends="CollectionSpaceDocument">
                        <schema name="common" />
                        <schema name="dublincore" />
                        <schema name="collectionspace_core" />

diff --git a/3rdparty/nuxeo/nuxeo-platform-collectionspace/src/main/resources/OSGI-INF/default-life-cycle-contrib.xml b/3rdparty/nuxeo/nuxeo-platform-collectionspace/src/main/resources/OSGI-INF/default-life-cycle-contrib.xml
index 8a48d6d548a9676137cf44f9645445b96c34679e..4b63194bb82fdadf12ed14fa40a625a926708433 100644 (file)
--- a/3rdparty/nuxeo/nuxeo-platform-collectionspace/src/main/resources/OSGI-INF/default-life-cycle-contrib.xml
+++ b/3rdparty/nuxeo/nuxeo-platform-collectionspace/src/main/resources/OSGI-INF/default-life-cycle-contrib.xml
@@ -2,16 +2,16 @@
 <component name="org.collectionspace.ecm.platform.default.LifeCycleManagerExtensions">
 
   <extension target="org.nuxeo.ecm.core.lifecycle.LifeCycleService"
-             point="types">
+               point="types">
     <types>
       <type name="CollectionSpaceDocument">default</type>
     </types>
   </extension>
 
-  <extension target="org.nuxeo.ecm.core.lifecycle.LifeCycleService" point="lifecycle">
-
+  <!-- The definition of the CollectionSpace default lifecycle name "cs_default"  -->
+  <extension target="org.nuxeo.ecm.core.lifecycle.LifeCycleService"
+               point="lifecycle">
     <documentation>CollectionSpace core default life cycle definition.</documentation>
-
     <lifecycle name="cs_default" defaultInitial="project">
       <transitions>
         <transition name="delete" destinationState="deleted">
@@ -31,10 +31,10 @@
     </lifecycle>
   </extension>
   
-  <extension target="org.nuxeo.ecm.core.lifecycle.LifeCycleService" point="lifecycle">
-  
+  <!-- The definition of the CollectionSpace locking lifecycle name "cs_locking"  -->  
+  <extension target="org.nuxeo.ecm.core.lifecycle.LifeCycleService"
+               point="lifecycle">
     <documentation>CollectionSpace "locking" life cycle definition.</documentation>
-
     <lifecycle name="cs_locking" defaultInitial="project">
       <transitions>
         <transition name="lock" destinationState="locked">
@@ -60,5 +60,4 @@
       </states>
     </lifecycle>
   </extension>
-
 </component>

diff --git a/3rdparty/nuxeo/nuxeo-platform-collectionspace/src/main/resources/OSGI-INF/ecm-types-contrib.xml b/3rdparty/nuxeo/nuxeo-platform-collectionspace/src/main/resources/OSGI-INF/ecm-types-contrib.xml
index eb081760deccf5a54e93a04a0a3ca0d2e1e11d42..6e68ecb6044abd5187a2d21d52a8ae64583d9712 100644 (file)
--- a/3rdparty/nuxeo/nuxeo-platform-collectionspace/src/main/resources/OSGI-INF/ecm-types-contrib.xml
+++ b/3rdparty/nuxeo/nuxeo-platform-collectionspace/src/main/resources/OSGI-INF/ecm-types-contrib.xml
@@ -1,29 +1,5 @@
 <?xml version="1.0"?>
-<component name="org.collectionspace.collectionspace_core.ecm.types">
-  <extension target="org.nuxeo.ecm.platform.types.TypeService" point="types">
-    <type id="CollectionSpace_Core" coretype="CollectionSpace_Core">
-      <label>org.collectionspace.collectionspace_core</label>
-      <!--icon>/icons/file.gif</icon-->
-      <default-view>view_documents</default-view>
-
-      <layouts mode="any">
-        <layout>heading</layout>
-        <layout>collectionspace_core</layout>
-      </layouts>        
-    </type>
-
-    <type id="Folder" coretype="Folder">
-      <subtypes>
-        <type>CollectionSpace_Core</type>
-      </subtypes>
-    </type>
-    
-    <type id="Workspace" coretype="Workspace">
-      <subtypes>
-        <type>CollectionSpace_Core</type>
-      </subtypes>
-    </type>
-  </extension>
+<component name="org.collectionspace.shared.ecm.types">
   <extension target="org.nuxeo.ecm.platform.types.TypeService" point="types">
     <type id="Subitem" coretype="Subitem">
       <label>org.collectionspace.subitem</label>

diff --git a/3rdparty/nuxeo/nuxeo-platform-collectionspace/src/main/resources/OSGI-INF/querymodel-contrib.xml b/3rdparty/nuxeo/nuxeo-platform-collectionspace/src/main/resources/OSGI-INF/querymodel-contrib.xml
index c8fa3f7283035fbb2f8c079d791bb5a64731df14..34e84b3d4109d4aff38d9c580195d3693c876799 100644 (file)
--- a/3rdparty/nuxeo/nuxeo-platform-collectionspace/src/main/resources/OSGI-INF/querymodel-contrib.xml
+++ b/3rdparty/nuxeo/nuxeo-platform-collectionspace/src/main/resources/OSGI-INF/querymodel-contrib.xml
@@ -15,7 +15,6 @@
         defaultSortAscending="false" />\r
       <max>50</max>\r
     </queryModel>\r
-               \r
 </extension>\r
 </component>\r
 \r

diff --git a/3rdparty/nuxeo/nuxeo-platform-collectionspace/src/main/resources/schemas/collectionspace_core.xsd b/3rdparty/nuxeo/nuxeo-platform-collectionspace/src/main/resources/schemas/collectionspace_core.xsd
deleted file mode 100644 (file)
index 1fe2659..0000000
--- a/3rdparty/nuxeo/nuxeo-platform-collectionspace/src/main/resources/schemas/collectionspace_core.xsd
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>\r
-\r
-<!--\r
-    Older (?) CollectionObject Core Schema for Nuxeo EP\r
-\r
-    $LastChangedRevision$\r
-    $LastChangedDate$\r
--->\r
-\r
-<xs:schema \r
-    xmlns:xs="http://www.w3.org/2001/XMLSchema"\r
-    xmlns:ns="http://collectionspace.org/collectionspace_core/"\r
-    xmlns="http://collectionspace.org/collectionspace_core/"\r
-    targetNamespace="http://collectionspace.org/collectionspace_core/"\r
-    version="0.1">\r
-         \r
-\r
-    <xs:element name="tenantId" type="xs:string"/>\r
-    <xs:element name="uri" type="xs:string"/>\r
-    <xs:element name="refName" type="xs:string"/>\r
-    <!--<xs:element name="createdAt" type="xs:string"/>-->\r
-    <xs:element name="createdAt" type="xs:dateTime"/>\r
-    <xs:element name="updatedAt" type="xs:dateTime"/>\r
-    <xs:element name="createdBy" type="xs:string"/>\r
-    <xs:element name="updatedBy" type="xs:string"/>\r
-</xs:schema>\r

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 54a923e765b11509b18ae2d30591098d00322339..7d7b3b62fdd7da345ecc62fe87f9baefabe30742 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
@@ -1,29 +1,58 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>\r
 \r
-<!--\r
-    CollectionObject schema (XSD)\r
-    \r
-    Entity  : CollectionObject\r
-    Part    : Common\r
-    Used for: Nuxeo EP core document type\r
-\r
-    $LastChangedRevision: 4736 $\r
-    $LastChangedDate: 2011-05-12 17:36:23 -0700 (Thu, 12 May 2011) $\r
--->\r
-\r
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"\r
     xmlns:ns="http://collectionspace.org/collectionobject/"\r
     xmlns="http://collectionspace.org/collectionobject/"\r
     targetNamespace="http://collectionspace.org/collectionobject/" version="0.1">\r
-\r
-    <!-- Object identification information -->\r
+    <xs:element name="objectHistoryNote" type="xs:string"/>\r
+    <xs:element name="viewersPersonalResponse" type="xs:string"/>\r
+    <xs:element name="fieldCollectionMethods">\r
+        <xs:complexType>\r
+            <xs:sequence>\r
+                <xs:element name="fieldCollectionMethod" type="xs:string" minOccurs="0"\r
+                    maxOccurs="unbounded"/>\r
+            </xs:sequence>\r
+        </xs:complexType>\r
+    </xs:element>    \r
+    <xs:element name="assocEventPeoples">\r
+        <xs:complexType>\r
+            <xs:sequence>\r
+                <xs:element name="assocEventPeople" type="xs:string" minOccurs="0"\r
+                    maxOccurs="unbounded"/>\r
+            </xs:sequence>\r
+        </xs:complexType>\r
+    </xs:element>\r
+    <xs:element name="assocEventNote" type="xs:string"/>\r
+    <xs:element name="responsibleDepartments">\r
+        <xs:complexType>\r
+            <xs:sequence>\r
+                <xs:element name="responsibleDepartment" type="xs:string" minOccurs="0"\r
+                    maxOccurs="unbounded"/>\r
+            </xs:sequence>\r
+        </xs:complexType>\r
+    </xs:element>\r
+    <xs:element name="ownershipAccess" type="xs:string"/>\r
+    <xs:element name="contentPositions">\r
+        <xs:complexType>\r
+            <xs:sequence>\r
+                <xs:element name="contentPosition" type="xs:string" minOccurs="0"\r
+                    maxOccurs="unbounded"/>\r
+            </xs:sequence>\r
+        </xs:complexType>\r
+    </xs:element>\r
+    <!-- \r
+    Tail\r
+    Tail\r
+    Tail\r
+    -->\r
 \r
     <xs:element name="objectNumber" type="xs:string"/>\r
     <xs:element name="otherNumberList" type="ns:otherNumberList"/>\r
     <xs:element name="briefDescriptions">\r
         <xs:complexType>\r
             <xs:sequence>\r
-                <xs:element name="briefDescription" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>\r
+                <xs:element name="briefDescription" type="xs:string" minOccurs="0"\r
+                    maxOccurs="unbounded"/>\r
             </xs:sequence>\r
         </xs:complexType>\r
     </xs:element>\r
@@ -37,14 +66,7 @@
     <xs:element name="distinguishingFeatures" type="xs:string"/>\r
     <xs:element name="numberOfObjects" type="xs:integer"/>\r
     <xs:element name="objectNameList" type="ns:objectNameList"/>\r
-    <xs:element name="responsibleDepartments">\r
-        <xs:complexType>\r
-            <xs:sequence>\r
-                <xs:element name="responsibleDepartment" type="xs:string"\r
-                    minOccurs="0" maxOccurs="unbounded"/>\r
-            </xs:sequence>\r
-        </xs:complexType>\r
-    </xs:element>\r
+    \r
     <xs:element name="collection" type="xs:string"/>\r
     <xs:element name="titleGroupList" type="titleGroupList"/>\r
     <xs:element name="recordStatus" type="xs:string"/>\r
@@ -64,14 +86,16 @@
     <xs:element name="contentActivities">\r
         <xs:complexType>\r
             <xs:sequence>\r
-                <xs:element name="contentActivity" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>\r
+                <xs:element name="contentActivity" type="xs:string" minOccurs="0"\r
+                    maxOccurs="unbounded"/>\r
             </xs:sequence>\r
         </xs:complexType>\r
     </xs:element>\r
     <xs:element name="contentConcepts">\r
         <xs:complexType>\r
             <xs:sequence>\r
-                <xs:element name="contentConcept" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>\r
+                <xs:element name="contentConcept" type="xs:string" minOccurs="0"\r
+                    maxOccurs="unbounded"/>\r
             </xs:sequence>\r
         </xs:complexType>\r
     </xs:element>\r
@@ -82,7 +106,8 @@
     <xs:element name="contentLanguages">\r
         <xs:complexType>\r
             <xs:sequence>\r
-                <xs:element name="contentLanguage" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>\r
+                <xs:element name="contentLanguage" type="xs:string" minOccurs="0"\r
+                    maxOccurs="unbounded"/>\r
             </xs:sequence>\r
         </xs:complexType>\r
     </xs:element>\r
@@ -90,7 +115,8 @@
     <xs:element name="contentOrganizations">\r
         <xs:complexType>\r
             <xs:sequence>\r
-                <xs:element name="contentOrganization" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>\r
+                <xs:element name="contentOrganization" type="xs:string" minOccurs="0"\r
+                    maxOccurs="unbounded"/>\r
             </xs:sequence>\r
         </xs:complexType>\r
     </xs:element>\r
@@ -98,35 +124,33 @@
     <xs:element name="contentPeoples">\r
         <xs:complexType>\r
             <xs:sequence>\r
-                <xs:element name="contentPeople" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>\r
+                <xs:element name="contentPeople" type="xs:string" minOccurs="0"\r
+                    maxOccurs="unbounded"/>\r
             </xs:sequence>\r
         </xs:complexType>\r
     </xs:element>\r
     <xs:element name="contentPersons">\r
         <xs:complexType>\r
             <xs:sequence>\r
-                <xs:element name="contentPerson" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>\r
+                <xs:element name="contentPerson" type="xs:string" minOccurs="0"\r
+                    maxOccurs="unbounded"/>\r
             </xs:sequence>\r
         </xs:complexType>\r
     </xs:element>\r
     <xs:element name="contentPlaces">\r
         <xs:complexType>\r
             <xs:sequence>\r
-                <xs:element name="contentPlace" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>\r
-            </xs:sequence>\r
-        </xs:complexType>\r
-    </xs:element>\r
-    <xs:element name="contentPositions">\r
-        <xs:complexType>\r
-            <xs:sequence>\r
-                <xs:element name="contentPosition" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>\r
+                <xs:element name="contentPlace" type="xs:string" minOccurs="0" maxOccurs="unbounded"\r
+                />\r
             </xs:sequence>\r
         </xs:complexType>\r
     </xs:element>\r
+    \r
     <xs:element name="contentScripts">\r
         <xs:complexType>\r
             <xs:sequence>\r
-                <xs:element name="contentScript" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>\r
+                <xs:element name="contentScript" type="xs:string" minOccurs="0"\r
+                    maxOccurs="unbounded"/>\r
             </xs:sequence>\r
         </xs:complexType>\r
     </xs:element>\r
@@ -173,8 +197,8 @@
     <xs:element name="nonTextualInscriptionGroupList" type="nonTextualInscriptionGroupList"/>\r
     <xs:complexType name="nonTextualInscriptionGroupList">\r
         <xs:sequence>\r
-            <xs:element name="nonTextualInscriptionGroup" type="nonTextualInscriptionGroup" minOccurs="0"\r
-                maxOccurs="unbounded"/>\r
+            <xs:element name="nonTextualInscriptionGroup" type="nonTextualInscriptionGroup"\r
+                minOccurs="0" maxOccurs="unbounded"/>\r
         </xs:sequence>\r
     </xs:complexType>\r
 \r
@@ -197,7 +221,7 @@
 \r
     <!-- Misc Object Description Information -->\r
 \r
-    <xs:element name="objectStatusList" type="objectStatusList" />     \r
+    <xs:element name="objectStatusList" type="objectStatusList"/>\r
     <xs:element name="phase" type="xs:string"/>\r
     <xs:element name="physicalDescription" type="xs:string"/>\r
     <xs:element name="sex" type="xs:string"/>\r
@@ -214,14 +238,16 @@
     <!-- Object Production Information -->\r
     <xs:element name="objectProductionDateGroupList" type="objectProductionDateGroupList"/>\r
     <xs:element name="objectProductionNote" type="xs:string"/>\r
-    <xs:element name="objectProductionOrganizationGroupList" type="objectProductionOrganizationGroupList"/>\r
+    <xs:element name="objectProductionOrganizationGroupList"\r
+        type="objectProductionOrganizationGroupList"/>\r
     <xs:element name="objectProductionPeopleGroupList" type="objectProductionPeopleGroupList"/>\r
     <xs:element name="objectProductionPersonGroupList" type="objectProductionPersonGroupList"/>\r
     <xs:element name="objectProductionPlaceGroupList" type="objectProductionPlaceGroupList"/>\r
     <xs:element name="objectProductionReasons">\r
         <xs:complexType>\r
             <xs:sequence>\r
-                <xs:element name="objectProductionReason" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>\r
+                <xs:element name="objectProductionReason" type="xs:string" minOccurs="0"\r
+                    maxOccurs="unbounded"/>\r
             </xs:sequence>\r
         </xs:complexType>\r
     </xs:element>\r
@@ -243,32 +269,29 @@
     <!-- not be implemented as part of CSPACE-3229 in Release 1.2 -->\r
     <xs:element name="assocEventName" type="xs:string"/>\r
     <xs:element name="assocEventNameType" type="xs:string"/>\r
-    <xs:element name="assocEventNote" type="xs:string"/>\r
+    \r
     <xs:element name="assocEventOrganizations">\r
         <xs:complexType>\r
             <xs:sequence>\r
-                <xs:element name="assocEventOrganization" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>\r
-            </xs:sequence>\r
-        </xs:complexType>\r
-    </xs:element>\r
-    <xs:element name="assocEventPeoples">\r
-        <xs:complexType>\r
-            <xs:sequence>\r
-                <xs:element name="assocEventPeople" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>\r
+                <xs:element name="assocEventOrganization" type="xs:string" minOccurs="0"\r
+                    maxOccurs="unbounded"/>\r
             </xs:sequence>\r
         </xs:complexType>\r
     </xs:element>\r
+    \r
     <xs:element name="assocEventPersons">\r
         <xs:complexType>\r
             <xs:sequence>\r
-                <xs:element name="assocEventPerson" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>\r
+                <xs:element name="assocEventPerson" type="xs:string" minOccurs="0"\r
+                    maxOccurs="unbounded"/>\r
             </xs:sequence>\r
         </xs:complexType>\r
     </xs:element>\r
     <xs:element name="assocEventPlaces">\r
         <xs:complexType>\r
             <xs:sequence>\r
-                <xs:element name="assocEventPlace" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>\r
+                <xs:element name="assocEventPlace" type="xs:string" minOccurs="0"\r
+                    maxOccurs="unbounded"/>\r
             </xs:sequence>\r
         </xs:complexType>\r
     </xs:element>\r
@@ -277,10 +300,6 @@
     <xs:element name="assocPeopleGroupList" type="assocPeopleGroupList"/>\r
     <xs:element name="assocPersonGroupList" type="assocPersonGroupList"/>\r
     <xs:element name="assocPlaceGroupList" type="assocPlaceGroupList"/>\r
-\r
-    <!-- Object History and Association Information - History -->\r
-\r
-    <xs:element name="objectHistoryNote" type="xs:string"/>\r
     <!-- FIXME Start of owner repeatable group -->\r
     <!-- Note: this group has repeatable sub-fields, and thus will -->\r
     <!-- not be implemented as part of CSPACE-3229 in Release 1.2 -->\r
@@ -291,7 +310,7 @@
             </xs:sequence>\r
         </xs:complexType>\r
     </xs:element>\r
-    <xs:element name="ownershipAccess" type="xs:string"/>\r
+    \r
     <xs:element name="ownershipCategory" type="xs:string"/>\r
     <xs:element name="ownershipDateGroupList" type="ownershipDateGroupList"/>\r
     <xs:element name="ownershipExchangeMethod" type="xs:string"/>\r
@@ -309,7 +328,8 @@
     <xs:element name="ownersReferences">\r
         <xs:complexType>\r
             <xs:sequence>\r
-                <xs:element name="ownersReference" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>\r
+                <xs:element name="ownersReference" type="xs:string" minOccurs="0"\r
+                    maxOccurs="unbounded"/>\r
             </xs:sequence>\r
         </xs:complexType>\r
     </xs:element>\r
@@ -319,59 +339,57 @@
 \r
     <xs:element name="viewersRole" type="xs:string"/>\r
     <xs:element name="viewersPersonalExperience" type="xs:string"/>\r
-    <xs:element name="viewersPersonalResponse" type="xs:string"/>\r
+    \r
     <xs:element name="viewersReferences">\r
         <xs:complexType>\r
             <xs:sequence>\r
-                <xs:element name="viewersReference" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>\r
+                <xs:element name="viewersReference" type="xs:string" minOccurs="0"\r
+                    maxOccurs="unbounded"/>\r
             </xs:sequence>\r
         </xs:complexType>\r
     </xs:element>\r
     <xs:element name="viewersContributionNote" type="xs:string"/>\r
 \r
     <!-- Reference Information -->\r
-    \r
+\r
     <xs:element name="referenceGroupList" type="referenceGroupList"/>\r
 \r
     <!--  Object Collection Information Group -->\r
 \r
     <xs:element name="fieldCollectionDateGroup" type="structuredDateGroup"/>\r
-    <xs:element name="fieldCollectionMethods">\r
-        <xs:complexType>\r
-            <xs:sequence>\r
-                <xs:element name="fieldCollectionMethod" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>\r
-            </xs:sequence>\r
-        </xs:complexType>\r
-    </xs:element>\r
+    \r
     <xs:element name="fieldCollectionNote" type="xs:string"/>\r
     <xs:element name="fieldCollectionNumber" type="xs:string"/>\r
     <xs:element name="fieldCollectionPlace" type="xs:string"/>\r
     <xs:element name="fieldCollectionSources">\r
         <xs:complexType>\r
             <xs:sequence>\r
-                <xs:element name="fieldCollectionSource" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>\r
+                <xs:element name="fieldCollectionSource" type="xs:string" minOccurs="0"\r
+                    maxOccurs="unbounded"/>\r
             </xs:sequence>\r
         </xs:complexType>\r
     </xs:element>\r
     <xs:element name="fieldCollectors">\r
         <xs:complexType>\r
             <xs:sequence>\r
-                <xs:element name="fieldCollector" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>\r
+                <xs:element name="fieldCollector" type="xs:string" minOccurs="0"\r
+                    maxOccurs="unbounded"/>\r
             </xs:sequence>\r
         </xs:complexType>\r
     </xs:element>\r
     <xs:element name="fieldColEventNames">\r
         <xs:complexType>\r
             <xs:sequence>\r
-                <xs:element name="fieldColEventName" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>\r
+                <xs:element name="fieldColEventName" type="xs:string" minOccurs="0"\r
+                    maxOccurs="unbounded"/>\r
             </xs:sequence>\r
         </xs:complexType>\r
     </xs:element>\r
 \r
     <xs:complexType name="otherNumberList">\r
         <xs:sequence>\r
-            <xs:element name="otherNumber" type="ns:otherNumber" minOccurs="0"\r
-                maxOccurs="unbounded"/>\r
+            <xs:element name="otherNumber" type="ns:otherNumber" minOccurs="0" maxOccurs="unbounded"\r
+            />\r
         </xs:sequence>\r
     </xs:complexType>\r
     <xs:complexType name="otherNumber">\r
@@ -401,8 +419,7 @@
 \r
     <xs:complexType name="titleGroupList">\r
         <xs:sequence>\r
-            <xs:element name="titleGroup" type="titleGroup" minOccurs="0"\r
-                maxOccurs="unbounded"/>\r
+            <xs:element name="titleGroup" type="titleGroup" minOccurs="0" maxOccurs="unbounded"/>\r
         </xs:sequence>\r
     </xs:complexType>\r
 \r
@@ -417,8 +434,8 @@
 \r
     <xs:complexType name="titleTranslationSubGroupList">\r
         <xs:sequence>\r
-            <xs:element name="titleTranslationSubGroup" type="titleTranslationSubGroup" minOccurs="0"\r
-                maxOccurs="unbounded"/>\r
+            <xs:element name="titleTranslationSubGroup" type="titleTranslationSubGroup"\r
+                minOccurs="0" maxOccurs="unbounded"/>\r
         </xs:sequence>\r
     </xs:complexType>\r
 \r
@@ -478,14 +495,15 @@
     <xs:complexType name="measuredPartGroup">\r
         <xs:sequence>\r
             <xs:element name="measuredPart" type="xs:string"/>\r
-            <xs:element name="dimensionSummary" type="xs:string" />\r
+            <xs:element name="dimensionSummary" type="xs:string"/>\r
             <xs:element name="dimensionSubGroupList" type="dimensionSubGroupList"/>\r
         </xs:sequence>\r
     </xs:complexType>\r
 \r
     <xs:complexType name="dimensionSubGroupList">\r
         <xs:sequence>\r
-            <xs:element name="dimensionSubGroup" type="dimensionSubGroup" minOccurs="0" maxOccurs="unbounded" />\r
+            <xs:element name="dimensionSubGroup" type="dimensionSubGroup" minOccurs="0"\r
+                maxOccurs="unbounded"/>\r
         </xs:sequence>\r
     </xs:complexType>\r
 \r
@@ -501,7 +519,7 @@
             <xs:element name="dimensionNote" type="xs:string"/>\r
         </xs:sequence>\r
     </xs:complexType>\r
-    \r
+\r
     <xs:complexType name="materialGroupList">\r
         <xs:sequence>\r
             <xs:element name="materialGroup" type="materialGroup" minOccurs="0"\r
@@ -517,10 +535,10 @@
             <xs:element name="materialSource" type="xs:string"/>\r
         </xs:sequence>\r
     </xs:complexType>\r
-    \r
+\r
     <xs:complexType name="objectStatusList">\r
         <xs:sequence>\r
-            <xs:element name="objectStatus" type="xs:string" minOccurs="0" maxOccurs="unbounded" />\r
+            <xs:element name="objectStatus" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>\r
         </xs:sequence>\r
     </xs:complexType>\r
 \r
@@ -560,8 +578,8 @@
 \r
     <xs:complexType name="objectProductionOrganizationGroupList">\r
         <xs:sequence>\r
-            <xs:element name="objectProductionOrganizationGroup" type="objectProductionOrganizationGroup" minOccurs="0"\r
-                maxOccurs="unbounded"/>\r
+            <xs:element name="objectProductionOrganizationGroup"\r
+                type="objectProductionOrganizationGroup" minOccurs="0" maxOccurs="unbounded"/>\r
         </xs:sequence>\r
     </xs:complexType>\r
     <xs:complexType name="objectProductionOrganizationGroup">\r
@@ -573,8 +591,8 @@
 \r
     <xs:complexType name="objectProductionPeopleGroupList">\r
         <xs:sequence>\r
-            <xs:element name="objectProductionPeopleGroup" type="objectProductionPeopleGroup" minOccurs="0"\r
-                maxOccurs="unbounded"/>\r
+            <xs:element name="objectProductionPeopleGroup" type="objectProductionPeopleGroup"\r
+                minOccurs="0" maxOccurs="unbounded"/>\r
         </xs:sequence>\r
     </xs:complexType>\r
     <xs:complexType name="objectProductionPeopleGroup">\r
@@ -586,8 +604,8 @@
 \r
     <xs:complexType name="objectProductionPersonGroupList">\r
         <xs:sequence>\r
-            <xs:element name="objectProductionPersonGroup" type="objectProductionPersonGroup" minOccurs="0"\r
-                maxOccurs="unbounded"/>\r
+            <xs:element name="objectProductionPersonGroup" type="objectProductionPersonGroup"\r
+                minOccurs="0" maxOccurs="unbounded"/>\r
         </xs:sequence>\r
     </xs:complexType>\r
     <xs:complexType name="objectProductionPersonGroup">\r
@@ -599,8 +617,8 @@
 \r
     <xs:complexType name="objectProductionPlaceGroupList">\r
         <xs:sequence>\r
-            <xs:element name="objectProductionPlaceGroup" type="objectProductionPlaceGroup" minOccurs="0"\r
-                maxOccurs="unbounded"/>\r
+            <xs:element name="objectProductionPlaceGroup" type="objectProductionPlaceGroup"\r
+                minOccurs="0" maxOccurs="unbounded"/>\r
         </xs:sequence>\r
     </xs:complexType>\r
     <xs:complexType name="objectProductionPlaceGroup">\r
@@ -655,8 +673,8 @@
     <!-- to assocCulturalAffinity -->\r
     <xs:complexType name="assocCulturalContextGroupList">\r
         <xs:sequence>\r
-            <xs:element name="assocCulturalContextGroup" type="assocCulturalContextGroup" minOccurs="0"\r
-                maxOccurs="unbounded"/>\r
+            <xs:element name="assocCulturalContextGroup" type="assocCulturalContextGroup"\r
+                minOccurs="0" maxOccurs="unbounded"/>\r
         </xs:sequence>\r
     </xs:complexType>\r
     <!-- FIXME rename fields, if not over CSPACE-2501 length limit, -->\r
@@ -756,7 +774,7 @@
             <xs:element name="assocPlaceNote" type="xs:string"/>\r
         </xs:sequence>\r
     </xs:complexType>\r
-    \r
+\r
     <xs:complexType name="ownershipDateGroupList">\r
         <xs:sequence>\r
             <xs:element name="ownershipDateGroup" type="structuredDateGroup" minOccurs="0"\r
@@ -766,8 +784,7 @@
 \r
     <xs:complexType name="usageGroupList">\r
         <xs:sequence>\r
-            <xs:element name="usageGroup" type="usageGroup" minOccurs="0"\r
-                maxOccurs="unbounded"/>\r
+            <xs:element name="usageGroup" type="usageGroup" minOccurs="0" maxOccurs="unbounded"/>\r
         </xs:sequence>\r
     </xs:complexType>\r
     <xs:complexType name="usageGroup">\r
@@ -776,13 +793,14 @@
             <xs:element name="usageNote" type="xs:string"/>\r
         </xs:sequence>\r
     </xs:complexType>\r
-    \r
+\r
     <xs:complexType name="referenceGroupList">\r
         <xs:sequence>\r
-            <xs:element name="referenceGroup" type="referenceGroup" minOccurs="0" maxOccurs="unbounded"/>\r
+            <xs:element name="referenceGroup" type="referenceGroup" minOccurs="0"\r
+                maxOccurs="unbounded"/>\r
         </xs:sequence>\r
     </xs:complexType>\r
-        \r
+\r
     <xs:complexType name="referenceGroup">\r
         <xs:sequence>\r
             <xs:element name="reference" type="xs:string"/>\r
@@ -795,29 +813,29 @@
     <!-- that correctly in its table creation/row linking. -->\r
     <xs:complexType name="structuredDateGroup">\r
         <xs:sequence>\r
-            <xs:element name="dateDisplayDate" type="xs:string"/>\r
+            <xs:element name="dateEarliestSingleQualifier" type="xs:string"/>\r
+            <xs:element name="scalarValuesComputed" type="xs:boolean"/>\r
+            <xs:element name="dateLatestDay" type="xs:integer"/>\r
+            <xs:element name="dateLatestYear" type="xs:integer"/>\r
             <xs:element name="dateAssociation" type="xs:string"/>\r
-            <xs:element name="dateEarliestSingleYear" type="xs:integer"/>\r
-            <xs:element name="dateEarliestSingleMonth" type="xs:integer"/>\r
-            <xs:element name="dateEarliestSingleDay" type="xs:integer"/>\r
             <xs:element name="dateEarliestSingleEra" type="xs:string"/>\r
+            <xs:element name="dateDisplayDate" type="xs:string"/>\r
             <xs:element name="dateEarliestSingleCertainty" type="xs:string"/>\r
-            <xs:element name="dateEarliestSingleQualifier" type="xs:string"/>\r
-            <xs:element name="dateEarliestSingleQualifierValue" type="xs:integer"/>\r
-            <xs:element name="dateEarliestSingleQualifierUnit" type="xs:string"/>\r
-            <xs:element name="dateLatestYear" type="xs:integer"/>\r
-            <xs:element name="dateLatestMonth" type="xs:integer"/>\r
-            <xs:element name="dateLatestDay" type="xs:integer"/>\r
             <xs:element name="dateLatestEra" type="xs:string"/>\r
+            <xs:element name="dateEarliestSingleQualifierValue" type="xs:integer"/>\r
             <xs:element name="dateLatestCertainty" type="xs:string"/>\r
+            <xs:element name="dateEarliestSingleYear" type="xs:integer"/>\r
             <xs:element name="dateLatestQualifier" type="xs:string"/>\r
             <xs:element name="dateLatestQualifierValue" type="xs:integer"/>\r
-            <xs:element name="dateLatestQualifierUnit" type="xs:string"/>\r
+            <xs:element name="dateEarliestSingleQualifierUnit" type="xs:string"/>\r
             <xs:element name="datePeriod" type="xs:string"/>\r
-            <xs:element name="dateNote" type="xs:string"/>\r
             <xs:element name="dateEarliestScalarValue" type="xs:date"/>\r
+            <xs:element name="dateLatestMonth" type="xs:integer"/>\r
+            <xs:element name="dateNote" type="xs:string"/>\r
             <xs:element name="dateLatestScalarValue" type="xs:date"/>\r
-            <xs:element name="scalarValuesComputed" type="xs:boolean"/>\r
+            <xs:element name="dateLatestQualifierUnit" type="xs:string"/>\r
+            <xs:element name="dateEarliestSingleDay" type="xs:integer"/>\r
+            <xs:element name="dateEarliestSingleMonth" type="xs:integer"/>\r
         </xs:sequence>\r
     </xs:complexType>\r
 \r