CSPACE-6935: Added new 'rev' field to authority and vocabulay records and also added...

diff --git a/3rdparty/nuxeo/nuxeo-platform-thumbnail/.gitignore b/3rdparty/nuxeo/nuxeo-platform-thumbnail/.gitignore
new file mode 100644 (file)
index 0000000..b83d222
--- /dev/null
+++ b/3rdparty/nuxeo/nuxeo-platform-thumbnail/.gitignore
@@ -0,0 +1 @@
+/target/

diff --git a/services/account/jaxb/.gitignore b/services/account/jaxb/.gitignore
new file mode 100644 (file)
index 0000000..993e2e7
--- /dev/null
+++ b/services/account/jaxb/.gitignore
@@ -0,0 +1,6 @@
+/target/
+/target/
+/target/
+/target/
+/target/
+/target/

diff --git a/services/acquisition/jaxb/.gitignore b/services/acquisition/jaxb/.gitignore
new file mode 100644 (file)
index 0000000..b83d222
--- /dev/null
+++ b/services/acquisition/jaxb/.gitignore
@@ -0,0 +1 @@
+/target/

diff --git a/services/authentication/jaxb/.gitignore b/services/authentication/jaxb/.gitignore
new file mode 100644 (file)
index 0000000..e91d5c4
--- /dev/null
+++ b/services/authentication/jaxb/.gitignore
@@ -0,0 +1,3 @@
+/target/
+/target/
+/target/

diff --git a/services/authentication/service/.gitignore b/services/authentication/service/.gitignore
new file mode 100644 (file)
index 0000000..b83d222
--- /dev/null
+++ b/services/authentication/service/.gitignore
@@ -0,0 +1 @@
+/target/

diff --git a/services/authority/jaxb/.gitignore b/services/authority/jaxb/.gitignore
new file mode 100644 (file)
index 0000000..b83d222
--- /dev/null
+++ b/services/authority/jaxb/.gitignore
@@ -0,0 +1 @@
+/target/

diff --git a/services/authority/jaxb/src/main/java/org/collectionspace/services/common/vocabulary/AuthorityItemJAXBSchema.java b/services/authority/jaxb/src/main/java/org/collectionspace/services/common/vocabulary/AuthorityItemJAXBSchema.java
index 2bb0252c10e3b418f7696b861c9f84af2e548e87..2a1397a4f02dc4765221fbdf9c91fe21aba31aad 100644 (file)
--- a/services/authority/jaxb/src/main/java/org/collectionspace/services/common/vocabulary/AuthorityItemJAXBSchema.java
+++ b/services/authority/jaxb/src/main/java/org/collectionspace/services/common/vocabulary/AuthorityItemJAXBSchema.java
@@ -33,6 +33,7 @@ public interface AuthorityItemJAXBSchema {
     final static String ORDER = "order";
     final static String SHORT_IDENTIFIER = "shortIdentifier";
     final static String CSID = "csid";
+    final static String REV = "rev";
     final static String DISPLAY_NAME = "displayName"; // This is the display name element for the Vocabulary service's item    
     final static String TERM_DISPLAY_NAME = "termDisplayName"; // This is the display name element for all Authority services' items
     final static String TERM_NAME = "termName";

diff --git a/services/authority/service/src/main/java/org/collectionspace/services/common/vocabulary/nuxeo/AuthorityDocumentModelHandler.java b/services/authority/service/src/main/java/org/collectionspace/services/common/vocabulary/nuxeo/AuthorityDocumentModelHandler.java
index 2dad57a22ecf8344fdc64c0683522a48e5069947..be07bd4c608dd166293751efc5726b43774070d0 100644 (file)
--- a/services/authority/service/src/main/java/org/collectionspace/services/common/vocabulary/nuxeo/AuthorityDocumentModelHandler.java
+++ b/services/authority/service/src/main/java/org/collectionspace/services/common/vocabulary/nuxeo/AuthorityDocumentModelHandler.java
@@ -34,6 +34,8 @@ import org.collectionspace.services.common.context.ServiceContext;
 import org.collectionspace.services.common.document.DocumentException;
 import org.collectionspace.services.common.document.DocumentNotFoundException;
 import org.collectionspace.services.common.document.DocumentWrapper;
+import org.collectionspace.services.common.document.DocumentHandler.Action;
+import org.collectionspace.services.common.vocabulary.AuthorityItemJAXBSchema;
 import org.collectionspace.services.common.vocabulary.AuthorityJAXBSchema;
 import org.collectionspace.services.config.service.ObjectPartType;
 import org.collectionspace.services.nuxeo.client.java.NuxeoDocumentModelHandler;
@@ -78,6 +80,22 @@ public abstract class AuthorityDocumentModelHandler<AuthCommon>
 
         return unQObjectProperties;
     }
+    
+    public void fillAllParts(DocumentWrapper<DocumentModel> wrapDoc, Action action) throws Exception {
+       super.fillAllParts(wrapDoc, action);
+       //
+       // Update the record's revision number on both CREATE and UPDATE actions
+       //
+       DocumentModel documentModel = wrapDoc.getWrappedObject();
+       Integer rev = (Integer)documentModel.getProperty(authorityCommonSchemaName, AuthorityItemJAXBSchema.REV);
+       if (rev == null) {
+               rev = 0;
+       } else {
+               rev++;
+       }
+       documentModel.setProperty(authorityCommonSchemaName, AuthorityItemJAXBSchema.REV, rev);
+    }
+    
 
     @Override
     public void handleCreate(DocumentWrapper<DocumentModel> wrapDoc) throws Exception {

diff --git a/services/authorization-mgt/client/.gitignore b/services/authorization-mgt/client/.gitignore
new file mode 100644 (file)
index 0000000..b83d222
--- /dev/null
+++ b/services/authorization-mgt/client/.gitignore
@@ -0,0 +1 @@
+/target/

diff --git a/services/authorization/jaxb/.gitignore b/services/authorization/jaxb/.gitignore
new file mode 100644 (file)
index 0000000..a227dd5
--- /dev/null
+++ b/services/authorization/jaxb/.gitignore
@@ -0,0 +1,7 @@
+/target/
+/target/
+/target/
+/target/
+/target/
+/target/
+/target/

diff --git a/services/authorization/service/.gitignore b/services/authorization/service/.gitignore
new file mode 100644 (file)
index 0000000..b83d222
--- /dev/null
+++ b/services/authorization/service/.gitignore
@@ -0,0 +1 @@
+/target/

diff --git a/services/batch/jaxb/.gitignore b/services/batch/jaxb/.gitignore
new file mode 100644 (file)
index 0000000..1dd3331
--- /dev/null
+++ b/services/batch/jaxb/.gitignore
@@ -0,0 +1,2 @@
+/target/
+/target/

diff --git a/services/citation/client/.gitignore b/services/citation/client/.gitignore
new file mode 100644 (file)
index 0000000..b83d222
--- /dev/null
+++ b/services/citation/client/.gitignore
@@ -0,0 +1 @@
+/target/

diff --git a/services/citation/jaxb/.gitignore b/services/citation/jaxb/.gitignore
new file mode 100644 (file)
index 0000000..1dd3331
--- /dev/null
+++ b/services/citation/jaxb/.gitignore
@@ -0,0 +1,2 @@
+/target/
+/target/

diff --git a/services/citation/jaxb/src/main/resources/citation_common.xsd b/services/citation/jaxb/src/main/resources/citation_common.xsd
index b86c2c1fa6cfaee24086911f013ea1f16be5bce6..056629752e00049074ce56e600c89bed7cf38052 100644 (file)
--- a/services/citation/jaxb/src/main/resources/citation_common.xsd
+++ b/services/citation/jaxb/src/main/resources/citation_common.xsd
@@ -27,6 +27,7 @@
             <xs:sequence>
                 <!--  Common identifier -->
                 <xs:element name="csid" type="xs:string" />
+                               <xs:element name="rev" type="xs:integer" /> <!-- Revision number -->
                 
                 <!--  Citation Information Group -->
                 <xs:element name="inAuthority" type="xs:string" />

diff --git a/services/citation/jaxb/src/main/resources/citationauthority_common.xsd b/services/citation/jaxb/src/main/resources/citationauthority_common.xsd
index 68d63d161882a98a90a66520b7b1904847fec441..0c7b36d666f31f63ae9475b8eb8082f42f971566 100644 (file)
--- a/services/citation/jaxb/src/main/resources/citationauthority_common.xsd
+++ b/services/citation/jaxb/src/main/resources/citationauthority_common.xsd
@@ -7,8 +7,6 @@
     Part    : Common
     Used for: JAXB binding between XML and Java objects
     
-    $LastChangedRevision: 1055 $
-    $LastChangedDate: 2009-12-09 12:25:15 -0800 (Wed, 09 Dec 2009) $
 -->
 
 <xs:schema 
@@ -18,7 +16,7 @@
     xmlns:ns="http://collectionspace.org/services/citation"
     xmlns="http://collectionspace.org/services/citation"
     targetNamespace="http://collectionspace.org/services/citation"
-    version="0.1"
+    version="0.2"
     >
     
     <!--
@@ -36,11 +34,13 @@
                 
                 <!--  CitationAuthority Information Group -->
                 <xs:element name="displayName" type="xs:string"/>
-                                                               <xs:element name="shortIdentifier" type="xs:string"/>
+                               <xs:element name="shortIdentifier" type="xs:string"/>
                 <xs:element name="refName" type="xs:string"/>
                 <xs:element name="vocabType" type="xs:string"/>
                 <xs:element name="source" type="xs:string"/>
                 <xs:element name="description" type="xs:string"/>
+                               <!-- Internal fields -->
+                               <xs:element name="rev" type="xs:integer"/> <!-- The revision number of the authority.  Increments with each change including changes to its terms. -->
             </xs:sequence>
         </xs:complexType>
     </xs:element>

diff --git a/services/citation/service/.gitignore b/services/citation/service/.gitignore
new file mode 100644 (file)
index 0000000..b83d222
--- /dev/null
+++ b/services/citation/service/.gitignore
@@ -0,0 +1 @@
+/target/

diff --git a/services/client/.gitignore b/services/client/.gitignore
new file mode 100644 (file)
index 0000000..b83d222
--- /dev/null
+++ b/services/client/.gitignore
@@ -0,0 +1 @@
+/target/

diff --git a/services/collectionobject/jaxb/.gitignore b/services/collectionobject/jaxb/.gitignore
new file mode 100644 (file)
index 0000000..1dd3331
--- /dev/null
+++ b/services/collectionobject/jaxb/.gitignore
@@ -0,0 +1,2 @@
+/target/
+/target/

diff --git a/services/common-api/.gitignore b/services/common-api/.gitignore
new file mode 100644 (file)
index 0000000..b83d222
--- /dev/null
+++ b/services/common-api/.gitignore
@@ -0,0 +1 @@
+/target/

diff --git a/services/common/.gitignore b/services/common/.gitignore
new file mode 100644 (file)
index 0000000..b83d222
--- /dev/null
+++ b/services/common/.gitignore
@@ -0,0 +1 @@
+/target/

diff --git a/services/common/src/main/java/org/collectionspace/services/common/vocabulary/RefNameServiceUtils.java b/services/common/src/main/java/org/collectionspace/services/common/vocabulary/RefNameServiceUtils.java
index 6804ec811776bab152e1a6ab93b29f88deb67aa2..5513e472a6b90b1c2243c272acee17423b0c18d8 100644 (file)
--- a/services/common/src/main/java/org/collectionspace/services/common/vocabulary/RefNameServiceUtils.java
+++ b/services/common/src/main/java/org/collectionspace/services/common/vocabulary/RefNameServiceUtils.java
@@ -521,7 +521,7 @@ public class RefNameServiceUtils {
 
         ArrayList<String> docTypes = new ArrayList<String>();
 
-        String query = computeWhereClauseForAuthorityRefDocs(refName, refPropName, docTypes, servicebindings, // REM - Side effect that docTypes array gets set.  Any others?
+        String query = computeWhereClauseForAuthorityRefDocs(refName, refPropName, docTypes, servicebindings, // REM - Side effect that docTypes, authRefFieldsByService, and queriedServiceBindings get set/change.  Any others?
                 queriedServiceBindings, authRefFieldsByService);
         if (query == null) { // found no authRef fields - nothing to query
             return null;
@@ -584,7 +584,7 @@ public class RefNameServiceUtils {
                 + " AND " + (authTermInfo.inAuthority.name != null
                 ? authTermInfo.inAuthority.name : authTermInfo.inAuthority.csid)
                 + " AND " + (authTermInfo.name != null
-                ? authTermInfo.name : authTermInfo.csid);
+                ? authTermInfo.name : authTermInfo.csid); // REM - This seems likely to cause trouble.  We should consider searching for the full refname -excluding the display name suffix
 
         String whereClauseStr = QueryManager.createWhereClauseFromKeywords(keywords);
 
@@ -882,7 +882,7 @@ public class RefNameServiceUtils {
         }
 
         if (prop instanceof StringProperty) {    // scalar string
-            addARIifMatches(refNameToMatch, matchBaseOnly, arci, prop, foundProps);
+            addARIifMatches(refNameToMatch, matchBaseOnly, arci, prop, foundProps); // REM - Side effect that foundProps gets changed/updated
         } else if (prop instanceof List) {
             List<Property> propList = (List<Property>) prop;
             // run through list. Must either be list of Strings, or Complex

diff --git a/services/concept/jaxb/.gitignore b/services/concept/jaxb/.gitignore
new file mode 100644 (file)
index 0000000..b83d222
--- /dev/null
+++ b/services/concept/jaxb/.gitignore
@@ -0,0 +1 @@
+/target/

diff --git a/services/concept/jaxb/src/main/resources/concept_common.xsd b/services/concept/jaxb/src/main/resources/concept_common.xsd
index 986650cacbe99be49399be62c485d3b6fa1d0e7d..505f955bbd3273a845830f872af9464df77828f7 100644 (file)
--- a/services/concept/jaxb/src/main/resources/concept_common.xsd
+++ b/services/concept/jaxb/src/main/resources/concept_common.xsd
@@ -27,6 +27,7 @@
             <xs:sequence>
                <!--  Common identifier -->
                 <xs:element name="csid" type="xs:string" />
+                               <xs:element name="rev" type="xs:integer" /> <!-- Revision number -->
                                        
                <!--  Common Authority Information Group -->
                <!--  inAuthority is the csid of the owning ConceptAuthority -->

diff --git a/services/concept/jaxb/src/main/resources/conceptauthority_common.xsd b/services/concept/jaxb/src/main/resources/conceptauthority_common.xsd
index 2cc040422163da1e4faf21ec70e538c946b87659..c319b93fcb927def4388acbd89efcd615326fecd 100644 (file)
--- a/services/concept/jaxb/src/main/resources/conceptauthority_common.xsd
+++ b/services/concept/jaxb/src/main/resources/conceptauthority_common.xsd
@@ -7,8 +7,6 @@
     Part    : Common
     Used for: JAXB binding between XML and Java objects
     
-    $LastChangedRevision: 1055 $
-    $LastChangedDate: 2009-12-09 12:25:15 -0800 (Wed, 09 Dec 2009) $
 -->
 
 <xs:schema 
@@ -18,7 +16,7 @@
     xmlns:ns="http://collectionspace.org/services/concept"
     xmlns="http://collectionspace.org/services/concept"
     targetNamespace="http://collectionspace.org/services/concept"
-    version="0.1"
+    version="0.2"
     >
     
     <!--
@@ -36,11 +34,13 @@
                 
                 <!--  ConceptAuthority Information Group -->
                 <xs:element name="displayName" type="xs:string"/>
-                                                               <xs:element name="shortIdentifier" type="xs:string"/>
+                               <xs:element name="shortIdentifier" type="xs:string"/>
                 <xs:element name="refName" type="xs:string"/>
                 <xs:element name="vocabType" type="xs:string"/>
                 <xs:element name="source" type="xs:string"/>
                 <xs:element name="description" type="xs:string"/>
+                               <!-- Internal fields -->
+                               <xs:element name="rev" type="xs:integer"/> <!-- The revision number of the authority.  Increments with each change including changes to its terms. -->
             </xs:sequence>
         </xs:complexType>
     </xs:element>

diff --git a/services/conditioncheck/jaxb/.gitignore b/services/conditioncheck/jaxb/.gitignore
new file mode 100644 (file)
index 0000000..b83d222
--- /dev/null
+++ b/services/conditioncheck/jaxb/.gitignore
@@ -0,0 +1 @@
+/target/

diff --git a/services/config/.gitignore b/services/config/.gitignore
new file mode 100644 (file)
index 0000000..e91d5c4
--- /dev/null
+++ b/services/config/.gitignore
@@ -0,0 +1,3 @@
+/target/
+/target/
+/target/

diff --git a/services/conservation/jaxb/.gitignore b/services/conservation/jaxb/.gitignore
new file mode 100644 (file)
index 0000000..b83d222
--- /dev/null
+++ b/services/conservation/jaxb/.gitignore
@@ -0,0 +1 @@
+/target/

diff --git a/services/contact/client/.gitignore b/services/contact/client/.gitignore
new file mode 100644 (file)
index 0000000..b83d222
--- /dev/null
+++ b/services/contact/client/.gitignore
@@ -0,0 +1 @@
+/target/

diff --git a/services/contact/jaxb/.gitignore b/services/contact/jaxb/.gitignore
new file mode 100644 (file)
index 0000000..b83d222
--- /dev/null
+++ b/services/contact/jaxb/.gitignore
@@ -0,0 +1 @@
+/target/

diff --git a/services/dimension/jaxb/.gitignore b/services/dimension/jaxb/.gitignore
new file mode 100644 (file)
index 0000000..b83d222
--- /dev/null
+++ b/services/dimension/jaxb/.gitignore
@@ -0,0 +1 @@
+/target/

diff --git a/services/exhibition/jaxb/.gitignore b/services/exhibition/jaxb/.gitignore
new file mode 100644 (file)
index 0000000..b83d222
--- /dev/null
+++ b/services/exhibition/jaxb/.gitignore
@@ -0,0 +1 @@
+/target/

diff --git a/services/group/jaxb/.gitignore b/services/group/jaxb/.gitignore
new file mode 100644 (file)
index 0000000..b83d222
--- /dev/null
+++ b/services/group/jaxb/.gitignore
@@ -0,0 +1 @@
+/target/

diff --git a/services/hyperjaxb/.gitignore b/services/hyperjaxb/.gitignore
new file mode 100644 (file)
index 0000000..b49c563
--- /dev/null
+++ b/services/hyperjaxb/.gitignore
@@ -0,0 +1,4 @@
+/target/
+/target/
+/target/
+/target/

diff --git a/services/imports/jaxb/.gitignore b/services/imports/jaxb/.gitignore
new file mode 100644 (file)
index 0000000..b83d222
--- /dev/null
+++ b/services/imports/jaxb/.gitignore
@@ -0,0 +1 @@
+/target/

diff --git a/services/intake/jaxb/.gitignore b/services/intake/jaxb/.gitignore
new file mode 100644 (file)
index 0000000..b83d222
--- /dev/null
+++ b/services/intake/jaxb/.gitignore
@@ -0,0 +1 @@
+/target/

diff --git a/services/jaxb/.gitignore b/services/jaxb/.gitignore
new file mode 100644 (file)
index 0000000..1dd3331
--- /dev/null
+++ b/services/jaxb/.gitignore
@@ -0,0 +1,2 @@
+/target/
+/target/

diff --git a/services/loanin/jaxb/.gitignore b/services/loanin/jaxb/.gitignore
new file mode 100644 (file)
index 0000000..b83d222
--- /dev/null
+++ b/services/loanin/jaxb/.gitignore
@@ -0,0 +1 @@
+/target/

diff --git a/services/loanout/jaxb/.gitignore b/services/loanout/jaxb/.gitignore
new file mode 100644 (file)
index 0000000..b83d222
--- /dev/null
+++ b/services/loanout/jaxb/.gitignore
@@ -0,0 +1 @@
+/target/

diff --git a/services/location/jaxb/.gitignore b/services/location/jaxb/.gitignore
new file mode 100644 (file)
index 0000000..b83d222
--- /dev/null
+++ b/services/location/jaxb/.gitignore
@@ -0,0 +1 @@
+/target/

diff --git a/services/location/jaxb/src/main/resources/location_common.xsd b/services/location/jaxb/src/main/resources/location_common.xsd
index b1a50358a64994da57fc2e9288a7b73ebec00df3..c2b6115e7c3d60dec21b81e204af1137c93c0c2d 100644 (file)
--- a/services/location/jaxb/src/main/resources/location_common.xsd
+++ b/services/location/jaxb/src/main/resources/location_common.xsd
@@ -1,4 +1,13 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+
+<!--
+    Location schema (XSD)
+
+    Entity  : Location
+    Part    : Common
+    Used for: JAXB binding between XML and Java objects
+-->
+
 <xs:schema 
     xmlns:xs="http://www.w3.org/2001/XMLSchema"
     xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
@@ -19,6 +28,7 @@
             <xs:sequence>
                 <!--  Common identifier -->
                 <xs:element name="csid" type="xs:string" />
+                               <xs:element name="rev" type="xs:integer" /> <!-- Revision number -->
                 
                 <!--  Location Information Group -->
                 <!--  inAuthority is the csid of the owning LocationAuthority -->

diff --git a/services/location/jaxb/src/main/resources/locationauthority_common.xsd b/services/location/jaxb/src/main/resources/locationauthority_common.xsd
index 13278e966315ec38f6c904be17015e21d7c7d836..513788fc55d92d3f312b12300c59c8f89e4f7ee2 100644 (file)
--- a/services/location/jaxb/src/main/resources/locationauthority_common.xsd
+++ b/services/location/jaxb/src/main/resources/locationauthority_common.xsd
@@ -7,8 +7,6 @@
     Part    : Common
     Used for: JAXB binding between XML and Java objects
     
-    $LastChangedRevision: 1055 $
-    $LastChangedDate: 2009-12-09 12:25:15 -0800 (Wed, 09 Dec 2009) $
 -->
 
 <xs:schema 
@@ -18,7 +16,7 @@
     xmlns:ns="http://collectionspace.org/services/location"
     xmlns="http://collectionspace.org/services/location"
     targetNamespace="http://collectionspace.org/services/location"
-    version="0.1"
+    version="0.2"
     >
     
     <!--
@@ -36,11 +34,13 @@
                 
                 <!--  LocationAuthority Information Group -->
                 <xs:element name="displayName" type="xs:string"/>
-                                                               <xs:element name="shortIdentifier" type="xs:string"/>
+                               <xs:element name="shortIdentifier" type="xs:string"/>
                 <xs:element name="refName" type="xs:string"/>
                 <xs:element name="vocabType" type="xs:string"/>
                 <xs:element name="source" type="xs:string"/>
                 <xs:element name="description" type="xs:string"/>
+                               <!-- Internal fields -->
+                               <xs:element name="rev" type="xs:integer"/> <!-- The revision number of the authority.  Increments with each change including changes to its terms. -->
             </xs:sequence>
         </xs:complexType>
     </xs:element>

diff --git a/services/material/jaxb/.gitignore b/services/material/jaxb/.gitignore
new file mode 100644 (file)
index 0000000..1dd3331
--- /dev/null
+++ b/services/material/jaxb/.gitignore
@@ -0,0 +1,2 @@
+/target/
+/target/

diff --git a/services/material/jaxb/src/main/resources/material_common.xsd b/services/material/jaxb/src/main/resources/material_common.xsd
index c462941ada51f5a0fc1de9f7d2453384280c8aa9..1a3448ba68ef31b9778b03a91eacf2463210c951 100644 (file)
--- a/services/material/jaxb/src/main/resources/material_common.xsd
+++ b/services/material/jaxb/src/main/resources/material_common.xsd
@@ -1,4 +1,13 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+
+<!--
+    Material schema (XSD)
+
+    Entity  : Material
+    Part    : Common
+    Used for: JAXB binding between XML and Java objects
+-->
+
 <xs:schema 
     xmlns:xs="http://www.w3.org/2001/XMLSchema"
     xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
@@ -17,6 +26,7 @@
             <xs:sequence>
                 <!--  Common identifier -->
                 <xs:element name="csid" type="xs:string" />
+                               <xs:element name="rev" type="xs:integer" /> <!-- Revision number -->
 
                 <!--  Common Authority Information Group -->
                 <!--  inAuthority is the csid of the owning MaterialAuthority -->

diff --git a/services/material/jaxb/src/main/resources/materialauthority_common.xsd b/services/material/jaxb/src/main/resources/materialauthority_common.xsd
index 3746b5cc95b7ee930241e6643766b6af2ce477b7..2c54d79e6602150a88e74d5f08a3925ac42c10f6 100644 (file)
--- a/services/material/jaxb/src/main/resources/materialauthority_common.xsd
+++ b/services/material/jaxb/src/main/resources/materialauthority_common.xsd
@@ -16,7 +16,7 @@
     xmlns:ns="http://collectionspace.org/services/material"
     xmlns="http://collectionspace.org/services/material"
     targetNamespace="http://collectionspace.org/services/material"
-    version="0.1"
+    version="0.2"
     >
     
     <!--
@@ -39,6 +39,8 @@
                 <xs:element name="vocabType" type="xs:string"/>
                 <xs:element name="source" type="xs:string"/>
                 <xs:element name="description" type="xs:string"/>
+                               <!-- Internal fields -->
+                               <xs:element name="rev" type="xs:integer"/> <!-- The revision number of the authority.  Increments with each change including changes to its terms. -->
             </xs:sequence>
         </xs:complexType>
     </xs:element>

diff --git a/services/media/jaxb/.gitignore b/services/media/jaxb/.gitignore
new file mode 100644 (file)
index 0000000..b83d222
--- /dev/null
+++ b/services/media/jaxb/.gitignore
@@ -0,0 +1 @@
+/target/

diff --git a/services/movement/jaxb/.gitignore b/services/movement/jaxb/.gitignore
new file mode 100644 (file)
index 0000000..1dd3331
--- /dev/null
+++ b/services/movement/jaxb/.gitignore
@@ -0,0 +1,2 @@
+/target/
+/target/

diff --git a/services/objectexit/jaxb/.gitignore b/services/objectexit/jaxb/.gitignore
new file mode 100644 (file)
index 0000000..b83d222
--- /dev/null
+++ b/services/objectexit/jaxb/.gitignore
@@ -0,0 +1 @@
+/target/

diff --git a/services/organization/jaxb/.gitignore b/services/organization/jaxb/.gitignore
new file mode 100644 (file)
index 0000000..b83d222
--- /dev/null
+++ b/services/organization/jaxb/.gitignore
@@ -0,0 +1 @@
+/target/

diff --git a/services/organization/jaxb/src/main/resources/organization_common.xsd b/services/organization/jaxb/src/main/resources/organization_common.xsd
index bd24f2b59dcc0bed5c85a8d85499f462cc452c01..b73a89e645031aa21932a1b62f441e50ba7ce8d0 100644 (file)
--- a/services/organization/jaxb/src/main/resources/organization_common.xsd
+++ b/services/organization/jaxb/src/main/resources/organization_common.xsd
@@ -1,4 +1,13 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+
+<!--
+    Organization schema (XSD)
+
+    Entity  : Organization
+    Part    : Common
+    Used for: JAXB binding between XML and Java objects
+-->
+
 <xs:schema 
     xmlns:xs="http://www.w3.org/2001/XMLSchema"
     xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
@@ -19,6 +28,7 @@
             <xs:sequence>
                 <!--  Common identifier -->
                 <xs:element name="csid" type="xs:string" />
+                               <xs:element name="rev" type="xs:integer" /> <!-- Revision number -->
                 
                 <!--  Organization Information Group -->
                 <xs:element name="inAuthority" type="xs:string" />

diff --git a/services/organization/jaxb/src/main/resources/orgauthority_common.xsd b/services/organization/jaxb/src/main/resources/orgauthority_common.xsd
index 5c7ff80705469d2584ca31d5e87b96ac031d66f3..cb0a797ad47dc1ad16c1a845f61a8a04acf04433 100644 (file)
--- a/services/organization/jaxb/src/main/resources/orgauthority_common.xsd
+++ b/services/organization/jaxb/src/main/resources/orgauthority_common.xsd
@@ -7,8 +7,6 @@
     Part    : Common
     Used for: JAXB binding between XML and Java objects
     
-    $LastChangedRevision$
-    $LastChangedDate$
 -->
 
 <xs:schema 
@@ -18,7 +16,8 @@
     xmlns:ns="http://collectionspace.org/services/organization"
     xmlns="http://collectionspace.org/services/organization"
     targetNamespace="http://collectionspace.org/services/organization"
-    version="0.1">
+    version="0.2"
+       >
     
     <!--
         Avoid XmlRootElement nightmare:
@@ -34,12 +33,14 @@
                 <xs:element name="csid" type="xs:string" />
                 
                 <!--  OrgAuthority Information Group -->
-                                                               <xs:element name="shortIdentifier" type="xs:string"/>
                 <xs:element name="displayName" type="xs:string"/>
+                               <xs:element name="shortIdentifier" type="xs:string"/>
                 <xs:element name="refName" type="xs:string"/>
                 <xs:element name="vocabType" type="xs:string"/>                
                 <xs:element name="source" type="xs:string"/>
                 <xs:element name="description" type="xs:string"/>
+                               <!-- Internal fields -->
+                               <xs:element name="rev" type="xs:integer"/> <!-- The revision number of the authority.  Increments with each change including changes to its terms. -->
             </xs:sequence>
         </xs:complexType>
     </xs:element>

diff --git a/services/person/jaxb/.gitignore b/services/person/jaxb/.gitignore
new file mode 100644 (file)
index 0000000..1dd3331
--- /dev/null
+++ b/services/person/jaxb/.gitignore
@@ -0,0 +1,2 @@
+/target/
+/target/

diff --git a/services/person/jaxb/src/main/resources/person_common.xsd b/services/person/jaxb/src/main/resources/person_common.xsd
index 65808948b27d0ce78e471791dc61f6fe3767e388..11941acbb1fdb5b17c727aaed09fcfc8a8b964b9 100644 (file)
--- a/services/person/jaxb/src/main/resources/person_common.xsd
+++ b/services/person/jaxb/src/main/resources/person_common.xsd
@@ -30,6 +30,7 @@
             <xs:sequence>
                 <!--  Common identifier -->
                 <xs:element name="csid" type="xs:string" />
+                               <xs:element name="rev" type="xs:integer" /> <!-- Revision number -->
                 
                 <!--  Person Information Group -->
                 <xs:element name="inAuthority" type="xs:string" />

diff --git a/services/person/jaxb/src/main/resources/personauthority_common.xsd b/services/person/jaxb/src/main/resources/personauthority_common.xsd
index 375b0821a9a420d186992b89a93f13c148105770..ec44739074387e89cfb64b80daa2c50880adcaed 100644 (file)
--- a/services/person/jaxb/src/main/resources/personauthority_common.xsd
+++ b/services/person/jaxb/src/main/resources/personauthority_common.xsd
@@ -7,8 +7,6 @@
     Part    : Common
     Used for: JAXB binding between XML and Java objects
     
-    $LastChangedRevision: 1055 $
-    $LastChangedDate: 2009-12-09 12:25:15 -0800 (Wed, 09 Dec 2009) $
 -->
 
 <xs:schema 
@@ -18,8 +16,8 @@
     xmlns:ns="http://collectionspace.org/services/person"
     xmlns="http://collectionspace.org/services/person"
     targetNamespace="http://collectionspace.org/services/person"
-    version="0.1"
-    >
+    version="0.2"
+       >
     
     <!--
         Avoid XmlRootElement nightmare:
@@ -36,11 +34,13 @@
                 
                 <!--  PersonAuthority Information Group -->
                 <xs:element name="displayName" type="xs:string"/>
-                                                               <xs:element name="shortIdentifier" type="xs:string"/>
+                               <xs:element name="shortIdentifier" type="xs:string"/>
                 <xs:element name="refName" type="xs:string"/>
                 <xs:element name="vocabType" type="xs:string"/>
                 <xs:element name="source" type="xs:string"/>
                 <xs:element name="description" type="xs:string"/>
+                               <!-- Internal fields -->
+                               <xs:element name="rev" type="xs:integer"/> <!-- The revision number of the authority.  Increments with each change including changes to its terms. -->
             </xs:sequence>
         </xs:complexType>
     </xs:element>

diff --git a/services/place/jaxb/.gitignore b/services/place/jaxb/.gitignore
new file mode 100644 (file)
index 0000000..b83d222
--- /dev/null
+++ b/services/place/jaxb/.gitignore
@@ -0,0 +1 @@
+/target/

diff --git a/services/place/jaxb/src/main/resources/place_common.xsd b/services/place/jaxb/src/main/resources/place_common.xsd
index b560026d634ddc21a9745606c1639f3ae6156c41..fa0f791bc3e08200d7839c2a7893b4f25ae6975d 100644 (file)
--- a/services/place/jaxb/src/main/resources/place_common.xsd
+++ b/services/place/jaxb/src/main/resources/place_common.xsd
@@ -18,6 +18,7 @@
             <xs:sequence>
               <!--  Common identifier -->
                 <xs:element name="csid" type="xs:string" />
+                               <xs:element name="rev" type="xs:integer" /> <!-- Revision number -->
                 
                     <!--  Place Information Group -->
                     <!--  inAuthority is the csid of the owning PlaceAuthority -->

diff --git a/services/place/jaxb/src/main/resources/placeauthority_common.xsd b/services/place/jaxb/src/main/resources/placeauthority_common.xsd
index 458364bd0943d04669ab6a7af433d20d56914195..c9a497122040cf206875a55ef919532b5c0fda4e 100644 (file)
--- a/services/place/jaxb/src/main/resources/placeauthority_common.xsd
+++ b/services/place/jaxb/src/main/resources/placeauthority_common.xsd
@@ -7,8 +7,6 @@
     Part    : Common
     Used for: JAXB binding between XML and Java objects
     
-    $LastChangedRevision: 1055 $
-    $LastChangedDate: 2009-12-09 12:25:15 -0800 (Wed, 09 Dec 2009) $
 -->
 
 <xs:schema 
@@ -18,7 +16,7 @@
     xmlns:ns="http://collectionspace.org/services/place"
     xmlns="http://collectionspace.org/services/place"
     targetNamespace="http://collectionspace.org/services/place"
-    version="0.1"
+    version="0.2"
     >
     
     <!--
@@ -36,11 +34,13 @@
                 
                 <!--  PlaceAuthority Information Group -->
                 <xs:element name="displayName" type="xs:string"/>
-                                                               <xs:element name="shortIdentifier" type="xs:string"/>
+                               <xs:element name="shortIdentifier" type="xs:string"/>
                 <xs:element name="refName" type="xs:string"/>
                 <xs:element name="vocabType" type="xs:string"/>
                 <xs:element name="source" type="xs:string"/>
                 <xs:element name="description" type="xs:string"/>
+                               <!-- Internal fields -->
+                               <xs:element name="rev" type="xs:integer"/> <!-- The revision number of the authority.  Increments with each change including changes to its terms. -->
             </xs:sequence>
         </xs:complexType>
     </xs:element>

diff --git a/services/publicitem/jaxb/.gitignore b/services/publicitem/jaxb/.gitignore
new file mode 100644 (file)
index 0000000..b83d222
--- /dev/null
+++ b/services/publicitem/jaxb/.gitignore
@@ -0,0 +1 @@
+/target/

diff --git a/services/report/jaxb/.gitignore b/services/report/jaxb/.gitignore
new file mode 100644 (file)
index 0000000..b83d222
--- /dev/null
+++ b/services/report/jaxb/.gitignore
@@ -0,0 +1 @@
+/target/

diff --git a/services/servicegroup/jaxb/.gitignore b/services/servicegroup/jaxb/.gitignore
new file mode 100644 (file)
index 0000000..b83d222
--- /dev/null
+++ b/services/servicegroup/jaxb/.gitignore
@@ -0,0 +1 @@
+/target/

diff --git a/services/taxonomy/jaxb/.gitignore b/services/taxonomy/jaxb/.gitignore
new file mode 100644 (file)
index 0000000..b83d222
--- /dev/null
+++ b/services/taxonomy/jaxb/.gitignore
@@ -0,0 +1 @@
+/target/

diff --git a/services/taxonomy/jaxb/src/main/resources/taxon_common.xsd b/services/taxonomy/jaxb/src/main/resources/taxon_common.xsd
index 43e7b6bef2b3c3011f932f7d993e761bc9c0ff7b..74b460741a67a73bab071db3cc55f1bff04343e5 100644 (file)
--- a/services/taxonomy/jaxb/src/main/resources/taxon_common.xsd
+++ b/services/taxonomy/jaxb/src/main/resources/taxon_common.xsd
@@ -18,6 +18,7 @@
             <xs:sequence>
                 <!--  Common identifier -->
                 <xs:element name="csid" type="xs:string" />
+                               <xs:element name="rev" type="xs:integer" /> <!-- Revision number -->
                 
                 <!--  Taxonomy Information Group -->
                 <!--  inAuthority is the csid of the owning TaxonomyAuthority -->

diff --git a/services/taxonomy/jaxb/src/main/resources/taxonomyauthority_common.xsd b/services/taxonomy/jaxb/src/main/resources/taxonomyauthority_common.xsd
index c2afec0cf33ffcb58c9bbb07947a367117a6e760..7417bedd4d3754c67c99f68969d5c8ddc3becf8d 100644 (file)
--- a/services/taxonomy/jaxb/src/main/resources/taxonomyauthority_common.xsd
+++ b/services/taxonomy/jaxb/src/main/resources/taxonomyauthority_common.xsd
@@ -7,8 +7,6 @@
     Part    : Common
     Used for: JAXB binding between XML and Java objects
     
-    $LastChangedRevision$
-    $LastChangedDate$
 -->
 
 <xs:schema 
@@ -18,7 +16,7 @@
     xmlns:ns="http://collectionspace.org/services/taxonomy"
     xmlns="http://collectionspace.org/services/taxonomy"
     targetNamespace="http://collectionspace.org/services/taxonomy"
-    version="0.1"
+    version="0.2"
     >
     
     <!--
@@ -41,6 +39,8 @@
                 <xs:element name="vocabType" type="xs:string"/>
                 <xs:element name="source" type="xs:string"/>
                 <xs:element name="description" type="xs:string"/>
+                               <!-- Internal fields -->
+                               <xs:element name="rev" type="xs:integer"/> <!-- The revision number of the authority.  Increments with each change including changes to its terms. -->
             </xs:sequence>
         </xs:complexType>
     </xs:element>

diff --git a/services/valuationcontrol/jaxb/.gitignore b/services/valuationcontrol/jaxb/.gitignore
new file mode 100644 (file)
index 0000000..b83d222
--- /dev/null
+++ b/services/valuationcontrol/jaxb/.gitignore
@@ -0,0 +1 @@
+/target/

diff --git a/services/vocabulary/jaxb/.gitignore b/services/vocabulary/jaxb/.gitignore
new file mode 100644 (file)
index 0000000..b83d222
--- /dev/null
+++ b/services/vocabulary/jaxb/.gitignore
@@ -0,0 +1 @@
+/target/

diff --git a/services/vocabulary/jaxb/src/main/resources/vocabulary_common.xsd b/services/vocabulary/jaxb/src/main/resources/vocabulary_common.xsd
index c362b5a8ce9b5c46ca3be35d7c0485f20af3c0f1..48b543328436f8905712ca27f6fba0e2e4394ece 100644 (file)
--- a/services/vocabulary/jaxb/src/main/resources/vocabulary_common.xsd
+++ b/services/vocabulary/jaxb/src/main/resources/vocabulary_common.xsd
@@ -7,8 +7,6 @@
     Part    : Common
     Used for: JAXB binding between XML and Java objects
     
-    $LastChangedRevision$
-    $LastChangedDate$
 -->
 
 <xs:schema 
@@ -18,7 +16,7 @@
     xmlns:ns="http://collectionspace.org/services/vocabulary"
     xmlns="http://collectionspace.org/services/vocabulary"
     targetNamespace="http://collectionspace.org/services/vocabulary"
-    version="0.1"
+    version="0.2"
     >
     
     <!--
@@ -41,8 +39,11 @@
                 <xs:element name="vocabType" type="xs:string"/>                
                 <xs:element name="source" type="xs:string"/>
                 <xs:element name="description" type="xs:string"/>
+                               <!-- Internal fields -->
+                               <xs:element name="rev" type="xs:integer"/> <!-- The revision number of the authority.  Increments with each change including changes to its terms. -->
             </xs:sequence>
         </xs:complexType>
     </xs:element>
+
 </xs:schema>
 

diff --git a/services/vocabulary/jaxb/src/main/resources/vocabularyitem_common.xsd b/services/vocabulary/jaxb/src/main/resources/vocabularyitem_common.xsd
index fcde9d3c83fd3238a5ccccc09f72795ead9e916a..c4c04b9e4bf8337aaa08c62dfde5fe0d26c1f5f0 100644 (file)
--- a/services/vocabulary/jaxb/src/main/resources/vocabularyitem_common.xsd
+++ b/services/vocabulary/jaxb/src/main/resources/vocabularyitem_common.xsd
@@ -19,6 +19,7 @@
             <xs:sequence>
                 <!--  Common identifier -->
                 <xs:element name="csid" type="xs:string"/>
+                               <xs:element name="rev" type="xs:integer" /> <!-- Revision number -->
 
                 <!--  Vocabularyitem Information Group -->
                 <xs:element name="inAuthority" type="xs:string"/>

diff --git a/services/work/jaxb/.gitignore b/services/work/jaxb/.gitignore
new file mode 100644 (file)
index 0000000..b83d222
--- /dev/null
+++ b/services/work/jaxb/.gitignore
@@ -0,0 +1 @@
+/target/

diff --git a/services/work/jaxb/src/main/resources/work_common.xsd b/services/work/jaxb/src/main/resources/work_common.xsd
index 61e4db5915603e9265fa8db7012198c9be15ce0a..cfa95363b0ccfcefd36df8b775e45a76690a1101 100644 (file)
--- a/services/work/jaxb/src/main/resources/work_common.xsd
+++ b/services/work/jaxb/src/main/resources/work_common.xsd
@@ -17,6 +17,7 @@
             <xs:sequence>
                 <!--  Common identifier -->
                 <xs:element name="csid" type="xs:string" />
+                               <xs:element name="rev" type="xs:integer" /> <!-- Revision number -->
 
                 <!--  Common Authority Information Group -->
                 <!--  inAuthority is the csid of the owning WorkAuthority -->

diff --git a/services/work/jaxb/src/main/resources/workauthority_common.xsd b/services/work/jaxb/src/main/resources/workauthority_common.xsd
index dac51d87bbad0e1710fe6c5fd9f1a0eb13c003fb..ce4beadad8c7477813c98d01dd82506f466d456a 100644 (file)
--- a/services/work/jaxb/src/main/resources/workauthority_common.xsd
+++ b/services/work/jaxb/src/main/resources/workauthority_common.xsd
@@ -16,7 +16,7 @@
     xmlns:ns="http://collectionspace.org/services/work"
     xmlns="http://collectionspace.org/services/work"
     targetNamespace="http://collectionspace.org/services/work"
-    version="0.1"
+    version="0.2"
     >
     
     <!--
@@ -39,6 +39,8 @@
                 <xs:element name="vocabType" type="xs:string"/>
                 <xs:element name="source" type="xs:string"/>
                 <xs:element name="description" type="xs:string"/>
+                               <!-- Internal fields -->
+                               <xs:element name="rev" type="xs:integer"/> <!-- The revision number of the authority.  Increments with each change including changes to its terms. -->
             </xs:sequence>
         </xs:complexType>
     </xs:element>