From 5f0b0f43d00ddb1de4d078319f453c40129a4f10 Mon Sep 17 00:00:00 2001
From: Aron Roberts <aron@socrates.berkeley.edu>
Date: Wed, 14 Oct 2009 21:48:05 +0000
Subject: [PATCH] CSPACE-526: Set keyword substitution properties to Revision
 and Date on all XSD files.  Added keyword anchors to, and updated initial
 comments block in, all entity-related XSD files.  Added keyword anchors to
 several non-entity XSD files, without otherwise changing those files.

---
 .../resources/schemas/collectionobject.xsd    |  8 +++++++
 .../resources/schemas/acquisitions_common.xsd | 12 +++++++++++
 .../main/resources/acquisitions_common.xsd    | 19 +++++++++++++++--
 .../schemas/collectionobjects_common.xsd      | 12 +++++++++++
 .../collectionobjects_naturalhistory.xsd      | 12 +++++++++++
 .../resources/collectionobjects_common.xsd    | 17 ++++++++++++++-
 .../collectionobjects_naturalhistory.xsd      | 18 +++++++---------
 .../src/main/resources/relations_common.xsd   | 20 ++++++++----------
 .../src/main/resources/service-config.xsd     |  3 +++
 .../common/src/main/resources/service.xsd     |  4 ++--
 .../src/main/resources/system-response.xsd    |  4 +++-
 services/common/src/main/resources/tenant.xsd |  4 ++--
 services/common/src/main/resources/types.xsd  |  4 ++--
 services/id/jaxb/src/main/resources/id.xsd    |  4 ++--
 .../main/resources/schemas/intakes_common.xsd | 10 ++++++++-
 .../src/main/resources/intakes-common.xsd     | 18 ++++++++++++++--
 .../resources/schemas/relations_common.xsd    | 21 ++++++++-----------
 .../resources/schemas/vocabularies_common.xsd | 12 +++++++++++
 .../schemas/vocabularyitems_common.xsd        | 12 +++++++++++
 .../src/main/resources/vocabulary_common.xsd  | 18 ++++++++++++++--
 20 files changed, 182 insertions(+), 50 deletions(-)

diff --git a/3rdparty/nuxeo/nuxeo-platform-collectionspace/src/main/resources/schemas/collectionobject.xsd b/3rdparty/nuxeo/nuxeo-platform-collectionspace/src/main/resources/schemas/collectionobject.xsd
index d37b63e13..31dbaf299 100644
--- a/3rdparty/nuxeo/nuxeo-platform-collectionspace/src/main/resources/schemas/collectionobject.xsd
+++ b/3rdparty/nuxeo/nuxeo-platform-collectionspace/src/main/resources/schemas/collectionobject.xsd
@@ -1,4 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+
+<!--
+    Older (?) CollectionObject Schema for Nuxeo EP
+
+    $LastChangedRevision$
+    $LastChangedDate$
+-->
+
 <xs:schema 
     xmlns:xs="http://www.w3.org/2001/XMLSchema"
     xmlns:ns="http://collectionspace.org/collectionobject/"
diff --git a/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/src/main/resources/schemas/acquisitions_common.xsd b/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/src/main/resources/schemas/acquisitions_common.xsd
index f97517298..85754e6f8 100644
--- a/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/src/main/resources/schemas/acquisitions_common.xsd
+++ b/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/src/main/resources/schemas/acquisitions_common.xsd
@@ -1,4 +1,16 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+
+<!--
+    Acquisition schema (XSD)
+    
+    Entity  : Acquisition
+    Part    : Common
+    Used for: Nuxeo EP core document type
+
+    $LastChangedRevision$
+    $LastChangedDate$
+-->
+
 <xs:schema 
     xmlns:xs="http://www.w3.org/2001/XMLSchema"
     xmlns:ns="http://collectionspace.org/acquisition/"
diff --git a/services/acquisition/jaxb/src/main/resources/acquisitions_common.xsd b/services/acquisition/jaxb/src/main/resources/acquisitions_common.xsd
index d15fc2f23..4bba41de7 100644
--- a/services/acquisition/jaxb/src/main/resources/acquisitions_common.xsd
+++ b/services/acquisition/jaxb/src/main/resources/acquisitions_common.xsd
@@ -1,4 +1,16 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+
+<!--
+    Acquisition schema (XSD)
+    
+    Entity  : Acquisition
+    Part    : Common
+    Used for: JAXB binding between XML and Java objects
+
+    $LastChangedRevision$
+    $LastChangedDate$
+-->
+
 <xs:schema 
   xmlns:xs="http://www.w3.org/2001/XMLSchema"
   xmlns:ns="http://collectionspace.org/services/acquisition"
@@ -8,8 +20,11 @@
 >
 
 
-<!-- avoid XmlRootElement nightnmare, see http://weblogs.java.net/blog/kohsuke/archive/2006/03/why_does_jaxb_p.html-->
-    <!-- See http://wiki.collectionspace.org/display/collectionspace/Acquisition+Schema -->    
+<!--
+    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/Acquisition+Schema -->    
     
     <!-- acquisition  -->
     <xs:element name="acquisitions_common">
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 78f6e9f01..c01906760 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
@@ -1,4 +1,16 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+
+<!--
+    CollectionObject schema (XSD)
+    
+    Entity  : CollectionObject
+    Part    : Common
+    Used for: Nuxeo EP core document type
+
+    $LastChangedRevision$
+    $LastChangedDate$
+-->
+
 <xs:schema 
     xmlns:xs="http://www.w3.org/2001/XMLSchema"
     xmlns:ns="http://collectionspace.org/collectionobject/"
diff --git a/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/src/main/resources/schemas/collectionobjects_naturalhistory.xsd b/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/src/main/resources/schemas/collectionobjects_naturalhistory.xsd
index 25aceab31..f7007faaf 100644
--- a/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/src/main/resources/schemas/collectionobjects_naturalhistory.xsd
+++ b/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/src/main/resources/schemas/collectionobjects_naturalhistory.xsd
@@ -1,4 +1,16 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+
+<!--
+    CollectionObject schema (XSD)
+    
+    Entity  : CollectionObject
+    Part    : Domain - Natural History (example)
+    Used for: Nuxeo EP core document type
+    
+    $LastChangedRevision$
+    $LastChangedDate$
+-->
+
 <xs:schema 
     xmlns:xs="http://www.w3.org/2001/XMLSchema"
     xmlns:ns="http://collectionspace.org/collectionobject/"
diff --git a/services/collectionobject/jaxb/src/main/resources/collectionobjects_common.xsd b/services/collectionobject/jaxb/src/main/resources/collectionobjects_common.xsd
index e0995e740..4aca87598 100644
--- a/services/collectionobject/jaxb/src/main/resources/collectionobjects_common.xsd
+++ b/services/collectionobject/jaxb/src/main/resources/collectionobjects_common.xsd
@@ -1,4 +1,16 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+
+<!--
+    CollectionObject schema (XSD)
+    
+    Entity  : CollectionObject
+    Part    : Common
+    Used for: JAXB binding between XML and Java objects
+    
+    $LastChangedRevision$
+    $LastChangedDate$
+-->
+
 <xs:schema 
   xmlns:xs="http://www.w3.org/2001/XMLSchema"
   xmlns:ns="http://collectionspace.org/servics/collectionobject"
@@ -7,7 +19,10 @@
   version="0.1"
 >
 
-<!-- avoid XmlRootElement nightnmare, see http://weblogs.java.net/blog/kohsuke/archive/2006/03/why_does_jaxb_p.html-->
+<!--
+    Avoid XmlRootElement nightmare:
+    See http://weblogs.java.net/blog/kohsuke/archive/2006/03/why_does_jaxb_p.html
+-->
 
     <!-- collectionobjects-common -->
     <!-- convention: <servicename>-common  -->
diff --git a/services/collectionobject/jaxb/src/main/resources/collectionobjects_naturalhistory.xsd b/services/collectionobject/jaxb/src/main/resources/collectionobjects_naturalhistory.xsd
index f066192f0..ac39cb0e5 100644
--- a/services/collectionobject/jaxb/src/main/resources/collectionobjects_naturalhistory.xsd
+++ b/services/collectionobject/jaxb/src/main/resources/collectionobjects_naturalhistory.xsd
@@ -1,18 +1,16 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+
 <!--
-    Copyright 2009 University of California at Berkeley
-    Licensed under the Educational Community License (ECL), Version 2.0.
-    You may not use this file except in compliance with this License.
+    CollectionObject schema (XSD)
     
-    You may obtain a copy of the ECL 2.0 License at
-    https://source.collectionspace.org/collection-space/LICENSE.txt
+    Entity  : CollectionObject
+    Part    : Domain - Natural History (example)
+    Used for: JAXB binding between XML and Java objects
 
-    Document   : collectionobject-naturalhistory.xsd
-    Revision   : $LastChangedRevision: $
-    Created on : $LastChangedDate: $
-    Author     : $LastChangedBy: $
-    Description:
+    $LastChangedRevision$
+    $LastChangedDate$
 -->
+
 <xs:schema 
   xmlns:xs="http://www.w3.org/2001/XMLSchema"
   xmlns:ns="http://collectionspace.org/services/collectionobject/domain/naturalhistory"
diff --git a/services/common/src/main/resources/relations_common.xsd b/services/common/src/main/resources/relations_common.xsd
index bf3db87af..d0415d480 100644
--- a/services/common/src/main/resources/relations_common.xsd
+++ b/services/common/src/main/resources/relations_common.xsd
@@ -1,18 +1,16 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+
 <!--
-    Copyright 2009 University of California at Berkeley
-    Licensed under the Educational Community License (ECL), Version 2.0.
-    You may not use this file except in compliance with this License.
+    Relation schema (XSD)
     
-    You may obtain a copy of the ECL 2.0 License at
-    https://source.collectionspace.org/collection-space/LICENSE.txt
-
-    Document   : relation.xsd
-    Revision   : $LastChangedRevision: $
-    Created on : $LastChangedDate: $
-    Author     : $LastChangedBy: $
-    Description:
+    Entity  : Relation
+    Part    : Common
+    Used for: JAXB binding between XML and Java objects
+            
+    $LastChangedRevision$
+    $LastChangedDate$
 -->
+
 <xs:schema
     xmlns:xs="http://www.w3.org/2001/XMLSchema"
     xmlns="http://collectionspace.org/services/relation"
diff --git a/services/common/src/main/resources/service-config.xsd b/services/common/src/main/resources/service-config.xsd
index ed7d5c5d7..06b12d008 100644
--- a/services/common/src/main/resources/service-config.xsd
+++ b/services/common/src/main/resources/service-config.xsd
@@ -3,10 +3,13 @@
     Document   : service-config.xsd
     Created on : May 19, 2009, 1:31 PM
     Author     :
+    $LastChangedRevision$
+    $LastChangedDate$
     Copyright 2009 University of California at Berkeley
     Description:
         Schema for service layer configuration
 -->
+
 <xs:schema 
   xmlns:xs="http://www.w3.org/2001/XMLSchema"
   xmlns="http://collectionspace.org/services/common"
diff --git a/services/common/src/main/resources/service.xsd b/services/common/src/main/resources/service.xsd
index 00e3b0ff7..c87ab7c9f 100644
--- a/services/common/src/main/resources/service.xsd
+++ b/services/common/src/main/resources/service.xsd
@@ -8,8 +8,8 @@
     https://source.collectionspace.org/collection-space/LICENSE.txt
 
     Document   : service.xsd
-    Revision   : $LastChangedRevision: $
-    Created on : $LastChangedDate: $
+    Revision   : $LastChangedRevision$
+    Created on : $LastChangedDate$
     Author     : $LastChangedBy: $
     Description: ServiceBinding desribes how a possibly tenant-specific service is
                  bound to corresponding service framework at runtime
diff --git a/services/common/src/main/resources/system-response.xsd b/services/common/src/main/resources/system-response.xsd
index 5e7f9ed2f..ce161d05f 100644
--- a/services/common/src/main/resources/system-response.xsd
+++ b/services/common/src/main/resources/system-response.xsd
@@ -3,6 +3,8 @@
     Document   : system-response.xsd
     Created on : May 26, 2009, 1:31 PM
     Author     :
+    $LastChangedRevision$
+    $LastChangedDate$
     Copyright 2009 University of California at Berkeley
     Description:
         Schema for system specific information for service response envelope.
@@ -104,4 +106,4 @@
         </xs:complexType>
     </xs:element>
 
-</xs:schema>
\ No newline at end of file
+</xs:schema>
diff --git a/services/common/src/main/resources/tenant.xsd b/services/common/src/main/resources/tenant.xsd
index 070685103..a9811f120 100644
--- a/services/common/src/main/resources/tenant.xsd
+++ b/services/common/src/main/resources/tenant.xsd
@@ -9,8 +9,8 @@
     https://source.collectionspace.org/collection-space/LICENSE.txt
 
     Document   : tenant-binding.xsd
-    Revision   : $LastChangedRevision: $
-    Created on : $LastChangedDate: $
+    Revision   : $LastChangedRevision$
+    Created on : $LastChangedDate$
     Description:
         
 -->
diff --git a/services/common/src/main/resources/types.xsd b/services/common/src/main/resources/types.xsd
index ab24291c0..a15cb6f5d 100644
--- a/services/common/src/main/resources/types.xsd
+++ b/services/common/src/main/resources/types.xsd
@@ -9,8 +9,8 @@
     https://source.collectionspace.org/collection-space/LICENSE.txt
 
     Document   : types.xsd
-    Revision   : $LastChangedRevision: $
-    Created on : $LastChangedDate: $
+    Revision   : $LastChangedRevision$
+    Created on : $LastChangedDate$
     Description:
         
 -->
diff --git a/services/id/jaxb/src/main/resources/id.xsd b/services/id/jaxb/src/main/resources/id.xsd
index eb194a7a4..fda369b76 100644
--- a/services/id/jaxb/src/main/resources/id.xsd
+++ b/services/id/jaxb/src/main/resources/id.xsd
@@ -16,8 +16,8 @@
  http://wiki.collectionspace.org
  
  $LastChangedBy: aron $
- $LastChangedRevision: 302 $
- $LastChangedDate: 2009-06-29 15:36:29 -0700 (Mon, 29 Jun 2009) $
+ $LastChangedRevision$
+ $LastChangedDate$
 -->
 
 <!-- TODO: ** These schemas are currently incomplete placeholders ** -->
diff --git a/services/intake/3rdparty/nuxeo-platform-cs-intake/src/main/resources/schemas/intakes_common.xsd b/services/intake/3rdparty/nuxeo-platform-cs-intake/src/main/resources/schemas/intakes_common.xsd
index 800c80158..ebf92ebd4 100644
--- a/services/intake/3rdparty/nuxeo-platform-cs-intake/src/main/resources/schemas/intakes_common.xsd
+++ b/services/intake/3rdparty/nuxeo-platform-cs-intake/src/main/resources/schemas/intakes_common.xsd
@@ -1,6 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+
 <!--
-Schema Revision No.: $Rev$
+    Intake schema (XSD)
+    
+    Entity  : Intake
+    Part    : Common
+    Used for: Nuxeo EP core document type
+
+    $LastChangedRevision$
+    $LastChangedDate$
 -->
 
 <xs:schema 
diff --git a/services/intake/jaxb/src/main/resources/intakes-common.xsd b/services/intake/jaxb/src/main/resources/intakes-common.xsd
index 8f01f1f0b..d0dc652c1 100644
--- a/services/intake/jaxb/src/main/resources/intakes-common.xsd
+++ b/services/intake/jaxb/src/main/resources/intakes-common.xsd
@@ -1,4 +1,16 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+
+<!--
+    Intake schema (XSD)
+    
+    Entity  : Intake
+    Part    : Common
+    Used for: JAXB binding between XML and Java objects
+
+    $LastChangedRevision$
+    $LastChangedDate$
+-->
+
 <xs:schema 
   xmlns:xs="http://www.w3.org/2001/XMLSchema"
   xmlns:ns="http://collectionspace.org/services/intake"
@@ -7,8 +19,10 @@
   version="0.1"
 >
 
-
-<!-- avoid XmlRootElement nightnmare, see http://weblogs.java.net/blog/kohsuke/archive/2006/03/why_does_jaxb_p.html-->
+<!--
+    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/Intake+Schema -->    
     
     <!-- intake  -->
diff --git a/services/relation/3rdparty/nuxeo-platform-cs-relation/src/main/resources/schemas/relations_common.xsd b/services/relation/3rdparty/nuxeo-platform-cs-relation/src/main/resources/schemas/relations_common.xsd
index 78e5fb47f..2ecf22619 100644
--- a/services/relation/3rdparty/nuxeo-platform-cs-relation/src/main/resources/schemas/relations_common.xsd
+++ b/services/relation/3rdparty/nuxeo-platform-cs-relation/src/main/resources/schemas/relations_common.xsd
@@ -1,19 +1,16 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+
 <!--
-    Copyright 2009 University of California at Berkeley
-    Licensed under the Educational Community License (ECL), Version 2.0.
-    You may not use this file except in compliance with this License.
+    Relation schema (XSD)
     
-    You may obtain a copy of the ECL 2.0 License at
-    https://source.collectionspace.org/collection-space/LICENSE.txt
-
-    Document   : relation.xsd
-    Revision   : $LastChangedRevision: $
-    Created on : $LastChangedDate: $
-    Author     : $LastChangedBy: $
-    Description:
-        Nuxeo document core type for CollectionSpace Relation
+    Entity  : Relation
+    Part    : Common
+    Used for: Nuxeo EP core document type
+
+    $LastChangedRevision$
+    $LastChangedDate$
 -->
+
 <xs:schema 
     xmlns:xs="http://www.w3.org/2001/XMLSchema"
     xmlns="http://collectionspace.org/relation/"
diff --git a/services/vocabulary/3rdparty/nuxeo-platform-cs-vocabulary/src/main/resources/schemas/vocabularies_common.xsd b/services/vocabulary/3rdparty/nuxeo-platform-cs-vocabulary/src/main/resources/schemas/vocabularies_common.xsd
index 7e642feaa..6cb8986a6 100644
--- a/services/vocabulary/3rdparty/nuxeo-platform-cs-vocabulary/src/main/resources/schemas/vocabularies_common.xsd
+++ b/services/vocabulary/3rdparty/nuxeo-platform-cs-vocabulary/src/main/resources/schemas/vocabularies_common.xsd
@@ -1,4 +1,16 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+
+<!--
+    Vocabulary schema (XSD)
+    
+    Entity  : Vocabulary
+    Part    : Common
+    Used for: Nuxeo EP core document type
+    
+    $LastChangedRevision$
+    $LastChangedDate$
+-->
+
 <xs:schema 
   xmlns:xs="http://www.w3.org/2001/XMLSchema"
   xmlns:ns="http://collectionspace.org/services/vocabulary"
diff --git a/services/vocabulary/3rdparty/nuxeo-platform-cs-vocabulary/src/main/resources/schemas/vocabularyitems_common.xsd b/services/vocabulary/3rdparty/nuxeo-platform-cs-vocabulary/src/main/resources/schemas/vocabularyitems_common.xsd
index 8b0d443d4..3720b9b0c 100644
--- a/services/vocabulary/3rdparty/nuxeo-platform-cs-vocabulary/src/main/resources/schemas/vocabularyitems_common.xsd
+++ b/services/vocabulary/3rdparty/nuxeo-platform-cs-vocabulary/src/main/resources/schemas/vocabularyitems_common.xsd
@@ -1,4 +1,16 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+
+<!--
+    VocabularyItem schema (XSD)
+    
+    Entity  : VocabularyItem
+    Part    : Common
+    Used for: Nuxeo EP core document type
+    
+    $LastChangedRevision$
+    $LastChangedDate$
+-->
+
 <xs:schema 
   xmlns:xs="http://www.w3.org/2001/XMLSchema"
   xmlns:ns="http://collectionspace.org/services/vocabulary"
diff --git a/services/vocabulary/jaxb/src/main/resources/vocabulary_common.xsd b/services/vocabulary/jaxb/src/main/resources/vocabulary_common.xsd
index 721babad8..90144b6ca 100644
--- a/services/vocabulary/jaxb/src/main/resources/vocabulary_common.xsd
+++ b/services/vocabulary/jaxb/src/main/resources/vocabulary_common.xsd
@@ -1,4 +1,16 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+
+<!--
+    Vocabulary schema (XSD)
+    
+    Entity  : Vocabulary
+    Part    : Common
+    Used for: JAXB binding between XML and Java objects
+    
+    $LastChangedRevision$
+    $LastChangedDate$
+-->
+
 <xs:schema 
   xmlns:xs="http://www.w3.org/2001/XMLSchema"
   xmlns:ns="http://collectionspace.org/services/vocabulary"
@@ -7,8 +19,10 @@
   version="0.1"
 >
 
-
-<!-- avoid XmlRootElement nightnmare, see http://weblogs.java.net/blog/kohsuke/archive/2006/03/why_does_jaxb_p.html-->
+<!--
+    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/Vocabulary+Schema -->    
     
     <!-- Vocabulary  -->
-- 
2.47.3