From 78686245ba5b72c4f220adf88ff47ecb690f7c8e Mon Sep 17 00:00:00 2001 From: remillet Date: Wed, 30 Mar 2016 16:06:34 -0700 Subject: [PATCH] CSPACE-6935: Added new 'rev' field to authority and vocabulay records and also added logic to increment rev number on updates. --- .../nuxeo/nuxeo-platform-thumbnail/.gitignore | 1 + services/account/jaxb/.gitignore | 6 ++++++ services/acquisition/jaxb/.gitignore | 1 + services/authentication/jaxb/.gitignore | 3 +++ services/authentication/service/.gitignore | 1 + services/authority/jaxb/.gitignore | 1 + .../vocabulary/AuthorityItemJAXBSchema.java | 1 + .../nuxeo/AuthorityDocumentModelHandler.java | 18 ++++++++++++++++++ services/authorization-mgt/client/.gitignore | 1 + services/authorization/jaxb/.gitignore | 7 +++++++ services/authorization/service/.gitignore | 1 + services/batch/jaxb/.gitignore | 2 ++ services/citation/client/.gitignore | 1 + services/citation/jaxb/.gitignore | 2 ++ .../src/main/resources/citation_common.xsd | 1 + .../resources/citationauthority_common.xsd | 8 ++++---- services/citation/service/.gitignore | 1 + services/client/.gitignore | 1 + services/collectionobject/jaxb/.gitignore | 2 ++ services/common-api/.gitignore | 1 + services/common/.gitignore | 1 + .../common/vocabulary/RefNameServiceUtils.java | 6 +++--- services/concept/jaxb/.gitignore | 1 + .../jaxb/src/main/resources/concept_common.xsd | 1 + .../main/resources/conceptauthority_common.xsd | 8 ++++---- services/conditioncheck/jaxb/.gitignore | 1 + services/config/.gitignore | 3 +++ services/conservation/jaxb/.gitignore | 1 + services/contact/client/.gitignore | 1 + services/contact/jaxb/.gitignore | 1 + services/dimension/jaxb/.gitignore | 1 + services/exhibition/jaxb/.gitignore | 1 + services/group/jaxb/.gitignore | 1 + services/hyperjaxb/.gitignore | 4 ++++ services/imports/jaxb/.gitignore | 1 + services/intake/jaxb/.gitignore | 1 + services/jaxb/.gitignore | 2 ++ services/loanin/jaxb/.gitignore | 1 + services/loanout/jaxb/.gitignore | 1 + services/location/jaxb/.gitignore | 1 + .../src/main/resources/location_common.xsd | 10 ++++++++++ .../resources/locationauthority_common.xsd | 8 ++++---- services/material/jaxb/.gitignore | 2 ++ .../src/main/resources/material_common.xsd | 10 ++++++++++ .../resources/materialauthority_common.xsd | 4 +++- services/media/jaxb/.gitignore | 1 + services/movement/jaxb/.gitignore | 2 ++ services/objectexit/jaxb/.gitignore | 1 + services/organization/jaxb/.gitignore | 1 + .../src/main/resources/organization_common.xsd | 10 ++++++++++ .../src/main/resources/orgauthority_common.xsd | 9 +++++---- services/person/jaxb/.gitignore | 2 ++ .../jaxb/src/main/resources/person_common.xsd | 1 + .../main/resources/personauthority_common.xsd | 10 +++++----- services/place/jaxb/.gitignore | 1 + .../jaxb/src/main/resources/place_common.xsd | 1 + .../main/resources/placeauthority_common.xsd | 8 ++++---- services/publicitem/jaxb/.gitignore | 1 + services/report/jaxb/.gitignore | 1 + services/servicegroup/jaxb/.gitignore | 1 + services/taxonomy/jaxb/.gitignore | 1 + .../jaxb/src/main/resources/taxon_common.xsd | 1 + .../resources/taxonomyauthority_common.xsd | 6 +++--- services/valuationcontrol/jaxb/.gitignore | 1 + services/vocabulary/jaxb/.gitignore | 1 + .../src/main/resources/vocabulary_common.xsd | 7 ++++--- .../main/resources/vocabularyitem_common.xsd | 1 + services/work/jaxb/.gitignore | 1 + .../jaxb/src/main/resources/work_common.xsd | 1 + .../main/resources/workauthority_common.xsd | 4 +++- 70 files changed, 170 insertions(+), 36 deletions(-) create mode 100644 3rdparty/nuxeo/nuxeo-platform-thumbnail/.gitignore create mode 100644 services/account/jaxb/.gitignore create mode 100644 services/acquisition/jaxb/.gitignore create mode 100644 services/authentication/jaxb/.gitignore create mode 100644 services/authentication/service/.gitignore create mode 100644 services/authority/jaxb/.gitignore create mode 100644 services/authorization-mgt/client/.gitignore create mode 100644 services/authorization/jaxb/.gitignore create mode 100644 services/authorization/service/.gitignore create mode 100644 services/batch/jaxb/.gitignore create mode 100644 services/citation/client/.gitignore create mode 100644 services/citation/jaxb/.gitignore create mode 100644 services/citation/service/.gitignore create mode 100644 services/client/.gitignore create mode 100644 services/collectionobject/jaxb/.gitignore create mode 100644 services/common-api/.gitignore create mode 100644 services/common/.gitignore create mode 100644 services/concept/jaxb/.gitignore create mode 100644 services/conditioncheck/jaxb/.gitignore create mode 100644 services/config/.gitignore create mode 100644 services/conservation/jaxb/.gitignore create mode 100644 services/contact/client/.gitignore create mode 100644 services/contact/jaxb/.gitignore create mode 100644 services/dimension/jaxb/.gitignore create mode 100644 services/exhibition/jaxb/.gitignore create mode 100644 services/group/jaxb/.gitignore create mode 100644 services/hyperjaxb/.gitignore create mode 100644 services/imports/jaxb/.gitignore create mode 100644 services/intake/jaxb/.gitignore create mode 100644 services/jaxb/.gitignore create mode 100644 services/loanin/jaxb/.gitignore create mode 100644 services/loanout/jaxb/.gitignore create mode 100644 services/location/jaxb/.gitignore create mode 100644 services/material/jaxb/.gitignore create mode 100644 services/media/jaxb/.gitignore create mode 100644 services/movement/jaxb/.gitignore create mode 100644 services/objectexit/jaxb/.gitignore create mode 100644 services/organization/jaxb/.gitignore create mode 100644 services/person/jaxb/.gitignore create mode 100644 services/place/jaxb/.gitignore create mode 100644 services/publicitem/jaxb/.gitignore create mode 100644 services/report/jaxb/.gitignore create mode 100644 services/servicegroup/jaxb/.gitignore create mode 100644 services/taxonomy/jaxb/.gitignore create mode 100644 services/valuationcontrol/jaxb/.gitignore create mode 100644 services/vocabulary/jaxb/.gitignore create mode 100644 services/work/jaxb/.gitignore diff --git a/3rdparty/nuxeo/nuxeo-platform-thumbnail/.gitignore b/3rdparty/nuxeo/nuxeo-platform-thumbnail/.gitignore new file mode 100644 index 000000000..b83d22266 --- /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 index 000000000..993e2e793 --- /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 index 000000000..b83d22266 --- /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 index 000000000..e91d5c41b --- /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 index 000000000..b83d22266 --- /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 index 000000000..b83d22266 --- /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 2bb0252c1..2a1397a4f 100644 --- 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 2dad57a22..be07bd4c6 100644 --- 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 return unQObjectProperties; } + + public void fillAllParts(DocumentWrapper 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 wrapDoc) throws Exception { diff --git a/services/authorization-mgt/client/.gitignore b/services/authorization-mgt/client/.gitignore new file mode 100644 index 000000000..b83d22266 --- /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 index 000000000..a227dd5ab --- /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 index 000000000..b83d22266 --- /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 index 000000000..1dd333108 --- /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 index 000000000..b83d22266 --- /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 index 000000000..1dd333108 --- /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 b86c2c1fa..056629752 100644 --- a/services/citation/jaxb/src/main/resources/citation_common.xsd +++ b/services/citation/jaxb/src/main/resources/citation_common.xsd @@ -27,6 +27,7 @@ + diff --git a/services/citation/jaxb/src/main/resources/citationauthority_common.xsd b/services/citation/jaxb/src/main/resources/citationauthority_common.xsd index 68d63d161..0c7b36d66 100644 --- 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) $ --> - + + + diff --git a/services/citation/service/.gitignore b/services/citation/service/.gitignore new file mode 100644 index 000000000..b83d22266 --- /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 index 000000000..b83d22266 --- /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 index 000000000..1dd333108 --- /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 index 000000000..b83d22266 --- /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 index 000000000..b83d22266 --- /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 6804ec811..5513e472a 100644 --- 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 docTypes = new ArrayList(); - 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 propList = (List) 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 index 000000000..b83d22266 --- /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 986650cac..505f955bb 100644 --- a/services/concept/jaxb/src/main/resources/concept_common.xsd +++ b/services/concept/jaxb/src/main/resources/concept_common.xsd @@ -27,6 +27,7 @@ + diff --git a/services/concept/jaxb/src/main/resources/conceptauthority_common.xsd b/services/concept/jaxb/src/main/resources/conceptauthority_common.xsd index 2cc040422..c319b93fc 100644 --- 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) $ --> - + + + diff --git a/services/conditioncheck/jaxb/.gitignore b/services/conditioncheck/jaxb/.gitignore new file mode 100644 index 000000000..b83d22266 --- /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 index 000000000..e91d5c41b --- /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 index 000000000..b83d22266 --- /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 index 000000000..b83d22266 --- /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 index 000000000..b83d22266 --- /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 index 000000000..b83d22266 --- /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 index 000000000..b83d22266 --- /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 index 000000000..b83d22266 --- /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 index 000000000..b49c56399 --- /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 index 000000000..b83d22266 --- /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 index 000000000..b83d22266 --- /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 index 000000000..1dd333108 --- /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 index 000000000..b83d22266 --- /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 index 000000000..b83d22266 --- /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 index 000000000..b83d22266 --- /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 b1a50358a..c2b6115e7 100644 --- a/services/location/jaxb/src/main/resources/location_common.xsd +++ b/services/location/jaxb/src/main/resources/location_common.xsd @@ -1,4 +1,13 @@ + + + + diff --git a/services/location/jaxb/src/main/resources/locationauthority_common.xsd b/services/location/jaxb/src/main/resources/locationauthority_common.xsd index 13278e966..513788fc5 100644 --- 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) $ --> - + + + diff --git a/services/material/jaxb/.gitignore b/services/material/jaxb/.gitignore new file mode 100644 index 000000000..1dd333108 --- /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 c462941ad..1a3448ba6 100644 --- a/services/material/jaxb/src/main/resources/material_common.xsd +++ b/services/material/jaxb/src/main/resources/material_common.xsd @@ -1,4 +1,13 @@ + + + + diff --git a/services/material/jaxb/src/main/resources/materialauthority_common.xsd b/services/material/jaxb/src/main/resources/materialauthority_common.xsd index 3746b5cc9..2c54d79e6 100644 --- 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" > + diff --git a/services/media/jaxb/.gitignore b/services/media/jaxb/.gitignore new file mode 100644 index 000000000..b83d22266 --- /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 index 000000000..1dd333108 --- /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 index 000000000..b83d22266 --- /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 index 000000000..b83d22266 --- /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 bd24f2b59..b73a89e64 100644 --- a/services/organization/jaxb/src/main/resources/organization_common.xsd +++ b/services/organization/jaxb/src/main/resources/organization_common.xsd @@ -1,4 +1,13 @@ + + + + diff --git a/services/organization/jaxb/src/main/resources/orgauthority_common.xsd b/services/organization/jaxb/src/main/resources/orgauthority_common.xsd index 5c7ff8070..cb0a797ad 100644 --- 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$ --> + version="0.2" + > - + + + diff --git a/services/person/jaxb/.gitignore b/services/person/jaxb/.gitignore new file mode 100644 index 000000000..1dd333108 --- /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 65808948b..11941acbb 100644 --- a/services/person/jaxb/src/main/resources/person_common.xsd +++ b/services/person/jaxb/src/main/resources/person_common.xsd @@ -30,6 +30,7 @@ + diff --git a/services/person/jaxb/src/main/resources/personauthority_common.xsd b/services/person/jaxb/src/main/resources/personauthority_common.xsd index 375b0821a..ec4473907 100644 --- 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) $ --> + version="0.2" + > - + + + diff --git a/services/place/jaxb/.gitignore b/services/place/jaxb/.gitignore new file mode 100644 index 000000000..b83d22266 --- /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 b560026d6..fa0f791bc 100644 --- a/services/place/jaxb/src/main/resources/place_common.xsd +++ b/services/place/jaxb/src/main/resources/place_common.xsd @@ -18,6 +18,7 @@ + diff --git a/services/place/jaxb/src/main/resources/placeauthority_common.xsd b/services/place/jaxb/src/main/resources/placeauthority_common.xsd index 458364bd0..c9a497122 100644 --- 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) $ --> - + + + diff --git a/services/publicitem/jaxb/.gitignore b/services/publicitem/jaxb/.gitignore new file mode 100644 index 000000000..b83d22266 --- /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 index 000000000..b83d22266 --- /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 index 000000000..b83d22266 --- /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 index 000000000..b83d22266 --- /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 43e7b6bef..74b460741 100644 --- a/services/taxonomy/jaxb/src/main/resources/taxon_common.xsd +++ b/services/taxonomy/jaxb/src/main/resources/taxon_common.xsd @@ -18,6 +18,7 @@ + diff --git a/services/taxonomy/jaxb/src/main/resources/taxonomyauthority_common.xsd b/services/taxonomy/jaxb/src/main/resources/taxonomyauthority_common.xsd index c2afec0cf..7417bedd4 100644 --- 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$ --> + diff --git a/services/valuationcontrol/jaxb/.gitignore b/services/valuationcontrol/jaxb/.gitignore new file mode 100644 index 000000000..b83d22266 --- /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 index 000000000..b83d22266 --- /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 c362b5a8c..48b543328 100644 --- 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$ --> + + diff --git a/services/vocabulary/jaxb/src/main/resources/vocabularyitem_common.xsd b/services/vocabulary/jaxb/src/main/resources/vocabularyitem_common.xsd index fcde9d3c8..c4c04b9e4 100644 --- a/services/vocabulary/jaxb/src/main/resources/vocabularyitem_common.xsd +++ b/services/vocabulary/jaxb/src/main/resources/vocabularyitem_common.xsd @@ -19,6 +19,7 @@ + diff --git a/services/work/jaxb/.gitignore b/services/work/jaxb/.gitignore new file mode 100644 index 000000000..b83d22266 --- /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 61e4db591..cfa95363b 100644 --- a/services/work/jaxb/src/main/resources/work_common.xsd +++ b/services/work/jaxb/src/main/resources/work_common.xsd @@ -17,6 +17,7 @@ + diff --git a/services/work/jaxb/src/main/resources/workauthority_common.xsd b/services/work/jaxb/src/main/resources/workauthority_common.xsd index dac51d87b..ce4beadad 100644 --- 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" > + -- 2.47.3