From 6feea727e8ae06895375b0a5c7d177f50278adaf Mon Sep 17 00:00:00 2001 From: Anthony Bucci Date: Thu, 4 Sep 2025 16:46:09 -0400 Subject: [PATCH 01/24] WIP DRYD-1435: bumping java, nuxeo version numbers and plugin version number --- pom.xml | 7 ++++--- services/pom.xml | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 8802895a20..f82d0c6463 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,8 @@ 2.2.11 0.6.2 2.17.1 - 9.10-HF30 + 17 + 2023.24-SNAPSHOT ${nuxeo.general.release} ${nuxeo.general.release} ${nuxeo.general.release} @@ -198,8 +199,8 @@ maven-compiler-plugin 3.1 - 1.8 - 1.8 + ${java.version} + ${java.version}s> diff --git a/services/pom.xml b/services/pom.xml index 8f81baa9b4..1fb0a2d04a 100644 --- a/services/pom.xml +++ b/services/pom.xml @@ -14,7 +14,7 @@ 0.5.0 - 0.13.3 + 2.0.14 cs_default generate-sources From 4d51d3f476c76574c74cd0e5321cb9b82e4ed371 Mon Sep 17 00:00:00 2001 From: Anthony Bucci Date: Fri, 5 Sep 2025 13:10:03 -0400 Subject: [PATCH 02/24] WIP DRYD-1435: bump jaxb-basics version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f82d0c6463..5604905e11 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ 0.12.0-NX2 2.14.3 2.2.11 - 0.6.2 + 2.0.14 2.17.1 17 2023.24-SNAPSHOT From 8d2517606ff95741580cb40f29957ad715cc3cf1 Mon Sep 17 00:00:00 2001 From: Anthony Bucci Date: Wed, 1 Oct 2025 14:42:16 -0400 Subject: [PATCH 03/24] WIP DRYD-1435: squashing a bunch of POM changes to hand off --- .../nuxeo-platform-collectionspace/pom.xml | 9 +- .../nuxeo-platform-elasticsearch/pom.xml | 8 +- .../naturalhistory/pom.xml | 8 +- .../nuxeo/nuxeo-platform-listener/pom.xml | 6 +- .../nuxeo-platform-listener/reindex/pom.xml | 8 +- .../tenants/botgarden/pom.xml | 8 +- .../nuxeo-platform-listener/tenants/pom.xml | 6 +- .../updateimagederivatives/pom.xml | 8 +- .../updateobjectlocationonmove/pom.xml | 8 +- .../updaterelationsondelete/pom.xml | 8 +- .../nuxeo/nuxeo-platform-quote-api/pom.xml | 7 +- 3rdparty/nuxeo/nuxeo-platform-quote/pom.xml | 6 +- .../nuxeo/nuxeo-platform-thumbnail/pom.xml | 8 +- .../nuxeo-server/7.10-HF17/bundles/pom.xml | 5 +- 3rdparty/nuxeo/nuxeo-server/pom.xml | 8 +- 3rdparty/nuxeo/pom.xml | 7 +- 3rdparty/pom.xml | 6 +- common-lib/pom.xml | 8 +- pom.xml | 87 +++++++------------ services/IntegrationTests/pom.xml | 6 +- services/JaxRsServiceProvider/pom.xml | 6 +- services/PerformanceTests/pom.xml | 6 +- services/account/client/pom.xml | 8 +- services/account/jaxb/pom.xml | 28 ++---- services/account/pom.xml | 7 +- services/account/pstore/pom.xml | 25 ++---- services/account/service/pom.xml | 6 +- .../nuxeo-platform-cs-acquisition/pom.xml | 10 +-- services/acquisition/3rdparty/pom.xml | 8 +- services/acquisition/client/pom.xml | 8 +- services/acquisition/jaxb/pom.xml | 13 ++- services/acquisition/pom.xml | 8 +- services/acquisition/service/pom.xml | 7 +- services/advancedsearch/client/pom.xml | 6 +- services/advancedsearch/jaxb/pom.xml | 10 +-- services/advancedsearch/pom.xml | 12 ++- services/advancedsearch/service/pom.xml | 8 +- services/authentication/client/pom.xml | 8 +- services/authentication/jaxb/pom.xml | 28 ++---- services/authentication/pom.xml | 7 +- services/authentication/pstore/pom.xml | 9 +- services/authentication/service/pom.xml | 6 +- services/authority/jaxb/pom.xml | 18 ++-- services/authority/pom.xml | 8 +- services/authority/service/pom.xml | 17 ++-- services/authorization-common/pom.xml | 6 +- services/authorization-mgt/client/pom.xml | 8 +- services/authorization-mgt/import/pom.xml | 7 +- services/authorization-mgt/jaxb/pom.xml | 28 ++---- services/authorization-mgt/pom.xml | 6 +- services/authorization-mgt/service/pom.xml | 10 +-- services/authorization/jaxb/pom.xml | 33 +++---- .../jaxb/src/main/resources/bindings.xjb | 6 +- services/authorization/pom.xml | 8 +- services/authorization/pstore/pom.xml | 10 +-- services/authorization/service/pom.xml | 8 +- .../3rdparty/nuxeo-platform-cs-batch/pom.xml | 7 +- services/batch/3rdparty/pom.xml | 8 +- services/batch/client/pom.xml | 8 +- services/batch/jaxb/pom.xml | 13 ++- services/batch/pom.xml | 8 +- services/batch/service/pom.xml | 6 +- .../3rdparty/nuxeo-platform-cs-blob/pom.xml | 7 +- services/blob/3rdparty/pom.xml | 8 +- services/blob/blob-test-utils/pom.xml | 8 +- services/blob/client/pom.xml | 10 +-- services/blob/jaxb/pom.xml | 13 ++- services/blob/pom.xml | 7 +- services/blob/service/pom.xml | 7 +- services/chronology/client/pom.xml | 8 +- services/chronology/jaxb/pom.xml | 12 ++- services/chronology/pom.xml | 7 +- services/chronology/service/pom.xml | 7 +- .../nuxeo-platform-cs-citation/pom.xml | 7 +- services/citation/3rdparty/pom.xml | 8 +- services/citation/client/pom.xml | 8 +- services/citation/jaxb/pom.xml | 13 ++- services/citation/pom.xml | 7 +- services/citation/service/pom.xml | 6 +- .../3rdparty/nuxeo-platform-cs-claim/pom.xml | 7 +- services/claim/3rdparty/pom.xml | 8 +- services/claim/client/pom.xml | 8 +- services/claim/jaxb/pom.xml | 13 ++- services/claim/pom.xml | 8 +- services/claim/service/pom.xml | 6 +- services/client/pom.xml | 13 +-- .../pom.xml | 9 +- .../pom.xml | 7 +- services/collectionobject/3rdparty/pom.xml | 8 +- services/collectionobject/client/pom.xml | 8 +- services/collectionobject/jaxb/pom.xml | 13 ++- services/collectionobject/pom.xml | 7 +- services/collectionobject/service/pom.xml | 6 +- services/common-api/pom.xml | 10 ++- .../services/common/api/FileTools.java | 4 +- services/common-test/pom.xml | 8 +- services/common/pom.xml | 15 ++-- .../nuxeo/client/java/CommonList.java | 8 +- .../nuxeo/client/java/ObjectFactory.java | 2 +- .../nuxeo/client/java/package-info.java | 2 +- .../nuxeo-platform-cs-concept/pom.xml | 7 +- services/concept/3rdparty/pom.xml | 8 +- services/concept/client/pom.xml | 8 +- services/concept/jaxb/pom.xml | 13 ++- services/concept/pom.xml | 7 +- services/concept/service/pom.xml | 6 +- .../nuxeo-platform-cs-conditioncheck/pom.xml | 7 +- services/conditioncheck/3rdparty/pom.xml | 7 +- services/conditioncheck/client/pom.xml | 8 +- services/conditioncheck/jaxb/pom.xml | 12 ++- services/conditioncheck/pom.xml | 7 +- services/conditioncheck/service/pom.xml | 6 +- services/config/pom.xml | 27 +++--- .../nuxeo-platform-cs-conservation/pom.xml | 8 +- services/conservation/3rdparty/pom.xml | 8 +- services/conservation/client/pom.xml | 8 +- services/conservation/jaxb/pom.xml | 13 ++- services/conservation/pom.xml | 8 +- services/conservation/service/pom.xml | 6 +- services/consultation/client/pom.xml | 6 +- services/consultation/jaxb/pom.xml | 10 +-- services/consultation/pom.xml | 12 ++- services/consultation/service/pom.xml | 8 +- .../nuxeo-platform-cs-contact/pom.xml | 7 +- services/contact/3rdparty/pom.xml | 8 +- services/contact/client/pom.xml | 8 +- services/contact/jaxb/pom.xml | 13 ++- services/contact/pom.xml | 8 +- services/contact/service/pom.xml | 6 +- services/deaccession/client/pom.xml | 6 +- services/deaccession/jaxb/pom.xml | 10 +-- services/deaccession/pom.xml | 12 ++- services/deaccession/service/pom.xml | 8 +- .../nuxeo-platform-cs-dimension/pom.xml | 7 +- services/dimension/3rdparty/pom.xml | 8 +- services/dimension/client/pom.xml | 8 +- services/dimension/jaxb/pom.xml | 13 ++- services/dimension/pom.xml | 7 +- services/dimension/service/pom.xml | 6 +- services/dutyofcare/client/pom.xml | 8 +- services/dutyofcare/jaxb/pom.xml | 12 ++- services/dutyofcare/pom.xml | 9 +- services/dutyofcare/service/pom.xml | 7 +- .../nuxeo-platform-cs-exhibition/pom.xml | 7 +- services/exhibition/3rdparty/pom.xml | 7 +- services/exhibition/client/pom.xml | 8 +- services/exhibition/jaxb/pom.xml | 12 ++- services/exhibition/pom.xml | 7 +- services/exhibition/service/pom.xml | 6 +- services/exit/client/pom.xml | 8 +- services/exit/jaxb/pom.xml | 12 ++- services/exit/pom.xml | 14 ++- services/exit/service/pom.xml | 8 +- services/export/client/pom.xml | 8 +- services/export/jaxb/pom.xml | 12 ++- services/export/pom.xml | 8 +- services/export/service/pom.xml | 6 +- .../3rdparty/nuxeo-platform-cs-group/pom.xml | 7 +- services/group/3rdparty/pom.xml | 8 +- services/group/client/pom.xml | 8 +- services/group/jaxb/pom.xml | 13 ++- services/group/pom.xml | 8 +- services/group/service/pom.xml | 6 +- services/heldintrust/client/pom.xml | 6 +- services/heldintrust/jaxb/pom.xml | 10 +-- services/heldintrust/pom.xml | 12 ++- services/heldintrust/service/pom.xml | 8 +- services/hyperjaxb/pom.xml | 41 ++------- .../hyperjaxb/src/main/resources/bindings.xjb | 2 +- services/id/3rdparty/pom.xml | 27 +----- services/id/client/pom.xml | 9 +- services/id/jaxb/pom.xml | 35 ++------ services/id/pom.xml | 26 +----- services/id/service/pom.xml | 25 +----- .../nuxeo-platform-cs-imports/pom.xml | 7 +- services/imports/3rdparty/pom.xml | 8 +- services/imports/jaxb/pom.xml | 13 ++- services/imports/pom.xml | 8 +- services/imports/service/pom.xml | 6 +- .../3rdparty/nuxeo-platform-cs-index/pom.xml | 7 +- services/index/3rdparty/pom.xml | 7 +- services/index/client/pom.xml | 8 +- services/index/jaxb/pom.xml | 13 ++- services/index/pom.xml | 8 +- services/index/service/pom.xml | 6 +- .../nuxeo-platform-cs-insurance/pom.xml | 7 +- services/insurance/3rdparty/pom.xml | 7 +- services/insurance/client/pom.xml | 8 +- services/insurance/jaxb/pom.xml | 12 ++- services/insurance/pom.xml | 6 +- services/insurance/service/pom.xml | 6 +- .../3rdparty/nuxeo-platform-cs-intake/pom.xml | 8 +- services/intake/3rdparty/pom.xml | 8 +- services/intake/client/pom.xml | 8 +- services/intake/jaxb/pom.xml | 13 ++- services/intake/pom.xml | 8 +- services/intake/service/pom.xml | 6 +- services/iterationreport/client/pom.xml | 8 +- services/iterationreport/jaxb/pom.xml | 12 ++- services/iterationreport/pom.xml | 6 +- services/iterationreport/service/pom.xml | 6 +- services/jaxb/pom.xml | 28 ++---- .../3rdparty/nuxeo-platform-cs-loanin/pom.xml | 8 +- services/loanin/3rdparty/pom.xml | 8 +- services/loanin/client/pom.xml | 8 +- services/loanin/jaxb/pom.xml | 13 ++- services/loanin/pom.xml | 8 +- services/loanin/service/pom.xml | 6 +- .../nuxeo-platform-cs-loanout/pom.xml | 8 +- services/loanout/3rdparty/pom.xml | 8 +- services/loanout/client/pom.xml | 8 +- services/loanout/jaxb/pom.xml | 13 ++- services/loanout/pom.xml | 8 +- services/loanout/service/pom.xml | 6 +- .../nuxeo-platform-cs-location/pom.xml | 7 +- services/location/3rdparty/pom.xml | 7 +- services/location/client/pom.xml | 8 +- services/location/jaxb/pom.xml | 13 ++- services/location/pom.xml | 7 +- services/location/service/pom.xml | 6 +- services/login/client/pom.xml | 8 +- services/login/pom.xml | 6 +- services/login/service/pom.xml | 6 +- services/logout/client/pom.xml | 8 +- services/logout/pom.xml | 6 +- services/logout/service/pom.xml | 6 +- .../nuxeo-platform-cs-material/pom.xml | 7 +- services/material/3rdparty/pom.xml | 8 +- services/material/client/pom.xml | 8 +- services/material/jaxb/pom.xml | 18 ++-- services/material/pom.xml | 7 +- services/material/service/pom.xml | 6 +- .../3rdparty/nuxeo-platform-cs-media/pom.xml | 8 +- services/media/3rdparty/pom.xml | 7 +- services/media/client/pom.xml | 10 +-- services/media/jaxb/pom.xml | 13 ++- services/media/pom.xml | 8 +- services/media/service/pom.xml | 6 +- .../nuxeo-platform-cs-movement/pom.xml | 7 +- services/movement/3rdparty/pom.xml | 8 +- services/movement/client/pom.xml | 8 +- services/movement/jaxb/pom.xml | 13 ++- services/movement/pom.xml | 8 +- services/movement/service/pom.xml | 6 +- services/nagpra-jaxb/pom.xml | 12 ++- services/nagprainventory/client/pom.xml | 6 +- services/nagprainventory/jaxb/pom.xml | 10 +-- services/nagprainventory/pom.xml | 12 ++- services/nagprainventory/service/pom.xml | 8 +- .../3rdparty/nuxeo-platform-cs-note/pom.xml | 7 +- services/note/3rdparty/pom.xml | 8 +- services/note/client/pom.xml | 8 +- services/note/jaxb/pom.xml | 13 ++- services/note/pom.xml | 8 +- services/note/service/pom.xml | 6 +- .../nuxeo-platform-cs-objectexit/pom.xml | 7 +- services/objectexit/3rdparty/pom.xml | 8 +- services/objectexit/client/pom.xml | 8 +- services/objectexit/jaxb/pom.xml | 13 ++- services/objectexit/pom.xml | 8 +- services/objectexit/service/pom.xml | 6 +- .../nuxeo-platform-cs-organization/pom.xml | 7 +- services/organization/3rdparty/pom.xml | 7 +- services/organization/client/pom.xml | 8 +- services/organization/jaxb/pom.xml | 12 ++- services/organization/pom.xml | 7 +- services/organization/service/pom.xml | 6 +- .../nuxeo-platform-cs-osteology/pom.xml | 7 +- services/osteology/3rdparty/pom.xml | 7 +- services/osteology/client/pom.xml | 8 +- services/osteology/jaxb/pom.xml | 12 ++- services/osteology/pom.xml | 7 +- services/osteology/service/pom.xml | 6 +- .../3rdparty/nuxeo-platform-cs-person/pom.xml | 7 +- .../nuxeo-platform-person-testsci/pom.xml | 9 +- services/person/3rdparty/pom.xml | 8 +- services/person/client/pom.xml | 8 +- services/person/jaxb/pom.xml | 13 ++- services/person/pom.xml | 7 +- services/person/service/pom.xml | 6 +- .../3rdparty/nuxeo-platform-cs-place/pom.xml | 7 +- services/place/3rdparty/pom.xml | 8 +- services/place/client/pom.xml | 8 +- services/place/jaxb/pom.xml | 17 ++-- services/place/pom.xml | 7 +- services/place/service/pom.xml | 6 +- services/pom.xml | 34 ++++---- .../3rdparty/nuxeo-platform-cs-pottag/pom.xml | 8 +- services/pottag/3rdparty/pom.xml | 8 +- services/pottag/client/pom.xml | 8 +- services/pottag/jaxb/pom.xml | 13 ++- services/pottag/pom.xml | 8 +- services/pottag/service/pom.xml | 6 +- .../nuxeo-platform-cs-propagation/pom.xml | 8 +- services/propagation/3rdparty/pom.xml | 8 +- services/propagation/client/pom.xml | 8 +- services/propagation/jaxb/pom.xml | 13 ++- services/propagation/pom.xml | 8 +- services/propagation/service/pom.xml | 6 +- .../nuxeo-platform-cs-publicitem/pom.xml | 7 +- services/publicitem/3rdparty/pom.xml | 8 +- services/publicitem/client/pom.xml | 8 +- services/publicitem/jaxb/pom.xml | 13 ++- services/publicitem/pom.xml | 8 +- services/publicitem/service/pom.xml | 6 +- services/query/pom.xml | 7 +- services/query/service/pom.xml | 8 +- .../nuxeo-platform-cs-relation/pom.xml | 7 +- services/relation/3rdparty/pom.xml | 8 +- services/relation/client/pom.xml | 8 +- services/relation/pom.xml | 7 +- services/relation/service/pom.xml | 6 +- services/repatriationrequest/client/pom.xml | 6 +- services/repatriationrequest/jaxb/pom.xml | 10 +-- services/repatriationrequest/pom.xml | 12 ++- services/repatriationrequest/service/pom.xml | 6 +- services/report/3rdparty/pom.xml | 7 +- services/report/client/pom.xml | 8 +- services/report/jaxb/pom.xml | 13 ++- services/report/pom.xml | 8 +- services/report/service/pom.xml | 6 +- services/restrictedmedia/client/pom.xml | 10 +-- services/restrictedmedia/jaxb/pom.xml | 10 +-- services/restrictedmedia/pom.xml | 12 ++- services/restrictedmedia/service/pom.xml | 8 +- services/security/client/pom.xml | 8 +- services/security/pom.xml | 7 +- services/servicegroup/client/pom.xml | 8 +- services/servicegroup/jaxb/pom.xml | 13 ++- services/servicegroup/pom.xml | 8 +- services/servicegroup/service/pom.xml | 6 +- services/structureddate/client/pom.xml | 8 +- services/structureddate/jaxb/pom.xml | 13 ++- services/structureddate/pom.xml | 6 +- services/structureddate/service/pom.xml | 6 +- .../structureddate/structureddate/pom.xml | 6 +- services/summarydocumentation/client/pom.xml | 6 +- services/summarydocumentation/jaxb/pom.xml | 10 +-- services/summarydocumentation/pom.xml | 12 ++- services/summarydocumentation/service/pom.xml | 8 +- services/systeminfo/client/pom.xml | 8 +- services/systeminfo/jaxb/pom.xml | 13 ++- services/systeminfo/pom.xml | 6 +- services/systeminfo/service/pom.xml | 6 +- .../nuxeo-platform-cs-taxonomy/pom.xml | 7 +- services/taxonomy/3rdparty/pom.xml | 8 +- services/taxonomy/client/pom.xml | 8 +- services/taxonomy/jaxb/pom.xml | 13 ++- services/taxonomy/pom.xml | 8 +- services/taxonomy/service/pom.xml | 6 +- .../nuxeo-platform-cs-transport/pom.xml | 7 +- services/transport/3rdparty/pom.xml | 7 +- services/transport/client/pom.xml | 8 +- services/transport/jaxb/pom.xml | 12 ++- services/transport/pom.xml | 8 +- services/transport/service/pom.xml | 8 +- .../3rdparty/nuxeo-platform-cs-uoc/pom.xml | 7 +- services/uoc/3rdparty/pom.xml | 7 +- services/uoc/client/pom.xml | 8 +- services/uoc/jaxb/pom.xml | 13 ++- services/uoc/pom.xml | 8 +- services/uoc/service/pom.xml | 6 +- .../pom.xml | 7 +- services/valuationcontrol/3rdparty/pom.xml | 7 +- services/valuationcontrol/client/pom.xml | 8 +- services/valuationcontrol/jaxb/pom.xml | 12 ++- services/valuationcontrol/pom.xml | 7 +- services/valuationcontrol/service/pom.xml | 6 +- .../nuxeo-platform-cs-vocabulary/pom.xml | 7 +- services/vocabulary/3rdparty/pom.xml | 8 +- services/vocabulary/client/pom.xml | 8 +- services/vocabulary/jaxb/pom.xml | 13 ++- services/vocabulary/pom.xml | 9 +- services/vocabulary/service/pom.xml | 6 +- .../3rdparty/nuxeo-platform-cs-work/pom.xml | 7 +- services/work/3rdparty/pom.xml | 8 +- services/work/client/pom.xml | 8 +- services/work/jaxb/pom.xml | 17 ++-- services/work/pom.xml | 7 +- services/work/service/pom.xml | 6 +- .../nuxeo-platform-cs-workflow/pom.xml | 7 +- services/workflow/3rdparty/pom.xml | 8 +- services/workflow/client/pom.xml | 8 +- services/workflow/jaxb/pom.xml | 13 ++- services/workflow/pom.xml | 8 +- services/workflow/service/pom.xml | 6 +- 386 files changed, 1385 insertions(+), 2173 deletions(-) diff --git a/3rdparty/nuxeo/nuxeo-platform-collectionspace/pom.xml b/3rdparty/nuxeo/nuxeo-platform-collectionspace/pom.xml index e393ad5ae9..51448b9090 100644 --- a/3rdparty/nuxeo/nuxeo-platform-collectionspace/pom.xml +++ b/3rdparty/nuxeo/nuxeo-platform-collectionspace/pom.xml @@ -1,6 +1,5 @@ - + + org.collectionspace.services @@ -19,7 +18,7 @@ mvn clean install -Dcspace.im.root='etc/' --> - + @@ -48,4 +47,4 @@ - + \ No newline at end of file diff --git a/3rdparty/nuxeo/nuxeo-platform-elasticsearch/pom.xml b/3rdparty/nuxeo/nuxeo-platform-elasticsearch/pom.xml index f32a31cc29..996b571a05 100644 --- a/3rdparty/nuxeo/nuxeo-platform-elasticsearch/pom.xml +++ b/3rdparty/nuxeo/nuxeo-platform-elasticsearch/pom.xml @@ -1,7 +1,5 @@ - - + + 4.0.0 org.collectionspace.services.3rdparty.nuxeo @@ -60,4 +58,4 @@ - + \ No newline at end of file diff --git a/3rdparty/nuxeo/nuxeo-platform-listener/naturalhistory/pom.xml b/3rdparty/nuxeo/nuxeo-platform-listener/naturalhistory/pom.xml index e441c1940b..195c172703 100644 --- a/3rdparty/nuxeo/nuxeo-platform-listener/naturalhistory/pom.xml +++ b/3rdparty/nuxeo/nuxeo-platform-listener/naturalhistory/pom.xml @@ -1,7 +1,5 @@ - - + + 4.0.0 org.collectionspace.services.3rdparty.nuxeo.listener @@ -58,4 +56,4 @@ - + \ No newline at end of file diff --git a/3rdparty/nuxeo/nuxeo-platform-listener/pom.xml b/3rdparty/nuxeo/nuxeo-platform-listener/pom.xml index 4d32c0ddf3..022a672514 100644 --- a/3rdparty/nuxeo/nuxeo-platform-listener/pom.xml +++ b/3rdparty/nuxeo/nuxeo-platform-listener/pom.xml @@ -1,5 +1,5 @@ - - + + org.collectionspace.services @@ -44,4 +44,4 @@ - + \ No newline at end of file diff --git a/3rdparty/nuxeo/nuxeo-platform-listener/reindex/pom.xml b/3rdparty/nuxeo/nuxeo-platform-listener/reindex/pom.xml index 393aec045f..fd882556e6 100644 --- a/3rdparty/nuxeo/nuxeo-platform-listener/reindex/pom.xml +++ b/3rdparty/nuxeo/nuxeo-platform-listener/reindex/pom.xml @@ -1,7 +1,5 @@ - - + + 4.0.0 org.collectionspace.services.3rdparty.nuxeo.listener @@ -48,4 +46,4 @@ - + \ No newline at end of file diff --git a/3rdparty/nuxeo/nuxeo-platform-listener/tenants/botgarden/pom.xml b/3rdparty/nuxeo/nuxeo-platform-listener/tenants/botgarden/pom.xml index d632e1e604..c45d1c996c 100644 --- a/3rdparty/nuxeo/nuxeo-platform-listener/tenants/botgarden/pom.xml +++ b/3rdparty/nuxeo/nuxeo-platform-listener/tenants/botgarden/pom.xml @@ -1,7 +1,5 @@ - - + + 4.0.0 org.collectionspace.services.3rdparty.nuxeo.listener.tenants @@ -69,4 +67,4 @@ - + \ No newline at end of file diff --git a/3rdparty/nuxeo/nuxeo-platform-listener/tenants/pom.xml b/3rdparty/nuxeo/nuxeo-platform-listener/tenants/pom.xml index 3d7de3cda0..ddfb153dd4 100644 --- a/3rdparty/nuxeo/nuxeo-platform-listener/tenants/pom.xml +++ b/3rdparty/nuxeo/nuxeo-platform-listener/tenants/pom.xml @@ -1,5 +1,5 @@ - - + + org.collectionspace.services @@ -39,4 +39,4 @@ - + \ No newline at end of file diff --git a/3rdparty/nuxeo/nuxeo-platform-listener/updateimagederivatives/pom.xml b/3rdparty/nuxeo/nuxeo-platform-listener/updateimagederivatives/pom.xml index c818a6ae24..e55b4c7570 100644 --- a/3rdparty/nuxeo/nuxeo-platform-listener/updateimagederivatives/pom.xml +++ b/3rdparty/nuxeo/nuxeo-platform-listener/updateimagederivatives/pom.xml @@ -1,7 +1,5 @@ - - + + 4.0.0 org.collectionspace.services.3rdparty.nuxeo.listener @@ -58,4 +56,4 @@ - + \ No newline at end of file diff --git a/3rdparty/nuxeo/nuxeo-platform-listener/updateobjectlocationonmove/pom.xml b/3rdparty/nuxeo/nuxeo-platform-listener/updateobjectlocationonmove/pom.xml index 658beec7a8..2d9791d4a7 100644 --- a/3rdparty/nuxeo/nuxeo-platform-listener/updateobjectlocationonmove/pom.xml +++ b/3rdparty/nuxeo/nuxeo-platform-listener/updateobjectlocationonmove/pom.xml @@ -1,7 +1,5 @@ - - + + 4.0.0 org.collectionspace.services.3rdparty.nuxeo.listener @@ -68,4 +66,4 @@ - + \ No newline at end of file diff --git a/3rdparty/nuxeo/nuxeo-platform-listener/updaterelationsondelete/pom.xml b/3rdparty/nuxeo/nuxeo-platform-listener/updaterelationsondelete/pom.xml index 63c453de06..abac1b9449 100644 --- a/3rdparty/nuxeo/nuxeo-platform-listener/updaterelationsondelete/pom.xml +++ b/3rdparty/nuxeo/nuxeo-platform-listener/updaterelationsondelete/pom.xml @@ -1,7 +1,5 @@ - - + + 4.0.0 org.collectionspace.services.3rdparty.nuxeo.listener @@ -53,4 +51,4 @@ - + \ No newline at end of file diff --git a/3rdparty/nuxeo/nuxeo-platform-quote-api/pom.xml b/3rdparty/nuxeo/nuxeo-platform-quote-api/pom.xml index a06e4511db..7058e0787e 100644 --- a/3rdparty/nuxeo/nuxeo-platform-quote-api/pom.xml +++ b/3rdparty/nuxeo/nuxeo-platform-quote-api/pom.xml @@ -1,6 +1,5 @@ - + + 4.0.0 org.collectionspace.services @@ -47,4 +46,4 @@ - + \ No newline at end of file diff --git a/3rdparty/nuxeo/nuxeo-platform-quote/pom.xml b/3rdparty/nuxeo/nuxeo-platform-quote/pom.xml index 60f2b9172a..29c850b897 100644 --- a/3rdparty/nuxeo/nuxeo-platform-quote/pom.xml +++ b/3rdparty/nuxeo/nuxeo-platform-quote/pom.xml @@ -1,5 +1,5 @@ - + + 4.0.0 @@ -142,4 +142,4 @@ - + \ No newline at end of file diff --git a/3rdparty/nuxeo/nuxeo-platform-thumbnail/pom.xml b/3rdparty/nuxeo/nuxeo-platform-thumbnail/pom.xml index 78b13e4d4a..70923a8d5a 100644 --- a/3rdparty/nuxeo/nuxeo-platform-thumbnail/pom.xml +++ b/3rdparty/nuxeo/nuxeo-platform-thumbnail/pom.xml @@ -1,7 +1,5 @@ - - + + 4.0.0 org.collectionspace.services.3rdparty.nuxeo @@ -69,4 +67,4 @@ - + \ No newline at end of file diff --git a/3rdparty/nuxeo/nuxeo-server/7.10-HF17/bundles/pom.xml b/3rdparty/nuxeo/nuxeo-server/7.10-HF17/bundles/pom.xml index 7351efa459..f8f2bbdf6a 100644 --- a/3rdparty/nuxeo/nuxeo-server/7.10-HF17/bundles/pom.xml +++ b/3rdparty/nuxeo/nuxeo-server/7.10-HF17/bundles/pom.xml @@ -1,4 +1,5 @@ - + + 4.0.0 @@ -120,4 +121,4 @@ - + \ No newline at end of file diff --git a/3rdparty/nuxeo/nuxeo-server/pom.xml b/3rdparty/nuxeo/nuxeo-server/pom.xml index 484b6985d4..9585581547 100644 --- a/3rdparty/nuxeo/nuxeo-server/pom.xml +++ b/3rdparty/nuxeo/nuxeo-server/pom.xml @@ -1,7 +1,5 @@ - - + + 4.0.0 @@ -777,4 +775,4 @@ provided - + \ No newline at end of file diff --git a/3rdparty/nuxeo/pom.xml b/3rdparty/nuxeo/pom.xml index e487d2e75c..d31959b957 100644 --- a/3rdparty/nuxeo/pom.xml +++ b/3rdparty/nuxeo/pom.xml @@ -1,6 +1,5 @@ - - + + org.collectionspace.services @@ -21,4 +20,4 @@ nuxeo-server - + \ No newline at end of file diff --git a/3rdparty/pom.xml b/3rdparty/pom.xml index e99e6678d6..361bddecf1 100644 --- a/3rdparty/pom.xml +++ b/3rdparty/pom.xml @@ -1,5 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services @@ -37,4 +37,4 @@ --> - + \ No newline at end of file diff --git a/common-lib/pom.xml b/common-lib/pom.xml index 873ec16fa6..6d8ae01288 100644 --- a/common-lib/pom.xml +++ b/common-lib/pom.xml @@ -1,7 +1,5 @@ - - + + 4.0.0 org.collectionspace.services @@ -320,4 +318,4 @@ 1.25 - + \ No newline at end of file diff --git a/pom.xml b/pom.xml index 5604905e11..5b9dc13974 100644 --- a/pom.xml +++ b/pom.xml @@ -1,6 +1,5 @@ - - + + 4.0.0 org.collectionspace.services @@ -22,6 +21,8 @@ 2.14.3 2.2.11 2.0.14 + 3.0.2 + 3.0.1 2.17.1 17 2023.24-SNAPSHOT @@ -200,7 +201,7 @@ 3.1 ${java.version} - ${java.version}s> + ${java.version}s> @@ -419,34 +420,21 @@ - - - - - - - - - - + + + + + + + + + + - - - - + + + + @@ -1133,17 +1121,13 @@ 2.0.2 - org.jvnet.jaxb2_commons + org.jvnet.jaxb jaxb2-basics ${jaxb2-basics.version} + - org.jvnet.jaxb2-commons - property-listener-injector - 1.0 - - - org.jvnet.jaxb2_commons + org.jvnet.jaxb jaxb2-basics-runtime ${jaxb2-basics.version} @@ -1187,20 +1171,16 @@ commons-cli 1.2 + - com.sun.xml.bind - jaxb-core - ${jaxb.version} + org.glassfish.jaxb + jaxb-runtime + ${jaxb-runtime.version} - com.sun.xml.bind - jaxb-impl - ${jaxb.version} - - - javax.xml.bind - jaxb-api - ${jaxb.version} + jakarta.xml.bind + jakarta.xml.bind-api + ${xml-bind.version} javax.persistence @@ -1224,12 +1204,7 @@ hibernate-c3p0 3.6.10.Final - - org.jvnet.hyperjaxb3 - - hyperjaxb3-ejb-runtime - 0.6.0 - + org.postgresql postgresql @@ -1274,4 +1249,4 @@ - + \ No newline at end of file diff --git a/services/IntegrationTests/pom.xml b/services/IntegrationTests/pom.xml index a2bef594c2..403e506b26 100644 --- a/services/IntegrationTests/pom.xml +++ b/services/IntegrationTests/pom.xml @@ -1,5 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.main @@ -169,4 +169,4 @@ - + \ No newline at end of file diff --git a/services/JaxRsServiceProvider/pom.xml b/services/JaxRsServiceProvider/pom.xml index 25221eaf1a..bc3132ce3c 100644 --- a/services/JaxRsServiceProvider/pom.xml +++ b/services/JaxRsServiceProvider/pom.xml @@ -1,5 +1,5 @@ - - + + org.collectionspace.services.main @@ -953,4 +953,4 @@ - + \ No newline at end of file diff --git a/services/PerformanceTests/pom.xml b/services/PerformanceTests/pom.xml index 32899a68c3..1d11f396a9 100644 --- a/services/PerformanceTests/pom.xml +++ b/services/PerformanceTests/pom.xml @@ -1,5 +1,5 @@ - - + + org.collectionspace.services.main org.collectionspace.services @@ -107,4 +107,4 @@ - + \ No newline at end of file diff --git a/services/account/client/pom.xml b/services/account/client/pom.xml index 8f5fb3ba0d..af169db41a 100644 --- a/services/account/client/pom.xml +++ b/services/account/client/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.account @@ -106,4 +104,4 @@ - + \ No newline at end of file diff --git a/services/account/jaxb/pom.xml b/services/account/jaxb/pom.xml index 9e5bcc4d40..227ae0f23f 100644 --- a/services/account/jaxb/pom.xml +++ b/services/account/jaxb/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.account @@ -14,14 +12,8 @@ - - com.sun.xml.bind - jaxb-core - - - org.jvnet.jaxb2-commons - property-listener-injector - + + javax.persistence persistence-api @@ -35,10 +27,7 @@ org.dom4j dom4j - - org.jvnet.hyperjaxb3 - hyperjaxb3-ejb-runtime - + org.collectionspace.services org.collectionspace.services.jaxb @@ -57,11 +46,10 @@ - org.jvnet.hyperjaxb3 - maven-hyperjaxb3-plugin + org.jvnet.jaxb + hyperjaxb3-ejb-plugin - - + \ No newline at end of file diff --git a/services/account/pom.xml b/services/account/pom.xml index a253fc23af..c81affeeba 100644 --- a/services/account/pom.xml +++ b/services/account/pom.xml @@ -1,5 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.main @@ -18,5 +18,4 @@ client - - + \ No newline at end of file diff --git a/services/account/pstore/pom.xml b/services/account/pstore/pom.xml index ff9b8f050d..7ca0ac5ddb 100644 --- a/services/account/pstore/pom.xml +++ b/services/account/pstore/pom.xml @@ -1,6 +1,5 @@ - - + + org.collectionspace.services.account org.collectionspace.services @@ -17,14 +16,8 @@ - - com.sun.xml.bind - jaxb-core - - - org.jvnet.jaxb2-commons - property-listener-injector - + + org.postgresql @@ -53,8 +46,8 @@ - - + + @@ -122,8 +115,7 @@ process-test-resources - + @@ -137,5 +129,4 @@ - - + \ No newline at end of file diff --git a/services/account/service/pom.xml b/services/account/service/pom.xml index 9d1465b1ac..f2aa73c499 100644 --- a/services/account/service/pom.xml +++ b/services/account/service/pom.xml @@ -1,5 +1,5 @@ - - + + org.collectionspace.services.account org.collectionspace.services @@ -107,4 +107,4 @@ - + \ No newline at end of file diff --git a/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/pom.xml b/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/pom.xml index 1f06f509d1..ed500eadff 100644 --- a/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/pom.xml +++ b/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/pom.xml @@ -1,9 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.acquisition.3rdparty @@ -50,4 +46,4 @@ - + \ No newline at end of file diff --git a/services/acquisition/3rdparty/pom.xml b/services/acquisition/3rdparty/pom.xml index 2ac7a477e1..fe180e2ba3 100644 --- a/services/acquisition/3rdparty/pom.xml +++ b/services/acquisition/3rdparty/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.acquisition @@ -21,4 +19,4 @@ nuxeo-platform-cs-acquisition --> - + \ No newline at end of file diff --git a/services/acquisition/client/pom.xml b/services/acquisition/client/pom.xml index 622359253c..8a32dbde8f 100644 --- a/services/acquisition/client/pom.xml +++ b/services/acquisition/client/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.acquisition @@ -78,4 +76,4 @@ - + \ No newline at end of file diff --git a/services/acquisition/jaxb/pom.xml b/services/acquisition/jaxb/pom.xml index 6cfb2412d2..da2ca03e05 100644 --- a/services/acquisition/jaxb/pom.xml +++ b/services/acquisition/jaxb/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services.acquisition org.collectionspace.services @@ -25,8 +23,8 @@ install - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin org.codehaus.mojo @@ -34,5 +32,4 @@ - - + \ No newline at end of file diff --git a/services/acquisition/pom.xml b/services/acquisition/pom.xml index 8a99ad2cb6..8af30a6879 100644 --- a/services/acquisition/pom.xml +++ b/services/acquisition/pom.xml @@ -1,6 +1,5 @@ - - - + + org.collectionspace.services org.collectionspace.services.main @@ -23,5 +22,4 @@ - - + \ No newline at end of file diff --git a/services/acquisition/service/pom.xml b/services/acquisition/service/pom.xml index ed0e9f76c8..babf8b505c 100644 --- a/services/acquisition/service/pom.xml +++ b/services/acquisition/service/pom.xml @@ -1,5 +1,5 @@ - - + + org.collectionspace.services.acquisition org.collectionspace.services @@ -40,5 +40,4 @@ - - + \ No newline at end of file diff --git a/services/advancedsearch/client/pom.xml b/services/advancedsearch/client/pom.xml index 6b3226169e..613868d372 100644 --- a/services/advancedsearch/client/pom.xml +++ b/services/advancedsearch/client/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.advancedsearch diff --git a/services/advancedsearch/jaxb/pom.xml b/services/advancedsearch/jaxb/pom.xml index 110fcc0bb6..103d9e5ab0 100644 --- a/services/advancedsearch/jaxb/pom.xml +++ b/services/advancedsearch/jaxb/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services.advancedsearch org.collectionspace.services @@ -35,8 +33,8 @@ install - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin diff --git a/services/advancedsearch/pom.xml b/services/advancedsearch/pom.xml index 8b9d7b83b5..8d68e3d030 100644 --- a/services/advancedsearch/pom.xml +++ b/services/advancedsearch/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.main @@ -32,8 +30,8 @@ src/main/java/**/*.java src/test/java/**/*.java - - + + true 4 @@ -42,7 +40,7 @@ - + diff --git a/services/advancedsearch/service/pom.xml b/services/advancedsearch/service/pom.xml index b77426cfc1..7df5eb2aaf 100644 --- a/services/advancedsearch/service/pom.xml +++ b/services/advancedsearch/service/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services @@ -107,4 +105,4 @@ collectionspace-services-advancedsearch - + \ No newline at end of file diff --git a/services/authentication/client/pom.xml b/services/authentication/client/pom.xml index 34cbe284d0..6e189908f1 100644 --- a/services/authentication/client/pom.xml +++ b/services/authentication/client/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services @@ -56,4 +54,4 @@ - + \ No newline at end of file diff --git a/services/authentication/jaxb/pom.xml b/services/authentication/jaxb/pom.xml index 0bb200657e..248aa3e6eb 100644 --- a/services/authentication/jaxb/pom.xml +++ b/services/authentication/jaxb/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services @@ -19,14 +17,8 @@ - - com.sun.xml.bind - jaxb-core - - - org.jvnet.jaxb2-commons - property-listener-injector - + + javax.persistence persistence-api @@ -40,10 +32,7 @@ org.dom4j dom4j - - org.jvnet.hyperjaxb3 - hyperjaxb3-ejb-runtime - + @@ -53,12 +42,11 @@ - org.jvnet.hyperjaxb3 - maven-hyperjaxb3-plugin + org.jvnet.jaxb + hyperjaxb3-ejb-plugin - - + \ No newline at end of file diff --git a/services/authentication/pom.xml b/services/authentication/pom.xml index cbeea2588c..5f373dfa44 100644 --- a/services/authentication/pom.xml +++ b/services/authentication/pom.xml @@ -1,5 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.main @@ -21,5 +21,4 @@ client - - + \ No newline at end of file diff --git a/services/authentication/pstore/pom.xml b/services/authentication/pstore/pom.xml index 3b61d781b7..f78d696b29 100644 --- a/services/authentication/pstore/pom.xml +++ b/services/authentication/pstore/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services @@ -127,5 +125,4 @@ - - + \ No newline at end of file diff --git a/services/authentication/service/pom.xml b/services/authentication/service/pom.xml index 6606c1b547..804275e355 100644 --- a/services/authentication/service/pom.xml +++ b/services/authentication/service/pom.xml @@ -1,5 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.authentication @@ -90,4 +90,4 @@ cspace-services-authn - + \ No newline at end of file diff --git a/services/authority/jaxb/pom.xml b/services/authority/jaxb/pom.xml index cd38021b2f..4e0415088c 100644 --- a/services/authority/jaxb/pom.xml +++ b/services/authority/jaxb/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services.authority org.collectionspace.services @@ -13,18 +11,12 @@ services.authority.jaxb - - com.sun.xml.bind - jaxb-core - - - org.jvnet.jaxb2-commons - property-listener-injector - + + org.collectionspace.services org.collectionspace.services.jaxb ${project.version} - + \ No newline at end of file diff --git a/services/authority/pom.xml b/services/authority/pom.xml index 62f9ec0bb8..4707fe1ff8 100644 --- a/services/authority/pom.xml +++ b/services/authority/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.main @@ -97,4 +95,4 @@ service - + \ No newline at end of file diff --git a/services/authority/service/pom.xml b/services/authority/service/pom.xml index d0ec4e86ba..0090dbfea9 100644 --- a/services/authority/service/pom.xml +++ b/services/authority/service/pom.xml @@ -1,6 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.authority @@ -145,14 +144,8 @@ persistence-api - - com.sun.xml.bind - jaxb-core - - - org.jvnet.jaxb2-commons - property-listener-injector - + + @@ -250,4 +243,4 @@ 4.1.0 - + \ No newline at end of file diff --git a/services/authorization-common/pom.xml b/services/authorization-common/pom.xml index b27d99fab9..e65a9a1669 100644 --- a/services/authorization-common/pom.xml +++ b/services/authorization-common/pom.xml @@ -1,5 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.main @@ -50,4 +50,4 @@ provided - + \ No newline at end of file diff --git a/services/authorization-mgt/client/pom.xml b/services/authorization-mgt/client/pom.xml index 3bfc04abb6..b10f52f43e 100644 --- a/services/authorization-mgt/client/pom.xml +++ b/services/authorization-mgt/client/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.authorization-mgt @@ -144,4 +142,4 @@ cspace-services-authorization-mgt-client - + \ No newline at end of file diff --git a/services/authorization-mgt/import/pom.xml b/services/authorization-mgt/import/pom.xml index 74e88e9590..2bcc52a51c 100644 --- a/services/authorization-mgt/import/pom.xml +++ b/services/authorization-mgt/import/pom.xml @@ -1,6 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.authorization-mgt @@ -309,4 +308,4 @@ - + \ No newline at end of file diff --git a/services/authorization-mgt/jaxb/pom.xml b/services/authorization-mgt/jaxb/pom.xml index 866b1c95c8..1e5dba340a 100644 --- a/services/authorization-mgt/jaxb/pom.xml +++ b/services/authorization-mgt/jaxb/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.authorization-mgt @@ -14,14 +12,8 @@ - - com.sun.xml.bind - jaxb-core - - - org.jvnet.jaxb2-commons - property-listener-injector - + + javax.persistence persistence-api @@ -35,10 +27,7 @@ org.dom4j dom4j - - org.jvnet.hyperjaxb3 - hyperjaxb3-ejb-runtime - + org.collectionspace.services org.collectionspace.services.jaxb @@ -57,11 +46,10 @@ - org.jvnet.hyperjaxb3 - maven-hyperjaxb3-plugin + org.jvnet.jaxb + hyperjaxb3-ejb-plugin - - + \ No newline at end of file diff --git a/services/authorization-mgt/pom.xml b/services/authorization-mgt/pom.xml index fbc7157a50..1d946a83ea 100644 --- a/services/authorization-mgt/pom.xml +++ b/services/authorization-mgt/pom.xml @@ -1,5 +1,5 @@ - - + + 4.0.0 org.collectionspace.services.main @@ -17,4 +17,4 @@ import client - + \ No newline at end of file diff --git a/services/authorization-mgt/service/pom.xml b/services/authorization-mgt/service/pom.xml index 2cd2f08866..6581e31bbe 100644 --- a/services/authorization-mgt/service/pom.xml +++ b/services/authorization-mgt/service/pom.xml @@ -1,5 +1,5 @@ - - + + 4.0.0 org.collectionspace.services.authorization-mgt @@ -133,8 +133,8 @@ provided - javax.xml.bind - jaxb-api + jakarta.xml.bind + jakarta.xml.bind-api org.collectionspace.services @@ -163,4 +163,4 @@ collectionspace-services-authz-mgt - + \ No newline at end of file diff --git a/services/authorization/jaxb/pom.xml b/services/authorization/jaxb/pom.xml index f6d0963189..5f9c9a0a88 100644 --- a/services/authorization/jaxb/pom.xml +++ b/services/authorization/jaxb/pom.xml @@ -1,5 +1,5 @@ - - + + org.collectionspace.services.authorization @@ -13,18 +13,12 @@ + - com.sun.xml.bind - jaxb-core - - - com.sun.xml.bind - jaxb-impl - - - org.jvnet.jaxb2-commons - property-listener-injector + org.glassfish.jaxb + jaxb-runtime + javax.persistence persistence-api @@ -42,18 +36,15 @@ org.hibernate hibernate-c3p0 - - org.jvnet.hyperjaxb3 - hyperjaxb3-ejb-runtime - + org.collectionspace.services org.collectionspace.services.hyperjaxb ${project.version} - javax.xml.bind - jaxb-api + jakarta.xml.bind + jakarta.xml.bind-api - + + org.collectionspace.services org.collectionspace.services.main @@ -19,5 +18,4 @@ client - - + \ No newline at end of file diff --git a/services/batch/service/pom.xml b/services/batch/service/pom.xml index c7e75d7061..b29fc6bfb2 100644 --- a/services/batch/service/pom.xml +++ b/services/batch/service/pom.xml @@ -1,5 +1,5 @@ - - + + org.collectionspace.services @@ -220,4 +220,4 @@ collectionspace-services-batch - + \ No newline at end of file diff --git a/services/blob/3rdparty/nuxeo-platform-cs-blob/pom.xml b/services/blob/3rdparty/nuxeo-platform-cs-blob/pom.xml index fe8d06d37e..4b6d13c73d 100644 --- a/services/blob/3rdparty/nuxeo-platform-cs-blob/pom.xml +++ b/services/blob/3rdparty/nuxeo-platform-cs-blob/pom.xml @@ -1,6 +1,5 @@ - + + 4.0.0 org.collectionspace.services @@ -40,4 +39,4 @@ - + \ No newline at end of file diff --git a/services/blob/3rdparty/pom.xml b/services/blob/3rdparty/pom.xml index d0db2a75da..58ff2d00f9 100644 --- a/services/blob/3rdparty/pom.xml +++ b/services/blob/3rdparty/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services.blob org.collectionspace.services @@ -22,4 +20,4 @@ nuxeo-platform-cs-blob --> - + \ No newline at end of file diff --git a/services/blob/blob-test-utils/pom.xml b/services/blob/blob-test-utils/pom.xml index 87d3b79e05..4d2a06b7a5 100644 --- a/services/blob/blob-test-utils/pom.xml +++ b/services/blob/blob-test-utils/pom.xml @@ -1,7 +1,5 @@ - - + + 4.0.0 @@ -36,4 +34,4 @@ - + \ No newline at end of file diff --git a/services/blob/client/pom.xml b/services/blob/client/pom.xml index 9e004c39ca..a32ab179d8 100644 --- a/services/blob/client/pom.xml +++ b/services/blob/client/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.blob @@ -120,7 +118,7 @@ /static ${project.build.directory}/maven-shared-archive-resources - + jar @@ -138,4 +136,4 @@ - + \ No newline at end of file diff --git a/services/blob/jaxb/pom.xml b/services/blob/jaxb/pom.xml index 3782e8678d..df0e0dd09f 100644 --- a/services/blob/jaxb/pom.xml +++ b/services/blob/jaxb/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services.blob org.collectionspace.services @@ -26,8 +24,8 @@ install - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin org.codehaus.mojo @@ -35,5 +33,4 @@ - - + \ No newline at end of file diff --git a/services/blob/pom.xml b/services/blob/pom.xml index b484c38baa..7b52e9c2b1 100644 --- a/services/blob/pom.xml +++ b/services/blob/pom.xml @@ -1,5 +1,5 @@ - - + + 4.0.0 org.collectionspace.services.main @@ -19,5 +19,4 @@ service - - + \ No newline at end of file diff --git a/services/blob/service/pom.xml b/services/blob/service/pom.xml index 8a2409716d..de24173c7f 100644 --- a/services/blob/service/pom.xml +++ b/services/blob/service/pom.xml @@ -1,6 +1,5 @@ - - + + org.collectionspace.services @@ -97,4 +96,4 @@ collectionspace-services-blob - + \ No newline at end of file diff --git a/services/chronology/client/pom.xml b/services/chronology/client/pom.xml index cd1f6f748b..44a18d8ee2 100644 --- a/services/chronology/client/pom.xml +++ b/services/chronology/client/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.chronology @@ -78,4 +76,4 @@ collectionspace-services-chronology-client - + \ No newline at end of file diff --git a/services/chronology/jaxb/pom.xml b/services/chronology/jaxb/pom.xml index 18f1d76d1d..654a86e4df 100644 --- a/services/chronology/jaxb/pom.xml +++ b/services/chronology/jaxb/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services.chronology org.collectionspace.services @@ -31,9 +29,9 @@ install - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin - + \ No newline at end of file diff --git a/services/chronology/pom.xml b/services/chronology/pom.xml index 617c5c980f..26e2ebdb7e 100644 --- a/services/chronology/pom.xml +++ b/services/chronology/pom.xml @@ -1,6 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.main @@ -18,4 +17,4 @@ client - + \ No newline at end of file diff --git a/services/chronology/service/pom.xml b/services/chronology/service/pom.xml index ac0dc1b00b..8d7ad04ae9 100644 --- a/services/chronology/service/pom.xml +++ b/services/chronology/service/pom.xml @@ -1,6 +1,5 @@ - - + + org.collectionspace.services @@ -94,4 +93,4 @@ collectionspace-services-chronology - + \ No newline at end of file diff --git a/services/citation/3rdparty/nuxeo-platform-cs-citation/pom.xml b/services/citation/3rdparty/nuxeo-platform-cs-citation/pom.xml index c9cf337fcc..7f6f68e070 100644 --- a/services/citation/3rdparty/nuxeo-platform-cs-citation/pom.xml +++ b/services/citation/3rdparty/nuxeo-platform-cs-citation/pom.xml @@ -1,6 +1,5 @@ - + + org.collectionspace.services org.collectionspace.services.citation.3rdparty @@ -39,4 +38,4 @@ - + \ No newline at end of file diff --git a/services/citation/3rdparty/pom.xml b/services/citation/3rdparty/pom.xml index 89a8970890..dba67d8e55 100644 --- a/services/citation/3rdparty/pom.xml +++ b/services/citation/3rdparty/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.citation @@ -28,4 +26,4 @@ nuxeo-platform-cs-citation --> - + \ No newline at end of file diff --git a/services/citation/client/pom.xml b/services/citation/client/pom.xml index 2ab4202a17..2df88c1a38 100644 --- a/services/citation/client/pom.xml +++ b/services/citation/client/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.citation @@ -67,4 +65,4 @@ collectionspace-services-citation-client - + \ No newline at end of file diff --git a/services/citation/jaxb/pom.xml b/services/citation/jaxb/pom.xml index 52784c552b..875d1cf0b3 100644 --- a/services/citation/jaxb/pom.xml +++ b/services/citation/jaxb/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.citation @@ -35,8 +33,8 @@ install - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin org.codehaus.mojo @@ -44,5 +42,4 @@ - - + \ No newline at end of file diff --git a/services/citation/pom.xml b/services/citation/pom.xml index ab861ddf16..4753636397 100644 --- a/services/citation/pom.xml +++ b/services/citation/pom.xml @@ -1,5 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.main @@ -30,5 +30,4 @@ client - - + \ No newline at end of file diff --git a/services/citation/service/pom.xml b/services/citation/service/pom.xml index 7fa5c5a40d..b012b93f10 100644 --- a/services/citation/service/pom.xml +++ b/services/citation/service/pom.xml @@ -1,5 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.citation @@ -94,4 +94,4 @@ - + \ No newline at end of file diff --git a/services/claim/3rdparty/nuxeo-platform-cs-claim/pom.xml b/services/claim/3rdparty/nuxeo-platform-cs-claim/pom.xml index 62ce2714ad..a4dc43a0c0 100644 --- a/services/claim/3rdparty/nuxeo-platform-cs-claim/pom.xml +++ b/services/claim/3rdparty/nuxeo-platform-cs-claim/pom.xml @@ -1,6 +1,5 @@ - + + org.collectionspace.services @@ -45,4 +44,4 @@ - + \ No newline at end of file diff --git a/services/claim/3rdparty/pom.xml b/services/claim/3rdparty/pom.xml index fe33baa889..165d3a00e1 100644 --- a/services/claim/3rdparty/pom.xml +++ b/services/claim/3rdparty/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services.claim org.collectionspace.services @@ -29,4 +27,4 @@ nuxeo-platform-cs-claim --> - + \ No newline at end of file diff --git a/services/claim/client/pom.xml b/services/claim/client/pom.xml index f380bdf383..0f7007863b 100644 --- a/services/claim/client/pom.xml +++ b/services/claim/client/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.claim @@ -74,4 +72,4 @@ collectionspace-services-claim-client - + \ No newline at end of file diff --git a/services/claim/jaxb/pom.xml b/services/claim/jaxb/pom.xml index eb8396a4a1..55209b7602 100644 --- a/services/claim/jaxb/pom.xml +++ b/services/claim/jaxb/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services.claim org.collectionspace.services @@ -26,8 +24,8 @@ install - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin org.codehaus.mojo @@ -35,5 +33,4 @@ - - + \ No newline at end of file diff --git a/services/claim/pom.xml b/services/claim/pom.xml index 63fe65630d..2b0449a51c 100644 --- a/services/claim/pom.xml +++ b/services/claim/pom.xml @@ -1,6 +1,5 @@ - - - + + org.collectionspace.services org.collectionspace.services.main @@ -20,5 +19,4 @@ client - - + \ No newline at end of file diff --git a/services/claim/service/pom.xml b/services/claim/service/pom.xml index 77bd509276..84b9a77e28 100644 --- a/services/claim/service/pom.xml +++ b/services/claim/service/pom.xml @@ -1,5 +1,5 @@ - - + + org.collectionspace.services @@ -90,4 +90,4 @@ collectionspace-services-claim - + \ No newline at end of file diff --git a/services/client/pom.xml b/services/client/pom.xml index ed12dbd0f0..5ce30ddc4c 100644 --- a/services/client/pom.xml +++ b/services/client/pom.xml @@ -1,5 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.main @@ -78,12 +78,7 @@ 1.0.01 provided - - com.sun.xml.bind - jaxb-core - jar - compile - + org.dom4j dom4j @@ -106,4 +101,4 @@ - + \ No newline at end of file diff --git a/services/collectionobject/3rdparty/nuxeo-platform-collectionobject-testsci/pom.xml b/services/collectionobject/3rdparty/nuxeo-platform-collectionobject-testsci/pom.xml index 1ab64c7140..c33cc696ba 100644 --- a/services/collectionobject/3rdparty/nuxeo-platform-collectionobject-testsci/pom.xml +++ b/services/collectionobject/3rdparty/nuxeo-platform-collectionobject-testsci/pom.xml @@ -1,6 +1,5 @@ - + + org.collectionspace.services org.collectionspace.services.collectionobject.3rdparty @@ -11,7 +10,7 @@ org.collectionspace.services.collectionobject.3rdparty.testsci.nuxeo jar - CollectionObject Nuxeo document type for Tenant ID = "2" + CollectionObject Nuxeo document type for Tenant ID = "2" @@ -52,4 +51,4 @@ - + \ No newline at end of file diff --git a/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/pom.xml b/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/pom.xml index 40a30113e6..8807bfa503 100644 --- a/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/pom.xml +++ b/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/pom.xml @@ -1,6 +1,5 @@ - + + org.collectionspace.services org.collectionspace.services.collectionobject.3rdparty @@ -42,4 +41,4 @@ - + \ No newline at end of file diff --git a/services/collectionobject/3rdparty/pom.xml b/services/collectionobject/3rdparty/pom.xml index b334635e7c..54afe7a82b 100644 --- a/services/collectionobject/3rdparty/pom.xml +++ b/services/collectionobject/3rdparty/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.collectionobject @@ -31,4 +29,4 @@ --> - + \ No newline at end of file diff --git a/services/collectionobject/client/pom.xml b/services/collectionobject/client/pom.xml index d31cfc5987..32c39ecd80 100644 --- a/services/collectionobject/client/pom.xml +++ b/services/collectionobject/client/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.collectionobject @@ -84,4 +82,4 @@ - + \ No newline at end of file diff --git a/services/collectionobject/jaxb/pom.xml b/services/collectionobject/jaxb/pom.xml index c6a6292eee..fefd08cc80 100644 --- a/services/collectionobject/jaxb/pom.xml +++ b/services/collectionobject/jaxb/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.collectionobject @@ -25,8 +23,8 @@ install - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin org.codehaus.mojo @@ -34,5 +32,4 @@ - - + \ No newline at end of file diff --git a/services/collectionobject/pom.xml b/services/collectionobject/pom.xml index 6b35b43247..ec030f673a 100644 --- a/services/collectionobject/pom.xml +++ b/services/collectionobject/pom.xml @@ -1,5 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.main @@ -23,5 +23,4 @@ - - + \ No newline at end of file diff --git a/services/collectionobject/service/pom.xml b/services/collectionobject/service/pom.xml index cf4ca8120f..3d60192d14 100644 --- a/services/collectionobject/service/pom.xml +++ b/services/collectionobject/service/pom.xml @@ -1,5 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.collectionobject @@ -105,4 +105,4 @@ collectionspace-services-collectionobject - + \ No newline at end of file diff --git a/services/common-api/pom.xml b/services/common-api/pom.xml index 38741f2089..0570904798 100644 --- a/services/common-api/pom.xml +++ b/services/common-api/pom.xml @@ -1,5 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.main @@ -11,6 +11,10 @@ services.common-api jar + + jakarta.xml.bind + jakarta.xml.bind-api + org.apache.commons commons-lang3 @@ -41,4 +45,4 @@ 1.1.6 - + \ No newline at end of file diff --git a/services/common-api/src/main/java/org/collectionspace/services/common/api/FileTools.java b/services/common-api/src/main/java/org/collectionspace/services/common/api/FileTools.java index 95fa0a83b0..b0943c235b 100644 --- a/services/common-api/src/main/java/org/collectionspace/services/common/api/FileTools.java +++ b/services/common-api/src/main/java/org/collectionspace/services/common/api/FileTools.java @@ -38,8 +38,8 @@ import java.util.List; import java.util.UUID; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.Unmarshaller; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.Unmarshaller; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/services/common-test/pom.xml b/services/common-test/pom.xml index 61cd855172..eeb0743825 100644 --- a/services/common-test/pom.xml +++ b/services/common-test/pom.xml @@ -1,7 +1,5 @@ - - + + 4.0.0 org.collectionspace.services.main @@ -53,4 +51,4 @@ collectionspace-services-common-test - + \ No newline at end of file diff --git a/services/common/pom.xml b/services/common/pom.xml index 7dc3204024..ff5e75d7d5 100644 --- a/services/common/pom.xml +++ b/services/common/pom.xml @@ -1,6 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.main @@ -173,8 +172,8 @@ provided - javax.xml.bind - jaxb-api + jakarta.xml.bind + jakarta.xml.bind-api javax.security @@ -419,8 +418,8 @@ install - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin org.codehaus.mojo @@ -428,4 +427,4 @@ - + \ No newline at end of file diff --git a/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/CommonList.java b/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/CommonList.java index b096964a91..db034c0eba 100644 --- a/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/CommonList.java +++ b/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/CommonList.java @@ -37,10 +37,10 @@ import org.w3c.dom.Document; import org.w3c.dom.Element; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlTransient; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlTransient; /** * This class allows us to generically represent and marshall a set of list diff --git a/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/ObjectFactory.java b/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/ObjectFactory.java index ec1d553bae..3d35a61674 100644 --- a/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/ObjectFactory.java +++ b/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/ObjectFactory.java @@ -23,7 +23,7 @@ */ package org.collectionspace.services.nuxeo.client.java; -import javax.xml.bind.annotation.XmlRegistry; +import jakarta.xml.bind.annotation.XmlRegistry; /** * ObjectFactory for CommonList diff --git a/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/package-info.java b/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/package-info.java index 648de4f715..5b29334bd0 100644 --- a/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/package-info.java +++ b/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/package-info.java @@ -1,3 +1,3 @@ // We make the CommonList act like an AbstractCommonList, by setting its namespace -@javax.xml.bind.annotation.XmlSchema(namespace = "http://collectionspace.org/services/jaxb") +@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://collectionspace.org/services/jaxb") package org.collectionspace.services.nuxeo.client.java; diff --git a/services/concept/3rdparty/nuxeo-platform-cs-concept/pom.xml b/services/concept/3rdparty/nuxeo-platform-cs-concept/pom.xml index 0eae2d4cba..c98f738574 100644 --- a/services/concept/3rdparty/nuxeo-platform-cs-concept/pom.xml +++ b/services/concept/3rdparty/nuxeo-platform-cs-concept/pom.xml @@ -1,6 +1,5 @@ - + + org.collectionspace.services org.collectionspace.services.concept.3rdparty @@ -40,4 +39,4 @@ - + \ No newline at end of file diff --git a/services/concept/3rdparty/pom.xml b/services/concept/3rdparty/pom.xml index c3f0f4c59c..8d947da58d 100644 --- a/services/concept/3rdparty/pom.xml +++ b/services/concept/3rdparty/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.concept @@ -21,4 +19,4 @@ nuxeo-platform-cs-concept --> - + \ No newline at end of file diff --git a/services/concept/client/pom.xml b/services/concept/client/pom.xml index 9525e09204..4300b2a356 100644 --- a/services/concept/client/pom.xml +++ b/services/concept/client/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.concept @@ -72,4 +70,4 @@ - + \ No newline at end of file diff --git a/services/concept/jaxb/pom.xml b/services/concept/jaxb/pom.xml index af24038e3b..1b47696d32 100644 --- a/services/concept/jaxb/pom.xml +++ b/services/concept/jaxb/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.concept @@ -35,8 +33,8 @@ install - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin org.codehaus.mojo @@ -44,5 +42,4 @@ - - + \ No newline at end of file diff --git a/services/concept/pom.xml b/services/concept/pom.xml index c3fcd3ff86..654bb4eb38 100644 --- a/services/concept/pom.xml +++ b/services/concept/pom.xml @@ -1,5 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.main @@ -21,5 +21,4 @@ client - - + \ No newline at end of file diff --git a/services/concept/service/pom.xml b/services/concept/service/pom.xml index 4ecf4e0e5c..588b11e8b8 100644 --- a/services/concept/service/pom.xml +++ b/services/concept/service/pom.xml @@ -1,5 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.concept @@ -99,4 +99,4 @@ - + \ No newline at end of file diff --git a/services/conditioncheck/3rdparty/nuxeo-platform-cs-conditioncheck/pom.xml b/services/conditioncheck/3rdparty/nuxeo-platform-cs-conditioncheck/pom.xml index efc4eaa776..a9fdfed948 100644 --- a/services/conditioncheck/3rdparty/nuxeo-platform-cs-conditioncheck/pom.xml +++ b/services/conditioncheck/3rdparty/nuxeo-platform-cs-conditioncheck/pom.xml @@ -1,6 +1,5 @@ - + + org.collectionspace.services @@ -52,4 +51,4 @@ - + \ No newline at end of file diff --git a/services/conditioncheck/3rdparty/pom.xml b/services/conditioncheck/3rdparty/pom.xml index 7751b2dfde..8b2641de07 100644 --- a/services/conditioncheck/3rdparty/pom.xml +++ b/services/conditioncheck/3rdparty/pom.xml @@ -1,6 +1,5 @@ - + + org.collectionspace.services.conditioncheck org.collectionspace.services @@ -21,4 +20,4 @@ nuxeo-platform-cs-conditioncheck --> - + \ No newline at end of file diff --git a/services/conditioncheck/client/pom.xml b/services/conditioncheck/client/pom.xml index 9f58d2302c..44feab356d 100644 --- a/services/conditioncheck/client/pom.xml +++ b/services/conditioncheck/client/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.conditioncheck @@ -71,4 +69,4 @@ collectionspace-services-conditioncheck-client - + \ No newline at end of file diff --git a/services/conditioncheck/jaxb/pom.xml b/services/conditioncheck/jaxb/pom.xml index 0682c762d4..9af685ee66 100644 --- a/services/conditioncheck/jaxb/pom.xml +++ b/services/conditioncheck/jaxb/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services.conditioncheck org.collectionspace.services @@ -25,8 +23,8 @@ install - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin org.codehaus.mojo @@ -34,4 +32,4 @@ - + \ No newline at end of file diff --git a/services/conditioncheck/pom.xml b/services/conditioncheck/pom.xml index 00e182c96c..ec1afbebda 100644 --- a/services/conditioncheck/pom.xml +++ b/services/conditioncheck/pom.xml @@ -1,6 +1,5 @@ - - - + + org.collectionspace.services org.collectionspace.services.main @@ -19,4 +18,4 @@ client - + \ No newline at end of file diff --git a/services/conditioncheck/service/pom.xml b/services/conditioncheck/service/pom.xml index 7f910e0ba5..042d5f43a4 100644 --- a/services/conditioncheck/service/pom.xml +++ b/services/conditioncheck/service/pom.xml @@ -1,5 +1,5 @@ - - + + org.collectionspace.services @@ -85,4 +85,4 @@ collectionspace-services-conditioncheck - + \ No newline at end of file diff --git a/services/config/pom.xml b/services/config/pom.xml index 71136d8951..4b0728e17f 100644 --- a/services/config/pom.xml +++ b/services/config/pom.xml @@ -1,5 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.main @@ -27,14 +27,9 @@ commons-io - javax.xml.bind - jaxb-api + jakarta.xml.bind + jakarta.xml.bind-api - - com.sun.xml.bind - jaxb-core - test - xerces xercesImpl @@ -44,13 +39,11 @@ org.jvnet.jaxb2_commons jaxb2-basics + ${jaxb2-basics.version} - - org.jvnet.jaxb2-commons - property-listener-injector - + - org.jvnet.jaxb2_commons + org.jvnet.jaxb jaxb2-basics-runtime @@ -65,8 +58,8 @@ install - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin org.codehaus.mojo @@ -75,4 +68,4 @@ - + \ No newline at end of file diff --git a/services/conservation/3rdparty/nuxeo-platform-cs-conservation/pom.xml b/services/conservation/3rdparty/nuxeo-platform-cs-conservation/pom.xml index 887d4fd732..f35c7d7d1d 100644 --- a/services/conservation/3rdparty/nuxeo-platform-cs-conservation/pom.xml +++ b/services/conservation/3rdparty/nuxeo-platform-cs-conservation/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services @@ -53,4 +51,4 @@ - + \ No newline at end of file diff --git a/services/conservation/3rdparty/pom.xml b/services/conservation/3rdparty/pom.xml index 64870b0258..717698ee42 100644 --- a/services/conservation/3rdparty/pom.xml +++ b/services/conservation/3rdparty/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services.conservation org.collectionspace.services @@ -22,4 +20,4 @@ nuxeo-platform-cs-conservation --> - + \ No newline at end of file diff --git a/services/conservation/client/pom.xml b/services/conservation/client/pom.xml index 2f3b35173d..029f38f25f 100644 --- a/services/conservation/client/pom.xml +++ b/services/conservation/client/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.conservation @@ -70,4 +68,4 @@ collectionspace-services-conservation-client - + \ No newline at end of file diff --git a/services/conservation/jaxb/pom.xml b/services/conservation/jaxb/pom.xml index 22d256ddd2..a89a2dd609 100644 --- a/services/conservation/jaxb/pom.xml +++ b/services/conservation/jaxb/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services.conservation org.collectionspace.services @@ -25,8 +23,8 @@ install - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin org.codehaus.mojo @@ -34,5 +32,4 @@ - - + \ No newline at end of file diff --git a/services/conservation/pom.xml b/services/conservation/pom.xml index 35fe550859..a9840fad22 100644 --- a/services/conservation/pom.xml +++ b/services/conservation/pom.xml @@ -1,6 +1,5 @@ - - - + + org.collectionspace.services org.collectionspace.services.main @@ -22,5 +21,4 @@ client - - + \ No newline at end of file diff --git a/services/conservation/service/pom.xml b/services/conservation/service/pom.xml index 13fa909280..ee0e8c0f6f 100644 --- a/services/conservation/service/pom.xml +++ b/services/conservation/service/pom.xml @@ -1,5 +1,5 @@ - - + + org.collectionspace.services @@ -85,4 +85,4 @@ collectionspace-services-conservation - + \ No newline at end of file diff --git a/services/consultation/client/pom.xml b/services/consultation/client/pom.xml index 848d86dcae..d2f61cb691 100644 --- a/services/consultation/client/pom.xml +++ b/services/consultation/client/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.consultation diff --git a/services/consultation/jaxb/pom.xml b/services/consultation/jaxb/pom.xml index 98cc855583..46b0f98585 100644 --- a/services/consultation/jaxb/pom.xml +++ b/services/consultation/jaxb/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services.consultation org.collectionspace.services @@ -25,8 +23,8 @@ install - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin diff --git a/services/consultation/pom.xml b/services/consultation/pom.xml index d32e28c08f..22606c3aea 100644 --- a/services/consultation/pom.xml +++ b/services/consultation/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.main @@ -32,8 +30,8 @@ src/main/java/**/*.java src/test/java/**/*.java - - + + true 4 @@ -42,7 +40,7 @@ - + diff --git a/services/consultation/service/pom.xml b/services/consultation/service/pom.xml index 67491afc7d..5a2abd30bc 100644 --- a/services/consultation/service/pom.xml +++ b/services/consultation/service/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services @@ -86,4 +84,4 @@ collectionspace-services-consultation - + \ No newline at end of file diff --git a/services/contact/3rdparty/nuxeo-platform-cs-contact/pom.xml b/services/contact/3rdparty/nuxeo-platform-cs-contact/pom.xml index ddac5356cd..e908d2003b 100644 --- a/services/contact/3rdparty/nuxeo-platform-cs-contact/pom.xml +++ b/services/contact/3rdparty/nuxeo-platform-cs-contact/pom.xml @@ -1,6 +1,5 @@ - + + org.collectionspace.services org.collectionspace.services.contact.3rdparty @@ -40,4 +39,4 @@ - + \ No newline at end of file diff --git a/services/contact/3rdparty/pom.xml b/services/contact/3rdparty/pom.xml index b690b37c86..79c9b3d352 100644 --- a/services/contact/3rdparty/pom.xml +++ b/services/contact/3rdparty/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.contact @@ -21,4 +19,4 @@ nuxeo-platform-cs-contact --> - + \ No newline at end of file diff --git a/services/contact/client/pom.xml b/services/contact/client/pom.xml index bb18c23027..10408df536 100644 --- a/services/contact/client/pom.xml +++ b/services/contact/client/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services.contact org.collectionspace.services @@ -64,4 +62,4 @@ collectionspace-services-contact-client - + \ No newline at end of file diff --git a/services/contact/jaxb/pom.xml b/services/contact/jaxb/pom.xml index 8e1b6f9503..d83270ffc2 100644 --- a/services/contact/jaxb/pom.xml +++ b/services/contact/jaxb/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.contact @@ -25,8 +23,8 @@ install - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin org.codehaus.mojo @@ -34,5 +32,4 @@ - - + \ No newline at end of file diff --git a/services/contact/pom.xml b/services/contact/pom.xml index f8c5fee429..b5168f5e05 100644 --- a/services/contact/pom.xml +++ b/services/contact/pom.xml @@ -1,6 +1,5 @@ - - - + + org.collectionspace.services.main org.collectionspace.services @@ -19,5 +18,4 @@ client - - + \ No newline at end of file diff --git a/services/contact/service/pom.xml b/services/contact/service/pom.xml index e0484bcbf2..045e73fa18 100644 --- a/services/contact/service/pom.xml +++ b/services/contact/service/pom.xml @@ -1,5 +1,5 @@ - - + + org.collectionspace.services.contact org.collectionspace.services @@ -85,4 +85,4 @@ collectionspace-services-contact - + \ No newline at end of file diff --git a/services/deaccession/client/pom.xml b/services/deaccession/client/pom.xml index fd8fa06172..db74ace27f 100644 --- a/services/deaccession/client/pom.xml +++ b/services/deaccession/client/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.deaccession diff --git a/services/deaccession/jaxb/pom.xml b/services/deaccession/jaxb/pom.xml index 610d5f0388..176b1373cd 100644 --- a/services/deaccession/jaxb/pom.xml +++ b/services/deaccession/jaxb/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services.deaccession org.collectionspace.services @@ -25,8 +23,8 @@ install - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin diff --git a/services/deaccession/pom.xml b/services/deaccession/pom.xml index 2584d4cbc8..5ef6dc0246 100644 --- a/services/deaccession/pom.xml +++ b/services/deaccession/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.main @@ -32,8 +30,8 @@ src/main/java/**/*.java src/test/java/**/*.java - - + + true 4 @@ -42,7 +40,7 @@ - + diff --git a/services/deaccession/service/pom.xml b/services/deaccession/service/pom.xml index 6d8f01e25d..80e00ee36d 100644 --- a/services/deaccession/service/pom.xml +++ b/services/deaccession/service/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services @@ -86,4 +84,4 @@ collectionspace-services-deaccession - + \ No newline at end of file diff --git a/services/dimension/3rdparty/nuxeo-platform-cs-dimension/pom.xml b/services/dimension/3rdparty/nuxeo-platform-cs-dimension/pom.xml index f93524ed53..5c9032d16e 100644 --- a/services/dimension/3rdparty/nuxeo-platform-cs-dimension/pom.xml +++ b/services/dimension/3rdparty/nuxeo-platform-cs-dimension/pom.xml @@ -1,6 +1,5 @@ - + + org.collectionspace.services org.collectionspace.services.dimension.3rdparty @@ -50,4 +49,4 @@ - + \ No newline at end of file diff --git a/services/dimension/3rdparty/pom.xml b/services/dimension/3rdparty/pom.xml index 5a6999f5e6..54c09244ed 100644 --- a/services/dimension/3rdparty/pom.xml +++ b/services/dimension/3rdparty/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.dimension @@ -19,4 +17,4 @@ nuxeo-platform-cs-dimension - + \ No newline at end of file diff --git a/services/dimension/client/pom.xml b/services/dimension/client/pom.xml index 57e8dcc42c..e58d23f680 100644 --- a/services/dimension/client/pom.xml +++ b/services/dimension/client/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services @@ -64,4 +62,4 @@ collectionspace-services-dimension-client - + \ No newline at end of file diff --git a/services/dimension/jaxb/pom.xml b/services/dimension/jaxb/pom.xml index 50d13aa8ba..3521a0b7e3 100644 --- a/services/dimension/jaxb/pom.xml +++ b/services/dimension/jaxb/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services @@ -31,8 +29,8 @@ install - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin org.codehaus.mojo @@ -40,5 +38,4 @@ - - + \ No newline at end of file diff --git a/services/dimension/pom.xml b/services/dimension/pom.xml index d7b572dcc7..b503026efb 100644 --- a/services/dimension/pom.xml +++ b/services/dimension/pom.xml @@ -1,6 +1,5 @@ - - - + + org.collectionspace.services.main @@ -20,4 +19,4 @@ client - + \ No newline at end of file diff --git a/services/dimension/service/pom.xml b/services/dimension/service/pom.xml index 43c341c546..bd19079985 100644 --- a/services/dimension/service/pom.xml +++ b/services/dimension/service/pom.xml @@ -1,5 +1,5 @@ - - + + org.collectionspace.services @@ -86,4 +86,4 @@ collectionspace-services-dimension - + \ No newline at end of file diff --git a/services/dutyofcare/client/pom.xml b/services/dutyofcare/client/pom.xml index c5275152ac..f94837f587 100644 --- a/services/dutyofcare/client/pom.xml +++ b/services/dutyofcare/client/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.dutyofcare @@ -78,4 +76,4 @@ collectionspace-services-dutyofcare-client - + \ No newline at end of file diff --git a/services/dutyofcare/jaxb/pom.xml b/services/dutyofcare/jaxb/pom.xml index 1b85ef8b85..1042e11a98 100644 --- a/services/dutyofcare/jaxb/pom.xml +++ b/services/dutyofcare/jaxb/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services.dutyofcare org.collectionspace.services @@ -25,9 +23,9 @@ install - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin - + \ No newline at end of file diff --git a/services/dutyofcare/pom.xml b/services/dutyofcare/pom.xml index 63246bbd69..813498ce7b 100644 --- a/services/dutyofcare/pom.xml +++ b/services/dutyofcare/pom.xml @@ -1,6 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.main @@ -41,7 +40,7 @@ - + @@ -54,4 +53,4 @@ client - + \ No newline at end of file diff --git a/services/dutyofcare/service/pom.xml b/services/dutyofcare/service/pom.xml index 478e07674a..ba73397146 100644 --- a/services/dutyofcare/service/pom.xml +++ b/services/dutyofcare/service/pom.xml @@ -1,6 +1,5 @@ - - + + org.collectionspace.services @@ -89,4 +88,4 @@ collectionspace-services-dutyofcare - + \ No newline at end of file diff --git a/services/exhibition/3rdparty/nuxeo-platform-cs-exhibition/pom.xml b/services/exhibition/3rdparty/nuxeo-platform-cs-exhibition/pom.xml index ee1bca9b6d..b9ff75f2af 100644 --- a/services/exhibition/3rdparty/nuxeo-platform-cs-exhibition/pom.xml +++ b/services/exhibition/3rdparty/nuxeo-platform-cs-exhibition/pom.xml @@ -1,6 +1,5 @@ - + + org.collectionspace.services @@ -52,4 +51,4 @@ - + \ No newline at end of file diff --git a/services/exhibition/3rdparty/pom.xml b/services/exhibition/3rdparty/pom.xml index d0af2470aa..539d3beb50 100644 --- a/services/exhibition/3rdparty/pom.xml +++ b/services/exhibition/3rdparty/pom.xml @@ -1,6 +1,5 @@ - + + org.collectionspace.services.exhibition org.collectionspace.services @@ -21,4 +20,4 @@ nuxeo-platform-cs-exhibition --> - + \ No newline at end of file diff --git a/services/exhibition/client/pom.xml b/services/exhibition/client/pom.xml index 7921ae8995..1ed1d99443 100644 --- a/services/exhibition/client/pom.xml +++ b/services/exhibition/client/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.exhibition @@ -74,4 +72,4 @@ collectionspace-services-exhibition-client - + \ No newline at end of file diff --git a/services/exhibition/jaxb/pom.xml b/services/exhibition/jaxb/pom.xml index 93624fd486..9708aec10d 100644 --- a/services/exhibition/jaxb/pom.xml +++ b/services/exhibition/jaxb/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services.exhibition org.collectionspace.services @@ -26,8 +24,8 @@ install - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin org.codehaus.mojo @@ -35,4 +33,4 @@ - + \ No newline at end of file diff --git a/services/exhibition/pom.xml b/services/exhibition/pom.xml index 516a32abe4..0d2d0188a2 100644 --- a/services/exhibition/pom.xml +++ b/services/exhibition/pom.xml @@ -1,6 +1,5 @@ - - - + + org.collectionspace.services org.collectionspace.services.main @@ -20,4 +19,4 @@ client - + \ No newline at end of file diff --git a/services/exhibition/service/pom.xml b/services/exhibition/service/pom.xml index 8b0ea97f62..2f2ad76b7b 100644 --- a/services/exhibition/service/pom.xml +++ b/services/exhibition/service/pom.xml @@ -1,5 +1,5 @@ - - + + org.collectionspace.services @@ -85,4 +85,4 @@ collectionspace-services-exhibition - + \ No newline at end of file diff --git a/services/exit/client/pom.xml b/services/exit/client/pom.xml index d9ed912c9b..5f6271d4e1 100644 --- a/services/exit/client/pom.xml +++ b/services/exit/client/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.exit @@ -58,4 +56,4 @@ collectionspace-services-exit-client - + \ No newline at end of file diff --git a/services/exit/jaxb/pom.xml b/services/exit/jaxb/pom.xml index e61c843374..b9df3dfad1 100644 --- a/services/exit/jaxb/pom.xml +++ b/services/exit/jaxb/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services.exit org.collectionspace.services @@ -25,9 +23,9 @@ install - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin - + \ No newline at end of file diff --git a/services/exit/pom.xml b/services/exit/pom.xml index 7f7a343f8c..67843a40c3 100644 --- a/services/exit/pom.xml +++ b/services/exit/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.main @@ -32,8 +30,8 @@ src/main/java/**/*.java src/test/java/**/*.java - - + + true 4 @@ -42,7 +40,7 @@ - + @@ -55,4 +53,4 @@ client - + \ No newline at end of file diff --git a/services/exit/service/pom.xml b/services/exit/service/pom.xml index 6524f25138..1f4797ace6 100644 --- a/services/exit/service/pom.xml +++ b/services/exit/service/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services @@ -86,4 +84,4 @@ collectionspace-services-exit - + \ No newline at end of file diff --git a/services/export/client/pom.xml b/services/export/client/pom.xml index 3b257b2cab..5e2e12385f 100644 --- a/services/export/client/pom.xml +++ b/services/export/client/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.export @@ -80,4 +78,4 @@ collectionspace-services-export-client - + \ No newline at end of file diff --git a/services/export/jaxb/pom.xml b/services/export/jaxb/pom.xml index b5cea75ccf..97cba20486 100644 --- a/services/export/jaxb/pom.xml +++ b/services/export/jaxb/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services.export org.collectionspace.services @@ -25,9 +23,9 @@ install - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin - + \ No newline at end of file diff --git a/services/export/pom.xml b/services/export/pom.xml index 72b75d3bfa..e3a1bc363b 100644 --- a/services/export/pom.xml +++ b/services/export/pom.xml @@ -1,7 +1,5 @@ - - - + + org.collectionspace.services org.collectionspace.services.main @@ -22,4 +20,4 @@ service client - + \ No newline at end of file diff --git a/services/export/service/pom.xml b/services/export/service/pom.xml index ae5d39314b..e670099cdd 100644 --- a/services/export/service/pom.xml +++ b/services/export/service/pom.xml @@ -1,5 +1,5 @@ - - + + org.collectionspace.services @@ -68,4 +68,4 @@ collectionspace-services-export - + \ No newline at end of file diff --git a/services/group/3rdparty/nuxeo-platform-cs-group/pom.xml b/services/group/3rdparty/nuxeo-platform-cs-group/pom.xml index c3ece04fe3..4f818c9834 100644 --- a/services/group/3rdparty/nuxeo-platform-cs-group/pom.xml +++ b/services/group/3rdparty/nuxeo-platform-cs-group/pom.xml @@ -1,6 +1,5 @@ - + + org.collectionspace.services @@ -45,4 +44,4 @@ - + \ No newline at end of file diff --git a/services/group/3rdparty/pom.xml b/services/group/3rdparty/pom.xml index 3fc276c6b0..2eddbdcc27 100644 --- a/services/group/3rdparty/pom.xml +++ b/services/group/3rdparty/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services.group org.collectionspace.services @@ -30,4 +28,4 @@ nuxeo-platform-cs-group --> - + \ No newline at end of file diff --git a/services/group/client/pom.xml b/services/group/client/pom.xml index cb6bc5ce95..541216f964 100644 --- a/services/group/client/pom.xml +++ b/services/group/client/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.group @@ -71,4 +69,4 @@ collectionspace-services-group-client - + \ No newline at end of file diff --git a/services/group/jaxb/pom.xml b/services/group/jaxb/pom.xml index 5ac3e2e1fc..ba26f8b32d 100644 --- a/services/group/jaxb/pom.xml +++ b/services/group/jaxb/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.group @@ -25,8 +23,8 @@ install - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin org.codehaus.mojo @@ -34,5 +32,4 @@ - - + \ No newline at end of file diff --git a/services/group/pom.xml b/services/group/pom.xml index ce80d5f975..f52f802164 100644 --- a/services/group/pom.xml +++ b/services/group/pom.xml @@ -1,6 +1,5 @@ - - - + + org.collectionspace.services org.collectionspace.services.main @@ -19,5 +18,4 @@ client - - + \ No newline at end of file diff --git a/services/group/service/pom.xml b/services/group/service/pom.xml index f9345a581c..c326c16b09 100644 --- a/services/group/service/pom.xml +++ b/services/group/service/pom.xml @@ -1,5 +1,5 @@ - - + + org.collectionspace.services @@ -85,4 +85,4 @@ collectionspace-services-group - + \ No newline at end of file diff --git a/services/heldintrust/client/pom.xml b/services/heldintrust/client/pom.xml index c79bc4e623..95e03863ba 100644 --- a/services/heldintrust/client/pom.xml +++ b/services/heldintrust/client/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.heldintrust diff --git a/services/heldintrust/jaxb/pom.xml b/services/heldintrust/jaxb/pom.xml index f68d6c04f0..a77fe9ad47 100644 --- a/services/heldintrust/jaxb/pom.xml +++ b/services/heldintrust/jaxb/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services.heldintrust org.collectionspace.services @@ -25,8 +23,8 @@ install - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin diff --git a/services/heldintrust/pom.xml b/services/heldintrust/pom.xml index 570bdfd2a8..529c9fe68c 100644 --- a/services/heldintrust/pom.xml +++ b/services/heldintrust/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.main @@ -32,8 +30,8 @@ src/main/java/**/*.java src/test/java/**/*.java - - + + true 4 @@ -42,7 +40,7 @@ - + diff --git a/services/heldintrust/service/pom.xml b/services/heldintrust/service/pom.xml index ffdd17dc47..c724b85919 100644 --- a/services/heldintrust/service/pom.xml +++ b/services/heldintrust/service/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services @@ -86,4 +84,4 @@ collectionspace-services-heldintrust - + \ No newline at end of file diff --git a/services/hyperjaxb/pom.xml b/services/hyperjaxb/pom.xml index e5da60c0cf..b3c992f948 100644 --- a/services/hyperjaxb/pom.xml +++ b/services/hyperjaxb/pom.xml @@ -1,27 +1,5 @@ - - - - - + + org.collectionspace.services @@ -49,8 +27,8 @@ --> - javax.xml.bind - jaxb-api + jakarta.xml.bind + jakarta.xml.bind-api @@ -66,10 +44,7 @@ org.dom4j dom4j - - org.jvnet.hyperjaxb3 - hyperjaxb3-ejb-runtime - + @@ -78,10 +53,10 @@ - org.jvnet.hyperjaxb3 - maven-hyperjaxb3-plugin + org.jvnet.jaxb + hyperjaxb3-ejb-plugin - + \ No newline at end of file diff --git a/services/hyperjaxb/src/main/resources/bindings.xjb b/services/hyperjaxb/src/main/resources/bindings.xjb index ce5cc40c49..d9b9f154cc 100644 --- a/services/hyperjaxb/src/main/resources/bindings.xjb +++ b/services/hyperjaxb/src/main/resources/bindings.xjb @@ -10,7 +10,7 @@ diff --git a/services/id/3rdparty/pom.xml b/services/id/3rdparty/pom.xml index 5a55dbd191..424d4de987 100644 --- a/services/id/3rdparty/pom.xml +++ b/services/id/3rdparty/pom.xml @@ -1,26 +1,5 @@ - - - - + + org.collectionspace.services org.collectionspace.services.id @@ -34,4 +13,4 @@ 3rd party build for ID service - + \ No newline at end of file diff --git a/services/id/client/pom.xml b/services/id/client/pom.xml index 8654b7f386..e3b5bb3ff9 100644 --- a/services/id/client/pom.xml +++ b/services/id/client/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.id @@ -32,5 +30,4 @@ cspace-services-id-client - - + \ No newline at end of file diff --git a/services/id/jaxb/pom.xml b/services/id/jaxb/pom.xml index 0f1712e467..f9db358bf7 100644 --- a/services/id/jaxb/pom.xml +++ b/services/id/jaxb/pom.xml @@ -1,27 +1,5 @@ - - - - - + + org.collectionspace.services org.collectionspace.services.id @@ -35,7 +13,7 @@ - org.jvnet.jaxb2_commons + org.jvnet.jaxb jaxb2-basics-runtime @@ -45,8 +23,8 @@ install - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin org.codehaus.mojo @@ -54,5 +32,4 @@ - - + \ No newline at end of file diff --git a/services/id/pom.xml b/services/id/pom.xml index e6b17faac6..a555442539 100644 --- a/services/id/pom.xml +++ b/services/id/pom.xml @@ -1,25 +1,5 @@ - - - - - + + org.collectionspace.services org.collectionspace.services.main @@ -38,4 +18,4 @@ client - + \ No newline at end of file diff --git a/services/id/service/pom.xml b/services/id/service/pom.xml index e2f727154c..5451a791b2 100644 --- a/services/id/service/pom.xml +++ b/services/id/service/pom.xml @@ -1,24 +1,5 @@ - - - - - + + org.collectionspace.services.id @@ -73,4 +54,4 @@ collectionspace-services-id - + \ No newline at end of file diff --git a/services/imports/3rdparty/nuxeo-platform-cs-imports/pom.xml b/services/imports/3rdparty/nuxeo-platform-cs-imports/pom.xml index c3f4817799..fbf882f4c1 100644 --- a/services/imports/3rdparty/nuxeo-platform-cs-imports/pom.xml +++ b/services/imports/3rdparty/nuxeo-platform-cs-imports/pom.xml @@ -1,6 +1,5 @@ - + + org.collectionspace.services @@ -40,4 +39,4 @@ - + \ No newline at end of file diff --git a/services/imports/3rdparty/pom.xml b/services/imports/3rdparty/pom.xml index 69ed643081..52f8234f01 100644 --- a/services/imports/3rdparty/pom.xml +++ b/services/imports/3rdparty/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services.imports org.collectionspace.services @@ -20,4 +18,4 @@ nuxeo-platform-cs-imports - + \ No newline at end of file diff --git a/services/imports/jaxb/pom.xml b/services/imports/jaxb/pom.xml index 358d9efd84..5244756672 100644 --- a/services/imports/jaxb/pom.xml +++ b/services/imports/jaxb/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services.imports org.collectionspace.services @@ -25,8 +23,8 @@ install - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin org.codehaus.mojo @@ -34,5 +32,4 @@ - - + \ No newline at end of file diff --git a/services/imports/pom.xml b/services/imports/pom.xml index b8fc762633..a088d1ddce 100644 --- a/services/imports/pom.xml +++ b/services/imports/pom.xml @@ -1,6 +1,5 @@ - - - + + org.collectionspace.services org.collectionspace.services.main @@ -18,5 +17,4 @@ 3rdparty - - + \ No newline at end of file diff --git a/services/imports/service/pom.xml b/services/imports/service/pom.xml index 70072b3c97..a9bb9c6e69 100644 --- a/services/imports/service/pom.xml +++ b/services/imports/service/pom.xml @@ -1,5 +1,5 @@ - - + + org.collectionspace.services @@ -134,4 +134,4 @@ collectionspace-services-imports - + \ No newline at end of file diff --git a/services/index/3rdparty/nuxeo-platform-cs-index/pom.xml b/services/index/3rdparty/nuxeo-platform-cs-index/pom.xml index cae6193e0e..ea2ee94851 100644 --- a/services/index/3rdparty/nuxeo-platform-cs-index/pom.xml +++ b/services/index/3rdparty/nuxeo-platform-cs-index/pom.xml @@ -1,6 +1,5 @@ - + + 4.0.0 org.collectionspace.services @@ -39,4 +38,4 @@ - + \ No newline at end of file diff --git a/services/index/3rdparty/pom.xml b/services/index/3rdparty/pom.xml index 982642c458..a5f9b1f507 100644 --- a/services/index/3rdparty/pom.xml +++ b/services/index/3rdparty/pom.xml @@ -1,6 +1,5 @@ - + + org.collectionspace.services.index org.collectionspace.services @@ -19,4 +18,4 @@ nuxeo-platform-cs-index - + \ No newline at end of file diff --git a/services/index/client/pom.xml b/services/index/client/pom.xml index 08ea979cdc..42e758a4d4 100644 --- a/services/index/client/pom.xml +++ b/services/index/client/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.index @@ -60,4 +58,4 @@ collectionspace-services-index-client - + \ No newline at end of file diff --git a/services/index/jaxb/pom.xml b/services/index/jaxb/pom.xml index 932d01f50c..1bcc20afbe 100644 --- a/services/index/jaxb/pom.xml +++ b/services/index/jaxb/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.index @@ -25,8 +23,8 @@ install - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin org.codehaus.mojo @@ -34,5 +32,4 @@ - - + \ No newline at end of file diff --git a/services/index/pom.xml b/services/index/pom.xml index 37a67360ef..be57d5b588 100644 --- a/services/index/pom.xml +++ b/services/index/pom.xml @@ -1,6 +1,5 @@ - - - + + org.collectionspace.services org.collectionspace.services.main @@ -19,5 +18,4 @@ service - - + \ No newline at end of file diff --git a/services/index/service/pom.xml b/services/index/service/pom.xml index d728467728..257cf0fcbc 100644 --- a/services/index/service/pom.xml +++ b/services/index/service/pom.xml @@ -1,5 +1,5 @@ - - + + org.collectionspace.services @@ -74,4 +74,4 @@ collectionspace-services-index - + \ No newline at end of file diff --git a/services/insurance/3rdparty/nuxeo-platform-cs-insurance/pom.xml b/services/insurance/3rdparty/nuxeo-platform-cs-insurance/pom.xml index 6b275726df..f1f25a8b9e 100644 --- a/services/insurance/3rdparty/nuxeo-platform-cs-insurance/pom.xml +++ b/services/insurance/3rdparty/nuxeo-platform-cs-insurance/pom.xml @@ -1,6 +1,5 @@ - + + org.collectionspace.services @@ -51,4 +50,4 @@ - + \ No newline at end of file diff --git a/services/insurance/3rdparty/pom.xml b/services/insurance/3rdparty/pom.xml index 6eb281f124..6bbc503cc0 100644 --- a/services/insurance/3rdparty/pom.xml +++ b/services/insurance/3rdparty/pom.xml @@ -1,6 +1,5 @@ - + + org.collectionspace.services.insurance org.collectionspace.services @@ -21,4 +20,4 @@ nuxeo-platform-cs-insurance --> - + \ No newline at end of file diff --git a/services/insurance/client/pom.xml b/services/insurance/client/pom.xml index 180b9d413f..60b89dde84 100644 --- a/services/insurance/client/pom.xml +++ b/services/insurance/client/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.insurance @@ -78,4 +76,4 @@ collectionspace-services-insurance-client - + \ No newline at end of file diff --git a/services/insurance/jaxb/pom.xml b/services/insurance/jaxb/pom.xml index b28112b95c..69caf41222 100644 --- a/services/insurance/jaxb/pom.xml +++ b/services/insurance/jaxb/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services.insurance org.collectionspace.services @@ -25,9 +23,9 @@ install - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin - + \ No newline at end of file diff --git a/services/insurance/pom.xml b/services/insurance/pom.xml index 543dcb0c0b..b1c16a48c6 100644 --- a/services/insurance/pom.xml +++ b/services/insurance/pom.xml @@ -1,5 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.main @@ -18,4 +18,4 @@ client - + \ No newline at end of file diff --git a/services/insurance/service/pom.xml b/services/insurance/service/pom.xml index e8d4299f7c..3eafe3e969 100644 --- a/services/insurance/service/pom.xml +++ b/services/insurance/service/pom.xml @@ -1,5 +1,5 @@ - - + + org.collectionspace.services @@ -91,4 +91,4 @@ collectionspace-services-insurance - + \ No newline at end of file diff --git a/services/intake/3rdparty/nuxeo-platform-cs-intake/pom.xml b/services/intake/3rdparty/nuxeo-platform-cs-intake/pom.xml index 1ed01daba1..513afbeb71 100644 --- a/services/intake/3rdparty/nuxeo-platform-cs-intake/pom.xml +++ b/services/intake/3rdparty/nuxeo-platform-cs-intake/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services @@ -53,4 +51,4 @@ - + \ No newline at end of file diff --git a/services/intake/3rdparty/pom.xml b/services/intake/3rdparty/pom.xml index b0dd34972b..3383e1fb1b 100644 --- a/services/intake/3rdparty/pom.xml +++ b/services/intake/3rdparty/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services.intake org.collectionspace.services @@ -22,4 +20,4 @@ nuxeo-platform-cs-intake --> - + \ No newline at end of file diff --git a/services/intake/client/pom.xml b/services/intake/client/pom.xml index e066409ce6..3d947b8761 100644 --- a/services/intake/client/pom.xml +++ b/services/intake/client/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.intake @@ -76,4 +74,4 @@ collectionspace-services-intake-client - + \ No newline at end of file diff --git a/services/intake/jaxb/pom.xml b/services/intake/jaxb/pom.xml index d79d575ef6..663484798f 100644 --- a/services/intake/jaxb/pom.xml +++ b/services/intake/jaxb/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services.intake org.collectionspace.services @@ -25,8 +23,8 @@ install - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin org.codehaus.mojo @@ -34,5 +32,4 @@ - - + \ No newline at end of file diff --git a/services/intake/pom.xml b/services/intake/pom.xml index e6b9dc89d9..0af8e50f28 100644 --- a/services/intake/pom.xml +++ b/services/intake/pom.xml @@ -1,6 +1,5 @@ - - - + + org.collectionspace.services org.collectionspace.services.main @@ -19,5 +18,4 @@ client - - + \ No newline at end of file diff --git a/services/intake/service/pom.xml b/services/intake/service/pom.xml index 75275a4658..34a1f4f92f 100644 --- a/services/intake/service/pom.xml +++ b/services/intake/service/pom.xml @@ -1,5 +1,5 @@ - - + + org.collectionspace.services @@ -90,4 +90,4 @@ collectionspace-services-intake - + \ No newline at end of file diff --git a/services/iterationreport/client/pom.xml b/services/iterationreport/client/pom.xml index 07d00e9d18..219d024c8f 100644 --- a/services/iterationreport/client/pom.xml +++ b/services/iterationreport/client/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.iterationreport @@ -78,4 +76,4 @@ collectionspace-services-iterationreport-client - + \ No newline at end of file diff --git a/services/iterationreport/jaxb/pom.xml b/services/iterationreport/jaxb/pom.xml index 9a38c72b9f..31a5c7eb93 100644 --- a/services/iterationreport/jaxb/pom.xml +++ b/services/iterationreport/jaxb/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services.iterationreport org.collectionspace.services @@ -25,9 +23,9 @@ install - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin - + \ No newline at end of file diff --git a/services/iterationreport/pom.xml b/services/iterationreport/pom.xml index 084f0d3ef8..961b9196bb 100644 --- a/services/iterationreport/pom.xml +++ b/services/iterationreport/pom.xml @@ -1,5 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.main @@ -17,4 +17,4 @@ client - + \ No newline at end of file diff --git a/services/iterationreport/service/pom.xml b/services/iterationreport/service/pom.xml index 231731ce02..fd1ad222e3 100644 --- a/services/iterationreport/service/pom.xml +++ b/services/iterationreport/service/pom.xml @@ -1,5 +1,5 @@ - - + + org.collectionspace.services @@ -91,4 +91,4 @@ collectionspace-services-iterationreport - + \ No newline at end of file diff --git a/services/jaxb/pom.xml b/services/jaxb/pom.xml index 8905e189e4..0a17da5576 100644 --- a/services/jaxb/pom.xml +++ b/services/jaxb/pom.xml @@ -1,15 +1,5 @@ - - - - - + + org.collectionspace.services @@ -22,12 +12,9 @@ services.jaxb + - com.sun.xml.bind - jaxb-core - - - org.jvnet.jaxb2_commons + org.jvnet.jaxb jaxb2-basics @@ -37,8 +24,8 @@ install - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin org.codehaus.mojo @@ -47,5 +34,4 @@ - - + \ No newline at end of file diff --git a/services/loanin/3rdparty/nuxeo-platform-cs-loanin/pom.xml b/services/loanin/3rdparty/nuxeo-platform-cs-loanin/pom.xml index 31f834e31f..cb31eb1471 100644 --- a/services/loanin/3rdparty/nuxeo-platform-cs-loanin/pom.xml +++ b/services/loanin/3rdparty/nuxeo-platform-cs-loanin/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services @@ -53,4 +51,4 @@ - + \ No newline at end of file diff --git a/services/loanin/3rdparty/pom.xml b/services/loanin/3rdparty/pom.xml index ac0a4ab2ce..f59492c0c5 100644 --- a/services/loanin/3rdparty/pom.xml +++ b/services/loanin/3rdparty/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services.loanin org.collectionspace.services @@ -22,4 +20,4 @@ nuxeo-platform-cs-loanin --> - + \ No newline at end of file diff --git a/services/loanin/client/pom.xml b/services/loanin/client/pom.xml index 494d55510e..b9e556f84b 100644 --- a/services/loanin/client/pom.xml +++ b/services/loanin/client/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.loanin @@ -70,4 +68,4 @@ collectionspace-services-loanin-client - + \ No newline at end of file diff --git a/services/loanin/jaxb/pom.xml b/services/loanin/jaxb/pom.xml index 764068b5db..a0a53e1d10 100644 --- a/services/loanin/jaxb/pom.xml +++ b/services/loanin/jaxb/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services.loanin org.collectionspace.services @@ -25,8 +23,8 @@ install - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin org.codehaus.mojo @@ -34,5 +32,4 @@ - - + \ No newline at end of file diff --git a/services/loanin/pom.xml b/services/loanin/pom.xml index c295d8b114..d182ee17ca 100644 --- a/services/loanin/pom.xml +++ b/services/loanin/pom.xml @@ -1,6 +1,5 @@ - - - + + org.collectionspace.services org.collectionspace.services.main @@ -22,5 +21,4 @@ client - - + \ No newline at end of file diff --git a/services/loanin/service/pom.xml b/services/loanin/service/pom.xml index e45eb90659..e744b3948b 100644 --- a/services/loanin/service/pom.xml +++ b/services/loanin/service/pom.xml @@ -1,5 +1,5 @@ - - + + org.collectionspace.services @@ -86,4 +86,4 @@ collectionspace-services-loanin - + \ No newline at end of file diff --git a/services/loanout/3rdparty/nuxeo-platform-cs-loanout/pom.xml b/services/loanout/3rdparty/nuxeo-platform-cs-loanout/pom.xml index 7a699878aa..fe689d540c 100644 --- a/services/loanout/3rdparty/nuxeo-platform-cs-loanout/pom.xml +++ b/services/loanout/3rdparty/nuxeo-platform-cs-loanout/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services @@ -53,4 +51,4 @@ - + \ No newline at end of file diff --git a/services/loanout/3rdparty/pom.xml b/services/loanout/3rdparty/pom.xml index e91a12e8c3..c395cf92c6 100644 --- a/services/loanout/3rdparty/pom.xml +++ b/services/loanout/3rdparty/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services.loanout org.collectionspace.services @@ -22,4 +20,4 @@ nuxeo-platform-cs-loanout --> - + \ No newline at end of file diff --git a/services/loanout/client/pom.xml b/services/loanout/client/pom.xml index 53875c5b46..dd869b7a2f 100644 --- a/services/loanout/client/pom.xml +++ b/services/loanout/client/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.loanout @@ -71,4 +69,4 @@ collectionspace-services-loanout-client - + \ No newline at end of file diff --git a/services/loanout/jaxb/pom.xml b/services/loanout/jaxb/pom.xml index 99f53bbfcb..5fb5e0b37b 100644 --- a/services/loanout/jaxb/pom.xml +++ b/services/loanout/jaxb/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services.loanout org.collectionspace.services @@ -25,8 +23,8 @@ install - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin org.codehaus.mojo @@ -34,5 +32,4 @@ - - + \ No newline at end of file diff --git a/services/loanout/pom.xml b/services/loanout/pom.xml index e9b2105fa7..75cadab735 100644 --- a/services/loanout/pom.xml +++ b/services/loanout/pom.xml @@ -1,6 +1,5 @@ - - - + + org.collectionspace.services org.collectionspace.services.main @@ -19,5 +18,4 @@ client - - + \ No newline at end of file diff --git a/services/loanout/service/pom.xml b/services/loanout/service/pom.xml index 37cc0b6fc0..bf4228acd9 100644 --- a/services/loanout/service/pom.xml +++ b/services/loanout/service/pom.xml @@ -1,5 +1,5 @@ - - + + org.collectionspace.services @@ -84,4 +84,4 @@ collectionspace-services-loanout - + \ No newline at end of file diff --git a/services/location/3rdparty/nuxeo-platform-cs-location/pom.xml b/services/location/3rdparty/nuxeo-platform-cs-location/pom.xml index 4c9bf08f96..2560a4ee36 100644 --- a/services/location/3rdparty/nuxeo-platform-cs-location/pom.xml +++ b/services/location/3rdparty/nuxeo-platform-cs-location/pom.xml @@ -1,6 +1,5 @@ - + + org.collectionspace.services org.collectionspace.services.location.3rdparty @@ -39,4 +38,4 @@ - + \ No newline at end of file diff --git a/services/location/3rdparty/pom.xml b/services/location/3rdparty/pom.xml index be40ec4536..ad61f8a0e5 100644 --- a/services/location/3rdparty/pom.xml +++ b/services/location/3rdparty/pom.xml @@ -1,6 +1,5 @@ - + + org.collectionspace.services org.collectionspace.services.location @@ -20,4 +19,4 @@ nuxeo-platform-cs-location --> - + \ No newline at end of file diff --git a/services/location/client/pom.xml b/services/location/client/pom.xml index 966fb25490..6d49954f06 100644 --- a/services/location/client/pom.xml +++ b/services/location/client/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.location @@ -70,4 +68,4 @@ collectionspace-services-location-client - + \ No newline at end of file diff --git a/services/location/jaxb/pom.xml b/services/location/jaxb/pom.xml index 94bc73f7f3..9787b7c957 100644 --- a/services/location/jaxb/pom.xml +++ b/services/location/jaxb/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.location @@ -35,8 +33,8 @@ install - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin org.codehaus.mojo @@ -44,5 +42,4 @@ - - + \ No newline at end of file diff --git a/services/location/pom.xml b/services/location/pom.xml index 61c421b4ff..8ff8a5c9b7 100644 --- a/services/location/pom.xml +++ b/services/location/pom.xml @@ -1,5 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.main @@ -21,5 +21,4 @@ client - - + \ No newline at end of file diff --git a/services/location/service/pom.xml b/services/location/service/pom.xml index 3ad92fca1e..c4280756e7 100644 --- a/services/location/service/pom.xml +++ b/services/location/service/pom.xml @@ -1,5 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.location @@ -99,4 +99,4 @@ - + \ No newline at end of file diff --git a/services/login/client/pom.xml b/services/login/client/pom.xml index 338b51ac92..05a8665202 100644 --- a/services/login/client/pom.xml +++ b/services/login/client/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.login @@ -15,4 +13,4 @@ collectionspace-services-login-client - + \ No newline at end of file diff --git a/services/login/pom.xml b/services/login/pom.xml index d1b2f217fd..cd6776203c 100644 --- a/services/login/pom.xml +++ b/services/login/pom.xml @@ -1,5 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.main @@ -15,4 +15,4 @@ client service - + \ No newline at end of file diff --git a/services/login/service/pom.xml b/services/login/service/pom.xml index 62935bd696..72ec50cd18 100644 --- a/services/login/service/pom.xml +++ b/services/login/service/pom.xml @@ -1,5 +1,5 @@ - - + + org.collectionspace.services @@ -51,4 +51,4 @@ collectionspace-services-login-service - + \ No newline at end of file diff --git a/services/logout/client/pom.xml b/services/logout/client/pom.xml index 839deae48d..5b37d4cdf2 100644 --- a/services/logout/client/pom.xml +++ b/services/logout/client/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.logout @@ -15,4 +13,4 @@ collectionspace-services-logout-client - + \ No newline at end of file diff --git a/services/logout/pom.xml b/services/logout/pom.xml index e0f6bab095..606249ecc4 100644 --- a/services/logout/pom.xml +++ b/services/logout/pom.xml @@ -1,5 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.main @@ -15,4 +15,4 @@ client service - + \ No newline at end of file diff --git a/services/logout/service/pom.xml b/services/logout/service/pom.xml index fab7d12924..78e19c901e 100644 --- a/services/logout/service/pom.xml +++ b/services/logout/service/pom.xml @@ -1,5 +1,5 @@ - - + + org.collectionspace.services @@ -51,4 +51,4 @@ collectionspace-services-logout-service - + \ No newline at end of file diff --git a/services/material/3rdparty/nuxeo-platform-cs-material/pom.xml b/services/material/3rdparty/nuxeo-platform-cs-material/pom.xml index 992a9ae7de..9a42e668ba 100644 --- a/services/material/3rdparty/nuxeo-platform-cs-material/pom.xml +++ b/services/material/3rdparty/nuxeo-platform-cs-material/pom.xml @@ -1,6 +1,5 @@ - + + org.collectionspace.services org.collectionspace.services.material.3rdparty @@ -39,4 +38,4 @@ - + \ No newline at end of file diff --git a/services/material/3rdparty/pom.xml b/services/material/3rdparty/pom.xml index 2cf481645e..4a5a5db80c 100644 --- a/services/material/3rdparty/pom.xml +++ b/services/material/3rdparty/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.material @@ -21,4 +19,4 @@ nuxeo-platform-cs-material --> - + \ No newline at end of file diff --git a/services/material/client/pom.xml b/services/material/client/pom.xml index 78d9105039..adec494cd9 100644 --- a/services/material/client/pom.xml +++ b/services/material/client/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.material @@ -66,4 +64,4 @@ collectionspace-services-material-client - + \ No newline at end of file diff --git a/services/material/jaxb/pom.xml b/services/material/jaxb/pom.xml index d0a9a4cd7c..cc0d192f2b 100644 --- a/services/material/jaxb/pom.xml +++ b/services/material/jaxb/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.material @@ -17,10 +15,7 @@ org.collectionspace.services org.collectionspace.services.common - - com.sun.xml.bind - jaxb-core - + - + \ No newline at end of file diff --git a/services/media/client/pom.xml b/services/media/client/pom.xml index 14c06f01b9..30384d8242 100644 --- a/services/media/client/pom.xml +++ b/services/media/client/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.media @@ -151,7 +149,7 @@ /static ${project.build.directory}/maven-shared-archive-resources - + jar @@ -169,4 +167,4 @@ - + \ No newline at end of file diff --git a/services/media/jaxb/pom.xml b/services/media/jaxb/pom.xml index 83334c7526..3552595cd8 100644 --- a/services/media/jaxb/pom.xml +++ b/services/media/jaxb/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services.media org.collectionspace.services @@ -25,8 +23,8 @@ install - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin org.codehaus.mojo @@ -34,5 +32,4 @@ - - + \ No newline at end of file diff --git a/services/media/pom.xml b/services/media/pom.xml index c8c4716a4f..1b81bcc508 100644 --- a/services/media/pom.xml +++ b/services/media/pom.xml @@ -1,6 +1,5 @@ - - - + + org.collectionspace.services org.collectionspace.services.main @@ -19,5 +18,4 @@ client - - + \ No newline at end of file diff --git a/services/media/service/pom.xml b/services/media/service/pom.xml index 41817229ce..4a291985c5 100644 --- a/services/media/service/pom.xml +++ b/services/media/service/pom.xml @@ -1,5 +1,5 @@ - - + + org.collectionspace.services @@ -101,4 +101,4 @@ collectionspace-services-media - + \ No newline at end of file diff --git a/services/movement/3rdparty/nuxeo-platform-cs-movement/pom.xml b/services/movement/3rdparty/nuxeo-platform-cs-movement/pom.xml index 7c8d73f4c2..64acd22413 100644 --- a/services/movement/3rdparty/nuxeo-platform-cs-movement/pom.xml +++ b/services/movement/3rdparty/nuxeo-platform-cs-movement/pom.xml @@ -1,6 +1,5 @@ - + + org.collectionspace.services @@ -51,4 +50,4 @@ - + \ No newline at end of file diff --git a/services/movement/3rdparty/pom.xml b/services/movement/3rdparty/pom.xml index 499654a08d..4e14a3fdbd 100644 --- a/services/movement/3rdparty/pom.xml +++ b/services/movement/3rdparty/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services.movement org.collectionspace.services @@ -22,4 +20,4 @@ nuxeo-platform-cs-movement --> - + \ No newline at end of file diff --git a/services/movement/client/pom.xml b/services/movement/client/pom.xml index 9bbb016ea4..6cd62ff883 100644 --- a/services/movement/client/pom.xml +++ b/services/movement/client/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.movement @@ -72,4 +70,4 @@ collectionspace-services-movement-client - + \ No newline at end of file diff --git a/services/movement/jaxb/pom.xml b/services/movement/jaxb/pom.xml index 5c87d32935..04c095fd8d 100644 --- a/services/movement/jaxb/pom.xml +++ b/services/movement/jaxb/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services.movement org.collectionspace.services @@ -25,8 +23,8 @@ install - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin org.codehaus.mojo @@ -34,5 +32,4 @@ - - + \ No newline at end of file diff --git a/services/movement/pom.xml b/services/movement/pom.xml index 58c3e85436..22f8c9ba96 100644 --- a/services/movement/pom.xml +++ b/services/movement/pom.xml @@ -1,6 +1,5 @@ - - - + + org.collectionspace.services org.collectionspace.services.main @@ -19,5 +18,4 @@ client - - + \ No newline at end of file diff --git a/services/movement/service/pom.xml b/services/movement/service/pom.xml index fbef801fb1..7df4a0ac10 100644 --- a/services/movement/service/pom.xml +++ b/services/movement/service/pom.xml @@ -1,5 +1,5 @@ - - + + org.collectionspace.services @@ -88,4 +88,4 @@ collectionspace-services-movement - + \ No newline at end of file diff --git a/services/nagpra-jaxb/pom.xml b/services/nagpra-jaxb/pom.xml index 86f1003d1e..6936f43c51 100644 --- a/services/nagpra-jaxb/pom.xml +++ b/services/nagpra-jaxb/pom.xml @@ -1,7 +1,5 @@ - - + + 4.0.0 org.collectionspace.services.main @@ -27,9 +25,9 @@ install - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin - + \ No newline at end of file diff --git a/services/nagprainventory/client/pom.xml b/services/nagprainventory/client/pom.xml index cb5308830b..581e2c8d43 100644 --- a/services/nagprainventory/client/pom.xml +++ b/services/nagprainventory/client/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.nagprainventory diff --git a/services/nagprainventory/jaxb/pom.xml b/services/nagprainventory/jaxb/pom.xml index c8606bcbef..b05315252f 100644 --- a/services/nagprainventory/jaxb/pom.xml +++ b/services/nagprainventory/jaxb/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services.nagprainventory org.collectionspace.services @@ -25,8 +23,8 @@ install - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin diff --git a/services/nagprainventory/pom.xml b/services/nagprainventory/pom.xml index c3b79dcb65..a1fc18e8c6 100644 --- a/services/nagprainventory/pom.xml +++ b/services/nagprainventory/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.main @@ -32,8 +30,8 @@ src/main/java/**/*.java src/test/java/**/*.java - - + + true 4 @@ -42,7 +40,7 @@ - + diff --git a/services/nagprainventory/service/pom.xml b/services/nagprainventory/service/pom.xml index 931497ebf9..cb8e387eeb 100644 --- a/services/nagprainventory/service/pom.xml +++ b/services/nagprainventory/service/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services @@ -86,4 +84,4 @@ collectionspace-services-nagprainventory - + \ No newline at end of file diff --git a/services/note/3rdparty/nuxeo-platform-cs-note/pom.xml b/services/note/3rdparty/nuxeo-platform-cs-note/pom.xml index 82f7e42848..c024ff3876 100644 --- a/services/note/3rdparty/nuxeo-platform-cs-note/pom.xml +++ b/services/note/3rdparty/nuxeo-platform-cs-note/pom.xml @@ -1,6 +1,5 @@ - + + org.collectionspace.services org.collectionspace.services.note.3rdparty @@ -40,4 +39,4 @@ - + \ No newline at end of file diff --git a/services/note/3rdparty/pom.xml b/services/note/3rdparty/pom.xml index a9ac2e3d17..499c8fbe97 100644 --- a/services/note/3rdparty/pom.xml +++ b/services/note/3rdparty/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.note @@ -21,4 +19,4 @@ nuxeo-platform-cs-note --> - + \ No newline at end of file diff --git a/services/note/client/pom.xml b/services/note/client/pom.xml index ada93e07a4..bff00802b7 100644 --- a/services/note/client/pom.xml +++ b/services/note/client/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services.note org.collectionspace.services @@ -59,4 +57,4 @@ collectionspace-services-note-client - + \ No newline at end of file diff --git a/services/note/jaxb/pom.xml b/services/note/jaxb/pom.xml index f05f71e18f..0402d6a4f5 100644 --- a/services/note/jaxb/pom.xml +++ b/services/note/jaxb/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.note @@ -30,8 +28,8 @@ install - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin org.codehaus.mojo @@ -39,5 +37,4 @@ - - + \ No newline at end of file diff --git a/services/note/pom.xml b/services/note/pom.xml index cc51f4812e..c762f45362 100644 --- a/services/note/pom.xml +++ b/services/note/pom.xml @@ -1,6 +1,5 @@ - - - + + org.collectionspace.services.main org.collectionspace.services @@ -20,5 +19,4 @@ client - - + \ No newline at end of file diff --git a/services/note/service/pom.xml b/services/note/service/pom.xml index 82f9573096..69d652c8ea 100644 --- a/services/note/service/pom.xml +++ b/services/note/service/pom.xml @@ -1,5 +1,5 @@ - - + + org.collectionspace.services.note org.collectionspace.services @@ -76,4 +76,4 @@ collectionspace-services-note - + \ No newline at end of file diff --git a/services/objectexit/3rdparty/nuxeo-platform-cs-objectexit/pom.xml b/services/objectexit/3rdparty/nuxeo-platform-cs-objectexit/pom.xml index 53e0b93131..90fe5076f9 100644 --- a/services/objectexit/3rdparty/nuxeo-platform-cs-objectexit/pom.xml +++ b/services/objectexit/3rdparty/nuxeo-platform-cs-objectexit/pom.xml @@ -1,6 +1,5 @@ - + + org.collectionspace.services @@ -50,4 +49,4 @@ - + \ No newline at end of file diff --git a/services/objectexit/3rdparty/pom.xml b/services/objectexit/3rdparty/pom.xml index 498a5b457c..01e6ba3be9 100644 --- a/services/objectexit/3rdparty/pom.xml +++ b/services/objectexit/3rdparty/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services.objectexit org.collectionspace.services @@ -30,4 +28,4 @@ nuxeo-platform-cs-objectexit --> - + \ No newline at end of file diff --git a/services/objectexit/client/pom.xml b/services/objectexit/client/pom.xml index d4b5c625f7..0dd6a596dc 100644 --- a/services/objectexit/client/pom.xml +++ b/services/objectexit/client/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.objectexit @@ -71,4 +69,4 @@ collectionspace-services-objectexit-client - + \ No newline at end of file diff --git a/services/objectexit/jaxb/pom.xml b/services/objectexit/jaxb/pom.xml index 20ace344de..892f8df211 100644 --- a/services/objectexit/jaxb/pom.xml +++ b/services/objectexit/jaxb/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services.objectexit org.collectionspace.services @@ -25,8 +23,8 @@ install - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin org.codehaus.mojo @@ -34,5 +32,4 @@ - - + \ No newline at end of file diff --git a/services/objectexit/pom.xml b/services/objectexit/pom.xml index 993e69a312..414ea6dfab 100644 --- a/services/objectexit/pom.xml +++ b/services/objectexit/pom.xml @@ -1,6 +1,5 @@ - - - + + org.collectionspace.services org.collectionspace.services.main @@ -20,5 +19,4 @@ client - - + \ No newline at end of file diff --git a/services/objectexit/service/pom.xml b/services/objectexit/service/pom.xml index 9e92cc5d09..05d9eef329 100644 --- a/services/objectexit/service/pom.xml +++ b/services/objectexit/service/pom.xml @@ -1,5 +1,5 @@ - - + + org.collectionspace.services @@ -85,4 +85,4 @@ collectionspace-services-objectexit - + \ No newline at end of file diff --git a/services/organization/3rdparty/nuxeo-platform-cs-organization/pom.xml b/services/organization/3rdparty/nuxeo-platform-cs-organization/pom.xml index 09431e117e..995a6b026e 100644 --- a/services/organization/3rdparty/nuxeo-platform-cs-organization/pom.xml +++ b/services/organization/3rdparty/nuxeo-platform-cs-organization/pom.xml @@ -1,6 +1,5 @@ - + + org.collectionspace.services org.collectionspace.services.organization.3rdparty @@ -40,4 +39,4 @@ - + \ No newline at end of file diff --git a/services/organization/3rdparty/pom.xml b/services/organization/3rdparty/pom.xml index 1c17aa159f..21414e9e03 100644 --- a/services/organization/3rdparty/pom.xml +++ b/services/organization/3rdparty/pom.xml @@ -1,6 +1,5 @@ - + + org.collectionspace.services org.collectionspace.services.organization @@ -20,4 +19,4 @@ nuxeo-platform-cs-organization --> - + \ No newline at end of file diff --git a/services/organization/client/pom.xml b/services/organization/client/pom.xml index 9bb8676521..689dc43f63 100644 --- a/services/organization/client/pom.xml +++ b/services/organization/client/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.organization @@ -65,4 +63,4 @@ collectionspace-services-organization-client - + \ No newline at end of file diff --git a/services/organization/jaxb/pom.xml b/services/organization/jaxb/pom.xml index db829b4bd9..325902eabc 100644 --- a/services/organization/jaxb/pom.xml +++ b/services/organization/jaxb/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services.organization org.collectionspace.services @@ -34,8 +32,8 @@ install - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin org.codehaus.mojo @@ -43,4 +41,4 @@ - + \ No newline at end of file diff --git a/services/organization/pom.xml b/services/organization/pom.xml index f4d7146f73..4e8aa6fc8f 100644 --- a/services/organization/pom.xml +++ b/services/organization/pom.xml @@ -1,5 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.main @@ -18,5 +18,4 @@ client - - + \ No newline at end of file diff --git a/services/organization/service/pom.xml b/services/organization/service/pom.xml index 96e83888a0..227922b38e 100644 --- a/services/organization/service/pom.xml +++ b/services/organization/service/pom.xml @@ -1,5 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.organization @@ -98,4 +98,4 @@ collectionspace-services-organization - + \ No newline at end of file diff --git a/services/osteology/3rdparty/nuxeo-platform-cs-osteology/pom.xml b/services/osteology/3rdparty/nuxeo-platform-cs-osteology/pom.xml index 770bfe43b0..2e2400d33c 100644 --- a/services/osteology/3rdparty/nuxeo-platform-cs-osteology/pom.xml +++ b/services/osteology/3rdparty/nuxeo-platform-cs-osteology/pom.xml @@ -1,6 +1,5 @@ - + + org.collectionspace.services @@ -51,4 +50,4 @@ - + \ No newline at end of file diff --git a/services/osteology/3rdparty/pom.xml b/services/osteology/3rdparty/pom.xml index b235f68397..662579d8ca 100644 --- a/services/osteology/3rdparty/pom.xml +++ b/services/osteology/3rdparty/pom.xml @@ -1,6 +1,5 @@ - + + org.collectionspace.services.osteology org.collectionspace.services @@ -21,4 +20,4 @@ nuxeo-platform-cs-osteology --> - + \ No newline at end of file diff --git a/services/osteology/client/pom.xml b/services/osteology/client/pom.xml index e72244becc..7b62d35320 100644 --- a/services/osteology/client/pom.xml +++ b/services/osteology/client/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.osteology @@ -78,4 +76,4 @@ collectionspace-services-osteology-client - + \ No newline at end of file diff --git a/services/osteology/jaxb/pom.xml b/services/osteology/jaxb/pom.xml index cad2f68a47..f1cca843f3 100644 --- a/services/osteology/jaxb/pom.xml +++ b/services/osteology/jaxb/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services.osteology org.collectionspace.services @@ -25,8 +23,8 @@ install - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin org.codehaus.mojo @@ -34,4 +32,4 @@ - + \ No newline at end of file diff --git a/services/osteology/pom.xml b/services/osteology/pom.xml index 6be3de5e51..fb09e20eda 100644 --- a/services/osteology/pom.xml +++ b/services/osteology/pom.xml @@ -1,6 +1,5 @@ - - - + + org.collectionspace.services org.collectionspace.services.main @@ -19,4 +18,4 @@ client - + \ No newline at end of file diff --git a/services/osteology/service/pom.xml b/services/osteology/service/pom.xml index df409c2f5b..aeb42c4aed 100644 --- a/services/osteology/service/pom.xml +++ b/services/osteology/service/pom.xml @@ -1,5 +1,5 @@ - - + + org.collectionspace.services @@ -91,4 +91,4 @@ collectionspace-services-osteology - + \ No newline at end of file diff --git a/services/person/3rdparty/nuxeo-platform-cs-person/pom.xml b/services/person/3rdparty/nuxeo-platform-cs-person/pom.xml index dcfd3e7c2a..d653059c84 100644 --- a/services/person/3rdparty/nuxeo-platform-cs-person/pom.xml +++ b/services/person/3rdparty/nuxeo-platform-cs-person/pom.xml @@ -1,6 +1,5 @@ - + + org.collectionspace.services org.collectionspace.services.person.3rdparty @@ -40,4 +39,4 @@ - + \ No newline at end of file diff --git a/services/person/3rdparty/nuxeo-platform-person-testsci/pom.xml b/services/person/3rdparty/nuxeo-platform-person-testsci/pom.xml index b50af3aba3..69d11e3a0e 100644 --- a/services/person/3rdparty/nuxeo-platform-person-testsci/pom.xml +++ b/services/person/3rdparty/nuxeo-platform-person-testsci/pom.xml @@ -1,6 +1,5 @@ - + + org.collectionspace.services org.collectionspace.services.person.3rdparty @@ -12,7 +11,7 @@ org.collectionspace.services.person.3rdparty.testsci.nuxeo jar - Person Nuxeo document type for Tenant ID = "2" + Person Nuxeo document type for Tenant ID = "2" @@ -53,4 +52,4 @@ - + \ No newline at end of file diff --git a/services/person/3rdparty/pom.xml b/services/person/3rdparty/pom.xml index 9cfe61183f..d7a9268988 100644 --- a/services/person/3rdparty/pom.xml +++ b/services/person/3rdparty/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.person @@ -22,4 +20,4 @@ nuxeo-platform-person-testsci --> - + \ No newline at end of file diff --git a/services/person/client/pom.xml b/services/person/client/pom.xml index 4b423940fa..1b9cf6089a 100644 --- a/services/person/client/pom.xml +++ b/services/person/client/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.person @@ -69,4 +67,4 @@ - + \ No newline at end of file diff --git a/services/person/jaxb/pom.xml b/services/person/jaxb/pom.xml index e1e10aa17e..2627c527f5 100644 --- a/services/person/jaxb/pom.xml +++ b/services/person/jaxb/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.person @@ -31,8 +29,8 @@ install - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin org.codehaus.mojo @@ -40,5 +38,4 @@ - - + \ No newline at end of file diff --git a/services/person/pom.xml b/services/person/pom.xml index afe936a274..7e984c3db1 100644 --- a/services/person/pom.xml +++ b/services/person/pom.xml @@ -1,5 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.main @@ -29,5 +29,4 @@ client - - + \ No newline at end of file diff --git a/services/person/service/pom.xml b/services/person/service/pom.xml index 8c6e8814c4..ec0e36a438 100644 --- a/services/person/service/pom.xml +++ b/services/person/service/pom.xml @@ -1,5 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.person @@ -103,4 +103,4 @@ - + \ No newline at end of file diff --git a/services/place/3rdparty/nuxeo-platform-cs-place/pom.xml b/services/place/3rdparty/nuxeo-platform-cs-place/pom.xml index 8979134b58..3f9febaed3 100644 --- a/services/place/3rdparty/nuxeo-platform-cs-place/pom.xml +++ b/services/place/3rdparty/nuxeo-platform-cs-place/pom.xml @@ -1,6 +1,5 @@ - + + org.collectionspace.services org.collectionspace.services.place.3rdparty @@ -40,4 +39,4 @@ - + \ No newline at end of file diff --git a/services/place/3rdparty/pom.xml b/services/place/3rdparty/pom.xml index 6a3122627e..5e92841cb2 100644 --- a/services/place/3rdparty/pom.xml +++ b/services/place/3rdparty/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.place @@ -21,4 +19,4 @@ nuxeo-platform-cs-place --> - + \ No newline at end of file diff --git a/services/place/client/pom.xml b/services/place/client/pom.xml index 44e900a5db..356332f6e9 100644 --- a/services/place/client/pom.xml +++ b/services/place/client/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.place @@ -66,4 +64,4 @@ collectionspace-services-place-client - + \ No newline at end of file diff --git a/services/place/jaxb/pom.xml b/services/place/jaxb/pom.xml index 3e9dfb3865..9edeba6ccd 100644 --- a/services/place/jaxb/pom.xml +++ b/services/place/jaxb/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.place @@ -17,10 +15,7 @@ org.collectionspace.services org.collectionspace.services.common - - com.sun.xml.bind - jaxb-core - + org.collectionspace.services org.collectionspace.services.jaxb @@ -39,8 +34,8 @@ install - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin org.codehaus.mojo @@ -48,4 +43,4 @@ - + \ No newline at end of file diff --git a/services/place/pom.xml b/services/place/pom.xml index eb228ee66b..874a8e1412 100644 --- a/services/place/pom.xml +++ b/services/place/pom.xml @@ -1,5 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.main @@ -27,5 +27,4 @@ client - - + \ No newline at end of file diff --git a/services/place/service/pom.xml b/services/place/service/pom.xml index 911e1217fb..2b61ecac0e 100644 --- a/services/place/service/pom.xml +++ b/services/place/service/pom.xml @@ -1,5 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.place @@ -109,4 +109,4 @@ collectionspace-services-place - + \ No newline at end of file diff --git a/services/pom.xml b/services/pom.xml index 1fb0a2d04a..5c190ce736 100644 --- a/services/pom.xml +++ b/services/pom.xml @@ -1,6 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services @@ -18,6 +17,7 @@ cs_default generate-sources + 2.0.14 @@ -239,30 +240,27 @@ - javax.xml.bind - jaxb-api - ${jaxb.version} + jakarta.xml.bind + jakarta.xml.bind-api + ${xml-bind.version} org.jvnet.jaxb2_commons jaxb2-basics-annotate - ${jaxb2-basics.version} + 1.1.0 org.jvnet.jaxb2_commons jaxb2-basics ${jaxb2-basics.version} + - - org.jvnet.jaxb2_commons - jaxb2-namespace-prefix - 1.4-SNAPSHOT - + @@ -361,4 +359,4 @@ - + \ No newline at end of file diff --git a/services/pottag/3rdparty/nuxeo-platform-cs-pottag/pom.xml b/services/pottag/3rdparty/nuxeo-platform-cs-pottag/pom.xml index 27b56d843c..c2f2844453 100644 --- a/services/pottag/3rdparty/nuxeo-platform-cs-pottag/pom.xml +++ b/services/pottag/3rdparty/nuxeo-platform-cs-pottag/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services @@ -53,4 +51,4 @@ - + \ No newline at end of file diff --git a/services/pottag/3rdparty/pom.xml b/services/pottag/3rdparty/pom.xml index ab94f1347e..f5a02cc2b9 100644 --- a/services/pottag/3rdparty/pom.xml +++ b/services/pottag/3rdparty/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services.pottag org.collectionspace.services @@ -29,4 +27,4 @@ nuxeo-platform-cs-pottag --> - + \ No newline at end of file diff --git a/services/pottag/client/pom.xml b/services/pottag/client/pom.xml index 18cc3e5548..5842600095 100644 --- a/services/pottag/client/pom.xml +++ b/services/pottag/client/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.pottag @@ -73,4 +71,4 @@ collectionspace-services-pottag-client - + \ No newline at end of file diff --git a/services/pottag/jaxb/pom.xml b/services/pottag/jaxb/pom.xml index 6e23a40544..771979f056 100644 --- a/services/pottag/jaxb/pom.xml +++ b/services/pottag/jaxb/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services.pottag org.collectionspace.services @@ -26,8 +24,8 @@ install - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin org.codehaus.mojo @@ -35,5 +33,4 @@ - - + \ No newline at end of file diff --git a/services/pottag/pom.xml b/services/pottag/pom.xml index bdc41cfe64..2fc6bac7f4 100644 --- a/services/pottag/pom.xml +++ b/services/pottag/pom.xml @@ -1,6 +1,5 @@ - - - + + org.collectionspace.services org.collectionspace.services.main @@ -22,5 +21,4 @@ client - - + \ No newline at end of file diff --git a/services/pottag/service/pom.xml b/services/pottag/service/pom.xml index 7d16a668bb..c5bc691894 100644 --- a/services/pottag/service/pom.xml +++ b/services/pottag/service/pom.xml @@ -1,5 +1,5 @@ - - + + org.collectionspace.services @@ -91,4 +91,4 @@ collectionspace-services-pottag - + \ No newline at end of file diff --git a/services/propagation/3rdparty/nuxeo-platform-cs-propagation/pom.xml b/services/propagation/3rdparty/nuxeo-platform-cs-propagation/pom.xml index 7112009d69..75524db14c 100644 --- a/services/propagation/3rdparty/nuxeo-platform-cs-propagation/pom.xml +++ b/services/propagation/3rdparty/nuxeo-platform-cs-propagation/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services @@ -53,4 +51,4 @@ - + \ No newline at end of file diff --git a/services/propagation/3rdparty/pom.xml b/services/propagation/3rdparty/pom.xml index 29b93b2353..fcb0135faa 100644 --- a/services/propagation/3rdparty/pom.xml +++ b/services/propagation/3rdparty/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services.propagation org.collectionspace.services @@ -29,4 +27,4 @@ nuxeo-platform-cs-propagation --> - + \ No newline at end of file diff --git a/services/propagation/client/pom.xml b/services/propagation/client/pom.xml index 802774a859..b87eeef963 100644 --- a/services/propagation/client/pom.xml +++ b/services/propagation/client/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.propagation @@ -71,4 +69,4 @@ collectionspace-services-propagation-client - + \ No newline at end of file diff --git a/services/propagation/jaxb/pom.xml b/services/propagation/jaxb/pom.xml index b55be2de8b..a63daf413a 100644 --- a/services/propagation/jaxb/pom.xml +++ b/services/propagation/jaxb/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services.propagation org.collectionspace.services @@ -25,8 +23,8 @@ install - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin org.codehaus.mojo @@ -34,5 +32,4 @@ - - + \ No newline at end of file diff --git a/services/propagation/pom.xml b/services/propagation/pom.xml index 71f6028d77..1394bba723 100644 --- a/services/propagation/pom.xml +++ b/services/propagation/pom.xml @@ -1,6 +1,5 @@ - - - + + org.collectionspace.services org.collectionspace.services.main @@ -23,5 +22,4 @@ client - - + \ No newline at end of file diff --git a/services/propagation/service/pom.xml b/services/propagation/service/pom.xml index cba945709f..163b32c25c 100644 --- a/services/propagation/service/pom.xml +++ b/services/propagation/service/pom.xml @@ -1,5 +1,5 @@ - - + + org.collectionspace.services @@ -96,4 +96,4 @@ collectionspace-services-propagation - + \ No newline at end of file diff --git a/services/publicitem/3rdparty/nuxeo-platform-cs-publicitem/pom.xml b/services/publicitem/3rdparty/nuxeo-platform-cs-publicitem/pom.xml index 05ef16127b..287f827f62 100644 --- a/services/publicitem/3rdparty/nuxeo-platform-cs-publicitem/pom.xml +++ b/services/publicitem/3rdparty/nuxeo-platform-cs-publicitem/pom.xml @@ -1,6 +1,5 @@ - + + org.collectionspace.services @@ -51,4 +50,4 @@ - + \ No newline at end of file diff --git a/services/publicitem/3rdparty/pom.xml b/services/publicitem/3rdparty/pom.xml index 18915e1e11..f91ea163dd 100644 --- a/services/publicitem/3rdparty/pom.xml +++ b/services/publicitem/3rdparty/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services.publicitem org.collectionspace.services @@ -20,4 +18,4 @@ nuxeo-platform-cs-publicitem - + \ No newline at end of file diff --git a/services/publicitem/client/pom.xml b/services/publicitem/client/pom.xml index 5eef9a3656..0833ed9627 100644 --- a/services/publicitem/client/pom.xml +++ b/services/publicitem/client/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.publicitem @@ -65,4 +63,4 @@ collectionspace-services-publicitem-client - + \ No newline at end of file diff --git a/services/publicitem/jaxb/pom.xml b/services/publicitem/jaxb/pom.xml index ab3f7d5e05..38e15632e9 100644 --- a/services/publicitem/jaxb/pom.xml +++ b/services/publicitem/jaxb/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services.publicitem org.collectionspace.services @@ -25,8 +23,8 @@ install - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin org.codehaus.mojo @@ -34,5 +32,4 @@ - - + \ No newline at end of file diff --git a/services/publicitem/pom.xml b/services/publicitem/pom.xml index c9932d12fe..c8361de50e 100644 --- a/services/publicitem/pom.xml +++ b/services/publicitem/pom.xml @@ -1,6 +1,5 @@ - - - + + org.collectionspace.services org.collectionspace.services.main @@ -22,5 +21,4 @@ service - - + \ No newline at end of file diff --git a/services/publicitem/service/pom.xml b/services/publicitem/service/pom.xml index 0538d5db7c..6769711075 100644 --- a/services/publicitem/service/pom.xml +++ b/services/publicitem/service/pom.xml @@ -1,5 +1,5 @@ - - + + org.collectionspace.services @@ -85,4 +85,4 @@ collectionspace-services-publicitem - + \ No newline at end of file diff --git a/services/query/pom.xml b/services/query/pom.xml index 98c04458a7..a0e04d21bf 100644 --- a/services/query/pom.xml +++ b/services/query/pom.xml @@ -1,5 +1,5 @@ - - + + org.collectionspace.services.main org.collectionspace.services @@ -22,5 +22,4 @@ service - - + \ No newline at end of file diff --git a/services/query/service/pom.xml b/services/query/service/pom.xml index 116181ec58..7291d108c8 100644 --- a/services/query/service/pom.xml +++ b/services/query/service/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.query @@ -47,4 +45,4 @@ collectionspace-services-query - + \ No newline at end of file diff --git a/services/relation/3rdparty/nuxeo-platform-cs-relation/pom.xml b/services/relation/3rdparty/nuxeo-platform-cs-relation/pom.xml index 73f3d9128f..378e57d14c 100644 --- a/services/relation/3rdparty/nuxeo-platform-cs-relation/pom.xml +++ b/services/relation/3rdparty/nuxeo-platform-cs-relation/pom.xml @@ -1,6 +1,5 @@ - + + org.collectionspace.services org.collectionspace.services.relation.3rdparty @@ -39,4 +38,4 @@ - + \ No newline at end of file diff --git a/services/relation/3rdparty/pom.xml b/services/relation/3rdparty/pom.xml index c12d4a95d3..bc9b75ff67 100644 --- a/services/relation/3rdparty/pom.xml +++ b/services/relation/3rdparty/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services.relation org.collectionspace.services @@ -21,4 +19,4 @@ nuxeo-platform-cs-relation - + \ No newline at end of file diff --git a/services/relation/client/pom.xml b/services/relation/client/pom.xml index 96e89ab949..886fd7082c 100644 --- a/services/relation/client/pom.xml +++ b/services/relation/client/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.relation @@ -65,4 +63,4 @@ cspace-services-relation-client - + \ No newline at end of file diff --git a/services/relation/pom.xml b/services/relation/pom.xml index a0f580b440..079e183654 100644 --- a/services/relation/pom.xml +++ b/services/relation/pom.xml @@ -1,5 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.main @@ -18,5 +18,4 @@ client - - + \ No newline at end of file diff --git a/services/relation/service/pom.xml b/services/relation/service/pom.xml index 5477f11faa..d955c9b75a 100644 --- a/services/relation/service/pom.xml +++ b/services/relation/service/pom.xml @@ -1,5 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.relation @@ -117,4 +117,4 @@ collectionspace-services-relation - + \ No newline at end of file diff --git a/services/repatriationrequest/client/pom.xml b/services/repatriationrequest/client/pom.xml index aa3b731c34..8ef4b3e8f6 100644 --- a/services/repatriationrequest/client/pom.xml +++ b/services/repatriationrequest/client/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.repatriationrequest diff --git a/services/repatriationrequest/jaxb/pom.xml b/services/repatriationrequest/jaxb/pom.xml index d61ef620da..3a21920d06 100644 --- a/services/repatriationrequest/jaxb/pom.xml +++ b/services/repatriationrequest/jaxb/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services.repatriationrequest org.collectionspace.services @@ -30,8 +28,8 @@ install - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin diff --git a/services/repatriationrequest/pom.xml b/services/repatriationrequest/pom.xml index 878359b2df..d00f2e45d4 100644 --- a/services/repatriationrequest/pom.xml +++ b/services/repatriationrequest/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.main @@ -32,8 +30,8 @@ src/main/java/**/*.java src/test/java/**/*.java - - + + true 4 @@ -42,7 +40,7 @@ - + diff --git a/services/repatriationrequest/service/pom.xml b/services/repatriationrequest/service/pom.xml index d68c441af7..6dddfa67f7 100644 --- a/services/repatriationrequest/service/pom.xml +++ b/services/repatriationrequest/service/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services diff --git a/services/report/3rdparty/pom.xml b/services/report/3rdparty/pom.xml index cc3bb99312..c192bf2483 100644 --- a/services/report/3rdparty/pom.xml +++ b/services/report/3rdparty/pom.xml @@ -1,6 +1,5 @@ - + + org.collectionspace.services.report org.collectionspace.services @@ -21,4 +20,4 @@ nuxeo-platform-cs-report --> - + \ No newline at end of file diff --git a/services/report/client/pom.xml b/services/report/client/pom.xml index c14b8d6353..90e7bb85f7 100644 --- a/services/report/client/pom.xml +++ b/services/report/client/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.report @@ -80,4 +78,4 @@ collectionspace-services-report-client - + \ No newline at end of file diff --git a/services/report/jaxb/pom.xml b/services/report/jaxb/pom.xml index 6ee0189ac4..c33bf67379 100644 --- a/services/report/jaxb/pom.xml +++ b/services/report/jaxb/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services.report org.collectionspace.services @@ -25,8 +23,8 @@ install - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin org.codehaus.mojo @@ -34,5 +32,4 @@ - - + \ No newline at end of file diff --git a/services/report/pom.xml b/services/report/pom.xml index d0f4baa21b..e1d668d94c 100644 --- a/services/report/pom.xml +++ b/services/report/pom.xml @@ -1,7 +1,5 @@ - - - + + org.collectionspace.services org.collectionspace.services.main @@ -77,4 +75,4 @@ client - + \ No newline at end of file diff --git a/services/report/service/pom.xml b/services/report/service/pom.xml index d8d6ea198e..6a1345f1f9 100644 --- a/services/report/service/pom.xml +++ b/services/report/service/pom.xml @@ -1,5 +1,5 @@ - - + + org.collectionspace.services @@ -113,4 +113,4 @@ collectionspace-services-report - + \ No newline at end of file diff --git a/services/restrictedmedia/client/pom.xml b/services/restrictedmedia/client/pom.xml index 2ccb0db6f1..09b0ea1eff 100644 --- a/services/restrictedmedia/client/pom.xml +++ b/services/restrictedmedia/client/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.restrictedmedia @@ -148,7 +146,7 @@ /static ${project.build.directory}/maven-shared-archive-resources - + jar @@ -166,4 +164,4 @@ - + \ No newline at end of file diff --git a/services/restrictedmedia/jaxb/pom.xml b/services/restrictedmedia/jaxb/pom.xml index b0acaec097..15512161ec 100644 --- a/services/restrictedmedia/jaxb/pom.xml +++ b/services/restrictedmedia/jaxb/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services.restrictedmedia org.collectionspace.services @@ -25,8 +23,8 @@ install - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin diff --git a/services/restrictedmedia/pom.xml b/services/restrictedmedia/pom.xml index 5abd858961..f9ca52d7ff 100644 --- a/services/restrictedmedia/pom.xml +++ b/services/restrictedmedia/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.main @@ -32,8 +30,8 @@ src/main/java/**/*.java src/test/java/**/*.java - - + + true 4 @@ -42,7 +40,7 @@ - + diff --git a/services/restrictedmedia/service/pom.xml b/services/restrictedmedia/service/pom.xml index 6a6530f22d..87682a4120 100644 --- a/services/restrictedmedia/service/pom.xml +++ b/services/restrictedmedia/service/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services @@ -106,4 +104,4 @@ collectionspace-services-restrictedmedia - + \ No newline at end of file diff --git a/services/security/client/pom.xml b/services/security/client/pom.xml index e7dee9f82c..2afc9afea3 100644 --- a/services/security/client/pom.xml +++ b/services/security/client/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services.security org.collectionspace.services @@ -102,4 +100,4 @@ - + \ No newline at end of file diff --git a/services/security/pom.xml b/services/security/pom.xml index 3024eb437a..b8643f8ecd 100644 --- a/services/security/pom.xml +++ b/services/security/pom.xml @@ -1,5 +1,5 @@ - - + + org.collectionspace.services.main org.collectionspace.services @@ -19,5 +19,4 @@ client - - + \ No newline at end of file diff --git a/services/servicegroup/client/pom.xml b/services/servicegroup/client/pom.xml index 14f5d3db5a..83740343ec 100644 --- a/services/servicegroup/client/pom.xml +++ b/services/servicegroup/client/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.servicegroup @@ -60,4 +58,4 @@ collectionspace-services-servicegroup-client - + \ No newline at end of file diff --git a/services/servicegroup/jaxb/pom.xml b/services/servicegroup/jaxb/pom.xml index cc8e9c51a0..14ec929a3c 100644 --- a/services/servicegroup/jaxb/pom.xml +++ b/services/servicegroup/jaxb/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services.servicegroup org.collectionspace.services @@ -26,8 +24,8 @@ install - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin org.codehaus.mojo @@ -35,5 +33,4 @@ - - + \ No newline at end of file diff --git a/services/servicegroup/pom.xml b/services/servicegroup/pom.xml index 0c70968397..b176db7eb6 100644 --- a/services/servicegroup/pom.xml +++ b/services/servicegroup/pom.xml @@ -1,6 +1,5 @@ - - - + + org.collectionspace.services org.collectionspace.services.main @@ -19,5 +18,4 @@ client - - + \ No newline at end of file diff --git a/services/servicegroup/service/pom.xml b/services/servicegroup/service/pom.xml index d4de08fe43..e6f30e3d2f 100644 --- a/services/servicegroup/service/pom.xml +++ b/services/servicegroup/service/pom.xml @@ -1,5 +1,5 @@ - - + + org.collectionspace.services @@ -90,4 +90,4 @@ collectionspace-services-servicegroup - + \ No newline at end of file diff --git a/services/structureddate/client/pom.xml b/services/structureddate/client/pom.xml index 278020446e..ff71b74f77 100644 --- a/services/structureddate/client/pom.xml +++ b/services/structureddate/client/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.structureddate @@ -55,4 +53,4 @@ collectionspace-services-structureddate-client - + \ No newline at end of file diff --git a/services/structureddate/jaxb/pom.xml b/services/structureddate/jaxb/pom.xml index 2518f5bc22..e86b76457b 100644 --- a/services/structureddate/jaxb/pom.xml +++ b/services/structureddate/jaxb/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services.structureddate org.collectionspace.services @@ -25,8 +23,8 @@ install - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin org.codehaus.mojo @@ -34,5 +32,4 @@ - - + \ No newline at end of file diff --git a/services/structureddate/pom.xml b/services/structureddate/pom.xml index 9fc0c517eb..c4f8c92127 100644 --- a/services/structureddate/pom.xml +++ b/services/structureddate/pom.xml @@ -1,5 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.main @@ -18,4 +18,4 @@ service - + \ No newline at end of file diff --git a/services/structureddate/service/pom.xml b/services/structureddate/service/pom.xml index 9e80fa1b1e..1c6274052c 100644 --- a/services/structureddate/service/pom.xml +++ b/services/structureddate/service/pom.xml @@ -1,5 +1,5 @@ - - + + org.collectionspace.services @@ -74,4 +74,4 @@ collectionspace-services-structureddate-service - + \ No newline at end of file diff --git a/services/structureddate/structureddate/pom.xml b/services/structureddate/structureddate/pom.xml index 817ad77ca8..8454460197 100644 --- a/services/structureddate/structureddate/pom.xml +++ b/services/structureddate/structureddate/pom.xml @@ -1,5 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.structureddate @@ -98,4 +98,4 @@ - + \ No newline at end of file diff --git a/services/summarydocumentation/client/pom.xml b/services/summarydocumentation/client/pom.xml index ed83674252..c71e9060b5 100644 --- a/services/summarydocumentation/client/pom.xml +++ b/services/summarydocumentation/client/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.summarydocumentation diff --git a/services/summarydocumentation/jaxb/pom.xml b/services/summarydocumentation/jaxb/pom.xml index 1e27981d80..f66b1ae372 100644 --- a/services/summarydocumentation/jaxb/pom.xml +++ b/services/summarydocumentation/jaxb/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services.summarydocumentation org.collectionspace.services @@ -30,8 +28,8 @@ install - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin diff --git a/services/summarydocumentation/pom.xml b/services/summarydocumentation/pom.xml index 11bb5cef41..084ba2fd5e 100644 --- a/services/summarydocumentation/pom.xml +++ b/services/summarydocumentation/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.main @@ -32,8 +30,8 @@ src/main/java/**/*.java src/test/java/**/*.java - - + + true 4 @@ -42,7 +40,7 @@ - + diff --git a/services/summarydocumentation/service/pom.xml b/services/summarydocumentation/service/pom.xml index e5c5083f19..fe9526a7e7 100644 --- a/services/summarydocumentation/service/pom.xml +++ b/services/summarydocumentation/service/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services @@ -85,4 +83,4 @@ collectionspace-services-summarydocumentation - + \ No newline at end of file diff --git a/services/systeminfo/client/pom.xml b/services/systeminfo/client/pom.xml index 8d200e0fbd..ae9f6166bb 100644 --- a/services/systeminfo/client/pom.xml +++ b/services/systeminfo/client/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.systeminfo @@ -50,4 +48,4 @@ collectionspace-services-systeminfo-client - + \ No newline at end of file diff --git a/services/systeminfo/jaxb/pom.xml b/services/systeminfo/jaxb/pom.xml index 8b91cc996a..4668975efd 100644 --- a/services/systeminfo/jaxb/pom.xml +++ b/services/systeminfo/jaxb/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services.systeminfo org.collectionspace.services @@ -25,8 +23,8 @@ install - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin org.codehaus.mojo @@ -34,5 +32,4 @@ - - + \ No newline at end of file diff --git a/services/systeminfo/pom.xml b/services/systeminfo/pom.xml index ec44dcaf3f..96f480f09d 100644 --- a/services/systeminfo/pom.xml +++ b/services/systeminfo/pom.xml @@ -1,5 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.main @@ -17,4 +17,4 @@ service - + \ No newline at end of file diff --git a/services/systeminfo/service/pom.xml b/services/systeminfo/service/pom.xml index af6c062f7b..05ac0af588 100644 --- a/services/systeminfo/service/pom.xml +++ b/services/systeminfo/service/pom.xml @@ -1,5 +1,5 @@ - - + + org.collectionspace.services @@ -69,4 +69,4 @@ collectionspace-services-systeminfo-service - + \ No newline at end of file diff --git a/services/taxonomy/3rdparty/nuxeo-platform-cs-taxonomy/pom.xml b/services/taxonomy/3rdparty/nuxeo-platform-cs-taxonomy/pom.xml index a99d324deb..46ede63f8e 100644 --- a/services/taxonomy/3rdparty/nuxeo-platform-cs-taxonomy/pom.xml +++ b/services/taxonomy/3rdparty/nuxeo-platform-cs-taxonomy/pom.xml @@ -1,6 +1,5 @@ - + + org.collectionspace.services org.collectionspace.services.taxonomy.3rdparty @@ -40,4 +39,4 @@ - + \ No newline at end of file diff --git a/services/taxonomy/3rdparty/pom.xml b/services/taxonomy/3rdparty/pom.xml index c8eabf2f03..4e9e875626 100644 --- a/services/taxonomy/3rdparty/pom.xml +++ b/services/taxonomy/3rdparty/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.taxonomy @@ -21,4 +19,4 @@ nuxeo-platform-cs-taxonomy --> - + \ No newline at end of file diff --git a/services/taxonomy/client/pom.xml b/services/taxonomy/client/pom.xml index 4f49883c92..f697093ebf 100644 --- a/services/taxonomy/client/pom.xml +++ b/services/taxonomy/client/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.taxonomy @@ -72,4 +70,4 @@ - + \ No newline at end of file diff --git a/services/taxonomy/jaxb/pom.xml b/services/taxonomy/jaxb/pom.xml index e02ca10a63..3ecbab353c 100644 --- a/services/taxonomy/jaxb/pom.xml +++ b/services/taxonomy/jaxb/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.taxonomy @@ -34,8 +32,8 @@ install - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin org.codehaus.mojo @@ -43,5 +41,4 @@ - - + \ No newline at end of file diff --git a/services/taxonomy/pom.xml b/services/taxonomy/pom.xml index 5da79e76b3..e4a2c2bce7 100644 --- a/services/taxonomy/pom.xml +++ b/services/taxonomy/pom.xml @@ -1,6 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.main @@ -30,5 +29,4 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs client - - + \ No newline at end of file diff --git a/services/taxonomy/service/pom.xml b/services/taxonomy/service/pom.xml index 5e63fa43c2..a26044500d 100644 --- a/services/taxonomy/service/pom.xml +++ b/services/taxonomy/service/pom.xml @@ -1,5 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.taxonomy @@ -94,4 +94,4 @@ - + \ No newline at end of file diff --git a/services/transport/3rdparty/nuxeo-platform-cs-transport/pom.xml b/services/transport/3rdparty/nuxeo-platform-cs-transport/pom.xml index c0bcd4a750..4e11ff07bc 100644 --- a/services/transport/3rdparty/nuxeo-platform-cs-transport/pom.xml +++ b/services/transport/3rdparty/nuxeo-platform-cs-transport/pom.xml @@ -1,6 +1,5 @@ - + + org.collectionspace.services @@ -51,4 +50,4 @@ - + \ No newline at end of file diff --git a/services/transport/3rdparty/pom.xml b/services/transport/3rdparty/pom.xml index f3b4d5bfd1..4f84f1c51f 100644 --- a/services/transport/3rdparty/pom.xml +++ b/services/transport/3rdparty/pom.xml @@ -1,6 +1,5 @@ - + + org.collectionspace.services.transport org.collectionspace.services @@ -21,4 +20,4 @@ nuxeo-platform-cs-transport --> - + \ No newline at end of file diff --git a/services/transport/client/pom.xml b/services/transport/client/pom.xml index 4a72870df0..72f114ee5f 100644 --- a/services/transport/client/pom.xml +++ b/services/transport/client/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.transport @@ -78,4 +76,4 @@ collectionspace-services-transport-client - + \ No newline at end of file diff --git a/services/transport/jaxb/pom.xml b/services/transport/jaxb/pom.xml index ba80ae541c..234454af64 100644 --- a/services/transport/jaxb/pom.xml +++ b/services/transport/jaxb/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services.transport org.collectionspace.services @@ -25,9 +23,9 @@ install - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin - + \ No newline at end of file diff --git a/services/transport/pom.xml b/services/transport/pom.xml index 5e348b4534..3879854021 100644 --- a/services/transport/pom.xml +++ b/services/transport/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.main @@ -20,4 +18,4 @@ client - + \ No newline at end of file diff --git a/services/transport/service/pom.xml b/services/transport/service/pom.xml index e5993e1636..cc918a0fc5 100644 --- a/services/transport/service/pom.xml +++ b/services/transport/service/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services @@ -93,4 +91,4 @@ collectionspace-services-transport - + \ No newline at end of file diff --git a/services/uoc/3rdparty/nuxeo-platform-cs-uoc/pom.xml b/services/uoc/3rdparty/nuxeo-platform-cs-uoc/pom.xml index f032a8e094..92f1d0dce5 100644 --- a/services/uoc/3rdparty/nuxeo-platform-cs-uoc/pom.xml +++ b/services/uoc/3rdparty/nuxeo-platform-cs-uoc/pom.xml @@ -1,6 +1,5 @@ - + + org.collectionspace.services @@ -52,4 +51,4 @@ - + \ No newline at end of file diff --git a/services/uoc/3rdparty/pom.xml b/services/uoc/3rdparty/pom.xml index fb55d80466..7d8a411549 100644 --- a/services/uoc/3rdparty/pom.xml +++ b/services/uoc/3rdparty/pom.xml @@ -1,6 +1,5 @@ - + + org.collectionspace.services.uoc org.collectionspace.services @@ -21,4 +20,4 @@ nuxeo-platform-cs-uoc --> - + \ No newline at end of file diff --git a/services/uoc/client/pom.xml b/services/uoc/client/pom.xml index 05e8bd37a1..9ee3c80d05 100644 --- a/services/uoc/client/pom.xml +++ b/services/uoc/client/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.uoc @@ -70,4 +68,4 @@ collectionspace-services-uoc-client - + \ No newline at end of file diff --git a/services/uoc/jaxb/pom.xml b/services/uoc/jaxb/pom.xml index 7da14c652a..4e41395ab0 100644 --- a/services/uoc/jaxb/pom.xml +++ b/services/uoc/jaxb/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services.uoc org.collectionspace.services @@ -25,8 +23,8 @@ install - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin org.codehaus.mojo @@ -34,5 +32,4 @@ - - + \ No newline at end of file diff --git a/services/uoc/pom.xml b/services/uoc/pom.xml index 2317dc90be..05627271ed 100644 --- a/services/uoc/pom.xml +++ b/services/uoc/pom.xml @@ -1,6 +1,5 @@ - - - + + org.collectionspace.services org.collectionspace.services.main @@ -22,5 +21,4 @@ client - - + \ No newline at end of file diff --git a/services/uoc/service/pom.xml b/services/uoc/service/pom.xml index 57c7ad7d8f..dee2cec907 100644 --- a/services/uoc/service/pom.xml +++ b/services/uoc/service/pom.xml @@ -1,5 +1,5 @@ - - + + org.collectionspace.services @@ -86,4 +86,4 @@ collectionspace-services-uoc - + \ No newline at end of file diff --git a/services/valuationcontrol/3rdparty/nuxeo-platform-cs-valuationcontrol/pom.xml b/services/valuationcontrol/3rdparty/nuxeo-platform-cs-valuationcontrol/pom.xml index 149062c077..2d09402303 100644 --- a/services/valuationcontrol/3rdparty/nuxeo-platform-cs-valuationcontrol/pom.xml +++ b/services/valuationcontrol/3rdparty/nuxeo-platform-cs-valuationcontrol/pom.xml @@ -1,6 +1,5 @@ - + + org.collectionspace.services @@ -52,4 +51,4 @@ - + \ No newline at end of file diff --git a/services/valuationcontrol/3rdparty/pom.xml b/services/valuationcontrol/3rdparty/pom.xml index b439f93117..feab2669bf 100644 --- a/services/valuationcontrol/3rdparty/pom.xml +++ b/services/valuationcontrol/3rdparty/pom.xml @@ -1,6 +1,5 @@ - + + org.collectionspace.services.valuationcontrol org.collectionspace.services @@ -21,4 +20,4 @@ nuxeo-platform-cs-valuationcontrol --> - + \ No newline at end of file diff --git a/services/valuationcontrol/client/pom.xml b/services/valuationcontrol/client/pom.xml index 55372ae4b0..ccd34ce447 100644 --- a/services/valuationcontrol/client/pom.xml +++ b/services/valuationcontrol/client/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.valuationcontrol @@ -71,4 +69,4 @@ collectionspace-services-valuationcontrol-client - + \ No newline at end of file diff --git a/services/valuationcontrol/jaxb/pom.xml b/services/valuationcontrol/jaxb/pom.xml index 8aacc9883d..7849e87de5 100644 --- a/services/valuationcontrol/jaxb/pom.xml +++ b/services/valuationcontrol/jaxb/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services.valuationcontrol org.collectionspace.services @@ -26,8 +24,8 @@ install - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin org.codehaus.mojo @@ -35,4 +33,4 @@ - + \ No newline at end of file diff --git a/services/valuationcontrol/pom.xml b/services/valuationcontrol/pom.xml index c53b692905..124012e9ec 100644 --- a/services/valuationcontrol/pom.xml +++ b/services/valuationcontrol/pom.xml @@ -1,6 +1,5 @@ - - - + + org.collectionspace.services org.collectionspace.services.main @@ -20,4 +19,4 @@ client - + \ No newline at end of file diff --git a/services/valuationcontrol/service/pom.xml b/services/valuationcontrol/service/pom.xml index 08c50c5e41..6577c2bc0b 100644 --- a/services/valuationcontrol/service/pom.xml +++ b/services/valuationcontrol/service/pom.xml @@ -1,5 +1,5 @@ - - + + org.collectionspace.services @@ -85,4 +85,4 @@ collectionspace-services-valuationcontrol - + \ No newline at end of file diff --git a/services/vocabulary/3rdparty/nuxeo-platform-cs-vocabulary/pom.xml b/services/vocabulary/3rdparty/nuxeo-platform-cs-vocabulary/pom.xml index c34e87cfd7..71d151d8d0 100644 --- a/services/vocabulary/3rdparty/nuxeo-platform-cs-vocabulary/pom.xml +++ b/services/vocabulary/3rdparty/nuxeo-platform-cs-vocabulary/pom.xml @@ -1,6 +1,5 @@ - + + org.collectionspace.services org.collectionspace.services.vocabulary.3rdparty @@ -40,4 +39,4 @@ - + \ No newline at end of file diff --git a/services/vocabulary/3rdparty/pom.xml b/services/vocabulary/3rdparty/pom.xml index a6452195af..1b870848eb 100644 --- a/services/vocabulary/3rdparty/pom.xml +++ b/services/vocabulary/3rdparty/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.vocabulary @@ -21,4 +19,4 @@ nuxeo-platform-cs-vocabulary --> - + \ No newline at end of file diff --git a/services/vocabulary/client/pom.xml b/services/vocabulary/client/pom.xml index 88bfddf698..506aa09b35 100644 --- a/services/vocabulary/client/pom.xml +++ b/services/vocabulary/client/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services @@ -62,4 +60,4 @@ collectionspace-services-vocabulary-client - + \ No newline at end of file diff --git a/services/vocabulary/jaxb/pom.xml b/services/vocabulary/jaxb/pom.xml index 7f96d589c2..47cd5ce758 100644 --- a/services/vocabulary/jaxb/pom.xml +++ b/services/vocabulary/jaxb/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.vocabulary @@ -30,8 +28,8 @@ install - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin org.codehaus.mojo @@ -39,5 +37,4 @@ - - + \ No newline at end of file diff --git a/services/vocabulary/pom.xml b/services/vocabulary/pom.xml index 31f800daf3..a7c879cbed 100644 --- a/services/vocabulary/pom.xml +++ b/services/vocabulary/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services.main org.collectionspace.services @@ -21,5 +19,4 @@ client - - + \ No newline at end of file diff --git a/services/vocabulary/service/pom.xml b/services/vocabulary/service/pom.xml index 6b13d244df..5df87da6da 100644 --- a/services/vocabulary/service/pom.xml +++ b/services/vocabulary/service/pom.xml @@ -1,5 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.vocabulary @@ -98,4 +98,4 @@ collectionspace-services-vocabulary - + \ No newline at end of file diff --git a/services/work/3rdparty/nuxeo-platform-cs-work/pom.xml b/services/work/3rdparty/nuxeo-platform-cs-work/pom.xml index 4c92932f55..3dc97ea27d 100644 --- a/services/work/3rdparty/nuxeo-platform-cs-work/pom.xml +++ b/services/work/3rdparty/nuxeo-platform-cs-work/pom.xml @@ -1,6 +1,5 @@ - + + org.collectionspace.services org.collectionspace.services.work.3rdparty @@ -39,4 +38,4 @@ - + \ No newline at end of file diff --git a/services/work/3rdparty/pom.xml b/services/work/3rdparty/pom.xml index 969ec7e21a..b4924ebcd5 100644 --- a/services/work/3rdparty/pom.xml +++ b/services/work/3rdparty/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.work @@ -21,4 +19,4 @@ nuxeo-platform-cs-work --> - + \ No newline at end of file diff --git a/services/work/client/pom.xml b/services/work/client/pom.xml index 1755a5ff05..5f6b2157fe 100644 --- a/services/work/client/pom.xml +++ b/services/work/client/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.work @@ -66,4 +64,4 @@ collectionspace-services-work-client - + \ No newline at end of file diff --git a/services/work/jaxb/pom.xml b/services/work/jaxb/pom.xml index 487c989c23..bb6337c842 100644 --- a/services/work/jaxb/pom.xml +++ b/services/work/jaxb/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.work @@ -17,10 +15,7 @@ org.collectionspace.services org.collectionspace.services.common - - com.sun.xml.bind - jaxb-core - + org.collectionspace.services org.collectionspace.services.jaxb @@ -39,8 +34,8 @@ install - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin org.codehaus.mojo @@ -48,4 +43,4 @@ - + \ No newline at end of file diff --git a/services/work/pom.xml b/services/work/pom.xml index fa8b939d82..2832ee2e44 100644 --- a/services/work/pom.xml +++ b/services/work/pom.xml @@ -1,5 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.main @@ -28,5 +28,4 @@ client - - + \ No newline at end of file diff --git a/services/work/service/pom.xml b/services/work/service/pom.xml index 6f43e809b1..45ba04d741 100644 --- a/services/work/service/pom.xml +++ b/services/work/service/pom.xml @@ -1,5 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.work @@ -109,4 +109,4 @@ collectionspace-services-work - + \ No newline at end of file diff --git a/services/workflow/3rdparty/nuxeo-platform-cs-workflow/pom.xml b/services/workflow/3rdparty/nuxeo-platform-cs-workflow/pom.xml index 5dc425579d..0695840878 100644 --- a/services/workflow/3rdparty/nuxeo-platform-cs-workflow/pom.xml +++ b/services/workflow/3rdparty/nuxeo-platform-cs-workflow/pom.xml @@ -1,6 +1,5 @@ - + + 4.0.0 org.collectionspace.services @@ -39,4 +38,4 @@ - + \ No newline at end of file diff --git a/services/workflow/3rdparty/pom.xml b/services/workflow/3rdparty/pom.xml index 1f24dc016d..584f819994 100644 --- a/services/workflow/3rdparty/pom.xml +++ b/services/workflow/3rdparty/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services.workflow org.collectionspace.services @@ -20,4 +18,4 @@ nuxeo-platform-cs-workflow - + \ No newline at end of file diff --git a/services/workflow/client/pom.xml b/services/workflow/client/pom.xml index e4c171da45..ad314ee79a 100644 --- a/services/workflow/client/pom.xml +++ b/services/workflow/client/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.workflow @@ -60,4 +58,4 @@ collectionspace-services-workflow-client - + \ No newline at end of file diff --git a/services/workflow/jaxb/pom.xml b/services/workflow/jaxb/pom.xml index a477e6518a..172e5e3fd4 100644 --- a/services/workflow/jaxb/pom.xml +++ b/services/workflow/jaxb/pom.xml @@ -1,7 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.workflow @@ -25,8 +23,8 @@ install - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin org.codehaus.mojo @@ -34,5 +32,4 @@ - - + \ No newline at end of file diff --git a/services/workflow/pom.xml b/services/workflow/pom.xml index eebcab4881..11d58a2f7b 100644 --- a/services/workflow/pom.xml +++ b/services/workflow/pom.xml @@ -1,6 +1,5 @@ - - - + + org.collectionspace.services org.collectionspace.services.main @@ -18,5 +17,4 @@ service - - + \ No newline at end of file diff --git a/services/workflow/service/pom.xml b/services/workflow/service/pom.xml index 41065d72dd..037a4118cc 100644 --- a/services/workflow/service/pom.xml +++ b/services/workflow/service/pom.xml @@ -1,5 +1,5 @@ - - + + org.collectionspace.services @@ -78,4 +78,4 @@ collectionspace-services-workflow - + \ No newline at end of file From 17c3106578029c27d131f4a5699044de8fa66086 Mon Sep 17 00:00:00 2001 From: Michael Ritter Date: Mon, 23 Feb 2026 16:59:16 -0700 Subject: [PATCH 04/24] Revert some formatting changes --- .../nuxeo-platform-collectionspace/pom.xml | 9 ++-- .../nuxeo-platform-elasticsearch/pom.xml | 8 +-- .../naturalhistory/pom.xml | 8 +-- .../nuxeo/nuxeo-platform-listener/pom.xml | 6 +-- .../nuxeo-platform-listener/reindex/pom.xml | 8 +-- .../tenants/botgarden/pom.xml | 8 +-- .../nuxeo-platform-listener/tenants/pom.xml | 6 +-- .../updateimagederivatives/pom.xml | 8 +-- .../updateobjectlocationonmove/pom.xml | 8 +-- .../updaterelationsondelete/pom.xml | 8 +-- .../nuxeo/nuxeo-platform-quote-api/pom.xml | 7 +-- 3rdparty/nuxeo/nuxeo-platform-quote/pom.xml | 6 +-- .../nuxeo/nuxeo-platform-thumbnail/pom.xml | 8 +-- .../nuxeo-server/7.10-HF17/bundles/pom.xml | 5 +- 3rdparty/nuxeo/nuxeo-server/pom.xml | 8 +-- 3rdparty/nuxeo/pom.xml | 7 +-- 3rdparty/pom.xml | 6 +-- common-lib/pom.xml | 8 +-- pom.xml | 50 ++++++++++++------- services/IntegrationTests/pom.xml | 6 +-- services/JaxRsServiceProvider/pom.xml | 6 +-- services/PerformanceTests/pom.xml | 6 +-- services/account/client/pom.xml | 8 +-- services/account/jaxb/pom.xml | 9 ++-- services/account/pom.xml | 7 +-- services/account/pstore/pom.xml | 15 +++--- services/account/service/pom.xml | 6 +-- .../nuxeo-platform-cs-acquisition/pom.xml | 10 ++-- services/acquisition/3rdparty/pom.xml | 8 +-- services/acquisition/client/pom.xml | 8 +-- services/acquisition/jaxb/pom.xml | 9 ++-- services/acquisition/pom.xml | 8 +-- services/acquisition/service/pom.xml | 7 +-- services/advancedsearch/client/pom.xml | 6 ++- services/advancedsearch/jaxb/pom.xml | 6 ++- services/advancedsearch/pom.xml | 12 +++-- services/advancedsearch/service/pom.xml | 8 +-- services/authentication/client/pom.xml | 8 +-- services/authentication/jaxb/pom.xml | 9 ++-- services/authentication/pom.xml | 7 +-- services/authentication/pstore/pom.xml | 9 ++-- services/authentication/service/pom.xml | 6 +-- services/authority/jaxb/pom.xml | 6 ++- services/authority/pom.xml | 8 +-- services/authority/service/pom.xml | 7 +-- services/authorization-common/pom.xml | 6 +-- services/authorization-mgt/client/pom.xml | 8 +-- services/authorization-mgt/import/pom.xml | 7 +-- services/authorization-mgt/jaxb/pom.xml | 9 ++-- services/authorization-mgt/pom.xml | 6 +-- services/authorization-mgt/service/pom.xml | 6 +-- services/authorization/jaxb/pom.xml | 4 +- services/authorization/pom.xml | 8 +-- services/authorization/pstore/pom.xml | 10 ++-- services/authorization/service/pom.xml | 8 +-- .../3rdparty/nuxeo-platform-cs-batch/pom.xml | 7 +-- services/batch/3rdparty/pom.xml | 8 +-- services/batch/client/pom.xml | 8 +-- services/batch/jaxb/pom.xml | 9 ++-- services/batch/pom.xml | 8 +-- services/batch/service/pom.xml | 6 +-- .../3rdparty/nuxeo-platform-cs-blob/pom.xml | 7 +-- services/blob/3rdparty/pom.xml | 8 +-- services/blob/blob-test-utils/pom.xml | 8 +-- services/blob/client/pom.xml | 10 ++-- services/blob/jaxb/pom.xml | 9 ++-- services/blob/pom.xml | 7 +-- services/blob/service/pom.xml | 7 +-- services/chronology/client/pom.xml | 8 +-- services/chronology/jaxb/pom.xml | 6 ++- services/chronology/pom.xml | 7 +-- services/chronology/service/pom.xml | 7 +-- .../nuxeo-platform-cs-citation/pom.xml | 7 +-- services/citation/3rdparty/pom.xml | 8 +-- services/citation/client/pom.xml | 8 +-- services/citation/jaxb/pom.xml | 9 ++-- services/citation/pom.xml | 7 +-- services/citation/service/pom.xml | 6 +-- .../3rdparty/nuxeo-platform-cs-claim/pom.xml | 7 +-- services/claim/3rdparty/pom.xml | 8 +-- services/claim/client/pom.xml | 8 +-- services/claim/jaxb/pom.xml | 9 ++-- services/claim/pom.xml | 8 +-- services/claim/service/pom.xml | 6 +-- services/client/pom.xml | 6 +-- .../pom.xml | 9 ++-- .../pom.xml | 7 +-- services/collectionobject/3rdparty/pom.xml | 8 +-- services/collectionobject/client/pom.xml | 8 +-- services/collectionobject/jaxb/pom.xml | 9 ++-- services/collectionobject/pom.xml | 7 +-- services/collectionobject/service/pom.xml | 6 +-- services/common-api/pom.xml | 6 +-- services/common-test/pom.xml | 8 +-- services/common/pom.xml | 7 +-- .../nuxeo-platform-cs-concept/pom.xml | 7 +-- services/concept/3rdparty/pom.xml | 8 +-- services/concept/client/pom.xml | 8 +-- services/concept/jaxb/pom.xml | 9 ++-- services/concept/pom.xml | 7 +-- services/concept/service/pom.xml | 6 +-- .../nuxeo-platform-cs-conditioncheck/pom.xml | 7 +-- services/conditioncheck/3rdparty/pom.xml | 7 +-- services/conditioncheck/client/pom.xml | 8 +-- services/conditioncheck/jaxb/pom.xml | 8 +-- services/conditioncheck/pom.xml | 7 +-- services/conditioncheck/service/pom.xml | 6 +-- services/config/pom.xml | 6 +-- .../nuxeo-platform-cs-conservation/pom.xml | 8 +-- services/conservation/3rdparty/pom.xml | 8 +-- services/conservation/client/pom.xml | 8 +-- services/conservation/jaxb/pom.xml | 9 ++-- services/conservation/pom.xml | 8 +-- services/conservation/service/pom.xml | 6 +-- services/consultation/client/pom.xml | 6 ++- services/consultation/jaxb/pom.xml | 6 ++- services/consultation/pom.xml | 12 +++-- services/consultation/service/pom.xml | 8 +-- .../nuxeo-platform-cs-contact/pom.xml | 7 +-- services/contact/3rdparty/pom.xml | 8 +-- services/contact/client/pom.xml | 8 +-- services/contact/jaxb/pom.xml | 9 ++-- services/contact/pom.xml | 8 +-- services/contact/service/pom.xml | 6 +-- services/deaccession/client/pom.xml | 6 ++- services/deaccession/jaxb/pom.xml | 6 ++- services/deaccession/pom.xml | 12 +++-- services/deaccession/service/pom.xml | 8 +-- .../nuxeo-platform-cs-dimension/pom.xml | 7 +-- services/dimension/3rdparty/pom.xml | 8 +-- services/dimension/client/pom.xml | 8 +-- services/dimension/jaxb/pom.xml | 9 ++-- services/dimension/pom.xml | 7 +-- services/dimension/service/pom.xml | 6 +-- services/dutyofcare/client/pom.xml | 8 +-- services/dutyofcare/jaxb/pom.xml | 6 ++- services/dutyofcare/pom.xml | 9 ++-- services/dutyofcare/service/pom.xml | 7 +-- .../nuxeo-platform-cs-exhibition/pom.xml | 7 +-- services/exhibition/3rdparty/pom.xml | 7 +-- services/exhibition/client/pom.xml | 8 +-- services/exhibition/jaxb/pom.xml | 8 +-- services/exhibition/pom.xml | 7 +-- services/exhibition/service/pom.xml | 6 +-- services/exit/client/pom.xml | 8 +-- services/exit/jaxb/pom.xml | 6 ++- services/exit/pom.xml | 14 +++--- services/exit/service/pom.xml | 8 +-- services/export/client/pom.xml | 8 +-- services/export/jaxb/pom.xml | 6 ++- services/export/pom.xml | 8 +-- services/export/service/pom.xml | 6 +-- .../3rdparty/nuxeo-platform-cs-group/pom.xml | 7 +-- services/group/3rdparty/pom.xml | 8 +-- services/group/client/pom.xml | 8 +-- services/group/jaxb/pom.xml | 9 ++-- services/group/pom.xml | 8 +-- services/group/service/pom.xml | 6 +-- services/heldintrust/client/pom.xml | 6 ++- services/heldintrust/jaxb/pom.xml | 6 ++- services/heldintrust/pom.xml | 12 +++-- services/heldintrust/service/pom.xml | 8 +-- services/hyperjaxb/pom.xml | 36 ++++++++++--- services/id/3rdparty/pom.xml | 27 ++++++++-- services/id/client/pom.xml | 9 ++-- services/id/jaxb/pom.xml | 29 +++++++++-- services/id/pom.xml | 26 ++++++++-- services/id/service/pom.xml | 25 ++++++++-- .../nuxeo-platform-cs-imports/pom.xml | 7 +-- services/imports/3rdparty/pom.xml | 8 +-- services/imports/jaxb/pom.xml | 9 ++-- services/imports/pom.xml | 8 +-- services/imports/service/pom.xml | 6 +-- .../3rdparty/nuxeo-platform-cs-index/pom.xml | 7 +-- services/index/3rdparty/pom.xml | 7 +-- services/index/client/pom.xml | 8 +-- services/index/jaxb/pom.xml | 9 ++-- services/index/pom.xml | 8 +-- services/index/service/pom.xml | 6 +-- .../nuxeo-platform-cs-insurance/pom.xml | 7 +-- services/insurance/3rdparty/pom.xml | 7 +-- services/insurance/client/pom.xml | 8 +-- services/insurance/jaxb/pom.xml | 6 ++- services/insurance/pom.xml | 6 +-- services/insurance/service/pom.xml | 6 +-- .../3rdparty/nuxeo-platform-cs-intake/pom.xml | 8 +-- services/intake/3rdparty/pom.xml | 8 +-- services/intake/client/pom.xml | 8 +-- services/intake/jaxb/pom.xml | 9 ++-- services/intake/pom.xml | 8 +-- services/intake/service/pom.xml | 6 +-- services/iterationreport/client/pom.xml | 8 +-- services/iterationreport/jaxb/pom.xml | 2 +- services/iterationreport/pom.xml | 6 +-- services/iterationreport/service/pom.xml | 6 +-- services/jaxb/pom.xml | 17 +++++-- .../3rdparty/nuxeo-platform-cs-loanin/pom.xml | 8 +-- services/loanin/3rdparty/pom.xml | 8 +-- services/loanin/client/pom.xml | 8 +-- services/loanin/jaxb/pom.xml | 9 ++-- services/loanin/pom.xml | 8 +-- services/loanin/service/pom.xml | 6 +-- .../nuxeo-platform-cs-loanout/pom.xml | 8 +-- services/loanout/3rdparty/pom.xml | 8 +-- services/loanout/client/pom.xml | 8 +-- services/loanout/jaxb/pom.xml | 9 ++-- services/loanout/pom.xml | 8 +-- services/loanout/service/pom.xml | 6 +-- .../nuxeo-platform-cs-location/pom.xml | 7 +-- services/location/3rdparty/pom.xml | 7 +-- services/location/client/pom.xml | 8 +-- services/location/jaxb/pom.xml | 9 ++-- services/location/pom.xml | 7 +-- services/location/service/pom.xml | 6 +-- services/login/client/pom.xml | 8 +-- services/login/pom.xml | 6 +-- services/login/service/pom.xml | 6 +-- services/logout/client/pom.xml | 8 +-- services/logout/pom.xml | 6 +-- services/logout/service/pom.xml | 6 +-- .../nuxeo-platform-cs-material/pom.xml | 7 +-- services/material/3rdparty/pom.xml | 8 +-- services/material/client/pom.xml | 8 +-- services/material/jaxb/pom.xml | 9 ++-- services/material/pom.xml | 7 +-- services/material/service/pom.xml | 6 +-- .../3rdparty/nuxeo-platform-cs-media/pom.xml | 8 +-- services/media/3rdparty/pom.xml | 7 +-- services/media/client/pom.xml | 10 ++-- services/media/jaxb/pom.xml | 9 ++-- services/media/pom.xml | 8 +-- services/media/service/pom.xml | 6 +-- .../nuxeo-platform-cs-movement/pom.xml | 7 +-- services/movement/3rdparty/pom.xml | 8 +-- services/movement/client/pom.xml | 8 +-- services/movement/jaxb/pom.xml | 9 ++-- services/movement/pom.xml | 8 +-- services/movement/service/pom.xml | 6 +-- services/nagpra-jaxb/pom.xml | 6 ++- services/nagprainventory/client/pom.xml | 6 ++- services/nagprainventory/jaxb/pom.xml | 8 +-- services/nagprainventory/pom.xml | 10 ++-- services/nagprainventory/service/pom.xml | 8 +-- .../3rdparty/nuxeo-platform-cs-note/pom.xml | 7 +-- services/note/3rdparty/pom.xml | 8 +-- services/note/client/pom.xml | 8 +-- services/note/jaxb/pom.xml | 9 ++-- services/note/pom.xml | 8 +-- services/note/service/pom.xml | 6 +-- .../nuxeo-platform-cs-objectexit/pom.xml | 7 +-- services/objectexit/3rdparty/pom.xml | 8 +-- services/objectexit/client/pom.xml | 8 +-- services/objectexit/jaxb/pom.xml | 9 ++-- services/objectexit/pom.xml | 8 +-- services/objectexit/service/pom.xml | 6 +-- .../nuxeo-platform-cs-organization/pom.xml | 7 +-- services/organization/3rdparty/pom.xml | 7 +-- services/organization/client/pom.xml | 8 +-- services/organization/jaxb/pom.xml | 8 +-- services/organization/pom.xml | 7 +-- services/organization/service/pom.xml | 6 +-- .../nuxeo-platform-cs-osteology/pom.xml | 7 +-- services/osteology/3rdparty/pom.xml | 7 +-- services/osteology/client/pom.xml | 8 +-- services/osteology/jaxb/pom.xml | 8 +-- services/osteology/pom.xml | 7 +-- services/osteology/service/pom.xml | 6 +-- .../3rdparty/nuxeo-platform-cs-person/pom.xml | 7 +-- .../nuxeo-platform-person-testsci/pom.xml | 9 ++-- services/person/3rdparty/pom.xml | 8 +-- services/person/client/pom.xml | 8 +-- services/person/jaxb/pom.xml | 9 ++-- services/person/pom.xml | 7 +-- services/person/service/pom.xml | 6 +-- .../3rdparty/nuxeo-platform-cs-place/pom.xml | 7 +-- services/place/3rdparty/pom.xml | 8 +-- services/place/client/pom.xml | 8 +-- services/place/jaxb/pom.xml | 8 +-- services/place/pom.xml | 7 +-- services/place/service/pom.xml | 6 +-- services/pom.xml | 7 +-- .../3rdparty/nuxeo-platform-cs-pottag/pom.xml | 8 +-- services/pottag/3rdparty/pom.xml | 8 +-- services/pottag/client/pom.xml | 8 +-- services/pottag/jaxb/pom.xml | 9 ++-- services/pottag/pom.xml | 8 +-- services/pottag/service/pom.xml | 6 +-- .../nuxeo-platform-cs-propagation/pom.xml | 8 +-- services/propagation/3rdparty/pom.xml | 8 +-- services/propagation/client/pom.xml | 8 +-- services/propagation/jaxb/pom.xml | 9 ++-- services/propagation/pom.xml | 8 +-- services/propagation/service/pom.xml | 6 +-- .../nuxeo-platform-cs-publicitem/pom.xml | 7 +-- services/publicitem/3rdparty/pom.xml | 8 +-- services/publicitem/client/pom.xml | 8 +-- services/publicitem/jaxb/pom.xml | 9 ++-- services/publicitem/pom.xml | 8 +-- services/publicitem/service/pom.xml | 6 +-- services/query/pom.xml | 7 +-- services/query/service/pom.xml | 8 +-- .../nuxeo-platform-cs-relation/pom.xml | 7 +-- services/relation/3rdparty/pom.xml | 8 +-- services/relation/client/pom.xml | 8 +-- services/relation/pom.xml | 7 +-- services/relation/service/pom.xml | 6 +-- services/repatriationrequest/client/pom.xml | 6 ++- services/repatriationrequest/jaxb/pom.xml | 6 ++- services/repatriationrequest/pom.xml | 12 +++-- services/repatriationrequest/service/pom.xml | 6 ++- services/report/3rdparty/pom.xml | 7 +-- services/report/client/pom.xml | 8 +-- services/report/jaxb/pom.xml | 9 ++-- services/report/pom.xml | 8 +-- services/report/service/pom.xml | 6 +-- services/restrictedmedia/client/pom.xml | 10 ++-- services/restrictedmedia/jaxb/pom.xml | 8 +-- services/restrictedmedia/pom.xml | 10 ++-- services/restrictedmedia/service/pom.xml | 8 +-- services/security/client/pom.xml | 8 +-- services/security/pom.xml | 7 +-- services/servicegroup/client/pom.xml | 8 +-- services/servicegroup/jaxb/pom.xml | 9 ++-- services/servicegroup/pom.xml | 8 +-- services/servicegroup/service/pom.xml | 6 +-- services/structureddate/client/pom.xml | 8 +-- services/structureddate/jaxb/pom.xml | 9 ++-- services/structureddate/pom.xml | 6 +-- services/structureddate/service/pom.xml | 6 +-- .../structureddate/structureddate/pom.xml | 6 +-- services/summarydocumentation/client/pom.xml | 6 ++- services/summarydocumentation/jaxb/pom.xml | 6 ++- services/summarydocumentation/pom.xml | 12 +++-- services/summarydocumentation/service/pom.xml | 8 +-- services/systeminfo/client/pom.xml | 8 +-- services/systeminfo/jaxb/pom.xml | 9 ++-- services/systeminfo/pom.xml | 6 +-- services/systeminfo/service/pom.xml | 6 +-- .../nuxeo-platform-cs-taxonomy/pom.xml | 7 +-- services/taxonomy/3rdparty/pom.xml | 8 +-- services/taxonomy/client/pom.xml | 8 +-- services/taxonomy/jaxb/pom.xml | 9 ++-- services/taxonomy/pom.xml | 8 +-- services/taxonomy/service/pom.xml | 6 +-- .../nuxeo-platform-cs-transport/pom.xml | 7 +-- services/transport/3rdparty/pom.xml | 7 +-- services/transport/client/pom.xml | 8 +-- services/transport/jaxb/pom.xml | 6 ++- services/transport/pom.xml | 8 +-- services/transport/service/pom.xml | 8 +-- .../3rdparty/nuxeo-platform-cs-uoc/pom.xml | 7 +-- services/uoc/3rdparty/pom.xml | 7 +-- services/uoc/client/pom.xml | 8 +-- services/uoc/jaxb/pom.xml | 9 ++-- services/uoc/pom.xml | 8 +-- services/uoc/service/pom.xml | 6 +-- .../pom.xml | 7 +-- services/valuationcontrol/3rdparty/pom.xml | 7 +-- services/valuationcontrol/client/pom.xml | 8 +-- services/valuationcontrol/jaxb/pom.xml | 8 +-- services/valuationcontrol/pom.xml | 7 +-- services/valuationcontrol/service/pom.xml | 6 +-- .../nuxeo-platform-cs-vocabulary/pom.xml | 7 +-- services/vocabulary/3rdparty/pom.xml | 8 +-- services/vocabulary/client/pom.xml | 8 +-- services/vocabulary/jaxb/pom.xml | 9 ++-- services/vocabulary/pom.xml | 9 ++-- services/vocabulary/service/pom.xml | 6 +-- .../3rdparty/nuxeo-platform-cs-work/pom.xml | 7 +-- services/work/3rdparty/pom.xml | 8 +-- services/work/client/pom.xml | 8 +-- services/work/jaxb/pom.xml | 8 +-- services/work/pom.xml | 7 +-- services/work/service/pom.xml | 6 +-- .../nuxeo-platform-cs-workflow/pom.xml | 7 +-- services/workflow/3rdparty/pom.xml | 8 +-- services/workflow/client/pom.xml | 8 +-- services/workflow/jaxb/pom.xml | 9 ++-- services/workflow/pom.xml | 8 +-- services/workflow/service/pom.xml | 6 +-- 380 files changed, 1860 insertions(+), 1163 deletions(-) diff --git a/3rdparty/nuxeo/nuxeo-platform-collectionspace/pom.xml b/3rdparty/nuxeo/nuxeo-platform-collectionspace/pom.xml index 51448b9090..e393ad5ae9 100644 --- a/3rdparty/nuxeo/nuxeo-platform-collectionspace/pom.xml +++ b/3rdparty/nuxeo/nuxeo-platform-collectionspace/pom.xml @@ -1,5 +1,6 @@ - - + org.collectionspace.services @@ -18,7 +19,7 @@ mvn clean install -Dcspace.im.root='etc/' --> - + @@ -47,4 +48,4 @@ - \ No newline at end of file + diff --git a/3rdparty/nuxeo/nuxeo-platform-elasticsearch/pom.xml b/3rdparty/nuxeo/nuxeo-platform-elasticsearch/pom.xml index 996b571a05..f32a31cc29 100644 --- a/3rdparty/nuxeo/nuxeo-platform-elasticsearch/pom.xml +++ b/3rdparty/nuxeo/nuxeo-platform-elasticsearch/pom.xml @@ -1,5 +1,7 @@ - - + + 4.0.0 org.collectionspace.services.3rdparty.nuxeo @@ -58,4 +60,4 @@ - \ No newline at end of file + diff --git a/3rdparty/nuxeo/nuxeo-platform-listener/naturalhistory/pom.xml b/3rdparty/nuxeo/nuxeo-platform-listener/naturalhistory/pom.xml index 195c172703..e441c1940b 100644 --- a/3rdparty/nuxeo/nuxeo-platform-listener/naturalhistory/pom.xml +++ b/3rdparty/nuxeo/nuxeo-platform-listener/naturalhistory/pom.xml @@ -1,5 +1,7 @@ - - + + 4.0.0 org.collectionspace.services.3rdparty.nuxeo.listener @@ -56,4 +58,4 @@ - \ No newline at end of file + diff --git a/3rdparty/nuxeo/nuxeo-platform-listener/pom.xml b/3rdparty/nuxeo/nuxeo-platform-listener/pom.xml index 022a672514..4d32c0ddf3 100644 --- a/3rdparty/nuxeo/nuxeo-platform-listener/pom.xml +++ b/3rdparty/nuxeo/nuxeo-platform-listener/pom.xml @@ -1,5 +1,5 @@ - - + + org.collectionspace.services @@ -44,4 +44,4 @@ - \ No newline at end of file + diff --git a/3rdparty/nuxeo/nuxeo-platform-listener/reindex/pom.xml b/3rdparty/nuxeo/nuxeo-platform-listener/reindex/pom.xml index fd882556e6..393aec045f 100644 --- a/3rdparty/nuxeo/nuxeo-platform-listener/reindex/pom.xml +++ b/3rdparty/nuxeo/nuxeo-platform-listener/reindex/pom.xml @@ -1,5 +1,7 @@ - - + + 4.0.0 org.collectionspace.services.3rdparty.nuxeo.listener @@ -46,4 +48,4 @@ - \ No newline at end of file + diff --git a/3rdparty/nuxeo/nuxeo-platform-listener/tenants/botgarden/pom.xml b/3rdparty/nuxeo/nuxeo-platform-listener/tenants/botgarden/pom.xml index c45d1c996c..d632e1e604 100644 --- a/3rdparty/nuxeo/nuxeo-platform-listener/tenants/botgarden/pom.xml +++ b/3rdparty/nuxeo/nuxeo-platform-listener/tenants/botgarden/pom.xml @@ -1,5 +1,7 @@ - - + + 4.0.0 org.collectionspace.services.3rdparty.nuxeo.listener.tenants @@ -67,4 +69,4 @@ - \ No newline at end of file + diff --git a/3rdparty/nuxeo/nuxeo-platform-listener/tenants/pom.xml b/3rdparty/nuxeo/nuxeo-platform-listener/tenants/pom.xml index ddfb153dd4..3d7de3cda0 100644 --- a/3rdparty/nuxeo/nuxeo-platform-listener/tenants/pom.xml +++ b/3rdparty/nuxeo/nuxeo-platform-listener/tenants/pom.xml @@ -1,5 +1,5 @@ - - + + org.collectionspace.services @@ -39,4 +39,4 @@ - \ No newline at end of file + diff --git a/3rdparty/nuxeo/nuxeo-platform-listener/updateimagederivatives/pom.xml b/3rdparty/nuxeo/nuxeo-platform-listener/updateimagederivatives/pom.xml index e55b4c7570..c818a6ae24 100644 --- a/3rdparty/nuxeo/nuxeo-platform-listener/updateimagederivatives/pom.xml +++ b/3rdparty/nuxeo/nuxeo-platform-listener/updateimagederivatives/pom.xml @@ -1,5 +1,7 @@ - - + + 4.0.0 org.collectionspace.services.3rdparty.nuxeo.listener @@ -56,4 +58,4 @@ - \ No newline at end of file + diff --git a/3rdparty/nuxeo/nuxeo-platform-listener/updateobjectlocationonmove/pom.xml b/3rdparty/nuxeo/nuxeo-platform-listener/updateobjectlocationonmove/pom.xml index 2d9791d4a7..658beec7a8 100644 --- a/3rdparty/nuxeo/nuxeo-platform-listener/updateobjectlocationonmove/pom.xml +++ b/3rdparty/nuxeo/nuxeo-platform-listener/updateobjectlocationonmove/pom.xml @@ -1,5 +1,7 @@ - - + + 4.0.0 org.collectionspace.services.3rdparty.nuxeo.listener @@ -66,4 +68,4 @@ - \ No newline at end of file + diff --git a/3rdparty/nuxeo/nuxeo-platform-listener/updaterelationsondelete/pom.xml b/3rdparty/nuxeo/nuxeo-platform-listener/updaterelationsondelete/pom.xml index abac1b9449..63c453de06 100644 --- a/3rdparty/nuxeo/nuxeo-platform-listener/updaterelationsondelete/pom.xml +++ b/3rdparty/nuxeo/nuxeo-platform-listener/updaterelationsondelete/pom.xml @@ -1,5 +1,7 @@ - - + + 4.0.0 org.collectionspace.services.3rdparty.nuxeo.listener @@ -51,4 +53,4 @@ - \ No newline at end of file + diff --git a/3rdparty/nuxeo/nuxeo-platform-quote-api/pom.xml b/3rdparty/nuxeo/nuxeo-platform-quote-api/pom.xml index 7058e0787e..a06e4511db 100644 --- a/3rdparty/nuxeo/nuxeo-platform-quote-api/pom.xml +++ b/3rdparty/nuxeo/nuxeo-platform-quote-api/pom.xml @@ -1,5 +1,6 @@ - - + 4.0.0 org.collectionspace.services @@ -46,4 +47,4 @@ - \ No newline at end of file + diff --git a/3rdparty/nuxeo/nuxeo-platform-quote/pom.xml b/3rdparty/nuxeo/nuxeo-platform-quote/pom.xml index 29c850b897..60f2b9172a 100644 --- a/3rdparty/nuxeo/nuxeo-platform-quote/pom.xml +++ b/3rdparty/nuxeo/nuxeo-platform-quote/pom.xml @@ -1,5 +1,5 @@ - - + 4.0.0 @@ -142,4 +142,4 @@ - \ No newline at end of file + diff --git a/3rdparty/nuxeo/nuxeo-platform-thumbnail/pom.xml b/3rdparty/nuxeo/nuxeo-platform-thumbnail/pom.xml index 70923a8d5a..78b13e4d4a 100644 --- a/3rdparty/nuxeo/nuxeo-platform-thumbnail/pom.xml +++ b/3rdparty/nuxeo/nuxeo-platform-thumbnail/pom.xml @@ -1,5 +1,7 @@ - - + + 4.0.0 org.collectionspace.services.3rdparty.nuxeo @@ -67,4 +69,4 @@ - \ No newline at end of file + diff --git a/3rdparty/nuxeo/nuxeo-server/7.10-HF17/bundles/pom.xml b/3rdparty/nuxeo/nuxeo-server/7.10-HF17/bundles/pom.xml index f8f2bbdf6a..7351efa459 100644 --- a/3rdparty/nuxeo/nuxeo-server/7.10-HF17/bundles/pom.xml +++ b/3rdparty/nuxeo/nuxeo-server/7.10-HF17/bundles/pom.xml @@ -1,5 +1,4 @@ - - + 4.0.0 @@ -121,4 +120,4 @@ - \ No newline at end of file + diff --git a/3rdparty/nuxeo/nuxeo-server/pom.xml b/3rdparty/nuxeo/nuxeo-server/pom.xml index 9585581547..484b6985d4 100644 --- a/3rdparty/nuxeo/nuxeo-server/pom.xml +++ b/3rdparty/nuxeo/nuxeo-server/pom.xml @@ -1,5 +1,7 @@ - - + + 4.0.0 @@ -775,4 +777,4 @@ provided - \ No newline at end of file + diff --git a/3rdparty/nuxeo/pom.xml b/3rdparty/nuxeo/pom.xml index d31959b957..e487d2e75c 100644 --- a/3rdparty/nuxeo/pom.xml +++ b/3rdparty/nuxeo/pom.xml @@ -1,5 +1,6 @@ - - + + org.collectionspace.services @@ -20,4 +21,4 @@ nuxeo-server - \ No newline at end of file + diff --git a/3rdparty/pom.xml b/3rdparty/pom.xml index 361bddecf1..e99e6678d6 100644 --- a/3rdparty/pom.xml +++ b/3rdparty/pom.xml @@ -1,5 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services @@ -37,4 +37,4 @@ --> - \ No newline at end of file + diff --git a/common-lib/pom.xml b/common-lib/pom.xml index 6d8ae01288..873ec16fa6 100644 --- a/common-lib/pom.xml +++ b/common-lib/pom.xml @@ -1,5 +1,7 @@ - - + + 4.0.0 org.collectionspace.services @@ -318,4 +320,4 @@ 1.25 - \ No newline at end of file + diff --git a/pom.xml b/pom.xml index 5b9dc13974..c284477f79 100644 --- a/pom.xml +++ b/pom.xml @@ -1,5 +1,6 @@ - - + + 4.0.0 org.collectionspace.services @@ -201,7 +202,7 @@ 3.1 ${java.version} - ${java.version}s> + ${java.version} @@ -420,21 +421,34 @@ - - - - - - - - - - + + + + + + + + + + - - - - + + + + @@ -1249,4 +1263,4 @@ - \ No newline at end of file + diff --git a/services/IntegrationTests/pom.xml b/services/IntegrationTests/pom.xml index 403e506b26..a2bef594c2 100644 --- a/services/IntegrationTests/pom.xml +++ b/services/IntegrationTests/pom.xml @@ -1,5 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.main @@ -169,4 +169,4 @@ - \ No newline at end of file + diff --git a/services/JaxRsServiceProvider/pom.xml b/services/JaxRsServiceProvider/pom.xml index bc3132ce3c..25221eaf1a 100644 --- a/services/JaxRsServiceProvider/pom.xml +++ b/services/JaxRsServiceProvider/pom.xml @@ -1,5 +1,5 @@ - - + + org.collectionspace.services.main @@ -953,4 +953,4 @@ - \ No newline at end of file + diff --git a/services/PerformanceTests/pom.xml b/services/PerformanceTests/pom.xml index 1d11f396a9..32899a68c3 100644 --- a/services/PerformanceTests/pom.xml +++ b/services/PerformanceTests/pom.xml @@ -1,5 +1,5 @@ - - + + org.collectionspace.services.main org.collectionspace.services @@ -107,4 +107,4 @@ - \ No newline at end of file + diff --git a/services/account/client/pom.xml b/services/account/client/pom.xml index af169db41a..8f5fb3ba0d 100644 --- a/services/account/client/pom.xml +++ b/services/account/client/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services org.collectionspace.services.account @@ -104,4 +106,4 @@ - \ No newline at end of file + diff --git a/services/account/jaxb/pom.xml b/services/account/jaxb/pom.xml index 227ae0f23f..a95034b4c9 100644 --- a/services/account/jaxb/pom.xml +++ b/services/account/jaxb/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services org.collectionspace.services.account @@ -52,4 +54,5 @@ - \ No newline at end of file + + diff --git a/services/account/pom.xml b/services/account/pom.xml index c81affeeba..a253fc23af 100644 --- a/services/account/pom.xml +++ b/services/account/pom.xml @@ -1,5 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.main @@ -18,4 +18,5 @@ client - \ No newline at end of file + + diff --git a/services/account/pstore/pom.xml b/services/account/pstore/pom.xml index 7ca0ac5ddb..dfa5df9eea 100644 --- a/services/account/pstore/pom.xml +++ b/services/account/pstore/pom.xml @@ -1,5 +1,6 @@ - - + + org.collectionspace.services.account org.collectionspace.services @@ -46,8 +47,8 @@ - - + + @@ -115,7 +116,8 @@ process-test-resources - + @@ -129,4 +131,5 @@ - \ No newline at end of file + + diff --git a/services/account/service/pom.xml b/services/account/service/pom.xml index f2aa73c499..9d1465b1ac 100644 --- a/services/account/service/pom.xml +++ b/services/account/service/pom.xml @@ -1,5 +1,5 @@ - - + + org.collectionspace.services.account org.collectionspace.services @@ -107,4 +107,4 @@ - \ No newline at end of file + diff --git a/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/pom.xml b/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/pom.xml index ed500eadff..1f06f509d1 100644 --- a/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/pom.xml +++ b/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/pom.xml @@ -1,5 +1,9 @@ - - + + org.collectionspace.services org.collectionspace.services.acquisition.3rdparty @@ -46,4 +50,4 @@ - \ No newline at end of file + diff --git a/services/acquisition/3rdparty/pom.xml b/services/acquisition/3rdparty/pom.xml index fe180e2ba3..2ac7a477e1 100644 --- a/services/acquisition/3rdparty/pom.xml +++ b/services/acquisition/3rdparty/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services org.collectionspace.services.acquisition @@ -19,4 +21,4 @@ nuxeo-platform-cs-acquisition --> - \ No newline at end of file + diff --git a/services/acquisition/client/pom.xml b/services/acquisition/client/pom.xml index 8a32dbde8f..622359253c 100644 --- a/services/acquisition/client/pom.xml +++ b/services/acquisition/client/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services org.collectionspace.services.acquisition @@ -76,4 +78,4 @@ - \ No newline at end of file + diff --git a/services/acquisition/jaxb/pom.xml b/services/acquisition/jaxb/pom.xml index da2ca03e05..37ab609f37 100644 --- a/services/acquisition/jaxb/pom.xml +++ b/services/acquisition/jaxb/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services.acquisition org.collectionspace.services @@ -32,4 +34,5 @@ - \ No newline at end of file + + diff --git a/services/acquisition/pom.xml b/services/acquisition/pom.xml index 8af30a6879..8a99ad2cb6 100644 --- a/services/acquisition/pom.xml +++ b/services/acquisition/pom.xml @@ -1,5 +1,6 @@ - - + + + org.collectionspace.services org.collectionspace.services.main @@ -22,4 +23,5 @@ - \ No newline at end of file + + diff --git a/services/acquisition/service/pom.xml b/services/acquisition/service/pom.xml index babf8b505c..ed0e9f76c8 100644 --- a/services/acquisition/service/pom.xml +++ b/services/acquisition/service/pom.xml @@ -1,5 +1,5 @@ - - + + org.collectionspace.services.acquisition org.collectionspace.services @@ -40,4 +40,5 @@ - \ No newline at end of file + + diff --git a/services/advancedsearch/client/pom.xml b/services/advancedsearch/client/pom.xml index 613868d372..6b3226169e 100644 --- a/services/advancedsearch/client/pom.xml +++ b/services/advancedsearch/client/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services org.collectionspace.services.advancedsearch diff --git a/services/advancedsearch/jaxb/pom.xml b/services/advancedsearch/jaxb/pom.xml index 103d9e5ab0..7c8174b48e 100644 --- a/services/advancedsearch/jaxb/pom.xml +++ b/services/advancedsearch/jaxb/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services.advancedsearch org.collectionspace.services diff --git a/services/advancedsearch/pom.xml b/services/advancedsearch/pom.xml index 8d68e3d030..8b9d7b83b5 100644 --- a/services/advancedsearch/pom.xml +++ b/services/advancedsearch/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services org.collectionspace.services.main @@ -30,8 +32,8 @@ src/main/java/**/*.java src/test/java/**/*.java - - + + true 4 @@ -40,7 +42,7 @@ - + diff --git a/services/advancedsearch/service/pom.xml b/services/advancedsearch/service/pom.xml index 7df5eb2aaf..b77426cfc1 100644 --- a/services/advancedsearch/service/pom.xml +++ b/services/advancedsearch/service/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services @@ -105,4 +107,4 @@ collectionspace-services-advancedsearch - \ No newline at end of file + diff --git a/services/authentication/client/pom.xml b/services/authentication/client/pom.xml index 6e189908f1..34cbe284d0 100644 --- a/services/authentication/client/pom.xml +++ b/services/authentication/client/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services @@ -54,4 +56,4 @@ - \ No newline at end of file + diff --git a/services/authentication/jaxb/pom.xml b/services/authentication/jaxb/pom.xml index 248aa3e6eb..cd94c7c987 100644 --- a/services/authentication/jaxb/pom.xml +++ b/services/authentication/jaxb/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services @@ -49,4 +51,5 @@ - \ No newline at end of file + + diff --git a/services/authentication/pom.xml b/services/authentication/pom.xml index 5f373dfa44..cbeea2588c 100644 --- a/services/authentication/pom.xml +++ b/services/authentication/pom.xml @@ -1,5 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.main @@ -21,4 +21,5 @@ client - \ No newline at end of file + + diff --git a/services/authentication/pstore/pom.xml b/services/authentication/pstore/pom.xml index f78d696b29..3b61d781b7 100644 --- a/services/authentication/pstore/pom.xml +++ b/services/authentication/pstore/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services @@ -125,4 +127,5 @@ - \ No newline at end of file + + diff --git a/services/authentication/service/pom.xml b/services/authentication/service/pom.xml index 804275e355..6606c1b547 100644 --- a/services/authentication/service/pom.xml +++ b/services/authentication/service/pom.xml @@ -1,5 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.authentication @@ -90,4 +90,4 @@ cspace-services-authn - \ No newline at end of file + diff --git a/services/authority/jaxb/pom.xml b/services/authority/jaxb/pom.xml index 4e0415088c..05ada4cfb0 100644 --- a/services/authority/jaxb/pom.xml +++ b/services/authority/jaxb/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services.authority org.collectionspace.services diff --git a/services/authority/pom.xml b/services/authority/pom.xml index 4707fe1ff8..62f9ec0bb8 100644 --- a/services/authority/pom.xml +++ b/services/authority/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services org.collectionspace.services.main @@ -95,4 +97,4 @@ service - \ No newline at end of file + diff --git a/services/authority/service/pom.xml b/services/authority/service/pom.xml index 0090dbfea9..dd516d2f1c 100644 --- a/services/authority/service/pom.xml +++ b/services/authority/service/pom.xml @@ -1,5 +1,6 @@ - - + + org.collectionspace.services org.collectionspace.services.authority @@ -243,4 +244,4 @@ 4.1.0 - \ No newline at end of file + diff --git a/services/authorization-common/pom.xml b/services/authorization-common/pom.xml index e65a9a1669..b27d99fab9 100644 --- a/services/authorization-common/pom.xml +++ b/services/authorization-common/pom.xml @@ -1,5 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.main @@ -50,4 +50,4 @@ provided - \ No newline at end of file + diff --git a/services/authorization-mgt/client/pom.xml b/services/authorization-mgt/client/pom.xml index b10f52f43e..3bfc04abb6 100644 --- a/services/authorization-mgt/client/pom.xml +++ b/services/authorization-mgt/client/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services org.collectionspace.services.authorization-mgt @@ -142,4 +144,4 @@ cspace-services-authorization-mgt-client - \ No newline at end of file + diff --git a/services/authorization-mgt/import/pom.xml b/services/authorization-mgt/import/pom.xml index 2bcc52a51c..74e88e9590 100644 --- a/services/authorization-mgt/import/pom.xml +++ b/services/authorization-mgt/import/pom.xml @@ -1,5 +1,6 @@ - - + + org.collectionspace.services org.collectionspace.services.authorization-mgt @@ -308,4 +309,4 @@ - \ No newline at end of file + diff --git a/services/authorization-mgt/jaxb/pom.xml b/services/authorization-mgt/jaxb/pom.xml index 1e5dba340a..8c1aa1e36b 100644 --- a/services/authorization-mgt/jaxb/pom.xml +++ b/services/authorization-mgt/jaxb/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services org.collectionspace.services.authorization-mgt @@ -52,4 +54,5 @@ - \ No newline at end of file + + diff --git a/services/authorization-mgt/pom.xml b/services/authorization-mgt/pom.xml index 1d946a83ea..fbc7157a50 100644 --- a/services/authorization-mgt/pom.xml +++ b/services/authorization-mgt/pom.xml @@ -1,5 +1,5 @@ - - + + 4.0.0 org.collectionspace.services.main @@ -17,4 +17,4 @@ import client - \ No newline at end of file + diff --git a/services/authorization-mgt/service/pom.xml b/services/authorization-mgt/service/pom.xml index 6581e31bbe..1ce9ae52e6 100644 --- a/services/authorization-mgt/service/pom.xml +++ b/services/authorization-mgt/service/pom.xml @@ -1,5 +1,5 @@ - - + + 4.0.0 org.collectionspace.services.authorization-mgt @@ -163,4 +163,4 @@ collectionspace-services-authz-mgt - \ No newline at end of file + diff --git a/services/authorization/jaxb/pom.xml b/services/authorization/jaxb/pom.xml index 5f9c9a0a88..4eae5866ea 100644 --- a/services/authorization/jaxb/pom.xml +++ b/services/authorization/jaxb/pom.xml @@ -1,5 +1,5 @@ - - + + org.collectionspace.services.authorization diff --git a/services/authorization/pom.xml b/services/authorization/pom.xml index e57014b4b6..86832289f6 100644 --- a/services/authorization/pom.xml +++ b/services/authorization/pom.xml @@ -1,5 +1,7 @@ - - + + 4.0.0 org.collectionspace.services.main @@ -19,4 +21,4 @@ pstore service - \ No newline at end of file + diff --git a/services/authorization/pstore/pom.xml b/services/authorization/pstore/pom.xml index 4a8f9e39f1..e4753e2985 100644 --- a/services/authorization/pstore/pom.xml +++ b/services/authorization/pstore/pom.xml @@ -1,5 +1,5 @@ - - + + org.collectionspace.services.authorization @@ -40,8 +40,8 @@ - - + + @@ -122,4 +122,4 @@ - \ No newline at end of file + diff --git a/services/authorization/service/pom.xml b/services/authorization/service/pom.xml index 65270566e6..1f2146fc15 100644 --- a/services/authorization/service/pom.xml +++ b/services/authorization/service/pom.xml @@ -1,5 +1,7 @@ - - + + 4.0.0 org.collectionspace.services.authorization @@ -153,4 +155,4 @@ - \ No newline at end of file + diff --git a/services/batch/3rdparty/nuxeo-platform-cs-batch/pom.xml b/services/batch/3rdparty/nuxeo-platform-cs-batch/pom.xml index 9655f11ba9..6051464e62 100644 --- a/services/batch/3rdparty/nuxeo-platform-cs-batch/pom.xml +++ b/services/batch/3rdparty/nuxeo-platform-cs-batch/pom.xml @@ -1,5 +1,6 @@ - - + org.collectionspace.services @@ -39,4 +40,4 @@ - \ No newline at end of file + diff --git a/services/batch/3rdparty/pom.xml b/services/batch/3rdparty/pom.xml index 8f6861ec48..0f5a9a6cf4 100644 --- a/services/batch/3rdparty/pom.xml +++ b/services/batch/3rdparty/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services.batch org.collectionspace.services @@ -18,4 +20,4 @@ nuxeo-platform-cs-batch - \ No newline at end of file + diff --git a/services/batch/client/pom.xml b/services/batch/client/pom.xml index 7ee39f6b67..8e977d900d 100644 --- a/services/batch/client/pom.xml +++ b/services/batch/client/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services org.collectionspace.services.batch @@ -69,4 +71,4 @@ collectionspace-services-batch-client - \ No newline at end of file + diff --git a/services/batch/jaxb/pom.xml b/services/batch/jaxb/pom.xml index c5c377b64a..cb2204591f 100644 --- a/services/batch/jaxb/pom.xml +++ b/services/batch/jaxb/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services.batch org.collectionspace.services @@ -37,4 +39,5 @@ - \ No newline at end of file + + diff --git a/services/batch/pom.xml b/services/batch/pom.xml index a01cec8824..045264404f 100644 --- a/services/batch/pom.xml +++ b/services/batch/pom.xml @@ -1,5 +1,6 @@ - - + + + org.collectionspace.services org.collectionspace.services.main @@ -18,4 +19,5 @@ client - \ No newline at end of file + + diff --git a/services/batch/service/pom.xml b/services/batch/service/pom.xml index b29fc6bfb2..c7e75d7061 100644 --- a/services/batch/service/pom.xml +++ b/services/batch/service/pom.xml @@ -1,5 +1,5 @@ - - + + org.collectionspace.services @@ -220,4 +220,4 @@ collectionspace-services-batch - \ No newline at end of file + diff --git a/services/blob/3rdparty/nuxeo-platform-cs-blob/pom.xml b/services/blob/3rdparty/nuxeo-platform-cs-blob/pom.xml index 4b6d13c73d..fe8d06d37e 100644 --- a/services/blob/3rdparty/nuxeo-platform-cs-blob/pom.xml +++ b/services/blob/3rdparty/nuxeo-platform-cs-blob/pom.xml @@ -1,5 +1,6 @@ - - + 4.0.0 org.collectionspace.services @@ -39,4 +40,4 @@ - \ No newline at end of file + diff --git a/services/blob/3rdparty/pom.xml b/services/blob/3rdparty/pom.xml index 58ff2d00f9..d0db2a75da 100644 --- a/services/blob/3rdparty/pom.xml +++ b/services/blob/3rdparty/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services.blob org.collectionspace.services @@ -20,4 +22,4 @@ nuxeo-platform-cs-blob --> - \ No newline at end of file + diff --git a/services/blob/blob-test-utils/pom.xml b/services/blob/blob-test-utils/pom.xml index 4d2a06b7a5..87d3b79e05 100644 --- a/services/blob/blob-test-utils/pom.xml +++ b/services/blob/blob-test-utils/pom.xml @@ -1,5 +1,7 @@ - - + + 4.0.0 @@ -34,4 +36,4 @@ - \ No newline at end of file + diff --git a/services/blob/client/pom.xml b/services/blob/client/pom.xml index a32ab179d8..9e004c39ca 100644 --- a/services/blob/client/pom.xml +++ b/services/blob/client/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services org.collectionspace.services.blob @@ -118,7 +120,7 @@ /static ${project.build.directory}/maven-shared-archive-resources - + jar @@ -136,4 +138,4 @@ - \ No newline at end of file + diff --git a/services/blob/jaxb/pom.xml b/services/blob/jaxb/pom.xml index df0e0dd09f..55997ae7a6 100644 --- a/services/blob/jaxb/pom.xml +++ b/services/blob/jaxb/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services.blob org.collectionspace.services @@ -33,4 +35,5 @@ - \ No newline at end of file + + diff --git a/services/blob/pom.xml b/services/blob/pom.xml index 7b52e9c2b1..b484c38baa 100644 --- a/services/blob/pom.xml +++ b/services/blob/pom.xml @@ -1,5 +1,5 @@ - - + + 4.0.0 org.collectionspace.services.main @@ -19,4 +19,5 @@ service - \ No newline at end of file + + diff --git a/services/blob/service/pom.xml b/services/blob/service/pom.xml index de24173c7f..8a2409716d 100644 --- a/services/blob/service/pom.xml +++ b/services/blob/service/pom.xml @@ -1,5 +1,6 @@ - - + + org.collectionspace.services @@ -96,4 +97,4 @@ collectionspace-services-blob - \ No newline at end of file + diff --git a/services/chronology/client/pom.xml b/services/chronology/client/pom.xml index 44a18d8ee2..cd1f6f748b 100644 --- a/services/chronology/client/pom.xml +++ b/services/chronology/client/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services org.collectionspace.services.chronology @@ -76,4 +78,4 @@ collectionspace-services-chronology-client - \ No newline at end of file + diff --git a/services/chronology/jaxb/pom.xml b/services/chronology/jaxb/pom.xml index 654a86e4df..32b9e1a32d 100644 --- a/services/chronology/jaxb/pom.xml +++ b/services/chronology/jaxb/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services.chronology org.collectionspace.services diff --git a/services/chronology/pom.xml b/services/chronology/pom.xml index 26e2ebdb7e..617c5c980f 100644 --- a/services/chronology/pom.xml +++ b/services/chronology/pom.xml @@ -1,5 +1,6 @@ - - + + org.collectionspace.services org.collectionspace.services.main @@ -17,4 +18,4 @@ client - \ No newline at end of file + diff --git a/services/chronology/service/pom.xml b/services/chronology/service/pom.xml index 8d7ad04ae9..ac0dc1b00b 100644 --- a/services/chronology/service/pom.xml +++ b/services/chronology/service/pom.xml @@ -1,5 +1,6 @@ - - + + org.collectionspace.services @@ -93,4 +94,4 @@ collectionspace-services-chronology - \ No newline at end of file + diff --git a/services/citation/3rdparty/nuxeo-platform-cs-citation/pom.xml b/services/citation/3rdparty/nuxeo-platform-cs-citation/pom.xml index 7f6f68e070..c9cf337fcc 100644 --- a/services/citation/3rdparty/nuxeo-platform-cs-citation/pom.xml +++ b/services/citation/3rdparty/nuxeo-platform-cs-citation/pom.xml @@ -1,5 +1,6 @@ - - + org.collectionspace.services org.collectionspace.services.citation.3rdparty @@ -38,4 +39,4 @@ - \ No newline at end of file + diff --git a/services/citation/3rdparty/pom.xml b/services/citation/3rdparty/pom.xml index dba67d8e55..89a8970890 100644 --- a/services/citation/3rdparty/pom.xml +++ b/services/citation/3rdparty/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services org.collectionspace.services.citation @@ -26,4 +28,4 @@ nuxeo-platform-cs-citation --> - \ No newline at end of file + diff --git a/services/citation/client/pom.xml b/services/citation/client/pom.xml index 2df88c1a38..2ab4202a17 100644 --- a/services/citation/client/pom.xml +++ b/services/citation/client/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services org.collectionspace.services.citation @@ -65,4 +67,4 @@ collectionspace-services-citation-client - \ No newline at end of file + diff --git a/services/citation/jaxb/pom.xml b/services/citation/jaxb/pom.xml index 875d1cf0b3..cf16f0f6fe 100644 --- a/services/citation/jaxb/pom.xml +++ b/services/citation/jaxb/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services org.collectionspace.services.citation @@ -42,4 +44,5 @@ - \ No newline at end of file + + diff --git a/services/citation/pom.xml b/services/citation/pom.xml index 4753636397..ab861ddf16 100644 --- a/services/citation/pom.xml +++ b/services/citation/pom.xml @@ -1,5 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.main @@ -30,4 +30,5 @@ client - \ No newline at end of file + + diff --git a/services/citation/service/pom.xml b/services/citation/service/pom.xml index b012b93f10..7fa5c5a40d 100644 --- a/services/citation/service/pom.xml +++ b/services/citation/service/pom.xml @@ -1,5 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.citation @@ -94,4 +94,4 @@ - \ No newline at end of file + diff --git a/services/claim/3rdparty/nuxeo-platform-cs-claim/pom.xml b/services/claim/3rdparty/nuxeo-platform-cs-claim/pom.xml index a4dc43a0c0..62ce2714ad 100644 --- a/services/claim/3rdparty/nuxeo-platform-cs-claim/pom.xml +++ b/services/claim/3rdparty/nuxeo-platform-cs-claim/pom.xml @@ -1,5 +1,6 @@ - - + org.collectionspace.services @@ -44,4 +45,4 @@ - \ No newline at end of file + diff --git a/services/claim/3rdparty/pom.xml b/services/claim/3rdparty/pom.xml index 165d3a00e1..fe33baa889 100644 --- a/services/claim/3rdparty/pom.xml +++ b/services/claim/3rdparty/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services.claim org.collectionspace.services @@ -27,4 +29,4 @@ nuxeo-platform-cs-claim --> - \ No newline at end of file + diff --git a/services/claim/client/pom.xml b/services/claim/client/pom.xml index 0f7007863b..f380bdf383 100644 --- a/services/claim/client/pom.xml +++ b/services/claim/client/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services org.collectionspace.services.claim @@ -72,4 +74,4 @@ collectionspace-services-claim-client - \ No newline at end of file + diff --git a/services/claim/jaxb/pom.xml b/services/claim/jaxb/pom.xml index 55209b7602..311d141b99 100644 --- a/services/claim/jaxb/pom.xml +++ b/services/claim/jaxb/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services.claim org.collectionspace.services @@ -33,4 +35,5 @@ - \ No newline at end of file + + diff --git a/services/claim/pom.xml b/services/claim/pom.xml index 2b0449a51c..63fe65630d 100644 --- a/services/claim/pom.xml +++ b/services/claim/pom.xml @@ -1,5 +1,6 @@ - - + + + org.collectionspace.services org.collectionspace.services.main @@ -19,4 +20,5 @@ client - \ No newline at end of file + + diff --git a/services/claim/service/pom.xml b/services/claim/service/pom.xml index 84b9a77e28..77bd509276 100644 --- a/services/claim/service/pom.xml +++ b/services/claim/service/pom.xml @@ -1,5 +1,5 @@ - - + + org.collectionspace.services @@ -90,4 +90,4 @@ collectionspace-services-claim - \ No newline at end of file + diff --git a/services/client/pom.xml b/services/client/pom.xml index 5ce30ddc4c..357531d52e 100644 --- a/services/client/pom.xml +++ b/services/client/pom.xml @@ -1,5 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.main @@ -101,4 +101,4 @@ - \ No newline at end of file + diff --git a/services/collectionobject/3rdparty/nuxeo-platform-collectionobject-testsci/pom.xml b/services/collectionobject/3rdparty/nuxeo-platform-collectionobject-testsci/pom.xml index c33cc696ba..1ab64c7140 100644 --- a/services/collectionobject/3rdparty/nuxeo-platform-collectionobject-testsci/pom.xml +++ b/services/collectionobject/3rdparty/nuxeo-platform-collectionobject-testsci/pom.xml @@ -1,5 +1,6 @@ - - + org.collectionspace.services org.collectionspace.services.collectionobject.3rdparty @@ -10,7 +11,7 @@ org.collectionspace.services.collectionobject.3rdparty.testsci.nuxeo jar - CollectionObject Nuxeo document type for Tenant ID = "2" + CollectionObject Nuxeo document type for Tenant ID = "2" @@ -51,4 +52,4 @@ - \ No newline at end of file + diff --git a/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/pom.xml b/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/pom.xml index 8807bfa503..40a30113e6 100644 --- a/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/pom.xml +++ b/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/pom.xml @@ -1,5 +1,6 @@ - - + org.collectionspace.services org.collectionspace.services.collectionobject.3rdparty @@ -41,4 +42,4 @@ - \ No newline at end of file + diff --git a/services/collectionobject/3rdparty/pom.xml b/services/collectionobject/3rdparty/pom.xml index 54afe7a82b..b334635e7c 100644 --- a/services/collectionobject/3rdparty/pom.xml +++ b/services/collectionobject/3rdparty/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services org.collectionspace.services.collectionobject @@ -29,4 +31,4 @@ --> - \ No newline at end of file + diff --git a/services/collectionobject/client/pom.xml b/services/collectionobject/client/pom.xml index 32c39ecd80..d31cfc5987 100644 --- a/services/collectionobject/client/pom.xml +++ b/services/collectionobject/client/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services org.collectionspace.services.collectionobject @@ -82,4 +84,4 @@ - \ No newline at end of file + diff --git a/services/collectionobject/jaxb/pom.xml b/services/collectionobject/jaxb/pom.xml index fefd08cc80..73b93545dd 100644 --- a/services/collectionobject/jaxb/pom.xml +++ b/services/collectionobject/jaxb/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services org.collectionspace.services.collectionobject @@ -32,4 +34,5 @@ - \ No newline at end of file + + diff --git a/services/collectionobject/pom.xml b/services/collectionobject/pom.xml index ec030f673a..6b35b43247 100644 --- a/services/collectionobject/pom.xml +++ b/services/collectionobject/pom.xml @@ -1,5 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.main @@ -23,4 +23,5 @@ - \ No newline at end of file + + diff --git a/services/collectionobject/service/pom.xml b/services/collectionobject/service/pom.xml index 3d60192d14..cf4ca8120f 100644 --- a/services/collectionobject/service/pom.xml +++ b/services/collectionobject/service/pom.xml @@ -1,5 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.collectionobject @@ -105,4 +105,4 @@ collectionspace-services-collectionobject - \ No newline at end of file + diff --git a/services/common-api/pom.xml b/services/common-api/pom.xml index 0570904798..e315a06747 100644 --- a/services/common-api/pom.xml +++ b/services/common-api/pom.xml @@ -1,5 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.main @@ -45,4 +45,4 @@ 1.1.6 - \ No newline at end of file + diff --git a/services/common-test/pom.xml b/services/common-test/pom.xml index eeb0743825..61cd855172 100644 --- a/services/common-test/pom.xml +++ b/services/common-test/pom.xml @@ -1,5 +1,7 @@ - - + + 4.0.0 org.collectionspace.services.main @@ -51,4 +53,4 @@ collectionspace-services-common-test - \ No newline at end of file + diff --git a/services/common/pom.xml b/services/common/pom.xml index ff5e75d7d5..6f52941cf8 100644 --- a/services/common/pom.xml +++ b/services/common/pom.xml @@ -1,5 +1,6 @@ - - + + org.collectionspace.services org.collectionspace.services.main @@ -427,4 +428,4 @@ - \ No newline at end of file + diff --git a/services/concept/3rdparty/nuxeo-platform-cs-concept/pom.xml b/services/concept/3rdparty/nuxeo-platform-cs-concept/pom.xml index c98f738574..0eae2d4cba 100644 --- a/services/concept/3rdparty/nuxeo-platform-cs-concept/pom.xml +++ b/services/concept/3rdparty/nuxeo-platform-cs-concept/pom.xml @@ -1,5 +1,6 @@ - - + org.collectionspace.services org.collectionspace.services.concept.3rdparty @@ -39,4 +40,4 @@ - \ No newline at end of file + diff --git a/services/concept/3rdparty/pom.xml b/services/concept/3rdparty/pom.xml index 8d947da58d..c3f0f4c59c 100644 --- a/services/concept/3rdparty/pom.xml +++ b/services/concept/3rdparty/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services org.collectionspace.services.concept @@ -19,4 +21,4 @@ nuxeo-platform-cs-concept --> - \ No newline at end of file + diff --git a/services/concept/client/pom.xml b/services/concept/client/pom.xml index 4300b2a356..9525e09204 100644 --- a/services/concept/client/pom.xml +++ b/services/concept/client/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services org.collectionspace.services.concept @@ -70,4 +72,4 @@ - \ No newline at end of file + diff --git a/services/concept/jaxb/pom.xml b/services/concept/jaxb/pom.xml index 1b47696d32..50dbcad4a0 100644 --- a/services/concept/jaxb/pom.xml +++ b/services/concept/jaxb/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services org.collectionspace.services.concept @@ -42,4 +44,5 @@ - \ No newline at end of file + + diff --git a/services/concept/pom.xml b/services/concept/pom.xml index 654bb4eb38..c3fcd3ff86 100644 --- a/services/concept/pom.xml +++ b/services/concept/pom.xml @@ -1,5 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.main @@ -21,4 +21,5 @@ client - \ No newline at end of file + + diff --git a/services/concept/service/pom.xml b/services/concept/service/pom.xml index 588b11e8b8..4ecf4e0e5c 100644 --- a/services/concept/service/pom.xml +++ b/services/concept/service/pom.xml @@ -1,5 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.concept @@ -99,4 +99,4 @@ - \ No newline at end of file + diff --git a/services/conditioncheck/3rdparty/nuxeo-platform-cs-conditioncheck/pom.xml b/services/conditioncheck/3rdparty/nuxeo-platform-cs-conditioncheck/pom.xml index a9fdfed948..efc4eaa776 100644 --- a/services/conditioncheck/3rdparty/nuxeo-platform-cs-conditioncheck/pom.xml +++ b/services/conditioncheck/3rdparty/nuxeo-platform-cs-conditioncheck/pom.xml @@ -1,5 +1,6 @@ - - + org.collectionspace.services @@ -51,4 +52,4 @@ - \ No newline at end of file + diff --git a/services/conditioncheck/3rdparty/pom.xml b/services/conditioncheck/3rdparty/pom.xml index 8b2641de07..7751b2dfde 100644 --- a/services/conditioncheck/3rdparty/pom.xml +++ b/services/conditioncheck/3rdparty/pom.xml @@ -1,5 +1,6 @@ - - + org.collectionspace.services.conditioncheck org.collectionspace.services @@ -20,4 +21,4 @@ nuxeo-platform-cs-conditioncheck --> - \ No newline at end of file + diff --git a/services/conditioncheck/client/pom.xml b/services/conditioncheck/client/pom.xml index 44feab356d..9f58d2302c 100644 --- a/services/conditioncheck/client/pom.xml +++ b/services/conditioncheck/client/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services org.collectionspace.services.conditioncheck @@ -69,4 +71,4 @@ collectionspace-services-conditioncheck-client - \ No newline at end of file + diff --git a/services/conditioncheck/jaxb/pom.xml b/services/conditioncheck/jaxb/pom.xml index 9af685ee66..514631edd0 100644 --- a/services/conditioncheck/jaxb/pom.xml +++ b/services/conditioncheck/jaxb/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services.conditioncheck org.collectionspace.services @@ -32,4 +34,4 @@ - \ No newline at end of file + diff --git a/services/conditioncheck/pom.xml b/services/conditioncheck/pom.xml index ec1afbebda..00e182c96c 100644 --- a/services/conditioncheck/pom.xml +++ b/services/conditioncheck/pom.xml @@ -1,5 +1,6 @@ - - + + + org.collectionspace.services org.collectionspace.services.main @@ -18,4 +19,4 @@ client - \ No newline at end of file + diff --git a/services/conditioncheck/service/pom.xml b/services/conditioncheck/service/pom.xml index 042d5f43a4..7f910e0ba5 100644 --- a/services/conditioncheck/service/pom.xml +++ b/services/conditioncheck/service/pom.xml @@ -1,5 +1,5 @@ - - + + org.collectionspace.services @@ -85,4 +85,4 @@ collectionspace-services-conditioncheck - \ No newline at end of file + diff --git a/services/config/pom.xml b/services/config/pom.xml index 4b0728e17f..7c4ad2e91c 100644 --- a/services/config/pom.xml +++ b/services/config/pom.xml @@ -1,5 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.main @@ -68,4 +68,4 @@ - \ No newline at end of file + diff --git a/services/conservation/3rdparty/nuxeo-platform-cs-conservation/pom.xml b/services/conservation/3rdparty/nuxeo-platform-cs-conservation/pom.xml index f35c7d7d1d..887d4fd732 100644 --- a/services/conservation/3rdparty/nuxeo-platform-cs-conservation/pom.xml +++ b/services/conservation/3rdparty/nuxeo-platform-cs-conservation/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services @@ -51,4 +53,4 @@ - \ No newline at end of file + diff --git a/services/conservation/3rdparty/pom.xml b/services/conservation/3rdparty/pom.xml index 717698ee42..64870b0258 100644 --- a/services/conservation/3rdparty/pom.xml +++ b/services/conservation/3rdparty/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services.conservation org.collectionspace.services @@ -20,4 +22,4 @@ nuxeo-platform-cs-conservation --> - \ No newline at end of file + diff --git a/services/conservation/client/pom.xml b/services/conservation/client/pom.xml index 029f38f25f..2f3b35173d 100644 --- a/services/conservation/client/pom.xml +++ b/services/conservation/client/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services org.collectionspace.services.conservation @@ -68,4 +70,4 @@ collectionspace-services-conservation-client - \ No newline at end of file + diff --git a/services/conservation/jaxb/pom.xml b/services/conservation/jaxb/pom.xml index a89a2dd609..09ba21df64 100644 --- a/services/conservation/jaxb/pom.xml +++ b/services/conservation/jaxb/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services.conservation org.collectionspace.services @@ -32,4 +34,5 @@ - \ No newline at end of file + + diff --git a/services/conservation/pom.xml b/services/conservation/pom.xml index a9840fad22..35fe550859 100644 --- a/services/conservation/pom.xml +++ b/services/conservation/pom.xml @@ -1,5 +1,6 @@ - - + + + org.collectionspace.services org.collectionspace.services.main @@ -21,4 +22,5 @@ client - \ No newline at end of file + + diff --git a/services/conservation/service/pom.xml b/services/conservation/service/pom.xml index ee0e8c0f6f..13fa909280 100644 --- a/services/conservation/service/pom.xml +++ b/services/conservation/service/pom.xml @@ -1,5 +1,5 @@ - - + + org.collectionspace.services @@ -85,4 +85,4 @@ collectionspace-services-conservation - \ No newline at end of file + diff --git a/services/consultation/client/pom.xml b/services/consultation/client/pom.xml index d2f61cb691..848d86dcae 100644 --- a/services/consultation/client/pom.xml +++ b/services/consultation/client/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services org.collectionspace.services.consultation diff --git a/services/consultation/jaxb/pom.xml b/services/consultation/jaxb/pom.xml index 46b0f98585..f3470d4a34 100644 --- a/services/consultation/jaxb/pom.xml +++ b/services/consultation/jaxb/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services.consultation org.collectionspace.services diff --git a/services/consultation/pom.xml b/services/consultation/pom.xml index 22606c3aea..d32e28c08f 100644 --- a/services/consultation/pom.xml +++ b/services/consultation/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services org.collectionspace.services.main @@ -30,8 +32,8 @@ src/main/java/**/*.java src/test/java/**/*.java - - + + true 4 @@ -40,7 +42,7 @@ - + diff --git a/services/consultation/service/pom.xml b/services/consultation/service/pom.xml index 5a2abd30bc..67491afc7d 100644 --- a/services/consultation/service/pom.xml +++ b/services/consultation/service/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services @@ -84,4 +86,4 @@ collectionspace-services-consultation - \ No newline at end of file + diff --git a/services/contact/3rdparty/nuxeo-platform-cs-contact/pom.xml b/services/contact/3rdparty/nuxeo-platform-cs-contact/pom.xml index e908d2003b..ddac5356cd 100644 --- a/services/contact/3rdparty/nuxeo-platform-cs-contact/pom.xml +++ b/services/contact/3rdparty/nuxeo-platform-cs-contact/pom.xml @@ -1,5 +1,6 @@ - - + org.collectionspace.services org.collectionspace.services.contact.3rdparty @@ -39,4 +40,4 @@ - \ No newline at end of file + diff --git a/services/contact/3rdparty/pom.xml b/services/contact/3rdparty/pom.xml index 79c9b3d352..b690b37c86 100644 --- a/services/contact/3rdparty/pom.xml +++ b/services/contact/3rdparty/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services org.collectionspace.services.contact @@ -19,4 +21,4 @@ nuxeo-platform-cs-contact --> - \ No newline at end of file + diff --git a/services/contact/client/pom.xml b/services/contact/client/pom.xml index 10408df536..bb18c23027 100644 --- a/services/contact/client/pom.xml +++ b/services/contact/client/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services.contact org.collectionspace.services @@ -62,4 +64,4 @@ collectionspace-services-contact-client - \ No newline at end of file + diff --git a/services/contact/jaxb/pom.xml b/services/contact/jaxb/pom.xml index d83270ffc2..7d5065187e 100644 --- a/services/contact/jaxb/pom.xml +++ b/services/contact/jaxb/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services org.collectionspace.services.contact @@ -32,4 +34,5 @@ - \ No newline at end of file + + diff --git a/services/contact/pom.xml b/services/contact/pom.xml index b5168f5e05..f8c5fee429 100644 --- a/services/contact/pom.xml +++ b/services/contact/pom.xml @@ -1,5 +1,6 @@ - - + + + org.collectionspace.services.main org.collectionspace.services @@ -18,4 +19,5 @@ client - \ No newline at end of file + + diff --git a/services/contact/service/pom.xml b/services/contact/service/pom.xml index 045e73fa18..e0484bcbf2 100644 --- a/services/contact/service/pom.xml +++ b/services/contact/service/pom.xml @@ -1,5 +1,5 @@ - - + + org.collectionspace.services.contact org.collectionspace.services @@ -85,4 +85,4 @@ collectionspace-services-contact - \ No newline at end of file + diff --git a/services/deaccession/client/pom.xml b/services/deaccession/client/pom.xml index db74ace27f..fd8fa06172 100644 --- a/services/deaccession/client/pom.xml +++ b/services/deaccession/client/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services org.collectionspace.services.deaccession diff --git a/services/deaccession/jaxb/pom.xml b/services/deaccession/jaxb/pom.xml index 176b1373cd..12e088969c 100644 --- a/services/deaccession/jaxb/pom.xml +++ b/services/deaccession/jaxb/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services.deaccession org.collectionspace.services diff --git a/services/deaccession/pom.xml b/services/deaccession/pom.xml index 5ef6dc0246..2584d4cbc8 100644 --- a/services/deaccession/pom.xml +++ b/services/deaccession/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services org.collectionspace.services.main @@ -30,8 +32,8 @@ src/main/java/**/*.java src/test/java/**/*.java - - + + true 4 @@ -40,7 +42,7 @@ - + diff --git a/services/deaccession/service/pom.xml b/services/deaccession/service/pom.xml index 80e00ee36d..6d8f01e25d 100644 --- a/services/deaccession/service/pom.xml +++ b/services/deaccession/service/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services @@ -84,4 +86,4 @@ collectionspace-services-deaccession - \ No newline at end of file + diff --git a/services/dimension/3rdparty/nuxeo-platform-cs-dimension/pom.xml b/services/dimension/3rdparty/nuxeo-platform-cs-dimension/pom.xml index 5c9032d16e..f93524ed53 100644 --- a/services/dimension/3rdparty/nuxeo-platform-cs-dimension/pom.xml +++ b/services/dimension/3rdparty/nuxeo-platform-cs-dimension/pom.xml @@ -1,5 +1,6 @@ - - + org.collectionspace.services org.collectionspace.services.dimension.3rdparty @@ -49,4 +50,4 @@ - \ No newline at end of file + diff --git a/services/dimension/3rdparty/pom.xml b/services/dimension/3rdparty/pom.xml index 54c09244ed..5a6999f5e6 100644 --- a/services/dimension/3rdparty/pom.xml +++ b/services/dimension/3rdparty/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services org.collectionspace.services.dimension @@ -17,4 +19,4 @@ nuxeo-platform-cs-dimension - \ No newline at end of file + diff --git a/services/dimension/client/pom.xml b/services/dimension/client/pom.xml index e58d23f680..57e8dcc42c 100644 --- a/services/dimension/client/pom.xml +++ b/services/dimension/client/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services @@ -62,4 +64,4 @@ collectionspace-services-dimension-client - \ No newline at end of file + diff --git a/services/dimension/jaxb/pom.xml b/services/dimension/jaxb/pom.xml index 3521a0b7e3..6881ce79b3 100644 --- a/services/dimension/jaxb/pom.xml +++ b/services/dimension/jaxb/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services @@ -38,4 +40,5 @@ - \ No newline at end of file + + diff --git a/services/dimension/pom.xml b/services/dimension/pom.xml index b503026efb..d7b572dcc7 100644 --- a/services/dimension/pom.xml +++ b/services/dimension/pom.xml @@ -1,5 +1,6 @@ - - + + + org.collectionspace.services.main @@ -19,4 +20,4 @@ client - \ No newline at end of file + diff --git a/services/dimension/service/pom.xml b/services/dimension/service/pom.xml index bd19079985..43c341c546 100644 --- a/services/dimension/service/pom.xml +++ b/services/dimension/service/pom.xml @@ -1,5 +1,5 @@ - - + + org.collectionspace.services @@ -86,4 +86,4 @@ collectionspace-services-dimension - \ No newline at end of file + diff --git a/services/dutyofcare/client/pom.xml b/services/dutyofcare/client/pom.xml index f94837f587..c5275152ac 100644 --- a/services/dutyofcare/client/pom.xml +++ b/services/dutyofcare/client/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services org.collectionspace.services.dutyofcare @@ -76,4 +78,4 @@ collectionspace-services-dutyofcare-client - \ No newline at end of file + diff --git a/services/dutyofcare/jaxb/pom.xml b/services/dutyofcare/jaxb/pom.xml index 1042e11a98..fdbc1b9339 100644 --- a/services/dutyofcare/jaxb/pom.xml +++ b/services/dutyofcare/jaxb/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services.dutyofcare org.collectionspace.services diff --git a/services/dutyofcare/pom.xml b/services/dutyofcare/pom.xml index 813498ce7b..63246bbd69 100644 --- a/services/dutyofcare/pom.xml +++ b/services/dutyofcare/pom.xml @@ -1,5 +1,6 @@ - - + + org.collectionspace.services org.collectionspace.services.main @@ -40,7 +41,7 @@ - + @@ -53,4 +54,4 @@ client - \ No newline at end of file + diff --git a/services/dutyofcare/service/pom.xml b/services/dutyofcare/service/pom.xml index ba73397146..478e07674a 100644 --- a/services/dutyofcare/service/pom.xml +++ b/services/dutyofcare/service/pom.xml @@ -1,5 +1,6 @@ - - + + org.collectionspace.services @@ -88,4 +89,4 @@ collectionspace-services-dutyofcare - \ No newline at end of file + diff --git a/services/exhibition/3rdparty/nuxeo-platform-cs-exhibition/pom.xml b/services/exhibition/3rdparty/nuxeo-platform-cs-exhibition/pom.xml index b9ff75f2af..ee1bca9b6d 100644 --- a/services/exhibition/3rdparty/nuxeo-platform-cs-exhibition/pom.xml +++ b/services/exhibition/3rdparty/nuxeo-platform-cs-exhibition/pom.xml @@ -1,5 +1,6 @@ - - + org.collectionspace.services @@ -51,4 +52,4 @@ - \ No newline at end of file + diff --git a/services/exhibition/3rdparty/pom.xml b/services/exhibition/3rdparty/pom.xml index 539d3beb50..d0af2470aa 100644 --- a/services/exhibition/3rdparty/pom.xml +++ b/services/exhibition/3rdparty/pom.xml @@ -1,5 +1,6 @@ - - + org.collectionspace.services.exhibition org.collectionspace.services @@ -20,4 +21,4 @@ nuxeo-platform-cs-exhibition --> - \ No newline at end of file + diff --git a/services/exhibition/client/pom.xml b/services/exhibition/client/pom.xml index 1ed1d99443..7921ae8995 100644 --- a/services/exhibition/client/pom.xml +++ b/services/exhibition/client/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services org.collectionspace.services.exhibition @@ -72,4 +74,4 @@ collectionspace-services-exhibition-client - \ No newline at end of file + diff --git a/services/exhibition/jaxb/pom.xml b/services/exhibition/jaxb/pom.xml index 9708aec10d..5b65d46c5c 100644 --- a/services/exhibition/jaxb/pom.xml +++ b/services/exhibition/jaxb/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services.exhibition org.collectionspace.services @@ -33,4 +35,4 @@ - \ No newline at end of file + diff --git a/services/exhibition/pom.xml b/services/exhibition/pom.xml index 0d2d0188a2..516a32abe4 100644 --- a/services/exhibition/pom.xml +++ b/services/exhibition/pom.xml @@ -1,5 +1,6 @@ - - + + + org.collectionspace.services org.collectionspace.services.main @@ -19,4 +20,4 @@ client - \ No newline at end of file + diff --git a/services/exhibition/service/pom.xml b/services/exhibition/service/pom.xml index 2f2ad76b7b..8b0ea97f62 100644 --- a/services/exhibition/service/pom.xml +++ b/services/exhibition/service/pom.xml @@ -1,5 +1,5 @@ - - + + org.collectionspace.services @@ -85,4 +85,4 @@ collectionspace-services-exhibition - \ No newline at end of file + diff --git a/services/exit/client/pom.xml b/services/exit/client/pom.xml index 5f6271d4e1..d9ed912c9b 100644 --- a/services/exit/client/pom.xml +++ b/services/exit/client/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services org.collectionspace.services.exit @@ -56,4 +58,4 @@ collectionspace-services-exit-client - \ No newline at end of file + diff --git a/services/exit/jaxb/pom.xml b/services/exit/jaxb/pom.xml index b9df3dfad1..3f82413b93 100644 --- a/services/exit/jaxb/pom.xml +++ b/services/exit/jaxb/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services.exit org.collectionspace.services diff --git a/services/exit/pom.xml b/services/exit/pom.xml index 67843a40c3..7f7a343f8c 100644 --- a/services/exit/pom.xml +++ b/services/exit/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services org.collectionspace.services.main @@ -30,8 +32,8 @@ src/main/java/**/*.java src/test/java/**/*.java - - + + true 4 @@ -40,7 +42,7 @@ - + @@ -53,4 +55,4 @@ client - \ No newline at end of file + diff --git a/services/exit/service/pom.xml b/services/exit/service/pom.xml index 1f4797ace6..6524f25138 100644 --- a/services/exit/service/pom.xml +++ b/services/exit/service/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services @@ -84,4 +86,4 @@ collectionspace-services-exit - \ No newline at end of file + diff --git a/services/export/client/pom.xml b/services/export/client/pom.xml index 5e2e12385f..3b257b2cab 100644 --- a/services/export/client/pom.xml +++ b/services/export/client/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services org.collectionspace.services.export @@ -78,4 +80,4 @@ collectionspace-services-export-client - \ No newline at end of file + diff --git a/services/export/jaxb/pom.xml b/services/export/jaxb/pom.xml index 97cba20486..e224ea6600 100644 --- a/services/export/jaxb/pom.xml +++ b/services/export/jaxb/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services.export org.collectionspace.services diff --git a/services/export/pom.xml b/services/export/pom.xml index e3a1bc363b..72b75d3bfa 100644 --- a/services/export/pom.xml +++ b/services/export/pom.xml @@ -1,5 +1,7 @@ - - + + + org.collectionspace.services org.collectionspace.services.main @@ -20,4 +22,4 @@ service client - \ No newline at end of file + diff --git a/services/export/service/pom.xml b/services/export/service/pom.xml index e670099cdd..ae5d39314b 100644 --- a/services/export/service/pom.xml +++ b/services/export/service/pom.xml @@ -1,5 +1,5 @@ - - + + org.collectionspace.services @@ -68,4 +68,4 @@ collectionspace-services-export - \ No newline at end of file + diff --git a/services/group/3rdparty/nuxeo-platform-cs-group/pom.xml b/services/group/3rdparty/nuxeo-platform-cs-group/pom.xml index 4f818c9834..c3ece04fe3 100644 --- a/services/group/3rdparty/nuxeo-platform-cs-group/pom.xml +++ b/services/group/3rdparty/nuxeo-platform-cs-group/pom.xml @@ -1,5 +1,6 @@ - - + org.collectionspace.services @@ -44,4 +45,4 @@ - \ No newline at end of file + diff --git a/services/group/3rdparty/pom.xml b/services/group/3rdparty/pom.xml index 2eddbdcc27..3fc276c6b0 100644 --- a/services/group/3rdparty/pom.xml +++ b/services/group/3rdparty/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services.group org.collectionspace.services @@ -28,4 +30,4 @@ nuxeo-platform-cs-group --> - \ No newline at end of file + diff --git a/services/group/client/pom.xml b/services/group/client/pom.xml index 541216f964..cb6bc5ce95 100644 --- a/services/group/client/pom.xml +++ b/services/group/client/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services org.collectionspace.services.group @@ -69,4 +71,4 @@ collectionspace-services-group-client - \ No newline at end of file + diff --git a/services/group/jaxb/pom.xml b/services/group/jaxb/pom.xml index ba26f8b32d..580ec512bc 100644 --- a/services/group/jaxb/pom.xml +++ b/services/group/jaxb/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services org.collectionspace.services.group @@ -32,4 +34,5 @@ - \ No newline at end of file + + diff --git a/services/group/pom.xml b/services/group/pom.xml index f52f802164..ce80d5f975 100644 --- a/services/group/pom.xml +++ b/services/group/pom.xml @@ -1,5 +1,6 @@ - - + + + org.collectionspace.services org.collectionspace.services.main @@ -18,4 +19,5 @@ client - \ No newline at end of file + + diff --git a/services/group/service/pom.xml b/services/group/service/pom.xml index c326c16b09..f9345a581c 100644 --- a/services/group/service/pom.xml +++ b/services/group/service/pom.xml @@ -1,5 +1,5 @@ - - + + org.collectionspace.services @@ -85,4 +85,4 @@ collectionspace-services-group - \ No newline at end of file + diff --git a/services/heldintrust/client/pom.xml b/services/heldintrust/client/pom.xml index 95e03863ba..c79bc4e623 100644 --- a/services/heldintrust/client/pom.xml +++ b/services/heldintrust/client/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services org.collectionspace.services.heldintrust diff --git a/services/heldintrust/jaxb/pom.xml b/services/heldintrust/jaxb/pom.xml index a77fe9ad47..73e7367177 100644 --- a/services/heldintrust/jaxb/pom.xml +++ b/services/heldintrust/jaxb/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services.heldintrust org.collectionspace.services diff --git a/services/heldintrust/pom.xml b/services/heldintrust/pom.xml index 529c9fe68c..570bdfd2a8 100644 --- a/services/heldintrust/pom.xml +++ b/services/heldintrust/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services org.collectionspace.services.main @@ -30,8 +32,8 @@ src/main/java/**/*.java src/test/java/**/*.java - - + + true 4 @@ -40,7 +42,7 @@ - + diff --git a/services/heldintrust/service/pom.xml b/services/heldintrust/service/pom.xml index c724b85919..ffdd17dc47 100644 --- a/services/heldintrust/service/pom.xml +++ b/services/heldintrust/service/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services @@ -84,4 +86,4 @@ collectionspace-services-heldintrust - \ No newline at end of file + diff --git a/services/hyperjaxb/pom.xml b/services/hyperjaxb/pom.xml index b3c992f948..acfd568b28 100644 --- a/services/hyperjaxb/pom.xml +++ b/services/hyperjaxb/pom.xml @@ -1,5 +1,27 @@ - - + + + + + org.collectionspace.services @@ -52,11 +74,11 @@ install - - org.jvnet.jaxb - hyperjaxb3-ejb-plugin - + + org.jvnet.jaxb + hyperjaxb3-ejb-plugin + - \ No newline at end of file + diff --git a/services/id/3rdparty/pom.xml b/services/id/3rdparty/pom.xml index 424d4de987..5a55dbd191 100644 --- a/services/id/3rdparty/pom.xml +++ b/services/id/3rdparty/pom.xml @@ -1,5 +1,26 @@ - - + + + + org.collectionspace.services org.collectionspace.services.id @@ -13,4 +34,4 @@ 3rd party build for ID service - \ No newline at end of file + diff --git a/services/id/client/pom.xml b/services/id/client/pom.xml index e3b5bb3ff9..8654b7f386 100644 --- a/services/id/client/pom.xml +++ b/services/id/client/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services org.collectionspace.services.id @@ -30,4 +32,5 @@ cspace-services-id-client - \ No newline at end of file + + diff --git a/services/id/jaxb/pom.xml b/services/id/jaxb/pom.xml index f9db358bf7..9fb463dfb2 100644 --- a/services/id/jaxb/pom.xml +++ b/services/id/jaxb/pom.xml @@ -1,5 +1,27 @@ - - + + + + + org.collectionspace.services org.collectionspace.services.id @@ -32,4 +54,5 @@ - \ No newline at end of file + + diff --git a/services/id/pom.xml b/services/id/pom.xml index a555442539..e6b17faac6 100644 --- a/services/id/pom.xml +++ b/services/id/pom.xml @@ -1,5 +1,25 @@ - - + + + + + org.collectionspace.services org.collectionspace.services.main @@ -18,4 +38,4 @@ client - \ No newline at end of file + diff --git a/services/id/service/pom.xml b/services/id/service/pom.xml index 5451a791b2..e2f727154c 100644 --- a/services/id/service/pom.xml +++ b/services/id/service/pom.xml @@ -1,5 +1,24 @@ - - + + + + + org.collectionspace.services.id @@ -54,4 +73,4 @@ collectionspace-services-id - \ No newline at end of file + diff --git a/services/imports/3rdparty/nuxeo-platform-cs-imports/pom.xml b/services/imports/3rdparty/nuxeo-platform-cs-imports/pom.xml index fbf882f4c1..c3f4817799 100644 --- a/services/imports/3rdparty/nuxeo-platform-cs-imports/pom.xml +++ b/services/imports/3rdparty/nuxeo-platform-cs-imports/pom.xml @@ -1,5 +1,6 @@ - - + org.collectionspace.services @@ -39,4 +40,4 @@ - \ No newline at end of file + diff --git a/services/imports/3rdparty/pom.xml b/services/imports/3rdparty/pom.xml index 52f8234f01..69ed643081 100644 --- a/services/imports/3rdparty/pom.xml +++ b/services/imports/3rdparty/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services.imports org.collectionspace.services @@ -18,4 +20,4 @@ nuxeo-platform-cs-imports - \ No newline at end of file + diff --git a/services/imports/jaxb/pom.xml b/services/imports/jaxb/pom.xml index 5244756672..a41be8abd7 100644 --- a/services/imports/jaxb/pom.xml +++ b/services/imports/jaxb/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services.imports org.collectionspace.services @@ -32,4 +34,5 @@ - \ No newline at end of file + + diff --git a/services/imports/pom.xml b/services/imports/pom.xml index a088d1ddce..b8fc762633 100644 --- a/services/imports/pom.xml +++ b/services/imports/pom.xml @@ -1,5 +1,6 @@ - - + + + org.collectionspace.services org.collectionspace.services.main @@ -17,4 +18,5 @@ 3rdparty - \ No newline at end of file + + diff --git a/services/imports/service/pom.xml b/services/imports/service/pom.xml index a9bb9c6e69..70072b3c97 100644 --- a/services/imports/service/pom.xml +++ b/services/imports/service/pom.xml @@ -1,5 +1,5 @@ - - + + org.collectionspace.services @@ -134,4 +134,4 @@ collectionspace-services-imports - \ No newline at end of file + diff --git a/services/index/3rdparty/nuxeo-platform-cs-index/pom.xml b/services/index/3rdparty/nuxeo-platform-cs-index/pom.xml index ea2ee94851..cae6193e0e 100644 --- a/services/index/3rdparty/nuxeo-platform-cs-index/pom.xml +++ b/services/index/3rdparty/nuxeo-platform-cs-index/pom.xml @@ -1,5 +1,6 @@ - - + 4.0.0 org.collectionspace.services @@ -38,4 +39,4 @@ - \ No newline at end of file + diff --git a/services/index/3rdparty/pom.xml b/services/index/3rdparty/pom.xml index a5f9b1f507..982642c458 100644 --- a/services/index/3rdparty/pom.xml +++ b/services/index/3rdparty/pom.xml @@ -1,5 +1,6 @@ - - + org.collectionspace.services.index org.collectionspace.services @@ -18,4 +19,4 @@ nuxeo-platform-cs-index - \ No newline at end of file + diff --git a/services/index/client/pom.xml b/services/index/client/pom.xml index 42e758a4d4..08ea979cdc 100644 --- a/services/index/client/pom.xml +++ b/services/index/client/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services org.collectionspace.services.index @@ -58,4 +60,4 @@ collectionspace-services-index-client - \ No newline at end of file + diff --git a/services/index/jaxb/pom.xml b/services/index/jaxb/pom.xml index 1bcc20afbe..2b721fb1cc 100644 --- a/services/index/jaxb/pom.xml +++ b/services/index/jaxb/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services org.collectionspace.services.index @@ -32,4 +34,5 @@ - \ No newline at end of file + + diff --git a/services/index/pom.xml b/services/index/pom.xml index be57d5b588..37a67360ef 100644 --- a/services/index/pom.xml +++ b/services/index/pom.xml @@ -1,5 +1,6 @@ - - + + + org.collectionspace.services org.collectionspace.services.main @@ -18,4 +19,5 @@ service - \ No newline at end of file + + diff --git a/services/index/service/pom.xml b/services/index/service/pom.xml index 257cf0fcbc..d728467728 100644 --- a/services/index/service/pom.xml +++ b/services/index/service/pom.xml @@ -1,5 +1,5 @@ - - + + org.collectionspace.services @@ -74,4 +74,4 @@ collectionspace-services-index - \ No newline at end of file + diff --git a/services/insurance/3rdparty/nuxeo-platform-cs-insurance/pom.xml b/services/insurance/3rdparty/nuxeo-platform-cs-insurance/pom.xml index f1f25a8b9e..6b275726df 100644 --- a/services/insurance/3rdparty/nuxeo-platform-cs-insurance/pom.xml +++ b/services/insurance/3rdparty/nuxeo-platform-cs-insurance/pom.xml @@ -1,5 +1,6 @@ - - + org.collectionspace.services @@ -50,4 +51,4 @@ - \ No newline at end of file + diff --git a/services/insurance/3rdparty/pom.xml b/services/insurance/3rdparty/pom.xml index 6bbc503cc0..6eb281f124 100644 --- a/services/insurance/3rdparty/pom.xml +++ b/services/insurance/3rdparty/pom.xml @@ -1,5 +1,6 @@ - - + org.collectionspace.services.insurance org.collectionspace.services @@ -20,4 +21,4 @@ nuxeo-platform-cs-insurance --> - \ No newline at end of file + diff --git a/services/insurance/client/pom.xml b/services/insurance/client/pom.xml index 60b89dde84..180b9d413f 100644 --- a/services/insurance/client/pom.xml +++ b/services/insurance/client/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services org.collectionspace.services.insurance @@ -76,4 +78,4 @@ collectionspace-services-insurance-client - \ No newline at end of file + diff --git a/services/insurance/jaxb/pom.xml b/services/insurance/jaxb/pom.xml index 69caf41222..f51b8ac200 100644 --- a/services/insurance/jaxb/pom.xml +++ b/services/insurance/jaxb/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services.insurance org.collectionspace.services diff --git a/services/insurance/pom.xml b/services/insurance/pom.xml index b1c16a48c6..543dcb0c0b 100644 --- a/services/insurance/pom.xml +++ b/services/insurance/pom.xml @@ -1,5 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.main @@ -18,4 +18,4 @@ client - \ No newline at end of file + diff --git a/services/insurance/service/pom.xml b/services/insurance/service/pom.xml index 3eafe3e969..e8d4299f7c 100644 --- a/services/insurance/service/pom.xml +++ b/services/insurance/service/pom.xml @@ -1,5 +1,5 @@ - - + + org.collectionspace.services @@ -91,4 +91,4 @@ collectionspace-services-insurance - \ No newline at end of file + diff --git a/services/intake/3rdparty/nuxeo-platform-cs-intake/pom.xml b/services/intake/3rdparty/nuxeo-platform-cs-intake/pom.xml index 513afbeb71..1ed01daba1 100644 --- a/services/intake/3rdparty/nuxeo-platform-cs-intake/pom.xml +++ b/services/intake/3rdparty/nuxeo-platform-cs-intake/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services @@ -51,4 +53,4 @@ - \ No newline at end of file + diff --git a/services/intake/3rdparty/pom.xml b/services/intake/3rdparty/pom.xml index 3383e1fb1b..b0dd34972b 100644 --- a/services/intake/3rdparty/pom.xml +++ b/services/intake/3rdparty/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services.intake org.collectionspace.services @@ -20,4 +22,4 @@ nuxeo-platform-cs-intake --> - \ No newline at end of file + diff --git a/services/intake/client/pom.xml b/services/intake/client/pom.xml index 3d947b8761..e066409ce6 100644 --- a/services/intake/client/pom.xml +++ b/services/intake/client/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services org.collectionspace.services.intake @@ -74,4 +76,4 @@ collectionspace-services-intake-client - \ No newline at end of file + diff --git a/services/intake/jaxb/pom.xml b/services/intake/jaxb/pom.xml index 663484798f..4acd3c23c7 100644 --- a/services/intake/jaxb/pom.xml +++ b/services/intake/jaxb/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services.intake org.collectionspace.services @@ -32,4 +34,5 @@ - \ No newline at end of file + + diff --git a/services/intake/pom.xml b/services/intake/pom.xml index 0af8e50f28..e6b9dc89d9 100644 --- a/services/intake/pom.xml +++ b/services/intake/pom.xml @@ -1,5 +1,6 @@ - - + + + org.collectionspace.services org.collectionspace.services.main @@ -18,4 +19,5 @@ client - \ No newline at end of file + + diff --git a/services/intake/service/pom.xml b/services/intake/service/pom.xml index 34a1f4f92f..75275a4658 100644 --- a/services/intake/service/pom.xml +++ b/services/intake/service/pom.xml @@ -1,5 +1,5 @@ - - + + org.collectionspace.services @@ -90,4 +90,4 @@ collectionspace-services-intake - \ No newline at end of file + diff --git a/services/iterationreport/client/pom.xml b/services/iterationreport/client/pom.xml index 219d024c8f..07d00e9d18 100644 --- a/services/iterationreport/client/pom.xml +++ b/services/iterationreport/client/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services org.collectionspace.services.iterationreport @@ -76,4 +78,4 @@ collectionspace-services-iterationreport-client - \ No newline at end of file + diff --git a/services/iterationreport/jaxb/pom.xml b/services/iterationreport/jaxb/pom.xml index 31a5c7eb93..875db5496c 100644 --- a/services/iterationreport/jaxb/pom.xml +++ b/services/iterationreport/jaxb/pom.xml @@ -28,4 +28,4 @@ - \ No newline at end of file + diff --git a/services/iterationreport/pom.xml b/services/iterationreport/pom.xml index 961b9196bb..084f0d3ef8 100644 --- a/services/iterationreport/pom.xml +++ b/services/iterationreport/pom.xml @@ -1,5 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.main @@ -17,4 +17,4 @@ client - \ No newline at end of file + diff --git a/services/iterationreport/service/pom.xml b/services/iterationreport/service/pom.xml index fd1ad222e3..231731ce02 100644 --- a/services/iterationreport/service/pom.xml +++ b/services/iterationreport/service/pom.xml @@ -1,5 +1,5 @@ - - + + org.collectionspace.services @@ -91,4 +91,4 @@ collectionspace-services-iterationreport - \ No newline at end of file + diff --git a/services/jaxb/pom.xml b/services/jaxb/pom.xml index 0a17da5576..6e7ec5c4a7 100644 --- a/services/jaxb/pom.xml +++ b/services/jaxb/pom.xml @@ -1,5 +1,15 @@ - - + + + + + org.collectionspace.services @@ -34,4 +44,5 @@ - \ No newline at end of file + + diff --git a/services/loanin/3rdparty/nuxeo-platform-cs-loanin/pom.xml b/services/loanin/3rdparty/nuxeo-platform-cs-loanin/pom.xml index cb31eb1471..31f834e31f 100644 --- a/services/loanin/3rdparty/nuxeo-platform-cs-loanin/pom.xml +++ b/services/loanin/3rdparty/nuxeo-platform-cs-loanin/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services @@ -51,4 +53,4 @@ - \ No newline at end of file + diff --git a/services/loanin/3rdparty/pom.xml b/services/loanin/3rdparty/pom.xml index f59492c0c5..ac0a4ab2ce 100644 --- a/services/loanin/3rdparty/pom.xml +++ b/services/loanin/3rdparty/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services.loanin org.collectionspace.services @@ -20,4 +22,4 @@ nuxeo-platform-cs-loanin --> - \ No newline at end of file + diff --git a/services/loanin/client/pom.xml b/services/loanin/client/pom.xml index b9e556f84b..494d55510e 100644 --- a/services/loanin/client/pom.xml +++ b/services/loanin/client/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services org.collectionspace.services.loanin @@ -68,4 +70,4 @@ collectionspace-services-loanin-client - \ No newline at end of file + diff --git a/services/loanin/jaxb/pom.xml b/services/loanin/jaxb/pom.xml index a0a53e1d10..8457935b20 100644 --- a/services/loanin/jaxb/pom.xml +++ b/services/loanin/jaxb/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services.loanin org.collectionspace.services @@ -32,4 +34,5 @@ - \ No newline at end of file + + diff --git a/services/loanin/pom.xml b/services/loanin/pom.xml index d182ee17ca..c295d8b114 100644 --- a/services/loanin/pom.xml +++ b/services/loanin/pom.xml @@ -1,5 +1,6 @@ - - + + + org.collectionspace.services org.collectionspace.services.main @@ -21,4 +22,5 @@ client - \ No newline at end of file + + diff --git a/services/loanin/service/pom.xml b/services/loanin/service/pom.xml index e744b3948b..e45eb90659 100644 --- a/services/loanin/service/pom.xml +++ b/services/loanin/service/pom.xml @@ -1,5 +1,5 @@ - - + + org.collectionspace.services @@ -86,4 +86,4 @@ collectionspace-services-loanin - \ No newline at end of file + diff --git a/services/loanout/3rdparty/nuxeo-platform-cs-loanout/pom.xml b/services/loanout/3rdparty/nuxeo-platform-cs-loanout/pom.xml index fe689d540c..7a699878aa 100644 --- a/services/loanout/3rdparty/nuxeo-platform-cs-loanout/pom.xml +++ b/services/loanout/3rdparty/nuxeo-platform-cs-loanout/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services @@ -51,4 +53,4 @@ - \ No newline at end of file + diff --git a/services/loanout/3rdparty/pom.xml b/services/loanout/3rdparty/pom.xml index c395cf92c6..e91a12e8c3 100644 --- a/services/loanout/3rdparty/pom.xml +++ b/services/loanout/3rdparty/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services.loanout org.collectionspace.services @@ -20,4 +22,4 @@ nuxeo-platform-cs-loanout --> - \ No newline at end of file + diff --git a/services/loanout/client/pom.xml b/services/loanout/client/pom.xml index dd869b7a2f..53875c5b46 100644 --- a/services/loanout/client/pom.xml +++ b/services/loanout/client/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services org.collectionspace.services.loanout @@ -69,4 +71,4 @@ collectionspace-services-loanout-client - \ No newline at end of file + diff --git a/services/loanout/jaxb/pom.xml b/services/loanout/jaxb/pom.xml index 5fb5e0b37b..72814f07a9 100644 --- a/services/loanout/jaxb/pom.xml +++ b/services/loanout/jaxb/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services.loanout org.collectionspace.services @@ -32,4 +34,5 @@ - \ No newline at end of file + + diff --git a/services/loanout/pom.xml b/services/loanout/pom.xml index 75cadab735..e9b2105fa7 100644 --- a/services/loanout/pom.xml +++ b/services/loanout/pom.xml @@ -1,5 +1,6 @@ - - + + + org.collectionspace.services org.collectionspace.services.main @@ -18,4 +19,5 @@ client - \ No newline at end of file + + diff --git a/services/loanout/service/pom.xml b/services/loanout/service/pom.xml index bf4228acd9..37cc0b6fc0 100644 --- a/services/loanout/service/pom.xml +++ b/services/loanout/service/pom.xml @@ -1,5 +1,5 @@ - - + + org.collectionspace.services @@ -84,4 +84,4 @@ collectionspace-services-loanout - \ No newline at end of file + diff --git a/services/location/3rdparty/nuxeo-platform-cs-location/pom.xml b/services/location/3rdparty/nuxeo-platform-cs-location/pom.xml index 2560a4ee36..4c9bf08f96 100644 --- a/services/location/3rdparty/nuxeo-platform-cs-location/pom.xml +++ b/services/location/3rdparty/nuxeo-platform-cs-location/pom.xml @@ -1,5 +1,6 @@ - - + org.collectionspace.services org.collectionspace.services.location.3rdparty @@ -38,4 +39,4 @@ - \ No newline at end of file + diff --git a/services/location/3rdparty/pom.xml b/services/location/3rdparty/pom.xml index ad61f8a0e5..be40ec4536 100644 --- a/services/location/3rdparty/pom.xml +++ b/services/location/3rdparty/pom.xml @@ -1,5 +1,6 @@ - - + org.collectionspace.services org.collectionspace.services.location @@ -19,4 +20,4 @@ nuxeo-platform-cs-location --> - \ No newline at end of file + diff --git a/services/location/client/pom.xml b/services/location/client/pom.xml index 6d49954f06..966fb25490 100644 --- a/services/location/client/pom.xml +++ b/services/location/client/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services org.collectionspace.services.location @@ -68,4 +70,4 @@ collectionspace-services-location-client - \ No newline at end of file + diff --git a/services/location/jaxb/pom.xml b/services/location/jaxb/pom.xml index 9787b7c957..229e0cce98 100644 --- a/services/location/jaxb/pom.xml +++ b/services/location/jaxb/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services org.collectionspace.services.location @@ -42,4 +44,5 @@ - \ No newline at end of file + + diff --git a/services/location/pom.xml b/services/location/pom.xml index 8ff8a5c9b7..61c421b4ff 100644 --- a/services/location/pom.xml +++ b/services/location/pom.xml @@ -1,5 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.main @@ -21,4 +21,5 @@ client - \ No newline at end of file + + diff --git a/services/location/service/pom.xml b/services/location/service/pom.xml index c4280756e7..3ad92fca1e 100644 --- a/services/location/service/pom.xml +++ b/services/location/service/pom.xml @@ -1,5 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.location @@ -99,4 +99,4 @@ - \ No newline at end of file + diff --git a/services/login/client/pom.xml b/services/login/client/pom.xml index 05a8665202..338b51ac92 100644 --- a/services/login/client/pom.xml +++ b/services/login/client/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services org.collectionspace.services.login @@ -13,4 +15,4 @@ collectionspace-services-login-client - \ No newline at end of file + diff --git a/services/login/pom.xml b/services/login/pom.xml index cd6776203c..d1b2f217fd 100644 --- a/services/login/pom.xml +++ b/services/login/pom.xml @@ -1,5 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.main @@ -15,4 +15,4 @@ client service - \ No newline at end of file + diff --git a/services/login/service/pom.xml b/services/login/service/pom.xml index 72ec50cd18..62935bd696 100644 --- a/services/login/service/pom.xml +++ b/services/login/service/pom.xml @@ -1,5 +1,5 @@ - - + + org.collectionspace.services @@ -51,4 +51,4 @@ collectionspace-services-login-service - \ No newline at end of file + diff --git a/services/logout/client/pom.xml b/services/logout/client/pom.xml index 5b37d4cdf2..839deae48d 100644 --- a/services/logout/client/pom.xml +++ b/services/logout/client/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services org.collectionspace.services.logout @@ -13,4 +15,4 @@ collectionspace-services-logout-client - \ No newline at end of file + diff --git a/services/logout/pom.xml b/services/logout/pom.xml index 606249ecc4..e0f6bab095 100644 --- a/services/logout/pom.xml +++ b/services/logout/pom.xml @@ -1,5 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.main @@ -15,4 +15,4 @@ client service - \ No newline at end of file + diff --git a/services/logout/service/pom.xml b/services/logout/service/pom.xml index 78e19c901e..fab7d12924 100644 --- a/services/logout/service/pom.xml +++ b/services/logout/service/pom.xml @@ -1,5 +1,5 @@ - - + + org.collectionspace.services @@ -51,4 +51,4 @@ collectionspace-services-logout-service - \ No newline at end of file + diff --git a/services/material/3rdparty/nuxeo-platform-cs-material/pom.xml b/services/material/3rdparty/nuxeo-platform-cs-material/pom.xml index 9a42e668ba..992a9ae7de 100644 --- a/services/material/3rdparty/nuxeo-platform-cs-material/pom.xml +++ b/services/material/3rdparty/nuxeo-platform-cs-material/pom.xml @@ -1,5 +1,6 @@ - - + org.collectionspace.services org.collectionspace.services.material.3rdparty @@ -38,4 +39,4 @@ - \ No newline at end of file + diff --git a/services/material/3rdparty/pom.xml b/services/material/3rdparty/pom.xml index 4a5a5db80c..2cf481645e 100644 --- a/services/material/3rdparty/pom.xml +++ b/services/material/3rdparty/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services org.collectionspace.services.material @@ -19,4 +21,4 @@ nuxeo-platform-cs-material --> - \ No newline at end of file + diff --git a/services/material/client/pom.xml b/services/material/client/pom.xml index adec494cd9..78d9105039 100644 --- a/services/material/client/pom.xml +++ b/services/material/client/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services org.collectionspace.services.material @@ -64,4 +66,4 @@ collectionspace-services-material-client - \ No newline at end of file + diff --git a/services/material/jaxb/pom.xml b/services/material/jaxb/pom.xml index cc0d192f2b..82bf7a20ae 100644 --- a/services/material/jaxb/pom.xml +++ b/services/material/jaxb/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services org.collectionspace.services.material @@ -53,4 +55,5 @@ - \ No newline at end of file + + diff --git a/services/material/pom.xml b/services/material/pom.xml index 79bd8c066a..7f67de082f 100644 --- a/services/material/pom.xml +++ b/services/material/pom.xml @@ -1,5 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.main @@ -28,4 +28,5 @@ client - \ No newline at end of file + + diff --git a/services/material/service/pom.xml b/services/material/service/pom.xml index 94add6b389..9a80fbd0c4 100644 --- a/services/material/service/pom.xml +++ b/services/material/service/pom.xml @@ -1,5 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.material @@ -109,4 +109,4 @@ collectionspace-services-material - \ No newline at end of file + diff --git a/services/media/3rdparty/nuxeo-platform-cs-media/pom.xml b/services/media/3rdparty/nuxeo-platform-cs-media/pom.xml index 91389fc6b9..4303cfd061 100644 --- a/services/media/3rdparty/nuxeo-platform-cs-media/pom.xml +++ b/services/media/3rdparty/nuxeo-platform-cs-media/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services @@ -51,4 +53,4 @@ - \ No newline at end of file + diff --git a/services/media/3rdparty/pom.xml b/services/media/3rdparty/pom.xml index a944336f8f..f8a06342de 100644 --- a/services/media/3rdparty/pom.xml +++ b/services/media/3rdparty/pom.xml @@ -1,5 +1,6 @@ - - + org.collectionspace.services.media org.collectionspace.services @@ -20,4 +21,4 @@ nuxeo-platform-cs-media --> - \ No newline at end of file + diff --git a/services/media/client/pom.xml b/services/media/client/pom.xml index 30384d8242..14c06f01b9 100644 --- a/services/media/client/pom.xml +++ b/services/media/client/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services org.collectionspace.services.media @@ -149,7 +151,7 @@ /static ${project.build.directory}/maven-shared-archive-resources - + jar @@ -167,4 +169,4 @@ - \ No newline at end of file + diff --git a/services/media/jaxb/pom.xml b/services/media/jaxb/pom.xml index 3552595cd8..57c1fd86d8 100644 --- a/services/media/jaxb/pom.xml +++ b/services/media/jaxb/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services.media org.collectionspace.services @@ -32,4 +34,5 @@ - \ No newline at end of file + + diff --git a/services/media/pom.xml b/services/media/pom.xml index 1b81bcc508..c8c4716a4f 100644 --- a/services/media/pom.xml +++ b/services/media/pom.xml @@ -1,5 +1,6 @@ - - + + + org.collectionspace.services org.collectionspace.services.main @@ -18,4 +19,5 @@ client - \ No newline at end of file + + diff --git a/services/media/service/pom.xml b/services/media/service/pom.xml index 4a291985c5..41817229ce 100644 --- a/services/media/service/pom.xml +++ b/services/media/service/pom.xml @@ -1,5 +1,5 @@ - - + + org.collectionspace.services @@ -101,4 +101,4 @@ collectionspace-services-media - \ No newline at end of file + diff --git a/services/movement/3rdparty/nuxeo-platform-cs-movement/pom.xml b/services/movement/3rdparty/nuxeo-platform-cs-movement/pom.xml index 64acd22413..7c8d73f4c2 100644 --- a/services/movement/3rdparty/nuxeo-platform-cs-movement/pom.xml +++ b/services/movement/3rdparty/nuxeo-platform-cs-movement/pom.xml @@ -1,5 +1,6 @@ - - + org.collectionspace.services @@ -50,4 +51,4 @@ - \ No newline at end of file + diff --git a/services/movement/3rdparty/pom.xml b/services/movement/3rdparty/pom.xml index 4e14a3fdbd..499654a08d 100644 --- a/services/movement/3rdparty/pom.xml +++ b/services/movement/3rdparty/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services.movement org.collectionspace.services @@ -20,4 +22,4 @@ nuxeo-platform-cs-movement --> - \ No newline at end of file + diff --git a/services/movement/client/pom.xml b/services/movement/client/pom.xml index 6cd62ff883..9bbb016ea4 100644 --- a/services/movement/client/pom.xml +++ b/services/movement/client/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services org.collectionspace.services.movement @@ -70,4 +72,4 @@ collectionspace-services-movement-client - \ No newline at end of file + diff --git a/services/movement/jaxb/pom.xml b/services/movement/jaxb/pom.xml index 04c095fd8d..fdb32163a9 100644 --- a/services/movement/jaxb/pom.xml +++ b/services/movement/jaxb/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services.movement org.collectionspace.services @@ -32,4 +34,5 @@ - \ No newline at end of file + + diff --git a/services/movement/pom.xml b/services/movement/pom.xml index 22f8c9ba96..58c3e85436 100644 --- a/services/movement/pom.xml +++ b/services/movement/pom.xml @@ -1,5 +1,6 @@ - - + + + org.collectionspace.services org.collectionspace.services.main @@ -18,4 +19,5 @@ client - \ No newline at end of file + + diff --git a/services/movement/service/pom.xml b/services/movement/service/pom.xml index 7df4a0ac10..fbef801fb1 100644 --- a/services/movement/service/pom.xml +++ b/services/movement/service/pom.xml @@ -1,5 +1,5 @@ - - + + org.collectionspace.services @@ -88,4 +88,4 @@ collectionspace-services-movement - \ No newline at end of file + diff --git a/services/nagpra-jaxb/pom.xml b/services/nagpra-jaxb/pom.xml index 6936f43c51..562f765b50 100644 --- a/services/nagpra-jaxb/pom.xml +++ b/services/nagpra-jaxb/pom.xml @@ -1,5 +1,7 @@ - - + + 4.0.0 org.collectionspace.services.main diff --git a/services/nagprainventory/client/pom.xml b/services/nagprainventory/client/pom.xml index 581e2c8d43..cb5308830b 100644 --- a/services/nagprainventory/client/pom.xml +++ b/services/nagprainventory/client/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services org.collectionspace.services.nagprainventory diff --git a/services/nagprainventory/jaxb/pom.xml b/services/nagprainventory/jaxb/pom.xml index b05315252f..7ed8070756 100644 --- a/services/nagprainventory/jaxb/pom.xml +++ b/services/nagprainventory/jaxb/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services.nagprainventory org.collectionspace.services @@ -28,4 +30,4 @@ - \ No newline at end of file + diff --git a/services/nagprainventory/pom.xml b/services/nagprainventory/pom.xml index a1fc18e8c6..c902650e0a 100644 --- a/services/nagprainventory/pom.xml +++ b/services/nagprainventory/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services org.collectionspace.services.main @@ -30,8 +32,8 @@ src/main/java/**/*.java src/test/java/**/*.java - - + + true 4 diff --git a/services/nagprainventory/service/pom.xml b/services/nagprainventory/service/pom.xml index cb8e387eeb..931497ebf9 100644 --- a/services/nagprainventory/service/pom.xml +++ b/services/nagprainventory/service/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services @@ -84,4 +86,4 @@ collectionspace-services-nagprainventory - \ No newline at end of file + diff --git a/services/note/3rdparty/nuxeo-platform-cs-note/pom.xml b/services/note/3rdparty/nuxeo-platform-cs-note/pom.xml index c024ff3876..82f7e42848 100644 --- a/services/note/3rdparty/nuxeo-platform-cs-note/pom.xml +++ b/services/note/3rdparty/nuxeo-platform-cs-note/pom.xml @@ -1,5 +1,6 @@ - - + org.collectionspace.services org.collectionspace.services.note.3rdparty @@ -39,4 +40,4 @@ - \ No newline at end of file + diff --git a/services/note/3rdparty/pom.xml b/services/note/3rdparty/pom.xml index 499c8fbe97..a9ac2e3d17 100644 --- a/services/note/3rdparty/pom.xml +++ b/services/note/3rdparty/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services org.collectionspace.services.note @@ -19,4 +21,4 @@ nuxeo-platform-cs-note --> - \ No newline at end of file + diff --git a/services/note/client/pom.xml b/services/note/client/pom.xml index bff00802b7..ada93e07a4 100644 --- a/services/note/client/pom.xml +++ b/services/note/client/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services.note org.collectionspace.services @@ -57,4 +59,4 @@ collectionspace-services-note-client - \ No newline at end of file + diff --git a/services/note/jaxb/pom.xml b/services/note/jaxb/pom.xml index 0402d6a4f5..d8598e0bb6 100644 --- a/services/note/jaxb/pom.xml +++ b/services/note/jaxb/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services org.collectionspace.services.note @@ -37,4 +39,5 @@ - \ No newline at end of file + + diff --git a/services/note/pom.xml b/services/note/pom.xml index c762f45362..cc51f4812e 100644 --- a/services/note/pom.xml +++ b/services/note/pom.xml @@ -1,5 +1,6 @@ - - + + + org.collectionspace.services.main org.collectionspace.services @@ -19,4 +20,5 @@ client - \ No newline at end of file + + diff --git a/services/note/service/pom.xml b/services/note/service/pom.xml index 69d652c8ea..82f9573096 100644 --- a/services/note/service/pom.xml +++ b/services/note/service/pom.xml @@ -1,5 +1,5 @@ - - + + org.collectionspace.services.note org.collectionspace.services @@ -76,4 +76,4 @@ collectionspace-services-note - \ No newline at end of file + diff --git a/services/objectexit/3rdparty/nuxeo-platform-cs-objectexit/pom.xml b/services/objectexit/3rdparty/nuxeo-platform-cs-objectexit/pom.xml index 90fe5076f9..53e0b93131 100644 --- a/services/objectexit/3rdparty/nuxeo-platform-cs-objectexit/pom.xml +++ b/services/objectexit/3rdparty/nuxeo-platform-cs-objectexit/pom.xml @@ -1,5 +1,6 @@ - - + org.collectionspace.services @@ -49,4 +50,4 @@ - \ No newline at end of file + diff --git a/services/objectexit/3rdparty/pom.xml b/services/objectexit/3rdparty/pom.xml index 01e6ba3be9..498a5b457c 100644 --- a/services/objectexit/3rdparty/pom.xml +++ b/services/objectexit/3rdparty/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services.objectexit org.collectionspace.services @@ -28,4 +30,4 @@ nuxeo-platform-cs-objectexit --> - \ No newline at end of file + diff --git a/services/objectexit/client/pom.xml b/services/objectexit/client/pom.xml index 0dd6a596dc..d4b5c625f7 100644 --- a/services/objectexit/client/pom.xml +++ b/services/objectexit/client/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services org.collectionspace.services.objectexit @@ -69,4 +71,4 @@ collectionspace-services-objectexit-client - \ No newline at end of file + diff --git a/services/objectexit/jaxb/pom.xml b/services/objectexit/jaxb/pom.xml index 892f8df211..25c9d6cf5f 100644 --- a/services/objectexit/jaxb/pom.xml +++ b/services/objectexit/jaxb/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services.objectexit org.collectionspace.services @@ -32,4 +34,5 @@ - \ No newline at end of file + + diff --git a/services/objectexit/pom.xml b/services/objectexit/pom.xml index 414ea6dfab..993e69a312 100644 --- a/services/objectexit/pom.xml +++ b/services/objectexit/pom.xml @@ -1,5 +1,6 @@ - - + + + org.collectionspace.services org.collectionspace.services.main @@ -19,4 +20,5 @@ client - \ No newline at end of file + + diff --git a/services/objectexit/service/pom.xml b/services/objectexit/service/pom.xml index 05d9eef329..9e92cc5d09 100644 --- a/services/objectexit/service/pom.xml +++ b/services/objectexit/service/pom.xml @@ -1,5 +1,5 @@ - - + + org.collectionspace.services @@ -85,4 +85,4 @@ collectionspace-services-objectexit - \ No newline at end of file + diff --git a/services/organization/3rdparty/nuxeo-platform-cs-organization/pom.xml b/services/organization/3rdparty/nuxeo-platform-cs-organization/pom.xml index 995a6b026e..09431e117e 100644 --- a/services/organization/3rdparty/nuxeo-platform-cs-organization/pom.xml +++ b/services/organization/3rdparty/nuxeo-platform-cs-organization/pom.xml @@ -1,5 +1,6 @@ - - + org.collectionspace.services org.collectionspace.services.organization.3rdparty @@ -39,4 +40,4 @@ - \ No newline at end of file + diff --git a/services/organization/3rdparty/pom.xml b/services/organization/3rdparty/pom.xml index 21414e9e03..1c17aa159f 100644 --- a/services/organization/3rdparty/pom.xml +++ b/services/organization/3rdparty/pom.xml @@ -1,5 +1,6 @@ - - + org.collectionspace.services org.collectionspace.services.organization @@ -19,4 +20,4 @@ nuxeo-platform-cs-organization --> - \ No newline at end of file + diff --git a/services/organization/client/pom.xml b/services/organization/client/pom.xml index 689dc43f63..9bb8676521 100644 --- a/services/organization/client/pom.xml +++ b/services/organization/client/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services org.collectionspace.services.organization @@ -63,4 +65,4 @@ collectionspace-services-organization-client - \ No newline at end of file + diff --git a/services/organization/jaxb/pom.xml b/services/organization/jaxb/pom.xml index 325902eabc..ed8c52b661 100644 --- a/services/organization/jaxb/pom.xml +++ b/services/organization/jaxb/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services.organization org.collectionspace.services @@ -41,4 +43,4 @@ - \ No newline at end of file + diff --git a/services/organization/pom.xml b/services/organization/pom.xml index 4e8aa6fc8f..f4d7146f73 100644 --- a/services/organization/pom.xml +++ b/services/organization/pom.xml @@ -1,5 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.main @@ -18,4 +18,5 @@ client - \ No newline at end of file + + diff --git a/services/organization/service/pom.xml b/services/organization/service/pom.xml index 227922b38e..96e83888a0 100644 --- a/services/organization/service/pom.xml +++ b/services/organization/service/pom.xml @@ -1,5 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.organization @@ -98,4 +98,4 @@ collectionspace-services-organization - \ No newline at end of file + diff --git a/services/osteology/3rdparty/nuxeo-platform-cs-osteology/pom.xml b/services/osteology/3rdparty/nuxeo-platform-cs-osteology/pom.xml index 2e2400d33c..770bfe43b0 100644 --- a/services/osteology/3rdparty/nuxeo-platform-cs-osteology/pom.xml +++ b/services/osteology/3rdparty/nuxeo-platform-cs-osteology/pom.xml @@ -1,5 +1,6 @@ - - + org.collectionspace.services @@ -50,4 +51,4 @@ - \ No newline at end of file + diff --git a/services/osteology/3rdparty/pom.xml b/services/osteology/3rdparty/pom.xml index 662579d8ca..b235f68397 100644 --- a/services/osteology/3rdparty/pom.xml +++ b/services/osteology/3rdparty/pom.xml @@ -1,5 +1,6 @@ - - + org.collectionspace.services.osteology org.collectionspace.services @@ -20,4 +21,4 @@ nuxeo-platform-cs-osteology --> - \ No newline at end of file + diff --git a/services/osteology/client/pom.xml b/services/osteology/client/pom.xml index 7b62d35320..e72244becc 100644 --- a/services/osteology/client/pom.xml +++ b/services/osteology/client/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services org.collectionspace.services.osteology @@ -76,4 +78,4 @@ collectionspace-services-osteology-client - \ No newline at end of file + diff --git a/services/osteology/jaxb/pom.xml b/services/osteology/jaxb/pom.xml index f1cca843f3..7718440f95 100644 --- a/services/osteology/jaxb/pom.xml +++ b/services/osteology/jaxb/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services.osteology org.collectionspace.services @@ -32,4 +34,4 @@ - \ No newline at end of file + diff --git a/services/osteology/pom.xml b/services/osteology/pom.xml index fb09e20eda..6be3de5e51 100644 --- a/services/osteology/pom.xml +++ b/services/osteology/pom.xml @@ -1,5 +1,6 @@ - - + + + org.collectionspace.services org.collectionspace.services.main @@ -18,4 +19,4 @@ client - \ No newline at end of file + diff --git a/services/osteology/service/pom.xml b/services/osteology/service/pom.xml index aeb42c4aed..df409c2f5b 100644 --- a/services/osteology/service/pom.xml +++ b/services/osteology/service/pom.xml @@ -1,5 +1,5 @@ - - + + org.collectionspace.services @@ -91,4 +91,4 @@ collectionspace-services-osteology - \ No newline at end of file + diff --git a/services/person/3rdparty/nuxeo-platform-cs-person/pom.xml b/services/person/3rdparty/nuxeo-platform-cs-person/pom.xml index d653059c84..dcfd3e7c2a 100644 --- a/services/person/3rdparty/nuxeo-platform-cs-person/pom.xml +++ b/services/person/3rdparty/nuxeo-platform-cs-person/pom.xml @@ -1,5 +1,6 @@ - - + org.collectionspace.services org.collectionspace.services.person.3rdparty @@ -39,4 +40,4 @@ - \ No newline at end of file + diff --git a/services/person/3rdparty/nuxeo-platform-person-testsci/pom.xml b/services/person/3rdparty/nuxeo-platform-person-testsci/pom.xml index 69d11e3a0e..b50af3aba3 100644 --- a/services/person/3rdparty/nuxeo-platform-person-testsci/pom.xml +++ b/services/person/3rdparty/nuxeo-platform-person-testsci/pom.xml @@ -1,5 +1,6 @@ - - + org.collectionspace.services org.collectionspace.services.person.3rdparty @@ -11,7 +12,7 @@ org.collectionspace.services.person.3rdparty.testsci.nuxeo jar - Person Nuxeo document type for Tenant ID = "2" + Person Nuxeo document type for Tenant ID = "2" @@ -52,4 +53,4 @@ - \ No newline at end of file + diff --git a/services/person/3rdparty/pom.xml b/services/person/3rdparty/pom.xml index d7a9268988..9cfe61183f 100644 --- a/services/person/3rdparty/pom.xml +++ b/services/person/3rdparty/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services org.collectionspace.services.person @@ -20,4 +22,4 @@ nuxeo-platform-person-testsci --> - \ No newline at end of file + diff --git a/services/person/client/pom.xml b/services/person/client/pom.xml index 1b9cf6089a..4b423940fa 100644 --- a/services/person/client/pom.xml +++ b/services/person/client/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services org.collectionspace.services.person @@ -67,4 +69,4 @@ - \ No newline at end of file + diff --git a/services/person/jaxb/pom.xml b/services/person/jaxb/pom.xml index 2627c527f5..7c2a051d88 100644 --- a/services/person/jaxb/pom.xml +++ b/services/person/jaxb/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services org.collectionspace.services.person @@ -38,4 +40,5 @@ - \ No newline at end of file + + diff --git a/services/person/pom.xml b/services/person/pom.xml index 7e984c3db1..afe936a274 100644 --- a/services/person/pom.xml +++ b/services/person/pom.xml @@ -1,5 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.main @@ -29,4 +29,5 @@ client - \ No newline at end of file + + diff --git a/services/person/service/pom.xml b/services/person/service/pom.xml index ec0e36a438..8c6e8814c4 100644 --- a/services/person/service/pom.xml +++ b/services/person/service/pom.xml @@ -1,5 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.person @@ -103,4 +103,4 @@ - \ No newline at end of file + diff --git a/services/place/3rdparty/nuxeo-platform-cs-place/pom.xml b/services/place/3rdparty/nuxeo-platform-cs-place/pom.xml index 3f9febaed3..8979134b58 100644 --- a/services/place/3rdparty/nuxeo-platform-cs-place/pom.xml +++ b/services/place/3rdparty/nuxeo-platform-cs-place/pom.xml @@ -1,5 +1,6 @@ - - + org.collectionspace.services org.collectionspace.services.place.3rdparty @@ -39,4 +40,4 @@ - \ No newline at end of file + diff --git a/services/place/3rdparty/pom.xml b/services/place/3rdparty/pom.xml index 5e92841cb2..6a3122627e 100644 --- a/services/place/3rdparty/pom.xml +++ b/services/place/3rdparty/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services org.collectionspace.services.place @@ -19,4 +21,4 @@ nuxeo-platform-cs-place --> - \ No newline at end of file + diff --git a/services/place/client/pom.xml b/services/place/client/pom.xml index 356332f6e9..44e900a5db 100644 --- a/services/place/client/pom.xml +++ b/services/place/client/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services org.collectionspace.services.place @@ -64,4 +66,4 @@ collectionspace-services-place-client - \ No newline at end of file + diff --git a/services/place/jaxb/pom.xml b/services/place/jaxb/pom.xml index 9edeba6ccd..a32f5757af 100644 --- a/services/place/jaxb/pom.xml +++ b/services/place/jaxb/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services org.collectionspace.services.place @@ -43,4 +45,4 @@ - \ No newline at end of file + diff --git a/services/place/pom.xml b/services/place/pom.xml index 874a8e1412..eb228ee66b 100644 --- a/services/place/pom.xml +++ b/services/place/pom.xml @@ -1,5 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.main @@ -27,4 +27,5 @@ client - \ No newline at end of file + + diff --git a/services/place/service/pom.xml b/services/place/service/pom.xml index 2b61ecac0e..911e1217fb 100644 --- a/services/place/service/pom.xml +++ b/services/place/service/pom.xml @@ -1,5 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.place @@ -109,4 +109,4 @@ collectionspace-services-place - \ No newline at end of file + diff --git a/services/pom.xml b/services/pom.xml index 5c190ce736..b42ab8fc0d 100644 --- a/services/pom.xml +++ b/services/pom.xml @@ -1,5 +1,6 @@ - - + + org.collectionspace.services org.collectionspace.services @@ -359,4 +360,4 @@ - \ No newline at end of file + diff --git a/services/pottag/3rdparty/nuxeo-platform-cs-pottag/pom.xml b/services/pottag/3rdparty/nuxeo-platform-cs-pottag/pom.xml index c2f2844453..27b56d843c 100644 --- a/services/pottag/3rdparty/nuxeo-platform-cs-pottag/pom.xml +++ b/services/pottag/3rdparty/nuxeo-platform-cs-pottag/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services @@ -51,4 +53,4 @@ - \ No newline at end of file + diff --git a/services/pottag/3rdparty/pom.xml b/services/pottag/3rdparty/pom.xml index f5a02cc2b9..ab94f1347e 100644 --- a/services/pottag/3rdparty/pom.xml +++ b/services/pottag/3rdparty/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services.pottag org.collectionspace.services @@ -27,4 +29,4 @@ nuxeo-platform-cs-pottag --> - \ No newline at end of file + diff --git a/services/pottag/client/pom.xml b/services/pottag/client/pom.xml index 5842600095..18cc3e5548 100644 --- a/services/pottag/client/pom.xml +++ b/services/pottag/client/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services org.collectionspace.services.pottag @@ -71,4 +73,4 @@ collectionspace-services-pottag-client - \ No newline at end of file + diff --git a/services/pottag/jaxb/pom.xml b/services/pottag/jaxb/pom.xml index 771979f056..d75e887a0c 100644 --- a/services/pottag/jaxb/pom.xml +++ b/services/pottag/jaxb/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services.pottag org.collectionspace.services @@ -33,4 +35,5 @@ - \ No newline at end of file + + diff --git a/services/pottag/pom.xml b/services/pottag/pom.xml index 2fc6bac7f4..bdc41cfe64 100644 --- a/services/pottag/pom.xml +++ b/services/pottag/pom.xml @@ -1,5 +1,6 @@ - - + + + org.collectionspace.services org.collectionspace.services.main @@ -21,4 +22,5 @@ client - \ No newline at end of file + + diff --git a/services/pottag/service/pom.xml b/services/pottag/service/pom.xml index c5bc691894..7d16a668bb 100644 --- a/services/pottag/service/pom.xml +++ b/services/pottag/service/pom.xml @@ -1,5 +1,5 @@ - - + + org.collectionspace.services @@ -91,4 +91,4 @@ collectionspace-services-pottag - \ No newline at end of file + diff --git a/services/propagation/3rdparty/nuxeo-platform-cs-propagation/pom.xml b/services/propagation/3rdparty/nuxeo-platform-cs-propagation/pom.xml index 75524db14c..7112009d69 100644 --- a/services/propagation/3rdparty/nuxeo-platform-cs-propagation/pom.xml +++ b/services/propagation/3rdparty/nuxeo-platform-cs-propagation/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services @@ -51,4 +53,4 @@ - \ No newline at end of file + diff --git a/services/propagation/3rdparty/pom.xml b/services/propagation/3rdparty/pom.xml index fcb0135faa..29b93b2353 100644 --- a/services/propagation/3rdparty/pom.xml +++ b/services/propagation/3rdparty/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services.propagation org.collectionspace.services @@ -27,4 +29,4 @@ nuxeo-platform-cs-propagation --> - \ No newline at end of file + diff --git a/services/propagation/client/pom.xml b/services/propagation/client/pom.xml index b87eeef963..802774a859 100644 --- a/services/propagation/client/pom.xml +++ b/services/propagation/client/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services org.collectionspace.services.propagation @@ -69,4 +71,4 @@ collectionspace-services-propagation-client - \ No newline at end of file + diff --git a/services/propagation/jaxb/pom.xml b/services/propagation/jaxb/pom.xml index a63daf413a..ef08245c09 100644 --- a/services/propagation/jaxb/pom.xml +++ b/services/propagation/jaxb/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services.propagation org.collectionspace.services @@ -32,4 +34,5 @@ - \ No newline at end of file + + diff --git a/services/propagation/pom.xml b/services/propagation/pom.xml index 1394bba723..71f6028d77 100644 --- a/services/propagation/pom.xml +++ b/services/propagation/pom.xml @@ -1,5 +1,6 @@ - - + + + org.collectionspace.services org.collectionspace.services.main @@ -22,4 +23,5 @@ client - \ No newline at end of file + + diff --git a/services/propagation/service/pom.xml b/services/propagation/service/pom.xml index 163b32c25c..cba945709f 100644 --- a/services/propagation/service/pom.xml +++ b/services/propagation/service/pom.xml @@ -1,5 +1,5 @@ - - + + org.collectionspace.services @@ -96,4 +96,4 @@ collectionspace-services-propagation - \ No newline at end of file + diff --git a/services/publicitem/3rdparty/nuxeo-platform-cs-publicitem/pom.xml b/services/publicitem/3rdparty/nuxeo-platform-cs-publicitem/pom.xml index 287f827f62..05ef16127b 100644 --- a/services/publicitem/3rdparty/nuxeo-platform-cs-publicitem/pom.xml +++ b/services/publicitem/3rdparty/nuxeo-platform-cs-publicitem/pom.xml @@ -1,5 +1,6 @@ - - + org.collectionspace.services @@ -50,4 +51,4 @@ - \ No newline at end of file + diff --git a/services/publicitem/3rdparty/pom.xml b/services/publicitem/3rdparty/pom.xml index f91ea163dd..18915e1e11 100644 --- a/services/publicitem/3rdparty/pom.xml +++ b/services/publicitem/3rdparty/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services.publicitem org.collectionspace.services @@ -18,4 +20,4 @@ nuxeo-platform-cs-publicitem - \ No newline at end of file + diff --git a/services/publicitem/client/pom.xml b/services/publicitem/client/pom.xml index 0833ed9627..5eef9a3656 100644 --- a/services/publicitem/client/pom.xml +++ b/services/publicitem/client/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services org.collectionspace.services.publicitem @@ -63,4 +65,4 @@ collectionspace-services-publicitem-client - \ No newline at end of file + diff --git a/services/publicitem/jaxb/pom.xml b/services/publicitem/jaxb/pom.xml index 38e15632e9..e7c7da0803 100644 --- a/services/publicitem/jaxb/pom.xml +++ b/services/publicitem/jaxb/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services.publicitem org.collectionspace.services @@ -32,4 +34,5 @@ - \ No newline at end of file + + diff --git a/services/publicitem/pom.xml b/services/publicitem/pom.xml index c8361de50e..c9932d12fe 100644 --- a/services/publicitem/pom.xml +++ b/services/publicitem/pom.xml @@ -1,5 +1,6 @@ - - + + + org.collectionspace.services org.collectionspace.services.main @@ -21,4 +22,5 @@ service - \ No newline at end of file + + diff --git a/services/publicitem/service/pom.xml b/services/publicitem/service/pom.xml index 6769711075..0538d5db7c 100644 --- a/services/publicitem/service/pom.xml +++ b/services/publicitem/service/pom.xml @@ -1,5 +1,5 @@ - - + + org.collectionspace.services @@ -85,4 +85,4 @@ collectionspace-services-publicitem - \ No newline at end of file + diff --git a/services/query/pom.xml b/services/query/pom.xml index a0e04d21bf..98c04458a7 100644 --- a/services/query/pom.xml +++ b/services/query/pom.xml @@ -1,5 +1,5 @@ - - + + org.collectionspace.services.main org.collectionspace.services @@ -22,4 +22,5 @@ service - \ No newline at end of file + + diff --git a/services/query/service/pom.xml b/services/query/service/pom.xml index 7291d108c8..116181ec58 100644 --- a/services/query/service/pom.xml +++ b/services/query/service/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services org.collectionspace.services.query @@ -45,4 +47,4 @@ collectionspace-services-query - \ No newline at end of file + diff --git a/services/relation/3rdparty/nuxeo-platform-cs-relation/pom.xml b/services/relation/3rdparty/nuxeo-platform-cs-relation/pom.xml index 378e57d14c..73f3d9128f 100644 --- a/services/relation/3rdparty/nuxeo-platform-cs-relation/pom.xml +++ b/services/relation/3rdparty/nuxeo-platform-cs-relation/pom.xml @@ -1,5 +1,6 @@ - - + org.collectionspace.services org.collectionspace.services.relation.3rdparty @@ -38,4 +39,4 @@ - \ No newline at end of file + diff --git a/services/relation/3rdparty/pom.xml b/services/relation/3rdparty/pom.xml index bc9b75ff67..c12d4a95d3 100644 --- a/services/relation/3rdparty/pom.xml +++ b/services/relation/3rdparty/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services.relation org.collectionspace.services @@ -19,4 +21,4 @@ nuxeo-platform-cs-relation - \ No newline at end of file + diff --git a/services/relation/client/pom.xml b/services/relation/client/pom.xml index 886fd7082c..96e89ab949 100644 --- a/services/relation/client/pom.xml +++ b/services/relation/client/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services org.collectionspace.services.relation @@ -63,4 +65,4 @@ cspace-services-relation-client - \ No newline at end of file + diff --git a/services/relation/pom.xml b/services/relation/pom.xml index 079e183654..a0f580b440 100644 --- a/services/relation/pom.xml +++ b/services/relation/pom.xml @@ -1,5 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.main @@ -18,4 +18,5 @@ client - \ No newline at end of file + + diff --git a/services/relation/service/pom.xml b/services/relation/service/pom.xml index d955c9b75a..5477f11faa 100644 --- a/services/relation/service/pom.xml +++ b/services/relation/service/pom.xml @@ -1,5 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.relation @@ -117,4 +117,4 @@ collectionspace-services-relation - \ No newline at end of file + diff --git a/services/repatriationrequest/client/pom.xml b/services/repatriationrequest/client/pom.xml index 8ef4b3e8f6..aa3b731c34 100644 --- a/services/repatriationrequest/client/pom.xml +++ b/services/repatriationrequest/client/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services org.collectionspace.services.repatriationrequest diff --git a/services/repatriationrequest/jaxb/pom.xml b/services/repatriationrequest/jaxb/pom.xml index 3a21920d06..b74a788a3e 100644 --- a/services/repatriationrequest/jaxb/pom.xml +++ b/services/repatriationrequest/jaxb/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services.repatriationrequest org.collectionspace.services diff --git a/services/repatriationrequest/pom.xml b/services/repatriationrequest/pom.xml index d00f2e45d4..878359b2df 100644 --- a/services/repatriationrequest/pom.xml +++ b/services/repatriationrequest/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services org.collectionspace.services.main @@ -30,8 +32,8 @@ src/main/java/**/*.java src/test/java/**/*.java - - + + true 4 @@ -40,7 +42,7 @@ - + diff --git a/services/repatriationrequest/service/pom.xml b/services/repatriationrequest/service/pom.xml index 6dddfa67f7..d68c441af7 100644 --- a/services/repatriationrequest/service/pom.xml +++ b/services/repatriationrequest/service/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services diff --git a/services/report/3rdparty/pom.xml b/services/report/3rdparty/pom.xml index c192bf2483..cc3bb99312 100644 --- a/services/report/3rdparty/pom.xml +++ b/services/report/3rdparty/pom.xml @@ -1,5 +1,6 @@ - - + org.collectionspace.services.report org.collectionspace.services @@ -20,4 +21,4 @@ nuxeo-platform-cs-report --> - \ No newline at end of file + diff --git a/services/report/client/pom.xml b/services/report/client/pom.xml index 90e7bb85f7..c14b8d6353 100644 --- a/services/report/client/pom.xml +++ b/services/report/client/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services org.collectionspace.services.report @@ -78,4 +80,4 @@ collectionspace-services-report-client - \ No newline at end of file + diff --git a/services/report/jaxb/pom.xml b/services/report/jaxb/pom.xml index c33bf67379..06bebdfeeb 100644 --- a/services/report/jaxb/pom.xml +++ b/services/report/jaxb/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services.report org.collectionspace.services @@ -32,4 +34,5 @@ - \ No newline at end of file + + diff --git a/services/report/pom.xml b/services/report/pom.xml index e1d668d94c..d0f4baa21b 100644 --- a/services/report/pom.xml +++ b/services/report/pom.xml @@ -1,5 +1,7 @@ - - + + + org.collectionspace.services org.collectionspace.services.main @@ -75,4 +77,4 @@ client - \ No newline at end of file + diff --git a/services/report/service/pom.xml b/services/report/service/pom.xml index 6a1345f1f9..d8d6ea198e 100644 --- a/services/report/service/pom.xml +++ b/services/report/service/pom.xml @@ -1,5 +1,5 @@ - - + + org.collectionspace.services @@ -113,4 +113,4 @@ collectionspace-services-report - \ No newline at end of file + diff --git a/services/restrictedmedia/client/pom.xml b/services/restrictedmedia/client/pom.xml index 09b0ea1eff..2ccb0db6f1 100644 --- a/services/restrictedmedia/client/pom.xml +++ b/services/restrictedmedia/client/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services org.collectionspace.services.restrictedmedia @@ -146,7 +148,7 @@ /static ${project.build.directory}/maven-shared-archive-resources - + jar @@ -164,4 +166,4 @@ - \ No newline at end of file + diff --git a/services/restrictedmedia/jaxb/pom.xml b/services/restrictedmedia/jaxb/pom.xml index 15512161ec..fa60b7376c 100644 --- a/services/restrictedmedia/jaxb/pom.xml +++ b/services/restrictedmedia/jaxb/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services.restrictedmedia org.collectionspace.services @@ -28,4 +30,4 @@ - \ No newline at end of file + diff --git a/services/restrictedmedia/pom.xml b/services/restrictedmedia/pom.xml index f9ca52d7ff..d80e22916c 100644 --- a/services/restrictedmedia/pom.xml +++ b/services/restrictedmedia/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services org.collectionspace.services.main @@ -30,8 +32,8 @@ src/main/java/**/*.java src/test/java/**/*.java - - + + true 4 diff --git a/services/restrictedmedia/service/pom.xml b/services/restrictedmedia/service/pom.xml index 87682a4120..6a6530f22d 100644 --- a/services/restrictedmedia/service/pom.xml +++ b/services/restrictedmedia/service/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services @@ -104,4 +106,4 @@ collectionspace-services-restrictedmedia - \ No newline at end of file + diff --git a/services/security/client/pom.xml b/services/security/client/pom.xml index 2afc9afea3..e7dee9f82c 100644 --- a/services/security/client/pom.xml +++ b/services/security/client/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services.security org.collectionspace.services @@ -100,4 +102,4 @@ - \ No newline at end of file + diff --git a/services/security/pom.xml b/services/security/pom.xml index b8643f8ecd..3024eb437a 100644 --- a/services/security/pom.xml +++ b/services/security/pom.xml @@ -1,5 +1,5 @@ - - + + org.collectionspace.services.main org.collectionspace.services @@ -19,4 +19,5 @@ client - \ No newline at end of file + + diff --git a/services/servicegroup/client/pom.xml b/services/servicegroup/client/pom.xml index 83740343ec..14f5d3db5a 100644 --- a/services/servicegroup/client/pom.xml +++ b/services/servicegroup/client/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services org.collectionspace.services.servicegroup @@ -58,4 +60,4 @@ collectionspace-services-servicegroup-client - \ No newline at end of file + diff --git a/services/servicegroup/jaxb/pom.xml b/services/servicegroup/jaxb/pom.xml index 14ec929a3c..68c9d5626c 100644 --- a/services/servicegroup/jaxb/pom.xml +++ b/services/servicegroup/jaxb/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services.servicegroup org.collectionspace.services @@ -33,4 +35,5 @@ - \ No newline at end of file + + diff --git a/services/servicegroup/pom.xml b/services/servicegroup/pom.xml index b176db7eb6..0c70968397 100644 --- a/services/servicegroup/pom.xml +++ b/services/servicegroup/pom.xml @@ -1,5 +1,6 @@ - - + + + org.collectionspace.services org.collectionspace.services.main @@ -18,4 +19,5 @@ client - \ No newline at end of file + + diff --git a/services/servicegroup/service/pom.xml b/services/servicegroup/service/pom.xml index e6f30e3d2f..d4de08fe43 100644 --- a/services/servicegroup/service/pom.xml +++ b/services/servicegroup/service/pom.xml @@ -1,5 +1,5 @@ - - + + org.collectionspace.services @@ -90,4 +90,4 @@ collectionspace-services-servicegroup - \ No newline at end of file + diff --git a/services/structureddate/client/pom.xml b/services/structureddate/client/pom.xml index ff71b74f77..278020446e 100644 --- a/services/structureddate/client/pom.xml +++ b/services/structureddate/client/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services org.collectionspace.services.structureddate @@ -53,4 +55,4 @@ collectionspace-services-structureddate-client - \ No newline at end of file + diff --git a/services/structureddate/jaxb/pom.xml b/services/structureddate/jaxb/pom.xml index e86b76457b..ee6d09e9a5 100644 --- a/services/structureddate/jaxb/pom.xml +++ b/services/structureddate/jaxb/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services.structureddate org.collectionspace.services @@ -32,4 +34,5 @@ - \ No newline at end of file + + diff --git a/services/structureddate/pom.xml b/services/structureddate/pom.xml index c4f8c92127..9fc0c517eb 100644 --- a/services/structureddate/pom.xml +++ b/services/structureddate/pom.xml @@ -1,5 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.main @@ -18,4 +18,4 @@ service - \ No newline at end of file + diff --git a/services/structureddate/service/pom.xml b/services/structureddate/service/pom.xml index 1c6274052c..9e80fa1b1e 100644 --- a/services/structureddate/service/pom.xml +++ b/services/structureddate/service/pom.xml @@ -1,5 +1,5 @@ - - + + org.collectionspace.services @@ -74,4 +74,4 @@ collectionspace-services-structureddate-service - \ No newline at end of file + diff --git a/services/structureddate/structureddate/pom.xml b/services/structureddate/structureddate/pom.xml index 8454460197..817ad77ca8 100644 --- a/services/structureddate/structureddate/pom.xml +++ b/services/structureddate/structureddate/pom.xml @@ -1,5 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.structureddate @@ -98,4 +98,4 @@ - \ No newline at end of file + diff --git a/services/summarydocumentation/client/pom.xml b/services/summarydocumentation/client/pom.xml index c71e9060b5..ed83674252 100644 --- a/services/summarydocumentation/client/pom.xml +++ b/services/summarydocumentation/client/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services org.collectionspace.services.summarydocumentation diff --git a/services/summarydocumentation/jaxb/pom.xml b/services/summarydocumentation/jaxb/pom.xml index f66b1ae372..4222286037 100644 --- a/services/summarydocumentation/jaxb/pom.xml +++ b/services/summarydocumentation/jaxb/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services.summarydocumentation org.collectionspace.services diff --git a/services/summarydocumentation/pom.xml b/services/summarydocumentation/pom.xml index 084ba2fd5e..11bb5cef41 100644 --- a/services/summarydocumentation/pom.xml +++ b/services/summarydocumentation/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services org.collectionspace.services.main @@ -30,8 +32,8 @@ src/main/java/**/*.java src/test/java/**/*.java - - + + true 4 @@ -40,7 +42,7 @@ - + diff --git a/services/summarydocumentation/service/pom.xml b/services/summarydocumentation/service/pom.xml index fe9526a7e7..e5c5083f19 100644 --- a/services/summarydocumentation/service/pom.xml +++ b/services/summarydocumentation/service/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services @@ -83,4 +85,4 @@ collectionspace-services-summarydocumentation - \ No newline at end of file + diff --git a/services/systeminfo/client/pom.xml b/services/systeminfo/client/pom.xml index ae9f6166bb..8d200e0fbd 100644 --- a/services/systeminfo/client/pom.xml +++ b/services/systeminfo/client/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services org.collectionspace.services.systeminfo @@ -48,4 +50,4 @@ collectionspace-services-systeminfo-client - \ No newline at end of file + diff --git a/services/systeminfo/jaxb/pom.xml b/services/systeminfo/jaxb/pom.xml index 4668975efd..e9d0910982 100644 --- a/services/systeminfo/jaxb/pom.xml +++ b/services/systeminfo/jaxb/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services.systeminfo org.collectionspace.services @@ -32,4 +34,5 @@ - \ No newline at end of file + + diff --git a/services/systeminfo/pom.xml b/services/systeminfo/pom.xml index 96f480f09d..ec44dcaf3f 100644 --- a/services/systeminfo/pom.xml +++ b/services/systeminfo/pom.xml @@ -1,5 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.main @@ -17,4 +17,4 @@ service - \ No newline at end of file + diff --git a/services/systeminfo/service/pom.xml b/services/systeminfo/service/pom.xml index 05ac0af588..af6c062f7b 100644 --- a/services/systeminfo/service/pom.xml +++ b/services/systeminfo/service/pom.xml @@ -1,5 +1,5 @@ - - + + org.collectionspace.services @@ -69,4 +69,4 @@ collectionspace-services-systeminfo-service - \ No newline at end of file + diff --git a/services/taxonomy/3rdparty/nuxeo-platform-cs-taxonomy/pom.xml b/services/taxonomy/3rdparty/nuxeo-platform-cs-taxonomy/pom.xml index 46ede63f8e..a99d324deb 100644 --- a/services/taxonomy/3rdparty/nuxeo-platform-cs-taxonomy/pom.xml +++ b/services/taxonomy/3rdparty/nuxeo-platform-cs-taxonomy/pom.xml @@ -1,5 +1,6 @@ - - + org.collectionspace.services org.collectionspace.services.taxonomy.3rdparty @@ -39,4 +40,4 @@ - \ No newline at end of file + diff --git a/services/taxonomy/3rdparty/pom.xml b/services/taxonomy/3rdparty/pom.xml index 4e9e875626..c8eabf2f03 100644 --- a/services/taxonomy/3rdparty/pom.xml +++ b/services/taxonomy/3rdparty/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services org.collectionspace.services.taxonomy @@ -19,4 +21,4 @@ nuxeo-platform-cs-taxonomy --> - \ No newline at end of file + diff --git a/services/taxonomy/client/pom.xml b/services/taxonomy/client/pom.xml index f697093ebf..4f49883c92 100644 --- a/services/taxonomy/client/pom.xml +++ b/services/taxonomy/client/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services org.collectionspace.services.taxonomy @@ -70,4 +72,4 @@ - \ No newline at end of file + diff --git a/services/taxonomy/jaxb/pom.xml b/services/taxonomy/jaxb/pom.xml index 3ecbab353c..a1b6809ddd 100644 --- a/services/taxonomy/jaxb/pom.xml +++ b/services/taxonomy/jaxb/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services org.collectionspace.services.taxonomy @@ -41,4 +43,5 @@ - \ No newline at end of file + + diff --git a/services/taxonomy/pom.xml b/services/taxonomy/pom.xml index e4a2c2bce7..5da79e76b3 100644 --- a/services/taxonomy/pom.xml +++ b/services/taxonomy/pom.xml @@ -1,5 +1,6 @@ - - + + org.collectionspace.services org.collectionspace.services.main @@ -29,4 +30,5 @@ client - \ No newline at end of file + + diff --git a/services/taxonomy/service/pom.xml b/services/taxonomy/service/pom.xml index a26044500d..5e63fa43c2 100644 --- a/services/taxonomy/service/pom.xml +++ b/services/taxonomy/service/pom.xml @@ -1,5 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.taxonomy @@ -94,4 +94,4 @@ - \ No newline at end of file + diff --git a/services/transport/3rdparty/nuxeo-platform-cs-transport/pom.xml b/services/transport/3rdparty/nuxeo-platform-cs-transport/pom.xml index 4e11ff07bc..c0bcd4a750 100644 --- a/services/transport/3rdparty/nuxeo-platform-cs-transport/pom.xml +++ b/services/transport/3rdparty/nuxeo-platform-cs-transport/pom.xml @@ -1,5 +1,6 @@ - - + org.collectionspace.services @@ -50,4 +51,4 @@ - \ No newline at end of file + diff --git a/services/transport/3rdparty/pom.xml b/services/transport/3rdparty/pom.xml index 4f84f1c51f..f3b4d5bfd1 100644 --- a/services/transport/3rdparty/pom.xml +++ b/services/transport/3rdparty/pom.xml @@ -1,5 +1,6 @@ - - + org.collectionspace.services.transport org.collectionspace.services @@ -20,4 +21,4 @@ nuxeo-platform-cs-transport --> - \ No newline at end of file + diff --git a/services/transport/client/pom.xml b/services/transport/client/pom.xml index 72f114ee5f..4a72870df0 100644 --- a/services/transport/client/pom.xml +++ b/services/transport/client/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services org.collectionspace.services.transport @@ -76,4 +78,4 @@ collectionspace-services-transport-client - \ No newline at end of file + diff --git a/services/transport/jaxb/pom.xml b/services/transport/jaxb/pom.xml index 234454af64..a6bb1ab8e8 100644 --- a/services/transport/jaxb/pom.xml +++ b/services/transport/jaxb/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services.transport org.collectionspace.services diff --git a/services/transport/pom.xml b/services/transport/pom.xml index 3879854021..5e348b4534 100644 --- a/services/transport/pom.xml +++ b/services/transport/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services org.collectionspace.services.main @@ -18,4 +20,4 @@ client - \ No newline at end of file + diff --git a/services/transport/service/pom.xml b/services/transport/service/pom.xml index cc918a0fc5..e5993e1636 100644 --- a/services/transport/service/pom.xml +++ b/services/transport/service/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services @@ -91,4 +93,4 @@ collectionspace-services-transport - \ No newline at end of file + diff --git a/services/uoc/3rdparty/nuxeo-platform-cs-uoc/pom.xml b/services/uoc/3rdparty/nuxeo-platform-cs-uoc/pom.xml index 92f1d0dce5..f032a8e094 100644 --- a/services/uoc/3rdparty/nuxeo-platform-cs-uoc/pom.xml +++ b/services/uoc/3rdparty/nuxeo-platform-cs-uoc/pom.xml @@ -1,5 +1,6 @@ - - + org.collectionspace.services @@ -51,4 +52,4 @@ - \ No newline at end of file + diff --git a/services/uoc/3rdparty/pom.xml b/services/uoc/3rdparty/pom.xml index 7d8a411549..fb55d80466 100644 --- a/services/uoc/3rdparty/pom.xml +++ b/services/uoc/3rdparty/pom.xml @@ -1,5 +1,6 @@ - - + org.collectionspace.services.uoc org.collectionspace.services @@ -20,4 +21,4 @@ nuxeo-platform-cs-uoc --> - \ No newline at end of file + diff --git a/services/uoc/client/pom.xml b/services/uoc/client/pom.xml index 9ee3c80d05..05e8bd37a1 100644 --- a/services/uoc/client/pom.xml +++ b/services/uoc/client/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services org.collectionspace.services.uoc @@ -68,4 +70,4 @@ collectionspace-services-uoc-client - \ No newline at end of file + diff --git a/services/uoc/jaxb/pom.xml b/services/uoc/jaxb/pom.xml index 4e41395ab0..91fcb054c9 100644 --- a/services/uoc/jaxb/pom.xml +++ b/services/uoc/jaxb/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services.uoc org.collectionspace.services @@ -32,4 +34,5 @@ - \ No newline at end of file + + diff --git a/services/uoc/pom.xml b/services/uoc/pom.xml index 05627271ed..2317dc90be 100644 --- a/services/uoc/pom.xml +++ b/services/uoc/pom.xml @@ -1,5 +1,6 @@ - - + + + org.collectionspace.services org.collectionspace.services.main @@ -21,4 +22,5 @@ client - \ No newline at end of file + + diff --git a/services/uoc/service/pom.xml b/services/uoc/service/pom.xml index dee2cec907..57c7ad7d8f 100644 --- a/services/uoc/service/pom.xml +++ b/services/uoc/service/pom.xml @@ -1,5 +1,5 @@ - - + + org.collectionspace.services @@ -86,4 +86,4 @@ collectionspace-services-uoc - \ No newline at end of file + diff --git a/services/valuationcontrol/3rdparty/nuxeo-platform-cs-valuationcontrol/pom.xml b/services/valuationcontrol/3rdparty/nuxeo-platform-cs-valuationcontrol/pom.xml index 2d09402303..149062c077 100644 --- a/services/valuationcontrol/3rdparty/nuxeo-platform-cs-valuationcontrol/pom.xml +++ b/services/valuationcontrol/3rdparty/nuxeo-platform-cs-valuationcontrol/pom.xml @@ -1,5 +1,6 @@ - - + org.collectionspace.services @@ -51,4 +52,4 @@ - \ No newline at end of file + diff --git a/services/valuationcontrol/3rdparty/pom.xml b/services/valuationcontrol/3rdparty/pom.xml index feab2669bf..b439f93117 100644 --- a/services/valuationcontrol/3rdparty/pom.xml +++ b/services/valuationcontrol/3rdparty/pom.xml @@ -1,5 +1,6 @@ - - + org.collectionspace.services.valuationcontrol org.collectionspace.services @@ -20,4 +21,4 @@ nuxeo-platform-cs-valuationcontrol --> - \ No newline at end of file + diff --git a/services/valuationcontrol/client/pom.xml b/services/valuationcontrol/client/pom.xml index ccd34ce447..55372ae4b0 100644 --- a/services/valuationcontrol/client/pom.xml +++ b/services/valuationcontrol/client/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services org.collectionspace.services.valuationcontrol @@ -69,4 +71,4 @@ collectionspace-services-valuationcontrol-client - \ No newline at end of file + diff --git a/services/valuationcontrol/jaxb/pom.xml b/services/valuationcontrol/jaxb/pom.xml index 7849e87de5..46a22c4f5d 100644 --- a/services/valuationcontrol/jaxb/pom.xml +++ b/services/valuationcontrol/jaxb/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services.valuationcontrol org.collectionspace.services @@ -33,4 +35,4 @@ - \ No newline at end of file + diff --git a/services/valuationcontrol/pom.xml b/services/valuationcontrol/pom.xml index 124012e9ec..c53b692905 100644 --- a/services/valuationcontrol/pom.xml +++ b/services/valuationcontrol/pom.xml @@ -1,5 +1,6 @@ - - + + + org.collectionspace.services org.collectionspace.services.main @@ -19,4 +20,4 @@ client - \ No newline at end of file + diff --git a/services/valuationcontrol/service/pom.xml b/services/valuationcontrol/service/pom.xml index 6577c2bc0b..08c50c5e41 100644 --- a/services/valuationcontrol/service/pom.xml +++ b/services/valuationcontrol/service/pom.xml @@ -1,5 +1,5 @@ - - + + org.collectionspace.services @@ -85,4 +85,4 @@ collectionspace-services-valuationcontrol - \ No newline at end of file + diff --git a/services/vocabulary/3rdparty/nuxeo-platform-cs-vocabulary/pom.xml b/services/vocabulary/3rdparty/nuxeo-platform-cs-vocabulary/pom.xml index 71d151d8d0..c34e87cfd7 100644 --- a/services/vocabulary/3rdparty/nuxeo-platform-cs-vocabulary/pom.xml +++ b/services/vocabulary/3rdparty/nuxeo-platform-cs-vocabulary/pom.xml @@ -1,5 +1,6 @@ - - + org.collectionspace.services org.collectionspace.services.vocabulary.3rdparty @@ -39,4 +40,4 @@ - \ No newline at end of file + diff --git a/services/vocabulary/3rdparty/pom.xml b/services/vocabulary/3rdparty/pom.xml index 1b870848eb..a6452195af 100644 --- a/services/vocabulary/3rdparty/pom.xml +++ b/services/vocabulary/3rdparty/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services org.collectionspace.services.vocabulary @@ -19,4 +21,4 @@ nuxeo-platform-cs-vocabulary --> - \ No newline at end of file + diff --git a/services/vocabulary/client/pom.xml b/services/vocabulary/client/pom.xml index 506aa09b35..88bfddf698 100644 --- a/services/vocabulary/client/pom.xml +++ b/services/vocabulary/client/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services @@ -60,4 +62,4 @@ collectionspace-services-vocabulary-client - \ No newline at end of file + diff --git a/services/vocabulary/jaxb/pom.xml b/services/vocabulary/jaxb/pom.xml index 47cd5ce758..e3052902e7 100644 --- a/services/vocabulary/jaxb/pom.xml +++ b/services/vocabulary/jaxb/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services org.collectionspace.services.vocabulary @@ -37,4 +39,5 @@ - \ No newline at end of file + + diff --git a/services/vocabulary/pom.xml b/services/vocabulary/pom.xml index a7c879cbed..31f800daf3 100644 --- a/services/vocabulary/pom.xml +++ b/services/vocabulary/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services.main org.collectionspace.services @@ -19,4 +21,5 @@ client - \ No newline at end of file + + diff --git a/services/vocabulary/service/pom.xml b/services/vocabulary/service/pom.xml index 5df87da6da..6b13d244df 100644 --- a/services/vocabulary/service/pom.xml +++ b/services/vocabulary/service/pom.xml @@ -1,5 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.vocabulary @@ -98,4 +98,4 @@ collectionspace-services-vocabulary - \ No newline at end of file + diff --git a/services/work/3rdparty/nuxeo-platform-cs-work/pom.xml b/services/work/3rdparty/nuxeo-platform-cs-work/pom.xml index 3dc97ea27d..4c92932f55 100644 --- a/services/work/3rdparty/nuxeo-platform-cs-work/pom.xml +++ b/services/work/3rdparty/nuxeo-platform-cs-work/pom.xml @@ -1,5 +1,6 @@ - - + org.collectionspace.services org.collectionspace.services.work.3rdparty @@ -38,4 +39,4 @@ - \ No newline at end of file + diff --git a/services/work/3rdparty/pom.xml b/services/work/3rdparty/pom.xml index b4924ebcd5..969ec7e21a 100644 --- a/services/work/3rdparty/pom.xml +++ b/services/work/3rdparty/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services org.collectionspace.services.work @@ -19,4 +21,4 @@ nuxeo-platform-cs-work --> - \ No newline at end of file + diff --git a/services/work/client/pom.xml b/services/work/client/pom.xml index 5f6b2157fe..1755a5ff05 100644 --- a/services/work/client/pom.xml +++ b/services/work/client/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services org.collectionspace.services.work @@ -64,4 +66,4 @@ collectionspace-services-work-client - \ No newline at end of file + diff --git a/services/work/jaxb/pom.xml b/services/work/jaxb/pom.xml index bb6337c842..fe8dd035ca 100644 --- a/services/work/jaxb/pom.xml +++ b/services/work/jaxb/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services org.collectionspace.services.work @@ -43,4 +45,4 @@ - \ No newline at end of file + diff --git a/services/work/pom.xml b/services/work/pom.xml index 2832ee2e44..fa8b939d82 100644 --- a/services/work/pom.xml +++ b/services/work/pom.xml @@ -1,5 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.main @@ -28,4 +28,5 @@ client - \ No newline at end of file + + diff --git a/services/work/service/pom.xml b/services/work/service/pom.xml index 45ba04d741..6f43e809b1 100644 --- a/services/work/service/pom.xml +++ b/services/work/service/pom.xml @@ -1,5 +1,5 @@ - - + + org.collectionspace.services org.collectionspace.services.work @@ -109,4 +109,4 @@ collectionspace-services-work - \ No newline at end of file + diff --git a/services/workflow/3rdparty/nuxeo-platform-cs-workflow/pom.xml b/services/workflow/3rdparty/nuxeo-platform-cs-workflow/pom.xml index 0695840878..5dc425579d 100644 --- a/services/workflow/3rdparty/nuxeo-platform-cs-workflow/pom.xml +++ b/services/workflow/3rdparty/nuxeo-platform-cs-workflow/pom.xml @@ -1,5 +1,6 @@ - - + 4.0.0 org.collectionspace.services @@ -38,4 +39,4 @@ - \ No newline at end of file + diff --git a/services/workflow/3rdparty/pom.xml b/services/workflow/3rdparty/pom.xml index 584f819994..1f24dc016d 100644 --- a/services/workflow/3rdparty/pom.xml +++ b/services/workflow/3rdparty/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services.workflow org.collectionspace.services @@ -18,4 +20,4 @@ nuxeo-platform-cs-workflow - \ No newline at end of file + diff --git a/services/workflow/client/pom.xml b/services/workflow/client/pom.xml index ad314ee79a..e4c171da45 100644 --- a/services/workflow/client/pom.xml +++ b/services/workflow/client/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services org.collectionspace.services.workflow @@ -58,4 +60,4 @@ collectionspace-services-workflow-client - \ No newline at end of file + diff --git a/services/workflow/jaxb/pom.xml b/services/workflow/jaxb/pom.xml index 172e5e3fd4..61e70f3501 100644 --- a/services/workflow/jaxb/pom.xml +++ b/services/workflow/jaxb/pom.xml @@ -1,5 +1,7 @@ - - + + org.collectionspace.services org.collectionspace.services.workflow @@ -32,4 +34,5 @@ - \ No newline at end of file + + diff --git a/services/workflow/pom.xml b/services/workflow/pom.xml index 11d58a2f7b..eebcab4881 100644 --- a/services/workflow/pom.xml +++ b/services/workflow/pom.xml @@ -1,5 +1,6 @@ - - + + + org.collectionspace.services org.collectionspace.services.main @@ -17,4 +18,5 @@ service - \ No newline at end of file + + diff --git a/services/workflow/service/pom.xml b/services/workflow/service/pom.xml index 037a4118cc..41065d72dd 100644 --- a/services/workflow/service/pom.xml +++ b/services/workflow/service/pom.xml @@ -1,5 +1,5 @@ - - + + org.collectionspace.services @@ -78,4 +78,4 @@ collectionspace-services-workflow - \ No newline at end of file + From 94d0afe7726e5367eac20cf363ad0c7b90a2fec5 Mon Sep 17 00:00:00 2001 From: Michael Ritter Date: Tue, 10 Mar 2026 15:09:46 -0600 Subject: [PATCH 05/24] Comment out dependency in order to resolve --- services/config/pom.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/services/config/pom.xml b/services/config/pom.xml index 7c4ad2e91c..5d555f7b4f 100644 --- a/services/config/pom.xml +++ b/services/config/pom.xml @@ -36,11 +36,13 @@ 2.12.2 test + org.jvnet.jaxb From f0e3848f373649d6227cf04f52ad81c380a5d449 Mon Sep 17 00:00:00 2001 From: Michael Ritter Date: Fri, 13 Mar 2026 13:58:31 -0600 Subject: [PATCH 06/24] Reset nuxeo version for jaxb testing --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c284477f79..320a8fce6b 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ 3.0.1 2.17.1 17 - 2023.24-SNAPSHOT + 9.10-HF30 ${nuxeo.general.release} ${nuxeo.general.release} ${nuxeo.general.release} From 0dc07835b5e0ede1ad27b3973f8353e56d6533a4 Mon Sep 17 00:00:00 2001 From: Michael Ritter Date: Tue, 24 Mar 2026 12:45:37 -0600 Subject: [PATCH 07/24] Disable hyperjaxb plugin --- services/account/jaxb/pom.xml | 3 ++- services/authentication/jaxb/pom.xml | 3 ++- services/authorization-mgt/jaxb/pom.xml | 3 ++- services/authorization/jaxb/pom.xml | 6 ++++-- services/hyperjaxb/pom.xml | 2 ++ 5 files changed, 12 insertions(+), 5 deletions(-) diff --git a/services/account/jaxb/pom.xml b/services/account/jaxb/pom.xml index a95034b4c9..486d6811c5 100644 --- a/services/account/jaxb/pom.xml +++ b/services/account/jaxb/pom.xml @@ -46,11 +46,12 @@ collectionspace-services-account-jaxb install + org.jvnet.jaxb hyperjaxb3-ejb-plugin + --> diff --git a/services/authentication/jaxb/pom.xml b/services/authentication/jaxb/pom.xml index cd94c7c987..5d37f73c97 100644 --- a/services/authentication/jaxb/pom.xml +++ b/services/authentication/jaxb/pom.xml @@ -42,11 +42,12 @@ collectionspace-services-authentication-jaxb install + org.jvnet.jaxb hyperjaxb3-ejb-plugin + --> diff --git a/services/authorization-mgt/jaxb/pom.xml b/services/authorization-mgt/jaxb/pom.xml index 8c1aa1e36b..44bc2c9589 100644 --- a/services/authorization-mgt/jaxb/pom.xml +++ b/services/authorization-mgt/jaxb/pom.xml @@ -46,11 +46,12 @@ collectionspace-services-authorization-mgt-jaxb install + org.jvnet.jaxb hyperjaxb3-ejb-plugin + --> diff --git a/services/authorization/jaxb/pom.xml b/services/authorization/jaxb/pom.xml index 4eae5866ea..b39c5bd598 100644 --- a/services/authorization/jaxb/pom.xml +++ b/services/authorization/jaxb/pom.xml @@ -77,11 +77,13 @@ collectionspace-services-authorization-jaxb install + - \ No newline at end of file + diff --git a/services/hyperjaxb/pom.xml b/services/hyperjaxb/pom.xml index acfd568b28..5f36fd5305 100644 --- a/services/hyperjaxb/pom.xml +++ b/services/hyperjaxb/pom.xml @@ -74,10 +74,12 @@ install + From 62c617d9ad3c2c4004d97212f8b8028fd807a442 Mon Sep 17 00:00:00 2001 From: Michael Ritter Date: Mon, 6 Apr 2026 11:23:02 -0600 Subject: [PATCH 08/24] DRYD-2052: Update jaxb plugin and schemas (#517) * Updates our XSDs to use the jakarta namespace * Update version and configuration for the jaxb-maven-plugin * Add dependencies for jaxb modules --- pom.xml | 27 ++++-------- services/acquisition/jaxb/pom.xml | 19 ++++---- .../main/resources/acquisitions_common.xsd | 7 ++- .../main/resources/advanced-search_common.xsd | 4 +- services/batch/jaxb/pom.xml | 5 --- .../jaxb/src/main/resources/batch_common.xsd | 15 +++---- services/chronology/jaxb/pom.xml | 7 +-- .../src/main/resources/chronology_common.xsd | 3 +- .../resources/chronologyauthority_common.xsd | 3 +- services/citation/jaxb/pom.xml | 10 ----- .../src/main/resources/citation_common.xsd | 14 +++--- .../resources/citationauthority_common.xsd | 16 +++---- services/citation/pom.xml | 11 ----- services/claim/jaxb/pom.xml | 19 ++++---- .../jaxb/src/main/resources/claims-common.xsd | 14 +++--- services/collectionobject/jaxb/pom.xml | 18 +++++--- .../resources/collectionobjects_common.xsd | 4 +- .../resources/collectionobjects_nagpra.xsd | 4 +- .../collectionobjects_naturalhistory.xsd | 4 +- services/concept/jaxb/pom.xml | 10 ----- .../src/main/resources/concept_common.xsd | 14 +++--- .../resources/conceptauthority_common.xsd | 16 +++---- services/conditioncheck/jaxb/pom.xml | 18 +++++--- .../main/resources/conditionchecks-common.xsd | 6 +-- services/config/pom.xml | 4 +- services/conservation/jaxb/pom.xml | 18 +++++--- .../main/resources/conservation-common.xsd | 6 +-- services/consultation/jaxb/pom.xml | 10 +++-- .../main/resources/consultations_common.xsd | 3 +- services/contact/jaxb/pom.xml | 21 +++++---- .../src/main/resources/contacts-common.xsd | 7 +-- services/deaccession/jaxb/pom.xml | 12 +++-- .../main/resources/deaccessions_common.xsd | 3 +- services/dimension/jaxb/pom.xml | 5 --- .../src/main/resources/dimensions-common.xsd | 6 +-- services/dutyofcare/jaxb/pom.xml | 12 +++-- .../main/resources/dutiesofcare_common.xsd | 3 +- services/exhibition/jaxb/pom.xml | 12 +++-- .../src/main/resources/exhibitions-common.xsd | 6 +-- services/exit/jaxb/pom.xml | 12 +++-- .../jaxb/src/main/resources/exits_common.xsd | 4 +- services/export/jaxb/pom.xml | 2 +- .../src/main/resources/exports-common.xsd | 12 +++-- services/group/jaxb/pom.xml | 12 +++-- .../jaxb/src/main/resources/groups_common.xsd | 7 +-- services/heldintrust/jaxb/pom.xml | 12 +++-- .../main/resources/heldintrusts_common.xsd | 3 +- services/id/jaxb/pom.xml | 2 +- services/imports/jaxb/pom.xml | 12 +++-- .../src/main/resources/imports_common.xsd | 6 +-- services/index/jaxb/pom.xml | 12 +++-- .../jaxb/src/main/resources/index-common.xsd | 7 +-- services/insurance/jaxb/pom.xml | 12 +++-- .../src/main/resources/insurances_common.xsd | 5 +-- services/intake/jaxb/pom.xml | 12 +++-- .../src/main/resources/intakes-common.xsd | 4 +- services/iterationreport/jaxb/pom.xml | 10 +++-- .../resources/iterationreports_common.xsd | 4 +- services/jaxb/pom.xml | 8 +++- .../jaxb/src/main/resources/authorityref.xsd | 4 +- .../src/main/resources/authorityrefdocs.xsd | 4 +- services/jaxb/src/main/resources/bindings.xjb | 14 ++++++ services/jaxb/src/main/resources/bindings.xml | 17 ------- .../jaxb/src/main/resources/blobs_common.xsd | 7 ++- .../main/resources/collectionspace_core.xsd | 3 +- .../jaxb/src/main/resources/index_common.xsd | 7 ++- .../src/main/resources/invocationContext.xsd | 5 ++- .../src/main/resources/invocationResults.xsd | 12 +++-- .../jaxb/src/main/resources/lifecycle.xsd | 10 ++--- .../src/main/resources/relations_common.xsd | 10 ++--- .../main/resources/service_description.xsd | 6 +-- .../src/main/resources/workflow_common.xsd | 6 +-- services/loanin/jaxb/pom.xml | 12 +++-- .../src/main/resources/loansin-common.xsd | 6 +-- services/loanout/jaxb/pom.xml | 12 +++-- .../src/main/resources/loansout-common.xsd | 6 +-- services/location/jaxb/pom.xml | 10 ----- .../src/main/resources/location_common.xsd | 15 +++---- .../resources/locationauthority_common.xsd | 17 +++---- services/material/jaxb/pom.xml | 21 --------- .../src/main/resources/material_common.xsd | 18 ++++---- .../resources/materialauthority_common.xsd | 17 +++---- services/media/jaxb/pom.xml | 12 +++-- .../jaxb/src/main/resources/media_common.xsd | 6 +-- services/movement/jaxb/pom.xml | 12 +++-- .../src/main/resources/movements-common.xsd | 6 +-- services/nagpra-jaxb/pom.xml | 12 +++-- .../src/main/resources/nagpra_common.xsd | 3 +- services/nagprainventory/jaxb/pom.xml | 10 +++-- .../main/resources/nagprainventory_common.xsd | 4 +- services/objectexit/jaxb/pom.xml | 12 +++-- .../src/main/resources/objectexit_common.xsd | 6 +-- services/organization/jaxb/pom.xml | 10 +---- .../main/resources/organization_common.xsd | 12 +++-- .../main/resources/orgauthority_common.xsd | 17 +++---- services/osteology/jaxb/pom.xml | 10 +++-- .../src/main/resources/osteology-common.xsd | 4 +- services/person/jaxb/pom.xml | 5 --- .../jaxb/src/main/resources/person_common.xsd | 15 +++---- .../main/resources/personauthority_common.xsd | 17 +++---- services/place/jaxb/pom.xml | 10 ----- .../jaxb/src/main/resources/place_common.xsd | 15 +++---- .../main/resources/placeauthority_common.xsd | 17 +++---- services/pom.xml | 44 ++++--------------- services/pottag/jaxb/pom.xml | 12 +++-- .../src/main/resources/pottags-common.xsd | 6 +-- services/propagation/jaxb/pom.xml | 12 +++-- .../main/resources/propagations-common.xsd | 6 +-- .../resources/schemas/publicitems_common.xsd | 13 +++--- services/publicitem/jaxb/pom.xml | 12 +++-- .../src/main/resources/publicitems-common.xsd | 8 ++-- services/repatriationrequest/jaxb/pom.xml | 7 +-- .../resources/repatriationrequests_common.xsd | 4 +- .../src/main/resources/reports-common.xsd | 14 +++--- .../main/resources/reports-output-mime.xsd | 6 +-- services/restrictedmedia/jaxb/pom.xml | 10 +++-- .../main/resources/restrictedmedia_common.xsd | 3 +- services/servicegroup/jaxb/pom.xml | 12 +++-- .../main/resources/servicegroup_common.xsd | 3 +- services/structureddate/jaxb/pom.xml | 12 +++-- .../main/resources/structureddate-common.xsd | 4 +- services/summarydocumentation/jaxb/pom.xml | 7 +-- .../summarydocumentations_common.xsd | 3 +- services/systeminfo/jaxb/pom.xml | 12 +++-- .../src/main/resources/systeminfo-common.xsd | 14 +++--- services/taxonomy/jaxb/pom.xml | 9 ---- .../jaxb/src/main/resources/taxon_common.xsd | 15 +++---- .../resources/taxonomyauthority_common.xsd | 17 +++---- services/transport/jaxb/pom.xml | 12 +++-- .../src/main/resources/transports-common.xsd | 4 +- services/uoc/jaxb/pom.xml | 12 +++-- .../jaxb/src/main/resources/uoc-common.xsd | 6 +-- services/valuationcontrol/jaxb/pom.xml | 12 +++-- .../resources/Valuationcontrols-common.xsd | 6 +-- services/vocabulary/jaxb/pom.xml | 14 +++--- .../src/main/resources/vocabulary_common.xsd | 17 +++---- .../main/resources/vocabularyitem_common.xsd | 15 +++---- services/work/jaxb/pom.xml | 10 ----- .../jaxb/src/main/resources/work_common.xsd | 16 +++---- .../main/resources/workauthority_common.xsd | 16 +++---- services/work/pom.xml | 9 ---- 141 files changed, 624 insertions(+), 798 deletions(-) create mode 100644 services/jaxb/src/main/resources/bindings.xjb delete mode 100644 services/jaxb/src/main/resources/bindings.xml diff --git a/pom.xml b/pom.xml index 320a8fce6b..3090e6ff07 100644 --- a/pom.xml +++ b/pom.xml @@ -20,9 +20,8 @@ 1.7.4 0.12.0-NX2 2.14.3 - 2.2.11 - 2.0.14 - 3.0.2 + 4.0.5 + 4.0.12 3.0.1 2.17.1 17 @@ -212,7 +211,7 @@ org.apache.maven.plugins maven-war-plugin - 2.1.1 + 3.4.0 WEB-INF/lib/*.jar @@ -1129,22 +1128,12 @@ provided - - net.java.dev.jaxb2-commons - jaxb-fluent-api - 2.0.2 - - - org.jvnet.jaxb - jaxb2-basics - ${jaxb2-basics.version} - - org.jvnet.jaxb - jaxb2-basics-runtime - ${jaxb2-basics.version} + jaxb-plugins-runtime + ${jvnet.jaxb.version} + org.jboss.resteasy resteasy-jaxrs @@ -1185,7 +1174,7 @@ commons-cli 1.2 - + org.glassfish.jaxb jaxb-runtime @@ -1218,7 +1207,7 @@ hibernate-c3p0 3.6.10.Final - + org.postgresql postgresql diff --git a/services/acquisition/jaxb/pom.xml b/services/acquisition/jaxb/pom.xml index 37ab609f37..48a3bf02b0 100644 --- a/services/acquisition/jaxb/pom.xml +++ b/services/acquisition/jaxb/pom.xml @@ -7,19 +7,23 @@ org.collectionspace.services ${revision} - + 4.0.0 org.collectionspace.services.acquisition.jaxb services.acquisition.jaxb - + - org.collectionspace.services - org.collectionspace.services.jaxb - ${project.version} - + jakarta.xml.bind + jakarta.xml.bind-api + + + + org.jvnet.jaxb + jaxb-plugins-runtime + - + collectionspace-services-acquisition-jaxb install @@ -35,4 +39,3 @@ - diff --git a/services/acquisition/jaxb/src/main/resources/acquisitions_common.xsd b/services/acquisition/jaxb/src/main/resources/acquisitions_common.xsd index 76587655f2..a975b0065c 100644 --- a/services/acquisition/jaxb/src/main/resources/acquisitions_common.xsd +++ b/services/acquisition/jaxb/src/main/resources/acquisitions_common.xsd @@ -11,11 +11,10 @@ $LastChangedDate$ --> - diff --git a/services/advancedsearch/jaxb/src/main/resources/advanced-search_common.xsd b/services/advancedsearch/jaxb/src/main/resources/advanced-search_common.xsd index f6b28889f9..8c81557dc3 100644 --- a/services/advancedsearch/jaxb/src/main/resources/advanced-search_common.xsd +++ b/services/advancedsearch/jaxb/src/main/resources/advanced-search_common.xsd @@ -10,8 +10,8 @@ org.collectionspace.services.jaxb ${project.version} - - org.collectionspace.services - org.collectionspace.services.hyperjaxb - ${project.version} - diff --git a/services/batch/jaxb/src/main/resources/batch_common.xsd b/services/batch/jaxb/src/main/resources/batch_common.xsd index dd1437fa59..eadb721dff 100644 --- a/services/batch/jaxb/src/main/resources/batch_common.xsd +++ b/services/batch/jaxb/src/main/resources/batch_common.xsd @@ -1,13 +1,11 @@ - - diff --git a/services/citation/jaxb/src/main/resources/citationauthority_common.xsd b/services/citation/jaxb/src/main/resources/citationauthority_common.xsd index 0c7b36d666..b836cdd8d5 100644 --- a/services/citation/jaxb/src/main/resources/citationauthority_common.xsd +++ b/services/citation/jaxb/src/main/resources/citationauthority_common.xsd @@ -9,15 +9,13 @@ --> - + - - jaxb service diff --git a/services/claim/jaxb/pom.xml b/services/claim/jaxb/pom.xml index 311d141b99..08b90c4a33 100644 --- a/services/claim/jaxb/pom.xml +++ b/services/claim/jaxb/pom.xml @@ -7,20 +7,24 @@ org.collectionspace.services ${revision} - + 4.0.0 org.collectionspace.services org.collectionspace.services.claim.jaxb services.claim.jaxb - + - org.collectionspace.services - org.collectionspace.services.jaxb - ${project.version} - + jakarta.xml.bind + jakarta.xml.bind-api + + + + org.jvnet.jaxb + jaxb-plugins-runtime + - + collectionspace-services-claim-jaxb install @@ -36,4 +40,3 @@ - diff --git a/services/claim/jaxb/src/main/resources/claims-common.xsd b/services/claim/jaxb/src/main/resources/claims-common.xsd index 41577046ec..7c502d96df 100644 --- a/services/claim/jaxb/src/main/resources/claims-common.xsd +++ b/services/claim/jaxb/src/main/resources/claims-common.xsd @@ -11,14 +11,12 @@ $LastChangedDate: 2011-07-22 12:44:36 -0700 (Fri, 22 Jul 2011) $ --> - services.concept.jaxb - - org.collectionspace.services - org.collectionspace.services.common - - - org.collectionspace.services - org.collectionspace.services.jaxb - ${project.version} - org.collectionspace.services org.collectionspace.services.authority.jaxb - true ${project.version} diff --git a/services/concept/jaxb/src/main/resources/concept_common.xsd b/services/concept/jaxb/src/main/resources/concept_common.xsd index 505f955bbd..1f0c485b0f 100644 --- a/services/concept/jaxb/src/main/resources/concept_common.xsd +++ b/services/concept/jaxb/src/main/resources/concept_common.xsd @@ -8,14 +8,12 @@ Used for: JAXB binding between XML and Java objects --> - diff --git a/services/concept/jaxb/src/main/resources/conceptauthority_common.xsd b/services/concept/jaxb/src/main/resources/conceptauthority_common.xsd index c319b93fcb..9ce44f12d7 100644 --- a/services/concept/jaxb/src/main/resources/conceptauthority_common.xsd +++ b/services/concept/jaxb/src/main/resources/conceptauthority_common.xsd @@ -9,15 +9,13 @@ --> - + -${jaxb2-basics.version} --> - + org.jvnet.jaxb - jaxb2-basics-runtime + jaxb-plugins-runtime org.collectionspace.services diff --git a/services/conservation/jaxb/pom.xml b/services/conservation/jaxb/pom.xml index 09ba21df64..5dead3adb1 100644 --- a/services/conservation/jaxb/pom.xml +++ b/services/conservation/jaxb/pom.xml @@ -7,19 +7,23 @@ org.collectionspace.services ${revision} - + 4.0.0 org.collectionspace.services.conservation.jaxb services.conservation.jaxb - + - org.collectionspace.services - org.collectionspace.services.jaxb - ${project.version} - + jakarta.xml.bind + jakarta.xml.bind-api + + + + org.jvnet.jaxb + jaxb-plugins-runtime + - + collectionspace-services-conservation-jaxb install diff --git a/services/conservation/jaxb/src/main/resources/conservation-common.xsd b/services/conservation/jaxb/src/main/resources/conservation-common.xsd index cc9a996c6a..62aab79ede 100644 --- a/services/conservation/jaxb/src/main/resources/conservation-common.xsd +++ b/services/conservation/jaxb/src/main/resources/conservation-common.xsd @@ -11,11 +11,9 @@ $LastChangedDate$ --> - - org.collectionspace.services - org.collectionspace.services.jaxb - ${project.version} + jakarta.xml.bind + jakarta.xml.bind-api + + + + org.jvnet.jaxb + jaxb-plugins-runtime diff --git a/services/consultation/jaxb/src/main/resources/consultations_common.xsd b/services/consultation/jaxb/src/main/resources/consultations_common.xsd index 0f1af8bb80..97e6d95c11 100644 --- a/services/consultation/jaxb/src/main/resources/consultations_common.xsd +++ b/services/consultation/jaxb/src/main/resources/consultations_common.xsd @@ -10,8 +10,7 @@ org.collectionspace.services.contact ${revision} - + 4.0.0 org.collectionspace.services.contact.jaxb services.contact.jaxb - + - org.collectionspace.services - org.collectionspace.services.jaxb - ${project.version} - + jakarta.xml.bind + jakarta.xml.bind-api + + + + org.jvnet.jaxb + jaxb-plugins-runtime + - + collectionspace-services-contact-jaxb install org.jvnet.jaxb - jaxb-maven-plugin + jaxb-maven-plugin org.codehaus.mojo @@ -35,4 +39,3 @@ - diff --git a/services/contact/jaxb/src/main/resources/contacts-common.xsd b/services/contact/jaxb/src/main/resources/contacts-common.xsd index 81ca550088..df76462433 100644 --- a/services/contact/jaxb/src/main/resources/contacts-common.xsd +++ b/services/contact/jaxb/src/main/resources/contacts-common.xsd @@ -11,11 +11,9 @@ $LastChangedDate$ --> - - diff --git a/services/deaccession/jaxb/pom.xml b/services/deaccession/jaxb/pom.xml index 12e088969c..ac300e78d5 100644 --- a/services/deaccession/jaxb/pom.xml +++ b/services/deaccession/jaxb/pom.xml @@ -14,9 +14,13 @@ - org.collectionspace.services - org.collectionspace.services.jaxb - ${project.version} + jakarta.xml.bind + jakarta.xml.bind-api + + + + org.jvnet.jaxb + jaxb-plugins-runtime @@ -30,4 +34,4 @@ - \ No newline at end of file + diff --git a/services/deaccession/jaxb/src/main/resources/deaccessions_common.xsd b/services/deaccession/jaxb/src/main/resources/deaccessions_common.xsd index 0515b12769..08542df130 100644 --- a/services/deaccession/jaxb/src/main/resources/deaccessions_common.xsd +++ b/services/deaccession/jaxb/src/main/resources/deaccessions_common.xsd @@ -9,8 +9,7 @@ --> org.collectionspace.services.jaxb ${project.version} - - org.collectionspace.services - org.collectionspace.services.hyperjaxb - ${project.version} - diff --git a/services/dimension/jaxb/src/main/resources/dimensions-common.xsd b/services/dimension/jaxb/src/main/resources/dimensions-common.xsd index 40fd310b68..83e1c561a3 100644 --- a/services/dimension/jaxb/src/main/resources/dimensions-common.xsd +++ b/services/dimension/jaxb/src/main/resources/dimensions-common.xsd @@ -11,11 +11,9 @@ $LastChangedDate: 2009-10-14 14:48:05 -0700 (Wed, 14 Oct 2009) $ --> - diff --git a/services/dutyofcare/jaxb/pom.xml b/services/dutyofcare/jaxb/pom.xml index fdbc1b9339..a4b9700b60 100644 --- a/services/dutyofcare/jaxb/pom.xml +++ b/services/dutyofcare/jaxb/pom.xml @@ -14,9 +14,13 @@ - org.collectionspace.services - org.collectionspace.services.jaxb - ${project.version} + jakarta.xml.bind + jakarta.xml.bind-api + + + + org.jvnet.jaxb + jaxb-plugins-runtime @@ -30,4 +34,4 @@ - \ No newline at end of file + diff --git a/services/dutyofcare/jaxb/src/main/resources/dutiesofcare_common.xsd b/services/dutyofcare/jaxb/src/main/resources/dutiesofcare_common.xsd index 46517dc65b..ecacd06c81 100644 --- a/services/dutyofcare/jaxb/src/main/resources/dutiesofcare_common.xsd +++ b/services/dutyofcare/jaxb/src/main/resources/dutiesofcare_common.xsd @@ -9,8 +9,7 @@ - org.collectionspace.services - org.collectionspace.services.jaxb - ${project.version} - + jakarta.xml.bind + jakarta.xml.bind-api + + + + org.jvnet.jaxb + jaxb-plugins-runtime + diff --git a/services/exhibition/jaxb/src/main/resources/exhibitions-common.xsd b/services/exhibition/jaxb/src/main/resources/exhibitions-common.xsd index f1a7bed01e..c25779abe5 100644 --- a/services/exhibition/jaxb/src/main/resources/exhibitions-common.xsd +++ b/services/exhibition/jaxb/src/main/resources/exhibitions-common.xsd @@ -8,11 +8,9 @@ Used for: JAXB binding between XML and Java objects --> - - org.collectionspace.services - org.collectionspace.services.jaxb - ${project.version} + jakarta.xml.bind + jakarta.xml.bind-api + + + + org.jvnet.jaxb + jaxb-plugins-runtime @@ -30,4 +34,4 @@ - \ No newline at end of file + diff --git a/services/exit/jaxb/src/main/resources/exits_common.xsd b/services/exit/jaxb/src/main/resources/exits_common.xsd index 3dd9096e00..a50981da7e 100644 --- a/services/exit/jaxb/src/main/resources/exits_common.xsd +++ b/services/exit/jaxb/src/main/resources/exits_common.xsd @@ -10,9 +10,7 @@ - \ No newline at end of file + diff --git a/services/export/jaxb/src/main/resources/exports-common.xsd b/services/export/jaxb/src/main/resources/exports-common.xsd index 95e981c61c..44e3ceccf7 100644 --- a/services/export/jaxb/src/main/resources/exports-common.xsd +++ b/services/export/jaxb/src/main/resources/exports-common.xsd @@ -12,13 +12,11 @@ --> - - diff --git a/services/heldintrust/jaxb/pom.xml b/services/heldintrust/jaxb/pom.xml index 73e7367177..a8f659b2f6 100644 --- a/services/heldintrust/jaxb/pom.xml +++ b/services/heldintrust/jaxb/pom.xml @@ -14,9 +14,13 @@ - org.collectionspace.services - org.collectionspace.services.jaxb - ${project.version} + jakarta.xml.bind + jakarta.xml.bind-api + + + + org.jvnet.jaxb + jaxb-plugins-runtime @@ -30,4 +34,4 @@ - \ No newline at end of file + diff --git a/services/heldintrust/jaxb/src/main/resources/heldintrusts_common.xsd b/services/heldintrust/jaxb/src/main/resources/heldintrusts_common.xsd index 85065a41a5..8f89eba62e 100644 --- a/services/heldintrust/jaxb/src/main/resources/heldintrusts_common.xsd +++ b/services/heldintrust/jaxb/src/main/resources/heldintrusts_common.xsd @@ -9,8 +9,7 @@ --> org.jvnet.jaxb - jaxb2-basics-runtime + jaxb-plugins-runtime diff --git a/services/imports/jaxb/pom.xml b/services/imports/jaxb/pom.xml index a41be8abd7..54eea34174 100644 --- a/services/imports/jaxb/pom.xml +++ b/services/imports/jaxb/pom.xml @@ -14,10 +14,14 @@ - org.collectionspace.services - org.collectionspace.services.jaxb - ${project.version} - + jakarta.xml.bind + jakarta.xml.bind-api + + + + org.jvnet.jaxb + jaxb-plugins-runtime + diff --git a/services/imports/jaxb/src/main/resources/imports_common.xsd b/services/imports/jaxb/src/main/resources/imports_common.xsd index c9008afff2..cc925d1184 100644 --- a/services/imports/jaxb/src/main/resources/imports_common.xsd +++ b/services/imports/jaxb/src/main/resources/imports_common.xsd @@ -11,11 +11,9 @@ $LastChangedDate: 2010-06-02 16:03:51 -0700 (Wed, 02 Jun 2010) $ --> - - org.collectionspace.services - org.collectionspace.services.jaxb - ${project.version} - + jakarta.xml.bind + jakarta.xml.bind-api + + + + org.jvnet.jaxb + jaxb-plugins-runtime + diff --git a/services/index/jaxb/src/main/resources/index-common.xsd b/services/index/jaxb/src/main/resources/index-common.xsd index ef50d16a95..51699fa94c 100644 --- a/services/index/jaxb/src/main/resources/index-common.xsd +++ b/services/index/jaxb/src/main/resources/index-common.xsd @@ -11,11 +11,9 @@ $LastChangedDate$ --> - - diff --git a/services/insurance/jaxb/pom.xml b/services/insurance/jaxb/pom.xml index f51b8ac200..3019713fd0 100644 --- a/services/insurance/jaxb/pom.xml +++ b/services/insurance/jaxb/pom.xml @@ -14,9 +14,13 @@ - org.collectionspace.services - org.collectionspace.services.jaxb - ${project.version} + jakarta.xml.bind + jakarta.xml.bind-api + + + + org.jvnet.jaxb + jaxb-plugins-runtime @@ -30,4 +34,4 @@ - \ No newline at end of file + diff --git a/services/insurance/jaxb/src/main/resources/insurances_common.xsd b/services/insurance/jaxb/src/main/resources/insurances_common.xsd index fc43a34cc2..d242006e65 100644 --- a/services/insurance/jaxb/src/main/resources/insurances_common.xsd +++ b/services/insurance/jaxb/src/main/resources/insurances_common.xsd @@ -10,9 +10,7 @@ + diff --git a/services/intake/jaxb/pom.xml b/services/intake/jaxb/pom.xml index 4acd3c23c7..b2e6b8f95d 100644 --- a/services/intake/jaxb/pom.xml +++ b/services/intake/jaxb/pom.xml @@ -14,10 +14,14 @@ - org.collectionspace.services - org.collectionspace.services.jaxb - ${project.version} - + jakarta.xml.bind + jakarta.xml.bind-api + + + + org.jvnet.jaxb + jaxb-plugins-runtime + diff --git a/services/intake/jaxb/src/main/resources/intakes-common.xsd b/services/intake/jaxb/src/main/resources/intakes-common.xsd index cde240b546..f51c9e3703 100644 --- a/services/intake/jaxb/src/main/resources/intakes-common.xsd +++ b/services/intake/jaxb/src/main/resources/intakes-common.xsd @@ -13,9 +13,7 @@ - org.collectionspace.services - org.collectionspace.services.jaxb - ${project.version} + jakarta.xml.bind + jakarta.xml.bind-api + + + + org.jvnet.jaxb + jaxb-plugins-runtime diff --git a/services/iterationreport/jaxb/src/main/resources/iterationreports_common.xsd b/services/iterationreport/jaxb/src/main/resources/iterationreports_common.xsd index d41204cc83..0fa2b8498a 100644 --- a/services/iterationreport/jaxb/src/main/resources/iterationreports_common.xsd +++ b/services/iterationreport/jaxb/src/main/resources/iterationreports_common.xsd @@ -10,9 +10,7 @@ services.jaxb - + + jakarta.xml.bind + jakarta.xml.bind-api + + org.jvnet.jaxb - jaxb2-basics + jaxb-plugins-runtime diff --git a/services/jaxb/src/main/resources/authorityref.xsd b/services/jaxb/src/main/resources/authorityref.xsd index 68c1d4dcd6..0399bda5df 100644 --- a/services/jaxb/src/main/resources/authorityref.xsd +++ b/services/jaxb/src/main/resources/authorityref.xsd @@ -17,8 +17,8 @@ --> + + + + + + + + + + diff --git a/services/jaxb/src/main/resources/bindings.xml b/services/jaxb/src/main/resources/bindings.xml deleted file mode 100644 index 76f7b6ad0f..0000000000 --- a/services/jaxb/src/main/resources/bindings.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/services/jaxb/src/main/resources/blobs_common.xsd b/services/jaxb/src/main/resources/blobs_common.xsd index 5b973959df..4e8015d67a 100644 --- a/services/jaxb/src/main/resources/blobs_common.xsd +++ b/services/jaxb/src/main/resources/blobs_common.xsd @@ -11,11 +11,10 @@ $LastChangedDate: 2010-06-02 16:03:51 -0700 (Wed, 02 Jun 2010) $ --> - diff --git a/services/jaxb/src/main/resources/index_common.xsd b/services/jaxb/src/main/resources/index_common.xsd index e250df2d12..d270eaaa86 100644 --- a/services/jaxb/src/main/resources/index_common.xsd +++ b/services/jaxb/src/main/resources/index_common.xsd @@ -11,11 +11,10 @@ $LastChangedDate: 2010-06-02 16:03:51 -0700 (Wed, 02 Jun 2010) $ --> - diff --git a/services/jaxb/src/main/resources/invocationContext.xsd b/services/jaxb/src/main/resources/invocationContext.xsd index 3f7a85bc0e..112b499174 100644 --- a/services/jaxb/src/main/resources/invocationContext.xsd +++ b/services/jaxb/src/main/resources/invocationContext.xsd @@ -8,7 +8,10 @@ $LastChangedRevision: 2316 $ $LastChangedDate: 2010-06-02 16:03:51 -0700 (Wed, 02 Jun 2010) $ --> - + diff --git a/services/jaxb/src/main/resources/invocationResults.xsd b/services/jaxb/src/main/resources/invocationResults.xsd index 7f7b732c09..4524ee7c0c 100644 --- a/services/jaxb/src/main/resources/invocationResults.xsd +++ b/services/jaxb/src/main/resources/invocationResults.xsd @@ -8,13 +8,11 @@ $LastChangedRevision: 2316 $ $LastChangedDate: 2010-06-02 16:03:51 -0700 (Wed, 02 Jun 2010) $ --> - + diff --git a/services/jaxb/src/main/resources/lifecycle.xsd b/services/jaxb/src/main/resources/lifecycle.xsd index b7a41ea674..934d8d71f5 100644 --- a/services/jaxb/src/main/resources/lifecycle.xsd +++ b/services/jaxb/src/main/resources/lifecycle.xsd @@ -1,9 +1,9 @@ - + diff --git a/services/jaxb/src/main/resources/relations_common.xsd b/services/jaxb/src/main/resources/relations_common.xsd index 923d1d3fd5..21991ce129 100644 --- a/services/jaxb/src/main/resources/relations_common.xsd +++ b/services/jaxb/src/main/resources/relations_common.xsd @@ -12,12 +12,10 @@ --> + xmlns:xs="http://www.w3.org/2001/XMLSchema" + xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb" jaxb:version="3.0" + xmlns="http://collectionspace.org/services/relation" + targetNamespace="http://collectionspace.org/services/relation"> diff --git a/services/jaxb/src/main/resources/service_description.xsd b/services/jaxb/src/main/resources/service_description.xsd index c586bb3788..c3bfa7fa3d 100644 --- a/services/jaxb/src/main/resources/service_description.xsd +++ b/services/jaxb/src/main/resources/service_description.xsd @@ -7,11 +7,9 @@ Used for: JAXB binding between XML and Java objects --> - diff --git a/services/jaxb/src/main/resources/workflow_common.xsd b/services/jaxb/src/main/resources/workflow_common.xsd index 3ba78d7d4f..9d4a5ca778 100644 --- a/services/jaxb/src/main/resources/workflow_common.xsd +++ b/services/jaxb/src/main/resources/workflow_common.xsd @@ -11,11 +11,9 @@ $LastChangedDate: 2010-06-02 16:03:51 -0700 (Wed, 02 Jun 2010) $ --> - diff --git a/services/loanin/jaxb/pom.xml b/services/loanin/jaxb/pom.xml index 8457935b20..cc0fd629d4 100644 --- a/services/loanin/jaxb/pom.xml +++ b/services/loanin/jaxb/pom.xml @@ -14,10 +14,14 @@ - org.collectionspace.services - org.collectionspace.services.jaxb - ${project.version} - + jakarta.xml.bind + jakarta.xml.bind-api + + + + org.jvnet.jaxb + jaxb-plugins-runtime + diff --git a/services/loanin/jaxb/src/main/resources/loansin-common.xsd b/services/loanin/jaxb/src/main/resources/loansin-common.xsd index 65c9e6df8a..e146410e0c 100644 --- a/services/loanin/jaxb/src/main/resources/loansin-common.xsd +++ b/services/loanin/jaxb/src/main/resources/loansin-common.xsd @@ -11,11 +11,9 @@ $LastChangedDate$ --> - - org.collectionspace.services - org.collectionspace.services.jaxb - ${project.version} - + jakarta.xml.bind + jakarta.xml.bind-api + + + + org.jvnet.jaxb + jaxb-plugins-runtime + diff --git a/services/loanout/jaxb/src/main/resources/loansout-common.xsd b/services/loanout/jaxb/src/main/resources/loansout-common.xsd index 0bbb9b50e2..a32abeba88 100644 --- a/services/loanout/jaxb/src/main/resources/loansout-common.xsd +++ b/services/loanout/jaxb/src/main/resources/loansout-common.xsd @@ -11,11 +11,9 @@ $LastChangedDate$ --> -services.location.jaxb - - org.collectionspace.services - org.collectionspace.services.common - - - org.collectionspace.services - org.collectionspace.services.jaxb - ${project.version} - org.collectionspace.services org.collectionspace.services.authority.jaxb - true ${project.version} diff --git a/services/location/jaxb/src/main/resources/location_common.xsd b/services/location/jaxb/src/main/resources/location_common.xsd index c2b6115e7c..d970443f7f 100644 --- a/services/location/jaxb/src/main/resources/location_common.xsd +++ b/services/location/jaxb/src/main/resources/location_common.xsd @@ -8,14 +8,12 @@ Used for: JAXB binding between XML and Java objects --> - @@ -88,4 +86,3 @@ - diff --git a/services/location/jaxb/src/main/resources/locationauthority_common.xsd b/services/location/jaxb/src/main/resources/locationauthority_common.xsd index 513788fc55..275371561a 100644 --- a/services/location/jaxb/src/main/resources/locationauthority_common.xsd +++ b/services/location/jaxb/src/main/resources/locationauthority_common.xsd @@ -9,15 +9,13 @@ --> - + - - org.collectionspace.services - org.collectionspace.services.jaxb - ${project.version} - org.collectionspace.services org.collectionspace.services.authority.jaxb - true ${project.version} diff --git a/services/material/jaxb/src/main/resources/material_common.xsd b/services/material/jaxb/src/main/resources/material_common.xsd index 1a3448ba68..f133c6e21a 100644 --- a/services/material/jaxb/src/main/resources/material_common.xsd +++ b/services/material/jaxb/src/main/resources/material_common.xsd @@ -8,15 +8,13 @@ Used for: JAXB binding between XML and Java objects --> - + @@ -478,4 +476,4 @@ - \ No newline at end of file + diff --git a/services/material/jaxb/src/main/resources/materialauthority_common.xsd b/services/material/jaxb/src/main/resources/materialauthority_common.xsd index 2c54d79e66..631a8a0418 100644 --- a/services/material/jaxb/src/main/resources/materialauthority_common.xsd +++ b/services/material/jaxb/src/main/resources/materialauthority_common.xsd @@ -9,15 +9,13 @@ --> - + - - org.collectionspace.services - org.collectionspace.services.jaxb - ${project.version} - + jakarta.xml.bind + jakarta.xml.bind-api + + + + org.jvnet.jaxb + jaxb-plugins-runtime + diff --git a/services/movement/jaxb/src/main/resources/movements-common.xsd b/services/movement/jaxb/src/main/resources/movements-common.xsd index ea729d27be..3975f7a6c5 100644 --- a/services/movement/jaxb/src/main/resources/movements-common.xsd +++ b/services/movement/jaxb/src/main/resources/movements-common.xsd @@ -11,11 +11,9 @@ $LastChangedDate$ --> - - org.collectionspace.services - org.collectionspace.services.jaxb - ${project.version} + jakarta.xml.bind + jakarta.xml.bind-api + + + + org.jvnet.jaxb + jaxb-plugins-runtime @@ -32,4 +36,4 @@ - \ No newline at end of file + diff --git a/services/nagpra-jaxb/src/main/resources/nagpra_common.xsd b/services/nagpra-jaxb/src/main/resources/nagpra_common.xsd index 0f0a775ddd..a1103aea0c 100644 --- a/services/nagpra-jaxb/src/main/resources/nagpra_common.xsd +++ b/services/nagpra-jaxb/src/main/resources/nagpra_common.xsd @@ -5,8 +5,7 @@ --> - org.collectionspace.services - org.collectionspace.services.jaxb - ${project.version} + jakarta.xml.bind + jakarta.xml.bind-api + + + + org.jvnet.jaxb + jaxb-plugins-runtime diff --git a/services/nagprainventory/jaxb/src/main/resources/nagprainventory_common.xsd b/services/nagprainventory/jaxb/src/main/resources/nagprainventory_common.xsd index c17f9b9ade..447534ac08 100644 --- a/services/nagprainventory/jaxb/src/main/resources/nagprainventory_common.xsd +++ b/services/nagprainventory/jaxb/src/main/resources/nagprainventory_common.xsd @@ -10,9 +10,7 @@ - org.collectionspace.services - org.collectionspace.services.jaxb - ${project.version} - + jakarta.xml.bind + jakarta.xml.bind-api + + + + org.jvnet.jaxb + jaxb-plugins-runtime + diff --git a/services/objectexit/jaxb/src/main/resources/objectexit_common.xsd b/services/objectexit/jaxb/src/main/resources/objectexit_common.xsd index f6aad8a48c..ce401a8988 100644 --- a/services/objectexit/jaxb/src/main/resources/objectexit_common.xsd +++ b/services/objectexit/jaxb/src/main/resources/objectexit_common.xsd @@ -11,11 +11,9 @@ $LastChangedDate: 2010-06-02 16:03:51 -0700 (Wed, 02 Jun 2010) $ --> -services.organization.jaxb - - org.collectionspace.services - org.collectionspace.services.common - - - org.collectionspace.services - org.collectionspace.services.jaxb - ${project.version} - org.collectionspace.services org.collectionspace.services.authority.jaxb @@ -44,3 +35,4 @@ + diff --git a/services/organization/jaxb/src/main/resources/organization_common.xsd b/services/organization/jaxb/src/main/resources/organization_common.xsd index 37976cefdf..77665852cb 100644 --- a/services/organization/jaxb/src/main/resources/organization_common.xsd +++ b/services/organization/jaxb/src/main/resources/organization_common.xsd @@ -9,13 +9,11 @@ --> + xmlns:xs="http://www.w3.org/2001/XMLSchema" + xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb" jaxb:version="3.0" + xmlns="http://collectionspace.org/services/organization" + targetNamespace="http://collectionspace.org/services/organization" + version="0.1"> diff --git a/services/organization/jaxb/src/main/resources/orgauthority_common.xsd b/services/organization/jaxb/src/main/resources/orgauthority_common.xsd index cb0a797ad4..070a381fd0 100644 --- a/services/organization/jaxb/src/main/resources/orgauthority_common.xsd +++ b/services/organization/jaxb/src/main/resources/orgauthority_common.xsd @@ -9,15 +9,13 @@ --> - + - @@ -146,4 +144,3 @@ - diff --git a/services/person/jaxb/src/main/resources/personauthority_common.xsd b/services/person/jaxb/src/main/resources/personauthority_common.xsd index ec44739074..797612c129 100644 --- a/services/person/jaxb/src/main/resources/personauthority_common.xsd +++ b/services/person/jaxb/src/main/resources/personauthority_common.xsd @@ -9,15 +9,13 @@ --> - + @@ -161,4 +159,3 @@ - diff --git a/services/place/jaxb/src/main/resources/placeauthority_common.xsd b/services/place/jaxb/src/main/resources/placeauthority_common.xsd index c9a4971220..bdc64a6d48 100644 --- a/services/place/jaxb/src/main/resources/placeauthority_common.xsd +++ b/services/place/jaxb/src/main/resources/placeauthority_common.xsd @@ -9,15 +9,13 @@ --> - + cs_default generate-sources - 2.0.14 org.jvnet.jaxb jaxb-maven-plugin - ${maven-jaxb2-plugin.version} + ${jvnet.jaxb.version} jaxb-codegen @@ -219,50 +220,22 @@ generate - true - src/main/resources - - *.xsd - - src/main/resources - - bindings.xml - - -extension - -Xnamespace-prefix - -Xinject-listener-code - -Xannotate - -verbose - + -XtoString -Xequals -XhashCode - + -Xnamespace-prefix - jakarta.xml.bind - jakarta.xml.bind-api - ${xml-bind.version} - - - org.jvnet.jaxb2_commons - jaxb2-basics-annotate - 1.1.0 + org.jvnet.jaxb + jaxb-plugins + ${jvnet.jaxb.version} - - org.jvnet.jaxb2_commons - jaxb2-basics - ${jaxb2-basics.version} - - - - - org.codehaus.mojo @@ -357,7 +330,6 @@ - diff --git a/services/pottag/jaxb/pom.xml b/services/pottag/jaxb/pom.xml index d75e887a0c..ed1dd78755 100644 --- a/services/pottag/jaxb/pom.xml +++ b/services/pottag/jaxb/pom.xml @@ -15,10 +15,14 @@ - org.collectionspace.services - org.collectionspace.services.jaxb - ${project.version} - + jakarta.xml.bind + jakarta.xml.bind-api + + + + org.jvnet.jaxb + jaxb-plugins-runtime + diff --git a/services/pottag/jaxb/src/main/resources/pottags-common.xsd b/services/pottag/jaxb/src/main/resources/pottags-common.xsd index 711ddc27da..14c9178f8b 100644 --- a/services/pottag/jaxb/src/main/resources/pottags-common.xsd +++ b/services/pottag/jaxb/src/main/resources/pottags-common.xsd @@ -11,11 +11,9 @@ $LastChangedDate$ --> - - org.collectionspace.services - org.collectionspace.services.jaxb - ${project.version} - + jakarta.xml.bind + jakarta.xml.bind-api + + + + org.jvnet.jaxb + jaxb-plugins-runtime + diff --git a/services/propagation/jaxb/src/main/resources/propagations-common.xsd b/services/propagation/jaxb/src/main/resources/propagations-common.xsd index 2b98fec5ef..cf0273a07d 100644 --- a/services/propagation/jaxb/src/main/resources/propagations-common.xsd +++ b/services/propagation/jaxb/src/main/resources/propagations-common.xsd @@ -11,11 +11,9 @@ $LastChangedDate$ --> - - - + + diff --git a/services/publicitem/jaxb/pom.xml b/services/publicitem/jaxb/pom.xml index e7c7da0803..a7726a9693 100644 --- a/services/publicitem/jaxb/pom.xml +++ b/services/publicitem/jaxb/pom.xml @@ -14,10 +14,14 @@ - org.collectionspace.services - org.collectionspace.services.jaxb - ${project.version} - + jakarta.xml.bind + jakarta.xml.bind-api + + + + org.jvnet.jaxb + jaxb-plugins-runtime + diff --git a/services/publicitem/jaxb/src/main/resources/publicitems-common.xsd b/services/publicitem/jaxb/src/main/resources/publicitems-common.xsd index c6d874b7a1..7528cfd9e1 100644 --- a/services/publicitem/jaxb/src/main/resources/publicitems-common.xsd +++ b/services/publicitem/jaxb/src/main/resources/publicitems-common.xsd @@ -4,10 +4,10 @@ binding between XML and Java objects $LastChangedRevision$ $LastChangedDate$ --> + xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb" jaxb:version="3.0" + xmlns="http://collectionspace.org/services/publicitem" + targetNamespace="http://collectionspace.org/services/publicitem" + version="0.1"> diff --git a/services/repatriationrequest/jaxb/pom.xml b/services/repatriationrequest/jaxb/pom.xml index b74a788a3e..f7435d2b78 100644 --- a/services/repatriationrequest/jaxb/pom.xml +++ b/services/repatriationrequest/jaxb/pom.xml @@ -13,11 +13,6 @@ services.repatriationrequest.jaxb - - org.collectionspace.services - org.collectionspace.services.jaxb - ${project.version} - org.collectionspace.services org.collectionspace.services.nagpra-jaxb @@ -35,4 +30,4 @@ - \ No newline at end of file + diff --git a/services/repatriationrequest/jaxb/src/main/resources/repatriationrequests_common.xsd b/services/repatriationrequest/jaxb/src/main/resources/repatriationrequests_common.xsd index 58c864617e..7c116c8254 100644 --- a/services/repatriationrequest/jaxb/src/main/resources/repatriationrequests_common.xsd +++ b/services/repatriationrequest/jaxb/src/main/resources/repatriationrequests_common.xsd @@ -10,10 +10,8 @@ - - - org.collectionspace.services - org.collectionspace.services.jaxb - ${project.version} + jakarta.xml.bind + jakarta.xml.bind-api + + + + org.jvnet.jaxb + jaxb-plugins-runtime diff --git a/services/restrictedmedia/jaxb/src/main/resources/restrictedmedia_common.xsd b/services/restrictedmedia/jaxb/src/main/resources/restrictedmedia_common.xsd index aed21ba74f..7dc3517f4b 100644 --- a/services/restrictedmedia/jaxb/src/main/resources/restrictedmedia_common.xsd +++ b/services/restrictedmedia/jaxb/src/main/resources/restrictedmedia_common.xsd @@ -9,8 +9,7 @@ --> - org.collectionspace.services - org.collectionspace.services.jaxb - ${project.version} - + jakarta.xml.bind + jakarta.xml.bind-api + + + + org.jvnet.jaxb + jaxb-plugins-runtime + diff --git a/services/servicegroup/jaxb/src/main/resources/servicegroup_common.xsd b/services/servicegroup/jaxb/src/main/resources/servicegroup_common.xsd index 42a6695514..92e00dcbe6 100644 --- a/services/servicegroup/jaxb/src/main/resources/servicegroup_common.xsd +++ b/services/servicegroup/jaxb/src/main/resources/servicegroup_common.xsd @@ -13,8 +13,7 @@ - org.collectionspace.services - org.collectionspace.services.jaxb - ${project.version} - + jakarta.xml.bind + jakarta.xml.bind-api + + + + org.jvnet.jaxb + jaxb-plugins-runtime + diff --git a/services/structureddate/jaxb/src/main/resources/structureddate-common.xsd b/services/structureddate/jaxb/src/main/resources/structureddate-common.xsd index 7d05df2e9c..212e08a981 100644 --- a/services/structureddate/jaxb/src/main/resources/structureddate-common.xsd +++ b/services/structureddate/jaxb/src/main/resources/structureddate-common.xsd @@ -10,9 +10,7 @@ services.summarydocumentation.jaxb - - org.collectionspace.services - org.collectionspace.services.jaxb - ${project.version} - org.collectionspace.services org.collectionspace.services.nagpra-jaxb @@ -35,4 +30,4 @@ - \ No newline at end of file + diff --git a/services/summarydocumentation/jaxb/src/main/resources/summarydocumentations_common.xsd b/services/summarydocumentation/jaxb/src/main/resources/summarydocumentations_common.xsd index 0855f2e30b..ec8c57b0d5 100644 --- a/services/summarydocumentation/jaxb/src/main/resources/summarydocumentations_common.xsd +++ b/services/summarydocumentation/jaxb/src/main/resources/summarydocumentations_common.xsd @@ -10,8 +10,7 @@ - org.collectionspace.services - org.collectionspace.services.jaxb - ${project.version} - + jakarta.xml.bind + jakarta.xml.bind-api + + + + org.jvnet.jaxb + jaxb-plugins-runtime + diff --git a/services/systeminfo/jaxb/src/main/resources/systeminfo-common.xsd b/services/systeminfo/jaxb/src/main/resources/systeminfo-common.xsd index d35336f9e0..489eaa2b76 100644 --- a/services/systeminfo/jaxb/src/main/resources/systeminfo-common.xsd +++ b/services/systeminfo/jaxb/src/main/resources/systeminfo-common.xsd @@ -9,14 +9,12 @@ --> - @@ -104,4 +102,3 @@ - diff --git a/services/taxonomy/jaxb/src/main/resources/taxonomyauthority_common.xsd b/services/taxonomy/jaxb/src/main/resources/taxonomyauthority_common.xsd index 7417bedd4d..6f123c3229 100644 --- a/services/taxonomy/jaxb/src/main/resources/taxonomyauthority_common.xsd +++ b/services/taxonomy/jaxb/src/main/resources/taxonomyauthority_common.xsd @@ -9,15 +9,13 @@ --> - + - - org.collectionspace.services - org.collectionspace.services.jaxb - ${project.version} - + jakarta.xml.bind + jakarta.xml.bind-api + + + + org.jvnet.jaxb + jaxb-plugins-runtime + diff --git a/services/valuationcontrol/jaxb/src/main/resources/Valuationcontrols-common.xsd b/services/valuationcontrol/jaxb/src/main/resources/Valuationcontrols-common.xsd index 71764e02cd..1c0ae2e9df 100644 --- a/services/valuationcontrol/jaxb/src/main/resources/Valuationcontrols-common.xsd +++ b/services/valuationcontrol/jaxb/src/main/resources/Valuationcontrols-common.xsd @@ -8,11 +8,9 @@ Used for: JAXB binding between XML and Java objects --> -services.vocabulary.jaxb - - org.collectionspace.services - org.collectionspace.services.common + jakarta.xml.bind + jakarta.xml.bind-api - + - org.collectionspace.services - org.collectionspace.services.jaxb - ${project.version} - + org.jvnet.jaxb + jaxb-plugins-runtime + collectionspace-services-vocabulary-jaxb diff --git a/services/vocabulary/jaxb/src/main/resources/vocabulary_common.xsd b/services/vocabulary/jaxb/src/main/resources/vocabulary_common.xsd index 48b5433284..0cbffef362 100644 --- a/services/vocabulary/jaxb/src/main/resources/vocabulary_common.xsd +++ b/services/vocabulary/jaxb/src/main/resources/vocabulary_common.xsd @@ -9,15 +9,13 @@ --> - + @@ -35,4 +33,3 @@ - diff --git a/services/work/jaxb/pom.xml b/services/work/jaxb/pom.xml index fe8dd035ca..ce12cbd47b 100644 --- a/services/work/jaxb/pom.xml +++ b/services/work/jaxb/pom.xml @@ -13,16 +13,6 @@ services.work.jaxb - - org.collectionspace.services - org.collectionspace.services.common - - - - org.collectionspace.services - org.collectionspace.services.jaxb - ${project.version} - org.collectionspace.services org.collectionspace.services.authority.jaxb diff --git a/services/work/jaxb/src/main/resources/work_common.xsd b/services/work/jaxb/src/main/resources/work_common.xsd index cfa95363b0..dbfc7e49f3 100644 --- a/services/work/jaxb/src/main/resources/work_common.xsd +++ b/services/work/jaxb/src/main/resources/work_common.xsd @@ -1,13 +1,11 @@ - + diff --git a/services/work/jaxb/src/main/resources/workauthority_common.xsd b/services/work/jaxb/src/main/resources/workauthority_common.xsd index ce4beadad8..0f1e458784 100644 --- a/services/work/jaxb/src/main/resources/workauthority_common.xsd +++ b/services/work/jaxb/src/main/resources/workauthority_common.xsd @@ -9,15 +9,13 @@ --> - + - - jaxb service From f3cb0b7ffaf878d5d1dd6a0856264d0734cd14a9 Mon Sep 17 00:00:00 2001 From: Michael Ritter Date: Thu, 9 Apr 2026 11:11:51 -0600 Subject: [PATCH 09/24] Migrate hyperjaxb module from xsd to classes (#521) * Migrate hyperjaxb module from xsd to classes --- services/hyperjaxb/pom.xml | 35 +-- .../authorization/perms/ActionType.java | 26 ++ .../authorization/perms/EffectType.java | 19 ++ .../authorization/perms/ObjectFactory.java | 22 ++ .../authorization/perms/Permission.java | 266 ++++++++++++++++++ .../authorization/perms/PermissionAction.java | 101 +++++++ .../authorization/perms/PermissionsList.java | 81 ++++++ .../hyperjaxb/src/main/resources/bindings.xjb | 18 -- .../src/main/resources/permissions.xsd | 219 -------------- .../src/main/resources/permissions_list.xsd | 55 ---- 10 files changed, 525 insertions(+), 317 deletions(-) create mode 100644 services/hyperjaxb/src/main/java/org/collectionspace/services/authorization/perms/ActionType.java create mode 100644 services/hyperjaxb/src/main/java/org/collectionspace/services/authorization/perms/EffectType.java create mode 100644 services/hyperjaxb/src/main/java/org/collectionspace/services/authorization/perms/ObjectFactory.java create mode 100644 services/hyperjaxb/src/main/java/org/collectionspace/services/authorization/perms/Permission.java create mode 100644 services/hyperjaxb/src/main/java/org/collectionspace/services/authorization/perms/PermissionAction.java create mode 100644 services/hyperjaxb/src/main/java/org/collectionspace/services/authorization/perms/PermissionsList.java delete mode 100644 services/hyperjaxb/src/main/resources/bindings.xjb delete mode 100644 services/hyperjaxb/src/main/resources/permissions.xsd delete mode 100644 services/hyperjaxb/src/main/resources/permissions_list.xsd diff --git a/services/hyperjaxb/pom.xml b/services/hyperjaxb/pom.xml index 5f36fd5305..1c6db7acad 100644 --- a/services/hyperjaxb/pom.xml +++ b/services/hyperjaxb/pom.xml @@ -34,25 +34,15 @@ services.hyperjaxb - jakarta.xml.bind jakarta.xml.bind-api - + + org.jvnet.jaxb + hyperjaxb3-ejb-runtime + 4.0.12 + javax.persistence persistence-api @@ -66,21 +56,16 @@ org.dom4j dom4j - + + org.jspecify + jspecify + 1.0.0 + collectionspace-services-hyperjaxb install - - - - diff --git a/services/hyperjaxb/src/main/java/org/collectionspace/services/authorization/perms/ActionType.java b/services/hyperjaxb/src/main/java/org/collectionspace/services/authorization/perms/ActionType.java new file mode 100644 index 0000000000..fd67add3cc --- /dev/null +++ b/services/hyperjaxb/src/main/java/org/collectionspace/services/authorization/perms/ActionType.java @@ -0,0 +1,26 @@ +package org.collectionspace.services.authorization.perms; + +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlType; + +@XmlEnum +@XmlType(name = "action_type") +public enum ActionType { + CREATE, + READ, + UPDATE, + DELETE, + SEARCH, + START, + STOP, + RUN, + ADMIN; + + public String value() { + return name(); + } + + public static ActionType fromValue(String v) { + return valueOf(v); + } +} diff --git a/services/hyperjaxb/src/main/java/org/collectionspace/services/authorization/perms/EffectType.java b/services/hyperjaxb/src/main/java/org/collectionspace/services/authorization/perms/EffectType.java new file mode 100644 index 0000000000..ad396acfd7 --- /dev/null +++ b/services/hyperjaxb/src/main/java/org/collectionspace/services/authorization/perms/EffectType.java @@ -0,0 +1,19 @@ +package org.collectionspace.services.authorization.perms; + +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlType; + +@XmlEnum +@XmlType(name = "effect_type") +public enum EffectType { + PERMIT, + DENY; + + public String value() { + return name(); + } + + public static EffectType fromValue(String v) { + return valueOf(v); + } +} diff --git a/services/hyperjaxb/src/main/java/org/collectionspace/services/authorization/perms/ObjectFactory.java b/services/hyperjaxb/src/main/java/org/collectionspace/services/authorization/perms/ObjectFactory.java new file mode 100644 index 0000000000..fa58c9817b --- /dev/null +++ b/services/hyperjaxb/src/main/java/org/collectionspace/services/authorization/perms/ObjectFactory.java @@ -0,0 +1,22 @@ +package org.collectionspace.services.authorization.perms; + +import jakarta.xml.bind.JAXBElement; +import jakarta.xml.bind.annotation.XmlElementDecl; +import jakarta.xml.bind.annotation.XmlRegistry; +import javax.xml.namespace.QName; + +@XmlRegistry +public class ObjectFactory { + + private static final QName _Permission_QNAME = + new QName("http://collectionspace.org/services/authorization/perms", "permission"); + + public Permission createPermission() { + return new Permission(); + } + + @XmlElementDecl(namespace = "http://collectionspace.org/services/authorization/perms", name = "permission") + public JAXBElement createPermission(Permission value) { + return new JAXBElement<>(_Permission_QNAME, Permission.class, null, value); + } +} diff --git a/services/hyperjaxb/src/main/java/org/collectionspace/services/authorization/perms/Permission.java b/services/hyperjaxb/src/main/java/org/collectionspace/services/authorization/perms/Permission.java new file mode 100644 index 0000000000..4fe1096d03 --- /dev/null +++ b/services/hyperjaxb/src/main/java/org/collectionspace/services/authorization/perms/Permission.java @@ -0,0 +1,266 @@ +package org.collectionspace.services.authorization.perms; + +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlSchemaType; +import jakarta.xml.bind.annotation.XmlType; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Objects; +import javax.persistence.Basic; +import javax.persistence.CascadeType; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.EnumType; +import javax.persistence.Enumerated; +import javax.persistence.Id; +import javax.persistence.Inheritance; +import javax.persistence.InheritanceType; +import javax.persistence.JoinColumn; +import javax.persistence.OneToMany; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; +import javax.persistence.Transient; +import javax.xml.datatype.XMLGregorianCalendar; +import org.jspecify.annotations.NonNull; +import org.jvnet.hyperjaxb3.xml.bind.annotation.adapters.XMLGregorianCalendarAsDateTime; +import org.jvnet.hyperjaxb3.xml.bind.annotation.adapters.XmlAdapterUtils; + +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "permission") +@Entity(name = "Permission") +@Table(name = "permissions") +@Inheritance(strategy = InheritanceType.JOINED) +public class Permission { + + @Id + @Column(name = "csid", nullable = false, length = 128) + @XmlAttribute(name = "csid") + private String csid; + + @Basic + @Column(name = "description") + private String description; + + @Basic + @Column(name = "resource_name", nullable = false, length = 128) + @XmlElement(required = true) + private String resourceName; + + @Basic + @Column(name = "attribute_name", length = 128) + private String attributeName; + + @Basic + @Column(name = "action_group", length = 128) + private String actionGroup; + + @OneToMany( + targetEntity = PermissionAction.class, + cascade = {CascadeType.ALL}) + @JoinColumn(name = "ACTION__PERMISSION_CSID") + @XmlElement(required = true) + private List action; + + @Basic + @Column(name = "effect", nullable = false, length = 32) + @Enumerated(EnumType.STRING) + @XmlElement(required = true) + private EffectType effect; + + @Basic + @Column(name = "metadata_protection") + private String metadataProtection; + + @Basic + @Column(name = "actions_protection") + private String actionsProtection; + + @Basic + @Column(name = "tenant_id", nullable = false, length = 128) + @XmlElement(name = "tenant_id", required = true) + private String tenantId; + + @Transient + @XmlElement(required = true) + @XmlSchemaType(name = "dateTime") + private XMLGregorianCalendar createdAt; + + @Transient + @XmlElement(required = true) + @XmlSchemaType(name = "dateTime") + private XMLGregorianCalendar updatedAt; + + public String getDescription() { + return description; + } + + public Permission setDescription(String description) { + this.description = description; + return this; + } + + public String getResourceName() { + return resourceName; + } + + public Permission setResourceName(String resourceName) { + this.resourceName = resourceName; + return this; + } + + public String getAttributeName() { + return attributeName; + } + + public Permission setAttributeName(String attributeName) { + this.attributeName = attributeName; + return this; + } + + public String getActionGroup() { + return actionGroup; + } + + public Permission setActionGroup(String actionGroup) { + this.actionGroup = actionGroup; + return this; + } + + @NonNull + public List getAction() { + if (action == null) { + action = new ArrayList<>(); + } + return action; + } + + public Permission setAction(List action) { + this.action = action; + return this; + } + + public EffectType getEffect() { + return effect; + } + + public Permission setEffect(EffectType effect) { + this.effect = effect; + return this; + } + + public String getMetadataProtection() { + return metadataProtection; + } + + public Permission setMetadataProtection(String metadataProtection) { + this.metadataProtection = metadataProtection; + return this; + } + + public String getActionsProtection() { + return actionsProtection; + } + + public Permission setActionsProtection(String actionsProtection) { + this.actionsProtection = actionsProtection; + return this; + } + + public String getTenantId() { + return tenantId; + } + + public Permission setTenantId(String tenantId) { + this.tenantId = tenantId; + return this; + } + + public XMLGregorianCalendar getCreatedAt() { + return createdAt; + } + + public Permission setCreatedAt(XMLGregorianCalendar createdAt) { + this.createdAt = createdAt; + return this; + } + + public XMLGregorianCalendar getUpdatedAt() { + return updatedAt; + } + + public Permission setUpdatedAt(XMLGregorianCalendar updatedAt) { + this.updatedAt = updatedAt; + return this; + } + + public String getCsid() { + return csid; + } + + public Permission setCsid(String csid) { + this.csid = csid; + return this; + } + + @Basic + @Column(name = "created_at", nullable = false) + @Temporal(TemporalType.TIMESTAMP) + public Date getCreatedAtItem() { + return XmlAdapterUtils.unmarshall(XMLGregorianCalendarAsDateTime.class, this.getCreatedAt()); + } + + public void setCreatedAtItem(Date target) { + setCreatedAt(XmlAdapterUtils.marshall(XMLGregorianCalendarAsDateTime.class, target)); + } + + @Basic + @Column(name = "updated_at") + @Temporal(TemporalType.TIMESTAMP) + public Date getUpdatedAtItem() { + return XmlAdapterUtils.unmarshall(XMLGregorianCalendarAsDateTime.class, this.getUpdatedAt()); + } + + public void setUpdatedAtItem(Date target) { + setUpdatedAt(XmlAdapterUtils.marshall(XMLGregorianCalendarAsDateTime.class, target)); + } + + @Override + public boolean equals(Object o) { + if (o == null || getClass() != o.getClass()) { + return false; + } + Permission that = (Permission) o; + return Objects.equals(description, that.description) + && Objects.equals(resourceName, that.resourceName) + && Objects.equals(attributeName, that.attributeName) + && Objects.equals(actionGroup, that.actionGroup) + && effect == that.effect + && Objects.equals(metadataProtection, that.metadataProtection) + && Objects.equals(actionsProtection, that.actionsProtection) + && Objects.equals(tenantId, that.tenantId) + && Objects.equals(createdAt, that.createdAt) + && Objects.equals(updatedAt, that.updatedAt) + && Objects.equals(csid, that.csid); + } + + @Override + public int hashCode() { + return Objects.hash( + description, + resourceName, + attributeName, + actionGroup, + effect, + metadataProtection, + actionsProtection, + tenantId, + createdAt, + updatedAt, + csid); + } +} diff --git a/services/hyperjaxb/src/main/java/org/collectionspace/services/authorization/perms/PermissionAction.java b/services/hyperjaxb/src/main/java/org/collectionspace/services/authorization/perms/PermissionAction.java new file mode 100644 index 0000000000..aa9f289a8a --- /dev/null +++ b/services/hyperjaxb/src/main/java/org/collectionspace/services/authorization/perms/PermissionAction.java @@ -0,0 +1,101 @@ +package org.collectionspace.services.authorization.perms; + +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; +import java.util.Objects; +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.EnumType; +import javax.persistence.Enumerated; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.Inheritance; +import javax.persistence.InheritanceType; +import javax.persistence.Table; + +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "permission_action") +@Entity(name = "PermissionAction") +@Table(name = "permissions_actions") +@Inheritance(strategy = InheritanceType.JOINED) +public class PermissionAction { + + @Basic + @Column(name = "name", nullable = false, length = 128) + @Enumerated(EnumType.STRING) + @XmlElement(required = true) + private ActionType name; + + @Basic + @Column(name = "objectIdentity", nullable = false, length = 128) + @XmlElement(required = true) + private String objectIdentity; + + @Basic + @Column(name = "objectIdentityResource", nullable = false, length = 128) + @XmlElement(required = true) + private String objectIdentityResource; + + @Id + @Column(name = "HJID") + @GeneratedValue(strategy = GenerationType.AUTO) + @XmlAttribute(name = "Hjid") + private Long hjid; + + public ActionType getName() { + return name; + } + + public PermissionAction setName(ActionType name) { + this.name = name; + return this; + } + + public String getObjectIdentity() { + return objectIdentity; + } + + public PermissionAction setObjectIdentity(String objectIdentity) { + this.objectIdentity = objectIdentity; + return this; + } + + public String getObjectIdentityResource() { + return objectIdentityResource; + } + + public PermissionAction setObjectIdentityResource(String objectIdentityResource) { + this.objectIdentityResource = objectIdentityResource; + return this; + } + + public Long getHjid() { + return hjid; + } + + public PermissionAction setHjid(Long hjid) { + this.hjid = hjid; + return this; + } + + @Override + public boolean equals(Object o) { + if (o == null || getClass() != o.getClass()) { + return false; + } + PermissionAction that = (PermissionAction) o; + return name == that.name + && Objects.equals(objectIdentity, that.objectIdentity) + && Objects.equals(objectIdentityResource, that.objectIdentityResource); + } + + @Override + public int hashCode() { + return Objects.hash(name, objectIdentity, objectIdentityResource); + } +} diff --git a/services/hyperjaxb/src/main/java/org/collectionspace/services/authorization/perms/PermissionsList.java b/services/hyperjaxb/src/main/java/org/collectionspace/services/authorization/perms/PermissionsList.java new file mode 100644 index 0000000000..ea00dd66e2 --- /dev/null +++ b/services/hyperjaxb/src/main/java/org/collectionspace/services/authorization/perms/PermissionsList.java @@ -0,0 +1,81 @@ +package org.collectionspace.services.authorization.perms; + +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlSchemaType; +import jakarta.xml.bind.annotation.XmlType; +import java.util.ArrayList; +import java.util.List; +import org.jspecify.annotations.NonNull; + +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "") +@XmlRootElement(name = "permissions_list") +public class PermissionsList { + + @XmlSchemaType(name = "unsignedInt") + private long pageNum; + + @XmlSchemaType(name = "unsignedInt") + private long pageSize; + + @XmlSchemaType(name = "unsignedInt") + private long itemsInPage; + + @XmlSchemaType(name = "unsignedInt") + private long totalItems; + + @XmlElement(required = true) + private List permission; + + public long getPageNum() { + return pageNum; + } + + public PermissionsList setPageNum(long pageNum) { + this.pageNum = pageNum; + return this; + } + + public long getPageSize() { + return pageSize; + } + + public PermissionsList setPageSize(long pageSize) { + this.pageSize = pageSize; + return this; + } + + public long getItemsInPage() { + return itemsInPage; + } + + public PermissionsList setItemsInPage(long itemsInPage) { + this.itemsInPage = itemsInPage; + return this; + } + + public long getTotalItems() { + return totalItems; + } + + public PermissionsList setTotalItems(long totalItems) { + this.totalItems = totalItems; + return this; + } + + @NonNull + public List getPermission() { + if (permission == null) { + permission = new ArrayList<>(); + } + return permission; + } + + public PermissionsList setPermission(List permission) { + this.permission = permission; + return this; + } +} diff --git a/services/hyperjaxb/src/main/resources/bindings.xjb b/services/hyperjaxb/src/main/resources/bindings.xjb deleted file mode 100644 index d9b9f154cc..0000000000 --- a/services/hyperjaxb/src/main/resources/bindings.xjb +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/services/hyperjaxb/src/main/resources/permissions.xsd b/services/hyperjaxb/src/main/resources/permissions.xsd deleted file mode 100644 index 1bb5fd50fe..0000000000 --- a/services/hyperjaxb/src/main/resources/permissions.xsd +++ /dev/null @@ -1,219 +0,0 @@ - - - - - - - - - - - CspacePermissionConfig describes permission in CollectionSpace - - resourceName could be a service path, e.g. collectionobjects or - intakes - no need to give slash at the beginning or end - - attributeName could be an attribute of the service schema - e.g. distinguishingFeatures from collectionobjects_common - - actionGroup is label that can be used by a client to "group" sets - of actions for operations - like searching for permissions by a specific actionGroup label. - - action describes the actions that could be taken on given resource - (and attribute) - - effect describes the effect of the access control for the action - performed on the given resource (and attribute) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/services/hyperjaxb/src/main/resources/permissions_list.xsd b/services/hyperjaxb/src/main/resources/permissions_list.xsd deleted file mode 100644 index f45fe2c535..0000000000 --- a/services/hyperjaxb/src/main/resources/permissions_list.xsd +++ /dev/null @@ -1,55 +0,0 @@ - - - - - - - - - - - - - - - - - - - - permission configuration list - - - - - - - - - - - - - From 21e1fa982f79523f12c2bde65753f4a20438b62f Mon Sep 17 00:00:00 2001 From: Michael Ritter Date: Thu, 9 Apr 2026 11:13:06 -0600 Subject: [PATCH 10/24] Migrate account from xsd to classes (#520) * Migrate account from xsd to classes * Replace field access with getter --- services/account/jaxb/pom.xml | 35 +- .../services/account/AccountListItem.java | 131 +++++++ .../services/account/AccountTenant.java | 68 ++++ .../services/account/AccountsCommon.java | 308 +++++++++++++++ .../services/account/AccountsCommonList.java | 34 ++ .../services/account/RoleList.java | 31 ++ .../services/account/RoleValue.java | 67 ++++ .../services/account/Status.java | 35 ++ .../services/account/Tenant.java | 165 ++++++++ .../services/account/TenantListItem.java | 45 +++ .../services/account/TenantsList.java | 35 ++ .../services/account/package-info.java | 2 + .../src/main/resources/accounts_common.xsd | 353 ------------------ .../main/resources/accounts_common_list.xsd | 118 ------ .../jaxb/src/main/resources/bindings.xml | 17 - .../jaxb/src/main/resources/instance1.xml | 43 --- .../services/account/AccountResource.java | 4 +- 17 files changed, 935 insertions(+), 556 deletions(-) create mode 100644 services/account/jaxb/src/main/java/org/collectionspace/services/account/AccountListItem.java create mode 100644 services/account/jaxb/src/main/java/org/collectionspace/services/account/AccountTenant.java create mode 100644 services/account/jaxb/src/main/java/org/collectionspace/services/account/AccountsCommon.java create mode 100644 services/account/jaxb/src/main/java/org/collectionspace/services/account/AccountsCommonList.java create mode 100644 services/account/jaxb/src/main/java/org/collectionspace/services/account/RoleList.java create mode 100644 services/account/jaxb/src/main/java/org/collectionspace/services/account/RoleValue.java create mode 100644 services/account/jaxb/src/main/java/org/collectionspace/services/account/Status.java create mode 100644 services/account/jaxb/src/main/java/org/collectionspace/services/account/Tenant.java create mode 100644 services/account/jaxb/src/main/java/org/collectionspace/services/account/TenantListItem.java create mode 100644 services/account/jaxb/src/main/java/org/collectionspace/services/account/TenantsList.java create mode 100644 services/account/jaxb/src/main/java/org/collectionspace/services/account/package-info.java delete mode 100644 services/account/jaxb/src/main/resources/accounts_common.xsd delete mode 100644 services/account/jaxb/src/main/resources/accounts_common_list.xsd delete mode 100644 services/account/jaxb/src/main/resources/bindings.xml delete mode 100644 services/account/jaxb/src/main/resources/instance1.xml diff --git a/services/account/jaxb/pom.xml b/services/account/jaxb/pom.xml index 486d6811c5..2a3f05350d 100644 --- a/services/account/jaxb/pom.xml +++ b/services/account/jaxb/pom.xml @@ -13,46 +13,35 @@ services.account.jaxb - - - javax.persistence persistence-api - org.hibernate - hibernate-entitymanager + jakarta.xml.bind + jakarta.xml.bind-api - - org.dom4j - dom4j + org.jvnet.jaxb + hyperjaxb3-ejb-runtime + 4.0.12 - + - org.collectionspace.services - org.collectionspace.services.jaxb - ${project.version} + org.collectionspace.services + org.collectionspace.services.jaxb + ${project.version} - org.collectionspace.services - org.collectionspace.services.hyperjaxb - ${project.version} + org.jspecify + jspecify + 1.0.0 collectionspace-services-account-jaxb install - - - diff --git a/services/account/jaxb/src/main/java/org/collectionspace/services/account/AccountListItem.java b/services/account/jaxb/src/main/java/org/collectionspace/services/account/AccountListItem.java new file mode 100644 index 0000000000..a657564175 --- /dev/null +++ b/services/account/jaxb/src/main/java/org/collectionspace/services/account/AccountListItem.java @@ -0,0 +1,131 @@ +package org.collectionspace.services.account; + +import java.util.ArrayList; +import java.util.List; + +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlSchemaType; +import jakarta.xml.bind.annotation.XmlType; +import org.jspecify.annotations.NonNull; + +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "") +public class AccountListItem { + + @XmlElement(required = true) + private String screenName; + + @XmlElement(required = true) + private String userid; + + @XmlElement(required = true) + private String tenantid; + + @XmlElement(required = true) + private List tenants; + + @XmlElement(required = true) + private String personRefName; + + @XmlElement(required = true) + private String email; + + private Boolean requireSSO; + + @XmlElement(required = true) + private Status status; + + @XmlElement(required = true) + @XmlSchemaType(name = "anyURI") + private String uri; + + @XmlElement(required = true) + private String csid; + + public String getScreenName() { + return screenName; + } + + public void setScreenName(String screenName) { + this.screenName = screenName; + } + + public String getUserid() { + return userid; + } + + public void setUserid(String userId) { + this.userid = userId; + } + + public String getTenantid() { + return tenantid; + } + + public void setTenantid(String tenantId) { + this.tenantid = tenantId; + } + + @NonNull + public List getTenants() { + if (tenants == null) { + tenants = new ArrayList<>(); + } + return this.tenants; + } + + public void setTenants(List tenants) { + this.tenants = tenants; + } + + public String getPersonRefName() { + return personRefName; + } + + public void setPersonRefName(String personRefName) { + this.personRefName = personRefName; + } + + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; + } + + public Boolean isRequireSSO() { + return requireSSO; + } + + public void setRequireSSO(Boolean requireSSO) { + this.requireSSO = requireSSO; + } + + public Status getStatus() { + return status; + } + + public void setStatus(Status status) { + this.status = status; + } + + public String getUri() { + return uri; + } + + public void setUri(String uri) { + this.uri = uri; + } + + public String getCsid() { + return csid; + } + + public void setCsid(String csid) { + this.csid = csid; + } + +} diff --git a/services/account/jaxb/src/main/java/org/collectionspace/services/account/AccountTenant.java b/services/account/jaxb/src/main/java/org/collectionspace/services/account/AccountTenant.java new file mode 100644 index 0000000000..991774644f --- /dev/null +++ b/services/account/jaxb/src/main/java/org/collectionspace/services/account/AccountTenant.java @@ -0,0 +1,68 @@ +package org.collectionspace.services.account; + +import java.util.Objects; +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.Inheritance; +import javax.persistence.InheritanceType; +import javax.persistence.Table; + +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; + + +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "account_tenant") +@Entity(name = "AccountTenant") +@Table(name = "accounts_tenants") +@Inheritance(strategy = InheritanceType.JOINED) +public class AccountTenant { + + @Id + @Column(name = "HJID") + @GeneratedValue(strategy = GenerationType.AUTO) + @XmlAttribute(name = "Hjid") + private Long hjid; + + @Basic + @Column(name = "tenant_id", nullable = false, length = 128) + @XmlElement(name = "tenant_id", required = true) + private String tenantId; + + public String getTenantId() { + return tenantId; + } + + public void setTenantId(String tenantId) { + this.tenantId = tenantId; + } + + public Long getHjid() { + return hjid; + } + + public void setHjid(Long hjid) { + this.hjid = hjid; + } + + @Override + public boolean equals(Object o) { + if (o == null || getClass() != o.getClass()) { + return false; + } + AccountTenant that = (AccountTenant) o; + return Objects.equals(tenantId, that.tenantId); + } + + @Override + public int hashCode() { + return Objects.hashCode(tenantId); + } +} diff --git a/services/account/jaxb/src/main/java/org/collectionspace/services/account/AccountsCommon.java b/services/account/jaxb/src/main/java/org/collectionspace/services/account/AccountsCommon.java new file mode 100644 index 0000000000..9760a67ecb --- /dev/null +++ b/services/account/jaxb/src/main/java/org/collectionspace/services/account/AccountsCommon.java @@ -0,0 +1,308 @@ +package org.collectionspace.services.account; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Date; +import java.util.List; +import java.util.Objects; +import javax.persistence.Basic; +import javax.persistence.CascadeType; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.EnumType; +import javax.persistence.Enumerated; +import javax.persistence.Id; +import javax.persistence.Inheritance; +import javax.persistence.InheritanceType; +import javax.persistence.JoinColumn; +import javax.persistence.OneToMany; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; +import javax.persistence.Transient; +import javax.persistence.UniqueConstraint; +import javax.xml.datatype.XMLGregorianCalendar; + +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlSchemaType; +import jakarta.xml.bind.annotation.XmlType; +import org.jspecify.annotations.NonNull; +import org.jvnet.hyperjaxb3.xml.bind.annotation.adapters.XMLGregorianCalendarAsDateTime; +import org.jvnet.hyperjaxb3.xml.bind.annotation.adapters.XmlAdapterUtils; + + +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "") +@XmlRootElement(name = "accounts_common") +@Entity(name = "AccountsCommon") +@Table(name = "accounts_common", uniqueConstraints = { + @UniqueConstraint(columnNames = { + "userid" + }) +}) +@Inheritance(strategy = InheritanceType.JOINED) +public class AccountsCommon { + + @Id + @Column(name = "csid", nullable = false, length = 128) + @XmlAttribute(name = "csid") + private String csid; + + @Basic + @Column(name = "screen_name", nullable = false, length = 128) + @XmlElement(required = true) + private String screenName; + + @Basic + @Column(name = "person_ref_name") + private String personRefName; + + @Basic + @Column(name = "email", nullable = false) + @XmlElement(required = true) + private String email; + + @Basic + @Column(name = "phone") + @XmlElement(required = true) + private String phone; + + @Basic + @Column(name = "mobile") + @XmlElement(required = true) + private String mobile; + + @Basic + @Column(name = "userid", nullable = false, length = 128) + @XmlElement(required = true) + private String userId; + + private byte[] password; + + @Basic + @Column(name = "require_sso") + private Boolean requireSSO; + + @OneToMany(targetEntity = AccountTenant.class, cascade = { + CascadeType.ALL + }) + @JoinColumn(name = "TENANTS_ACCOUNTS_COMMON_CSID") + @XmlElement(required = true) + private List tenants; + + @Basic + @Column(name = "status", nullable = false, length = 15) + @Enumerated(EnumType.STRING) + @XmlElement(required = true) + private Status status; + + @Basic + @Column(name = "metadata_protection") + private String metadataProtection; + + @Basic + @Column(name = "roles_protection") + private String rolesProtection; + + @Transient + @XmlElement(required = true) + @XmlSchemaType(name = "dateTime") + private XMLGregorianCalendar createdAt; + + @Transient + @XmlElement(required = true) + @XmlSchemaType(name = "dateTime") + private XMLGregorianCalendar updatedAt; + + @Transient + private RoleList roleList; + + public String getScreenName() { + return screenName; + } + + public void setScreenName(String screenName) { + this.screenName = screenName; + } + + public String getPersonRefName() { + return personRefName; + } + + public void setPersonRefName(String personRefName) { + this.personRefName = personRefName; + } + + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; + } + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } + + public String getMobile() { + return mobile; + } + + public void setMobile(String mobile) { + this.mobile = mobile; + } + + public String getUserId() { + return userId; + } + + public void setUserId(String userId) { + this.userId = userId; + } + + public byte[] getPassword() { + return password; + } + + public void setPassword(byte[] password) { + this.password = password; + } + + public Boolean isRequireSSO() { + return requireSSO; + } + + public void setRequireSSO(Boolean requireSSO) { + this.requireSSO = requireSSO; + } + + @NonNull + public List getTenants() { + if (tenants == null) { + tenants = new ArrayList<>(); + } + return this.tenants; + } + + public void setTenants(List tenants) { + this.tenants = tenants; + } + + public Status getStatus() { + return status; + } + + public void setStatus(Status status) { + this.status = status; + } + + public String getMetadataProtection() { + return metadataProtection; + } + + public void setMetadataProtection(String metadataProtection) { + this.metadataProtection = metadataProtection; + } + + public String getRolesProtection() { + return rolesProtection; + } + + public void setRolesProtection(String rolesProtection) { + this.rolesProtection = rolesProtection; + } + + public XMLGregorianCalendar getCreatedAt() { + return createdAt; + } + + public void setCreatedAt(XMLGregorianCalendar createdAt) { + this.createdAt = createdAt; + } + + public XMLGregorianCalendar getUpdatedAt() { + return updatedAt; + } + + public void setUpdatedAt(XMLGregorianCalendar updatedAt) { + this.updatedAt = updatedAt; + } + + public RoleList getRoleList() { + return roleList; + } + + public void setRoleList(RoleList roleList) { + this.roleList = roleList; + } + + public String getCsid() { + return csid; + } + + public void setCsid(String csid) { + this.csid = csid; + } + + @Basic + @Column(name = "created_at", nullable = false) + @Temporal(TemporalType.TIMESTAMP) + public Date getCreatedAtItem() { + return XmlAdapterUtils.unmarshall(XMLGregorianCalendarAsDateTime.class, this.getCreatedAt()); + } + + public void setCreatedAtItem(Date createdAt) { + setCreatedAt(XmlAdapterUtils.marshall(XMLGregorianCalendarAsDateTime.class, createdAt)); + } + + @Basic + @Column(name = "updated_at") + @Temporal(TemporalType.TIMESTAMP) + public Date getUpdatedAtItem() { + return XmlAdapterUtils.unmarshall(XMLGregorianCalendarAsDateTime.class, this.getUpdatedAt()); + } + + public void setUpdatedAtItem(Date updatedAt) { + setUpdatedAt(XmlAdapterUtils.marshall(XMLGregorianCalendarAsDateTime.class, updatedAt)); + } + + @Override + public boolean equals(Object o) { + if (o == null || getClass() != o.getClass()) { + return false; + } + AccountsCommon that = (AccountsCommon) o; + return Objects.equals(screenName, that.screenName) + && Objects.equals(personRefName, that.personRefName) + && Objects.equals(email, that.email) + && Objects.equals(phone, that.phone) + && Objects.equals(mobile, that.mobile) + && Objects.equals(userId, that.userId) + && Objects.deepEquals(password, that.password) + && Objects.equals(requireSSO, that.requireSSO) + && Objects.equals(tenants, that.tenants) + && status == that.status + && Objects.equals(metadataProtection, that.metadataProtection) + && Objects.equals(rolesProtection, that.rolesProtection) + && Objects.equals(createdAt, that.createdAt) + && Objects.equals(updatedAt, that.updatedAt) + && Objects.equals(roleList, that.roleList) + && Objects.equals(csid, that.csid); + } + + @Override + public int hashCode() { + return Objects.hash(screenName, personRefName, email, phone, mobile, userId, Arrays.hashCode(password), + requireSSO, tenants, status, metadataProtection, rolesProtection, createdAt, updatedAt, + roleList, csid); + } +} diff --git a/services/account/jaxb/src/main/java/org/collectionspace/services/account/AccountsCommonList.java b/services/account/jaxb/src/main/java/org/collectionspace/services/account/AccountsCommonList.java new file mode 100644 index 0000000000..1921fdc056 --- /dev/null +++ b/services/account/jaxb/src/main/java/org/collectionspace/services/account/AccountsCommonList.java @@ -0,0 +1,34 @@ +package org.collectionspace.services.account; + +import java.util.ArrayList; +import java.util.List; + +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; +import org.collectionspace.services.jaxb.AbstractCommonList; +import org.jspecify.annotations.NonNull; + +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "") +@XmlRootElement(name = "accounts-common-list") +public class AccountsCommonList extends AbstractCommonList { + + @XmlElement(name = "account-list-item", required = true) + private List accountListItem; + + @NonNull + public List getAccountListItem() { + if (accountListItem == null) { + accountListItem = new ArrayList<>(); + } + return this.accountListItem; + } + + public void setAccountListItem(List accountListItem) { + this.accountListItem = accountListItem; + } + +} diff --git a/services/account/jaxb/src/main/java/org/collectionspace/services/account/RoleList.java b/services/account/jaxb/src/main/java/org/collectionspace/services/account/RoleList.java new file mode 100644 index 0000000000..1609f91bbb --- /dev/null +++ b/services/account/jaxb/src/main/java/org/collectionspace/services/account/RoleList.java @@ -0,0 +1,31 @@ +package org.collectionspace.services.account; + +import java.util.ArrayList; +import java.util.List; + +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; +import org.jspecify.annotations.NonNull; + +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "roleList") +public class RoleList { + + @XmlElement(required = true) + private List role; + + @NonNull + public List getRole() { + if (role == null) { + role = new ArrayList<>(); + } + return this.role; + } + + public void setRole(List role) { + this.role = role; + } + +} diff --git a/services/account/jaxb/src/main/java/org/collectionspace/services/account/RoleValue.java b/services/account/jaxb/src/main/java/org/collectionspace/services/account/RoleValue.java new file mode 100644 index 0000000000..ad39121e6d --- /dev/null +++ b/services/account/jaxb/src/main/java/org/collectionspace/services/account/RoleValue.java @@ -0,0 +1,67 @@ +package org.collectionspace.services.account; + +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; + + +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "role_value") +public class RoleValue { + + private String roleRelationshipId; + + @XmlElement(required = true) + private String roleId; + + @XmlElement(required = true) + private String roleName; + + @XmlElement(required = true) + private String displayName; + + @XmlElement(required = true) + private String tenantId; + + public String getRoleRelationshipId() { + return roleRelationshipId; + } + + public void setRoleRelationshipId(String roleRelationshipId) { + this.roleRelationshipId = roleRelationshipId; + } + + public String getRoleId() { + return roleId; + } + + public void setRoleId(String roleId) { + this.roleId = roleId; + } + + public String getRoleName() { + return roleName; + } + + public void setRoleName(String roleName) { + this.roleName = roleName; + } + + public String getDisplayName() { + return displayName; + } + + public void setDisplayName(String displayName) { + this.displayName = displayName; + } + + public String getTenantId() { + return tenantId; + } + + public void setTenantId(String tenantId) { + this.tenantId = tenantId; + } + +} diff --git a/services/account/jaxb/src/main/java/org/collectionspace/services/account/Status.java b/services/account/jaxb/src/main/java/org/collectionspace/services/account/Status.java new file mode 100644 index 0000000000..852b0c3a96 --- /dev/null +++ b/services/account/jaxb/src/main/java/org/collectionspace/services/account/Status.java @@ -0,0 +1,35 @@ +package org.collectionspace.services.account; + +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlEnumValue; +import jakarta.xml.bind.annotation.XmlType; + +@XmlType(name = "status") +@XmlEnum +public enum Status { + + @XmlEnumValue("active") + ACTIVE("active"), + @XmlEnumValue("inactive") + INACTIVE("inactive"); + + private final String value; + + Status(String v) { + value = v; + } + + public String value() { + return value; + } + + public static Status fromValue(String v) { + for (Status c: Status.values()) { + if (c.value.equals(v)) { + return c; + } + } + throw new IllegalArgumentException(v); + } + +} diff --git a/services/account/jaxb/src/main/java/org/collectionspace/services/account/Tenant.java b/services/account/jaxb/src/main/java/org/collectionspace/services/account/Tenant.java new file mode 100644 index 0000000000..23f76f5c5e --- /dev/null +++ b/services/account/jaxb/src/main/java/org/collectionspace/services/account/Tenant.java @@ -0,0 +1,165 @@ +package org.collectionspace.services.account; + +import java.util.Date; +import java.util.Objects; +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.Inheritance; +import javax.persistence.InheritanceType; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; +import javax.persistence.Transient; +import javax.xml.datatype.XMLGregorianCalendar; + +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlSchemaType; +import jakarta.xml.bind.annotation.XmlType; +import org.jvnet.hyperjaxb3.xml.bind.annotation.adapters.XMLGregorianCalendarAsDateTime; +import org.jvnet.hyperjaxb3.xml.bind.annotation.adapters.XmlAdapterUtils; + + +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "") +@XmlRootElement(name = "tenant") +@Entity(name = "Tenant") +@Table(name = "tenants") +@Inheritance(strategy = InheritanceType.JOINED) +public class Tenant { + + @Id + @Column(name = "id", nullable = false, length = 128) + @XmlElement(required = true) + private String id; + + @Basic + @Column(name = "name", nullable = false) + @XmlElement(required = true) + private String name; + + @Basic + @Column(name = "config_md5hash") + @XmlElement(required = true) + private String configMD5Hash; + + @Basic + @Column(name = "authorities_initialized", nullable = false) + private boolean authoritiesInitialized; + + @Basic + @Column(name = "disabled", nullable = false) + private boolean disabled; + + @Transient + @XmlElement(required = true) + @XmlSchemaType(name = "dateTime") + private XMLGregorianCalendar createdAt; + + @Transient + @XmlElement(required = true) + @XmlSchemaType(name = "dateTime") + private XMLGregorianCalendar updatedAt; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getConfigMD5Hash() { + return configMD5Hash; + } + + public void setConfigMD5Hash(String configMD5Hash) { + this.configMD5Hash = configMD5Hash; + } + + public boolean isAuthoritiesInitialized() { + return authoritiesInitialized; + } + + public void setAuthoritiesInitialized(boolean authoritiesInitialized) { + this.authoritiesInitialized = authoritiesInitialized; + } + + public boolean isDisabled() { + return disabled; + } + + public void setDisabled(boolean disabled) { + this.disabled = disabled; + } + + public XMLGregorianCalendar getCreatedAt() { + return createdAt; + } + + public void setCreatedAt(XMLGregorianCalendar createdAt) { + this.createdAt = createdAt; + } + + public XMLGregorianCalendar getUpdatedAt() { + return updatedAt; + } + + public void setUpdatedAt(XMLGregorianCalendar updatedAt) { + this.updatedAt = updatedAt; + } + + @Basic + @Column(name = "created_at", nullable = false) + @Temporal(TemporalType.TIMESTAMP) + public Date getCreatedAtItem() { + return XmlAdapterUtils.unmarshall(XMLGregorianCalendarAsDateTime.class, this.getCreatedAt()); + } + + public void setCreatedAtItem(Date createdAt) { + setCreatedAt(XmlAdapterUtils.marshall(XMLGregorianCalendarAsDateTime.class, createdAt)); + } + + @Basic + @Column(name = "updated_at") + @Temporal(TemporalType.TIMESTAMP) + public Date getUpdatedAtItem() { + return XmlAdapterUtils.unmarshall(XMLGregorianCalendarAsDateTime.class, this.getUpdatedAt()); + } + + public void setUpdatedAtItem(Date updatedAt) { + setUpdatedAt(XmlAdapterUtils.marshall(XMLGregorianCalendarAsDateTime.class, updatedAt)); + } + + @Override + public boolean equals(Object o) { + if (o == null || getClass() != o.getClass()) { + return false; + } + Tenant tenant = (Tenant) o; + return authoritiesInitialized == tenant.authoritiesInitialized + && disabled == tenant.disabled + && Objects.equals(id, tenant.id) + && Objects.equals(name, tenant.name) + && Objects.equals(configMD5Hash, tenant.configMD5Hash) + && Objects.equals(createdAt, tenant.createdAt) + && Objects.equals(updatedAt, tenant.updatedAt); + } + + @Override + public int hashCode() { + return Objects.hash(id, name, configMD5Hash, authoritiesInitialized, disabled, createdAt, updatedAt); + } +} diff --git a/services/account/jaxb/src/main/java/org/collectionspace/services/account/TenantListItem.java b/services/account/jaxb/src/main/java/org/collectionspace/services/account/TenantListItem.java new file mode 100644 index 0000000000..118b9c7ded --- /dev/null +++ b/services/account/jaxb/src/main/java/org/collectionspace/services/account/TenantListItem.java @@ -0,0 +1,45 @@ +package org.collectionspace.services.account; + +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; + + +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "") +public class TenantListItem { + + @XmlElement(required = true) + private String id; + + @XmlElement(required = true) + private String name; + + private boolean disabled; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public boolean isDisabled() { + return disabled; + } + + public void setDisabled(boolean disabled) { + this.disabled = disabled; + } + +} diff --git a/services/account/jaxb/src/main/java/org/collectionspace/services/account/TenantsList.java b/services/account/jaxb/src/main/java/org/collectionspace/services/account/TenantsList.java new file mode 100644 index 0000000000..06204c37ef --- /dev/null +++ b/services/account/jaxb/src/main/java/org/collectionspace/services/account/TenantsList.java @@ -0,0 +1,35 @@ +package org.collectionspace.services.account; + +import java.util.ArrayList; +import java.util.List; + +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; +import org.collectionspace.services.jaxb.AbstractCommonList; +import org.jspecify.annotations.NonNull; + + +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "") +@XmlRootElement(name = "tenants-list") +public class TenantsList extends AbstractCommonList { + + @XmlElement(name = "tenant-list-item", required = true) + private List tenantListItem; + + @NonNull + public List getTenantListItem() { + if (tenantListItem == null) { + tenantListItem = new ArrayList<>(); + } + return this.tenantListItem; + } + + public void setTenantListItem(List tenantListItem) { + this.tenantListItem = tenantListItem; + } + +} diff --git a/services/account/jaxb/src/main/java/org/collectionspace/services/account/package-info.java b/services/account/jaxb/src/main/java/org/collectionspace/services/account/package-info.java new file mode 100644 index 0000000000..0094929bc9 --- /dev/null +++ b/services/account/jaxb/src/main/java/org/collectionspace/services/account/package-info.java @@ -0,0 +1,2 @@ +@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://collectionspace.org/services/account") +package org.collectionspace.services.account; diff --git a/services/account/jaxb/src/main/resources/accounts_common.xsd b/services/account/jaxb/src/main/resources/accounts_common.xsd deleted file mode 100644 index 7caba18ecc..0000000000 --- a/services/account/jaxb/src/main/resources/accounts_common.xsd +++ /dev/null @@ -1,353 +0,0 @@ - - - - - - - - - - - - - - - - - - - - AccountsCommon is the account definition in CollectionSpace - - userId is unique across all realms and across all tenants in CollectionSpace - - password should be >8 and <24 chars in length - - tenant association is usually not required to be provided by the - service consumer. only in cases where a user in CollectionSpace - has access to the spaces of multiple tenants, this is used - to associate that user with more than one tenants - - - - - - userid - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - userId is unique across all tenants in CollectionSpace - - - - - - - - - - - - - password should be >8 and <24 chars in length - - - - - - - - - - If true, login through an SSO identity provider is required. - - - - - - - - - - - - tenant association is usually not required to be provided by the - service consumer. only in cases where a user in CollectionSpace - has access to the spaces of multiple tenants, this is used - to associate that user with more than one tenants - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - RoleList is used relationships - - - - - - - - - - - - - - RoleValue is used in relationships - - - - - - - - - - - - - - - - - - Status of the account in CollectionSpace - - - - - - - - - - - - AccountTenant defines the relationship between an account and a tenant - - - - - - - - - - - - - - - - - - - - - - - - - - - Tenant defines the tenant in CollectionSpace - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/services/account/jaxb/src/main/resources/accounts_common_list.xsd b/services/account/jaxb/src/main/resources/accounts_common_list.xsd deleted file mode 100644 index 02131abe13..0000000000 --- a/services/account/jaxb/src/main/resources/accounts_common_list.xsd +++ /dev/null @@ -1,118 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - AccountsCommonList contains information about one or more - accounts. An instance of this type could be returned on - index and search operations. - - - - - - - - - - - - - - - - - - - - - - - tenant association is usually not required to be provided by the - service consumer. only in cases where a user in CollectionSpace - has access to the spaces of multiple tenants, this is used - to associate that user with more than one tenants - - - - - - - - - - - - - - - - - - - - - - - - TenantsList contains information about one or more - tenants. An instance of this type could be returned on - index and search operations. - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/services/account/jaxb/src/main/resources/bindings.xml b/services/account/jaxb/src/main/resources/bindings.xml deleted file mode 100644 index 72e1e094ba..0000000000 --- a/services/account/jaxb/src/main/resources/bindings.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/services/account/jaxb/src/main/resources/instance1.xml b/services/account/jaxb/src/main/resources/instance1.xml deleted file mode 100644 index 90c47c8eb4..0000000000 --- a/services/account/jaxb/src/main/resources/instance1.xml +++ /dev/null @@ -1,43 +0,0 @@ - - - screenName0 - personRefName0 - email0 - phone0 - mobile0 - userId0 - ZGVmYXVsdA== - - tenant_id0 - - - tenant_id1 - - active - metadataProtection0 - rolesProtection0 - 2006-05-04T18:13:51.0 - 2006-05-04T18:13:51.0 - - - roleRelationshipId0 - roleId0 - roleName0 - displayName0 - tenantId0 - - - roleRelationshipId1 - roleId1 - roleName1 - displayName1 - tenantId1 - - - diff --git a/services/account/service/src/main/java/org/collectionspace/services/account/AccountResource.java b/services/account/service/src/main/java/org/collectionspace/services/account/AccountResource.java index 27f1c6e0ef..d7b336bc6d 100644 --- a/services/account/service/src/main/java/org/collectionspace/services/account/AccountResource.java +++ b/services/account/service/src/main/java/org/collectionspace/services/account/AccountResource.java @@ -603,7 +603,7 @@ private Response requestPasswordReset(UriInfo ui, String targetTenantID, Account if (contains(targetTenantID, accountListItem.getTenants()) == false) { String errMsg = String.format("Could not send a password request email to user ID='%s'. That account is not associated with the targeted tenant ID = '%s'.", - accountListItem.email, targetTenantID); + accountListItem.getEmail(), targetTenantID); result = Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(errMsg).type("text/plain").build(); return result; } @@ -635,7 +635,7 @@ private Response requestPasswordReset(UriInfo ui, String targetTenantID, Account String status = EmailUtil.sendMessage(emailConfig, accountListItem.getEmail(), message); if (status != null) { String errMsg = String.format("Could not send email to %s: %s", - accountListItem.email, status); + accountListItem.getEmail(), status); result = Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(errMsg).type("text/plain").build(); } else { String okMsg = accountListItem.getEmail(); From 3c909e644ec767f11ebcd5a25d92684bad2358e0 Mon Sep 17 00:00:00 2001 From: Michael Ritter Date: Thu, 9 Apr 2026 11:13:25 -0600 Subject: [PATCH 11/24] Migrate authentication from xsd to classes (#519) * Migrate authentication from xsd to classes --- services/authentication/jaxb/pom.xml | 29 +-- .../authentication/Passwordreset.java | 37 ++++ .../services/authentication/Token.java | 167 ++++++++++++++ .../services/authentication/User.java | 163 ++++++++++++++ .../authentication_identity_provider.xsd | 208 ------------------ 5 files changed, 375 insertions(+), 229 deletions(-) create mode 100644 services/authentication/jaxb/src/main/java/org/collectionspace/services/authentication/Passwordreset.java create mode 100644 services/authentication/jaxb/src/main/java/org/collectionspace/services/authentication/Token.java create mode 100644 services/authentication/jaxb/src/main/java/org/collectionspace/services/authentication/User.java delete mode 100644 services/authentication/jaxb/src/main/resources/authentication_identity_provider.xsd diff --git a/services/authentication/jaxb/pom.xml b/services/authentication/jaxb/pom.xml index 5d37f73c97..e52654cfd1 100644 --- a/services/authentication/jaxb/pom.xml +++ b/services/authentication/jaxb/pom.xml @@ -13,44 +13,31 @@ org.collectionspace.services.authentication.jaxb services.authentication.jaxb + authentication.sql src/main/resources/db/mysql - - - javax.persistence - persistence-api + jakarta.xml.bind + jakarta.xml.bind-api - org.hibernate - hibernate-entitymanager + javax.persistence + persistence-api - - org.dom4j - dom4j + org.jvnet.jaxb + hyperjaxb3-ejb-runtime + 4.0.12 - - collectionspace-services-authentication-jaxb install - - - - - diff --git a/services/authentication/jaxb/src/main/java/org/collectionspace/services/authentication/Passwordreset.java b/services/authentication/jaxb/src/main/java/org/collectionspace/services/authentication/Passwordreset.java new file mode 100644 index 0000000000..df40b27f40 --- /dev/null +++ b/services/authentication/jaxb/src/main/java/org/collectionspace/services/authentication/Passwordreset.java @@ -0,0 +1,37 @@ +package org.collectionspace.services.authentication; + +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; + +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "") +@XmlRootElement(name = "passwordreset") +public class Passwordreset { + + @XmlElement(required = true) + protected String token; + + @XmlElement(required = true) + protected String password; + + public String getToken() { + return token; + } + + public Passwordreset setToken(String token) { + this.token = token; + return this; + } + + public String getPassword() { + return password; + } + + public Passwordreset setPassword(String password) { + this.password = password; + return this; + } +} diff --git a/services/authentication/jaxb/src/main/java/org/collectionspace/services/authentication/Token.java b/services/authentication/jaxb/src/main/java/org/collectionspace/services/authentication/Token.java new file mode 100644 index 0000000000..65e087009e --- /dev/null +++ b/services/authentication/jaxb/src/main/java/org/collectionspace/services/authentication/Token.java @@ -0,0 +1,167 @@ +package org.collectionspace.services.authentication; + +import java.math.BigInteger; +import java.util.Date; +import java.util.Objects; +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.Inheritance; +import javax.persistence.InheritanceType; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; +import javax.persistence.Transient; +import javax.xml.datatype.XMLGregorianCalendar; + +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlSchemaType; +import jakarta.xml.bind.annotation.XmlType; +import org.jvnet.hyperjaxb3.xml.bind.annotation.adapters.XMLGregorianCalendarAsDateTime; +import org.jvnet.hyperjaxb3.xml.bind.annotation.adapters.XmlAdapterUtils; + +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "") +@XmlRootElement(name = "token") +@Entity(name = "Token") +@Table(name = "tokens") +@Inheritance(strategy = InheritanceType.JOINED) +public class Token { + + @Id + @Column(name = "id", nullable = false, length = 128) + @XmlElement(required = true) + protected String id; + + @Basic + @Column(name = "account_csid", nullable = false, length = 128) + @XmlElement(required = true) + protected String accountCsid; + + @Basic + @Column(name = "tenant_id", nullable = false, length = 128) + @XmlElement(required = true) + protected String tenantId; + + @Basic + @Column(name = "expire_seconds", nullable = false, precision = 20, scale = 0) + @XmlElement(required = true) + protected BigInteger expireSeconds; + + @Basic + @Column(name = "enabled", nullable = false) + protected boolean enabled; + + @Transient + @XmlElement(required = true) + @XmlSchemaType(name = "dateTime") + protected XMLGregorianCalendar createdAt; + + @Transient + @XmlElement(required = true) + @XmlSchemaType(name = "dateTime") + protected XMLGregorianCalendar updatedAt; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getAccountCsid() { + return accountCsid; + } + + public void setAccountCsid(String accountCsid) { + this.accountCsid = accountCsid; + } + + public String getTenantId() { + return tenantId; + } + + public void setTenantId(String tenantId) { + this.tenantId = tenantId; + } + + public BigInteger getExpireSeconds() { + return expireSeconds; + } + + public void setExpireSeconds(BigInteger expireSeconds) { + this.expireSeconds = expireSeconds; + } + + public boolean isEnabled() { + return enabled; + } + + public void setEnabled(boolean enabled) { + this.enabled = enabled; + } + + public XMLGregorianCalendar getCreatedAt() { + return createdAt; + } + + public void setCreatedAt(XMLGregorianCalendar createdAt) { + this.createdAt = createdAt; + } + + public XMLGregorianCalendar getUpdatedAt() { + return updatedAt; + } + + public void setUpdatedAt(XMLGregorianCalendar updatedAt) { + this.updatedAt = updatedAt; + } + + @Basic + @Column(name = "created_at", nullable = false) + @Temporal(TemporalType.TIMESTAMP) + public Date getCreatedAtItem() { + return XmlAdapterUtils.unmarshall(XMLGregorianCalendarAsDateTime.class, this.getCreatedAt()); + } + + public void setCreatedAtItem(Date createdAt) { + setCreatedAt(XmlAdapterUtils.marshall(XMLGregorianCalendarAsDateTime.class, createdAt)); + } + + @Basic + @Column(name = "updated_at") + @Temporal(TemporalType.TIMESTAMP) + public Date getUpdatedAtItem() { + return XmlAdapterUtils.unmarshall(XMLGregorianCalendarAsDateTime.class, this.getUpdatedAt()); + } + + public void setUpdatedAtItem(Date updatedAt) { + setUpdatedAt(XmlAdapterUtils.marshall(XMLGregorianCalendarAsDateTime.class, updatedAt)); + } + + + @Override + public boolean equals(Object o) { + if (o == null || getClass() != o.getClass()) { + return false; + } + Token token = (Token) o; + return enabled == token.enabled + && Objects.equals(id, token.id) + && Objects.equals(accountCsid, token.accountCsid) + && Objects.equals(tenantId, token.tenantId) + && Objects.equals(expireSeconds, token.expireSeconds) + && Objects.equals(createdAt, token.createdAt) + && Objects.equals(updatedAt, token.updatedAt); + } + + @Override + public int hashCode() { + return Objects.hash(id, accountCsid, tenantId, expireSeconds, enabled, createdAt, updatedAt); + } +} diff --git a/services/authentication/jaxb/src/main/java/org/collectionspace/services/authentication/User.java b/services/authentication/jaxb/src/main/java/org/collectionspace/services/authentication/User.java new file mode 100644 index 0000000000..f209bdc21f --- /dev/null +++ b/services/authentication/jaxb/src/main/java/org/collectionspace/services/authentication/User.java @@ -0,0 +1,163 @@ +package org.collectionspace.services.authentication; + +import java.util.Date; +import java.util.Objects; +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.Inheritance; +import javax.persistence.InheritanceType; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; +import javax.persistence.Transient; +import javax.xml.datatype.XMLGregorianCalendar; + +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlSchemaType; +import jakarta.xml.bind.annotation.XmlType; +import org.jvnet.hyperjaxb3.xml.bind.annotation.adapters.XMLGregorianCalendarAsDateTime; +import org.jvnet.hyperjaxb3.xml.bind.annotation.adapters.XmlAdapterUtils; + +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "") +@XmlRootElement(name = "user") +@Entity(name = "User") +@Table(name = "users") +@Inheritance(strategy = InheritanceType.JOINED) +public class User { + + @Id + @Column(name = "username", nullable = false, length = 128) + @XmlElement(required = true) + protected String username; + + @Basic + @Column(name = "passwd", nullable = false, length = 128) + @XmlElement(required = true) + protected String passwd; + + @Basic + @Column(name = "salt", nullable = false, length = 128) + @XmlElement(required = true) + protected String salt; + + @Transient + @XmlElement(required = true) + @XmlSchemaType(name = "dateTime") + protected XMLGregorianCalendar createdAt; + + @Transient + @XmlElement(required = true) + @XmlSchemaType(name = "dateTime") + protected XMLGregorianCalendar updatedAt; + + @Transient + @XmlElement(required = true) + @XmlSchemaType(name = "dateTime") + protected XMLGregorianCalendar lastLogin; + + public String getUsername() { + return username; + } + + public void setUsername(String username) { + this.username = username; + } + + public String getPasswd() { + return passwd; + } + + public void setPasswd(String passwd) { + this.passwd = passwd; + } + + public String getSalt() { + return salt; + } + + public void setSalt(String salt) { + this.salt = salt; + } + + public XMLGregorianCalendar getCreatedAt() { + return createdAt; + } + + public void setCreatedAt(XMLGregorianCalendar createdAt) { + this.createdAt = createdAt; + } + + public XMLGregorianCalendar getUpdatedAt() { + return updatedAt; + } + + public void setUpdatedAt(XMLGregorianCalendar updatedAt) { + this.updatedAt = updatedAt; + } + + public XMLGregorianCalendar getLastLogin() { + return lastLogin; + } + + public void setLastLogin(XMLGregorianCalendar lastLogin) { + this.lastLogin = lastLogin; + } + + @Basic + @Column(name = "created_at", nullable = false) + @Temporal(TemporalType.TIMESTAMP) + public Date getCreatedAtItem() { + return XmlAdapterUtils.unmarshall(XMLGregorianCalendarAsDateTime.class, this.getCreatedAt()); + } + + public void setCreatedAtItem(Date createdAt) { + setCreatedAt(XmlAdapterUtils.marshall(XMLGregorianCalendarAsDateTime.class, createdAt)); + } + + @Basic + @Column(name = "updated_at") + @Temporal(TemporalType.TIMESTAMP) + public Date getUpdatedAtItem() { + return XmlAdapterUtils.unmarshall(XMLGregorianCalendarAsDateTime.class, this.getUpdatedAt()); + } + + public void setUpdatedAtItem(Date updatedAt) { + setUpdatedAt(XmlAdapterUtils.marshall(XMLGregorianCalendarAsDateTime.class, updatedAt)); + } + + @Basic + @Column(name = "lastLogin") + @Temporal(TemporalType.TIMESTAMP) + public Date getLastLoginItem() { + return XmlAdapterUtils.unmarshall(XMLGregorianCalendarAsDateTime.class, this.getLastLogin()); + } + + public void setLastLoginItem(Date lastLogin) { + setLastLogin(XmlAdapterUtils.marshall(XMLGregorianCalendarAsDateTime.class, lastLogin)); + } + + @Override + public boolean equals(Object o) { + if (o == null || getClass() != o.getClass()) { + return false; + } + User user = (User) o; + return Objects.equals(username, user.username) + && Objects.equals(passwd, user.passwd) + && Objects.equals(salt, user.salt) + && Objects.equals(createdAt, user.createdAt) + && Objects.equals(updatedAt, user.updatedAt) + && Objects.equals(lastLogin, user.lastLogin); + } + + @Override + public int hashCode() { + return Objects.hash(username, passwd, salt, createdAt, updatedAt, lastLogin); + } +} diff --git a/services/authentication/jaxb/src/main/resources/authentication_identity_provider.xsd b/services/authentication/jaxb/src/main/resources/authentication_identity_provider.xsd deleted file mode 100644 index 6971c27157..0000000000 --- a/services/authentication/jaxb/src/main/resources/authentication_identity_provider.xsd +++ /dev/null @@ -1,208 +0,0 @@ - - - - - - - - - - - - - User definition of CollectionSpace Identity Provider (CSIP) - - username is unique within all the realms in CollectionSpace - including the one managed by CSIP - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - The payload for a password reset request - - - - - - - - - - - - Definition for creating password reset tockens. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - From a7ee9ff482d45d9fc98e0a25af443a1f89e78dba Mon Sep 17 00:00:00 2001 From: Michael Ritter Date: Thu, 9 Apr 2026 11:13:40 -0600 Subject: [PATCH 12/24] Authorization migrate xsd to classes (#518) * Authorization migrate xsd to classes --- services/authorization/jaxb/pom.xml | 63 +---- .../authorization/AccountPermission.java | 47 ++++ .../services/authorization/AccountRole.java | 58 +++++ .../authorization/AccountRoleRel.java | 159 ++++++++++++ .../services/authorization/AccountValue.java | 59 +++++ .../services/authorization/ObjectFactory.java | 56 +++++ .../authorization/PermissionRole.java | 58 +++++ .../authorization/PermissionRoleRel.java | 159 ++++++++++++ .../authorization/PermissionValue.java | 70 ++++++ .../authorization/PermissionsRolesList.java | 34 +++ .../services/authorization/Role.java | 234 ++++++++++++++++++ .../services/authorization/RoleValue.java | 70 ++++++ .../services/authorization/RolesList.java | 80 ++++++ .../services/authorization/SubjectType.java | 19 ++ .../services/authorization/package-info.java | 1 + .../main/resources/accounts_permissions.xsd | 45 ---- .../src/main/resources/accounts_roles.xsd | 180 -------------- .../main/resources/authorization_common.xsd | 89 ------- .../jaxb/src/main/resources/bindings.xjb | 29 --- .../src/main/resources/permissions_roles.xsd | 158 ------------ .../jaxb/src/main/resources/roles.xsd | 156 ------------ .../jaxb/src/main/resources/roles_list.xsd | 60 ----- services/authorization/service/pom.xml | 6 + 23 files changed, 1117 insertions(+), 773 deletions(-) create mode 100644 services/authorization/jaxb/src/main/java/org/collectionspace/services/authorization/AccountPermission.java create mode 100644 services/authorization/jaxb/src/main/java/org/collectionspace/services/authorization/AccountRole.java create mode 100644 services/authorization/jaxb/src/main/java/org/collectionspace/services/authorization/AccountRoleRel.java create mode 100644 services/authorization/jaxb/src/main/java/org/collectionspace/services/authorization/AccountValue.java create mode 100644 services/authorization/jaxb/src/main/java/org/collectionspace/services/authorization/ObjectFactory.java create mode 100644 services/authorization/jaxb/src/main/java/org/collectionspace/services/authorization/PermissionRole.java create mode 100644 services/authorization/jaxb/src/main/java/org/collectionspace/services/authorization/PermissionRoleRel.java create mode 100644 services/authorization/jaxb/src/main/java/org/collectionspace/services/authorization/PermissionValue.java create mode 100644 services/authorization/jaxb/src/main/java/org/collectionspace/services/authorization/PermissionsRolesList.java create mode 100644 services/authorization/jaxb/src/main/java/org/collectionspace/services/authorization/Role.java create mode 100644 services/authorization/jaxb/src/main/java/org/collectionspace/services/authorization/RoleValue.java create mode 100644 services/authorization/jaxb/src/main/java/org/collectionspace/services/authorization/RolesList.java create mode 100644 services/authorization/jaxb/src/main/java/org/collectionspace/services/authorization/SubjectType.java create mode 100644 services/authorization/jaxb/src/main/java/org/collectionspace/services/authorization/package-info.java delete mode 100644 services/authorization/jaxb/src/main/resources/accounts_permissions.xsd delete mode 100644 services/authorization/jaxb/src/main/resources/accounts_roles.xsd delete mode 100644 services/authorization/jaxb/src/main/resources/authorization_common.xsd delete mode 100644 services/authorization/jaxb/src/main/resources/bindings.xjb delete mode 100644 services/authorization/jaxb/src/main/resources/permissions_roles.xsd delete mode 100644 services/authorization/jaxb/src/main/resources/roles.xsd delete mode 100644 services/authorization/jaxb/src/main/resources/roles_list.xsd diff --git a/services/authorization/jaxb/pom.xml b/services/authorization/jaxb/pom.xml index b39c5bd598..8c0b91fa23 100644 --- a/services/authorization/jaxb/pom.xml +++ b/services/authorization/jaxb/pom.xml @@ -10,80 +10,31 @@ 4.0.0 org.collectionspace.services.authorization.jaxb services.authorization.jaxb - - + - - - org.glassfish.jaxb - jaxb-runtime - - javax.persistence persistence-api - - org.hibernate - hibernate-entitymanager - - - - org.dom4j - dom4j - - - org.hibernate - hibernate-c3p0 - - - - org.collectionspace.services - org.collectionspace.services.hyperjaxb - ${project.version} - jakarta.xml.bind jakarta.xml.bind-api - collectionspace-services-authorization-jaxb install - - - - + diff --git a/services/authorization/jaxb/src/main/java/org/collectionspace/services/authorization/AccountPermission.java b/services/authorization/jaxb/src/main/java/org/collectionspace/services/authorization/AccountPermission.java new file mode 100644 index 0000000000..4fb193c4c2 --- /dev/null +++ b/services/authorization/jaxb/src/main/java/org/collectionspace/services/authorization/AccountPermission.java @@ -0,0 +1,47 @@ +package org.collectionspace.services.authorization; + +import java.util.ArrayList; +import java.util.List; + +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; +import org.jspecify.annotations.NonNull; + +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "account_permission") +public class AccountPermission { + + @XmlElement(required = true) + private List account; + + @XmlElement(required = true) + private List permission; + + @NonNull + public List getAccount() { + if (account == null) { + account = new ArrayList<>(); + } + return account; + } + + public AccountPermission setAccount(List account) { + this.account = account; + return this; + } + + @NonNull + public List getPermission() { + if (permission == null) { + permission = new ArrayList<>(); + } + return permission; + } + + public AccountPermission setPermission(List permission) { + this.permission = permission; + return this; + } +} diff --git a/services/authorization/jaxb/src/main/java/org/collectionspace/services/authorization/AccountRole.java b/services/authorization/jaxb/src/main/java/org/collectionspace/services/authorization/AccountRole.java new file mode 100644 index 0000000000..7ca300364f --- /dev/null +++ b/services/authorization/jaxb/src/main/java/org/collectionspace/services/authorization/AccountRole.java @@ -0,0 +1,58 @@ +package org.collectionspace.services.authorization; + +import java.util.ArrayList; +import java.util.List; + +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; +import org.jspecify.annotations.NonNull; + +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "account_role") +public class AccountRole { + + private SubjectType subject; + + @XmlElement(required = true) + private List account; + + @XmlElement(required = true) + private List role; + + public SubjectType getSubject() { + return subject; + } + + public AccountRole setSubject(SubjectType subject) { + this.subject = subject; + return this; + } + + @NonNull + public List getAccount() { + if (account == null) { + account = new ArrayList<>(); + } + return account; + } + + public AccountRole setAccount(List account) { + this.account = account; + return this; + } + + @NonNull + public List getRole() { + if (role == null) { + role = new ArrayList<>(); + } + return role; + } + + public AccountRole setRole(List role) { + this.role = role; + return this; + } +} diff --git a/services/authorization/jaxb/src/main/java/org/collectionspace/services/authorization/AccountRoleRel.java b/services/authorization/jaxb/src/main/java/org/collectionspace/services/authorization/AccountRoleRel.java new file mode 100644 index 0000000000..7198dc980e --- /dev/null +++ b/services/authorization/jaxb/src/main/java/org/collectionspace/services/authorization/AccountRoleRel.java @@ -0,0 +1,159 @@ +package org.collectionspace.services.authorization; + +import java.util.Date; +import java.util.Objects; +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.Inheritance; +import javax.persistence.InheritanceType; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; +import javax.persistence.Transient; +import javax.persistence.UniqueConstraint; +import javax.xml.datatype.XMLGregorianCalendar; + +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlSchemaType; +import jakarta.xml.bind.annotation.XmlType; +import org.jvnet.hyperjaxb3.xml.bind.annotation.adapters.XMLGregorianCalendarAsDateTime; +import org.jvnet.hyperjaxb3.xml.bind.annotation.adapters.XmlAdapterUtils; + +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "account_role_rel") +@Entity(name = "AccountRoleRel") +@Table(name = "accounts_roles", uniqueConstraints = { + @UniqueConstraint(columnNames = { + "account_id", + "role_id" + }) +}) +@Inheritance(strategy = InheritanceType.JOINED) +public class AccountRoleRel { + + @Id + @Column(name = "HJID") + @GeneratedValue(strategy = GenerationType.AUTO) + @XmlAttribute(name = "Hjid") + private Long hjid; + + @Basic + @Column(name = "account_id", nullable = false, length = 128) + private String accountId; + + @Basic + @Column(name = "screen_name") + private String screenName; + + @Basic + @Column(name = "user_id", nullable = false, length = 128) + @XmlElement(required = true) + private String userId; + + @Basic + @Column(name = "role_id", nullable = false, length = 128) + @XmlElement(required = true) + private String roleId; + + @Basic + @Column(name = "role_name") + private String roleName; + + @Transient + @XmlElement(required = true) + @XmlSchemaType(name = "dateTime") + private XMLGregorianCalendar createdAt; + + public String getAccountId() { + return accountId; + } + + public void setAccountId(String accountId) { + this.accountId = accountId; + } + + public String getScreenName() { + return screenName; + } + + public void setScreenName(String screenName) { + this.screenName = screenName; + } + + public String getUserId() { + return userId; + } + + public void setUserId(String userId) { + this.userId = userId; + } + + public String getRoleId() { + return roleId; + } + + public void setRoleId(String roleId) { + this.roleId = roleId; + } + + public String getRoleName() { + return roleName; + } + + public void setRoleName(String roleName) { + this.roleName = roleName; + } + + public XMLGregorianCalendar getCreatedAt() { + return createdAt; + } + + public void setCreatedAt(XMLGregorianCalendar createdAt) { + this.createdAt = createdAt; + } + + public Long getHjid() { + return hjid; + } + + public void setHjid(Long hjid) { + this.hjid = hjid; + } + + @Basic + @Column(name = "created_at", nullable = false) + @Temporal(TemporalType.TIMESTAMP) + public Date getCreatedAtItem() { + return XmlAdapterUtils.unmarshall(XMLGregorianCalendarAsDateTime.class, this.getCreatedAt()); + } + + public void setCreatedAtItem(Date createdAt) { + setCreatedAt(XmlAdapterUtils.marshall(XMLGregorianCalendarAsDateTime.class, createdAt)); + } + + @Override + public boolean equals(Object o) { + if (o == null || getClass() != o.getClass()) { + return false; + } + AccountRoleRel that = (AccountRoleRel) o; + return Objects.equals(accountId, that.accountId) + && Objects.equals(screenName, that.screenName) + && Objects.equals(userId, that.userId) + && Objects.equals(roleId, that.roleId) + && Objects.equals(roleName, that.roleName) + && Objects.equals(createdAt, that.createdAt); + } + + @Override + public int hashCode() { + return Objects.hash(accountId, screenName, userId, roleId, roleName, createdAt); + } +} diff --git a/services/authorization/jaxb/src/main/java/org/collectionspace/services/authorization/AccountValue.java b/services/authorization/jaxb/src/main/java/org/collectionspace/services/authorization/AccountValue.java new file mode 100644 index 0000000000..348de4169b --- /dev/null +++ b/services/authorization/jaxb/src/main/java/org/collectionspace/services/authorization/AccountValue.java @@ -0,0 +1,59 @@ +package org.collectionspace.services.authorization; + +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; + +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "account_value") +public class AccountValue { + + @XmlElement(required = true) + private String accountId; + + @XmlElement(required = true) + private String screenName; + + @XmlElement(required = true) + private String userId; + + @XmlElement(required = true) + private String tenantId; + + public String getAccountId() { + return accountId; + } + + public AccountValue setAccountId(String accountId) { + this.accountId = accountId; + return this; + } + + public String getScreenName() { + return screenName; + } + + public AccountValue setScreenName(String screenName) { + this.screenName = screenName; + return this; + } + + public String getUserId() { + return userId; + } + + public AccountValue setUserId(String userId) { + this.userId = userId; + return this; + } + + public String getTenantId() { + return tenantId; + } + + public AccountValue setTenantId(String tenantId) { + this.tenantId = tenantId; + return this; + } +} diff --git a/services/authorization/jaxb/src/main/java/org/collectionspace/services/authorization/ObjectFactory.java b/services/authorization/jaxb/src/main/java/org/collectionspace/services/authorization/ObjectFactory.java new file mode 100644 index 0000000000..c16076a064 --- /dev/null +++ b/services/authorization/jaxb/src/main/java/org/collectionspace/services/authorization/ObjectFactory.java @@ -0,0 +1,56 @@ +package org.collectionspace.services.authorization; + +import javax.xml.namespace.QName; + +import jakarta.xml.bind.JAXBElement; +import jakarta.xml.bind.annotation.XmlElementDecl; +import jakarta.xml.bind.annotation.XmlRegistry; + +@XmlRegistry +public class ObjectFactory { + + private static final String AUTHORIZATION_NS = "http://collectionspace.org/services/authorization"; + + private static final QName _AccountRole_QNAME = new QName(AUTHORIZATION_NS, "account_role"); + private static final QName _AccountRoleRel_QNAME = new QName(AUTHORIZATION_NS, "account_role_rel"); + private static final QName _AccountPermission_QNAME = new QName(AUTHORIZATION_NS, "account_permission"); + private static final QName _PermissionRoleRel_QNAME = new QName(AUTHORIZATION_NS, "permission_role_rel"); + private static final QName _Role_QNAME = new QName(AUTHORIZATION_NS, "role"); + private static final QName _RolesList_QNAME = new QName(AUTHORIZATION_NS, "roles_list"); + private static final QName _PermissionRole_QNAME = new QName(AUTHORIZATION_NS, "permission_role"); + + @XmlElementDecl(namespace = AUTHORIZATION_NS, name = "account_role") + public JAXBElement createAccountRole(AccountRole value) { + return new JAXBElement<>(_AccountRole_QNAME, AccountRole.class, null, value); + } + + @XmlElementDecl(namespace = AUTHORIZATION_NS, name = "account_role_rel") + public JAXBElement createAccountRoleRel(AccountRoleRel value) { + return new JAXBElement<>(_AccountRoleRel_QNAME, AccountRoleRel.class, null, value); + } + + @XmlElementDecl(namespace = AUTHORIZATION_NS, name = "account_permission") + public JAXBElement createAccountPermission(AccountPermission value) { + return new JAXBElement<>(_AccountPermission_QNAME, AccountPermission.class, null, value); + } + + @XmlElementDecl(namespace = AUTHORIZATION_NS, name = "permission_role_rel") + public JAXBElement createPermissionRoleRel(PermissionRoleRel value) { + return new JAXBElement<>(_PermissionRoleRel_QNAME, PermissionRoleRel.class, null, value); + } + + @XmlElementDecl(namespace = AUTHORIZATION_NS, name = "role") + public JAXBElement createRole(Role value) { + return new JAXBElement<>(_Role_QNAME, Role.class, null, value); + } + + @XmlElementDecl(namespace = AUTHORIZATION_NS, name = "roles_list") + public JAXBElement createRolesList(RolesList value) { + return new JAXBElement<>(_RolesList_QNAME, RolesList.class, null, value); + } + + @XmlElementDecl(namespace = AUTHORIZATION_NS, name = "permission_role") + public JAXBElement createPermissionRole(PermissionRole value) { + return new JAXBElement<>(_PermissionRole_QNAME, PermissionRole.class, null, value); + } +} diff --git a/services/authorization/jaxb/src/main/java/org/collectionspace/services/authorization/PermissionRole.java b/services/authorization/jaxb/src/main/java/org/collectionspace/services/authorization/PermissionRole.java new file mode 100644 index 0000000000..a80a011b3a --- /dev/null +++ b/services/authorization/jaxb/src/main/java/org/collectionspace/services/authorization/PermissionRole.java @@ -0,0 +1,58 @@ +package org.collectionspace.services.authorization; + +import java.util.ArrayList; +import java.util.List; + +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; +import org.jspecify.annotations.NonNull; + +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "permission_role") +public class PermissionRole { + + private SubjectType subject; + + @XmlElement(required = true) + private List permission; + + @XmlElement(required = true) + private List role; + + public SubjectType getSubject() { + return subject; + } + + public PermissionRole setSubject(SubjectType subject) { + this.subject = subject; + return this; + } + + @NonNull + public List getPermission() { + if (permission == null) { + permission = new ArrayList<>(); + } + return permission; + } + + public PermissionRole setPermission(List permission) { + this.permission = permission; + return this; + } + + @NonNull + public List getRole() { + if (role == null) { + role = new ArrayList<>(); + } + return role; + } + + public PermissionRole setRole(List role) { + this.role = role; + return this; + } +} diff --git a/services/authorization/jaxb/src/main/java/org/collectionspace/services/authorization/PermissionRoleRel.java b/services/authorization/jaxb/src/main/java/org/collectionspace/services/authorization/PermissionRoleRel.java new file mode 100644 index 0000000000..dd69efd7be --- /dev/null +++ b/services/authorization/jaxb/src/main/java/org/collectionspace/services/authorization/PermissionRoleRel.java @@ -0,0 +1,159 @@ +package org.collectionspace.services.authorization; + +import java.util.Date; +import java.util.Objects; +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.Inheritance; +import javax.persistence.InheritanceType; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; +import javax.persistence.Transient; +import javax.persistence.UniqueConstraint; +import javax.xml.datatype.XMLGregorianCalendar; + +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlSchemaType; +import jakarta.xml.bind.annotation.XmlType; +import org.jvnet.hyperjaxb3.xml.bind.annotation.adapters.XMLGregorianCalendarAsDateTime; +import org.jvnet.hyperjaxb3.xml.bind.annotation.adapters.XmlAdapterUtils; + +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "permission_role_rel") +@Entity(name = "PermissionRoleRel") +@Table(name = "permissions_roles", uniqueConstraints = { + @UniqueConstraint(columnNames = { + "permission_id", + "role_id" + }) +}) +@Inheritance(strategy = InheritanceType.JOINED) +public class PermissionRoleRel { + + @Id + @Column(name = "HJID") + @GeneratedValue(strategy = GenerationType.AUTO) + @XmlAttribute(name = "Hjid") + private Long hjid; + + @Basic + @Column(name = "permission_id", nullable = false, length = 128) + @XmlElement(required = true) + private String permissionId; + + @Basic + @Column(name = "permission_resource") + private String permissionResource; + + @Basic + @Column(name = "actionGroup") + private String actionGroup; + + @Basic + @Column(name = "role_id", nullable = false, length = 128) + @XmlElement(required = true) + private String roleId; + + @Basic + @Column(name = "role_name") + private String roleName; + + @Transient + @XmlElement(required = true) + @XmlSchemaType(name = "dateTime") + private XMLGregorianCalendar createdAt; + + public String getPermissionId() { + return permissionId; + } + + public void setPermissionId(String permissionId) { + this.permissionId = permissionId; + } + + public String getPermissionResource() { + return permissionResource; + } + + public void setPermissionResource(String permissionResource) { + this.permissionResource = permissionResource; + } + + public String getActionGroup() { + return actionGroup; + } + + public void setActionGroup(String actionGroup) { + this.actionGroup = actionGroup; + } + + public String getRoleId() { + return roleId; + } + + public void setRoleId(String roleId) { + this.roleId = roleId; + } + + public String getRoleName() { + return roleName; + } + + public void setRoleName(String roleName) { + this.roleName = roleName; + } + + public XMLGregorianCalendar getCreatedAt() { + return createdAt; + } + + public void setCreatedAt(XMLGregorianCalendar createdAt) { + this.createdAt = createdAt; + } + + public Long getHjid() { + return hjid; + } + + public void setHjid(Long hjid) { + this.hjid = hjid; + } + + @Basic + @Column(name = "created_at", nullable = false) + @Temporal(TemporalType.TIMESTAMP) + public Date getCreatedAtItem() { + return XmlAdapterUtils.unmarshall(XMLGregorianCalendarAsDateTime.class, this.getCreatedAt()); + } + + public void setCreatedAtItem(Date createdAt) { + setCreatedAt(XmlAdapterUtils.marshall(XMLGregorianCalendarAsDateTime.class, createdAt)); + } + + @Override + public boolean equals(Object o) { + if (o == null || getClass() != o.getClass()) { + return false; + } + PermissionRoleRel that = (PermissionRoleRel) o; + return Objects.equals(permissionId, that.permissionId) + && Objects.equals(permissionResource, that.permissionResource) + && Objects.equals(actionGroup, that.actionGroup) + && Objects.equals(roleId, that.roleId) + && Objects.equals(roleName, that.roleName) + && Objects.equals(createdAt, that.createdAt); + } + + @Override + public int hashCode() { + return Objects.hash(permissionId, permissionResource, actionGroup, roleId, roleName, createdAt); + } +} diff --git a/services/authorization/jaxb/src/main/java/org/collectionspace/services/authorization/PermissionValue.java b/services/authorization/jaxb/src/main/java/org/collectionspace/services/authorization/PermissionValue.java new file mode 100644 index 0000000000..16d80c1b2c --- /dev/null +++ b/services/authorization/jaxb/src/main/java/org/collectionspace/services/authorization/PermissionValue.java @@ -0,0 +1,70 @@ +package org.collectionspace.services.authorization; + +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; + +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "permission_value") +public class PermissionValue { + + private String permRelationshipId; + + @XmlElement(required = true) + private String permissionId; + + @XmlElement(required = true) + private String resourceName; + + @XmlElement(required = true) + private String actionGroup; + + @XmlElement(required = true) + private String tenantId; + + public String getPermRelationshipId() { + return permRelationshipId; + } + + public PermissionValue setPermRelationshipId(String permRelationshipId) { + this.permRelationshipId = permRelationshipId; + return this; + } + + public String getPermissionId() { + return permissionId; + } + + public PermissionValue setPermissionId(String permissionId) { + this.permissionId = permissionId; + return this; + } + + public String getResourceName() { + return resourceName; + } + + public PermissionValue setResourceName(String resourceName) { + this.resourceName = resourceName; + return this; + } + + public String getActionGroup() { + return actionGroup; + } + + public PermissionValue setActionGroup(String actionGroup) { + this.actionGroup = actionGroup; + return this; + } + + public String getTenantId() { + return tenantId; + } + + public PermissionValue setTenantId(String tenantId) { + this.tenantId = tenantId; + return this; + } +} diff --git a/services/authorization/jaxb/src/main/java/org/collectionspace/services/authorization/PermissionsRolesList.java b/services/authorization/jaxb/src/main/java/org/collectionspace/services/authorization/PermissionsRolesList.java new file mode 100644 index 0000000000..92702470ee --- /dev/null +++ b/services/authorization/jaxb/src/main/java/org/collectionspace/services/authorization/PermissionsRolesList.java @@ -0,0 +1,34 @@ +package org.collectionspace.services.authorization; + + +import java.util.ArrayList; +import java.util.List; + +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; +import org.jspecify.annotations.NonNull; + +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "") +@XmlRootElement(name = "permissions_roles_list") +public class PermissionsRolesList { + + @XmlElement(required = true) + private List permissionRole; + + @NonNull + public List getPermissionRole() { + if (permissionRole == null) { + permissionRole = new ArrayList<>(); + } + return this.permissionRole; + } + + public void setPermissionRole(List permissionRole) { + this.permissionRole = permissionRole; + } + +} diff --git a/services/authorization/jaxb/src/main/java/org/collectionspace/services/authorization/Role.java b/services/authorization/jaxb/src/main/java/org/collectionspace/services/authorization/Role.java new file mode 100644 index 0000000000..f0d4f58133 --- /dev/null +++ b/services/authorization/jaxb/src/main/java/org/collectionspace/services/authorization/Role.java @@ -0,0 +1,234 @@ +package org.collectionspace.services.authorization; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Objects; +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.Inheritance; +import javax.persistence.InheritanceType; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; +import javax.persistence.Transient; +import javax.persistence.UniqueConstraint; +import javax.xml.datatype.XMLGregorianCalendar; + +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlSchemaType; +import jakarta.xml.bind.annotation.XmlType; +import org.jspecify.annotations.NonNull; +import org.jvnet.hyperjaxb3.xml.bind.annotation.adapters.XMLGregorianCalendarAsDateTime; +import org.jvnet.hyperjaxb3.xml.bind.annotation.adapters.XmlAdapterUtils; + +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "role") +@Entity(name = "Role") +@Table(name = "roles", uniqueConstraints = { + @UniqueConstraint(columnNames = { + "rolename", + "tenant_id" + }), + @UniqueConstraint(columnNames = { + "displayname", + "tenant_id" + }) +}) +@Inheritance(strategy = InheritanceType.JOINED) +public class Role { + + @Id + @Column(name = "csid", nullable = false, length = 128) + @XmlAttribute(name = "csid") + private String csid; + + @Basic + @Column(name = "displayname", nullable = false, length = 200) + @XmlElement(required = true) + private String displayName; + + @Basic + @Column(name = "rolename", nullable = false, length = 200) + @XmlElement(required = true) + private String roleName; + + @Basic + @Column(name = "description") + private String description; + + @Basic + @Column(name = "rolegroup") + private String roleGroup; + + @Basic + @Column(name = "tenant_id", nullable = false, length = 128) + @XmlElement(name = "tenant_id", required = true) + private String tenantId; + + @Basic + @Column(name = "metadata_protection") + private String metadataProtection; + + @Basic + @Column(name = "perms_protection") + private String permsProtection; + + @Transient + @XmlElement(required = true) + @XmlSchemaType(name = "dateTime") + private XMLGregorianCalendar createdAt; + + @Transient + @XmlElement(required = true) + @XmlSchemaType(name = "dateTime") + private XMLGregorianCalendar updatedAt; + + @Transient + @XmlElement(required = true) + private List permission; + + public String getDisplayName() { + return displayName; + } + + public void setDisplayName(String displayName) { + this.displayName = displayName; + } + + public String getRoleName() { + return roleName; + } + + public void setRoleName(String roleName) { + this.roleName = roleName; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public String getRoleGroup() { + return roleGroup; + } + + public void setRoleGroup(String roleGroup) { + this.roleGroup = roleGroup; + } + + public String getTenantId() { + return tenantId; + } + + public void setTenantId(String tenantId) { + this.tenantId = tenantId; + } + + public String getMetadataProtection() { + return metadataProtection; + } + + public void setMetadataProtection(String metadataProtection) { + this.metadataProtection = metadataProtection; + } + + public String getPermsProtection() { + return permsProtection; + } + + public void setPermsProtection(String permsProtection) { + this.permsProtection = permsProtection; + } + + public XMLGregorianCalendar getCreatedAt() { + return createdAt; + } + + public void setCreatedAt(XMLGregorianCalendar createdAt) { + this.createdAt = createdAt; + } + + public XMLGregorianCalendar getUpdatedAt() { + return updatedAt; + } + + public void setUpdatedAt(XMLGregorianCalendar updatedAt) { + this.updatedAt = updatedAt; + } + + @NonNull + public List getPermission() { + if (permission == null) { + permission = new ArrayList<>(); + } + return this.permission; + } + + public void setPermission(List permission) { + this.permission = permission; + } + + public String getCsid() { + return csid; + } + + public void setCsid(String csid) { + this.csid = csid; + } + + @Basic + @Column(name = "created_at", nullable = false) + @Temporal(TemporalType.TIMESTAMP) + public Date getCreatedAtItem() { + return XmlAdapterUtils.unmarshall(XMLGregorianCalendarAsDateTime.class, this.getCreatedAt()); + } + + public void setCreatedAtItem(Date createdAt) { + setCreatedAt(XmlAdapterUtils.marshall(XMLGregorianCalendarAsDateTime.class, createdAt)); + } + + @Basic + @Column(name = "updated_at") + @Temporal(TemporalType.TIMESTAMP) + public Date getUpdatedAtItem() { + return XmlAdapterUtils.unmarshall(XMLGregorianCalendarAsDateTime.class, this.getUpdatedAt()); + } + + public void setUpdatedAtItem(Date updatedAt) { + setUpdatedAt(XmlAdapterUtils.marshall(XMLGregorianCalendarAsDateTime.class, updatedAt)); + } + + @Override + public boolean equals(Object o) { + if (o == null || getClass() != o.getClass()) { + return false; + } + Role role = (Role) o; + return Objects.equals(displayName, role.displayName) + && Objects.equals(roleName, role.roleName) + && Objects.equals(description, role.description) + && Objects.equals(roleGroup, role.roleGroup) + && Objects.equals(tenantId, role.tenantId) + && Objects.equals(metadataProtection, role.metadataProtection) + && Objects.equals(permsProtection, role.permsProtection) + && Objects.equals(createdAt, role.createdAt) + && Objects.equals(updatedAt, role.updatedAt) + && Objects.equals(permission, role.permission) + && Objects.equals(csid, role.csid); + } + + @Override + public int hashCode() { + return Objects.hash(displayName, roleName, description, roleGroup, tenantId, metadataProtection, + permsProtection, createdAt, updatedAt, permission, csid); + } +} diff --git a/services/authorization/jaxb/src/main/java/org/collectionspace/services/authorization/RoleValue.java b/services/authorization/jaxb/src/main/java/org/collectionspace/services/authorization/RoleValue.java new file mode 100644 index 0000000000..8902f10d1d --- /dev/null +++ b/services/authorization/jaxb/src/main/java/org/collectionspace/services/authorization/RoleValue.java @@ -0,0 +1,70 @@ +package org.collectionspace.services.authorization; + +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; + +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "role_value") +public class RoleValue { + + private String roleRelationshipId; + + @XmlElement(required = true) + private String roleId; + + @XmlElement(required = true) + private String roleName; + + @XmlElement(required = true) + private String displayName; + + @XmlElement(required = true) + private String tenantId; + + public String getRoleRelationshipId() { + return roleRelationshipId; + } + + public RoleValue setRoleRelationshipId(String roleRelationshipId) { + this.roleRelationshipId = roleRelationshipId; + return this; + } + + public String getRoleId() { + return roleId; + } + + public RoleValue setRoleId(String roleId) { + this.roleId = roleId; + return this; + } + + public String getRoleName() { + return roleName; + } + + public RoleValue setRoleName(String roleName) { + this.roleName = roleName; + return this; + } + + public String getDisplayName() { + return displayName; + } + + public RoleValue setDisplayName(String displayName) { + this.displayName = displayName; + return this; + } + + public String getTenantId() { + return tenantId; + } + + public RoleValue setTenantId(String tenantId) { + this.tenantId = tenantId; + return this; + } +} diff --git a/services/authorization/jaxb/src/main/java/org/collectionspace/services/authorization/RolesList.java b/services/authorization/jaxb/src/main/java/org/collectionspace/services/authorization/RolesList.java new file mode 100644 index 0000000000..a0182ec90c --- /dev/null +++ b/services/authorization/jaxb/src/main/java/org/collectionspace/services/authorization/RolesList.java @@ -0,0 +1,80 @@ +package org.collectionspace.services.authorization; + +import java.util.ArrayList; +import java.util.List; + +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlSchemaType; +import jakarta.xml.bind.annotation.XmlType; +import org.jspecify.annotations.NonNull; + +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "roles_list") +public class RolesList { + + @XmlSchemaType(name = "unsignedInt") + private long pageNum; + + @XmlSchemaType(name = "unsignedInt") + private long pageSize; + + @XmlSchemaType(name = "unsignedInt") + private long itemsInPage; + + @XmlSchemaType(name = "unsignedInt") + private long totalItems; + + @XmlElement(required = true) + private List role; + + public long getPageNum() { + return pageNum; + } + + public RolesList setPageNum(long pageNum) { + this.pageNum = pageNum; + return this; + } + + public long getPageSize() { + return pageSize; + } + + public RolesList setPageSize(long pageSize) { + this.pageSize = pageSize; + return this; + } + + public long getItemsInPage() { + return itemsInPage; + } + + public RolesList setItemsInPage(long itemsInPage) { + this.itemsInPage = itemsInPage; + return this; + } + + public long getTotalItems() { + return totalItems; + } + + public RolesList setTotalItems(long totalItems) { + this.totalItems = totalItems; + return this; + } + + @NonNull + public List getRole() { + if (role == null) { + role = new ArrayList<>(); + } + return role; + } + + public RolesList setRole(List role) { + this.role = role; + return this; + } +} diff --git a/services/authorization/jaxb/src/main/java/org/collectionspace/services/authorization/SubjectType.java b/services/authorization/jaxb/src/main/java/org/collectionspace/services/authorization/SubjectType.java new file mode 100644 index 0000000000..d37fffdcd8 --- /dev/null +++ b/services/authorization/jaxb/src/main/java/org/collectionspace/services/authorization/SubjectType.java @@ -0,0 +1,19 @@ +package org.collectionspace.services.authorization; + +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlType; + +@XmlEnum +@XmlType(name = "subject_type") +public enum SubjectType { + + ACCOUNT, PERMISSION, ROLE; + + public String value() { + return name(); + } + + public static SubjectType fromValue(String v) { + return valueOf(v); + } +} diff --git a/services/authorization/jaxb/src/main/java/org/collectionspace/services/authorization/package-info.java b/services/authorization/jaxb/src/main/java/org/collectionspace/services/authorization/package-info.java new file mode 100644 index 0000000000..1305144dbc --- /dev/null +++ b/services/authorization/jaxb/src/main/java/org/collectionspace/services/authorization/package-info.java @@ -0,0 +1 @@ +package org.collectionspace.services.authorization; \ No newline at end of file diff --git a/services/authorization/jaxb/src/main/resources/accounts_permissions.xsd b/services/authorization/jaxb/src/main/resources/accounts_permissions.xsd deleted file mode 100644 index 9617f08278..0000000000 --- a/services/authorization/jaxb/src/main/resources/accounts_permissions.xsd +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - - - - - - - AccountPermission defines 1-n association between - an account and its corresponding permissions. - - - - - - - - - - - - - - diff --git a/services/authorization/jaxb/src/main/resources/accounts_roles.xsd b/services/authorization/jaxb/src/main/resources/accounts_roles.xsd deleted file mode 100644 index 58af0e53d0..0000000000 --- a/services/authorization/jaxb/src/main/resources/accounts_roles.xsd +++ /dev/null @@ -1,180 +0,0 @@ - - - - - - - - - - - - - - - AccountRole defines 1-n association between - either account and role or role and account - - - - - - - - - - - - - - - - - - - - - - - - - - - AccountRole defines association between account and role in CollectionSpace - - - - - - account_id - role_id - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - AccountRoleList defines 1-n association between - either account and role or role and account. - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/services/authorization/jaxb/src/main/resources/authorization_common.xsd b/services/authorization/jaxb/src/main/resources/authorization_common.xsd deleted file mode 100644 index 9eb30df733..0000000000 --- a/services/authorization/jaxb/src/main/resources/authorization_common.xsd +++ /dev/null @@ -1,89 +0,0 @@ - - - - - - - - - - AccountValue is used relationships - - - - - - - - - - - - - - - - - RoleValue is used relationships - - - - - - - - - - - - - - - - - - PermissionValue is used relationships - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/services/authorization/jaxb/src/main/resources/bindings.xjb b/services/authorization/jaxb/src/main/resources/bindings.xjb deleted file mode 100644 index 38f08b91cf..0000000000 --- a/services/authorization/jaxb/src/main/resources/bindings.xjb +++ /dev/null @@ -1,29 +0,0 @@ - - - \ No newline at end of file diff --git a/services/authorization/jaxb/src/main/resources/permissions_roles.xsd b/services/authorization/jaxb/src/main/resources/permissions_roles.xsd deleted file mode 100644 index 00a7e96461..0000000000 --- a/services/authorization/jaxb/src/main/resources/permissions_roles.xsd +++ /dev/null @@ -1,158 +0,0 @@ - - - - - - - - - - - - - - - PermissionRole defines 1-n association between - either permission and role or role and permission - - - - - - - - - - - - - - - - - - - PermissionRoleRel defines 1-1 association between - permission and role in CollectionSpace. - Note that this relation is defined exclusively for service-side - use only. - - - - - - - permission_id - role_id - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - A list of permission_role association for a permission or a role (for test only) - - - - - - - - permission role list - - - - - - - - diff --git a/services/authorization/jaxb/src/main/resources/roles.xsd b/services/authorization/jaxb/src/main/resources/roles.xsd deleted file mode 100644 index ee8cc7caf3..0000000000 --- a/services/authorization/jaxb/src/main/resources/roles.xsd +++ /dev/null @@ -1,156 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - Role definition in CollectionSpace - - - - - rolename - tenant_id - - - displayname - tenant_id - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/services/authorization/jaxb/src/main/resources/roles_list.xsd b/services/authorization/jaxb/src/main/resources/roles_list.xsd deleted file mode 100644 index b83b3dcb98..0000000000 --- a/services/authorization/jaxb/src/main/resources/roles_list.xsd +++ /dev/null @@ -1,60 +0,0 @@ - - - - - - - - - - - - - - - - - - - - role list - - - - - - - - - - - - diff --git a/services/authorization/service/pom.xml b/services/authorization/service/pom.xml index 1f2146fc15..dd20f5adb4 100644 --- a/services/authorization/service/pom.xml +++ b/services/authorization/service/pom.xml @@ -125,6 +125,12 @@ ${project.version} provided + + org.collectionspace.services + org.collectionspace.services.hyperjaxb + ${project.version} + provided + From 50c71f22d94677d6e977e4f74ce4a9b5e27a4066 Mon Sep 17 00:00:00 2001 From: Michael Ritter Date: Fri, 10 Apr 2026 15:12:37 -0600 Subject: [PATCH 13/24] DRYD-2053: Update JAXB Imports (#522) * Replace javax.xml.bind imports with jakarta * Replace NameCoverter import --- .../test/CollectionSpaceIntegrationTest.java | 4 +- .../test/RelationIntegrationTest.java | 4 +- .../test/CollectionSpacePerformanceTest.java | 4 +- .../services/account/AccountResource.java | 2 +- .../advancedsearch/AdvancedSearch.java | 4 +- .../AdvancedSearchJAXBContext.java | 4 +- .../mapper/CollectionObjectMapper.java | 4 +- .../importer/AuthorizationGen.java | 4 +- .../importer/AuthorizationSeed.java | 4 +- .../services/authorization/RoleResource.java | 2 +- .../storage/PermissionValidatorHandler.java | 2 +- .../client/AbstractServiceClientImpl.java | 2 +- .../client/CollectionSpaceClientUtils.java | 8 ++-- .../services/client/PoxPayload.java | 12 +++--- .../services/client/test/BaseServiceTest.java | 12 +++--- .../services/common/document/JaxbUtils.java | 12 +++--- .../client/handler/CSDocumentModelList.java | 6 +-- .../java/RemoteDocumentModelHandlerImpl.java | 2 +- .../common/test/AbstractSecurityTestBase.java | 2 +- .../common/test/SecurityUtilsTest.java | 2 +- .../config/AbstractConfigReaderImpl.java | 6 +-- .../config/ServicesConfigReaderImplTest.java | 2 +- .../vocabulary/VocabularyResource.java | 41 +++++++++---------- 23 files changed, 70 insertions(+), 75 deletions(-) diff --git a/services/IntegrationTests/src/test/java/org/collectionspace/services/IntegrationTests/test/CollectionSpaceIntegrationTest.java b/services/IntegrationTests/src/test/java/org/collectionspace/services/IntegrationTests/test/CollectionSpaceIntegrationTest.java index 1fa2515c77..4326b2c9f7 100644 --- a/services/IntegrationTests/src/test/java/org/collectionspace/services/IntegrationTests/test/CollectionSpaceIntegrationTest.java +++ b/services/IntegrationTests/src/test/java/org/collectionspace/services/IntegrationTests/test/CollectionSpaceIntegrationTest.java @@ -31,8 +31,8 @@ import javax.ws.rs.core.MultivaluedMap; import javax.ws.rs.core.Response; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.Marshaller; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.Marshaller; import org.collectionspace.services.client.PayloadInputPart; import org.collectionspace.services.client.PoxPayloadIn; diff --git a/services/IntegrationTests/src/test/java/org/collectionspace/services/IntegrationTests/test/RelationIntegrationTest.java b/services/IntegrationTests/src/test/java/org/collectionspace/services/IntegrationTests/test/RelationIntegrationTest.java index 6c174f5db7..a68ffa4d64 100644 --- a/services/IntegrationTests/src/test/java/org/collectionspace/services/IntegrationTests/test/RelationIntegrationTest.java +++ b/services/IntegrationTests/src/test/java/org/collectionspace/services/IntegrationTests/test/RelationIntegrationTest.java @@ -29,8 +29,8 @@ import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.Marshaller; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.Marshaller; import org.testng.Assert; import org.testng.annotations.AfterClass; diff --git a/services/PerformanceTests/src/test/java/org/collectionspace/services/PerformanceTests/test/CollectionSpacePerformanceTest.java b/services/PerformanceTests/src/test/java/org/collectionspace/services/PerformanceTests/test/CollectionSpacePerformanceTest.java index 77c13bdc3c..7e3c487d28 100644 --- a/services/PerformanceTests/src/test/java/org/collectionspace/services/PerformanceTests/test/CollectionSpacePerformanceTest.java +++ b/services/PerformanceTests/src/test/java/org/collectionspace/services/PerformanceTests/test/CollectionSpacePerformanceTest.java @@ -32,8 +32,8 @@ import javax.ws.rs.core.MultivaluedMap; import javax.ws.rs.core.Response; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.Marshaller; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.Marshaller; import org.collectionspace.services.collectionobject.CollectionobjectsCommon; import org.collectionspace.services.collectionobject.TitleGroup; diff --git a/services/account/service/src/main/java/org/collectionspace/services/account/AccountResource.java b/services/account/service/src/main/java/org/collectionspace/services/account/AccountResource.java index d7b336bc6d..6daf7df6b5 100644 --- a/services/account/service/src/main/java/org/collectionspace/services/account/AccountResource.java +++ b/services/account/service/src/main/java/org/collectionspace/services/account/AccountResource.java @@ -106,7 +106,7 @@ import javax.ws.rs.core.Response; import javax.ws.rs.core.UriBuilder; import javax.ws.rs.core.UriInfo; -import javax.xml.bind.DatatypeConverter; +import jakarta.xml.bind.DatatypeConverter; /** AccountResource provides RESTful interface to the account service */ diff --git a/services/advancedsearch/service/src/main/java/org/collectionspace/services/advancedsearch/AdvancedSearch.java b/services/advancedsearch/service/src/main/java/org/collectionspace/services/advancedsearch/AdvancedSearch.java index 13042ca62a..6104dc5bc9 100644 --- a/services/advancedsearch/service/src/main/java/org/collectionspace/services/advancedsearch/AdvancedSearch.java +++ b/services/advancedsearch/service/src/main/java/org/collectionspace/services/advancedsearch/AdvancedSearch.java @@ -12,8 +12,8 @@ import javax.ws.rs.core.MultivaluedMap; import javax.ws.rs.core.Request; import javax.ws.rs.core.UriInfo; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Unmarshaller; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.Unmarshaller; import org.collectionspace.services.MediaJAXBSchema; import org.collectionspace.services.advancedsearch.AdvancedsearchCommonList.AdvancedsearchListItem; diff --git a/services/advancedsearch/service/src/main/java/org/collectionspace/services/advancedsearch/AdvancedSearchJAXBContext.java b/services/advancedsearch/service/src/main/java/org/collectionspace/services/advancedsearch/AdvancedSearchJAXBContext.java index 9a1bb24d94..9f565566e3 100644 --- a/services/advancedsearch/service/src/main/java/org/collectionspace/services/advancedsearch/AdvancedSearchJAXBContext.java +++ b/services/advancedsearch/service/src/main/java/org/collectionspace/services/advancedsearch/AdvancedSearchJAXBContext.java @@ -1,7 +1,7 @@ package org.collectionspace.services.advancedsearch; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBException; import org.collectionspace.collectionspace_core.CollectionSpaceCore; import org.collectionspace.services.collectionobject.CollectionobjectsCommon; diff --git a/services/advancedsearch/service/src/main/java/org/collectionspace/services/advancedsearch/mapper/CollectionObjectMapper.java b/services/advancedsearch/service/src/main/java/org/collectionspace/services/advancedsearch/mapper/CollectionObjectMapper.java index 08c0311f9a..b0d99b3aa7 100644 --- a/services/advancedsearch/service/src/main/java/org/collectionspace/services/advancedsearch/mapper/CollectionObjectMapper.java +++ b/services/advancedsearch/service/src/main/java/org/collectionspace/services/advancedsearch/mapper/CollectionObjectMapper.java @@ -7,8 +7,8 @@ import static org.collectionspace.services.client.CollectionSpaceClient.PART_LABEL_SEPARATOR; import java.util.Map; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Unmarshaller; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.Unmarshaller; import org.collectionspace.collectionspace_core.CollectionSpaceCore; import org.collectionspace.services.MediaJAXBSchema; import org.collectionspace.services.advancedsearch.AdvancedsearchCommonList.AdvancedsearchListItem; diff --git a/services/authorization-mgt/import/src/main/java/org/collectionspace/services/authorization/importer/AuthorizationGen.java b/services/authorization-mgt/import/src/main/java/org/collectionspace/services/authorization/importer/AuthorizationGen.java index 51c722f65e..1341fc4e6e 100644 --- a/services/authorization-mgt/import/src/main/java/org/collectionspace/services/authorization/importer/AuthorizationGen.java +++ b/services/authorization-mgt/import/src/main/java/org/collectionspace/services/authorization/importer/AuthorizationGen.java @@ -30,8 +30,8 @@ import java.util.ArrayList; import java.util.Hashtable; import java.util.List; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.Marshaller; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.Marshaller; import org.collectionspace.services.client.TenantClient; import org.collectionspace.authentication.AuthN; diff --git a/services/authorization-mgt/import/src/main/java/org/collectionspace/services/authorization/importer/AuthorizationSeed.java b/services/authorization-mgt/import/src/main/java/org/collectionspace/services/authorization/importer/AuthorizationSeed.java index 7ac92c8192..30079397ce 100644 --- a/services/authorization-mgt/import/src/main/java/org/collectionspace/services/authorization/importer/AuthorizationSeed.java +++ b/services/authorization-mgt/import/src/main/java/org/collectionspace/services/authorization/importer/AuthorizationSeed.java @@ -28,8 +28,8 @@ import java.util.List; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.Unmarshaller; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.Unmarshaller; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/services/authorization-mgt/service/src/main/java/org/collectionspace/services/authorization/RoleResource.java b/services/authorization-mgt/service/src/main/java/org/collectionspace/services/authorization/RoleResource.java index 4819fd1b67..c87cf5cffd 100644 --- a/services/authorization-mgt/service/src/main/java/org/collectionspace/services/authorization/RoleResource.java +++ b/services/authorization-mgt/service/src/main/java/org/collectionspace/services/authorization/RoleResource.java @@ -101,7 +101,7 @@ public Response createRole(Role input) { // // Replace the generic error message with a Role-specific error message // - String msg = String.format("There is already a role with the name '%s'. Please choose a different name.", input.displayName); + String msg = String.format("There is already a role with the name '%s'. Please choose a different name.", input.getDisplayName()); throw bigReThrow(new DocumentException(msg, de, de.getErrorCode()), msg); } } diff --git a/services/authorization-mgt/service/src/main/java/org/collectionspace/services/authorization/storage/PermissionValidatorHandler.java b/services/authorization-mgt/service/src/main/java/org/collectionspace/services/authorization/storage/PermissionValidatorHandler.java index 0e45348138..835b7c8939 100644 --- a/services/authorization-mgt/service/src/main/java/org/collectionspace/services/authorization/storage/PermissionValidatorHandler.java +++ b/services/authorization-mgt/service/src/main/java/org/collectionspace/services/authorization/storage/PermissionValidatorHandler.java @@ -26,7 +26,7 @@ import java.util.List; -import javax.xml.bind.JAXBElement; +import jakarta.xml.bind.JAXBElement; import org.collectionspace.services.authorization.perms.Permission; import org.collectionspace.services.authorization.perms.PermissionAction; diff --git a/services/client/src/main/java/org/collectionspace/services/client/AbstractServiceClientImpl.java b/services/client/src/main/java/org/collectionspace/services/client/AbstractServiceClientImpl.java index e2adcb7da9..dbd124f3b0 100644 --- a/services/client/src/main/java/org/collectionspace/services/client/AbstractServiceClientImpl.java +++ b/services/client/src/main/java/org/collectionspace/services/client/AbstractServiceClientImpl.java @@ -33,7 +33,7 @@ import javax.ws.rs.client.ClientRequestFilter; import javax.ws.rs.core.MultivaluedMap; import javax.ws.rs.core.Response; -import javax.xml.bind.DatatypeConverter; +import jakarta.xml.bind.DatatypeConverter; import org.apache.commons.httpclient.HttpClient; import org.apache.commons.httpclient.UsernamePasswordCredentials; diff --git a/services/client/src/main/java/org/collectionspace/services/client/CollectionSpaceClientUtils.java b/services/client/src/main/java/org/collectionspace/services/client/CollectionSpaceClientUtils.java index 7202e56542..842ade0289 100644 --- a/services/client/src/main/java/org/collectionspace/services/client/CollectionSpaceClientUtils.java +++ b/services/client/src/main/java/org/collectionspace/services/client/CollectionSpaceClientUtils.java @@ -31,10 +31,10 @@ import javax.ws.rs.core.MultivaluedMap; import javax.ws.rs.core.Response; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Marshaller; -import javax.xml.bind.Unmarshaller; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.Marshaller; +import jakarta.xml.bind.Unmarshaller; import javax.xml.parsers.DocumentBuilderFactory; import org.apache.commons.io.FileUtils; diff --git a/services/client/src/main/java/org/collectionspace/services/client/PoxPayload.java b/services/client/src/main/java/org/collectionspace/services/client/PoxPayload.java index 609c12430d..a7e5adcefc 100644 --- a/services/client/src/main/java/org/collectionspace/services/client/PoxPayload.java +++ b/services/client/src/main/java/org/collectionspace/services/client/PoxPayload.java @@ -11,14 +11,12 @@ import java.util.List; import java.util.Set; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBElement; -import javax.xml.bind.Marshaller; -import javax.xml.bind.Unmarshaller; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBElement; +import jakarta.xml.bind.Marshaller; +import jakarta.xml.bind.Unmarshaller; import javax.xml.transform.stream.StreamSource; -import com.sun.xml.bind.api.impl.NameConverter; - import org.apache.commons.io.FileUtils; import org.apache.commons.lang3.StringUtils; import org.dom4j.Document; @@ -27,10 +25,10 @@ import org.dom4j.Element; import org.dom4j.Namespace; import org.dom4j.io.SAXReader; +import org.glassfish.jaxb.core.api.impl.NameConverter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -// TODO: Auto-generated Javadoc /** * The Class PoxPayload. * diff --git a/services/client/src/main/java/org/collectionspace/services/client/test/BaseServiceTest.java b/services/client/src/main/java/org/collectionspace/services/client/test/BaseServiceTest.java index 035f164cf5..1e9a5dc73d 100644 --- a/services/client/src/main/java/org/collectionspace/services/client/test/BaseServiceTest.java +++ b/services/client/src/main/java/org/collectionspace/services/client/test/BaseServiceTest.java @@ -36,12 +36,12 @@ import javax.activation.MimetypesFileTypeMap; import javax.ws.rs.core.MultivaluedMap; import javax.ws.rs.core.Response; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBElement; -import javax.xml.bind.JAXBException; -import javax.xml.bind.MarshalException; -import javax.xml.bind.Marshaller; -import javax.xml.bind.Unmarshaller; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBElement; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.MarshalException; +import jakarta.xml.bind.Marshaller; +import jakarta.xml.bind.Unmarshaller; import javax.xml.namespace.QName; import javax.xml.parsers.DocumentBuilderFactory; diff --git a/services/common/src/main/java/org/collectionspace/services/common/document/JaxbUtils.java b/services/common/src/main/java/org/collectionspace/services/common/document/JaxbUtils.java index 366634d278..44355691ac 100644 --- a/services/common/src/main/java/org/collectionspace/services/common/document/JaxbUtils.java +++ b/services/common/src/main/java/org/collectionspace/services/common/document/JaxbUtils.java @@ -31,11 +31,11 @@ import java.io.StringWriter; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBElement; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Marshaller; -import javax.xml.bind.Unmarshaller; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBElement; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.Marshaller; +import jakarta.xml.bind.Unmarshaller; import javax.xml.namespace.QName; import org.slf4j.Logger; @@ -63,7 +63,7 @@ public static String toString(Object o, Class clazz) { Marshaller m = jc.createMarshaller(); m.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, Boolean.TRUE); m.marshal(o, sw); - } catch (javax.xml.bind.MarshalException e) { + } catch (jakarta.xml.bind.MarshalException e) { // // If the JAX-B object we're trying to marshal doesn't have an @XmlRootElement, then we need another // approach. diff --git a/services/common/src/main/java/org/collectionspace/services/nuxeo/client/handler/CSDocumentModelList.java b/services/common/src/main/java/org/collectionspace/services/nuxeo/client/handler/CSDocumentModelList.java index 65e18063cd..c6bbc4ee51 100644 --- a/services/common/src/main/java/org/collectionspace/services/nuxeo/client/handler/CSDocumentModelList.java +++ b/services/common/src/main/java/org/collectionspace/services/nuxeo/client/handler/CSDocumentModelList.java @@ -3,9 +3,9 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlRootElement; import org.collectionspace.services.client.PoxPayloadOut; import org.collectionspace.services.jaxb.AbstractCommonList; diff --git a/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/RemoteDocumentModelHandlerImpl.java b/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/RemoteDocumentModelHandlerImpl.java index eb6b0158ca..0139e468d7 100644 --- a/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/RemoteDocumentModelHandlerImpl.java +++ b/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/RemoteDocumentModelHandlerImpl.java @@ -37,7 +37,7 @@ import javax.ws.rs.core.MultivaluedMap; import javax.ws.rs.core.Response; import javax.ws.rs.core.UriInfo; -import javax.xml.bind.JAXBElement; +import jakarta.xml.bind.JAXBElement; import org.collectionspace.authentication.AuthN; import org.collectionspace.services.authorization.AccountPermission; diff --git a/services/common/src/test/java/org/collectionspace/services/common/test/AbstractSecurityTestBase.java b/services/common/src/test/java/org/collectionspace/services/common/test/AbstractSecurityTestBase.java index 2fdd5da6ed..2ec195f5a9 100644 --- a/services/common/src/test/java/org/collectionspace/services/common/test/AbstractSecurityTestBase.java +++ b/services/common/src/test/java/org/collectionspace/services/common/test/AbstractSecurityTestBase.java @@ -2,7 +2,7 @@ import java.io.ByteArrayInputStream; -import javax.xml.bind.JAXBException; +import jakarta.xml.bind.JAXBException; import javax.xml.namespace.QName; import org.collectionspace.services.common.config.ServicesConfigReaderImpl; diff --git a/services/common/src/test/java/org/collectionspace/services/common/test/SecurityUtilsTest.java b/services/common/src/test/java/org/collectionspace/services/common/test/SecurityUtilsTest.java index 22b6fc62b7..debac3a76e 100644 --- a/services/common/src/test/java/org/collectionspace/services/common/test/SecurityUtilsTest.java +++ b/services/common/src/test/java/org/collectionspace/services/common/test/SecurityUtilsTest.java @@ -2,7 +2,7 @@ import java.util.Set; -import javax.xml.bind.JAXBException; +import jakarta.xml.bind.JAXBException; import org.collectionspace.services.common.security.SecurityUtils; import org.collectionspace.services.config.AssertionProbesType; diff --git a/services/config/src/main/java/org/collectionspace/services/common/config/AbstractConfigReaderImpl.java b/services/config/src/main/java/org/collectionspace/services/common/config/AbstractConfigReaderImpl.java index a03e118f35..8c501ee788 100644 --- a/services/config/src/main/java/org/collectionspace/services/common/config/AbstractConfigReaderImpl.java +++ b/services/config/src/main/java/org/collectionspace/services/common/config/AbstractConfigReaderImpl.java @@ -31,9 +31,9 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Unmarshaller; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.Unmarshaller; import org.collectionspace.services.common.api.JEEServerDeployment; import org.slf4j.Logger; diff --git a/services/config/src/test/java/org/collectionspace/services/common/config/ServicesConfigReaderImplTest.java b/services/config/src/test/java/org/collectionspace/services/common/config/ServicesConfigReaderImplTest.java index 73c612ccf0..6f9b858e57 100644 --- a/services/config/src/test/java/org/collectionspace/services/common/config/ServicesConfigReaderImplTest.java +++ b/services/config/src/test/java/org/collectionspace/services/common/config/ServicesConfigReaderImplTest.java @@ -4,7 +4,7 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.JAXBException; +import jakarta.xml.bind.JAXBException; import org.collectionspace.services.config.AssertionAttributeProbeType; import org.collectionspace.services.config.SAMLRelyingPartyType; diff --git a/services/vocabulary/service/src/main/java/org/collectionspace/services/vocabulary/VocabularyResource.java b/services/vocabulary/service/src/main/java/org/collectionspace/services/vocabulary/VocabularyResource.java index ae371b36a1..30f2ad5ff9 100644 --- a/services/vocabulary/service/src/main/java/org/collectionspace/services/vocabulary/VocabularyResource.java +++ b/services/vocabulary/service/src/main/java/org/collectionspace/services/vocabulary/VocabularyResource.java @@ -23,6 +23,21 @@ */ package org.collectionspace.services.vocabulary; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.Set; +import javax.ws.rs.GET; +import javax.ws.rs.POST; +import javax.ws.rs.PUT; +import javax.ws.rs.Path; +import javax.ws.rs.PathParam; +import javax.ws.rs.core.Context; +import javax.ws.rs.core.MultivaluedMap; +import javax.ws.rs.core.Request; +import javax.ws.rs.core.Response; +import javax.ws.rs.core.UriBuilder; +import javax.ws.rs.core.UriInfo; + import org.collectionspace.services.client.IClientQueryParams; import org.collectionspace.services.client.PayloadInputPart; import org.collectionspace.services.client.PoxPayload; @@ -60,24 +75,6 @@ import org.slf4j.LoggerFactory; import org.w3c.dom.Element; -import java.util.ArrayList; -import java.util.Base64; -import java.util.HashSet; -import java.util.Set; - -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Request; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriBuilder; -import javax.ws.rs.core.UriInfo; -import javax.xml.bind.DatatypeConverter; - @Path("/" + VocabularyClient.SERVICE_PATH_COMPONENT) public class VocabularyResource extends AuthorityResource { @@ -86,12 +83,12 @@ private enum Method { POST, PUT; } - private final static String vocabularyServiceName = VocabularyClient.SERVICE_PATH_COMPONENT; + private static final String vocabularyServiceName = VocabularyClient.SERVICE_PATH_COMPONENT; - private final static String VOCABULARIES_COMMON = "vocabularies_common"; + private static final String VOCABULARIES_COMMON = "vocabularies_common"; - private final static String vocabularyItemServiceName = "vocabularyitems"; - private final static String VOCABULARYITEMS_COMMON = "vocabularyitems_common"; + private static final String vocabularyItemServiceName = "vocabularyitems"; + private static final String VOCABULARYITEMS_COMMON = "vocabularyitems_common"; final Logger logger = LoggerFactory.getLogger(VocabularyResource.class); From 047dce8a35da799318abd646e45c7188e7f214ae Mon Sep 17 00:00:00 2001 From: Michael Ritter Date: Fri, 10 Apr 2026 16:32:16 -0600 Subject: [PATCH 14/24] DRYD-2080: Support Ant scripts (#523) * Add ant module to download js libs * Update build scripts to include ant classpath * Rework scriptdefs to run with prepare-ant-libs as a dependency --- 3rdparty/ant/build.xml | 23 ++++++++++++ 3rdparty/ant/pom.xml | 22 ++++++++++++ 3rdparty/pom.xml | 24 +------------ build.xml | 47 +++++++++++++++++-------- cspace-ui/build.xml | 20 +++++++---- services/JaxRsServiceProvider/build.xml | 2 -- services/build.xml | 10 ++++-- 7 files changed, 98 insertions(+), 50 deletions(-) create mode 100644 3rdparty/ant/build.xml create mode 100644 3rdparty/ant/pom.xml diff --git a/3rdparty/ant/build.xml b/3rdparty/ant/build.xml new file mode 100644 index 0000000000..77f80a502d --- /dev/null +++ b/3rdparty/ant/build.xml @@ -0,0 +1,23 @@ + + Collectionspace Services - Ant Libs + + + + + + + + + + + + + + + + + + + + + diff --git a/3rdparty/ant/pom.xml b/3rdparty/ant/pom.xml new file mode 100644 index 0000000000..422ad4da36 --- /dev/null +++ b/3rdparty/ant/pom.xml @@ -0,0 +1,22 @@ + + + + org.collectionspace.services + org.collectionspace.services.3rdparty + ${revision} + + + 4.0.0 + org.collectionspace.services.3rdparty.ant-lib + collectionspace.3rdparty.ant-lib + pom + + + + org.openjdk.nashorn + nashorn-core + 15.7 + + + diff --git a/3rdparty/pom.xml b/3rdparty/pom.xml index e99e6678d6..5033fc7622 100644 --- a/3rdparty/pom.xml +++ b/3rdparty/pom.xml @@ -12,29 +12,7 @@ pom + ant nuxeo - - - - - - - - - - diff --git a/build.xml b/build.xml index d026cd9117..abad494dc4 100644 --- a/build.xml +++ b/build.xml @@ -3,6 +3,7 @@ + @@ -14,14 +15,28 @@ - - - - + + + + + + + + + + + + + + + + + + @@ -226,8 +241,7 @@ - - + @@ -311,19 +325,22 @@ - - - + + + + - + - + + + diff --git a/cspace-ui/build.xml b/cspace-ui/build.xml index e4954e8019..28e70b8c8b 100644 --- a/cspace-ui/build.xml +++ b/cspace-ui/build.xml @@ -11,13 +11,6 @@ - - - - - project.setProperty(attributes.get("property"), attributes.get("string").toUpperCase()); - - @@ -142,6 +135,19 @@ + + + + + + + + + + + project.setProperty(attributes.get("property"), attributes.get("string").toUpperCase()); + + diff --git a/services/JaxRsServiceProvider/build.xml b/services/JaxRsServiceProvider/build.xml index c03e19ce95..d941c99624 100644 --- a/services/JaxRsServiceProvider/build.xml +++ b/services/JaxRsServiceProvider/build.xml @@ -53,7 +53,6 @@ - @@ -78,7 +77,6 @@ - diff --git a/services/build.xml b/services/build.xml index 0ab996d00e..6449b9ec0c 100644 --- a/services/build.xml +++ b/services/build.xml @@ -145,7 +145,9 @@ - + + + @@ -200,8 +202,10 @@ - - + + + + From 9963459df140c883d474ec400fb26904bb299437 Mon Sep 17 00:00:00 2001 From: Michael Ritter Date: Tue, 14 Apr 2026 13:48:43 -0600 Subject: [PATCH 15/24] DRYD-2082: Update Hibernate (#524) * Update hibernate to 5.6.15.Final to match nuxeo * Move annotations on created/updatedAt to fields * Create DateAdapter for XML serialization * Prefer javax.transaction connection properties * Remove unused connection properties --- pom.xml | 27 +- .../main/resources/META-INF/persistence.xml | 31 +-- .../account/client/test/AccountTest.java | 2 +- services/account/jaxb/pom.xml | 7 +- .../services/account/AccountsCommon.java | 47 +--- .../services/account/Tenant.java | 48 +--- .../storage/AccountDocumentHandler.java | 2 +- .../account/storage/AccountStorageClient.java | 2 +- .../storage/TenantDocumentHandler.java | 2 +- .../account/storage/TenantStorageClient.java | 2 +- .../storage/csidp/TokenStorageClient.java | 4 +- .../storage/csidp/UserStorageClient.java | 6 +- services/authentication/jaxb/pom.xml | 8 +- .../services/authentication/Token.java | 49 +--- .../services/authentication/User.java | 69 ++--- services/authority/pom.xml | 2 +- services/authority/service/pom.xml | 4 +- services/authorization-mgt/import/build.xml | 14 +- services/authorization-mgt/import/pom.xml | 246 +++++++----------- .../java/org/collectionspace/ImportAuthz.java | 10 +- .../driver/AuthorizationSeedDriver.java | 92 +++---- .../importer/AuthorizationGen.java | 18 +- .../importer/AuthorizationSeed.java | 11 +- .../main/resources/META-INF/persistence.xml | 14 +- .../src/main/resources/hibernate.cfg.xml | 24 -- services/authorization/jaxb/pom.xml | 12 +- .../authorization/AccountRoleRel.java | 27 +- .../authorization/PermissionRoleRel.java | 27 +- .../services/authorization/Role.java | 47 +--- services/common/pom.xml | 2 +- .../AuthorizationCommon.java | 23 +- .../authorization_mgt/AuthorizationStore.java | 4 +- .../jpa/JpaRelationshipStorageClient.java | 2 +- .../storage/jpa/JpaStorageClientImpl.java | 4 +- .../common/storage/jpa/JpaStorageUtils.java | 10 +- services/hyperjaxb/pom.xml | 13 +- .../authorization/perms/Permission.java | 61 ++--- .../services/jaxb/adapter/DateAdapter.java | 24 ++ .../jaxb/adapter/DateAdapterTest.java | 26 ++ services/pom.xml | 60 +---- 40 files changed, 409 insertions(+), 674 deletions(-) delete mode 100644 services/authorization-mgt/import/src/main/resources/hibernate.cfg.xml create mode 100644 services/jaxb/src/main/java/org/collectionspace/services/jaxb/adapter/DateAdapter.java create mode 100644 services/jaxb/src/test/java/org/collectionspace/services/jaxb/adapter/DateAdapterTest.java diff --git a/pom.xml b/pom.xml index 3090e6ff07..a47da5064d 100644 --- a/pom.xml +++ b/pom.xml @@ -19,6 +19,7 @@ 1.7.4 0.12.0-NX2 + 5.6.15.Final 2.14.3 4.0.5 4.0.12 @@ -1187,26 +1188,36 @@ javax.persistence - persistence-api - 1.0 + javax.persistence-api + 2.2 + + + org.hibernate + hibernate-core + ${hibernate.version} + + + javax.xml.bind + jaxb-api + + org.hibernate hibernate-entitymanager - 3.4.0.GA + ${hibernate.version} dom4j dom4j + + javax.xml.bind + jaxb-api + - - org.hibernate - hibernate-c3p0 - 3.6.10.Final - org.postgresql diff --git a/services/JaxRsServiceProvider/src/main/resources/META-INF/persistence.xml b/services/JaxRsServiceProvider/src/main/resources/META-INF/persistence.xml index a01685418c..dd8ce65267 100644 --- a/services/JaxRsServiceProvider/src/main/resources/META-INF/persistence.xml +++ b/services/JaxRsServiceProvider/src/main/resources/META-INF/persistence.xml @@ -1,9 +1,8 @@ - + org.hibernate.ejb.HibernatePersistence - - - - - - - - + + + + + + + diff --git a/services/account/client/src/test/java/org/collectionspace/services/account/client/test/AccountTest.java b/services/account/client/src/test/java/org/collectionspace/services/account/client/test/AccountTest.java index 98d1b64635..358e3ac4f1 100644 --- a/services/account/client/src/test/java/org/collectionspace/services/account/client/test/AccountTest.java +++ b/services/account/client/src/test/java/org/collectionspace/services/account/client/test/AccountTest.java @@ -61,7 +61,7 @@ public void create(String testName) throws Exception { account.setStatus(Status.ACTIVE); id = UUID.randomUUID().toString(); account.setCsid(id); - account.setCreatedAtItem(new Date()); + account.setCreatedAt(new Date()); AccountTenant tenant = new AccountTenant(); tenant.setTenantId("123"); List tList = new ArrayList(); diff --git a/services/account/jaxb/pom.xml b/services/account/jaxb/pom.xml index 2a3f05350d..7b8c460408 100644 --- a/services/account/jaxb/pom.xml +++ b/services/account/jaxb/pom.xml @@ -15,17 +15,12 @@ javax.persistence - persistence-api + javax.persistence-api jakarta.xml.bind jakarta.xml.bind-api - - org.jvnet.jaxb - hyperjaxb3-ejb-runtime - 4.0.12 - org.collectionspace.services diff --git a/services/account/jaxb/src/main/java/org/collectionspace/services/account/AccountsCommon.java b/services/account/jaxb/src/main/java/org/collectionspace/services/account/AccountsCommon.java index 9760a67ecb..b598dadce1 100644 --- a/services/account/jaxb/src/main/java/org/collectionspace/services/account/AccountsCommon.java +++ b/services/account/jaxb/src/main/java/org/collectionspace/services/account/AccountsCommon.java @@ -21,7 +21,6 @@ import javax.persistence.TemporalType; import javax.persistence.Transient; import javax.persistence.UniqueConstraint; -import javax.xml.datatype.XMLGregorianCalendar; import jakarta.xml.bind.annotation.XmlAccessType; import jakarta.xml.bind.annotation.XmlAccessorType; @@ -30,9 +29,9 @@ import jakarta.xml.bind.annotation.XmlRootElement; import jakarta.xml.bind.annotation.XmlSchemaType; import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import org.collectionspace.services.jaxb.adapter.DateAdapter; import org.jspecify.annotations.NonNull; -import org.jvnet.hyperjaxb3.xml.bind.annotation.adapters.XMLGregorianCalendarAsDateTime; -import org.jvnet.hyperjaxb3.xml.bind.annotation.adapters.XmlAdapterUtils; @XmlAccessorType(XmlAccessType.FIELD) @@ -108,15 +107,19 @@ public class AccountsCommon { @Column(name = "roles_protection") private String rolesProtection; - @Transient + @Column(name = "created_at", nullable = false) + @Temporal(TemporalType.TIMESTAMP) @XmlElement(required = true) @XmlSchemaType(name = "dateTime") - private XMLGregorianCalendar createdAt; + @XmlJavaTypeAdapter(DateAdapter.class) + private Date createdAt; - @Transient + @Column(name = "updated_at") + @Temporal(TemporalType.TIMESTAMP) @XmlElement(required = true) @XmlSchemaType(name = "dateTime") - private XMLGregorianCalendar updatedAt; + @XmlJavaTypeAdapter(DateAdapter.class) + private Date updatedAt; @Transient private RoleList roleList; @@ -221,19 +224,19 @@ public void setRolesProtection(String rolesProtection) { this.rolesProtection = rolesProtection; } - public XMLGregorianCalendar getCreatedAt() { + public Date getCreatedAt() { return createdAt; } - public void setCreatedAt(XMLGregorianCalendar createdAt) { + public void setCreatedAt(Date createdAt) { this.createdAt = createdAt; } - public XMLGregorianCalendar getUpdatedAt() { + public Date getUpdatedAt() { return updatedAt; } - public void setUpdatedAt(XMLGregorianCalendar updatedAt) { + public void setUpdatedAt(Date updatedAt) { this.updatedAt = updatedAt; } @@ -253,28 +256,6 @@ public void setCsid(String csid) { this.csid = csid; } - @Basic - @Column(name = "created_at", nullable = false) - @Temporal(TemporalType.TIMESTAMP) - public Date getCreatedAtItem() { - return XmlAdapterUtils.unmarshall(XMLGregorianCalendarAsDateTime.class, this.getCreatedAt()); - } - - public void setCreatedAtItem(Date createdAt) { - setCreatedAt(XmlAdapterUtils.marshall(XMLGregorianCalendarAsDateTime.class, createdAt)); - } - - @Basic - @Column(name = "updated_at") - @Temporal(TemporalType.TIMESTAMP) - public Date getUpdatedAtItem() { - return XmlAdapterUtils.unmarshall(XMLGregorianCalendarAsDateTime.class, this.getUpdatedAt()); - } - - public void setUpdatedAtItem(Date updatedAt) { - setUpdatedAt(XmlAdapterUtils.marshall(XMLGregorianCalendarAsDateTime.class, updatedAt)); - } - @Override public boolean equals(Object o) { if (o == null || getClass() != o.getClass()) { diff --git a/services/account/jaxb/src/main/java/org/collectionspace/services/account/Tenant.java b/services/account/jaxb/src/main/java/org/collectionspace/services/account/Tenant.java index 23f76f5c5e..f482bd1204 100644 --- a/services/account/jaxb/src/main/java/org/collectionspace/services/account/Tenant.java +++ b/services/account/jaxb/src/main/java/org/collectionspace/services/account/Tenant.java @@ -11,8 +11,6 @@ import javax.persistence.Table; import javax.persistence.Temporal; import javax.persistence.TemporalType; -import javax.persistence.Transient; -import javax.xml.datatype.XMLGregorianCalendar; import jakarta.xml.bind.annotation.XmlAccessType; import jakarta.xml.bind.annotation.XmlAccessorType; @@ -20,8 +18,8 @@ import jakarta.xml.bind.annotation.XmlRootElement; import jakarta.xml.bind.annotation.XmlSchemaType; import jakarta.xml.bind.annotation.XmlType; -import org.jvnet.hyperjaxb3.xml.bind.annotation.adapters.XMLGregorianCalendarAsDateTime; -import org.jvnet.hyperjaxb3.xml.bind.annotation.adapters.XmlAdapterUtils; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import org.collectionspace.services.jaxb.adapter.DateAdapter; @XmlAccessorType(XmlAccessType.FIELD) @@ -55,15 +53,19 @@ public class Tenant { @Column(name = "disabled", nullable = false) private boolean disabled; - @Transient + @Column(name = "created_at", nullable = false) + @Temporal(TemporalType.TIMESTAMP) @XmlElement(required = true) @XmlSchemaType(name = "dateTime") - private XMLGregorianCalendar createdAt; + @XmlJavaTypeAdapter(DateAdapter.class) + private Date createdAt; - @Transient + @Column(name = "updated_at") + @Temporal(TemporalType.TIMESTAMP) @XmlElement(required = true) @XmlSchemaType(name = "dateTime") - private XMLGregorianCalendar updatedAt; + @XmlJavaTypeAdapter(DateAdapter.class) + private Date updatedAt; public String getId() { return id; @@ -105,44 +107,22 @@ public void setDisabled(boolean disabled) { this.disabled = disabled; } - public XMLGregorianCalendar getCreatedAt() { + public Date getCreatedAt() { return createdAt; } - public void setCreatedAt(XMLGregorianCalendar createdAt) { + public void setCreatedAt(Date createdAt) { this.createdAt = createdAt; } - public XMLGregorianCalendar getUpdatedAt() { + public Date getUpdatedAt() { return updatedAt; } - public void setUpdatedAt(XMLGregorianCalendar updatedAt) { + public void setUpdatedAt(Date updatedAt) { this.updatedAt = updatedAt; } - @Basic - @Column(name = "created_at", nullable = false) - @Temporal(TemporalType.TIMESTAMP) - public Date getCreatedAtItem() { - return XmlAdapterUtils.unmarshall(XMLGregorianCalendarAsDateTime.class, this.getCreatedAt()); - } - - public void setCreatedAtItem(Date createdAt) { - setCreatedAt(XmlAdapterUtils.marshall(XMLGregorianCalendarAsDateTime.class, createdAt)); - } - - @Basic - @Column(name = "updated_at") - @Temporal(TemporalType.TIMESTAMP) - public Date getUpdatedAtItem() { - return XmlAdapterUtils.unmarshall(XMLGregorianCalendarAsDateTime.class, this.getUpdatedAt()); - } - - public void setUpdatedAtItem(Date updatedAt) { - setUpdatedAt(XmlAdapterUtils.marshall(XMLGregorianCalendarAsDateTime.class, updatedAt)); - } - @Override public boolean equals(Object o) { if (o == null || getClass() != o.getClass()) { diff --git a/services/account/service/src/main/java/org/collectionspace/services/account/storage/AccountDocumentHandler.java b/services/account/service/src/main/java/org/collectionspace/services/account/storage/AccountDocumentHandler.java index 938a7629a1..400c5a5281 100644 --- a/services/account/service/src/main/java/org/collectionspace/services/account/storage/AccountDocumentHandler.java +++ b/services/account/service/src/main/java/org/collectionspace/services/account/storage/AccountDocumentHandler.java @@ -142,7 +142,7 @@ public void handleUpdate(DocumentWrapper wrapDoc) throws Excepti */ private AccountsCommon merge(AccountsCommon from, AccountsCommon to) { Date now = new Date(); - to.setUpdatedAtItem(now); + to.setUpdatedAt(now); if (from.getEmail() != null) { to.setEmail(from.getEmail()); } diff --git a/services/account/service/src/main/java/org/collectionspace/services/account/storage/AccountStorageClient.java b/services/account/service/src/main/java/org/collectionspace/services/account/storage/AccountStorageClient.java index b42977406e..e1326b8c25 100644 --- a/services/account/service/src/main/java/org/collectionspace/services/account/storage/AccountStorageClient.java +++ b/services/account/service/src/main/java/org/collectionspace/services/account/storage/AccountStorageClient.java @@ -86,7 +86,7 @@ public String create(ServiceContext ctx, // // Now add the account to the CSpace list of accounts // - account.setCreatedAtItem(new Date()); + account.setCreatedAt(new Date()); jpaConnectionContext.persist(account); // // Finish creating related resources -e.g., account-role relationships diff --git a/services/account/service/src/main/java/org/collectionspace/services/account/storage/TenantDocumentHandler.java b/services/account/service/src/main/java/org/collectionspace/services/account/storage/TenantDocumentHandler.java index cad4454293..5c4bad626b 100644 --- a/services/account/service/src/main/java/org/collectionspace/services/account/storage/TenantDocumentHandler.java +++ b/services/account/service/src/main/java/org/collectionspace/services/account/storage/TenantDocumentHandler.java @@ -76,7 +76,7 @@ public void handleUpdate(DocumentWrapper wrapDoc) throws Exception { */ private Tenant merge(Tenant from, Tenant to) { Date now = new Date(); - to.setUpdatedAtItem(now); + to.setUpdatedAt(now); // The only thing we allow changing at this point are the 'disabled' and 'authoritiesInitialized' flags to.setDisabled(from.isDisabled()); to.setAuthoritiesInitialized(from.isAuthoritiesInitialized()); diff --git a/services/account/service/src/main/java/org/collectionspace/services/account/storage/TenantStorageClient.java b/services/account/service/src/main/java/org/collectionspace/services/account/storage/TenantStorageClient.java index da43ba6940..9754e54bb8 100644 --- a/services/account/service/src/main/java/org/collectionspace/services/account/storage/TenantStorageClient.java +++ b/services/account/service/src/main/java/org/collectionspace/services/account/storage/TenantStorageClient.java @@ -73,7 +73,7 @@ public String create(ServiceContext ctx, new DocumentWrapperImpl(tenant); handler.handle(Action.CREATE, wrapDoc); jpaConnectionContext.beginTransaction(); - tenant.setCreatedAtItem(new Date()); + tenant.setCreatedAt(new Date()); jpaConnectionContext.persist(tenant); handler.complete(Action.CREATE, wrapDoc); jpaConnectionContext.commitTransaction(); diff --git a/services/account/service/src/main/java/org/collectionspace/services/account/storage/csidp/TokenStorageClient.java b/services/account/service/src/main/java/org/collectionspace/services/account/storage/csidp/TokenStorageClient.java index 226abe67ea..5479046460 100644 --- a/services/account/service/src/main/java/org/collectionspace/services/account/storage/csidp/TokenStorageClient.java +++ b/services/account/service/src/main/java/org/collectionspace/services/account/storage/csidp/TokenStorageClient.java @@ -71,7 +71,7 @@ static public Token create(String accountCsid, String tenantId, BigInteger expir token.setTenantId(tenantId); token.setExpireSeconds(expireSeconds); token.setEnabled(true); - token.setCreatedAtItem(new Date()); + token.setCreatedAt(new Date()); em.getTransaction().begin(); em.persist(token); @@ -98,7 +98,7 @@ static public void update(TransactionContext transactionContext, String id, bool tokenFound = get((JPATransactionContext)transactionContext, id); if (tokenFound != null) { tokenFound.setEnabled(enabledFlag); - tokenFound.setUpdatedAtItem(new Date()); + tokenFound.setUpdatedAt(new Date()); if (logger.isDebugEnabled()) { logger.debug("Updated token=" + JaxbUtils.toString(tokenFound, Token.class)); } diff --git a/services/account/service/src/main/java/org/collectionspace/services/account/storage/csidp/UserStorageClient.java b/services/account/service/src/main/java/org/collectionspace/services/account/storage/csidp/UserStorageClient.java index 4c337433bd..3352c03b29 100644 --- a/services/account/service/src/main/java/org/collectionspace/services/account/storage/csidp/UserStorageClient.java +++ b/services/account/service/src/main/java/org/collectionspace/services/account/storage/csidp/UserStorageClient.java @@ -66,7 +66,7 @@ public User create(String userId, byte[] password) throws Exception { String salt = UUID.randomUUID().toString(); user.setPasswd(getEncPassword(userId, password, salt)); user.setSalt(salt); - user.setCreatedAtItem(new Date()); + user.setCreatedAt(new Date()); return user; } @@ -112,13 +112,13 @@ public User get(ServiceContext ctx, String userId) throws DocumentNotFoundExcept * @param password */ public void update(JPATransactionContext jpaTransactionContext, String userId, byte[] password) - throws DocumentNotFoundException, Exception { + throws DocumentNotFoundException, BadRequestException { User userFound = get(jpaTransactionContext, userId); if (userFound != null) { String salt = UUID.randomUUID().toString(); userFound.setPasswd(getEncPassword(userId, password, salt)); userFound.setSalt(salt); - userFound.setUpdatedAtItem(new Date()); + userFound.setUpdatedAt(new Date()); if (logger.isDebugEnabled()) { logger.debug("updated user=" + JaxbUtils.toString(userFound, User.class)); } diff --git a/services/authentication/jaxb/pom.xml b/services/authentication/jaxb/pom.xml index e52654cfd1..5ad184ed7b 100644 --- a/services/authentication/jaxb/pom.xml +++ b/services/authentication/jaxb/pom.xml @@ -26,12 +26,12 @@ javax.persistence - persistence-api + javax.persistence-api - org.jvnet.jaxb - hyperjaxb3-ejb-runtime - 4.0.12 + org.collectionspace.services + org.collectionspace.services.jaxb + ${project.version} diff --git a/services/authentication/jaxb/src/main/java/org/collectionspace/services/authentication/Token.java b/services/authentication/jaxb/src/main/java/org/collectionspace/services/authentication/Token.java index 65e087009e..192018dfe0 100644 --- a/services/authentication/jaxb/src/main/java/org/collectionspace/services/authentication/Token.java +++ b/services/authentication/jaxb/src/main/java/org/collectionspace/services/authentication/Token.java @@ -12,8 +12,6 @@ import javax.persistence.Table; import javax.persistence.Temporal; import javax.persistence.TemporalType; -import javax.persistence.Transient; -import javax.xml.datatype.XMLGregorianCalendar; import jakarta.xml.bind.annotation.XmlAccessType; import jakarta.xml.bind.annotation.XmlAccessorType; @@ -21,8 +19,8 @@ import jakarta.xml.bind.annotation.XmlRootElement; import jakarta.xml.bind.annotation.XmlSchemaType; import jakarta.xml.bind.annotation.XmlType; -import org.jvnet.hyperjaxb3.xml.bind.annotation.adapters.XMLGregorianCalendarAsDateTime; -import org.jvnet.hyperjaxb3.xml.bind.annotation.adapters.XmlAdapterUtils; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import org.collectionspace.services.jaxb.adapter.DateAdapter; @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "") @@ -56,15 +54,19 @@ public class Token { @Column(name = "enabled", nullable = false) protected boolean enabled; - @Transient + @Column(name = "created_at", nullable = false) + @Temporal(TemporalType.TIMESTAMP) @XmlElement(required = true) @XmlSchemaType(name = "dateTime") - protected XMLGregorianCalendar createdAt; + @XmlJavaTypeAdapter(DateAdapter.class) + protected Date createdAt; - @Transient + @Column(name = "updated_at") + @Temporal(TemporalType.TIMESTAMP) @XmlElement(required = true) @XmlSchemaType(name = "dateTime") - protected XMLGregorianCalendar updatedAt; + @XmlJavaTypeAdapter(DateAdapter.class) + protected Date updatedAt; public String getId() { return id; @@ -106,45 +108,22 @@ public void setEnabled(boolean enabled) { this.enabled = enabled; } - public XMLGregorianCalendar getCreatedAt() { + public Date getCreatedAt() { return createdAt; } - public void setCreatedAt(XMLGregorianCalendar createdAt) { + public void setCreatedAt(Date createdAt) { this.createdAt = createdAt; } - public XMLGregorianCalendar getUpdatedAt() { + public Date getUpdatedAt() { return updatedAt; } - public void setUpdatedAt(XMLGregorianCalendar updatedAt) { + public void setUpdatedAt(Date updatedAt) { this.updatedAt = updatedAt; } - @Basic - @Column(name = "created_at", nullable = false) - @Temporal(TemporalType.TIMESTAMP) - public Date getCreatedAtItem() { - return XmlAdapterUtils.unmarshall(XMLGregorianCalendarAsDateTime.class, this.getCreatedAt()); - } - - public void setCreatedAtItem(Date createdAt) { - setCreatedAt(XmlAdapterUtils.marshall(XMLGregorianCalendarAsDateTime.class, createdAt)); - } - - @Basic - @Column(name = "updated_at") - @Temporal(TemporalType.TIMESTAMP) - public Date getUpdatedAtItem() { - return XmlAdapterUtils.unmarshall(XMLGregorianCalendarAsDateTime.class, this.getUpdatedAt()); - } - - public void setUpdatedAtItem(Date updatedAt) { - setUpdatedAt(XmlAdapterUtils.marshall(XMLGregorianCalendarAsDateTime.class, updatedAt)); - } - - @Override public boolean equals(Object o) { if (o == null || getClass() != o.getClass()) { diff --git a/services/authentication/jaxb/src/main/java/org/collectionspace/services/authentication/User.java b/services/authentication/jaxb/src/main/java/org/collectionspace/services/authentication/User.java index f209bdc21f..60f2565787 100644 --- a/services/authentication/jaxb/src/main/java/org/collectionspace/services/authentication/User.java +++ b/services/authentication/jaxb/src/main/java/org/collectionspace/services/authentication/User.java @@ -11,8 +11,6 @@ import javax.persistence.Table; import javax.persistence.Temporal; import javax.persistence.TemporalType; -import javax.persistence.Transient; -import javax.xml.datatype.XMLGregorianCalendar; import jakarta.xml.bind.annotation.XmlAccessType; import jakarta.xml.bind.annotation.XmlAccessorType; @@ -20,8 +18,8 @@ import jakarta.xml.bind.annotation.XmlRootElement; import jakarta.xml.bind.annotation.XmlSchemaType; import jakarta.xml.bind.annotation.XmlType; -import org.jvnet.hyperjaxb3.xml.bind.annotation.adapters.XMLGregorianCalendarAsDateTime; -import org.jvnet.hyperjaxb3.xml.bind.annotation.adapters.XmlAdapterUtils; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import org.collectionspace.services.jaxb.adapter.DateAdapter; @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "") @@ -46,20 +44,26 @@ public class User { @XmlElement(required = true) protected String salt; - @Transient + @Column(name = "created_at", nullable = false) + @Temporal(TemporalType.TIMESTAMP) @XmlElement(required = true) @XmlSchemaType(name = "dateTime") - protected XMLGregorianCalendar createdAt; + @XmlJavaTypeAdapter(DateAdapter.class) + protected Date createdAt; - @Transient + @Column(name = "updated_at") + @Temporal(TemporalType.TIMESTAMP) @XmlElement(required = true) @XmlSchemaType(name = "dateTime") - protected XMLGregorianCalendar updatedAt; + @XmlJavaTypeAdapter(DateAdapter.class) + protected Date updatedAt; - @Transient + @Column(name = "lastLogin") + @Temporal(TemporalType.TIMESTAMP) @XmlElement(required = true) @XmlSchemaType(name = "dateTime") - protected XMLGregorianCalendar lastLogin; + @XmlJavaTypeAdapter(DateAdapter.class) + protected Date lastLogin; public String getUsername() { return username; @@ -85,63 +89,30 @@ public void setSalt(String salt) { this.salt = salt; } - public XMLGregorianCalendar getCreatedAt() { + public Date getCreatedAt() { return createdAt; } - public void setCreatedAt(XMLGregorianCalendar createdAt) { + public void setCreatedAt(Date createdAt) { this.createdAt = createdAt; } - public XMLGregorianCalendar getUpdatedAt() { + public Date getUpdatedAt() { return updatedAt; } - public void setUpdatedAt(XMLGregorianCalendar updatedAt) { + public void setUpdatedAt(Date updatedAt) { this.updatedAt = updatedAt; } - public XMLGregorianCalendar getLastLogin() { + public Date getLastLogin() { return lastLogin; } - public void setLastLogin(XMLGregorianCalendar lastLogin) { + public void setLastLogin(Date lastLogin) { this.lastLogin = lastLogin; } - @Basic - @Column(name = "created_at", nullable = false) - @Temporal(TemporalType.TIMESTAMP) - public Date getCreatedAtItem() { - return XmlAdapterUtils.unmarshall(XMLGregorianCalendarAsDateTime.class, this.getCreatedAt()); - } - - public void setCreatedAtItem(Date createdAt) { - setCreatedAt(XmlAdapterUtils.marshall(XMLGregorianCalendarAsDateTime.class, createdAt)); - } - - @Basic - @Column(name = "updated_at") - @Temporal(TemporalType.TIMESTAMP) - public Date getUpdatedAtItem() { - return XmlAdapterUtils.unmarshall(XMLGregorianCalendarAsDateTime.class, this.getUpdatedAt()); - } - - public void setUpdatedAtItem(Date updatedAt) { - setUpdatedAt(XmlAdapterUtils.marshall(XMLGregorianCalendarAsDateTime.class, updatedAt)); - } - - @Basic - @Column(name = "lastLogin") - @Temporal(TemporalType.TIMESTAMP) - public Date getLastLoginItem() { - return XmlAdapterUtils.unmarshall(XMLGregorianCalendarAsDateTime.class, this.getLastLogin()); - } - - public void setLastLoginItem(Date lastLogin) { - setLastLogin(XmlAdapterUtils.marshall(XMLGregorianCalendarAsDateTime.class, lastLogin)); - } - @Override public boolean equals(Object o) { if (o == null || getClass() != o.getClass()) { diff --git a/services/authority/pom.xml b/services/authority/pom.xml index 62f9ec0bb8..eba0994ce5 100644 --- a/services/authority/pom.xml +++ b/services/authority/pom.xml @@ -51,7 +51,7 @@ javax.persistence - persistence-api + javax.persistence-api diff --git a/services/authority/service/pom.xml b/services/authority/service/pom.xml index dd516d2f1c..74e35b0b5d 100644 --- a/services/authority/service/pom.xml +++ b/services/authority/service/pom.xml @@ -142,11 +142,9 @@ javax.persistence - persistence-api + javax.persistence-api - - diff --git a/services/authorization-mgt/import/build.xml b/services/authorization-mgt/import/build.xml index 80ea02a208..317041b16c 100644 --- a/services/authorization-mgt/import/build.xml +++ b/services/authorization-mgt/import/build.xml @@ -110,7 +110,7 @@ - + @@ -121,7 +121,7 @@ - + @@ -133,12 +133,12 @@ - - - + + + - + @@ -147,7 +147,7 @@ - + diff --git a/services/authorization-mgt/import/pom.xml b/services/authorization-mgt/import/pom.xml index 74e88e9590..842cd0b5a8 100644 --- a/services/authorization-mgt/import/pom.xml +++ b/services/authorization-mgt/import/pom.xml @@ -15,27 +15,51 @@ - + org.collectionspace.services - org.collectionspace.services.authentication.service + org.collectionspace.services.common ${project.version} - provided + + + org.nuxeo.binary.metadata + * + + + org.nuxeo.lib.runtime + * + + + org.nuxeo.ecm.platform + * + + + org.nuxeo.runtime + * + + + org.nuxeo.ecm.core + * + + + javax.xml.bind + jaxb-api + + org.collectionspace.services - org.collectionspace.services.authorization.service + org.collectionspace.services.authorization.jaxb ${project.version} - provided org.collectionspace.services - org.collectionspace.services.authorization.jaxb + org.collectionspace.services.hyperjaxb ${project.version} org.collectionspace.services - org.collectionspace.services.config + org.collectionspace.services.authentication.service ${project.version} @@ -47,205 +71,121 @@ commons-codec commons-codec + + org.jboss.resteasy + * + org.collectionspace.services - org.collectionspace.services.authorization-mgt.client + org.collectionspace.services.config ${project.version} - - - commons-codec - commons-codec - 1.4 - + + + - org.testng - testng + org.slf4j + slf4j-api + compile commons-cli commons-cli - org.springframework.security - spring-security-core - ${spring.security.version} - provided - - - org.springframework.security - spring-security-config - ${spring.security.version} - provided - - - org.springframework.security - spring-security-acl - ${spring.security.version} - provided + org.hibernate + hibernate-core + 5.6.15.Final + + + javax.xml.bind + jaxb-api + + - org.springframework.security - spring-security-web - ${spring.security.version} - provided + org.springframework + spring-beans + ${spring.version} + compile org.springframework spring-context ${spring.version} - provided + compile org.springframework - spring-context-support + spring-core ${spring.version} - provided + compile org.springframework - spring-aop + spring-jdbc ${spring.version} - provided + compile org.springframework - spring-beans + spring-tx ${spring.version} - provided + compile - aopalliance - aopalliance - 1.0 - provided + org.springframework.security + spring-security-core + ${spring.security.version} + compile - + + - org.jboss.security - jbosssx - 2.0.3.SP1 - provided + org.springframework.security + spring-security-acl + ${spring.security.version} + runtime + + + org.springframework + spring-context-support + ${spring.version} + runtime + + + org.springframework + spring-expression + ${spring.version} + runtime net.sf.ehcache ehcache - 2.10.2 + 2.10.9.2 + runtime org.postgresql postgresql + runtime ch.elca.el4j.modules module-xml_merge-common - - - commons-codec - commons-codec - - - xml-apis - xml-apis - - + runtime - org.collectionspace.services - - org.collectionspace.services.authorization-mgt.service - - ${project.version} - - - nuxeo-core-query - org.nuxeo.ecm.core - - - nuxeo-opencmis-bindings - org.nuxeo.ecm.core - - - nuxeo-runtime - org.nuxeo.runtime - - - nuxeo-core-api - org.nuxeo.ecm.core - - - nuxeo-platform-types-core - org.nuxeo.ecm.platform - - - - nuxeo-platform-filemanager-api - - org.nuxeo.ecm.platform - - - nuxeo-core-schema - org.nuxeo.ecm.core - - - nuxeo-platform-mimetype-api - org.nuxeo.ecm.platform - - - nuxeo-core-io - org.nuxeo.ecm.core - - - nuxeo-platform-types-api - org.nuxeo.ecm.platform - - - nuxeo-runtime-launcher - org.nuxeo.lib.runtime - - - nuxeo-core-storage-sql-ra - org.nuxeo.ecm.core - - - nuxeo-platform-imaging-core - org.nuxeo.ecm.platform - - - nuxeo-runtime-osgi - org.nuxeo.runtime - - - nuxeo-platform-imaging-api - org.nuxeo.ecm.platform - - - nuxeo-core-convert - org.nuxeo.ecm.core - - - - nuxeo-platform-mimetype-core - - org.nuxeo.ecm.platform - - - nuxeo-core-storage-sql - org.nuxeo.ecm.core - - - commons-codec - commons-codec - - + org.hibernate + hibernate-entitymanager + runtime - cspace-services-authorization-mgt-import @@ -298,8 +238,6 @@ - org.postgresql postgresql diff --git a/services/authorization-mgt/import/src/main/java/org/collectionspace/ImportAuthz.java b/services/authorization-mgt/import/src/main/java/org/collectionspace/ImportAuthz.java index af8445eed7..d52a96cdef 100644 --- a/services/authorization-mgt/import/src/main/java/org/collectionspace/ImportAuthz.java +++ b/services/authorization-mgt/import/src/main/java/org/collectionspace/ImportAuthz.java @@ -37,6 +37,7 @@ import org.collectionspace.services.authorization.driver.AuthorizationSeedDriver; import org.collectionspace.services.common.document.TransactionException; import org.collectionspace.services.common.storage.jpa.JPATransactionContext; +import org.collectionspace.services.common.storage.jpa.JpaStorageUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -140,9 +141,9 @@ private static Options createOptions() { // Create our AuthZ metadata // public static void main(String[] args) throws TransactionException { - Options options = createOptions(); + AuthorizationSeedDriver driver = null; CommandLineParser parser = new GnuParser(); JPATransactionContext jpaTransactionContext = new JPATransactionContext(); try { @@ -161,8 +162,7 @@ public static void main(String[] args) throws TransactionException { // // Instantiate an AuthZ seed driver and ask it to generate our AuthZ metadata // - AuthorizationSeedDriver driver = new AuthorizationSeedDriver( - user, password, tenantBinding, exportDir); + driver = new AuthorizationSeedDriver(user, password, tenantBinding, exportDir); jpaTransactionContext.beginTransaction(); driver.generate(jpaTransactionContext); logger.info("Finished processing all tenant bindings files and generating all AuthN/AuthZ metadata."); @@ -190,6 +190,10 @@ public static void main(String[] args) throws TransactionException { System.exit(1); } finally { jpaTransactionContext.close(); + JpaStorageUtils.releaseEntityManagerFactories(); + if (driver != null) { + driver.close(); + } } } } diff --git a/services/authorization-mgt/import/src/main/java/org/collectionspace/services/authorization/driver/AuthorizationSeedDriver.java b/services/authorization-mgt/import/src/main/java/org/collectionspace/services/authorization/driver/AuthorizationSeedDriver.java index 7b9a3d5092..179a22677b 100644 --- a/services/authorization-mgt/import/src/main/java/org/collectionspace/services/authorization/driver/AuthorizationSeedDriver.java +++ b/services/authorization-mgt/import/src/main/java/org/collectionspace/services/authorization/driver/AuthorizationSeedDriver.java @@ -28,31 +28,22 @@ import java.util.HashSet; import java.util.List; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; - import org.collectionspace.authentication.AuthN; -import org.collectionspace.services.authorization.AuthZ; -import org.collectionspace.services.authorization.perms.Permission; import org.collectionspace.services.authorization.PermissionRole; import org.collectionspace.services.authorization.PermissionRoleRel; import org.collectionspace.services.authorization.Role; import org.collectionspace.services.authorization.SubjectType; import org.collectionspace.services.authorization.importer.AuthorizationGen; import org.collectionspace.services.authorization.importer.AuthorizationSeed; -import org.collectionspace.services.common.authorization_mgt.AuthorizationCommon; +import org.collectionspace.services.authorization.perms.Permission; import org.collectionspace.services.common.authorization_mgt.AuthorizationStore; import org.collectionspace.services.common.authorization_mgt.PermissionRoleUtil; -import org.collectionspace.services.common.context.ServiceContext; import org.collectionspace.services.common.storage.jpa.JPATransactionContext; -import org.collectionspace.services.common.storage.jpa.JpaStorageUtils; - import org.hibernate.exception.ConstraintViolationException; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; - import org.springframework.context.support.ClassPathXmlApplicationContext; +import org.springframework.jdbc.datasource.DataSourceTransactionManager; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; import org.springframework.security.core.Authentication; import org.springframework.security.core.GrantedAuthority; @@ -69,16 +60,17 @@ public class AuthorizationSeedDriver { final Logger logger = LoggerFactory.getLogger(AuthorizationSeedDriver.class); - final static private String SPRING_SECURITY_METADATA = "applicationContext-authorization-test.xml"; - final static private String ROLE_FILE = "import-roles.xml"; - final static private String PERMISSION_FILE = "import-permissions.xml"; - final static private String PERMISSION_ROLE_FILE = "import-permissions-roles.xml"; + private static final String SPRING_SECURITY_METADATA = "applicationContext-authorization-test.xml"; + private static final String ROLE_FILE = "import-roles.xml"; + private static final String PERMISSION_FILE = "import-permissions.xml"; + private static final String PERMISSION_ROLE_FILE = "import-permissions-roles.xml"; private String user; private String password; private String tenantBindingFile; private String exportDir; private AuthorizationGen authzGen; - private org.springframework.jdbc.datasource.DataSourceTransactionManager txManager; + private DataSourceTransactionManager txManager; + private ClassPathXmlApplicationContext appContext; /** * AuthorizationSeedDriver @@ -101,7 +93,7 @@ public AuthorizationSeedDriver(String user, String password, throw new IllegalArgumentException("password required."); } this.password = password; - + if (tenantBindingFile == null || tenantBindingFile.isEmpty()) { throw new IllegalArgumentException("tenantbinding file are required."); } @@ -143,14 +135,11 @@ public void seed(JPATransactionContext jpaTransactionContext) { // Push all the authz info into the cspace DB tables -this include default roles, permissions, and permroles // store(); - setupSpringSecurity(); status = beginTransaction("seedData"); AuthorizationSeed authzSeed = new AuthorizationSeed(); authzSeed.seedPermissions(jpaTransactionContext, authzGen.getDefaultPermissions(), authzGen.getDefaultPermissionRoles()); - if (logger.isDebugEnabled()) { - logger.debug("Authorization seeding completed."); - } + logger.debug("Authorization seeding completed."); } catch (Exception ex) { if (status != null) { rollbackTransaction(status); @@ -167,51 +156,45 @@ public void seed(JPATransactionContext jpaTransactionContext) { } } + /** + * Close the application context to allow for a clean shutdown of the ImportAuthz application. + */ + public void close() { + if (appContext != null && appContext.isActive()) { + appContext.close(); + } + } + /** * Setup of Spring Security context */ private void setupSpringSecurity() { - ClassPathXmlApplicationContext appContext = new ClassPathXmlApplicationContext( - new String[]{SPRING_SECURITY_METADATA}); + appContext = new ClassPathXmlApplicationContext(SPRING_SECURITY_METADATA); System.setProperty("spring-beans-config", SPRING_SECURITY_METADATA); - // - // authZ local not used but call to AuthZ.get() has side-effect of initializing our Spring Security context - // - AuthZ authZ = AuthZ.get(); - txManager = (org.springframework.jdbc.datasource.DataSourceTransactionManager) appContext.getBean("transactionManager"); - // - // debug - // - if (logger.isDebugEnabled()) { - logger.debug("Spring Security setup complete."); - } + txManager = (DataSourceTransactionManager) appContext.getBean("transactionManager"); + logger.debug("Spring Security setup complete."); } private void login() { - //GrantedAuthority cspace_admin = new SimpleGrantedAuthority("ROLE_ADMINISTRATOR"); - GrantedAuthority spring_security_admin = new SimpleGrantedAuthority(AuthN.ROLE_SPRING_ADMIN_NAME); //NOTE: Must match with value in applicationContext-authorization-test.xml (aka SPRING_SECURITY_METADATA) - HashSet gauths = new HashSet(); - //gauths.add(cspace_admin); - gauths.add(spring_security_admin); + //NOTE: Must match with value in applicationContext-authorization-test.xml (aka SPRING_SECURITY_METADATA) + GrantedAuthority springSecurityAdmin = new SimpleGrantedAuthority(AuthN.ROLE_SPRING_ADMIN_NAME); + HashSet gauths = new HashSet<>(); + gauths.add(springSecurityAdmin); Authentication authRequest = new UsernamePasswordAuthenticationToken(user, password, gauths); SecurityContextHolder.getContext().setAuthentication(authRequest); - if (logger.isDebugEnabled()) { - logger.debug("Spring Security login successful for user=" + user); - } + logger.debug("Spring Security login successful for user={}", user); } private void logout() { SecurityContextHolder.getContext().setAuthentication(null); - if (logger.isDebugEnabled()) { - logger.debug("Spring Security logged out user=" + user); - } + logger.debug("Spring Security logged out user={}", user); } private void store() throws Exception { - JPATransactionContext jpaTransactionContext = new JPATransactionContext((ServiceContext)null); + JPATransactionContext jpaTransactionContext = new JPATransactionContext(null); try { jpaTransactionContext.beginTransaction(); - + AuthorizationStore authzStore = new AuthorizationStore(); logger.info("Seeding Roles metadata to database."); for (Role role : authzGen.getDefaultRoles()) { @@ -229,14 +212,16 @@ private void store() throws Exception { } } } - + logger.info("Seeding Permissions metadata to database."); - for (Permission perm : authzGen.getDefaultPermissions()) { //FIXME: REM - 3/27/2012 - If we change the CSID of permissions to something like a refname, then we need to check for existing perms just like we did above for roles + //FIXME: REM - 3/27/2012 - If we change the CSID of permissions to something like a refname, then we need + // to check for existing perms just like we did above for roles + for (Permission perm : authzGen.getDefaultPermissions()) { authzStore.store(jpaTransactionContext, perm); } - + logger.info("Seeding Permissions/Roles relationships metadata to database."); - List permRoleRels = new ArrayList(); + List permRoleRels = new ArrayList<>(); for (PermissionRole pr : authzGen.getDefaultPermissionRoles()) { String tenantId = getTenantId(pr); PermissionRoleUtil.buildPermissionRoleRel(jpaTransactionContext, pr, SubjectType.ROLE, permRoleRels, false /*not for delete*/, tenantId); @@ -244,7 +229,7 @@ private void store() throws Exception { for (PermissionRoleRel permRoleRel : permRoleRels) { authzStore.store(jpaTransactionContext, permRoleRel); } - + jpaTransactionContext.commitTransaction(); if (logger.isInfoEnabled()) { logger.info("All Authorization metadata persisted."); @@ -265,11 +250,10 @@ private void store() throws Exception { */ private String getTenantId(PermissionRole pr) { String result = null; - + // Since all the role and permission values in a PermissionRole instance *must* have the same tenant ID, we // can just get the tenant ID from the 0th (first) role. result = pr.getRole().get(0).getTenantId(); - return result; } diff --git a/services/authorization-mgt/import/src/main/java/org/collectionspace/services/authorization/importer/AuthorizationGen.java b/services/authorization-mgt/import/src/main/java/org/collectionspace/services/authorization/importer/AuthorizationGen.java index 1341fc4e6e..7c14e70c82 100644 --- a/services/authorization-mgt/import/src/main/java/org/collectionspace/services/authorization/importer/AuthorizationGen.java +++ b/services/authorization-mgt/import/src/main/java/org/collectionspace/services/authorization/importer/AuthorizationGen.java @@ -24,38 +24,32 @@ package org.collectionspace.services.authorization.importer; import java.io.File; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import java.util.ArrayList; import java.util.Hashtable; import java.util.List; + import jakarta.xml.bind.JAXBContext; import jakarta.xml.bind.Marshaller; - -import org.collectionspace.services.client.TenantClient; -import org.collectionspace.authentication.AuthN; import org.collectionspace.authentication.AuthN; - -import org.collectionspace.services.authorization.perms.Permission; import org.collectionspace.services.authorization.PermissionRole; import org.collectionspace.services.authorization.PermissionValue; -import org.collectionspace.services.authorization.perms.PermissionsList; import org.collectionspace.services.authorization.PermissionsRolesList; - import org.collectionspace.services.authorization.Role; import org.collectionspace.services.authorization.RoleValue; import org.collectionspace.services.authorization.RolesList; import org.collectionspace.services.authorization.SubjectType; - +import org.collectionspace.services.authorization.perms.Permission; +import org.collectionspace.services.authorization.perms.PermissionsList; +import org.collectionspace.services.client.TenantClient; import org.collectionspace.services.common.authorization_mgt.AuthorizationCommon; import org.collectionspace.services.common.config.ServicesConfigReaderImpl; import org.collectionspace.services.common.config.TenantBindingConfigReaderImpl; import org.collectionspace.services.common.security.SecurityUtils; import org.collectionspace.services.common.storage.jpa.JPATransactionContext; - import org.collectionspace.services.config.service.ServiceBindingType; import org.collectionspace.services.config.tenant.TenantBindingType; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * AuthorizationGen generates authorizations (permissions and roles) diff --git a/services/authorization-mgt/import/src/main/java/org/collectionspace/services/authorization/importer/AuthorizationSeed.java b/services/authorization-mgt/import/src/main/java/org/collectionspace/services/authorization/importer/AuthorizationSeed.java index 30079397ce..b4f04d4802 100644 --- a/services/authorization-mgt/import/src/main/java/org/collectionspace/services/authorization/importer/AuthorizationSeed.java +++ b/services/authorization-mgt/import/src/main/java/org/collectionspace/services/authorization/importer/AuthorizationSeed.java @@ -25,21 +25,18 @@ import java.io.FileInputStream; import java.io.InputStream; - import java.util.List; import jakarta.xml.bind.JAXBContext; import jakarta.xml.bind.Unmarshaller; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import org.collectionspace.services.authorization.perms.Permission; import org.collectionspace.services.authorization.PermissionRole; -import org.collectionspace.services.authorization.perms.PermissionsList; import org.collectionspace.services.authorization.PermissionsRolesList; +import org.collectionspace.services.authorization.perms.Permission; +import org.collectionspace.services.authorization.perms.PermissionsList; import org.collectionspace.services.common.authorization_mgt.AuthorizationCommon; import org.collectionspace.services.common.storage.jpa.JPATransactionContext; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * AuthorizationSeed seeds authorizations (permission, role) into authz provider database diff --git a/services/authorization-mgt/import/src/main/resources/META-INF/persistence.xml b/services/authorization-mgt/import/src/main/resources/META-INF/persistence.xml index b694ab8554..7435d5ab75 100644 --- a/services/authorization-mgt/import/src/main/resources/META-INF/persistence.xml +++ b/services/authorization-mgt/import/src/main/resources/META-INF/persistence.xml @@ -1,6 +1,8 @@ - + org.collectionspace.services.authorization.perms.Permission org.collectionspace.services.authorization.perms.PermissionAction @@ -8,7 +10,13 @@ org.collectionspace.services.authorization.Role org.collectionspace.services.authorization.AccountRoleRel - + + + + + + + diff --git a/services/authorization-mgt/import/src/main/resources/hibernate.cfg.xml b/services/authorization-mgt/import/src/main/resources/hibernate.cfg.xml deleted file mode 100644 index 0d9143787c..0000000000 --- a/services/authorization-mgt/import/src/main/resources/hibernate.cfg.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - @DB_CSPACE_URL@ - @DB_DRIVER_CLASS@ - @DB_CSPACE_USER@ - @DB_CSPACE_PASSWORD@ - @DB_DIALECT@ - org.hibernate.transaction.JDBCTransactionFactory - thread - false - - diff --git a/services/authorization/jaxb/pom.xml b/services/authorization/jaxb/pom.xml index 8c0b91fa23..ddd7e64afa 100644 --- a/services/authorization/jaxb/pom.xml +++ b/services/authorization/jaxb/pom.xml @@ -14,22 +14,22 @@ javax.persistence - persistence-api + javax.persistence-api jakarta.xml.bind jakarta.xml.bind-api - - org.jvnet.jaxb - hyperjaxb3-ejb-runtime - 4.0.12 - org.jspecify jspecify 1.0.0 + + org.collectionspace.services + org.collectionspace.services.jaxb + ${project.version} + diff --git a/services/authorization/jaxb/src/main/java/org/collectionspace/services/authorization/AccountRoleRel.java b/services/authorization/jaxb/src/main/java/org/collectionspace/services/authorization/AccountRoleRel.java index 7198dc980e..dcd2732775 100644 --- a/services/authorization/jaxb/src/main/java/org/collectionspace/services/authorization/AccountRoleRel.java +++ b/services/authorization/jaxb/src/main/java/org/collectionspace/services/authorization/AccountRoleRel.java @@ -13,9 +13,7 @@ import javax.persistence.Table; import javax.persistence.Temporal; import javax.persistence.TemporalType; -import javax.persistence.Transient; import javax.persistence.UniqueConstraint; -import javax.xml.datatype.XMLGregorianCalendar; import jakarta.xml.bind.annotation.XmlAccessType; import jakarta.xml.bind.annotation.XmlAccessorType; @@ -23,8 +21,8 @@ import jakarta.xml.bind.annotation.XmlElement; import jakarta.xml.bind.annotation.XmlSchemaType; import jakarta.xml.bind.annotation.XmlType; -import org.jvnet.hyperjaxb3.xml.bind.annotation.adapters.XMLGregorianCalendarAsDateTime; -import org.jvnet.hyperjaxb3.xml.bind.annotation.adapters.XmlAdapterUtils; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import org.collectionspace.services.jaxb.adapter.DateAdapter; @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "account_role_rel") @@ -66,10 +64,12 @@ public class AccountRoleRel { @Column(name = "role_name") private String roleName; - @Transient + @Column(name = "created_at", nullable = false) + @Temporal(TemporalType.TIMESTAMP) @XmlElement(required = true) @XmlSchemaType(name = "dateTime") - private XMLGregorianCalendar createdAt; + @XmlJavaTypeAdapter(DateAdapter.class) + private Date createdAt; public String getAccountId() { return accountId; @@ -111,11 +111,11 @@ public void setRoleName(String roleName) { this.roleName = roleName; } - public XMLGregorianCalendar getCreatedAt() { + public Date getCreatedAt() { return createdAt; } - public void setCreatedAt(XMLGregorianCalendar createdAt) { + public void setCreatedAt(Date createdAt) { this.createdAt = createdAt; } @@ -127,17 +127,6 @@ public void setHjid(Long hjid) { this.hjid = hjid; } - @Basic - @Column(name = "created_at", nullable = false) - @Temporal(TemporalType.TIMESTAMP) - public Date getCreatedAtItem() { - return XmlAdapterUtils.unmarshall(XMLGregorianCalendarAsDateTime.class, this.getCreatedAt()); - } - - public void setCreatedAtItem(Date createdAt) { - setCreatedAt(XmlAdapterUtils.marshall(XMLGregorianCalendarAsDateTime.class, createdAt)); - } - @Override public boolean equals(Object o) { if (o == null || getClass() != o.getClass()) { diff --git a/services/authorization/jaxb/src/main/java/org/collectionspace/services/authorization/PermissionRoleRel.java b/services/authorization/jaxb/src/main/java/org/collectionspace/services/authorization/PermissionRoleRel.java index dd69efd7be..6adf6e7ab0 100644 --- a/services/authorization/jaxb/src/main/java/org/collectionspace/services/authorization/PermissionRoleRel.java +++ b/services/authorization/jaxb/src/main/java/org/collectionspace/services/authorization/PermissionRoleRel.java @@ -13,9 +13,7 @@ import javax.persistence.Table; import javax.persistence.Temporal; import javax.persistence.TemporalType; -import javax.persistence.Transient; import javax.persistence.UniqueConstraint; -import javax.xml.datatype.XMLGregorianCalendar; import jakarta.xml.bind.annotation.XmlAccessType; import jakarta.xml.bind.annotation.XmlAccessorType; @@ -23,8 +21,8 @@ import jakarta.xml.bind.annotation.XmlElement; import jakarta.xml.bind.annotation.XmlSchemaType; import jakarta.xml.bind.annotation.XmlType; -import org.jvnet.hyperjaxb3.xml.bind.annotation.adapters.XMLGregorianCalendarAsDateTime; -import org.jvnet.hyperjaxb3.xml.bind.annotation.adapters.XmlAdapterUtils; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import org.collectionspace.services.jaxb.adapter.DateAdapter; @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "permission_role_rel") @@ -66,10 +64,12 @@ public class PermissionRoleRel { @Column(name = "role_name") private String roleName; - @Transient + @Column(name = "created_at", nullable = false) + @Temporal(TemporalType.TIMESTAMP) @XmlElement(required = true) @XmlSchemaType(name = "dateTime") - private XMLGregorianCalendar createdAt; + @XmlJavaTypeAdapter(DateAdapter.class) + private Date createdAt; public String getPermissionId() { return permissionId; @@ -111,11 +111,11 @@ public void setRoleName(String roleName) { this.roleName = roleName; } - public XMLGregorianCalendar getCreatedAt() { + public Date getCreatedAt() { return createdAt; } - public void setCreatedAt(XMLGregorianCalendar createdAt) { + public void setCreatedAt(Date createdAt) { this.createdAt = createdAt; } @@ -127,17 +127,6 @@ public void setHjid(Long hjid) { this.hjid = hjid; } - @Basic - @Column(name = "created_at", nullable = false) - @Temporal(TemporalType.TIMESTAMP) - public Date getCreatedAtItem() { - return XmlAdapterUtils.unmarshall(XMLGregorianCalendarAsDateTime.class, this.getCreatedAt()); - } - - public void setCreatedAtItem(Date createdAt) { - setCreatedAt(XmlAdapterUtils.marshall(XMLGregorianCalendarAsDateTime.class, createdAt)); - } - @Override public boolean equals(Object o) { if (o == null || getClass() != o.getClass()) { diff --git a/services/authorization/jaxb/src/main/java/org/collectionspace/services/authorization/Role.java b/services/authorization/jaxb/src/main/java/org/collectionspace/services/authorization/Role.java index f0d4f58133..236c751079 100644 --- a/services/authorization/jaxb/src/main/java/org/collectionspace/services/authorization/Role.java +++ b/services/authorization/jaxb/src/main/java/org/collectionspace/services/authorization/Role.java @@ -15,7 +15,6 @@ import javax.persistence.TemporalType; import javax.persistence.Transient; import javax.persistence.UniqueConstraint; -import javax.xml.datatype.XMLGregorianCalendar; import jakarta.xml.bind.annotation.XmlAccessType; import jakarta.xml.bind.annotation.XmlAccessorType; @@ -23,9 +22,9 @@ import jakarta.xml.bind.annotation.XmlElement; import jakarta.xml.bind.annotation.XmlSchemaType; import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import org.collectionspace.services.jaxb.adapter.DateAdapter; import org.jspecify.annotations.NonNull; -import org.jvnet.hyperjaxb3.xml.bind.annotation.adapters.XMLGregorianCalendarAsDateTime; -import org.jvnet.hyperjaxb3.xml.bind.annotation.adapters.XmlAdapterUtils; @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "role") @@ -79,15 +78,19 @@ public class Role { @Column(name = "perms_protection") private String permsProtection; - @Transient + @Column(name = "created_at", nullable = false) + @Temporal(TemporalType.TIMESTAMP) @XmlElement(required = true) @XmlSchemaType(name = "dateTime") - private XMLGregorianCalendar createdAt; + @XmlJavaTypeAdapter(DateAdapter.class) + private Date createdAt; - @Transient + @Column(name = "updated_at") + @Temporal(TemporalType.TIMESTAMP) @XmlElement(required = true) @XmlSchemaType(name = "dateTime") - private XMLGregorianCalendar updatedAt; + @XmlJavaTypeAdapter(DateAdapter.class) + private Date updatedAt; @Transient @XmlElement(required = true) @@ -149,19 +152,19 @@ public void setPermsProtection(String permsProtection) { this.permsProtection = permsProtection; } - public XMLGregorianCalendar getCreatedAt() { + public Date getCreatedAt() { return createdAt; } - public void setCreatedAt(XMLGregorianCalendar createdAt) { + public void setCreatedAt(Date createdAt) { this.createdAt = createdAt; } - public XMLGregorianCalendar getUpdatedAt() { + public Date getUpdatedAt() { return updatedAt; } - public void setUpdatedAt(XMLGregorianCalendar updatedAt) { + public void setUpdatedAt(Date updatedAt) { this.updatedAt = updatedAt; } @@ -185,28 +188,6 @@ public void setCsid(String csid) { this.csid = csid; } - @Basic - @Column(name = "created_at", nullable = false) - @Temporal(TemporalType.TIMESTAMP) - public Date getCreatedAtItem() { - return XmlAdapterUtils.unmarshall(XMLGregorianCalendarAsDateTime.class, this.getCreatedAt()); - } - - public void setCreatedAtItem(Date createdAt) { - setCreatedAt(XmlAdapterUtils.marshall(XMLGregorianCalendarAsDateTime.class, createdAt)); - } - - @Basic - @Column(name = "updated_at") - @Temporal(TemporalType.TIMESTAMP) - public Date getUpdatedAtItem() { - return XmlAdapterUtils.unmarshall(XMLGregorianCalendarAsDateTime.class, this.getUpdatedAt()); - } - - public void setUpdatedAtItem(Date updatedAt) { - setUpdatedAt(XmlAdapterUtils.marshall(XMLGregorianCalendarAsDateTime.class, updatedAt)); - } - @Override public boolean equals(Object o) { if (o == null || getClass() != o.getClass()) { diff --git a/services/common/pom.xml b/services/common/pom.xml index 6f52941cf8..f7db542399 100644 --- a/services/common/pom.xml +++ b/services/common/pom.xml @@ -195,7 +195,7 @@ javax.persistence - persistence-api + javax.persistence-api diff --git a/services/common/src/main/java/org/collectionspace/services/common/authorization_mgt/AuthorizationCommon.java b/services/common/src/main/java/org/collectionspace/services/common/authorization_mgt/AuthorizationCommon.java index 91c920708e..ca9ff6342f 100644 --- a/services/common/src/main/java/org/collectionspace/services/common/authorization_mgt/AuthorizationCommon.java +++ b/services/common/src/main/java/org/collectionspace/services/common/authorization_mgt/AuthorizationCommon.java @@ -1,6 +1,5 @@ package org.collectionspace.services.common.authorization_mgt; -import java.security.NoSuchAlgorithmException; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; @@ -19,7 +18,6 @@ import org.collectionspace.authentication.AuthN; import org.collectionspace.services.account.AccountListItem; - import org.collectionspace.services.authentication.Token; import org.collectionspace.services.authorization.AuthZ; import org.collectionspace.services.authorization.CSpaceAction; @@ -41,7 +39,6 @@ import org.collectionspace.services.client.Profiler; import org.collectionspace.services.client.RoleClient; import org.collectionspace.services.client.workflow.WorkflowClient; - import org.collectionspace.services.common.config.ServiceConfigUtils; import org.collectionspace.services.common.config.TenantBindingConfigReaderImpl; import org.collectionspace.services.common.context.ServiceBindingUtils; @@ -52,17 +49,13 @@ import org.collectionspace.services.common.storage.JDBCTools; import org.collectionspace.services.common.storage.jpa.JPATransactionContext; import org.collectionspace.services.common.storage.jpa.JpaStorageUtils; - import org.collectionspace.services.config.service.ServiceBindingType; import org.collectionspace.services.config.tenant.EmailConfig; import org.collectionspace.services.config.tenant.PasswordResetConfig; import org.collectionspace.services.config.tenant.TenantBindingType; - import org.collectionspace.services.lifecycle.Lifecycle; import org.collectionspace.services.lifecycle.TransitionDef; import org.collectionspace.services.lifecycle.TransitionDefList; - -//import org.mortbay.log.Log; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -189,7 +182,7 @@ public static Role getRole(JPATransactionContext jpaTransactionContext, String t public static Role createRole(String tenantId, String name, String description, boolean immutable) { Role role = new Role(); - role.setCreatedAtItem(new Date()); + role.setCreatedAt(new Date()); role.setDisplayName(name); String roleName = AuthorizationCommon.getQualifiedRoleName(tenantId, name); role.setRoleName(roleName); @@ -298,7 +291,7 @@ private static Permission createPermission(String tenantId, Permission perm = new Permission(); perm.setCsid(id); perm.setDescription(description); - perm.setCreatedAtItem(new Date()); + perm.setCreatedAt(new Date()); perm.setResourceName(resourceName.toLowerCase().trim()); perm.setEffect(EffectType.PERMIT); perm.setTenantId(tenantId); @@ -1105,7 +1098,7 @@ public static void createDefaultWorkflowPermissions( Role readonlyRole = AuthorizationCommon.getRole(jpaTransactionContext, tenantBinding.getId(), ROLE_TENANT_READER); if (adminRole == null || readonlyRole == null) { - String msg = String.format("One or more of the required default CollectionSpace administrator roles is missing or was never created. If you're setting up a new instance of CollectionSpace, shutdown the Tomcat server and run the 'ant import' command from the root/top level CollectionSpace 'Services' source directory. Then try restarting Tomcat."); + String msg = "One or more of the required default CollectionSpace administrator roles is missing or was never created. If you're setting up a new instance of CollectionSpace, shutdown the Tomcat server and run the 'ant import' command from the root/top level CollectionSpace 'Services' source directory. Then try restarting Tomcat."; logger.info(msg); throw new RuntimeException("One or more of the required default CollectionSpace administrator roles is missing or was never created."); } @@ -1265,17 +1258,17 @@ private static void persist(JPATransactionContext jpaTransactionContext, Permiss } - public static boolean hasTokenExpired(EmailConfig emailConfig, Token token) throws NoSuchAlgorithmException { + public static boolean hasTokenExpired(EmailConfig emailConfig, Token token) { boolean result = false; int maxConfigSeconds = emailConfig.getPasswordResetConfig().getTokenExpirationSeconds().intValue(); int maxTokenSeconds = token.getExpireSeconds().intValue(); - long createdTime = token.getCreatedAtItem().getTime(); - long configExpirationTime = createdTime + maxConfigSeconds * 1000; // the current tenant config for how long a token stays valid - long tokenDefinedExirationTime = createdTime + maxTokenSeconds * 1000; // the tenant config for how long a token stays valid when the token was created. + long createdTime = token.getCreatedAt().getTime(); + long configExpirationTime = createdTime + maxConfigSeconds * 1000L; // the current tenant config for how long a token stays valid + long tokenDefinedExpirationTime = createdTime + maxTokenSeconds * 1000L; // the tenant config for how long a token stays valid when the token was created. - if (configExpirationTime != tokenDefinedExirationTime) { + if (configExpirationTime != tokenDefinedExpirationTime) { String msg = String.format("The configured expiration time for the token = '%s' changed from when the token was created.", token.getId()); logger.warn(msg); diff --git a/services/common/src/main/java/org/collectionspace/services/common/authorization_mgt/AuthorizationStore.java b/services/common/src/main/java/org/collectionspace/services/common/authorization_mgt/AuthorizationStore.java index 6a4b72ac02..64211d4960 100644 --- a/services/common/src/main/java/org/collectionspace/services/common/authorization_mgt/AuthorizationStore.java +++ b/services/common/src/main/java/org/collectionspace/services/common/authorization_mgt/AuthorizationStore.java @@ -118,7 +118,7 @@ public String store(Object entity) throws Exception { //by the caller em.getTransaction().begin(); if (JaxbUtils.getValue(entity, "getCreatedAt") == null) { - JaxbUtils.setValue(entity, "setCreatedAtItem", Date.class, new Date()); + JaxbUtils.setValue(entity, "setCreatedAt", Date.class, new Date()); } em.persist(entity); em.getTransaction().commit(); @@ -201,7 +201,7 @@ public String store(JPATransactionContext jpaTransactionContext, Object entity) } */ if (JaxbUtils.getValue(entity, "getCreatedAt") == null) { - JaxbUtils.setValue(entity, "setCreatedAtItem", Date.class, new Date()); + JaxbUtils.setValue(entity, "setCreatedAt", Date.class, new Date()); } if (entityExists == true) { diff --git a/services/common/src/main/java/org/collectionspace/services/common/storage/jpa/JpaRelationshipStorageClient.java b/services/common/src/main/java/org/collectionspace/services/common/storage/jpa/JpaRelationshipStorageClient.java index 63b0547c64..7491ff48a5 100644 --- a/services/common/src/main/java/org/collectionspace/services/common/storage/jpa/JpaRelationshipStorageClient.java +++ b/services/common/src/main/java/org/collectionspace/services/common/storage/jpa/JpaRelationshipStorageClient.java @@ -95,7 +95,7 @@ public String create(ServiceContext ctx, DocumentWrapper> wrapDoc = new DocumentWrapperImpl>(relationshipList); handler.handle(Action.CREATE, wrapDoc); for (T relationship : relationshipList) { - JaxbUtils.setValue(relationship, "setCreatedAtItem", Date.class, new Date()); + JaxbUtils.setValue(relationship, "setCreatedAt", Date.class, new Date()); jpaTransactionContext.persist(relationship); } handler.complete(Action.CREATE, wrapDoc); diff --git a/services/common/src/main/java/org/collectionspace/services/common/storage/jpa/JpaStorageClientImpl.java b/services/common/src/main/java/org/collectionspace/services/common/storage/jpa/JpaStorageClientImpl.java index b963929a3b..6803d78cea 100644 --- a/services/common/src/main/java/org/collectionspace/services/common/storage/jpa/JpaStorageClientImpl.java +++ b/services/common/src/main/java/org/collectionspace/services/common/storage/jpa/JpaStorageClientImpl.java @@ -117,7 +117,7 @@ public String create(ServiceContext ctx, jpaConnectionContext.beginTransaction(); try { handler.handle(Action.CREATE, wrapDoc); - JaxbUtils.setValue(entity, "setCreatedAtItem", Date.class, new Date()); + JaxbUtils.setValue(entity, "setCreatedAt", Date.class, new Date()); jpaConnectionContext.persist(entity); } catch (EntityExistsException ee) { // FIXME: No, don't allow duplicates // @@ -312,7 +312,7 @@ public void update(ServiceContext ctx, String id, DocumentHandler handler) Object entityFound = getEntity(ctx, id, entityReceived.getClass()); DocumentWrapper wrapDoc = new DocumentWrapperImpl(entityFound); handler.handle(Action.UPDATE, wrapDoc); - JaxbUtils.setValue(entityFound, "setUpdatedAtItem", Date.class, new Date()); + JaxbUtils.setValue(entityFound, "setUpdatedAt", Date.class, new Date()); handler.complete(Action.UPDATE, wrapDoc); jpaConnectionContext.commitTransaction(); diff --git a/services/common/src/main/java/org/collectionspace/services/common/storage/jpa/JpaStorageUtils.java b/services/common/src/main/java/org/collectionspace/services/common/storage/jpa/JpaStorageUtils.java index 111b4e69f2..1040751da6 100644 --- a/services/common/src/main/java/org/collectionspace/services/common/storage/jpa/JpaStorageUtils.java +++ b/services/common/src/main/java/org/collectionspace/services/common/storage/jpa/JpaStorageUtils.java @@ -23,18 +23,16 @@ */ package org.collectionspace.services.common.storage.jpa; -import java.util.List; import java.util.ArrayList; import java.util.HashMap; import java.util.Iterator; +import java.util.List; import java.util.Map; - -import javax.persistence.PersistenceException; import javax.persistence.EntityManager; import javax.persistence.EntityManagerFactory; -import javax.persistence.EntityNotFoundException; import javax.persistence.NoResultException; import javax.persistence.Persistence; +import javax.persistence.PersistenceException; import javax.persistence.Query; import org.collectionspace.authentication.AuthN; @@ -50,13 +48,12 @@ import org.collectionspace.services.authorization.URIResourceImpl; import org.collectionspace.services.common.api.Tools; import org.collectionspace.services.common.authorization_mgt.AuthorizationRoleRel; -import org.collectionspace.services.common.context.ServiceContext; import org.collectionspace.services.common.document.DocumentFilter; import org.collectionspace.services.common.document.DocumentNotFoundException; -import org.collectionspace.services.common.security.UnauthorizedException; import org.collectionspace.services.common.document.JaxbUtils; import org.collectionspace.services.common.document.TransactionException; import org.collectionspace.services.common.security.SecurityUtils; +import org.collectionspace.services.common.security.UnauthorizedException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -64,7 +61,6 @@ * Utilities for JpaStorage * @author */ -@SuppressWarnings({"rawtypes", "unchecked"}) public class JpaStorageUtils { final private static Logger logger = LoggerFactory.getLogger(JpaStorageUtils.class); diff --git a/services/hyperjaxb/pom.xml b/services/hyperjaxb/pom.xml index 1c6db7acad..c9e4fc4ef0 100644 --- a/services/hyperjaxb/pom.xml +++ b/services/hyperjaxb/pom.xml @@ -34,18 +34,19 @@ services.hyperjaxb + + org.collectionspace.services + org.collectionspace.services.jaxb + ${project.version} + + jakarta.xml.bind jakarta.xml.bind-api - - org.jvnet.jaxb - hyperjaxb3-ejb-runtime - 4.0.12 - javax.persistence - persistence-api + javax.persistence-api org.hibernate diff --git a/services/hyperjaxb/src/main/java/org/collectionspace/services/authorization/perms/Permission.java b/services/hyperjaxb/src/main/java/org/collectionspace/services/authorization/perms/Permission.java index 4fe1096d03..8bb3a8c720 100644 --- a/services/hyperjaxb/src/main/java/org/collectionspace/services/authorization/perms/Permission.java +++ b/services/hyperjaxb/src/main/java/org/collectionspace/services/authorization/perms/Permission.java @@ -1,11 +1,5 @@ package org.collectionspace.services.authorization.perms; -import jakarta.xml.bind.annotation.XmlAccessType; -import jakarta.xml.bind.annotation.XmlAccessorType; -import jakarta.xml.bind.annotation.XmlAttribute; -import jakarta.xml.bind.annotation.XmlElement; -import jakarta.xml.bind.annotation.XmlSchemaType; -import jakarta.xml.bind.annotation.XmlType; import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -24,11 +18,16 @@ import javax.persistence.Table; import javax.persistence.Temporal; import javax.persistence.TemporalType; -import javax.persistence.Transient; -import javax.xml.datatype.XMLGregorianCalendar; + +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlSchemaType; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import org.collectionspace.services.jaxb.adapter.DateAdapter; import org.jspecify.annotations.NonNull; -import org.jvnet.hyperjaxb3.xml.bind.annotation.adapters.XMLGregorianCalendarAsDateTime; -import org.jvnet.hyperjaxb3.xml.bind.annotation.adapters.XmlAdapterUtils; @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "permission") @@ -85,15 +84,19 @@ public class Permission { @XmlElement(name = "tenant_id", required = true) private String tenantId; - @Transient + @Column(name = "created_at", nullable = false) + @Temporal(TemporalType.TIMESTAMP) @XmlElement(required = true) @XmlSchemaType(name = "dateTime") - private XMLGregorianCalendar createdAt; + @XmlJavaTypeAdapter(DateAdapter.class) + private Date createdAt; - @Transient + @Column(name = "updated_at") + @Temporal(TemporalType.TIMESTAMP) @XmlElement(required = true) @XmlSchemaType(name = "dateTime") - private XMLGregorianCalendar updatedAt; + @XmlJavaTypeAdapter(DateAdapter.class) + private Date updatedAt; public String getDescription() { return description; @@ -180,20 +183,20 @@ public Permission setTenantId(String tenantId) { return this; } - public XMLGregorianCalendar getCreatedAt() { + public Date getCreatedAt() { return createdAt; } - public Permission setCreatedAt(XMLGregorianCalendar createdAt) { + public Permission setCreatedAt(Date createdAt) { this.createdAt = createdAt; return this; } - public XMLGregorianCalendar getUpdatedAt() { + public Date getUpdatedAt() { return updatedAt; } - public Permission setUpdatedAt(XMLGregorianCalendar updatedAt) { + public Permission setUpdatedAt(Date updatedAt) { this.updatedAt = updatedAt; return this; } @@ -207,28 +210,6 @@ public Permission setCsid(String csid) { return this; } - @Basic - @Column(name = "created_at", nullable = false) - @Temporal(TemporalType.TIMESTAMP) - public Date getCreatedAtItem() { - return XmlAdapterUtils.unmarshall(XMLGregorianCalendarAsDateTime.class, this.getCreatedAt()); - } - - public void setCreatedAtItem(Date target) { - setCreatedAt(XmlAdapterUtils.marshall(XMLGregorianCalendarAsDateTime.class, target)); - } - - @Basic - @Column(name = "updated_at") - @Temporal(TemporalType.TIMESTAMP) - public Date getUpdatedAtItem() { - return XmlAdapterUtils.unmarshall(XMLGregorianCalendarAsDateTime.class, this.getUpdatedAt()); - } - - public void setUpdatedAtItem(Date target) { - setUpdatedAt(XmlAdapterUtils.marshall(XMLGregorianCalendarAsDateTime.class, target)); - } - @Override public boolean equals(Object o) { if (o == null || getClass() != o.getClass()) { diff --git a/services/jaxb/src/main/java/org/collectionspace/services/jaxb/adapter/DateAdapter.java b/services/jaxb/src/main/java/org/collectionspace/services/jaxb/adapter/DateAdapter.java new file mode 100644 index 0000000000..6d79288393 --- /dev/null +++ b/services/jaxb/src/main/java/org/collectionspace/services/jaxb/adapter/DateAdapter.java @@ -0,0 +1,24 @@ +package org.collectionspace.services.jaxb.adapter; + +import java.time.Instant; +import java.time.format.DateTimeFormatter; +import java.util.Date; + +import jakarta.xml.bind.annotation.adapters.XmlAdapter; + +/** + * Adapter to convert {@link Date} to an ISO-8601 String at UTC-0 + * + * @since 9.0.0 + */ +public class DateAdapter extends XmlAdapter { + @Override + public Date unmarshal(String s) { + return Date.from(Instant.parse(s)); + } + + @Override + public String marshal(Date date) { + return DateTimeFormatter.ISO_INSTANT.format(date.toInstant()); + } +} diff --git a/services/jaxb/src/test/java/org/collectionspace/services/jaxb/adapter/DateAdapterTest.java b/services/jaxb/src/test/java/org/collectionspace/services/jaxb/adapter/DateAdapterTest.java new file mode 100644 index 0000000000..9710573f89 --- /dev/null +++ b/services/jaxb/src/test/java/org/collectionspace/services/jaxb/adapter/DateAdapterTest.java @@ -0,0 +1,26 @@ +package org.collectionspace.services.jaxb.adapter; + +import java.time.Instant; +import java.util.Date; + +import org.testng.Assert; +import org.testng.annotations.Test; + +public class DateAdapterTest { + + private static final String STRING_EPOCH = "1970-01-01T00:00:00Z"; + private static final Date DATE_EPOCH = Date.from(Instant.EPOCH); + private final DateAdapter adapter = new DateAdapter(); + + @Test + public void testUnmarshal() { + Date unmarshalled = adapter.unmarshal(STRING_EPOCH); + Assert.assertEquals(unmarshalled, DATE_EPOCH); + } + + @Test + public void testMarshal() { + String marshalled = adapter.marshal(DATE_EPOCH); + Assert.assertEquals(marshalled, STRING_EPOCH); + } +} \ No newline at end of file diff --git a/services/pom.xml b/services/pom.xml index b0cbf4dcd8..e9ee3623d0 100644 --- a/services/pom.xml +++ b/services/pom.xml @@ -182,32 +182,6 @@ ${jboss.dir} - org.jvnet.jaxb jaxb-maven-plugin @@ -240,7 +214,7 @@ org.codehaus.mojo exec-maven-plugin - 1.1 + 3.6.3 @@ -273,39 +247,7 @@ org.apache.maven.plugins maven-javadoc-plugin - - - - - - From 27c696e357458cf8f321463eaf9bf248e88e58dc Mon Sep 17 00:00:00 2001 From: Michael Ritter Date: Mon, 20 Apr 2026 17:39:55 -0600 Subject: [PATCH 16/24] DRYD-2051: Nuxeo updates (#525) * Update nuxeo.general.release to 2023.39 * Update nuxeo repository * Add enforcer plugin for dependency constraints * Nuxeo Updates * Migrate getLocalService to getService * Replace ClientException with NuxeoException * ES API updates * Fulltext API updates * CoreSession API updates * DocModel API update * Remove ScopeType/ScopedMap * Replace getPath with getXPath * CMIS updates * Dependency changes * jackson -> 2.19.4 * stax2-api -> 4.2.2 * groovy -> 2.4.21 * guava -> 32.1.3-jre * commons-codec -> 1.18.0 * commons-io -> 2.19.0 * commons-lang3 -> 3.18.0 * Add exclusion for woodstox-core-asl * Add missing Transient annotation on AccountsCommon * Remove unused files --- .../DefaultESDocumentWriter.java | 161 +++++------ .../TenantConfiguredESDocumentWriter.java | 16 +- .../anthro/AnthroESDocumentWriter.java | 2 +- .../materials/MaterialsESDocumentWriter.java | 79 +++--- .../naturalhistory/pom.xml | 5 - .../UpdateFormattedDisplayNameListener.java | 2 +- .../nuxeo/nuxeo-platform-listener/pom.xml | 11 - .../tenants/botgarden/pom.xml | 9 +- .../nuxeo-platform-listener/tenants/pom.xml | 11 - .../updateimagederivatives/pom.xml | 8 +- .../AbstractUpdateObjectLocationValues.java | 14 +- .../UpdateObjectLocationAndCrateOnMove.java | 6 +- .../listener/UpdateObjectLocationOnMove.java | 4 +- .../nuxeo/nuxeo-platform-quote-api/pom.xml | 2 +- .../ecm/platform/quote/api/QuoteManager.java | 26 +- .../platform/quote/api/QuoteableDocument.java | 16 +- .../quote/impl/QuoteableDocumentAdapter.java | 14 +- .../services/QuotesModerationService.java | 22 +- 3rdparty/nuxeo/nuxeo-platform-quote/pom.xml | 20 +- .../platform/quote/ejb/QuoteManagerBean.java | 42 +-- .../quote/ejb/QuotesModerationBean.java | 12 +- .../quote/impl/QuoteConverterImpl.java | 8 +- .../platform/quote/impl/QuoteManagerImpl.java | 78 +++--- .../DocumentRemovedQuoteEventListener.java | 4 +- .../listener/QuoteRemovedEventListener.java | 4 +- .../listener/test/SimpleListenerTest.java | 2 +- .../nuxeo/nuxeo-platform-thumbnail/pom.xml | 5 - .../thumbnail/AddThumbnailUnrestricted.java | 4 +- .../nuxeo/extension/thumbnail/Thumbnail.java | 4 +- .../thumbnail/ThumbnailConverter.java | 2 +- .../thumbnail/UpdateThumbListener.java | 4 +- .../org/nuxeo/platform/thumbnail/App.java | 13 - 3rdparty/nuxeo/nuxeo-server/pom.xml | 146 ++-------- pom.xml | 187 +++++++------ services/JaxRsServiceProvider/pom.xml | 19 +- .../services/account/AccountsCommon.java | 1 + services/authority/service/pom.xml | 23 +- .../nuxeo/AuthorityDocumentModelHandler.java | 4 +- .../AuthorityItemDocumentModelHandler.java | 7 +- .../authorization/PermissionResource.java.txt | 254 ------------------ .../PermissionDocumentHandler.java.txt | 1 - .../applicationContext-authorization.xml | 2 +- .../batch/nuxeo/ReindexFullTextBatchJob.java | 12 +- .../blob/nuxeo/BlobDocumentModelHandler.java | 7 +- services/common/pom.xml | 61 ++--- .../common/context/ServiceBindingUtils.java | 4 +- .../common/document/DocumentUtils.java | 2 +- .../common/imaging/nuxeo/ImagePlugin.javax | 5 +- .../common/imaging/nuxeo/NuxeoBlobUtils.java | 37 ++- .../common/relation/RelationUtils.java | 6 +- .../common/repository/RepositoryClient.java | 6 +- .../vocabulary/RefNameServiceUtils.java | 65 +++-- .../nuxeo/WorkflowDocumentModelHandler.java | 7 +- .../client/java/CoreSessionInterface.java | 46 ++-- .../nuxeo/client/java/CoreSessionWrapper.java | 42 +-- .../client/java/DocumentModelHandler.java | 8 +- .../client/java/NuxeoClientEmbedded.java | 38 ++- .../client/java/NuxeoConnectorEmbedded.java | 4 +- .../client/java/NuxeoDocumentException.java | 6 +- .../java/NuxeoRepositoryClientImpl.java | 57 ++-- .../java/RemoteDocumentModelHandlerImpl.java | 18 +- .../listener/AbstractCSEventListenerImpl.java | 18 +- .../services/nuxeo/util/NuxeoUtils.java | 6 +- .../nuxeo/util/ReindexFulltextRoot.java | 10 +- services/imports/service/pom.xml | 10 +- .../services/relation/RelationResource.txt | 3 - .../nuxeo/RelationDocumentModelHandler.java | 8 +- .../nuxeo/ReportDocumentModelHandler.java | 2 +- 68 files changed, 617 insertions(+), 1125 deletions(-) delete mode 100644 3rdparty/nuxeo/nuxeo-platform-thumbnail/src/main/java/org/nuxeo/platform/thumbnail/App.java delete mode 100644 services/authorization-mgt/service/src/main/java/org/collectionspace/services/authorization/PermissionResource.java.txt delete mode 100644 services/authorization-mgt/service/src/main/java/org/collectionspace/services/authorization/storage/PermissionDocumentHandler.java.txt delete mode 100644 services/relation/service/src/main/java/org/collectionspace/services/relation/RelationResource.txt diff --git a/3rdparty/nuxeo/nuxeo-platform-elasticsearch/src/main/java/org/collectionspace/services/nuxeo/elasticsearch/DefaultESDocumentWriter.java b/3rdparty/nuxeo/nuxeo-platform-elasticsearch/src/main/java/org/collectionspace/services/nuxeo/elasticsearch/DefaultESDocumentWriter.java index e9dea8ffed..c8c3f01382 100644 --- a/3rdparty/nuxeo/nuxeo-platform-elasticsearch/src/main/java/org/collectionspace/services/nuxeo/elasticsearch/DefaultESDocumentWriter.java +++ b/3rdparty/nuxeo/nuxeo-platform-elasticsearch/src/main/java/org/collectionspace/services/nuxeo/elasticsearch/DefaultESDocumentWriter.java @@ -12,29 +12,25 @@ import java.util.Map; import java.util.Set; -import javax.ws.rs.core.HttpHeaders; - +import com.fasterxml.jackson.core.JsonGenerator; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.node.IntNode; +import com.fasterxml.jackson.databind.node.ObjectNode; +import com.fasterxml.jackson.databind.node.TextNode; import org.apache.commons.lang3.StringUtils; -import org.codehaus.jackson.JsonGenerator; -import org.codehaus.jackson.JsonNode; -import org.codehaus.jackson.map.ObjectMapper; -import org.codehaus.jackson.node.IntNode; -import org.codehaus.jackson.node.ObjectNode; -import org.codehaus.jackson.node.TextNode; import org.collectionspace.services.common.api.RefNameUtils; -import org.nuxeo.ecm.automation.jaxrs.io.documents.JsonESDocumentWriter; import org.nuxeo.ecm.core.api.CoreSession; import org.nuxeo.ecm.core.api.DocumentModel; import org.nuxeo.ecm.core.api.DocumentModelList; +import org.nuxeo.elasticsearch.io.JsonESDocumentWriter; public class DefaultESDocumentWriter extends JsonESDocumentWriter { - private static ObjectMapper objectMapper = new ObjectMapper(); + private static final ObjectMapper objectMapper = new ObjectMapper(); @Override - public void writeDoc(JsonGenerator jg, DocumentModel doc, String[] schemas, - Map contextParameters, HttpHeaders headers) - throws IOException { - + public void writeESDocument(JsonGenerator jg, DocumentModel doc, String[] schemas, + Map contextParameters) throws IOException { ObjectNode denormValues = getDenormValues(doc); jg.writeStartObject(); @@ -42,7 +38,7 @@ public void writeDoc(JsonGenerator jg, DocumentModel doc, String[] schemas, writeSystemProperties(jg, doc); writeSchemas(jg, doc, schemas); writeContextParameters(jg, doc, contextParameters); - writeDenormValues(jg, doc, denormValues); + writeDenormValues(jg, denormValues); jg.writeEndObject(); jg.flush(); @@ -90,13 +86,13 @@ public ObjectNode getDenormValues(DocumentModel doc) { return denormValues; } - public void writeDenormValues(JsonGenerator jg, DocumentModel doc, ObjectNode denormValues) throws IOException { - if (denormValues != null && denormValues.size() > 0) { + public void writeDenormValues(JsonGenerator jg, ObjectNode denormValues) throws IOException { + if (denormValues != null && !denormValues.isEmpty()) { if (jg.getCodec() == null) { jg.setCodec(objectMapper); } - Iterator> entries = denormValues.getFields(); + Iterator> entries = denormValues.fields(); while (entries.hasNext()) { Map.Entry entry = entries.next(); @@ -112,29 +108,26 @@ private void denormMediaRecords(CoreSession session, String csid, String tenantI String relatedRecordQuery = String.format("SELECT * FROM Relation WHERE relations_common:subjectCsid = '%s' AND relations_common:objectDocumentType = 'Media' AND ecm:currentLifeCycleState = 'project' AND collectionspace_core:tenantId = '%s'", csid, tenantId); DocumentModelList relationDocs = session.query(relatedRecordQuery); - List mediaCsids = new ArrayList(); - List mediaAltTexts = new ArrayList(); + List mediaCsids = new ArrayList<>(); + List mediaAltTexts = new ArrayList<>(); if (relationDocs.size() > 0) { - Iterator iterator = relationDocs.iterator(); + for (DocumentModel relationDoc : relationDocs) { + String mediaCsid = (String) relationDoc.getProperty("relations_common", "objectCsid"); + DocumentModel mediaDoc = getRecordByCsid(session, tenantId, "Media", mediaCsid); - while (iterator.hasNext()) { - DocumentModel relationDoc = iterator.next(); - String mediaCsid = (String) relationDoc.getProperty("relations_common", "objectCsid"); - DocumentModel mediaDoc = getRecordByCsid(session, tenantId, "Media", mediaCsid); + if (isMediaPublished(mediaDoc)) { + mediaCsids.add(new TextNode(mediaCsid)); - if (isMediaPublished(mediaDoc)) { - mediaCsids.add(new TextNode(mediaCsid)); + String altText = (String) mediaDoc.getProperty("media_common", "altText"); - String altText = (String) mediaDoc.getProperty("media_common", "altText"); + if (altText == null) { + altText = ""; + } - if (altText == null) { - altText = ""; - } - - mediaAltTexts.add(new TextNode(altText)); - } - } + mediaAltTexts.add(new TextNode(altText)); + } + } } denormValues.putArray("mediaCsid").addAll(mediaCsids); @@ -149,19 +142,16 @@ private void denormRelatedObjects(CoreSession session, String csid, String tenan "SELECT * FROM Relation WHERE relations_common:objectCsid = '%s' AND relations_common:subjectDocumentType = 'CollectionObject' AND ecm:currentLifeCycleState = 'project' AND collectionspace_core:tenantId = '%s'", csid, tenantId); DocumentModelList relationDocs = session.query(relatedRecordQuery); - List objectCsids = new ArrayList(); + List objectCsids = new ArrayList<>(); if (relationDocs.size() > 0) { - Iterator iterator = relationDocs.iterator(); - - while (iterator.hasNext()) { - DocumentModel relationDoc = iterator.next(); - String objectCsid = (String) relationDoc.getProperty("relations_common", "subjectCsid"); + for (DocumentModel relationDoc : relationDocs) { + String objectCsid = (String) relationDoc.getProperty("relations_common", "subjectCsid"); - if (objectCsid != null) { - objectCsids.add(new TextNode(objectCsid)); - } - } + if (objectCsid != null) { + objectCsids.add(new TextNode(objectCsid)); + } + } } denormValues.putArray("objectCsid").addAll(objectCsids); @@ -172,20 +162,17 @@ private void denormAcquisitionRecords(CoreSession session, String csid, String t String relatedRecordQuery = String.format("SELECT * FROM Relation WHERE relations_common:subjectCsid = '%s' AND relations_common:objectDocumentType = 'Acquisition' AND ecm:currentLifeCycleState = 'project' AND collectionspace_core:tenantId = '%s'", csid, tenantId); DocumentModelList relationDocs = session.query(relatedRecordQuery); - List creditLines = new ArrayList(); + List creditLines = new ArrayList<>(); if (relationDocs.size() > 0) { - Iterator iterator = relationDocs.iterator(); - - while (iterator.hasNext()) { - DocumentModel relationDoc = iterator.next(); - String acquisitionCsid = (String) relationDoc.getProperty("relations_common", "objectCsid"); - String creditLine = getCreditLine(session, tenantId, acquisitionCsid); - - if (creditLine != null && creditLine.length() > 0) { - creditLines.add(new TextNode(creditLine)); - } - } + for (DocumentModel relationDoc : relationDocs) { + String acquisitionCsid = (String) relationDoc.getProperty("relations_common", "objectCsid"); + String creditLine = getCreditLine(session, tenantId, acquisitionCsid); + + if (creditLine != null && !creditLine.isEmpty()) { + creditLines.add(new TextNode(creditLine)); + } + } } denormValues.putArray("creditLine").addAll(creditLines); @@ -196,30 +183,27 @@ private void denormExhibitionRecords(CoreSession session, String csid, String te String relatedRecordQuery = String.format("SELECT * FROM Relation WHERE relations_common:subjectCsid = '%s' AND relations_common:objectDocumentType = 'Exhibition' AND ecm:currentLifeCycleState = 'project' AND collectionspace_core:tenantId = '%s'", csid, tenantId); DocumentModelList relationDocs = session.query(relatedRecordQuery); - List exhibitions = new ArrayList(); + List exhibitions = new ArrayList<>(); if (relationDocs.size() > 0) { - Iterator iterator = relationDocs.iterator(); + for (DocumentModel relationDoc : relationDocs) { + String exhibitionCsid = (String) relationDoc.getProperty("relations_common", "objectCsid"); + DocumentModel exhibitionDoc = getRecordByCsid(session, tenantId, "Exhibition", exhibitionCsid); - while (iterator.hasNext()) { - DocumentModel relationDoc = iterator.next(); - String exhibitionCsid = (String) relationDoc.getProperty("relations_common", "objectCsid"); - DocumentModel exhibitionDoc = getRecordByCsid(session, tenantId, "Exhibition", exhibitionCsid); + if (exhibitionDoc != null && isExhibitionPublished(exhibitionDoc)) { + ObjectNode exhibitionNode = objectMapper.createObjectNode(); - if (exhibitionDoc != null && isExhibitionPublished(exhibitionDoc)) { - ObjectNode exhibitionNode = objectMapper.createObjectNode(); + String title = (String) exhibitionDoc.getProperty("exhibitions_common", "title"); + String generalNote = (String) exhibitionDoc.getProperty("exhibitions_common", "generalNote"); + String curatorialNote = (String) exhibitionDoc.getProperty("exhibitions_common", "curatorialNote"); - String title = (String) exhibitionDoc.getProperty("exhibitions_common", "title"); - String generalNote = (String) exhibitionDoc.getProperty("exhibitions_common", "generalNote"); - String curatorialNote = (String) exhibitionDoc.getProperty("exhibitions_common", "curatorialNote"); + exhibitionNode.put("title", title); + exhibitionNode.put("generalNote", generalNote); + exhibitionNode.put("curatorialNote", curatorialNote); - exhibitionNode.put("title", title); - exhibitionNode.put("generalNote", generalNote); - exhibitionNode.put("curatorialNote", curatorialNote); - - exhibitions.add(exhibitionNode); - } - } + exhibitions.add(exhibitionNode); + } + } } denormValues.putArray("exhibition").addAll(exhibitions); @@ -376,15 +360,14 @@ private boolean isPublished(DocumentModel doc, String publishedFieldPart, String List publishToValues = (List) doc.getProperty(publishedFieldPart, publishedFieldName); if (publishToValues != null) { - for (int i=0; i structDateToYearNodes(Map structDate) { } protected List structDatesToYearNodes(List> structDates) { - Set years = new HashSet(); + Set years = new HashSet<>(); for (Map structDate : structDates) { if (structDate != null) { @@ -440,8 +423,8 @@ protected List structDatesToYearNodes(List> struct // Subtract one day to make it inclusive. latestCalendar.add(Calendar.DATE, -1); - Integer earliestYear = earliestCalendar.get(Calendar.YEAR); - Integer latestYear = latestCalendar.get(Calendar.YEAR);; + int earliestYear = earliestCalendar.get(Calendar.YEAR); + int latestYear = latestCalendar.get(Calendar.YEAR); for (int year = earliestYear; year <= latestYear; year++) { years.add(year); @@ -450,10 +433,10 @@ protected List structDatesToYearNodes(List> struct } } - List yearList = new ArrayList(years); + List yearList = new ArrayList<>(years); Collections.sort(yearList); - List yearNodes = new ArrayList(); + List yearNodes = new ArrayList<>(); for (Integer year : yearList) { yearNodes.add(new IntNode(year)); diff --git a/3rdparty/nuxeo/nuxeo-platform-elasticsearch/src/main/java/org/collectionspace/services/nuxeo/elasticsearch/TenantConfiguredESDocumentWriter.java b/3rdparty/nuxeo/nuxeo-platform-elasticsearch/src/main/java/org/collectionspace/services/nuxeo/elasticsearch/TenantConfiguredESDocumentWriter.java index eceecc58a2..ecb28d750f 100644 --- a/3rdparty/nuxeo/nuxeo-platform-elasticsearch/src/main/java/org/collectionspace/services/nuxeo/elasticsearch/TenantConfiguredESDocumentWriter.java +++ b/3rdparty/nuxeo/nuxeo-platform-elasticsearch/src/main/java/org/collectionspace/services/nuxeo/elasticsearch/TenantConfiguredESDocumentWriter.java @@ -3,31 +3,25 @@ import java.io.IOException; import java.util.Map; -import javax.ws.rs.core.HttpHeaders; - +import com.fasterxml.jackson.core.JsonGenerator; import org.apache.commons.lang3.StringUtils; -import org.codehaus.jackson.JsonGenerator; import org.collectionspace.services.client.CollectionSpaceClient; import org.collectionspace.services.common.ServiceMain; import org.collectionspace.services.common.config.TenantBindingConfigReaderImpl; import org.collectionspace.services.config.service.ServiceBindingType; import org.collectionspace.services.config.tenant.TenantBindingType; -import org.nuxeo.ecm.automation.jaxrs.io.documents.JsonESDocumentWriter; import org.nuxeo.ecm.core.api.DocumentModel; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import org.nuxeo.elasticsearch.io.JsonESDocumentWriter; /** * A JsonESDocumentWriter that delegates to the class that is specified in the * CSpace tenant binding file for the current tenant. */ public class TenantConfiguredESDocumentWriter extends JsonESDocumentWriter { - final Logger logger = LoggerFactory.getLogger(TenantConfiguredESDocumentWriter.class); @Override - public void writeDoc(JsonGenerator jg, DocumentModel doc, String[] schemas, Map contextParameters, - HttpHeaders headers) throws IOException { - + public void writeESDocument(JsonGenerator jg, DocumentModel doc, String[] schemas, + Map contextParameters) throws IOException { String tenantId = (String) doc.getProperty(CollectionSpaceClient.COLLECTIONSPACE_CORE_SCHEMA, CollectionSpaceClient.COLLECTIONSPACE_CORE_TENANTID); if (tenantId == null) { @@ -80,7 +74,7 @@ public void writeDoc(JsonGenerator jg, DocumentModel doc, String[] schemas, Map< throw new IOException(msg, e); } - documentWriter.writeDoc(jg, doc, schemas, contextParameters, headers); + documentWriter.writeESDocument(jg, doc, schemas, contextParameters); } private void writeEmptyDoc(JsonGenerator jg) throws IOException { diff --git a/3rdparty/nuxeo/nuxeo-platform-elasticsearch/src/main/java/org/collectionspace/services/nuxeo/elasticsearch/anthro/AnthroESDocumentWriter.java b/3rdparty/nuxeo/nuxeo-platform-elasticsearch/src/main/java/org/collectionspace/services/nuxeo/elasticsearch/anthro/AnthroESDocumentWriter.java index d41557eefe..bc35155bf9 100644 --- a/3rdparty/nuxeo/nuxeo-platform-elasticsearch/src/main/java/org/collectionspace/services/nuxeo/elasticsearch/anthro/AnthroESDocumentWriter.java +++ b/3rdparty/nuxeo/nuxeo-platform-elasticsearch/src/main/java/org/collectionspace/services/nuxeo/elasticsearch/anthro/AnthroESDocumentWriter.java @@ -3,8 +3,8 @@ import java.util.List; import java.util.Map; +import com.fasterxml.jackson.databind.node.ObjectNode; import org.apache.commons.lang3.StringUtils; -import org.codehaus.jackson.node.ObjectNode; import org.collectionspace.services.common.api.RefNameUtils; import org.collectionspace.services.nuxeo.elasticsearch.DefaultESDocumentWriter; import org.nuxeo.ecm.core.api.DocumentModel; diff --git a/3rdparty/nuxeo/nuxeo-platform-elasticsearch/src/main/java/org/collectionspace/services/nuxeo/elasticsearch/materials/MaterialsESDocumentWriter.java b/3rdparty/nuxeo/nuxeo-platform-elasticsearch/src/main/java/org/collectionspace/services/nuxeo/elasticsearch/materials/MaterialsESDocumentWriter.java index 9ce7b84f37..1916cc5ab3 100644 --- a/3rdparty/nuxeo/nuxeo-platform-elasticsearch/src/main/java/org/collectionspace/services/nuxeo/elasticsearch/materials/MaterialsESDocumentWriter.java +++ b/3rdparty/nuxeo/nuxeo-platform-elasticsearch/src/main/java/org/collectionspace/services/nuxeo/elasticsearch/materials/MaterialsESDocumentWriter.java @@ -2,19 +2,16 @@ import java.util.ArrayList; import java.util.Collection; -import java.util.Iterator; import java.util.LinkedHashSet; import java.util.List; import java.util.Map; import java.util.Set; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.node.ObjectNode; +import com.fasterxml.jackson.databind.node.TextNode; import org.apache.commons.lang3.StringUtils; - -import org.codehaus.jackson.JsonNode; -import org.codehaus.jackson.map.ObjectMapper; -import org.codehaus.jackson.node.ObjectNode; -import org.codehaus.jackson.node.TextNode; - import org.collectionspace.services.common.api.RefNameUtils; import org.collectionspace.services.nuxeo.elasticsearch.DefaultESDocumentWriter; import org.nuxeo.ecm.core.api.CoreSession; @@ -71,12 +68,12 @@ public ObjectNode getDenormValues(DocumentModel doc) { // Combine term creator organizations and term editor organizations into a holding // institutions field. - Set holdingInstitutions = new LinkedHashSet(); + Set holdingInstitutions = new LinkedHashSet<>(); holdingInstitutions.addAll(getTermAttributionContributors(doc)); holdingInstitutions.addAll(getTermAttributionEditors(doc)); - if (holdingInstitutions.size() > 0) { + if (!holdingInstitutions.isEmpty()) { denormValues.putArray("holdingInstitutions").addAll(jsonNodes(holdingInstitutions)); } } @@ -151,29 +148,25 @@ private void denormMediaRecords(CoreSession session, String refName, String tena String escapedRefName = refName.replace("'", "\\'"); String mediaQuery = String.format("SELECT * FROM Media WHERE media_common:coverage = '%s' AND ecm:currentLifeCycleState = 'project' AND collectionspace_core:tenantId = '%s' ORDER BY media_common:identificationNumber", escapedRefName, tenantId); DocumentModelList mediaDocs = session.query(mediaQuery); - List mediaCsids = new ArrayList(); - List mediaAltTexts = new ArrayList(); + List mediaCsids = new ArrayList<>(); + List mediaAltTexts = new ArrayList<>(); if (mediaDocs.size() > 0) { - Iterator iterator = mediaDocs.iterator(); - - while (iterator.hasNext()) { - DocumentModel mediaDoc = iterator.next(); + for (DocumentModel mediaDoc : mediaDocs) { + if (isMediaPublished(mediaDoc)) { + String mediaCsid = mediaDoc.getName(); - if (isMediaPublished(mediaDoc)) { - String mediaCsid = (String) mediaDoc.getName(); + mediaCsids.add(new TextNode(mediaCsid)); - mediaCsids.add(new TextNode(mediaCsid)); + String altText = (String) mediaDoc.getProperty("media_common", "altText"); - String altText = (String) mediaDoc.getProperty("media_common", "altText"); + if (altText == null) { + altText = ""; + } - if (altText == null) { - altText = ""; - } - - mediaAltTexts.add(new TextNode(altText)); - } - } + mediaAltTexts.add(new TextNode(altText)); + } + } } denormValues.putArray("mediaCsid").addAll(mediaCsids); @@ -194,7 +187,7 @@ protected String computeTitle(DocumentModel doc) { } private List findTermDisplayNamesWithFlag(List> termGroups, String flagShortId) { - List termDisplayNames = new ArrayList(); + List termDisplayNames = new ArrayList<>(); for (Map termGroup : termGroups) { String termFlag = (String) termGroup.get("termFlag"); @@ -212,7 +205,7 @@ private List findTermDisplayNamesWithFlag(List> term } private Set getTermAttributionContributors(DocumentModel doc) { - Set orgs = new LinkedHashSet(); + Set orgs = new LinkedHashSet<>(); List> groups = (List>) doc.getProperty("materials_common", "materialTermAttributionContributingGroupList"); @@ -228,7 +221,7 @@ private Set getTermAttributionContributors(DocumentModel doc) { } private Set getTermAttributionEditors(DocumentModel doc) { - Set orgs = new LinkedHashSet(); + Set orgs = new LinkedHashSet<>(); List> groups = (List>) doc.getProperty("materials_common", "materialTermAttributionEditingGroupList"); @@ -248,29 +241,25 @@ private boolean isMediaPublished(DocumentModel mediaDoc) { boolean isPublished = false; if (publishToValues != null) { - for (int i=0; i jsonNodes(Collection values) { - List nodes = new ArrayList(); - Iterator iterator = values.iterator(); - - while (iterator.hasNext()) { - String value = iterator.next(); + List nodes = new ArrayList<>(); - nodes.add(new TextNode(value)); - } + for (String value : values) { + nodes.add(new TextNode(value)); + } return nodes; } diff --git a/3rdparty/nuxeo/nuxeo-platform-listener/naturalhistory/pom.xml b/3rdparty/nuxeo/nuxeo-platform-listener/naturalhistory/pom.xml index e441c1940b..c7afb986f5 100644 --- a/3rdparty/nuxeo/nuxeo-platform-listener/naturalhistory/pom.xml +++ b/3rdparty/nuxeo/nuxeo-platform-listener/naturalhistory/pom.xml @@ -21,11 +21,6 @@ org.nuxeo.ecm.core nuxeo-core-storage-sql - - org.nuxeo.ecm.platform - nuxeo-platform-filemanager-api - ${nuxeo.platform.version} - org.collectionspace.services org.collectionspace.services.taxonomy.service diff --git a/3rdparty/nuxeo/nuxeo-platform-listener/naturalhistory/src/main/java/org/collectionspace/services/listener/naturalhistory/UpdateFormattedDisplayNameListener.java b/3rdparty/nuxeo/nuxeo-platform-listener/naturalhistory/src/main/java/org/collectionspace/services/listener/naturalhistory/UpdateFormattedDisplayNameListener.java index 5416b4480f..5e9b2ebb29 100644 --- a/3rdparty/nuxeo/nuxeo-platform-listener/naturalhistory/src/main/java/org/collectionspace/services/listener/naturalhistory/UpdateFormattedDisplayNameListener.java +++ b/3rdparty/nuxeo/nuxeo-platform-listener/naturalhistory/src/main/java/org/collectionspace/services/listener/naturalhistory/UpdateFormattedDisplayNameListener.java @@ -114,7 +114,7 @@ private void updateFormattedDisplayNames(DocumentModel doc, DocumentModel previo } /* - private Set getDisplayNames(DocumentModel doc) throws ClientException { + private Set getDisplayNames(DocumentModel doc) throws NuxeoException { Set displayNames = new HashSet(); List> termGroupList = (List>) doc.getProperty(TaxonConstants.DISPLAY_NAME_SCHEMA_NAME, TERM_GROUP_LIST_FIELD_NAME); diff --git a/3rdparty/nuxeo/nuxeo-platform-listener/pom.xml b/3rdparty/nuxeo/nuxeo-platform-listener/pom.xml index 4d32c0ddf3..b959084a53 100644 --- a/3rdparty/nuxeo/nuxeo-platform-listener/pom.xml +++ b/3rdparty/nuxeo/nuxeo-platform-listener/pom.xml @@ -31,17 +31,6 @@ org.nuxeo.ecm.core nuxeo-core-storage-sql - - org.nuxeo.ecm.platform - nuxeo-platform-filemanager-api - ${nuxeo.platform.version} - - - org.nuxeo.ecm.platform - nuxeo-platform-imaging-api - ${nuxeo.platform.version} - provided - diff --git a/3rdparty/nuxeo/nuxeo-platform-listener/tenants/botgarden/pom.xml b/3rdparty/nuxeo/nuxeo-platform-listener/tenants/botgarden/pom.xml index d632e1e604..5d2a6e2fdf 100644 --- a/3rdparty/nuxeo/nuxeo-platform-listener/tenants/botgarden/pom.xml +++ b/3rdparty/nuxeo/nuxeo-platform-listener/tenants/botgarden/pom.xml @@ -21,13 +21,8 @@ org.nuxeo.ecm.core nuxeo-core-storage-sql - ${nuxeo.core.version} + ${nuxeo.general.release} - - org.nuxeo.ecm.platform - nuxeo-platform-filemanager-api - ${nuxeo.platform.version} - org.collectionspace.services org.collectionspace.services.collectionobject.service @@ -68,5 +63,5 @@ - + diff --git a/3rdparty/nuxeo/nuxeo-platform-listener/tenants/pom.xml b/3rdparty/nuxeo/nuxeo-platform-listener/tenants/pom.xml index 3d7de3cda0..63f9f6fcf0 100644 --- a/3rdparty/nuxeo/nuxeo-platform-listener/tenants/pom.xml +++ b/3rdparty/nuxeo/nuxeo-platform-listener/tenants/pom.xml @@ -26,17 +26,6 @@ org.nuxeo.ecm.core nuxeo-core-storage-sql - - org.nuxeo.ecm.platform - nuxeo-platform-filemanager-api - ${nuxeo.platform.version} - - - org.nuxeo.ecm.platform - nuxeo-platform-imaging-api - ${nuxeo.platform.version} - provided - diff --git a/3rdparty/nuxeo/nuxeo-platform-listener/updateimagederivatives/pom.xml b/3rdparty/nuxeo/nuxeo-platform-listener/updateimagederivatives/pom.xml index c818a6ae24..23107f5dc9 100644 --- a/3rdparty/nuxeo/nuxeo-platform-listener/updateimagederivatives/pom.xml +++ b/3rdparty/nuxeo/nuxeo-platform-listener/updateimagederivatives/pom.xml @@ -15,7 +15,7 @@ org.collectionspace.services.listener.updateimagederivatives http://maven.apache.org - + org.collectionspace.services @@ -32,8 +32,12 @@ org.collectionspace.services.client ${project.version} + + org.nuxeo.ecm.platform + nuxeo-platform-imaging-core + - + diff --git a/3rdparty/nuxeo/nuxeo-platform-listener/updateobjectlocationonmove/src/main/java/org/collectionspace/services/listener/AbstractUpdateObjectLocationValues.java b/3rdparty/nuxeo/nuxeo-platform-listener/updateobjectlocationonmove/src/main/java/org/collectionspace/services/listener/AbstractUpdateObjectLocationValues.java index dd6874c787..ab28507041 100644 --- a/3rdparty/nuxeo/nuxeo-platform-listener/updateobjectlocationonmove/src/main/java/org/collectionspace/services/listener/AbstractUpdateObjectLocationValues.java +++ b/3rdparty/nuxeo/nuxeo-platform-listener/updateobjectlocationonmove/src/main/java/org/collectionspace/services/listener/AbstractUpdateObjectLocationValues.java @@ -16,7 +16,7 @@ import org.collectionspace.services.nuxeo.listener.AbstractCSEventSyncListenerImpl; import org.collectionspace.services.nuxeo.util.NuxeoUtils; -import org.nuxeo.ecm.core.api.ClientException; +import org.nuxeo.ecm.core.api.NuxeoException; import org.nuxeo.ecm.core.api.DocumentModel; import org.nuxeo.ecm.core.api.DocumentModelList; import org.nuxeo.ecm.core.api.event.DocumentEventTypes; @@ -222,13 +222,13 @@ private void persistLocationChange(CoreSessionInterface session, DocumentModel c * * @param movementCsid the CSID of a Movement record. * @param coreSession a repository session. - * @throws ClientException + * @throws NuxeoException * @return the CSIDs of the CollectionObject records, if any, which are * related to the Movement record. * @throws DocumentException */ private Set getCollectionObjectCsidsRelatedToMovement(String movementCsid, - CoreSessionInterface coreSession) throws ClientException { + CoreSessionInterface coreSession) throws NuxeoException { Set csids = new HashSet<>(); @@ -323,14 +323,14 @@ private static boolean isCreatingNewRelationship(Event event) { * deletion, or of a Movement record referenced by a Relation record slated * for deletion. This record should be filtered out, prior to returning the * most recent Movement record. - * @throws ClientException + * @throws NuxeoException * @return the most recent Movement record related to the CollectionObject * identified by the supplied CSID. * @throws DocumentException */ protected DocumentModel getMostRecentMovement(Event event, CoreSessionInterface session, String collectionObjectCsid, - boolean isAboutToBeRemovedEvent, String eventMovementCsid) throws ClientException { + boolean isAboutToBeRemovedEvent, String eventMovementCsid) throws NuxeoException { DocumentModel result = null; // @@ -568,7 +568,7 @@ private static boolean existsInResultList(DocumentModelList relationDocModelList * @param relationDocModel a document model for a Relation record. * @param desiredDocType a desired document type. * @param relatedDocType a related document type. - * @throws ClientException + * @throws NuxeoException * * @return the CSID from the desired document type in the relation. Returns * null if the Relation record does not involve both the desired @@ -600,7 +600,7 @@ protected static String getCsidForDesiredDocTypeFromRelation(DocumentModel relat * @param movementDocModel a document model for a Movement record. * @return a potentially updated document model for the CollectionObject * record. - * @throws ClientException + * @throws NuxeoException */ protected abstract boolean updateCollectionObjectLocation(DocumentModel collectionObjectDocModel, DocumentModel movementDocModel, diff --git a/3rdparty/nuxeo/nuxeo-platform-listener/updateobjectlocationonmove/src/main/java/org/collectionspace/services/listener/UpdateObjectLocationAndCrateOnMove.java b/3rdparty/nuxeo/nuxeo-platform-listener/updateobjectlocationonmove/src/main/java/org/collectionspace/services/listener/UpdateObjectLocationAndCrateOnMove.java index af971f0556..7e71ea4850 100644 --- a/3rdparty/nuxeo/nuxeo-platform-listener/updateobjectlocationonmove/src/main/java/org/collectionspace/services/listener/UpdateObjectLocationAndCrateOnMove.java +++ b/3rdparty/nuxeo/nuxeo-platform-listener/updateobjectlocationonmove/src/main/java/org/collectionspace/services/listener/UpdateObjectLocationAndCrateOnMove.java @@ -7,7 +7,7 @@ import org.collectionspace.services.common.api.RefNameUtils; import org.collectionspace.services.common.api.Tools; -import org.nuxeo.ecm.core.api.ClientException; +import org.nuxeo.ecm.core.api.NuxeoException; import org.nuxeo.ecm.core.api.DocumentModel; public class UpdateObjectLocationAndCrateOnMove extends UpdateObjectLocationOnMove { @@ -25,7 +25,7 @@ public class UpdateObjectLocationAndCrateOnMove extends UpdateObjectLocationOnMo @Override protected boolean updateCollectionObjectLocation(DocumentModel collectionObjectDocModel, DocumentModel movementDocModel, - DocumentModel mostRecentMovementDocumentModel) throws ClientException { + DocumentModel mostRecentMovementDocumentModel) throws NuxeoException { boolean locationChanged = super.updateCollectionObjectLocation(collectionObjectDocModel, movementDocModel, mostRecentMovementDocumentModel); boolean crateChanged = updateComputedCrateValue(collectionObjectDocModel, mostRecentMovementDocumentModel); @@ -34,7 +34,7 @@ protected boolean updateCollectionObjectLocation(DocumentModel collectionObjectD } private boolean updateComputedCrateValue(DocumentModel collectionObjectDocModel, - DocumentModel movementDocModel) throws ClientException { + DocumentModel movementDocModel) throws NuxeoException { boolean result = false; String crateRefName = null; diff --git a/3rdparty/nuxeo/nuxeo-platform-listener/updateobjectlocationonmove/src/main/java/org/collectionspace/services/listener/UpdateObjectLocationOnMove.java b/3rdparty/nuxeo/nuxeo-platform-listener/updateobjectlocationonmove/src/main/java/org/collectionspace/services/listener/UpdateObjectLocationOnMove.java index e430447ee6..cfe6149a1f 100644 --- a/3rdparty/nuxeo/nuxeo-platform-listener/updateobjectlocationonmove/src/main/java/org/collectionspace/services/listener/UpdateObjectLocationOnMove.java +++ b/3rdparty/nuxeo/nuxeo-platform-listener/updateobjectlocationonmove/src/main/java/org/collectionspace/services/listener/UpdateObjectLocationOnMove.java @@ -6,7 +6,7 @@ import org.collectionspace.services.common.api.RefNameUtils; import org.collectionspace.services.common.api.Tools; -import org.nuxeo.ecm.core.api.ClientException; +import org.nuxeo.ecm.core.api.NuxeoException; import org.nuxeo.ecm.core.api.DocumentModel; public class UpdateObjectLocationOnMove extends AbstractUpdateObjectLocationValues { @@ -16,7 +16,7 @@ public class UpdateObjectLocationOnMove extends AbstractUpdateObjectLocationValu @Override protected boolean updateCollectionObjectLocation(DocumentModel collectionObjectDocModel, DocumentModel movementDocModel, //FIXME: Not needed? - DocumentModel mostRecentMovementDocumentModel) throws ClientException { + DocumentModel mostRecentMovementDocumentModel) throws NuxeoException { boolean result = false; // diff --git a/3rdparty/nuxeo/nuxeo-platform-quote-api/pom.xml b/3rdparty/nuxeo/nuxeo-platform-quote-api/pom.xml index a06e4511db..58d26825a6 100644 --- a/3rdparty/nuxeo/nuxeo-platform-quote-api/pom.xml +++ b/3rdparty/nuxeo/nuxeo-platform-quote-api/pom.xml @@ -19,7 +19,7 @@ org.nuxeo.ecm.core nuxeo-core-api - ${nuxeo.core.version} + ${nuxeo.general.release} diff --git a/3rdparty/nuxeo/nuxeo-platform-quote-api/src/main/java/org/collectionspace/ecm/platform/quote/api/QuoteManager.java b/3rdparty/nuxeo/nuxeo-platform-quote-api/src/main/java/org/collectionspace/ecm/platform/quote/api/QuoteManager.java index 7d4dad5f6b..485f41404c 100644 --- a/3rdparty/nuxeo/nuxeo-platform-quote-api/src/main/java/org/collectionspace/ecm/platform/quote/api/QuoteManager.java +++ b/3rdparty/nuxeo/nuxeo-platform-quote-api/src/main/java/org/collectionspace/ecm/platform/quote/api/QuoteManager.java @@ -21,7 +21,7 @@ import java.util.List; -import org.nuxeo.ecm.core.api.ClientException; +import org.nuxeo.ecm.core.api.NuxeoException; import org.nuxeo.ecm.core.api.DocumentModel; /** @@ -31,10 +31,10 @@ public interface QuoteManager { List getQuotes(DocumentModel docModel) - throws ClientException; + throws NuxeoException; List getQuotes(DocumentModel docModel, DocumentModel parent) - throws ClientException; + throws NuxeoException; /** * @deprecated CommentManager cannot find the author if invoked remotely so @@ -42,7 +42,7 @@ List getQuotes(DocumentModel docModel, DocumentModel parent) */ @Deprecated DocumentModel createQuote(DocumentModel docModel, String quote) - throws ClientException; + throws NuxeoException; /** * Creates a comment document model, filling its properties with given info @@ -52,29 +52,29 @@ DocumentModel createQuote(DocumentModel docModel, String quote) * @param comment the comment content * @param author the comment author * @return the comment document model. - * @throws ClientException + * @throws NuxeoException */ DocumentModel createQuote(DocumentModel docModel, String comment, - String author) throws ClientException; + String author) throws NuxeoException; DocumentModel createQuote(DocumentModel docModel, DocumentModel comment) - throws ClientException; + throws NuxeoException; DocumentModel createQuote(DocumentModel docModel, DocumentModel parent, - DocumentModel child) throws ClientException; + DocumentModel child) throws NuxeoException; void deleteQuote(DocumentModel docModel, DocumentModel comment) - throws ClientException; + throws NuxeoException; /** * Gets documents in relation with a particular comment. * * @param quote the comment * @return the list of documents - * @throws ClientException + * @throws NuxeoException */ List getDocumentsForQuote(DocumentModel quote) - throws ClientException; + throws NuxeoException; /** * Creates a comment document model. It gives opportunity to save the comments in a @@ -84,9 +84,9 @@ List getDocumentsForQuote(DocumentModel quote) * @param quote the comment content * @param path the location path * @return the comment document model. - * @throws ClientException + * @throws NuxeoException */ DocumentModel createLocatedQuote(DocumentModel docModel, - DocumentModel quote, String path) throws ClientException; + DocumentModel quote, String path) throws NuxeoException; } diff --git a/3rdparty/nuxeo/nuxeo-platform-quote-api/src/main/java/org/collectionspace/ecm/platform/quote/api/QuoteableDocument.java b/3rdparty/nuxeo/nuxeo-platform-quote-api/src/main/java/org/collectionspace/ecm/platform/quote/api/QuoteableDocument.java index 80e82ddd30..9a6e599948 100644 --- a/3rdparty/nuxeo/nuxeo-platform-quote-api/src/main/java/org/collectionspace/ecm/platform/quote/api/QuoteableDocument.java +++ b/3rdparty/nuxeo/nuxeo-platform-quote-api/src/main/java/org/collectionspace/ecm/platform/quote/api/QuoteableDocument.java @@ -22,7 +22,7 @@ import java.io.Serializable; import java.util.List; -import org.nuxeo.ecm.core.api.ClientException; +import org.nuxeo.ecm.core.api.NuxeoException; import org.nuxeo.ecm.core.api.DocumentModel; /** @@ -36,38 +36,38 @@ public interface QuoteableDocument extends Serializable { * * @return the list of comments */ - List getQuotes() throws ClientException; + List getQuotes() throws NuxeoException; /** * Returns the comments for this document that are replied to a parent comment. * * @param parent the parent comment * @return the comments for the parent comment - * @throws ClientException + * @throws NuxeoException */ - List getQuotes(DocumentModel parent) throws ClientException; + List getQuotes(DocumentModel parent) throws NuxeoException; /** * Removes a comment from the document comment list. * * @param comment */ - void removeQuote(DocumentModel comment) throws ClientException; + void removeQuote(DocumentModel comment) throws NuxeoException; /** * Creates a new comment. * * @param comment */ - DocumentModel addQuote(DocumentModel comment) throws ClientException; + DocumentModel addQuote(DocumentModel comment) throws NuxeoException; /** * Creates a new comment as a reply to an existing comment. * * @param parent the parent comment, which must exist * @param comment the comment to be added - * @throws ClientException + * @throws NuxeoException */ - DocumentModel addQuote(DocumentModel parent, DocumentModel comment) throws ClientException; + DocumentModel addQuote(DocumentModel parent, DocumentModel comment) throws NuxeoException; } diff --git a/3rdparty/nuxeo/nuxeo-platform-quote-api/src/main/java/org/collectionspace/ecm/platform/quote/impl/QuoteableDocumentAdapter.java b/3rdparty/nuxeo/nuxeo-platform-quote-api/src/main/java/org/collectionspace/ecm/platform/quote/impl/QuoteableDocumentAdapter.java index 9a8117d281..80212b59c0 100644 --- a/3rdparty/nuxeo/nuxeo-platform-quote-api/src/main/java/org/collectionspace/ecm/platform/quote/impl/QuoteableDocumentAdapter.java +++ b/3rdparty/nuxeo/nuxeo-platform-quote-api/src/main/java/org/collectionspace/ecm/platform/quote/impl/QuoteableDocumentAdapter.java @@ -21,7 +21,7 @@ import java.util.List; -import org.nuxeo.ecm.core.api.ClientException; +import org.nuxeo.ecm.core.api.NuxeoException; import org.nuxeo.ecm.core.api.DocumentModel; import org.collectionspace.ecm.platform.quote.api.QuoteManager; import org.collectionspace.ecm.platform.quote.api.QuoteableDocument; @@ -50,37 +50,37 @@ private static QuoteManager getQuoteManager() { } @Override - public DocumentModel addQuote(DocumentModel comment) throws ClientException { + public DocumentModel addQuote(DocumentModel comment) throws NuxeoException { QuoteManager quoteManager = getQuoteManager(); return quoteManager.createQuote(docModel, comment); } @Deprecated - public DocumentModel addQuote(String comment) throws ClientException { + public DocumentModel addQuote(String comment) throws NuxeoException { QuoteManager quoteManager = getQuoteManager(); return quoteManager.createQuote(docModel, comment); } @Override - public DocumentModel addQuote(DocumentModel parent, DocumentModel comment) throws ClientException { + public DocumentModel addQuote(DocumentModel parent, DocumentModel comment) throws NuxeoException { QuoteManager quoteManager = getQuoteManager(); return quoteManager.createQuote(docModel, parent, comment); } @Override - public void removeQuote(DocumentModel comment) throws ClientException { + public void removeQuote(DocumentModel comment) throws NuxeoException { QuoteManager quoteManager = getQuoteManager(); quoteManager.deleteQuote(docModel, comment); } @Override - public List getQuotes() throws ClientException { + public List getQuotes() throws NuxeoException { QuoteManager quoteManager = getQuoteManager(); return quoteManager.getQuotes(docModel); } @Override - public List getQuotes(DocumentModel parent) throws ClientException { + public List getQuotes(DocumentModel parent) throws NuxeoException { QuoteManager quoteManager = getQuoteManager(); return quoteManager.getQuotes(docModel, parent); } diff --git a/3rdparty/nuxeo/nuxeo-platform-quote-api/src/main/java/org/collectionspace/ecm/platform/quote/workflow/services/QuotesModerationService.java b/3rdparty/nuxeo/nuxeo-platform-quote-api/src/main/java/org/collectionspace/ecm/platform/quote/workflow/services/QuotesModerationService.java index 65953e34c5..d00ceda2c3 100644 --- a/3rdparty/nuxeo/nuxeo-platform-quote-api/src/main/java/org/collectionspace/ecm/platform/quote/workflow/services/QuotesModerationService.java +++ b/3rdparty/nuxeo/nuxeo-platform-quote-api/src/main/java/org/collectionspace/ecm/platform/quote/workflow/services/QuotesModerationService.java @@ -18,7 +18,7 @@ import java.util.ArrayList; -import org.nuxeo.ecm.core.api.ClientException; +import org.nuxeo.ecm.core.api.NuxeoException; import org.nuxeo.ecm.core.api.CoreSession; import org.nuxeo.ecm.core.api.DocumentModel; @@ -30,11 +30,11 @@ public interface QuotesModerationService { * @param session the coreSession * @param document the document were the comment is posted * @param commentId the commentId - * @throws ClientException + * @throws NuxeoException */ void startModeration(CoreSession session, DocumentModel document, String commentId, ArrayList moderators) - throws ClientException; + throws NuxeoException; /** * Gets the moderation process for the given Comment posted on a documentModel. @@ -42,12 +42,12 @@ void startModeration(CoreSession session, DocumentModel document, * @param session the coreSession * @param document the document were the comment is posted * @param commentId the commentId - * @throws ClientException + * @throws NuxeoException */ /** ProcessInstance getModerationProcess(JbpmService jbpmService, CoreSessionInterface session, DocumentModel doc, String commentId) - throws ClientException; + throws NuxeoException; **/ /** @@ -56,10 +56,10 @@ ProcessInstance getModerationProcess(JbpmService jbpmService, * @param session the coreSession * @param document the document were the comment is posted * @param commentId the commentId - * @throws ClientException + * @throws NuxeoException */ void approveQuote(CoreSession session, DocumentModel document, - String commentId) throws ClientException; + String commentId) throws NuxeoException; /** * Reject the comment with the given commentId. @@ -67,19 +67,19 @@ void approveQuote(CoreSession session, DocumentModel document, * @param session the coreSession * @param document the document were the comment is posted * @param commentId the commentId - * @throws ClientException + * @throws NuxeoException */ void rejectQuote(CoreSession session, DocumentModel document, - String commentId) throws ClientException; + String commentId) throws NuxeoException; /** * Publish the given comment. * * @param session the coreSession * @param comment the comment to publish - * @throws ClientException + * @throws NuxeoException */ void publishQuote(CoreSession session, DocumentModel comment) - throws ClientException; + throws NuxeoException; } diff --git a/3rdparty/nuxeo/nuxeo-platform-quote/pom.xml b/3rdparty/nuxeo/nuxeo-platform-quote/pom.xml index 60f2b9172a..6a6decbebb 100644 --- a/3rdparty/nuxeo/nuxeo-platform-quote/pom.xml +++ b/3rdparty/nuxeo/nuxeo-platform-quote/pom.xml @@ -30,12 +30,12 @@ org.nuxeo.ecm.core nuxeo-core-api - ${nuxeo.core.version} + ${nuxeo.general.release} org.nuxeo.ecm.core nuxeo-core-event - ${nuxeo.core.version} + ${nuxeo.general.release} org.slf4j @@ -46,22 +46,22 @@ org.nuxeo.ecm.core nuxeo-core-schema - ${nuxeo.core.version} + ${nuxeo.general.release} org.nuxeo.ecm.platform nuxeo-platform-relations-api - ${nuxeo.platform.version} + ${nuxeo.general.release} org.nuxeo.ecm.platform nuxeo-platform-api - ${nuxeo.platform.version} + ${nuxeo.general.release} org.nuxeo.ecm.platform - nuxeo-platform-usermanager-api - ${nuxeo.platform.version} + nuxeo-platform-usermanager + ${nuxeo.general.release} @@ -106,19 +106,19 @@ org.nuxeo.ecm.platform nuxeo-platform-relations-core - ${nuxeo.platform.version} + ${nuxeo.general.release} test org.nuxeo.ecm.platform nuxeo-platform-relations-jena-plugin - ${nuxeo.platform.version} + ${nuxeo.general.release} test org.nuxeo.ecm.platform nuxeo-platform-comment-core - ${nuxeo.platform.version} + ${nuxeo.general.release} test diff --git a/3rdparty/nuxeo/nuxeo-platform-quote/src/main/java/org/collectionspace/ecm/platform/quote/ejb/QuoteManagerBean.java b/3rdparty/nuxeo/nuxeo-platform-quote/src/main/java/org/collectionspace/ecm/platform/quote/ejb/QuoteManagerBean.java index 8270fa83fc..add021b760 100644 --- a/3rdparty/nuxeo/nuxeo-platform-quote/src/main/java/org/collectionspace/ecm/platform/quote/ejb/QuoteManagerBean.java +++ b/3rdparty/nuxeo/nuxeo-platform-quote/src/main/java/org/collectionspace/ecm/platform/quote/ejb/QuoteManagerBean.java @@ -28,7 +28,7 @@ import javax.ejb.Remote; import javax.ejb.Stateless; -import org.nuxeo.ecm.core.api.ClientException; +import org.nuxeo.ecm.core.api.NuxeoException; import org.nuxeo.ecm.core.api.ClientRuntimeException; import org.nuxeo.ecm.core.api.DocumentModel; @@ -62,22 +62,22 @@ public void remove() {} @Override public DocumentModel createQuote(DocumentModel docModel, - String quote) throws ClientException { + String quote) throws NuxeoException { try { String author = context.getCallerPrincipal().getName(); return quoteManager.createQuote(docModel, quote, author); } catch (Throwable e) { - throw ClientException.wrap(e); + throw NuxeoException.wrap(e); } } @Override public DocumentModel createQuote(DocumentModel docModel, - String quote, String author) throws ClientException { + String quote, String author) throws NuxeoException { try { return quoteManager.createQuote(docModel, quote, author); } catch (Throwable e) { - throw ClientException.wrap(e); + throw NuxeoException.wrap(e); } } @@ -85,14 +85,14 @@ private String updateAuthor(DocumentModel docModel) { String author; try { author = (String) docModel.getProperty("comment", "author"); - } catch (ClientException e) { + } catch (NuxeoException e) { author = null; } if (author == null) { author = context.getCallerPrincipal().getName(); try { docModel.setProperty("comment", "author", author); - } catch (ClientException e) { + } catch (NuxeoException e) { throw new ClientRuntimeException(e); } } @@ -101,73 +101,73 @@ private String updateAuthor(DocumentModel docModel) { @Override public DocumentModel createQuote(DocumentModel docModel, - DocumentModel quote) throws ClientException { + DocumentModel quote) throws NuxeoException { try { updateAuthor(quote); return quoteManager.createQuote(docModel, quote); } catch (Throwable e) { - throw ClientException.wrap(e); + throw NuxeoException.wrap(e); } } @Override public void deleteQuote(DocumentModel docModel, DocumentModel quote) - throws ClientException { + throws NuxeoException { try { quoteManager.deleteQuote(docModel, quote); } catch (Throwable e) { - throw ClientException.wrap(e); + throw NuxeoException.wrap(e); } } @Override public List getQuotes(DocumentModel docModel) - throws ClientException { + throws NuxeoException { try { return quoteManager.getQuotes(docModel); } catch (Throwable e) { - throw ClientException.wrap(e); + throw NuxeoException.wrap(e); } } @Override public DocumentModel createQuote(DocumentModel docModel, - DocumentModel parent, DocumentModel child) throws ClientException { + DocumentModel parent, DocumentModel child) throws NuxeoException { try { updateAuthor(child); return quoteManager.createQuote(docModel, parent, child); } catch (Throwable e) { - throw ClientException.wrap(e); + throw NuxeoException.wrap(e); } } @Override public List getQuotes(DocumentModel docModel, - DocumentModel parent) throws ClientException { + DocumentModel parent) throws NuxeoException { try { return quoteManager.getQuotes(docModel, parent); } catch (Throwable e) { - throw ClientException.wrap(e); + throw NuxeoException.wrap(e); } } @Override public List getDocumentsForQuote(DocumentModel commentDoc) - throws ClientException{ + throws NuxeoException{ try { return quoteManager.getDocumentsForQuote(commentDoc); } catch (Throwable e) { - throw ClientException.wrap(e); + throw NuxeoException.wrap(e); } } @Override public DocumentModel createLocatedQuote(DocumentModel docModel, - DocumentModel comment, String path) throws ClientException { + DocumentModel comment, String path) throws NuxeoException { try { return quoteManager.createLocatedQuote(docModel, comment, path); } catch (Throwable e) { - throw ClientException.wrap(e); + throw NuxeoException.wrap(e); } } diff --git a/3rdparty/nuxeo/nuxeo-platform-quote/src/main/java/org/collectionspace/ecm/platform/quote/ejb/QuotesModerationBean.java b/3rdparty/nuxeo/nuxeo-platform-quote/src/main/java/org/collectionspace/ecm/platform/quote/ejb/QuotesModerationBean.java index 3f8dae9d14..3251b5d5ee 100644 --- a/3rdparty/nuxeo/nuxeo-platform-quote/src/main/java/org/collectionspace/ecm/platform/quote/ejb/QuotesModerationBean.java +++ b/3rdparty/nuxeo/nuxeo-platform-quote/src/main/java/org/collectionspace/ecm/platform/quote/ejb/QuotesModerationBean.java @@ -25,7 +25,7 @@ import javax.ejb.Remote; import javax.ejb.Stateless; -import org.nuxeo.ecm.core.api.ClientException; +import org.nuxeo.ecm.core.api.NuxeoException; import org.nuxeo.ecm.core.api.CoreSession; import org.nuxeo.ecm.core.api.DocumentModel; import org.nuxeo.runtime.api.Framework; @@ -39,30 +39,30 @@ public class QuotesModerationBean implements QuotesModerationService { protected QuotesModerationService getQuotesModerationService() { - return Framework.getLocalService(QuotesModerationService.class); + return Framework.getService(QuotesModerationService.class); } public void approveQuote(CoreSession session, DocumentModel document, - String commentID) throws ClientException { + String commentID) throws NuxeoException { getQuotesModerationService().approveQuote(session, document, commentID); } public void publishQuote(CoreSession session, DocumentModel comment) - throws ClientException { + throws NuxeoException { getQuotesModerationService().publishQuote(session, comment); } public void rejectQuote(CoreSession session, DocumentModel document, - String commentID) throws ClientException { + String commentID) throws NuxeoException { getQuotesModerationService().rejectQuote(session, document, commentID); } public void startModeration(CoreSession session, DocumentModel document, String commentID, ArrayList moderators) - throws ClientException { + throws NuxeoException { getQuotesModerationService().startModeration(session, document, commentID, moderators); } diff --git a/3rdparty/nuxeo/nuxeo-platform-quote/src/main/java/org/collectionspace/ecm/platform/quote/impl/QuoteConverterImpl.java b/3rdparty/nuxeo/nuxeo-platform-quote/src/main/java/org/collectionspace/ecm/platform/quote/impl/QuoteConverterImpl.java index f5243f5758..66f7b18e86 100644 --- a/3rdparty/nuxeo/nuxeo-platform-quote/src/main/java/org/collectionspace/ecm/platform/quote/impl/QuoteConverterImpl.java +++ b/3rdparty/nuxeo/nuxeo-platform-quote/src/main/java/org/collectionspace/ecm/platform/quote/impl/QuoteConverterImpl.java @@ -22,7 +22,7 @@ import java.util.HashMap; import java.util.Set; -import org.nuxeo.ecm.core.api.ClientException; +import org.nuxeo.ecm.core.api.NuxeoException; import org.nuxeo.ecm.core.api.DataModel; import org.nuxeo.ecm.core.api.DataModelMap; import org.nuxeo.ecm.core.api.DocumentModel; @@ -47,7 +47,7 @@ public String getDocumentType() { return "Comment"; } - /*public Comment getComment(DocumentModel docModel) throws ClientException { + /*public Comment getComment(DocumentModel docModel) throws NuxeoException { CommentImpl comment; try { comment = (CommentImpl) getCommentClass().newInstance(); @@ -76,7 +76,7 @@ public String getDocumentType() { } } catch (Exception e) { - throw new ClientException("failed to create comment", e); + throw new NuxeoException("failed to create comment", e); } return comment; }*/ @@ -91,7 +91,7 @@ public void updateDocumentModel(DocumentModel docModel, DocumentModel comment) { String schema = dataModel.getSchema(); try { docModel.setProperties(schema, new HashMap(dataModel.getMap())); - } catch (ClientException e) { + } catch (NuxeoException e) { continue; } /*if(docModel.hasSchema(schema)) { diff --git a/3rdparty/nuxeo/nuxeo-platform-quote/src/main/java/org/collectionspace/ecm/platform/quote/impl/QuoteManagerImpl.java b/3rdparty/nuxeo/nuxeo-platform-quote/src/main/java/org/collectionspace/ecm/platform/quote/impl/QuoteManagerImpl.java index 1c35eeb07c..9fa462103f 100644 --- a/3rdparty/nuxeo/nuxeo-platform-quote/src/main/java/org/collectionspace/ecm/platform/quote/impl/QuoteManagerImpl.java +++ b/3rdparty/nuxeo/nuxeo-platform-quote/src/main/java/org/collectionspace/ecm/platform/quote/impl/QuoteManagerImpl.java @@ -33,7 +33,7 @@ import javax.security.auth.login.LoginException; import org.nuxeo.common.utils.IdUtils; -import org.nuxeo.ecm.core.api.ClientException; +import org.nuxeo.ecm.core.api.NuxeoException; import org.nuxeo.ecm.core.api.ClientRuntimeException; import org.nuxeo.ecm.core.api.CoreInstance; import org.nuxeo.ecm.core.api.CoreSession; @@ -102,25 +102,25 @@ public QuoteManagerImpl(QuoteServiceConfig config) { } protected CoreSession openCoreSession(String repositoryName) - throws ClientException { + throws NuxeoException { CoreSession result = null; try { result = CoreInstance.openCoreSession(repositoryName); } catch (Exception e) { - throw new ClientException(e); + throw new NuxeoException(e); } return result; } protected void closeCoreSession(LoginContext loginContext, - CoreSession session) throws ClientException { + CoreSession session) throws NuxeoException { if (loginContext != null) { try { loginContext.logout(); } catch (LoginException e) { - throw new ClientException(e); + throw new NuxeoException(e); } } if (session != null) { @@ -133,19 +133,19 @@ private static RelationManager getRelationManager() throws Exception { } public List getQuotes(DocumentModel docModel) - throws ClientException { + throws NuxeoException { RelationManager relationManager; Map ctxMap = new HashMap(); ctxMap.put(ResourceAdapter.CORE_SESSION_CONTEXT_KEY, docModel.getSessionId()); try { relationManager = getRelationManager(); } catch (Exception e) { - throw new ClientException(e); + throw new NuxeoException(e); } Resource docResource = relationManager.getResource( config.documentNamespace, docModel, ctxMap); if (docResource == null) { - throw new ClientException( + throw new NuxeoException( "Could not adapt document model to relation resource ; " + "check the service relation adapters configuration"); } @@ -189,7 +189,7 @@ public List getQuotes(DocumentModel docModel) } public DocumentModel createQuote(DocumentModel docModel, String comment, - String author) throws ClientException { + String author) throws NuxeoException { LoginContext loginContext = null; CoreSession session = null; try { @@ -206,14 +206,14 @@ public DocumentModel createQuote(DocumentModel docModel, String comment, return commentDM; } catch (Exception e) { - throw new ClientException(e); + throw new NuxeoException(e); } finally { closeCoreSession(loginContext, session); } } public DocumentModel createQuote(DocumentModel docModel, String quote) - throws ClientException { + throws NuxeoException { String author = getCurrentUser(docModel); return createQuote(docModel, quote, author); } @@ -224,10 +224,10 @@ public DocumentModel createQuote(DocumentModel docModel, String quote) * * @param docModel The document model that holds the session id * @param comment The comment to update - * @throws ClientException + * @throws NuxeoException */ private static String updateAuthor(DocumentModel docModel, - DocumentModel comment) throws ClientException { + DocumentModel comment) throws NuxeoException { // update the author if not set String author = (String) comment.getProperty("comment", "author"); if (author == null) { @@ -239,7 +239,7 @@ private static String updateAuthor(DocumentModel docModel, } public DocumentModel createQuote(DocumentModel docModel, - DocumentModel comment) throws ClientException { + DocumentModel comment) throws NuxeoException { LoginContext loginContext = null; CoreSession session = null; try { @@ -249,7 +249,7 @@ public DocumentModel createQuote(DocumentModel docModel, session.save(); return doc; } catch (Exception e) { - throw new ClientException(e); + throw new NuxeoException(e); } finally { closeCoreSession(loginContext, session); } @@ -257,7 +257,7 @@ public DocumentModel createQuote(DocumentModel docModel, protected DocumentModel internalCreateQuote(CoreSession session, DocumentModel docModel, DocumentModel comment, String path) - throws ClientException { + throws NuxeoException { String author = updateAuthor(docModel, comment); DocumentModel createdComment; @@ -274,7 +274,7 @@ protected DocumentModel internalCreateQuote(CoreSession session, config.documentNamespace, docModel, null); if (commentRes == null || documentRes == null) { - throw new ClientException( + throw new NuxeoException( "Could not adapt document model to relation resource ; " + "check the service relation adapters configuration"); } @@ -286,7 +286,7 @@ protected DocumentModel internalCreateQuote(CoreSession session, statementList.add(stmt); relationManager.add(config.graphName, statementList); } catch (Exception e) { - throw new ClientException("failed to create comment", e); + throw new NuxeoException("failed to create comment", e); } NuxeoPrincipal principal = null; @@ -304,7 +304,7 @@ protected DocumentModel internalCreateQuote(CoreSession session, private DocumentModel createQuoteDocModel(CoreSession mySession, DocumentModel docModel, DocumentModel comment, String path) - throws ClientException { + throws NuxeoException { String domainPath; updateAuthor(docModel, comment); @@ -373,7 +373,7 @@ private DocumentModel createQuoteDocModel(CoreSession mySession, private static void notifyEvent(CoreSession session, DocumentModel docModel, String eventType, DocumentModel parent, DocumentModel child, NuxeoPrincipal principal) - throws ClientException { + throws NuxeoException { DocumentEventContext ctx = new DocumentEventContext(session, principal, docModel); Map props = new HashMap(); @@ -411,7 +411,7 @@ private static void setFolderPermissions(DocumentModel dm) { acp.addACL(acl); try { dm.setACP(acp, true); - } catch (ClientException e) { + } catch (NuxeoException e) { throw new ClientRuntimeException(e); } } @@ -426,7 +426,7 @@ private static void setQuotePermissions(DocumentModel dm) { acp.addACL(acl); try { dm.setACP(acp, true); - } catch (ClientException e) { + } catch (NuxeoException e) { throw new ClientRuntimeException(e); } } @@ -448,18 +448,18 @@ private static CoreSession getUserSession(String sid) { */ @Deprecated private static String getCurrentUser(DocumentModel target) - throws ClientException { + throws NuxeoException { String sid = target.getSessionId(); CoreSession userSession = getUserSession(sid); if (userSession == null) { - throw new ClientException( + throw new NuxeoException( "userSession is null, do not invoke this method when the user is not local"); } return userSession.getPrincipal().getName(); } private String getQuoteName(DocumentModel target, DocumentModel comment) - throws ClientException { + throws NuxeoException { String author = (String) comment.getProperty("comment", "author"); if (author == null) { author = getCurrentUser(target); @@ -474,7 +474,7 @@ private static Date getQuoteTimeStamp(DocumentModel comment) { try { creationDate = (Calendar) comment.getProperty("dublincore", "created"); - } catch (ClientException e) { + } catch (NuxeoException e) { creationDate = null; } if (creationDate == null) { @@ -484,7 +484,7 @@ private static Date getQuoteTimeStamp(DocumentModel comment) { } public void deleteQuote(DocumentModel docModel, DocumentModel comment) - throws ClientException { + throws NuxeoException { LoginContext loginContext = null; CoreSession session = null; try { @@ -492,13 +492,13 @@ public void deleteQuote(DocumentModel docModel, DocumentModel comment) session = openCoreSession(docModel.getRepositoryName()); if (session == null) { - throw new ClientException( + throw new NuxeoException( "Unable to acess repository for comment: " + comment.getId()); } DocumentRef ref = comment.getRef(); if (!session.exists(ref)) { - throw new ClientException("Comment Document does not exist: " + throw new NuxeoException("Comment Document does not exist: " + comment.getId()); } @@ -512,14 +512,14 @@ public void deleteQuote(DocumentModel docModel, DocumentModel comment) } catch (Throwable e) { log.error("failed to delete comment", e); - throw new ClientException("failed to delete comment", e); + throw new NuxeoException("failed to delete comment", e); } finally { closeCoreSession(loginContext, session); } } public DocumentModel createQuote(DocumentModel docModel, - DocumentModel parent, DocumentModel child) throws ClientException { + DocumentModel parent, DocumentModel child) throws NuxeoException { LoginContext loginContext = null; CoreSession session = null; try { @@ -540,7 +540,7 @@ public DocumentModel createQuote(DocumentModel docModel, return newComment; } catch (Exception e) { - throw new ClientException(e); + throw new NuxeoException(e); } finally { closeCoreSession(loginContext, session); } @@ -559,31 +559,31 @@ private static NuxeoPrincipal getAuthor(DocumentModel docModel) { } public List getQuotes(DocumentModel docModel, - DocumentModel parent) throws ClientException { + DocumentModel parent) throws NuxeoException { try { //loginContext = Framework.login(); //session = openCoreSession(docModel.getRepositoryName()); //DocumentModel parentDocModel = session.getDocument(parent.getRef()); return getQuotes(parent); } catch (Exception e) { - throw new ClientException(e); + throw new NuxeoException(e); } } public List getDocumentsForQuote(DocumentModel comment) - throws ClientException { + throws NuxeoException { RelationManager relationManager; Map ctxMap = new HashMap(); ctxMap.put(ResourceAdapter.CORE_SESSION_CONTEXT_KEY, comment.getSessionId()); try { relationManager = getRelationManager(); } catch (Exception e) { - throw new ClientException(e); + throw new NuxeoException(e); } Resource commentResource = relationManager.getResource( config.commentNamespace, comment, ctxMap); if (commentResource == null) { - throw new ClientException( + throw new NuxeoException( "Could not adapt document model to relation resource ; " + "check the service relation adapters configuration"); } @@ -621,7 +621,7 @@ public List getDocumentsForQuote(DocumentModel comment) } public DocumentModel createLocatedQuote(DocumentModel docModel, - DocumentModel comment, String path) throws ClientException { + DocumentModel comment, String path) throws NuxeoException { LoginContext loginContext = null; CoreSession session = null; DocumentModel createdComment; @@ -631,7 +631,7 @@ public DocumentModel createLocatedQuote(DocumentModel docModel, createdComment = internalCreateQuote(session, docModel, comment, path); session.save(); } catch (Exception e) { - throw new ClientException(e); + throw new NuxeoException(e); } finally { closeCoreSession(loginContext, session); } diff --git a/3rdparty/nuxeo/nuxeo-platform-quote/src/main/java/org/collectionspace/ecm/platform/quote/listener/DocumentRemovedQuoteEventListener.java b/3rdparty/nuxeo/nuxeo-platform-quote/src/main/java/org/collectionspace/ecm/platform/quote/listener/DocumentRemovedQuoteEventListener.java index b39968d7d6..d9c25d8c6c 100644 --- a/3rdparty/nuxeo/nuxeo-platform-quote/src/main/java/org/collectionspace/ecm/platform/quote/listener/DocumentRemovedQuoteEventListener.java +++ b/3rdparty/nuxeo/nuxeo-platform-quote/src/main/java/org/collectionspace/ecm/platform/quote/listener/DocumentRemovedQuoteEventListener.java @@ -25,7 +25,7 @@ import java.util.List; -import org.nuxeo.ecm.core.api.ClientException; +import org.nuxeo.ecm.core.api.NuxeoException; import org.nuxeo.ecm.core.api.CoreSession; import org.nuxeo.ecm.core.api.DocumentModel; import org.nuxeo.ecm.core.event.PostCommitEventListener; @@ -53,7 +53,7 @@ protected void doProcess(CoreSession coreSession, private static void onDocumentRemoved(CoreSession coreSession, RelationManager relationManager, QuoteServiceConfig config, - DocumentModel docMessage) throws ClientException { + DocumentModel docMessage) throws NuxeoException { Resource documentRes = relationManager.getResource( config.documentNamespace, docMessage, null); diff --git a/3rdparty/nuxeo/nuxeo-platform-quote/src/main/java/org/collectionspace/ecm/platform/quote/listener/QuoteRemovedEventListener.java b/3rdparty/nuxeo/nuxeo-platform-quote/src/main/java/org/collectionspace/ecm/platform/quote/listener/QuoteRemovedEventListener.java index 321e87a2ff..2aa4c827f5 100644 --- a/3rdparty/nuxeo/nuxeo-platform-quote/src/main/java/org/collectionspace/ecm/platform/quote/listener/QuoteRemovedEventListener.java +++ b/3rdparty/nuxeo/nuxeo-platform-quote/src/main/java/org/collectionspace/ecm/platform/quote/listener/QuoteRemovedEventListener.java @@ -21,7 +21,7 @@ import java.util.List; -import org.nuxeo.ecm.core.api.ClientException; +import org.nuxeo.ecm.core.api.NuxeoException; import org.nuxeo.ecm.core.api.CoreSession; import org.nuxeo.ecm.core.api.DocumentModel; import org.nuxeo.ecm.core.event.EventListener; @@ -53,7 +53,7 @@ protected void doProcess(CoreSession coreSession, private static void onQuoteRemoved(RelationManager relationManager, QuoteServiceConfig config, DocumentModel docModel) - throws ClientException { + throws NuxeoException { Resource quoteRes = relationManager.getResource( config.commentNamespace, docModel, null); if (quoteRes == null) { diff --git a/3rdparty/nuxeo/nuxeo-platform-quote/src/test/java/org/nuxeo/ecm/platform/comment/listener/test/SimpleListenerTest.java b/3rdparty/nuxeo/nuxeo-platform-quote/src/test/java/org/nuxeo/ecm/platform/comment/listener/test/SimpleListenerTest.java index 57796aae49..2fdf881919 100644 --- a/3rdparty/nuxeo/nuxeo-platform-quote/src/test/java/org/nuxeo/ecm/platform/comment/listener/test/SimpleListenerTest.java +++ b/3rdparty/nuxeo/nuxeo-platform-quote/src/test/java/org/nuxeo/ecm/platform/comment/listener/test/SimpleListenerTest.java @@ -95,7 +95,7 @@ protected DocumentModel doCreateADocWithComments() throws Exception { } protected void waitForAsyncExec() { - Framework.getLocalService(EventService.class).waitForAsyncCompletion(); + Framework.getService(EventService.class).waitForAsyncCompletion(); } /* diff --git a/3rdparty/nuxeo/nuxeo-platform-thumbnail/pom.xml b/3rdparty/nuxeo/nuxeo-platform-thumbnail/pom.xml index 78b13e4d4a..e1b385ec94 100644 --- a/3rdparty/nuxeo/nuxeo-platform-thumbnail/pom.xml +++ b/3rdparty/nuxeo/nuxeo-platform-thumbnail/pom.xml @@ -20,11 +20,6 @@ org.nuxeo.ecm.core nuxeo-core-storage-sql - - org.nuxeo.ecm.platform - nuxeo-platform-filemanager-api - ${nuxeo.platform.version} - org.nuxeo.ecm.core nuxeo-core-convert diff --git a/3rdparty/nuxeo/nuxeo-platform-thumbnail/src/main/java/org/collectionspace/services/nuxeo/extension/thumbnail/AddThumbnailUnrestricted.java b/3rdparty/nuxeo/nuxeo-platform-thumbnail/src/main/java/org/collectionspace/services/nuxeo/extension/thumbnail/AddThumbnailUnrestricted.java index d4aaaa01bc..ba136dfe25 100644 --- a/3rdparty/nuxeo/nuxeo-platform-thumbnail/src/main/java/org/collectionspace/services/nuxeo/extension/thumbnail/AddThumbnailUnrestricted.java +++ b/3rdparty/nuxeo/nuxeo-platform-thumbnail/src/main/java/org/collectionspace/services/nuxeo/extension/thumbnail/AddThumbnailUnrestricted.java @@ -10,7 +10,7 @@ import org.collectionspace.services.nuxeo.util.ThumbnailConstants; import org.nuxeo.ecm.core.api.Blob; -import org.nuxeo.ecm.core.api.ClientException; +import org.nuxeo.ecm.core.api.NuxeoException; import org.nuxeo.ecm.core.api.CoreSession; import org.nuxeo.ecm.core.api.DocumentModel; import org.nuxeo.ecm.core.api.UnrestrictedSessionRunner; @@ -49,7 +49,7 @@ public AddThumbnailUnrestricted(CoreSession coreSession, DocumentModel doc, * to the document blob. */ @Override - public void run() throws ClientException { + public void run() throws NuxeoException { String errMsg = "Error while adding preview thumbnail."; String documentId = doc.getId(); diff --git a/3rdparty/nuxeo/nuxeo-platform-thumbnail/src/main/java/org/collectionspace/services/nuxeo/extension/thumbnail/Thumbnail.java b/3rdparty/nuxeo/nuxeo-platform-thumbnail/src/main/java/org/collectionspace/services/nuxeo/extension/thumbnail/Thumbnail.java index a4a40bc67f..dc9ea1c303 100644 --- a/3rdparty/nuxeo/nuxeo-platform-thumbnail/src/main/java/org/collectionspace/services/nuxeo/extension/thumbnail/Thumbnail.java +++ b/3rdparty/nuxeo/nuxeo-platform-thumbnail/src/main/java/org/collectionspace/services/nuxeo/extension/thumbnail/Thumbnail.java @@ -1,7 +1,7 @@ package org.collectionspace.services.nuxeo.extension.thumbnail; import org.collectionspace.services.nuxeo.util.ThumbnailConstants; -import org.nuxeo.ecm.core.api.ClientException; +import org.nuxeo.ecm.core.api.NuxeoException; import org.nuxeo.ecm.core.api.DocumentModel; public class Thumbnail { @@ -11,7 +11,7 @@ public Thumbnail(DocumentModel doc) { docModel = doc; } - public String getDigest() throws ClientException { + public String getDigest() throws NuxeoException { String result = null; if (docModel != null) { diff --git a/3rdparty/nuxeo/nuxeo-platform-thumbnail/src/main/java/org/collectionspace/services/nuxeo/extension/thumbnail/ThumbnailConverter.java b/3rdparty/nuxeo/nuxeo-platform-thumbnail/src/main/java/org/collectionspace/services/nuxeo/extension/thumbnail/ThumbnailConverter.java index 8446ee5c30..61ca636768 100644 --- a/3rdparty/nuxeo/nuxeo-platform-thumbnail/src/main/java/org/collectionspace/services/nuxeo/extension/thumbnail/ThumbnailConverter.java +++ b/3rdparty/nuxeo/nuxeo-platform-thumbnail/src/main/java/org/collectionspace/services/nuxeo/extension/thumbnail/ThumbnailConverter.java @@ -36,7 +36,7 @@ public BlobHolder convert(BlobHolder blobHolder, try { // Make sure the toThumbnail command is available CommandLineExecutorService cles = Framework - .getLocalService(CommandLineExecutorService.class); + .getService(CommandLineExecutorService.class); CommandAvailability commandAvailability = cles .getCommandAvailability("toThumbnail"); if (!commandAvailability.isAvailable()) { diff --git a/3rdparty/nuxeo/nuxeo-platform-thumbnail/src/main/java/org/collectionspace/services/nuxeo/extension/thumbnail/UpdateThumbListener.java b/3rdparty/nuxeo/nuxeo-platform-thumbnail/src/main/java/org/collectionspace/services/nuxeo/extension/thumbnail/UpdateThumbListener.java index 2817660883..ae7bb6cf97 100644 --- a/3rdparty/nuxeo/nuxeo-platform-thumbnail/src/main/java/org/collectionspace/services/nuxeo/extension/thumbnail/UpdateThumbListener.java +++ b/3rdparty/nuxeo/nuxeo-platform-thumbnail/src/main/java/org/collectionspace/services/nuxeo/extension/thumbnail/UpdateThumbListener.java @@ -7,7 +7,7 @@ import org.collectionspace.services.nuxeo.util.ThumbnailConstants; import org.nuxeo.ecm.core.api.Blob; -import org.nuxeo.ecm.core.api.ClientException; +import org.nuxeo.ecm.core.api.NuxeoException; import org.nuxeo.ecm.core.api.DocumentModel; import org.nuxeo.ecm.core.api.blobholder.BlobHolder; import org.nuxeo.ecm.core.api.event.DocumentEventTypes; @@ -25,7 +25,7 @@ public boolean shouldHandleEvent(Event event) { return ec instanceof DocumentEventContext; } - public void handleCSEvent(Event event) throws ClientException { + public void handleCSEvent(Event event) throws NuxeoException { EventContext ec = event.getContext(); if (ec instanceof DocumentEventContext) { DocumentEventContext context = (DocumentEventContext) ec; diff --git a/3rdparty/nuxeo/nuxeo-platform-thumbnail/src/main/java/org/nuxeo/platform/thumbnail/App.java b/3rdparty/nuxeo/nuxeo-platform-thumbnail/src/main/java/org/nuxeo/platform/thumbnail/App.java deleted file mode 100644 index 038e27e523..0000000000 --- a/3rdparty/nuxeo/nuxeo-platform-thumbnail/src/main/java/org/nuxeo/platform/thumbnail/App.java +++ /dev/null @@ -1,13 +0,0 @@ -package org.nuxeo.platform.thumbnail; - -/** - * Hello world! - * - */ -public class App -{ - public static void main( String[] args ) - { - System.out.println( "Hello World!" ); - } -} diff --git a/3rdparty/nuxeo/nuxeo-server/pom.xml b/3rdparty/nuxeo/nuxeo-server/pom.xml index 484b6985d4..363550a33e 100644 --- a/3rdparty/nuxeo/nuxeo-server/pom.xml +++ b/3rdparty/nuxeo/nuxeo-server/pom.xml @@ -16,48 +16,14 @@ - nuxeo-public-releases - https://maven-eu.nuxeo.org/nexus/content/repositories/public-releases - - false - - - - - nuxeo-vendor-releases - https://maven-eu.nuxeo.org/nexus/content/repositories/vendor-releases + nuxeo-public-lts + https://packages.nuxeo.com/repository/maven-public-lts false - - - internal-releases - https://mavenin.nuxeo.com/nexus/content/groups/internal-releases - Nuxeo virtual release repository - - true - - - false - - - - internal-snapshots - https://mavenin.nuxeo.com/nexus/content/groups/internal-snapshots - Nuxeo virtual snapshot repository - - false - - - always - true - - - - org.nuxeo.ecm.platform nuxeo-platform-login-token @@ -313,7 +263,7 @@ runtime - org.nuxeo + org.nuxeo.ecm.platform nuxeo-platform-lang-ext ${nuxeo.general.release} runtime @@ -332,7 +282,7 @@ runtime - org.nuxeo.binary.metadata + org.nuxeo.ecm.platform nuxeo-binary-metadata ${nuxeo.general.release} runtime @@ -389,13 +339,7 @@ org.nuxeo.ecm.platform - nuxeo-platform-tag-api - ${nuxeo.general.release} - runtime - - - org.nuxeo.ecm.platform - nuxeo-platform-tag-core + nuxeo-platform-tag ${nuxeo.general.release} runtime @@ -408,13 +352,7 @@ org.nuxeo.ecm.platform - nuxeo-platform-url-api - ${nuxeo.general.release} - runtime - - - org.nuxeo.ecm.platform - nuxeo-platform-url-core + nuxeo-platform-url ${nuxeo.general.release} runtime @@ -476,20 +414,6 @@ runtime - - org.nuxeo.ecm.platform - nuxeo-platform-imaging-api - ${nuxeo.general.release} - runtime - - - - org.nuxeo.ecm.platform - nuxeo-platform-imaging-convert - ${nuxeo.general.release} - runtime - - org.nuxeo.ecm.platform nuxeo-platform-imaging-core @@ -537,7 +461,7 @@ nuxeo-core-mimetype - org.nuxeo + org.nuxeo.ecm.platform nuxeo-dmk-adaptor @@ -614,11 +538,7 @@ org.nuxeo.ecm.platform - nuxeo-platform-types-api - - - org.nuxeo.ecm.platform - nuxeo-platform-types-core + nuxeo-platform-types org.nuxeo.ecm.platform @@ -630,24 +550,12 @@ org.nuxeo.ecm.platform - nuxeo-platform-filemanager-api - - - org.nuxeo.ecm.platform - nuxeo-platform-filemanager-core - - - org.nuxeo.ecm.platform - nuxeo-platform-filemanager-core-listener + nuxeo-platform-filemanager org.nuxeo.ecm.platform nuxeo-platform-login - - org.nuxeo.ecm.platform - nuxeo-platform-login-default - org.nuxeo.ecm.platform nuxeo-platform-login-token @@ -681,7 +589,7 @@ nuxeo-platform-lang - org.nuxeo + org.nuxeo.ecm.platform nuxeo-platform-lang-ext @@ -693,7 +601,7 @@ nuxeo-automation-io - org.nuxeo.binary.metadata + org.nuxeo.ecm.platform nuxeo-binary-metadata @@ -722,19 +630,11 @@ org.nuxeo.ecm.platform - nuxeo-platform-tag-api - - - org.nuxeo.ecm.platform - nuxeo-platform-tag-core - - - org.nuxeo.ecm.platform - nuxeo-platform-url-api + nuxeo-platform-tag org.nuxeo.ecm.platform - nuxeo-platform-url-core + nuxeo-platform-url @@ -752,16 +652,6 @@ nuxeo-core-management-jtajca - - org.nuxeo.ecm.platform - nuxeo-platform-imaging-api - - - - org.nuxeo.ecm.platform - nuxeo-platform-imaging-convert - - org.nuxeo.ecm.platform nuxeo-platform-imaging-core diff --git a/pom.xml b/pom.xml index a47da5064d..d9efa3db3f 100644 --- a/pom.xml +++ b/pom.xml @@ -14,29 +14,39 @@ UTF-8 ${revision} ${revision} + 17 8.5.40 - - 1.7.4 - 0.12.0-NX2 - 5.6.15.Final - 2.14.3 - 4.0.5 - 4.0.12 - 3.0.1 - 2.17.1 - 17 - 9.10-HF30 - ${nuxeo.general.release} - ${nuxeo.general.release} - ${nuxeo.general.release} + + 2.0.14 + 3.0.2 + 4.0.12 3.4.6 42.3.9 3.0.20.Final + 3.0.1 + + + 1.7.4 + 1.18.0 + 2.19.0 + 3.18.0 + 1.1.1-NX01 + 2.4.21 + 32.1.3-jre + 5.6.15.Final + 2.19.4 + 2.2.11 + 2.17.1 + 2023.39 1.7.32 + 4.2.2 + + 5.3.28 5.8.4 0.4.3 + 2.10.9.2 @@ -76,22 +86,6 @@ - - - - cspace-nuxeo-public-releases @@ -129,6 +123,13 @@ true + + nuxeo-public-lts + https://packages.nuxeo.com/repository/maven-public-lts + + false + + @@ -464,6 +465,46 @@ + + + org.apache.maven.plugins + maven-enforcer-plugin + 3.6.2 + + + enforce-banned-dependencies + + enforce + + + + + + + jakarta.inject:jakarta.inject-api + jakarta.mail:jakarta.mail-api + jakarta.persistence:jakarta.persistence-api + jakarta.servlet:jakarta.servlet-api + jakarta.transaction:jakarta.transaction-api + jakarta.ws.rs:jakarta.ws.rs-api + jakarta.xml.soap:jakarta.xml.soap-api + + Only jakarta activation, annotation, xml bind, and validation apis should be used + + + + javax.xml.bind:jaxb-api + + Do not use javax JAXB API + + + + + + @@ -535,12 +576,12 @@ org.nuxeo.lib.runtime nuxeo-runtime-launcher - 9.10-HF30 + ${nuxeo.general.release} org.nuxeo.lib.runtime nuxeo-runtime-tomcat-adapter - 9.10-HF30 + ${nuxeo.general.release} provided @@ -763,12 +804,12 @@ commons-codec commons-codec - 1.10 + ${commons-codec.version} org.codehaus.woodstox stax2-api - 3.1.4 + ${stax2-api.version} org.apache.santuario @@ -812,7 +853,7 @@ org.apache.commons commons-lang3 - 3.2.1 + ${commons-lang3.version} compile @@ -838,13 +879,13 @@ org.codehaus.groovy groovy-all - 2.4.12 + ${groovy.version} compile com.google.guava guava - 20.0 + ${guava.version} compile @@ -918,7 +959,7 @@ org.nuxeo.ecm.automation nuxeo-automation-io - ${nuxeo.core.version} + ${nuxeo.general.release} com.sun.jersey @@ -946,7 +987,7 @@ org.nuxeo.ecm.core nuxeo-core - ${nuxeo.core.version} + ${nuxeo.general.release} org.slf4j @@ -966,7 +1007,7 @@ org.nuxeo.ecm.core nuxeo-core-api - ${nuxeo.core.version} + ${nuxeo.general.release} com.sun.jersey @@ -977,12 +1018,12 @@ org.nuxeo.common nuxeo-common - ${nuxeo.core.version} + ${nuxeo.general.release} org.nuxeo.ecm.platform nuxeo-platform-imaging-core - ${nuxeo.platform.version} + ${nuxeo.general.release} provided @@ -1007,17 +1048,17 @@ org.nuxeo.runtime nuxeo-runtime - ${nuxeo.core.version} + ${nuxeo.general.release} org.nuxeo.ecm.core nuxeo-core-schema - ${nuxeo.core.version} + ${nuxeo.general.release} org.nuxeo.ecm.core nuxeo-core-storage-sql - ${nuxeo.core.version} + ${nuxeo.general.release} org.slf4j @@ -1028,12 +1069,12 @@ org.nuxeo.ecm.core nuxeo-core-storage-sql-ra - ${nuxeo.core.version} + ${nuxeo.general.release} org.nuxeo.ecm.core nuxeo-core-io - ${nuxeo.core.version} + ${nuxeo.general.release} @@ -1045,7 +1086,7 @@ org.nuxeo.ecm.core nuxeo-core-convert - ${nuxeo.core.version} + ${nuxeo.general.release} com.sun.jersey @@ -1056,56 +1097,22 @@ org.nuxeo.ecm.core nuxeo-opencmis-impl - ${nuxeo.core.version} - - - com.sun.jersey - jersey-core - - - com.sun.jersey - jersey-server - - - jersey-servlet - com.sun.jersey - - - org.slf4j - slf4j-log4j12 - - - - dom4j - dom4j - - + ${nuxeo.general.release} org.nuxeo.ecm.core nuxeo-opencmis-bindings - ${nuxeo.core.version} - - - com.sun.jersey - jersey-core - - - - dom4j - dom4j - - + ${nuxeo.general.release} org.nuxeo.runtime nuxeo-runtime-jtajca - ${nuxeo.core.version} + ${nuxeo.general.release} org.nuxeo.runtime nuxeo-runtime-datasource - ${nuxeo.core.version} + ${nuxeo.general.release} @@ -1154,6 +1161,12 @@ org.jboss.resteasy resteasy-jaxb-provider ${resteasy.version} + + + javax.xml.bind + jaxb-api + + org.jboss.resteasy @@ -1168,7 +1181,7 @@ commons-io commons-io - 2.7 + ${commons-io.version} commons-cli diff --git a/services/JaxRsServiceProvider/pom.xml b/services/JaxRsServiceProvider/pom.xml index 25221eaf1a..25eaac92c8 100644 --- a/services/JaxRsServiceProvider/pom.xml +++ b/services/JaxRsServiceProvider/pom.xml @@ -689,7 +689,7 @@ org.nuxeo.ecm.core nuxeo-core-query - ${nuxeo.core.version} + ${nuxeo.general.release} org.nuxeo.ecm.core @@ -713,15 +713,10 @@ org.nuxeo.runtime nuxeo-runtime-datasource - - org.nuxeo.ecm.platform - nuxeo-platform-usermanager-api - ${nuxeo.core.version} - org.nuxeo.ecm.platform nuxeo-platform-commandline-executor - ${nuxeo.core.version} + ${nuxeo.general.release} provided @@ -733,27 +728,27 @@ org.nuxeo.ecm.platform nuxeo-platform-api - ${nuxeo.core.version} + ${nuxeo.general.release} org.nuxeo.ecm.platform nuxeo-platform-login - ${nuxeo.core.version} + ${nuxeo.general.release} org.nuxeo.ecm.platform nuxeo-platform-imaging-core - ${nuxeo.platform.version} + ${nuxeo.general.release} org.nuxeo.ecm.platform nuxeo-platform-audit-api - ${nuxeo.core.version} + ${nuxeo.general.release} org.nuxeo.runtime nuxeo-runtime-osgi - ${nuxeo.core.version} + ${nuxeo.general.release} diff --git a/services/account/jaxb/src/main/java/org/collectionspace/services/account/AccountsCommon.java b/services/account/jaxb/src/main/java/org/collectionspace/services/account/AccountsCommon.java index b598dadce1..3da327dfa6 100644 --- a/services/account/jaxb/src/main/java/org/collectionspace/services/account/AccountsCommon.java +++ b/services/account/jaxb/src/main/java/org/collectionspace/services/account/AccountsCommon.java @@ -80,6 +80,7 @@ public class AccountsCommon { @XmlElement(required = true) private String userId; + @Transient private byte[] password; @Basic diff --git a/services/authority/service/pom.xml b/services/authority/service/pom.xml index 74e35b0b5d..739d2b073b 100644 --- a/services/authority/service/pom.xml +++ b/services/authority/service/pom.xml @@ -186,18 +186,7 @@ org.nuxeo.ecm.platform nuxeo-platform-imaging-core - ${nuxeo.platform.version} - - - org.nuxeo.ecm.platform - nuxeo-platform-imaging-api - ${nuxeo.platform.version} - provided - - - org.nuxeo.ecm.platform - nuxeo-platform-filemanager-api - ${nuxeo.platform.version} + ${nuxeo.general.release} org.nuxeo.common @@ -215,7 +204,7 @@ org.nuxeo.ecm.core nuxeo-core-query - ${nuxeo.core.version} + ${nuxeo.general.release} org.nuxeo.ecm.core @@ -225,16 +214,10 @@ org.nuxeo.ecm.core nuxeo-core-storage-sql - org.nuxeo.runtime nuxeo-runtime-osgi - ${nuxeo.core.version} + ${nuxeo.general.release} org.osgi 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 3b73cf3a1f..a6b4844386 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 @@ -71,7 +71,7 @@ import org.collectionspace.services.nuxeo.client.java.NuxeoRepositoryClientImpl; import org.collectionspace.services.nuxeo.util.NuxeoUtils; import org.dom4j.Element; -import org.nuxeo.ecm.core.api.ClientException; +import org.nuxeo.ecm.core.api.NuxeoException; import org.nuxeo.ecm.core.api.DocumentModel; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -757,7 +757,7 @@ public String getShortIdentifier(ServiceContext ctx, String authCSID, String sch throw new DocumentNotFoundException(String.format("Could not find authority resource with CSID='%s'.", authCSID)); } shortIdentifier = (String) docModel.getProperty(schemaName, AuthorityJAXBSchema.SHORT_IDENTIFIER); - } catch (ClientException ce) { + } catch (NuxeoException ce) { throw new RuntimeException("AuthorityDocHandler Internal Error: cannot get shortId!", ce); } finally { if (repoSession != null) { diff --git a/services/authority/service/src/main/java/org/collectionspace/services/common/vocabulary/nuxeo/AuthorityItemDocumentModelHandler.java b/services/authority/service/src/main/java/org/collectionspace/services/common/vocabulary/nuxeo/AuthorityItemDocumentModelHandler.java index 30616a1cdc..66facc603d 100644 --- a/services/authority/service/src/main/java/org/collectionspace/services/common/vocabulary/nuxeo/AuthorityItemDocumentModelHandler.java +++ b/services/authority/service/src/main/java/org/collectionspace/services/common/vocabulary/nuxeo/AuthorityItemDocumentModelHandler.java @@ -66,13 +66,12 @@ import org.collectionspace.services.nuxeo.util.NuxeoUtils; import org.collectionspace.services.relation.RelationsCommonList; import org.collectionspace.services.vocabulary.VocabularyItemJAXBSchema; -import org.nuxeo.ecm.core.api.ClientException; +import org.nuxeo.ecm.core.api.NuxeoException; import org.nuxeo.ecm.core.api.DocumentModel; -import org.nuxeo.ecm.core.api.model.PropertyException; +import org.nuxeo.ecm.core.api.PropertyException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -//import org.collectionspace.services.common.authority.AuthorityItemRelations; /** * AuthorityItemDocumentModelHandler * @@ -253,7 +252,7 @@ public String getUri(DocumentModel docModel) { try { inAuthority = (String) docModel.getProperty(authorityItemCommonSchemaName, AuthorityItemJAXBSchema.IN_AUTHORITY); - } catch (ClientException pe) { + } catch (NuxeoException pe) { throw new RuntimeException("Could not get parent specifier for item!"); } } diff --git a/services/authorization-mgt/service/src/main/java/org/collectionspace/services/authorization/PermissionResource.java.txt b/services/authorization-mgt/service/src/main/java/org/collectionspace/services/authorization/PermissionResource.java.txt deleted file mode 100644 index 22ac5c5034..0000000000 --- a/services/authorization-mgt/service/src/main/java/org/collectionspace/services/authorization/PermissionResource.java.txt +++ /dev/null @@ -1,254 +0,0 @@ -/** - * This document is a part of the source code and related artifacts - * for CollectionSpace, an open source collections management system - * for museums and related institutions: - - * http://www.collectionspace.org - * http://wiki.collectionspace.org - - * 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. - - * You may obtain a copy of the ECL 2.0 License at - - * https://source.collectionspace.org/collection-space/LICENSE.txt - - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.collectionspace.services.authorization; - -import org.collectionspace.services.authorization.perms.Permission; -import org.collectionspace.services.authorization.perms.PermissionsList; -import org.collectionspace.services.authorization.storage.AuthorizationDelegate; -import org.collectionspace.services.client.CollectionSpaceClientUtils; -import org.collectionspace.services.client.PayloadOutputPart; -import org.collectionspace.services.client.PermissionClient; -import org.collectionspace.services.common.SecurityResourceBase; -import org.collectionspace.services.common.ServiceMessages; -import org.collectionspace.services.common.context.RemoteServiceContextFactory; -import org.collectionspace.services.common.context.ServiceContext; -import org.collectionspace.services.common.context.ServiceContextFactory; -import org.collectionspace.services.common.storage.StorageClient; -import org.collectionspace.services.common.storage.jpa.JpaStorageClientImpl; -import org.jboss.resteasy.util.HttpResponseCodes; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriBuilder; -import javax.ws.rs.core.UriInfo; - -@Path(PermissionClient.SERVICE_PATH) -@Consumes("application/xml") -@Produces("application/xml") -public class PermissionResource extends SecurityResourceBase { - - final Logger logger = LoggerFactory.getLogger(PermissionResource.class); - final StorageClient storageClient = new JpaStorageClientImpl(); - - @Override - protected String getVersionString() { - return "$LastChangedRevision: 1165 $"; - } - - @Override - public String getServiceName() { - return PermissionClient.SERVICE_NAME; - } - - @Override - public Class getCommonPartClass() { - return Permission.class; - } - - @Override - public ServiceContextFactory getServiceContextFactory() { - return RemoteServiceContextFactory.get(); - } - - @Override - public StorageClient getStorageClient(ServiceContext ctx) { - //FIXME use ctx to identify storage client - return storageClient; - } - - @POST - public Response createPermission(Permission input) { - return create(input); - } - - public Permission createPermissionFromInstance(Permission input) { - Permission result = null; - - String permCsid = null; - Response response = createPermission(input); - if (response.getStatus() == Response.Status.CREATED.getStatusCode()) { - permCsid = CollectionSpaceClientUtils.extractId(response); - result = getPermission(permCsid); - } - - return result; - } - - @GET - @Path("{csid}") - public Permission getPermission(@PathParam("csid") String csid) { - return (Permission)get(csid, Permission.class); - } - - @GET - @Produces("application/xml") - public PermissionsList getPermissionList(@Context UriInfo ui) { - PermissionsList result = (PermissionsList)getList(ui, Permission.class); - if(logger.isTraceEnabled()) { - PayloadOutputPart ppo = new PayloadOutputPart(PermissionsList.class.getName(), result); - System.out.println(ppo.asXML()); - } - - return result; - } - - @PUT - @Path("{csid}") - public Permission updatePermission(@PathParam("csid") String csid,Permission theUpdate) { - return (Permission)update(csid, theUpdate, Permission.class); - } - - @DELETE - @Path("{csid}") - public Response deletePermission(@PathParam("csid") String csid) { - logger.debug("deletePermission with csid=" + csid); - ensureCSID(csid, ServiceMessages.DELETE_FAILED + "permission "); - try { - //FIXME ideally the following two ops should be in the same tx CSPACE-658 - //delete all relationships for this permission - PermissionRoleSubResource subResource = - new PermissionRoleSubResource(PermissionRoleSubResource.PERMISSION_PERMROLE_SERVICE); - subResource.deletePermissionRole(csid, SubjectType.ROLE); - //NOTE for delete permissions in the authz provider - //at the PermissionRoleSubResource/DocHandler level, there is no visibility - //if permission is deleted, so do it here, however, - //this is a very dangerous operation as it deletes the Spring ACL instead of ACE(s) - //the ACL might be needed for other ACEs roles... - AuthorizationDelegate.deletePermissions(csid); - - ServiceContext ctx = createServiceContext((Permission) null, Permission.class); - getStorageClient(ctx).delete(ctx, csid); - return Response.status(HttpResponseCodes.SC_OK).build(); - } catch (Exception e) { - throw bigReThrow(e, ServiceMessages.DELETE_FAILED, csid); - } - } - - @POST - @Path("{csid}/permroles") - public Response createPermissionRole(@QueryParam("_method") String method, - @PathParam("csid") String permCsid, - PermissionRole input) { - if (method != null) { - if ("delete".equalsIgnoreCase(method)) { - return deletePermissionRole(permCsid, input); - } - } - logger.debug("createPermissionRole with permCsid=" + permCsid); - ensureCSID(permCsid, ServiceMessages.POST_FAILED + "permroles permission "); - try { - PermissionRoleSubResource subResource = - new PermissionRoleSubResource(PermissionRoleSubResource.PERMISSION_PERMROLE_SERVICE); - String permrolecsid = subResource.createPermissionRole(input, SubjectType.ROLE); - UriBuilder path = UriBuilder.fromResource(PermissionResource.class); - path.path(permCsid + "/permroles/" + permrolecsid); - Response response = Response.created(path.build()).build(); - return response; - } catch (Exception e) { - throw bigReThrow(e, ServiceMessages.POST_FAILED, permCsid); - } - } - - @GET - @Path("{csid}/permroles/{id}") - public PermissionRoleRel getPermissionRole( - @PathParam("csid") String permCsid, - @PathParam("id") String permrolecsid) { - logger.debug("getPermissionRole with permCsid=" + permCsid); - ensureCSID(permCsid, ServiceMessages.GET_FAILED + "permroles permission "); - PermissionRoleRel result = null; - try { - PermissionRoleSubResource subResource = - new PermissionRoleSubResource(PermissionRoleSubResource.PERMISSION_PERMROLE_SERVICE); - //get relationships for a permission - result = subResource.getPermissionRoleRel(permCsid, SubjectType.ROLE, permrolecsid); - } catch (Exception e) { - throw bigReThrow(e, ServiceMessages.GET_FAILED, permCsid); - } - checkResult(result, permCsid, ServiceMessages.GET_FAILED); - return result; - } - - @GET - @Path("{csid}/permroles") - public PermissionRole getPermissionRole( - @PathParam("csid") String permCsid) { - logger.debug("getPermissionRole with permCsid=" + permCsid); - ensureCSID(permCsid, ServiceMessages.GET_FAILED + "permroles permission "); - PermissionRole result = null; - try { - PermissionRoleSubResource subResource = - new PermissionRoleSubResource(PermissionRoleSubResource.PERMISSION_PERMROLE_SERVICE); - //get relationships for a permission - result = subResource.getPermissionRole(permCsid, SubjectType.ROLE); - } catch (Exception e) { - throw bigReThrow(e, ServiceMessages.GET_FAILED, permCsid); - } - checkResult(result, permCsid, ServiceMessages.GET_FAILED); - return result; - } - - public Response deletePermissionRole(String permCsid, PermissionRole input) { - logger.debug("Delete payload of permrole relationships with permission permCsid=" + permCsid); - ensureCSID(permCsid, ServiceMessages.DELETE_FAILED + "permroles permission "); - try { - PermissionRoleSubResource subResource = - new PermissionRoleSubResource(PermissionRoleSubResource.PERMISSION_PERMROLE_SERVICE); - //delete all relationships for a permission - subResource.deletePermissionRole(permCsid, SubjectType.ROLE, input); - return Response.status(HttpResponseCodes.SC_OK).build(); - } catch (Exception e) { - throw bigReThrow(e, ServiceMessages.DELETE_FAILED, permCsid); - } - } - - @DELETE - @Path("{csid}/permroles") - public Response deletePermissionRole( - @PathParam("csid") String permCsid) { - logger.debug("Delete all the role relationships of the permissions with permCsid=" + permCsid); - ensureCSID(permCsid, ServiceMessages.DELETE_FAILED + "permroles permission "); - try { - PermissionRoleSubResource subResource = - new PermissionRoleSubResource(PermissionRoleSubResource.PERMISSION_PERMROLE_SERVICE); - //delete all relationships for a permission - subResource.deletePermissionRole(permCsid, SubjectType.ROLE); - return Response.status(HttpResponseCodes.SC_OK).build(); - } catch (Exception e) { - throw bigReThrow(e, ServiceMessages.DELETE_FAILED, permCsid); - } - } - -} diff --git a/services/authorization-mgt/service/src/main/java/org/collectionspace/services/authorization/storage/PermissionDocumentHandler.java.txt b/services/authorization-mgt/service/src/main/java/org/collectionspace/services/authorization/storage/PermissionDocumentHandler.java.txt deleted file mode 100644 index 9be3c7b6e2..0000000000 --- a/services/authorization-mgt/service/src/main/java/org/collectionspace/services/authorization/storage/PermissionDocumentHandler.java.txt +++ /dev/null @@ -1 +0,0 @@ -The PermissionDocumentHandler.java file has been move to the "org.collectionspace.services.common" module. \ No newline at end of file diff --git a/services/authorization/service/src/main/resources/applicationContext-authorization.xml b/services/authorization/service/src/main/resources/applicationContext-authorization.xml index 745d7422b7..d361d0149b 100644 --- a/services/authorization/service/src/main/resources/applicationContext-authorization.xml +++ b/services/authorization/service/src/main/resources/applicationContext-authorization.xml @@ -41,7 +41,7 @@ --> - + diff --git a/services/batch/service/src/main/java/org/collectionspace/services/batch/nuxeo/ReindexFullTextBatchJob.java b/services/batch/service/src/main/java/org/collectionspace/services/batch/nuxeo/ReindexFullTextBatchJob.java index 5aad4633cc..0061c74042 100644 --- a/services/batch/service/src/main/java/org/collectionspace/services/batch/nuxeo/ReindexFullTextBatchJob.java +++ b/services/batch/service/src/main/java/org/collectionspace/services/batch/nuxeo/ReindexFullTextBatchJob.java @@ -37,15 +37,15 @@ import org.nuxeo.ecm.core.api.CoreSession; import org.nuxeo.ecm.core.api.IterableQueryResult; import org.nuxeo.ecm.core.api.NuxeoException; +import org.nuxeo.ecm.core.api.repository.FulltextConfiguration; import org.nuxeo.ecm.core.event.EventService; import org.nuxeo.ecm.core.query.QueryFilter; import org.nuxeo.ecm.core.query.sql.NXQL; -import org.nuxeo.ecm.core.storage.FulltextConfiguration; +import org.nuxeo.ecm.core.storage.FulltextExtractorWork; import org.nuxeo.ecm.core.storage.sql.Model; import org.nuxeo.ecm.core.storage.sql.Node; import org.nuxeo.ecm.core.storage.sql.Session; import org.nuxeo.ecm.core.storage.sql.SimpleProperty; -import org.nuxeo.ecm.core.storage.sql.coremodel.SQLFulltextExtractorWork; import org.nuxeo.ecm.core.storage.sql.coremodel.SQLSession; import org.nuxeo.ecm.core.work.api.Work; import org.nuxeo.ecm.core.work.api.WorkManager; @@ -531,7 +531,7 @@ private void reindexDocuments(String docType, List csids) throws Excepti runAsyncBatch(asyncIds); // wait for async completion after transaction commit - Framework.getLocalService(EventService.class).waitForAsyncCompletion(); + Framework.getService(EventService.class).waitForAsyncCompletion(); } private List quoteList(List values) { @@ -642,7 +642,7 @@ protected void doBatch(List infos) { runAsyncBatch(asyncIds); // wait for async completion after transaction commit - Framework.getLocalService(EventService.class).waitForAsyncCompletion(); + Framework.getService(EventService.class).waitForAsyncCompletion(); } /* @@ -692,9 +692,9 @@ protected void runAsyncBatch(Set asyncIds) return; } String repositoryName = coreSession.getRepositoryName(); - WorkManager workManager = Framework.getLocalService(WorkManager.class); + WorkManager workManager = Framework.getService(WorkManager.class); for (String id : asyncIds) { - Work work = new SQLFulltextExtractorWork(repositoryName, id); + Work work = new FulltextExtractorWork(repositoryName, id, false, true, false); // schedule immediately, we're outside a transaction workManager.schedule(work, Scheduling.IF_NOT_SCHEDULED, false); } diff --git a/services/blob/service/src/main/java/org/collectionspace/services/blob/nuxeo/BlobDocumentModelHandler.java b/services/blob/service/src/main/java/org/collectionspace/services/blob/nuxeo/BlobDocumentModelHandler.java index dc0f4d9817..c30eff598b 100644 --- a/services/blob/service/src/main/java/org/collectionspace/services/blob/nuxeo/BlobDocumentModelHandler.java +++ b/services/blob/service/src/main/java/org/collectionspace/services/blob/nuxeo/BlobDocumentModelHandler.java @@ -41,7 +41,7 @@ import org.collectionspace.services.jaxb.BlobJAXBSchema; import org.collectionspace.services.nuxeo.client.java.CommonList; import org.collectionspace.services.nuxeo.client.java.CoreSessionInterface; -import org.nuxeo.ecm.core.api.ClientException; +import org.nuxeo.ecm.core.api.NuxeoException; import org.nuxeo.ecm.core.api.DocumentModel; import org.nuxeo.ecm.core.api.IdRef; import org.slf4j.Logger; @@ -49,7 +49,6 @@ import java.util.List; import java.util.Map; -import java.util.Set; import javax.ws.rs.core.MultivaluedMap; @@ -96,7 +95,7 @@ private BlobsCommon getCommonPartProperties(DocumentModel docModel) throws Excep } private void setCommonPartProperties(DocumentModel documentModel, - BlobsCommon blobsCommon) throws ClientException { + BlobsCommon blobsCommon) throws NuxeoException { try { String schemaName = getServiceContext().getCommonPartLabel(); PayloadOutputPart outputPart = new PayloadOutputPart(schemaName, blobsCommon); @@ -104,7 +103,7 @@ private void setCommonPartProperties(DocumentModel documentModel, Map propertyMap = DocumentUtils.parseProperties(schemaName, element, getServiceContext()); documentModel.setProperties(schemaName, propertyMap); } catch (Exception e) { - throw new ClientException(e); + throw new NuxeoException(e); } } diff --git a/services/common/pom.xml b/services/common/pom.xml index f7db542399..ceacd09ed5 100644 --- a/services/common/pom.xml +++ b/services/common/pom.xml @@ -64,8 +64,6 @@ org.collectionspace.services.publicitem.jaxb ${project.version} - org.collectionspace.services org.collectionspace.services.jaxb @@ -140,10 +138,16 @@ 2.0.1 - commons-dbcp - commons-dbcp - 1.3-RC1 + org.apache.commons + commons-dbcp2 + 2.13.0 provided + + + jakarta.transaction + jakarta.transaction-api + + commons-codec @@ -230,40 +234,24 @@ - org.nuxeo.binary.metadata + org.nuxeo.ecm.platform nuxeo-binary-metadata - ${nuxeo.platform.version} + ${nuxeo.general.release} org.nuxeo.lib.runtime nuxeo-runtime-launcher - ${nuxeo.platform.version} + ${nuxeo.general.release} org.nuxeo.ecm.platform - nuxeo-platform-types-api - ${nuxeo.platform.version} - - - org.nuxeo.ecm.platform - nuxeo-platform-types-core - ${nuxeo.platform.version} + nuxeo-platform-types + ${nuxeo.general.release} org.nuxeo.ecm.platform nuxeo-platform-imaging-core - ${nuxeo.platform.version} - - - org.nuxeo.ecm.platform - nuxeo-platform-imaging-api - ${nuxeo.platform.version} - provided - - - org.nuxeo.ecm.platform - nuxeo-platform-filemanager-api - ${nuxeo.platform.version} + ${nuxeo.general.release} org.nuxeo.common @@ -281,7 +269,7 @@ org.nuxeo.ecm.core nuxeo-core-query - ${nuxeo.core.version} + ${nuxeo.general.release} org.nuxeo.ecm.core @@ -291,12 +279,6 @@ org.nuxeo.ecm.core nuxeo-core-storage-sql - org.nuxeo.ecm.core nuxeo-core-convert @@ -304,7 +286,7 @@ org.nuxeo.runtime nuxeo-runtime-osgi - ${nuxeo.core.version} + ${nuxeo.general.release} org.nuxeo.ecm.core @@ -329,6 +311,15 @@ com.sun.xml.ws jaxws-rt + + javax.xml.bind + jaxb-api + + + + org.codehaus.woodstox + woodstox-core-asl + diff --git a/services/common/src/main/java/org/collectionspace/services/common/context/ServiceBindingUtils.java b/services/common/src/main/java/org/collectionspace/services/common/context/ServiceBindingUtils.java index 9404590b19..c05f57f237 100644 --- a/services/common/src/main/java/org/collectionspace/services/common/context/ServiceBindingUtils.java +++ b/services/common/src/main/java/org/collectionspace/services/common/context/ServiceBindingUtils.java @@ -15,7 +15,7 @@ import org.collectionspace.services.config.types.PropertyItemType; import org.collectionspace.services.config.types.PropertyType; import org.collectionspace.services.nuxeo.util.NuxeoUtils; -import org.nuxeo.ecm.core.api.ClientException; +import org.nuxeo.ecm.core.api.NuxeoException; import org.nuxeo.ecm.core.api.DocumentModel; import java.lang.IndexOutOfBoundsException; @@ -218,7 +218,7 @@ public static String getMappedFieldInDoc(ServiceBindingType sb, logger.trace("SBUtils.getMappedField caught OOB exc, for Prop: " + propName + " in: " + docModel.getDocumentType().getName() + " csid: " + NuxeoUtils.getCsid(docModel)); - } catch (ClientException ce) { + } catch (NuxeoException ce) { throw new RuntimeException( "getMappedFieldInDoc: Problem fetching: " + propName + " logicalfieldName: " + logicalFieldName diff --git a/services/common/src/main/java/org/collectionspace/services/common/document/DocumentUtils.java b/services/common/src/main/java/org/collectionspace/services/common/document/DocumentUtils.java index c1b7ab430a..e9252e7198 100644 --- a/services/common/src/main/java/org/collectionspace/services/common/document/DocumentUtils.java +++ b/services/common/src/main/java/org/collectionspace/services/common/document/DocumentUtils.java @@ -753,7 +753,7 @@ private static void buildList(Document document, Element element, */ public static Schema getSchemaFromName(String schemaName) { SchemaManager schemaManager = Framework - .getLocalService(SchemaManager.class); + .getService(SchemaManager.class); return schemaManager.getSchema(schemaName); } diff --git a/services/common/src/main/java/org/collectionspace/services/common/imaging/nuxeo/ImagePlugin.javax b/services/common/src/main/java/org/collectionspace/services/common/imaging/nuxeo/ImagePlugin.javax index 2d7d8dbff9..845ceaa0b7 100644 --- a/services/common/src/main/java/org/collectionspace/services/common/imaging/nuxeo/ImagePlugin.javax +++ b/services/common/src/main/java/org/collectionspace/services/common/imaging/nuxeo/ImagePlugin.javax @@ -24,7 +24,7 @@ import java.util.Map; import org.nuxeo.common.utils.IdUtils; import org.nuxeo.ecm.core.api.Blob; -import org.nuxeo.ecm.core.api.ClientException; +import org.nuxeo.ecm.core.api.NuxeoException; import org.nuxeo.ecm.core.api.CoreSession; import org.nuxeo.ecm.core.api.DocumentModel; import org.nuxeo.ecm.core.api.DocumentRef; @@ -39,6 +39,7 @@ import org.nuxeo.ecm.platform.types.TypeManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +// TODO: This file is named incorrectly. What was it supposed to be for? public class ImagePlugin extends AbstractFileImporter { private static final long serialVersionUID = 5850210255138418118L; @@ -47,7 +48,7 @@ public class ImagePlugin extends AbstractFileImporter { public DocumentModel create(CoreSession documentManager, Blob content, String path, boolean overwrite, String fullname, - TypeManager typeService) throws ClientException, IOException { + TypeManager typeService) throws NuxeoException, IOException { path = getNearestContainerPath(documentManager, path); doSecurityCheck(documentManager, path, ImagingDocumentConstants.PICTURE_TYPE_NAME, typeService); diff --git a/services/common/src/main/java/org/collectionspace/services/common/imaging/nuxeo/NuxeoBlobUtils.java b/services/common/src/main/java/org/collectionspace/services/common/imaging/nuxeo/NuxeoBlobUtils.java index 2b638550da..0aa2ceeef1 100644 --- a/services/common/src/main/java/org/collectionspace/services/common/imaging/nuxeo/NuxeoBlobUtils.java +++ b/services/common/src/main/java/org/collectionspace/services/common/imaging/nuxeo/NuxeoBlobUtils.java @@ -61,7 +61,6 @@ import org.nuxeo.ecm.core.api.model.Property; import org.nuxeo.binary.metadata.api.BinaryMetadataService; import org.nuxeo.ecm.core.api.Blob; -import org.nuxeo.ecm.core.api.ClientException; import org.nuxeo.ecm.core.api.DocumentModel; import org.nuxeo.ecm.core.api.DocumentRef; import org.nuxeo.ecm.core.api.PropertyException; @@ -511,7 +510,7 @@ static private BlobsCommon createBlobsCommon(ServiceContext ctx, DocumentModel d ThumbnailConstants.THUMBNAIL_FILENAME_PROPERTY_NAME); Blob thumbnailBlob = (Blob)documentModel.getProperty(ThumbnailConstants.THUMBNAIL_SCHEMA_NAME, ThumbnailConstants.THUMBNAIL_PROPERTY_NAME); - } catch (ClientException e) { + } catch (NuxeoException e) { errorMsg = "Could not extract the name of the thumbnail preview image file."; if (logger.isDebugEnabled()) { logger.debug(errorMsg, e); @@ -530,7 +529,7 @@ static private BlobsCommon createBlobsCommon(ServiceContext ctx, DocumentModel d } static private Blob checkMimeType(Blob blob, String fullname) - throws ClientException { + throws NuxeoException { final String mimeType = blob.getMimeType(); if (mimeType != null && !mimeType.equals("application/octet-stream") && !mimeType.equals("application/octetstream")) { @@ -540,7 +539,7 @@ static private Blob checkMimeType(Blob blob, String fullname) try { blob = getMimeService().updateMimetype(blob, filename); } catch (MimetypeDetectionException e) { - throw new ClientException(e); + throw new NuxeoException(e); } return blob; } @@ -549,16 +548,16 @@ static private Blob checkMimeType(Blob blob, String fullname) * Gets the type service. Not in use, but please keep for future reference * * @return the type service - * @throws ClientException + * @throws NuxeoException * the client exception */ - private static TypeManager getTypeService() throws ClientException { + private static TypeManager getTypeService() throws NuxeoException { TypeManager typeService = null; try { typeService = Framework.getService(TypeManager.class); } catch (Exception e) { - throw new ClientException(e); + throw new NuxeoException(e); } return typeService; @@ -579,10 +578,10 @@ private static Blob createFileBlob(File file, boolean isTemporary) throws Except * Gets Nuxeo's file manager service. * * @return the file manager service - * @throws ClientException + * @throws NuxeoException * the client exception */ - private static FileManager getFileManager() throws ClientException { + private static FileManager getFileManager() throws NuxeoException { FileManager result = null; try { @@ -590,7 +589,7 @@ private static FileManager getFileManager() throws ClientException { } catch (Exception e) { String msg = "Unable to get Nuxeo's FileManager service."; logger.error(msg, e); - throw new ClientException("msg", e); + throw new NuxeoException("msg", e); } return result; @@ -600,10 +599,10 @@ private static FileManager getFileManager() throws ClientException { * Gets Nuxeo's file manager service. * * @return the file manager service - * @throws ClientException + * @throws NuxeoException * the client exception */ - private static FileManagerService getFileManagerService() throws ClientException { + private static FileManagerService getFileManagerService() throws NuxeoException { FileManagerService result = null; try { @@ -611,7 +610,7 @@ private static FileManagerService getFileManagerService() throws ClientException } catch (Exception e) { String msg = "Unable to get Nuxeo's FileManager service."; logger.error(msg, e); - throw new ClientException("msg", e); + throw new NuxeoException("msg", e); } return result; @@ -639,13 +638,13 @@ static private void releaseRepositorySession(ServiceContext getDocFromCsid(ServiceContext ctx, String csid) throws Exception; - public String getDocURI(DocumentWrapper wrappedDoc) throws ClientException; + public String getDocURI(DocumentWrapper wrappedDoc) throws NuxeoException; /** * Find wrapped documentModel from the Nuxeo repository 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 5233aadf06..3fca65de8f 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 @@ -31,11 +31,11 @@ import javax.ws.rs.core.Response; -import org.nuxeo.ecm.core.api.ClientException; import org.nuxeo.ecm.core.api.DocumentModel; import org.nuxeo.ecm.core.api.DocumentModelList; +import org.nuxeo.ecm.core.api.NuxeoException; import org.nuxeo.ecm.core.api.model.Property; -import org.nuxeo.ecm.core.api.model.PropertyException; +import org.nuxeo.ecm.core.api.PropertyException; import org.nuxeo.ecm.core.api.model.PropertyNotFoundException; import org.nuxeo.ecm.core.api.model.impl.primitives.StringProperty; import org.slf4j.Logger; @@ -48,7 +48,6 @@ import org.collectionspace.services.client.Profiler; import org.collectionspace.services.common.CSWebApplicationException; import org.collectionspace.services.common.ServiceMain; -import org.collectionspace.services.common.ServletTools; import org.collectionspace.services.common.StoredValuesUriTemplate; import org.collectionspace.services.common.UriTemplateFactory; import org.collectionspace.services.common.UriTemplateRegistry; @@ -141,7 +140,7 @@ public static Specifier getSpecifier(String identifier, String method, String op identifier.substring(URN_ID_PREFIX_LEN, closeParen)); } } else { - logger.error(method + ": bad or missing specifier!"); + logger.error("{}: bad or missing specifier!", method); Response response = Response.status(Response.Status.BAD_REQUEST).entity( op + " failed on bad or missing Authority specifier").type( "text/plain").build(); @@ -546,7 +545,8 @@ public static int updateAuthorityRefDocs( break; } docsInCurrentPage = docList.size(); - logger.debug("updateAuthorityRefDocs: current page=" + currentPage + " documents included in page=" + docsInCurrentPage); + logger.debug("updateAuthorityRefDocs: current page={} documents included in page={}", currentPage, + docsInCurrentPage); if (docsInCurrentPage == 0) { logger.debug("updateAuthorityRefDocs: no more documents requiring refName updates could be found"); break; @@ -575,11 +575,13 @@ public static int updateAuthorityRefDocs( } } catch (Exception e) { - logger.error("Internal error updating the AuthorityRefDocs: " + e.getLocalizedMessage()); + logger.error("Internal error updating the AuthorityRefDocs: {}", e.getLocalizedMessage()); logger.debug(Tools.errorToString(e, true)); throw e; } - logger.debug("updateAuthorityRefDocs replaced a total of " + nRefsFound + " authority references, within as many as " + docsScanned + " scanned document(s)"); + logger.debug( + "updateAuthorityRefDocs replaced a total of {} authority references, within as many as {} scanned document(s)", + nRefsFound, docsScanned); return nRefsFound; } @@ -794,7 +796,7 @@ private static String computeWhereClauseForAuthorityRefDocs( } // TODO there are multiple copies of this that should be put somewhere common. - protected static String getRefname(DocumentModel docModel) throws ClientException { + protected static String getRefname(DocumentModel docModel) throws NuxeoException { String result = (String)docModel.getProperty(CollectionSpaceClient.COLLECTIONSPACE_CORE_SCHEMA, CollectionSpaceClient.COLLECTIONSPACE_CORE_REFNAME); return result; @@ -903,7 +905,7 @@ private static long processRefObjsDocList( try { String itemRefName = getRefname(docModel); ilistItem.setRefName(itemRefName); - } catch (ClientException ce) { + } catch (NuxeoException ce) { throw new RuntimeException( "processRefObjsDocList: Problem fetching refName from item Object: " + ce.getLocalizedMessage()); @@ -924,19 +926,20 @@ private static long processRefObjsDocList( additionalValues.put(UriTemplateFactory.ITEM_IDENTIFIER_VAR, csid); uri = template.buildUri(additionalValues); } catch (Exception e) { - logger.warn("Could not extract inAuthority property from authority item record: " + e.getMessage()); + logger.warn("Could not extract inAuthority property from authority item record: {}", + e.getMessage()); } } else if (template.getUriTemplateType() == UriTemplateFactory.CONTACT) { // FIXME: Generating contact sub-resource URIs requires additional work, // as a follow-on to CSPACE-5271 - ADR 2012-08-16 // Sets the default (empty string) value for uri, for now } else { - logger.warn("Unrecognized URI template type = " + template.getUriTemplateType()); + logger.warn("Unrecognized URI template type = {}", template.getUriTemplateType()); // Sets the default (empty string) value for uri } } else { // (if template == null) - logger.warn("Could not retrieve URI template from registry via tenant ID " - + tenantId + " and docType " + docType); + logger.warn("Could not retrieve URI template from registry via tenant ID {} and docType {}", + tenantId, docType); // Sets the default (empty string) value for uri } ilistItem.setUri(uri); @@ -944,7 +947,7 @@ private static long processRefObjsDocList( ilistItem.setWorkflowState(docModel.getCurrentLifeCycleState()); ilistItem.setUpdatedAt(NuxeoDocumentModelHandler.getUpdatedAtAsString(docModel)); } catch (Exception e) { - logger.error("Error getting core values for doc [" + csid + "]: " + e.getLocalizedMessage()); + logger.error("Error getting core values for doc [{}]: {}", csid, e.getLocalizedMessage()); } ilistItem.setDocType(docType); ilistItem.setDocNumber( @@ -991,19 +994,15 @@ private static long processRefObjsDocList( :refName.equals(docRefName)) { // We found the self for an item foundSelf = true; - logger.trace("getAuthorityRefDocs: Result: " - + docType + " [" + NuxeoUtils.getCsid(docModel) - + "] appears to be self for: [" - + refName + "]"); + logger.trace("getAuthorityRefDocs: Result: {} [{}] appears to be self for: [{}]", docType, + NuxeoUtils.getCsid(docModel), refName); } else { nRefsFalsePositives++; - logger.trace("getAuthorityRefDocs: Result: " - + docType + " [" + NuxeoUtils.getCsid(docModel) - + "] does not reference [" - + refName + "]"); + logger.trace("getAuthorityRefDocs: Result: {} [{}] does not reference [{}]", docType, + NuxeoUtils.getCsid(docModel), refName); } } - } catch (ClientException ce) { + } catch (NuxeoException ce) { throw new RuntimeException( "getAuthorityRefDocs: Problem fetching values from repo: " + ce.getLocalizedMessage()); } @@ -1094,7 +1093,7 @@ public static List findAuthRefPropertiesInDoc( Property prop = docModel.getProperty(arci.pathEls[0]); findAuthRefPropertiesInProperty(authRefInfoList, prop, arci, 0, refNameToMatch, matchBaseOnly); } catch (Exception e) { - logger.error("Problem fetching property: " + arci.pathEls[0]); + logger.error("Problem fetching property: {}", arci.pathEls[0]); } } return authRefInfoList; @@ -1124,8 +1123,8 @@ private static List findAuthRefPropertiesInProperty( for (Property listItemProp : propList) { if (listItemProp instanceof StringProperty) { if (arci.pathEls.length - pathStartIndex != 1) { - logger.error("Configuration for authRefs does not match schema structure: " - + arci.pathEls.toString()); + logger.error("Configuration for authRefs does not match schema structure: {}", + arci.pathEls.toString()); break; } else { addARIifMatches(refNameToMatch, matchBaseOnly, arci, listItemProp, authRefInfoList); @@ -1136,8 +1135,8 @@ private static List findAuthRefPropertiesInProperty( findAuthRefPropertiesInProperty(authRefInfoList, listItemProp, arci, pathStartIndex + 2, refNameToMatch, matchBaseOnly); } else { - logger.error("Configuration for authRefs does not match schema structure: " - + arci.pathEls.toString()); + logger.error("Configuration for authRefs does not match schema structure: {}", + arci.pathEls.toString()); break; } } @@ -1149,13 +1148,11 @@ private static List findAuthRefPropertiesInProperty( findAuthRefPropertiesInProperty(authRefInfoList, localProp, arci, pathStartIndex, refNameToMatch, matchBaseOnly); } catch (PropertyNotFoundException pnfe) { - logger.error("Could not find property: [" + localPropName + "] in path: " - + arci.getFullPath()); + logger.error("Could not find property: [{}] in path: {}", localPropName, arci.getFullPath()); // Fall through - ari will be null and we will continue... } } else { - logger.error("Configuration for authRefs does not match schema structure: " - + arci.pathEls.toString()); + logger.error("Configuration for authRefs does not match schema structure: {}", arci.pathEls.toString()); } if (ari != null) { @@ -1181,12 +1178,12 @@ private static void addARIifMatches( :refNameToMatch.equals(value))) || ((refNameToMatch == null) && Tools.notBlank(value))) { // Found a match - logger.debug("Found a match on property: " + prop.getPath() + " with value: [" + value + "]"); + logger.debug("Found a match on property: {} with value: [{}]", prop.getXPath(), value); AuthRefInfo ari = new AuthRefInfo(arci, prop); authRefInfoList.add(ari); } } catch (PropertyException pe) { - logger.debug("PropertyException on: " + prop.getPath() + pe.getLocalizedMessage()); + logger.debug("PropertyException on: {}{}", prop.getXPath(), pe.getLocalizedMessage()); } } diff --git a/services/common/src/main/java/org/collectionspace/services/common/workflow/service/nuxeo/WorkflowDocumentModelHandler.java b/services/common/src/main/java/org/collectionspace/services/common/workflow/service/nuxeo/WorkflowDocumentModelHandler.java index 0842347f8a..bc76307873 100644 --- a/services/common/src/main/java/org/collectionspace/services/common/workflow/service/nuxeo/WorkflowDocumentModelHandler.java +++ b/services/common/src/main/java/org/collectionspace/services/common/workflow/service/nuxeo/WorkflowDocumentModelHandler.java @@ -39,8 +39,8 @@ import org.collectionspace.services.nuxeo.client.java.NuxeoDocumentModelHandler; import org.collectionspace.services.nuxeo.client.java.DocumentModelHandler; import org.collectionspace.services.workflow.WorkflowCommon; -import org.nuxeo.ecm.core.api.ClientException; import org.nuxeo.ecm.core.api.DocumentModel; +import org.nuxeo.ecm.core.api.NuxeoException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -83,7 +83,7 @@ public void handleUpdate(DocumentWrapper wrapDoc) throws Exceptio } @Override - protected void handleRefNameChanges(ServiceContext ctx, DocumentModel docModel) throws ClientException { + protected void handleRefNameChanges(ServiceContext ctx, DocumentModel docModel) throws NuxeoException { // // We are intentionally overriding this method to do nothing since the Workflow resource is a meta-resource without a refname // @@ -172,8 +172,7 @@ public void fillAllParts(DocumentWrapper wrapDoc, Action action) String msg = "Unable to follow workflow transition to state = " + transitionToFollow; logger.error(msg, e); - ClientException ce = new ClientException("Unable to follow workflow transition: " + transitionToFollow); - throw ce; + throw new NuxeoException("Unable to follow workflow transition: " + transitionToFollow); } } diff --git a/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/CoreSessionInterface.java b/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/CoreSessionInterface.java index 1c45a4805a..c3243ff5b2 100644 --- a/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/CoreSessionInterface.java +++ b/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/CoreSessionInterface.java @@ -3,13 +3,13 @@ import java.security.Principal; import org.collectionspace.services.common.document.DocumentException; -import org.nuxeo.ecm.core.api.ClientException; import org.nuxeo.ecm.core.api.CoreSession; import org.nuxeo.ecm.core.api.DocumentModel; import org.nuxeo.ecm.core.api.DocumentModelList; import org.nuxeo.ecm.core.api.DocumentRef; import org.nuxeo.ecm.core.api.Filter; import org.nuxeo.ecm.core.api.IterableQueryResult; +import org.nuxeo.ecm.core.api.NuxeoException; import org.nuxeo.ecm.core.api.event.DocumentEventTypes; import org.nuxeo.ecm.core.api.impl.LifeCycleFilter; @@ -25,10 +25,10 @@ public interface CoreSessionInterface { * Gets the root document of this repository. * * @return the root document. cannot be null - * @throws ClientException + * @throws NuxeoException * @throws SecurityException */ - public DocumentModel getRootDocument() throws ClientException; + public DocumentModel getRootDocument() throws NuxeoException; /** * Gets the current session id. @@ -60,12 +60,12 @@ public interface CoreSessionInterface { public Principal getPrincipal(); public IterableQueryResult queryAndFetch(String query, String queryType, - Object... params) throws ClientException, DocumentException; + Object... params) throws NuxeoException, DocumentException; public DocumentModelList query(String query, Filter filter, long limit, - long offset, boolean countTotal) throws ClientException, DocumentException; + long offset, boolean countTotal) throws NuxeoException, DocumentException; - public DocumentModelList query(String query) throws ClientException, DocumentException; + public DocumentModelList query(String query) throws NuxeoException, DocumentException; /** * Executes the given NXQL query an returns the result. @@ -73,10 +73,10 @@ public DocumentModelList query(String query, Filter filter, long limit, * @param query the query to execute * @param max number of document to retrieve * @return the query result - * @throws ClientException + * @throws NuxeoException * @throws DocumentException */ - public DocumentModelList query(String query, int max) throws ClientException, DocumentException; + public DocumentModelList query(String query, int max) throws NuxeoException, DocumentException; /** * Executes the given NXQL query and returns the result that matches the @@ -86,7 +86,7 @@ public DocumentModelList query(String query, Filter filter, long limit, * @param filter the filter to apply to result * @return the query result * @throws DocumentException - * @throws ClientException + * @throws NuxeoException */ public DocumentModelList query(String query, LifeCycleFilter workflowStateFilter) throws DocumentException; @@ -101,30 +101,30 @@ public DocumentModelList query(String query, Filter filter, long limit, * * @param docRef the document reference * @return the document - * @throws ClientException + * @throws NuxeoException * @throws SecurityException */ - public DocumentModel getDocument(DocumentRef docRef) throws ClientException; + public DocumentModel getDocument(DocumentRef docRef) throws NuxeoException; - public DocumentModel saveDocument(DocumentModel docModel) throws ClientException; + public DocumentModel saveDocument(DocumentModel docModel) throws NuxeoException; - public void save() throws ClientException; + public void save() throws NuxeoException; /** * Bulk document saving. * * @param docModels the document models that needs to be saved - * @throws ClientException + * @throws NuxeoException */ - public void saveDocuments(DocumentModel[] docModels) throws ClientException; + public void saveDocuments(DocumentModel[] docModels) throws NuxeoException; /** * Removes this document and all its children, if any. * * @param docRef the reference to the document to remove - * @throws ClientException + * @throws NuxeoException */ - public void removeDocument(DocumentRef docRef) throws ClientException; + public void removeDocument(DocumentRef docRef) throws NuxeoException; /** * Creates a document model using required information. @@ -139,10 +139,10 @@ public DocumentModelList query(String query, Filter filter, long limit, * @param id * @param typeName * @return the initial document model - * @throws ClientException + * @throws NuxeoException */ public DocumentModel createDocumentModel(String parentPath, String id, - String typeName) throws ClientException; + String typeName) throws NuxeoException; /** * Creates a document using given document model for initialization. @@ -153,9 +153,9 @@ public DocumentModel createDocumentModel(String parentPath, String id, * * @param model the document model to use for initialization * @return the created document - * @throws ClientException + * @throws NuxeoException */ - public DocumentModel createDocument(DocumentModel model) throws ClientException; + public DocumentModel createDocument(DocumentModel model) throws NuxeoException; /** * Gets the children of the given parent. @@ -163,9 +163,9 @@ public DocumentModel createDocumentModel(String parentPath, String id, * @param parent the parent reference * @return the children if any, an empty list if no children or null if the * specified parent document is not a folder - * @throws ClientException + * @throws NuxeoException */ - public DocumentModelList getChildren(DocumentRef parent) throws ClientException; + public DocumentModelList getChildren(DocumentRef parent) throws NuxeoException; } diff --git a/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/CoreSessionWrapper.java b/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/CoreSessionWrapper.java index 14459dfdf0..953e9ed5ca 100644 --- a/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/CoreSessionWrapper.java +++ b/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/CoreSessionWrapper.java @@ -14,12 +14,12 @@ import java.util.regex.Pattern; import org.collectionspace.services.common.document.DocumentException; -import org.nuxeo.ecm.core.api.ClientException; import org.nuxeo.ecm.core.api.DocumentModel; import org.nuxeo.ecm.core.api.DocumentModelList; import org.nuxeo.ecm.core.api.DocumentRef; import org.nuxeo.ecm.core.api.Filter; import org.nuxeo.ecm.core.api.IterableQueryResult; +import org.nuxeo.ecm.core.api.NuxeoException; import org.nuxeo.ecm.core.api.event.DocumentEventTypes; import org.nuxeo.ecm.core.api.impl.LifeCycleFilter; import org.nuxeo.ecm.core.api.CoreSession; @@ -96,11 +96,11 @@ public void close() throws Exception { * Gets the root document of this repository. * * @return the root document. cannot be null - * @throws ClientException + * @throws NuxeoException * @throws SecurityException */ @Override - public DocumentModel getRootDocument() throws ClientException { + public DocumentModel getRootDocument() throws NuxeoException { return repoSession.getRootDocument(); } @@ -171,7 +171,7 @@ private String localizeTimestamps(String query) throws DocumentException { @Override public IterableQueryResult queryAndFetch(String query, String queryType, - Object... params) throws ClientException, DocumentException { + Object... params) throws NuxeoException, DocumentException { query = localizeTimestamps(query); logQuery(query, queryType); return repoSession.queryAndFetch(query, queryType, params); @@ -179,21 +179,21 @@ public IterableQueryResult queryAndFetch(String query, String queryType, @Override public DocumentModelList query(String query, Filter filter, long limit, - long offset, boolean countTotal) throws ClientException, DocumentException { + long offset, boolean countTotal) throws NuxeoException, DocumentException { query = localizeTimestamps(query); logQuery(query, filter, limit, offset, countTotal); return repoSession.query(query, filter, limit, offset, countTotal); } @Override - public DocumentModelList query(String query, int max) throws ClientException, DocumentException { + public DocumentModelList query(String query, int max) throws NuxeoException, DocumentException { query = localizeTimestamps(query); logQuery(query); return repoSession.query(query, max); } @Override - public DocumentModelList query(String query) throws ClientException, DocumentException { + public DocumentModelList query(String query) throws NuxeoException, DocumentException { query = localizeTimestamps(query); logQuery(query); return repoSession.query(query); @@ -216,16 +216,16 @@ public DocumentModelList query(String query, LifeCycleFilter workflowStateFilter * * @param docRef the document reference * @return the document - * @throws ClientException + * @throws NuxeoException * @throws SecurityException */ @Override - public DocumentModel getDocument(DocumentRef docRef) throws ClientException { + public DocumentModel getDocument(DocumentRef docRef) throws NuxeoException { return repoSession.getDocument(docRef); } @Override - public DocumentModel saveDocument(DocumentModel docModel) throws ClientException { + public DocumentModel saveDocument(DocumentModel docModel) throws NuxeoException { DocumentModel result = null; try { @@ -244,7 +244,7 @@ public DocumentModel saveDocument(DocumentModel docModel) throws ClientException } @Override - public void save() throws ClientException { + public void save() throws NuxeoException { try { if (isTransactionMarkedForRollbackOnly() == false) { repoSession.save(); @@ -262,10 +262,10 @@ public void save() throws ClientException { * Bulk document saving. * * @param docModels the document models that needs to be saved - * @throws ClientException + * @throws NuxeoException */ @Override - public void saveDocuments(DocumentModel[] docModels) throws ClientException { + public void saveDocuments(DocumentModel[] docModels) throws NuxeoException { try { if (isTransactionMarkedForRollbackOnly() == false) { repoSession.saveDocuments(docModels); @@ -283,10 +283,10 @@ public void saveDocuments(DocumentModel[] docModels) throws ClientException { * Removes this document and all its children, if any. * * @param docRef the reference to the document to remove - * @throws ClientException + * @throws NuxeoException */ @Override - public void removeDocument(DocumentRef docRef) throws ClientException { + public void removeDocument(DocumentRef docRef) throws NuxeoException { repoSession.removeDocument(docRef); } @@ -303,11 +303,11 @@ public void removeDocument(DocumentRef docRef) throws ClientException { * @param id * @param typeName * @return the initial document model - * @throws ClientException + * @throws NuxeoException */ @Override public DocumentModel createDocumentModel(String parentPath, String id, - String typeName) throws ClientException { + String typeName) throws NuxeoException { return repoSession.createDocumentModel(parentPath, id, typeName); } @@ -320,10 +320,10 @@ public DocumentModel createDocumentModel(String parentPath, String id, * * @param model the document model to use for initialization * @return the created document - * @throws ClientException + * @throws NuxeoException */ @Override - public DocumentModel createDocument(DocumentModel model) throws ClientException { + public DocumentModel createDocument(DocumentModel model) throws NuxeoException { return repoSession.createDocument(model); } @@ -333,10 +333,10 @@ public DocumentModel createDocument(DocumentModel model) throws ClientException * @param parent the parent reference * @return the children if any, an empty list if no children or null if the * specified parent document is not a folder - * @throws ClientException + * @throws NuxeoException */ @Override - public DocumentModelList getChildren(DocumentRef parent) throws ClientException { + public DocumentModelList getChildren(DocumentRef parent) throws NuxeoException { return repoSession.getChildren(parent); } diff --git a/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/DocumentModelHandler.java b/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/DocumentModelHandler.java index 828260d44a..083a28250a 100644 --- a/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/DocumentModelHandler.java +++ b/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/DocumentModelHandler.java @@ -54,10 +54,10 @@ import org.collectionspace.services.common.vocabulary.RefNameServiceUtils.AuthRefConfigInfo; import org.collectionspace.services.common.vocabulary.RefNameServiceUtils.Specifier; import org.collectionspace.services.lifecycle.Lifecycle; -import org.nuxeo.ecm.core.api.ClientException; import org.nuxeo.ecm.core.api.DocumentModel; import org.nuxeo.ecm.core.api.DocumentModelList; -import org.nuxeo.ecm.core.api.model.PropertyException; +import org.nuxeo.ecm.core.api.NuxeoException; +import org.nuxeo.ecm.core.api.PropertyException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -264,7 +264,7 @@ protected RefName.RefNameInterface getRefName(DocumentWrapper doc } private void handleCoreValues(DocumentWrapper docWrapper, - Action action) throws ClientException { + Action action) throws NuxeoException { DocumentModel documentModel = docWrapper.getWrappedObject(); String now = GregorianCalendarDateTimeUtils.timestampUTC(); ServiceContext ctx = getServiceContext(); @@ -352,7 +352,7 @@ protected boolean hasRefNameUpdate() { return result; } - protected void handleRefNameChanges(ServiceContext ctx, DocumentModel docModel) throws ClientException { + protected void handleRefNameChanges(ServiceContext ctx, DocumentModel docModel) throws NuxeoException { // First get the old refName this.oldRefNameOnUpdate = (String)docModel.getProperty(CollectionSpaceClient.COLLECTIONSPACE_CORE_SCHEMA, CollectionSpaceClient.COLLECTIONSPACE_CORE_REFNAME); diff --git a/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/NuxeoClientEmbedded.java b/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/NuxeoClientEmbedded.java index 559e3ccf49..38b05736c6 100644 --- a/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/NuxeoClientEmbedded.java +++ b/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/NuxeoClientEmbedded.java @@ -23,24 +23,20 @@ import java.util.HashMap; import java.util.Iterator; import java.util.Map.Entry; -import java.security.Principal; +import javax.transaction.TransactionManager; import org.collectionspace.services.common.context.ServiceContext; import org.collectionspace.services.common.repository.RepositoryInstanceWrapperAdvice; import org.collectionspace.services.config.tenant.RepositoryDomainType; -import org.nuxeo.ecm.core.api.repository.Repository; import org.nuxeo.ecm.core.api.CoreInstance; import org.nuxeo.ecm.core.api.CoreSession; import org.nuxeo.ecm.core.api.NuxeoPrincipal; import org.nuxeo.ecm.core.api.SystemPrincipal; +import org.nuxeo.ecm.core.api.repository.Repository; import org.nuxeo.ecm.core.api.repository.RepositoryManager; import org.nuxeo.runtime.api.Framework; import org.nuxeo.runtime.jtajca.NuxeoContainer; import org.nuxeo.runtime.transaction.TransactionHelper; - -import javax.transaction.TransactionManager; -import javax.transaction.UserTransaction; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.aop.framework.ProxyFactory; @@ -278,9 +274,8 @@ private CoreSessionInterface getAOPProxy(CoreSession repositoryInstance) { return result; } - private Principal getSystemPrincipal() { - NuxeoPrincipal principal = new SystemPrincipal(null); - return principal; + private NuxeoPrincipal getSystemPrincipal() { + return new SystemPrincipal(null); } /* @@ -291,31 +286,30 @@ private Principal getSystemPrincipal() { */ private CoreSessionInterface getCoreSessionWrapper(Repository repository) { CoreSessionInterface result = null; - + CoreSession coreSession = null; try { - coreSession = CoreInstance.openCoreSession(repository.getName(), getSystemPrincipal()); // A Nuxeo repo instance handler proxy + // A Nuxeo repo instance handler proxy + coreSession = CoreInstance.getCoreSession(repository.getName(), getSystemPrincipal()); } catch (Exception e) { - logger.warn(String.format("Could not open a session to the '%s' repository. The current request to the CollectionSpace services API will fail.", - repository != null ? repository.getName() : "not specified"), e); + logger.warn( + "Could not open a session to the '{}' repository. The current request to the CollectionSpace services API will fail.", + repository != null ? repository.getName() : "not specified", e); } - + if (coreSession != null) { result = this.getAOPProxy(coreSession); // This is our AOP proxy if (result != null) { String key = result.getSessionId(); repositoryInstances.put(key, result); } else { - // - // Since we couldn't get an AOP proxy, we need to close the core session. - // - CoreInstance.closeCoreSession(coreSession); - String errMsg = String.format("Could not instantiate a Spring AOP proxy for class '%s'.", - CoreSessionWrapper.class.getName()); - logger.error(errMsg); + // This is now a no-op and probably isn't necessary + coreSession.close(); + logger.error("Could not instantiate a Spring AOP proxy for class '{}'.", + CoreSessionWrapper.class.getName()); } } - + return result; } diff --git a/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/NuxeoConnectorEmbedded.java b/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/NuxeoConnectorEmbedded.java index 0fca95e1c8..61f41379ef 100644 --- a/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/NuxeoConnectorEmbedded.java +++ b/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/NuxeoConnectorEmbedded.java @@ -139,13 +139,13 @@ private void startNuxeoEP(String serverRootPath) throws Exception { try { Repository defaultRepo = Framework.getService(RepositoryManager.class).getDefaultRepository(); - coreSession = CoreInstance.openCoreSession(defaultRepo.getName(), new SystemPrincipal(null)); + coreSession = CoreInstance.getCoreSession(defaultRepo.getName(), new SystemPrincipal(null)); } catch (Throwable t) { logger.error(t.getMessage()); throw new RuntimeException("Could not start the Nuxeo EP Framework", t); } finally { if (coreSession != null) { - CoreInstance.closeCoreSession(coreSession); + coreSession.close(); } if (transactionStarted) { diff --git a/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/NuxeoDocumentException.java b/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/NuxeoDocumentException.java index 1ed3cfe00d..b96b95ce51 100644 --- a/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/NuxeoDocumentException.java +++ b/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/NuxeoDocumentException.java @@ -5,7 +5,6 @@ import org.apache.http.HttpStatus; import org.nuxeo.ecm.core.api.ConcurrentUpdateException; -import org.nuxeo.ecm.core.api.WrappedException; public class NuxeoDocumentException extends DocumentException { @@ -50,11 +49,8 @@ private static String getExceptionClassName(Throwable exception) { if (exception != null) { result = exception.getClass().getCanonicalName(); - if (exception instanceof WrappedException) { - result = ((WrappedException)exception).getClassName(); // Nuxeo wraps the original exception, so we need to get the name of it. - } } - + return result; } diff --git a/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/NuxeoRepositoryClientImpl.java b/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/NuxeoRepositoryClientImpl.java index 537cba57ae..a9cf5d8233 100644 --- a/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/NuxeoRepositoryClientImpl.java +++ b/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/NuxeoRepositoryClientImpl.java @@ -28,17 +28,13 @@ import java.util.Map; import java.util.Set; import java.util.UUID; - import javax.sql.rowset.CachedRowSet; import javax.ws.rs.core.MultivaluedMap; -// -// CSPACE-5036 - How to make CMISQL queries from Nuxeo -// import org.apache.chemistry.opencmis.commons.enums.CmisVersion; import org.apache.chemistry.opencmis.commons.server.CallContext; import org.apache.chemistry.opencmis.server.impl.CallContextImpl; -import org.apache.chemistry.opencmis.server.shared.ThresholdOutputStreamFactory; +import org.apache.chemistry.opencmis.server.shared.TempStoreOutputStreamFactory; import org.collectionspace.services.client.CollectionSpaceClient; import org.collectionspace.services.client.IQueryManager; import org.collectionspace.services.client.PoxPayloadIn; @@ -75,12 +71,12 @@ import org.collectionspace.services.nuxeo.util.CSReindexFulltextRoot; import org.collectionspace.services.nuxeo.util.NuxeoUtils; import org.nuxeo.common.utils.IdUtils; -import org.nuxeo.ecm.core.api.ClientException; import org.nuxeo.ecm.core.api.DocumentModel; import org.nuxeo.ecm.core.api.DocumentModelList; import org.nuxeo.ecm.core.api.DocumentRef; import org.nuxeo.ecm.core.api.IdRef; import org.nuxeo.ecm.core.api.IterableQueryResult; +import org.nuxeo.ecm.core.api.NuxeoException; import org.nuxeo.ecm.core.api.PathRef; import org.nuxeo.ecm.core.api.VersioningOption; import org.nuxeo.ecm.core.api.impl.DocumentModelListImpl; @@ -104,12 +100,8 @@ */ public class NuxeoRepositoryClientImpl implements RepositoryClient { - /** - * The logger. - */ private final Logger logger = LoggerFactory.getLogger(NuxeoRepositoryClientImpl.class); -// private final Logger profilerLogger = LoggerFactory.getLogger("remperf"); -// private String foo = Profiler.createLogger(); + public static final String NUXEO_CORE_TYPE_DOMAIN = "Domain"; public static final String NUXEO_CORE_TYPE_WORKSPACEROOT = "WorkspaceRoot"; // FIXME: Get this value from an existing constant, if available @@ -129,7 +121,8 @@ public NuxeoRepositoryClientImpl() { //Empty constructor } - public void assertWorkflowState(ServiceContext ctx, DocumentModel docModel) throws DocumentNotFoundException, ClientException { + public void assertWorkflowState(ServiceContext ctx, DocumentModel docModel) throws DocumentNotFoundException, + NuxeoException { MultivaluedMap queryParams = ctx.getQueryParams(); if (queryParams != null) { // @@ -389,7 +382,7 @@ private boolean reindexElasticsearch(DocumentHandler handler, String csid, Strin @Override public boolean synchronize(ServiceContext ctx, Object specifier, DocumentHandler handler) - throws DocumentNotFoundException, TransactionException, DocumentException { + throws DocumentNotFoundException, DocumentException { boolean result = false; if (handler == null) { @@ -592,7 +585,7 @@ public void get(ServiceContext ctx, DocumentHandler handler) public DocumentWrapper getDoc( CoreSessionInterface repoSession, ServiceContext ctx, - String csid) throws DocumentNotFoundException, DocumentException { + String csid) throws DocumentNotFoundException { DocumentWrapper wrapDoc = null; try { @@ -600,15 +593,15 @@ public DocumentWrapper getDoc( DocumentModel doc = null; try { doc = repoSession.getDocument(docRef); - } catch (ClientException ce) { + } catch (NuxeoException ce) { String msg = logException(ce, "Could not find document with CSID=" + csid); throw new DocumentNotFoundException(msg, ce); } wrapDoc = new DocumentWrapperImpl(doc); } catch (IllegalArgumentException iae) { throw iae; - } catch (DocumentException de) { - throw de; + } catch (NuxeoException ne) { + throw ne; } return wrapDoc; @@ -1185,11 +1178,11 @@ public DocumentWrapper getDocFromCsid(ServiceContext wrappedDoc) throws ClientException { + public String getDocURI(DocumentWrapper wrappedDoc) throws NuxeoException { DocumentModel docModel = wrappedDoc.getWrappedObject(); String uri = (String) docModel.getProperty(CollectionSpaceClient.COLLECTIONSPACE_CORE_SCHEMA, CollectionSpaceClient.COLLECTIONSPACE_CORE_URI); @@ -1208,7 +1201,7 @@ private IterableQueryResult makeCMISQLQuery(CoreSessionInterface repoSession, St logger.debug(String.format("Performing a CMIS query on Nuxeo repository named %s", repoSession.getRepositoryName())); - ThresholdOutputStreamFactory streamFactory = ThresholdOutputStreamFactory.newInstance( + TempStoreOutputStreamFactory streamFactory = TempStoreOutputStreamFactory.newInstance( null, THRESHOLD, -1, false); CallContextImpl callContext = new CallContextImpl( CallContext.BINDING_LOCAL, @@ -1223,7 +1216,7 @@ private IterableQueryResult makeCMISQLQuery(CoreSessionInterface repoSession, St NuxeoCmisService cmisService = new NuxeoCmisService(repoSession.getCoreSession()); result = repoSession.queryAndFetch(query, "CMISQL", cmisService); - } catch (ClientException e) { + } catch (NuxeoException e) { // TODO Auto-generated catch block logger.error("Encounter trouble making the following CMIS query: " + query, e); throw new NuxeoDocumentException(e); @@ -1300,7 +1293,7 @@ public void getFiltered(ServiceContext ctx, DocumentHandler handler) throw de; } catch (Exception e) { if (logger.isDebugEnabled()) { - logger.debug("Caught exception ", e); // REM - 1/17/2014: Check for org.nuxeo.ecm.core.api.ClientException and re-attempt + logger.debug("Caught exception ", e); // REM - 1/17/2014: Check for org.nuxeo.ecm.core.api.NuxeoException and re-attempt } throw new NuxeoDocumentException(e); } finally { @@ -1791,7 +1784,7 @@ public void update(ServiceContext ctx, String csid, DocumentHandler handler) * @param docModel the document to save * @param fSaveSession if TRUE, will call CoreSessionInterface.save() to save * accumulated changes. - * @throws ClientException + * @throws NuxeoException * @throws DocumentException */ @Deprecated @@ -1800,14 +1793,14 @@ public void saveDocWithoutHandlerProcessing( CoreSessionInterface repoSession, DocumentModel docModel, boolean fSaveSession) - throws ClientException, DocumentException { + throws NuxeoException, DocumentException { try { repoSession.saveDocument(docModel); if (fSaveSession) { repoSession.save(); } - } catch (ClientException ce) { + } catch (NuxeoException ce) { throw ce; } catch (Exception e) { if (logger.isDebugEnabled()) { @@ -1825,7 +1818,7 @@ public void saveDocWithoutHandlerProcessing( * @param docModelList a list of document models * @param fSaveSession if TRUE, will call CoreSessionInterface.save() to save * accumulated changes. - * @throws ClientException + * @throws NuxeoException * @throws DocumentException */ public void saveDocListWithoutHandlerProcessing( @@ -1833,14 +1826,14 @@ public void saveDocListWithoutHandlerProcessing( CoreSessionInterface repoSession, DocumentModelList docList, boolean fSaveSession) - throws ClientException, DocumentException { + throws NuxeoException, DocumentException { try { DocumentModel[] docModelArray = new DocumentModel[docList.size()]; repoSession.saveDocuments(docList.toArray(docModelArray)); if (fSaveSession) { repoSession.save(); } - } catch (ClientException ce) { + } catch (NuxeoException ce) { throw ce; } catch (Exception e) { logger.error("Caught exception ", e); @@ -2084,7 +2077,7 @@ private DocumentModel getWorkspacesRoot(CoreSessionInterface repoSession, } if (result == null) { - throw new ClientException("Could not find workspace root directory in: " + throw new NuxeoException("Could not find workspace root directory in: " + domainPath); } @@ -2283,9 +2276,7 @@ public void releaseRepositorySession(ServiceContext @Override public void doWorkflowTransition(ServiceContext ctx, String id, - DocumentHandler handler, TransitionDef transitionDef) - throws BadRequestException, DocumentNotFoundException, - DocumentException { + DocumentHandler handler, TransitionDef transitionDef) { // This is a placeholder for when we change the StorageClient interface to treat workflow transitions as 1st class operations like 'get', 'create', 'update, 'delete', etc } @@ -2399,7 +2390,7 @@ private void rollbackTransaction(CoreSessionInterface repoSession) { */ @Override public boolean delete(ServiceContext ctx, Object entityFound, DocumentHandler handler) - throws DocumentNotFoundException, DocumentException { + throws DocumentException { throw new UnsupportedOperationException(); } } diff --git a/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/RemoteDocumentModelHandlerImpl.java b/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/RemoteDocumentModelHandlerImpl.java index 0139e468d7..e58ef5d664 100644 --- a/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/RemoteDocumentModelHandlerImpl.java +++ b/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/RemoteDocumentModelHandlerImpl.java @@ -91,7 +91,7 @@ import org.nuxeo.ecm.core.api.impl.DataModelImpl; import org.nuxeo.ecm.core.api.model.DocumentPart; import org.nuxeo.ecm.core.api.model.Property; -import org.nuxeo.ecm.core.api.model.PropertyException; +import org.nuxeo.ecm.core.api.PropertyException; import org.nuxeo.ecm.core.api.model.impl.ScalarProperty; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -251,7 +251,7 @@ public boolean handleDelete(DocumentWrapper wrapDoc) throws Excep public void completeUpdate(DocumentWrapper wrapDoc) throws Exception { DocumentModel docModel = wrapDoc.getWrappedObject(); - String[] schemas = docModel.getDeclaredSchemas(); + String[] schemas = docModel.getSchemas(); Map partsMetaMap = getServiceContext().getPartsMetadata(); for (String schema : schemas) { ObjectPartType partMeta = partsMetaMap.get(schema); @@ -353,7 +353,7 @@ public void extractAllParts(DocumentWrapper wrapDoc) throws Exception { DocumentModel docModel = wrapDoc.getWrappedObject(); - String[] schemas = docModel.getDeclaredSchemas(); + String[] schemas = docModel.getSchemas(); Map partsMetaMap = getServiceContext().getPartsMetadata(); for (String schema : schemas) { ObjectPartType partMeta = partsMetaMap.get(schema); @@ -768,9 +768,8 @@ public AuthorityRefList getAuthorityRefs( return authRefList; } - private boolean appendToAuthRefsList(RefNameServiceUtils.AuthRefInfo ari, - List list) - throws Exception { + private boolean appendToAuthRefsList(RefNameServiceUtils.AuthRefInfo ari, + List list) { String fieldName = ari.getQualifiedDisplayName(); try { String refNameValue = (String)ari.getProperty().getValue(); @@ -780,12 +779,7 @@ private boolean appendToAuthRefsList(RefNameServiceUtils.AuthRefInfo ari, return true; } } catch(PropertyException pe) { - String msg = "PropertyException on: "+ari.getProperty().getPath()+pe.getLocalizedMessage(); - if (logger.isDebugEnabled()) { - logger.debug(msg, pe); - } else { - logger.error(msg); - } + logger.error("PropertyException on: {} {}", ari.getProperty().getXPath(), pe.getLocalizedMessage(), pe); } return false; } diff --git a/services/common/src/main/java/org/collectionspace/services/nuxeo/listener/AbstractCSEventListenerImpl.java b/services/common/src/main/java/org/collectionspace/services/nuxeo/listener/AbstractCSEventListenerImpl.java index 3d7ad65e30..0d326769ab 100644 --- a/services/common/src/main/java/org/collectionspace/services/nuxeo/listener/AbstractCSEventListenerImpl.java +++ b/services/common/src/main/java/org/collectionspace/services/nuxeo/listener/AbstractCSEventListenerImpl.java @@ -14,8 +14,6 @@ import org.collectionspace.services.config.tenant.Param; import org.collectionspace.services.nuxeo.client.java.CoreSessionInterface; import org.collectionspace.services.nuxeo.util.NuxeoUtils; -import org.nuxeo.common.collections.ScopeType; -import org.nuxeo.common.collections.ScopedMap; import org.nuxeo.ecm.core.api.DocumentModel; import org.nuxeo.ecm.core.api.DocumentModelList; import org.nuxeo.ecm.core.event.Event; @@ -23,9 +21,9 @@ import org.nuxeo.ecm.core.event.impl.DocumentEventContext; public abstract class AbstractCSEventListenerImpl implements CSEventListener { - private static Map> mapOfrepositoryNames = new HashMap>(); // - private static Map>> eventListenerParamsMap = new HashMap>>(); // >> - private static Map nameMap = new HashMap(); + private static Map> mapOfrepositoryNames = new HashMap<>(); // + private static Map>> eventListenerParamsMap = new HashMap<>(); // >> + private static Map nameMap = new HashMap<>(); // SQL clauses private final static String NONVERSIONED_NONPROXY_DOCUMENT_WHERE_CLAUSE_FRAGMENT = @@ -34,7 +32,7 @@ public abstract class AbstractCSEventListenerImpl implements CSEventListener { protected final static String ACTIVE_DOCUMENT_WHERE_CLAUSE_FRAGMENT = "AND (ecm:currentLifeCycleState <> 'deleted') " + NONVERSIONED_NONPROXY_DOCUMENT_WHERE_CLAUSE_FRAGMENT; - static final String DOCMODEL_CONTEXT_PROPERTY_PREFIX = ScopeType.DEFAULT.getScopePrefix(); + private static final String DOCMODEL_CONTEXT_PROPERTY_PREFIX = "default/"; private String currentRepositoryName; public AbstractCSEventListenerImpl() { @@ -228,8 +226,8 @@ protected Serializable getContextPropertyValue(DocumentEventContext docEventCont // @Override public void setDocModelContextProperty(DocumentModel collectionObjectDocModel, String key, Serializable value) { - ScopedMap contextData = collectionObjectDocModel.getContextData(); - contextData.putIfAbsent(DOCMODEL_CONTEXT_PROPERTY_PREFIX + key, value); + Map contextData = collectionObjectDocModel.getContextData(); + contextData.putIfAbsent(DOCMODEL_CONTEXT_PROPERTY_PREFIX + key, value); } // @@ -237,8 +235,8 @@ public void setDocModelContextProperty(DocumentModel collectionObjectDocModel, S // @Override public void clearDocModelContextProperty(DocumentModel docModel, String key) { - ScopedMap contextData = docModel.getContextData(); - contextData.remove(DOCMODEL_CONTEXT_PROPERTY_PREFIX + key); + Map contextData = docModel.getContextData(); + contextData.remove(DOCMODEL_CONTEXT_PROPERTY_PREFIX + key); } // diff --git a/services/common/src/main/java/org/collectionspace/services/nuxeo/util/NuxeoUtils.java b/services/common/src/main/java/org/collectionspace/services/nuxeo/util/NuxeoUtils.java index e036d7f41f..727160e060 100644 --- a/services/common/src/main/java/org/collectionspace/services/nuxeo/util/NuxeoUtils.java +++ b/services/common/src/main/java/org/collectionspace/services/nuxeo/util/NuxeoUtils.java @@ -50,7 +50,6 @@ import org.collectionspace.services.common.vocabulary.RefNameServiceUtils.AuthorityItemSpecifier; import org.collectionspace.services.common.vocabulary.RefNameServiceUtils.Specifier; import org.collectionspace.services.common.vocabulary.RefNameServiceUtils.SpecifierForm; -import org.collectionspace.services.config.tenant.RepositoryDomainType; import org.collectionspace.services.lifecycle.Lifecycle; import org.collectionspace.services.lifecycle.State; import org.collectionspace.services.lifecycle.StateList; @@ -66,7 +65,6 @@ import org.nuxeo.ecm.core.api.DocumentModel; import org.nuxeo.ecm.core.api.DocumentModelList; import org.nuxeo.ecm.core.api.Blob; -import org.nuxeo.ecm.core.api.ClientException; import org.nuxeo.ecm.core.api.CoreSession; import org.nuxeo.ecm.core.api.DocumentRef; import org.nuxeo.ecm.core.api.IdRef; @@ -493,7 +491,7 @@ public static Document getDocument(CoreSessionInterface repoSession, String csid * * @throws DocumentException the document exception * @throws IOException Signals that an I/O exception has occurred. - * @throws ClientException the client exception + * @throws NuxeoException the client exception */ public static DocumentModel getWorkspaceModel( CoreSessionInterface repoSession, String workspaceName) @@ -955,7 +953,7 @@ public static String prepareStringLiteral(String s) { } public static boolean documentExists(CoreSessionInterface repoSession, - String csid) throws ClientException, DocumentException { + String csid) throws NuxeoException, DocumentException { boolean result = false; String statement = String.format( diff --git a/services/common/src/main/java/org/collectionspace/services/nuxeo/util/ReindexFulltextRoot.java b/services/common/src/main/java/org/collectionspace/services/nuxeo/util/ReindexFulltextRoot.java index 2458da6089..eb86ceae9c 100644 --- a/services/common/src/main/java/org/collectionspace/services/nuxeo/util/ReindexFulltextRoot.java +++ b/services/common/src/main/java/org/collectionspace/services/nuxeo/util/ReindexFulltextRoot.java @@ -44,15 +44,15 @@ import org.nuxeo.ecm.core.api.IterableQueryResult; import org.nuxeo.ecm.core.api.NuxeoException; import org.nuxeo.ecm.core.api.NuxeoPrincipal; +import org.nuxeo.ecm.core.api.repository.FulltextConfiguration; import org.nuxeo.ecm.core.event.EventService; import org.nuxeo.ecm.core.query.QueryFilter; import org.nuxeo.ecm.core.query.sql.NXQL; -import org.nuxeo.ecm.core.storage.FulltextConfiguration; +import org.nuxeo.ecm.core.storage.FulltextExtractorWork; import org.nuxeo.ecm.core.storage.sql.Model; import org.nuxeo.ecm.core.storage.sql.Node; import org.nuxeo.ecm.core.storage.sql.Session; import org.nuxeo.ecm.core.storage.sql.SimpleProperty; -import org.nuxeo.ecm.core.storage.sql.coremodel.SQLFulltextExtractorWork; import org.nuxeo.ecm.core.storage.sql.coremodel.SQLSession; import org.nuxeo.ecm.core.work.api.Work; import org.nuxeo.ecm.core.work.api.WorkManager; @@ -263,7 +263,7 @@ protected void doBatch(List infos) throws NuxeoException { runAsyncBatch(asyncIds); // wait for async completion after transaction commit - Framework.getLocalService(EventService.class).waitForAsyncCompletion(); + Framework.getService(EventService.class).waitForAsyncCompletion(); } /* @@ -312,9 +312,9 @@ protected void runAsyncBatch(Set asyncIds) { return; } String repositoryName = coreSession.getRepositoryName(); - WorkManager workManager = Framework.getLocalService(WorkManager.class); + WorkManager workManager = Framework.getService(WorkManager.class); for (String id : asyncIds) { - Work work = new SQLFulltextExtractorWork(repositoryName, id); + Work work = new FulltextExtractorWork(repositoryName, id, false, true, false); // schedule immediately, we're outside a transaction workManager.schedule(work, Scheduling.IF_NOT_SCHEDULED, false); } diff --git a/services/imports/service/pom.xml b/services/imports/service/pom.xml index 70072b3c97..807a83afaf 100644 --- a/services/imports/service/pom.xml +++ b/services/imports/service/pom.xml @@ -85,16 +85,10 @@ - - - org.nuxeo.shell - nuxeo-shell-core - ${nuxeo.shell.version} - org.nuxeo.ecm.platform nuxeo-importer-core - ${nuxeo.platform.version} + ${nuxeo.general.release} org.slf4j @@ -109,7 +103,7 @@ org.nuxeo.ecm.platform nuxeo-importer-xml-parser - ${nuxeo.platform.version} + ${nuxeo.general.release} dom4j diff --git a/services/relation/service/src/main/java/org/collectionspace/services/relation/RelationResource.txt b/services/relation/service/src/main/java/org/collectionspace/services/relation/RelationResource.txt deleted file mode 100644 index d3a70a756a..0000000000 --- a/services/relation/service/src/main/java/org/collectionspace/services/relation/RelationResource.txt +++ /dev/null @@ -1,3 +0,0 @@ -Because of a dependency cycle with the "Common" module, the RelationResource class was moved to the "Common" module at: - -..\services\common\src\main\java\org\collectionspace\services\common\relation \ No newline at end of file diff --git a/services/relation/service/src/main/java/org/collectionspace/services/relation/nuxeo/RelationDocumentModelHandler.java b/services/relation/service/src/main/java/org/collectionspace/services/relation/nuxeo/RelationDocumentModelHandler.java index f512f27714..fa296be087 100644 --- a/services/relation/service/src/main/java/org/collectionspace/services/relation/nuxeo/RelationDocumentModelHandler.java +++ b/services/relation/service/src/main/java/org/collectionspace/services/relation/nuxeo/RelationDocumentModelHandler.java @@ -58,10 +58,10 @@ import org.collectionspace.services.nuxeo.client.java.CoreSessionInterface; import org.collectionspace.services.nuxeo.client.java.NuxeoRepositoryClientImpl; -import org.nuxeo.ecm.core.api.ClientException; import org.nuxeo.ecm.core.api.DocumentModel; import org.nuxeo.ecm.core.api.DocumentModelList; -import org.nuxeo.ecm.core.api.model.PropertyException; +import org.nuxeo.ecm.core.api.NuxeoException; +import org.nuxeo.ecm.core.api.PropertyException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -514,7 +514,7 @@ private void populateSubjectOrObjectValues( RelationJAXBSchema.SUBJECT_REFNAME :RelationJAXBSchema.OBJECT_REFNAME), refname); - } catch (ClientException ce) { + } catch (NuxeoException ce) { throw new RuntimeException( "populateSubjectOrObjectValues: Problem fetching field " + ce.getLocalizedMessage()); } @@ -523,7 +523,7 @@ private void populateSubjectOrObjectValues( // property values in the target document model. try { relationDocModel.setProperties(ctx.getCommonPartLabel(), properties); - } catch (ClientException ce) { + } catch (NuxeoException ce) { throw new RuntimeException( "populateSubjectValues: Problem setting fields " + ce.getLocalizedMessage()); } diff --git a/services/report/service/src/main/java/org/collectionspace/services/report/nuxeo/ReportDocumentModelHandler.java b/services/report/service/src/main/java/org/collectionspace/services/report/nuxeo/ReportDocumentModelHandler.java index b4fe5bc0e2..d93ed0e715 100644 --- a/services/report/service/src/main/java/org/collectionspace/services/report/nuxeo/ReportDocumentModelHandler.java +++ b/services/report/service/src/main/java/org/collectionspace/services/report/nuxeo/ReportDocumentModelHandler.java @@ -104,7 +104,7 @@ import org.collectionspace.services.report.ResourceActionGroup; import org.collectionspace.services.report.ResourceActionGroupList; import org.nuxeo.ecm.core.api.DocumentModel; -import org.nuxeo.ecm.core.api.model.PropertyException; +import org.nuxeo.ecm.core.api.PropertyException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; From 6d20abadd825cb51af978a4583d957ff920074fc Mon Sep 17 00:00:00 2001 From: Michael Ritter Date: Fri, 24 Apr 2026 12:27:09 -0600 Subject: [PATCH 17/24] Fix import regression from merge --- .../org/collectionspace/services/account/AccountResource.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/account/service/src/main/java/org/collectionspace/services/account/AccountResource.java b/services/account/service/src/main/java/org/collectionspace/services/account/AccountResource.java index 48d3233385..ad1e4415f9 100644 --- a/services/account/service/src/main/java/org/collectionspace/services/account/AccountResource.java +++ b/services/account/service/src/main/java/org/collectionspace/services/account/AccountResource.java @@ -61,7 +61,7 @@ import freemarker.template.Template; import freemarker.template.TemplateException; import freemarker.template.TemplateNotFoundException; -import javax.xml.bind.DatatypeConverter; +import jakarta.xml.bind.DatatypeConverter; import org.apache.commons.lang3.StringUtils; import org.collectionspace.authentication.AuthN; import org.collectionspace.services.account.storage.AccountStorageClient; From f81241aa992be1abebcf75e0450d04eb613c7c6e Mon Sep 17 00:00:00 2001 From: Michael Ritter Date: Tue, 5 May 2026 15:31:18 -0600 Subject: [PATCH 18/24] DRYD-2091: Upgrade RESTEasy (#530) * Upgrades RESTEasy to v5.x * Remove resteasy-jaxb-provider * Replace resteasy-jaxrs with resteasy-client for clients * Add JakartaJAXBProvider for XMLRootElement marshalling * Add JAXBContextCache for caching JAXBContexts * Replace ObjectFactory usage with jaxb.index * Prefer XMLRootElement * Add XMLSchema to package-info for namespaces in marshalled responses --- .../botgarden/UpdateAccessCodeListener.java | 2 +- .../botgarden/UpdateDeadFlagListener.java | 2 +- .../botgarden/UpdateRareFlagListener.java | 2 +- .../botgarden/UpdateStyledNameListener.java | 2 +- pom.xml | 21 ++-- services/IntegrationTests/pom.xml | 8 +- .../test/CollectionSpaceIntegrationTest.java | 21 ---- .../test/RelationIntegrationTest.java | 5 +- services/JaxRsServiceProvider/pom.xml | 24 ++--- .../jaxrs/CSpaceResteasyBootstrap.java | 2 +- .../CollectionSpaceJaxRsApplication.java | 6 +- services/PerformanceTests/pom.xml | 6 +- .../test/CollectionSpacePerformanceTest.java | 36 +------ services/account/client/pom.xml | 6 +- .../client/test/AccountRoleServiceTest.java | 6 +- .../services/account/jaxb.index | 10 ++ services/account/service/pom.xml | 6 +- services/acquisition/client/pom.xml | 6 +- services/advancedsearch/client/pom.xml | 8 +- services/advancedsearch/service/pom.xml | 6 +- .../authentication/Passwordreset.java | 2 - .../services/authentication/Token.java | 2 - .../services/authentication/User.java | 2 - .../services/authentication/package-info.java | 4 + .../services/authentication/jaxb.index | 3 + services/authority/pom.xml | 6 +- services/authority/service/pom.xml | 6 +- services/authorization-mgt/client/pom.xml | 19 +--- .../client/test/RoleServiceTest.java | 16 +-- .../importer/AuthorizationGen.java | 23 ++--- .../importer/AuthorizationSeed.java | 13 +-- services/authorization-mgt/service/pom.xml | 6 +- .../storage/PermissionValidatorHandler.java | 8 +- .../storage/RoleDocumentHandler.java | 13 +-- .../authorization/AccountPermission.java | 4 +- .../services/authorization/AccountRole.java | 4 +- .../authorization/AccountRoleRel.java | 4 +- .../services/authorization/ObjectFactory.java | 56 ----------- .../authorization/PermissionRole.java | 4 +- .../authorization/PermissionRoleRel.java | 4 +- .../authorization/PermissionsRolesList.java | 2 - .../services/authorization/Role.java | 4 +- .../services/authorization/RolesList.java | 4 +- .../services/authorization/package-info.java | 5 +- .../services/authorization/jaxb.index | 12 +++ services/batch/client/pom.xml | 6 +- services/batch/service/pom.xml | 6 +- .../nuxeo/BatchDocumentModelHandler.java | 2 +- services/blob/service/pom.xml | 6 +- services/chronology/client/pom.xml | 6 +- services/chronology/service/pom.xml | 6 +- services/citation/client/pom.xml | 6 +- services/citation/service/pom.xml | 6 +- services/claim/client/pom.xml | 6 +- services/claim/service/pom.xml | 6 +- services/client/pom.xml | 11 ++- .../client/AbstractServiceClientImpl.java | 97 ++++--------------- .../client/CollectionSpaceClientUtils.java | 27 +++--- .../services/client/PoxPayload.java | 12 +-- .../services/client/test/BaseServiceTest.java | 33 ++++--- services/collectionobject/client/pom.xml | 6 +- services/collectionobject/service/pom.xml | 6 +- services/common-api/pom.xml | 7 +- .../services/common/api/FileTools.java | 33 ++++--- services/common-http/pom.xml | 29 ++++++ .../common/jaxb/JAXBContextCache.java | 47 +++++++++ .../common/provider/JakartaJAXBProvider.java | 91 +++++++++++++++++ services/common-test/pom.xml | 6 +- services/common/pom.xml | 6 +- .../services/common/ServiceMain.java | 2 +- .../services/common/document/JaxbUtils.java | 42 +------- .../common/xmljson/XmlToJsonFilter.java | 4 +- .../java/RemoteDocumentModelHandlerImpl.java | 9 +- services/concept/client/pom.xml | 6 +- services/concept/service/pom.xml | 6 +- services/conditioncheck/client/pom.xml | 6 +- services/conditioncheck/service/pom.xml | 6 +- services/config/pom.xml | 13 +-- .../config/AbstractConfigReaderImpl.java | 3 +- services/conservation/client/pom.xml | 6 +- services/conservation/service/pom.xml | 6 +- services/consultation/client/pom.xml | 8 +- services/consultation/service/pom.xml | 6 +- services/contact/client/pom.xml | 6 +- services/contact/service/pom.xml | 6 +- services/deaccession/client/pom.xml | 8 +- services/deaccession/service/pom.xml | 6 +- services/dimension/client/pom.xml | 6 +- services/dimension/service/pom.xml | 6 +- services/dutyofcare/client/pom.xml | 6 +- services/dutyofcare/service/pom.xml | 6 +- services/exhibition/client/pom.xml | 6 +- services/exhibition/service/pom.xml | 6 +- services/exit/client/pom.xml | 6 +- services/exit/service/pom.xml | 6 +- services/export/client/pom.xml | 6 +- services/export/service/pom.xml | 2 +- services/group/client/pom.xml | 6 +- services/group/service/pom.xml | 6 +- services/heldintrust/client/pom.xml | 8 +- services/heldintrust/service/pom.xml | 6 +- .../authorization/perms/ObjectFactory.java | 22 ----- .../authorization/perms/Permission.java | 4 +- .../authorization/perms/PermissionsList.java | 2 - .../authorization/perms/package-info.java | 4 + .../services/authorization/perms/jaxb.index | 2 + services/imports/service/pom.xml | 6 +- services/index/client/pom.xml | 6 +- services/index/service/pom.xml | 6 +- services/insurance/client/pom.xml | 6 +- services/insurance/service/pom.xml | 6 +- services/intake/client/pom.xml | 6 +- services/intake/service/pom.xml | 6 +- services/iterationreport/client/pom.xml | 6 +- services/iterationreport/service/pom.xml | 6 +- services/loanin/client/pom.xml | 6 +- services/loanin/service/pom.xml | 6 +- services/loanout/client/pom.xml | 6 +- services/loanout/service/pom.xml | 6 +- services/location/client/pom.xml | 6 +- services/location/service/pom.xml | 6 +- services/login/service/pom.xml | 2 +- services/logout/service/pom.xml | 2 +- services/material/client/pom.xml | 6 +- services/material/service/pom.xml | 6 +- services/media/client/pom.xml | 6 +- services/media/service/pom.xml | 6 +- services/movement/client/pom.xml | 6 +- services/movement/service/pom.xml | 6 +- services/nagprainventory/client/pom.xml | 8 +- services/nagprainventory/service/pom.xml | 6 +- services/note/client/pom.xml | 6 +- services/note/service/pom.xml | 6 +- services/objectexit/client/pom.xml | 6 +- services/objectexit/service/pom.xml | 6 +- services/organization/client/pom.xml | 6 +- services/organization/service/pom.xml | 6 +- services/osteology/client/pom.xml | 6 +- services/osteology/service/pom.xml | 6 +- services/person/client/pom.xml | 6 +- services/person/service/pom.xml | 6 +- services/place/client/pom.xml | 6 +- services/place/service/pom.xml | 6 +- services/pom.xml | 1 + services/pottag/client/pom.xml | 6 +- services/pottag/service/pom.xml | 6 +- services/propagation/client/pom.xml | 6 +- services/propagation/service/pom.xml | 6 +- services/publicitem/client/pom.xml | 6 +- services/publicitem/service/pom.xml | 6 +- services/query/service/pom.xml | 6 +- services/relation/client/pom.xml | 6 +- services/relation/service/pom.xml | 6 +- services/repatriationrequest/client/pom.xml | 8 +- services/repatriationrequest/service/pom.xml | 8 +- services/report/client/pom.xml | 6 +- services/report/service/pom.xml | 6 +- .../CSpaceRepositoryService.java | 2 +- services/restrictedmedia/client/pom.xml | 6 +- services/restrictedmedia/service/pom.xml | 6 +- services/security/client/pom.xml | 6 +- services/servicegroup/client/pom.xml | 6 +- services/servicegroup/service/pom.xml | 6 +- services/structureddate/client/pom.xml | 6 +- services/structureddate/service/pom.xml | 6 +- services/summarydocumentation/client/pom.xml | 8 +- services/summarydocumentation/service/pom.xml | 6 +- services/systeminfo/client/pom.xml | 6 +- services/systeminfo/service/pom.xml | 6 +- services/taxonomy/client/pom.xml | 6 +- services/taxonomy/service/pom.xml | 6 +- services/transport/client/pom.xml | 6 +- services/transport/service/pom.xml | 6 +- services/uoc/client/pom.xml | 6 +- services/uoc/service/pom.xml | 6 +- services/valuationcontrol/client/pom.xml | 6 +- services/valuationcontrol/service/pom.xml | 6 +- services/vocabulary/client/pom.xml | 6 +- services/vocabulary/service/pom.xml | 6 +- services/work/client/pom.xml | 6 +- services/work/service/pom.xml | 6 +- services/workflow/client/pom.xml | 6 +- services/workflow/service/pom.xml | 6 +- 183 files changed, 521 insertions(+), 1075 deletions(-) create mode 100644 services/account/jaxb/src/main/resources/org/collectionspace/services/account/jaxb.index create mode 100644 services/authentication/jaxb/src/main/java/org/collectionspace/services/authentication/package-info.java create mode 100644 services/authentication/jaxb/src/main/resources/org/collectionspace/services/authentication/jaxb.index delete mode 100644 services/authorization/jaxb/src/main/java/org/collectionspace/services/authorization/ObjectFactory.java create mode 100644 services/authorization/jaxb/src/main/resources/org/collectionspace/services/authorization/jaxb.index create mode 100644 services/common-http/pom.xml create mode 100644 services/common-http/src/main/java/org/collectionspace/services/common/jaxb/JAXBContextCache.java create mode 100644 services/common-http/src/main/java/org/collectionspace/services/common/provider/JakartaJAXBProvider.java delete mode 100644 services/hyperjaxb/src/main/java/org/collectionspace/services/authorization/perms/ObjectFactory.java create mode 100644 services/hyperjaxb/src/main/java/org/collectionspace/services/authorization/perms/package-info.java create mode 100644 services/hyperjaxb/src/main/resources/org/collectionspace/services/authorization/perms/jaxb.index diff --git a/3rdparty/nuxeo/nuxeo-platform-listener/tenants/botgarden/src/main/java/org/collectionspace/services/listener/botgarden/UpdateAccessCodeListener.java b/3rdparty/nuxeo/nuxeo-platform-listener/tenants/botgarden/src/main/java/org/collectionspace/services/listener/botgarden/UpdateAccessCodeListener.java index ddd33e8e58..87d0e1688a 100644 --- a/3rdparty/nuxeo/nuxeo-platform-listener/tenants/botgarden/src/main/java/org/collectionspace/services/listener/botgarden/UpdateAccessCodeListener.java +++ b/3rdparty/nuxeo/nuxeo-platform-listener/tenants/botgarden/src/main/java/org/collectionspace/services/listener/botgarden/UpdateAccessCodeListener.java @@ -364,7 +364,7 @@ private Set findAddedTaxonNames(List previousTaxonNames, List serviceContext = batchResource.createServiceContext(batchResource.getServiceName()); diff --git a/3rdparty/nuxeo/nuxeo-platform-listener/tenants/botgarden/src/main/java/org/collectionspace/services/listener/botgarden/UpdateDeadFlagListener.java b/3rdparty/nuxeo/nuxeo-platform-listener/tenants/botgarden/src/main/java/org/collectionspace/services/listener/botgarden/UpdateDeadFlagListener.java index 9106cdf761..bbe29e5c2a 100644 --- a/3rdparty/nuxeo/nuxeo-platform-listener/tenants/botgarden/src/main/java/org/collectionspace/services/listener/botgarden/UpdateDeadFlagListener.java +++ b/3rdparty/nuxeo/nuxeo-platform-listener/tenants/botgarden/src/main/java/org/collectionspace/services/listener/botgarden/UpdateDeadFlagListener.java @@ -108,7 +108,7 @@ public void handleCSEvent(Event event) { } private UpdateDeadFlagBatchJob createUpdater(DocumentEventContext context) throws Exception { - ResourceMap resourceMap = ResteasyProviderFactory.getContextData(ResourceMap.class); + ResourceMap resourceMap = ResteasyProviderFactory.getInstance().getContextData(ResourceMap.class); BatchResource batchResource = (BatchResource) resourceMap.get(BatchClient.SERVICE_NAME); ServiceContext serviceContext = batchResource.createServiceContext(batchResource.getServiceName()); diff --git a/3rdparty/nuxeo/nuxeo-platform-listener/tenants/botgarden/src/main/java/org/collectionspace/services/listener/botgarden/UpdateRareFlagListener.java b/3rdparty/nuxeo/nuxeo-platform-listener/tenants/botgarden/src/main/java/org/collectionspace/services/listener/botgarden/UpdateRareFlagListener.java index 844f079040..f67b8ab91e 100644 --- a/3rdparty/nuxeo/nuxeo-platform-listener/tenants/botgarden/src/main/java/org/collectionspace/services/listener/botgarden/UpdateRareFlagListener.java +++ b/3rdparty/nuxeo/nuxeo-platform-listener/tenants/botgarden/src/main/java/org/collectionspace/services/listener/botgarden/UpdateRareFlagListener.java @@ -205,7 +205,7 @@ private boolean hasRareConservationCategory(DocumentModel doc) { } private UpdateRareFlagBatchJob createUpdater(DocumentEventContext context) throws Exception { - ResourceMap resourceMap = ResteasyProviderFactory.getContextData(ResourceMap.class); + ResourceMap resourceMap = ResteasyProviderFactory.getInstance().getContextData(ResourceMap.class); BatchResource batchResource = (BatchResource) resourceMap.get(BatchClient.SERVICE_NAME); ServiceContext serviceContext = batchResource.createServiceContext(batchResource.getServiceName()); diff --git a/3rdparty/nuxeo/nuxeo-platform-listener/tenants/botgarden/src/main/java/org/collectionspace/services/listener/botgarden/UpdateStyledNameListener.java b/3rdparty/nuxeo/nuxeo-platform-listener/tenants/botgarden/src/main/java/org/collectionspace/services/listener/botgarden/UpdateStyledNameListener.java index 6b46af12d7..a3c64f032d 100644 --- a/3rdparty/nuxeo/nuxeo-platform-listener/tenants/botgarden/src/main/java/org/collectionspace/services/listener/botgarden/UpdateStyledNameListener.java +++ b/3rdparty/nuxeo/nuxeo-platform-listener/tenants/botgarden/src/main/java/org/collectionspace/services/listener/botgarden/UpdateStyledNameListener.java @@ -101,7 +101,7 @@ public void handleCSEvent(Event event) { } private FormatVoucherNameBatchJob createFormatter(DocumentEventContext context) throws Exception { - ResourceMap resourceMap = ResteasyProviderFactory.getContextData(ResourceMap.class); + ResourceMap resourceMap = ResteasyProviderFactory.getInstance().getContextData(ResourceMap.class); BatchResource batchResource = (BatchResource) resourceMap.get(BatchClient.SERVICE_NAME); ServiceContext serviceContext = batchResource.createServiceContext(batchResource.getServiceName()); diff --git a/pom.xml b/pom.xml index d9efa3db3f..b850f604a6 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ 4.0.12 3.4.6 42.3.9 - 3.0.20.Final + 5.0.10.Final 3.0.1 @@ -510,6 +510,14 @@ + + org.jboss.resteasy + resteasy-bom + ${resteasy.version} + pom + import + + @@ -1159,20 +1167,15 @@ org.jboss.resteasy - resteasy-jaxb-provider + resteasy-multipart-provider ${resteasy.version} - javax.xml.bind - jaxb-api + org.jboss.resteasy + resteasy-jaxb-provider - - org.jboss.resteasy - resteasy-multipart-provider - ${resteasy.version} - commons-httpclient commons-httpclient diff --git a/services/IntegrationTests/pom.xml b/services/IntegrationTests/pom.xml index a2bef594c2..b0ef43fe82 100644 --- a/services/IntegrationTests/pom.xml +++ b/services/IntegrationTests/pom.xml @@ -79,15 +79,13 @@ org.jboss.resteasy - resteasy-jaxrs - - - org.jboss.resteasy - resteasy-jaxb-provider + resteasy-client + test org.jboss.resteasy resteasy-multipart-provider + test javax.security diff --git a/services/IntegrationTests/src/test/java/org/collectionspace/services/IntegrationTests/test/CollectionSpaceIntegrationTest.java b/services/IntegrationTests/src/test/java/org/collectionspace/services/IntegrationTests/test/CollectionSpaceIntegrationTest.java index 4326b2c9f7..1665f01836 100644 --- a/services/IntegrationTests/src/test/java/org/collectionspace/services/IntegrationTests/test/CollectionSpaceIntegrationTest.java +++ b/services/IntegrationTests/src/test/java/org/collectionspace/services/IntegrationTests/test/CollectionSpaceIntegrationTest.java @@ -31,8 +31,6 @@ import javax.ws.rs.core.MultivaluedMap; import javax.ws.rs.core.Response; -import jakarta.xml.bind.JAXBContext; -import jakarta.xml.bind.Marshaller; import org.collectionspace.services.client.PayloadInputPart; import org.collectionspace.services.client.PoxPayloadIn; @@ -187,25 +185,6 @@ void verbose(String msg) { System.out.println(msg); } - /** - * Verbose. - * - * @param msg the msg - * @param o the o - * @param clazz the clazz - */ - void verbose(String msg, Object o, Class clazz) { - try { - verbose(msg); - JAXBContext jc = JAXBContext.newInstance(clazz); - Marshaller m = jc.createMarshaller(); - m.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, Boolean.TRUE); - m.marshal(o, System.out); - } catch (Exception e) { - e.printStackTrace(); - } - } - /** * Verbose map. * diff --git a/services/IntegrationTests/src/test/java/org/collectionspace/services/IntegrationTests/test/RelationIntegrationTest.java b/services/IntegrationTests/src/test/java/org/collectionspace/services/IntegrationTests/test/RelationIntegrationTest.java index a68ffa4d64..be3705c3b6 100644 --- a/services/IntegrationTests/src/test/java/org/collectionspace/services/IntegrationTests/test/RelationIntegrationTest.java +++ b/services/IntegrationTests/src/test/java/org/collectionspace/services/IntegrationTests/test/RelationIntegrationTest.java @@ -32,6 +32,7 @@ import jakarta.xml.bind.JAXBContext; import jakarta.xml.bind.Marshaller; +import org.collectionspace.services.common.jaxb.JAXBContextCache; import org.testng.Assert; import org.testng.annotations.AfterClass; import org.testng.annotations.Test; @@ -94,10 +95,10 @@ public void cleanUp() { * @param clazz the clazz * @return the string */ - static protected String objectAsXmlString(Object o, Class clazz) { + protected static String objectAsXmlString(Object o, Class clazz) { StringWriter sw = new StringWriter(); try { - JAXBContext jc = JAXBContext.newInstance(clazz); + JAXBContext jc = JAXBContextCache.getInstance().getCachedJAXBContext(clazz); Marshaller m = jc.createMarshaller(); m.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, Boolean.TRUE); diff --git a/services/JaxRsServiceProvider/pom.xml b/services/JaxRsServiceProvider/pom.xml index 25eaac92c8..53961816a9 100644 --- a/services/JaxRsServiceProvider/pom.xml +++ b/services/JaxRsServiceProvider/pom.xml @@ -12,10 +12,6 @@ services.jaxrs.provider war - - 0.5 - - commons-collections @@ -54,7 +50,11 @@ - + + org.collectionspace.services + common-http + ${project.version} + org.collectionspace.services org.collectionspace.services.authorization.service @@ -483,17 +483,7 @@ org.jboss.resteasy - resteasy-jaxrs - - - org.jboss.resteasy - resteasy-jaxb-provider - - - jaxb-impl - com.sun.xml.bind - - + resteasy-core org.jboss.resteasy @@ -941,7 +931,7 @@ CollectionSpace Services ${project.groupId} - ${cs.release} + ${project.version diff --git a/services/JaxRsServiceProvider/src/main/java/org/collectionspace/services/jaxrs/CSpaceResteasyBootstrap.java b/services/JaxRsServiceProvider/src/main/java/org/collectionspace/services/jaxrs/CSpaceResteasyBootstrap.java index 583b25d8eb..6b1b6b6653 100644 --- a/services/JaxRsServiceProvider/src/main/java/org/collectionspace/services/jaxrs/CSpaceResteasyBootstrap.java +++ b/services/JaxRsServiceProvider/src/main/java/org/collectionspace/services/jaxrs/CSpaceResteasyBootstrap.java @@ -7,7 +7,6 @@ import javax.ws.rs.core.Response; import javax.ws.rs.core.UriInfo; -import org.jboss.resteasy.core.Dispatcher; import org.jboss.resteasy.plugins.server.servlet.ResteasyBootstrap; import org.jboss.resteasy.specimpl.PathSegmentImpl; import org.apache.commons.io.IOUtils; @@ -46,6 +45,7 @@ import org.collectionspace.services.jaxb.AbstractCommonList.ListItem; import org.collectionspace.services.nuxeo.util.NuxeoUtils; import org.collectionspace.services.report.ReportResource; +import org.jboss.resteasy.spi.Dispatcher; import org.nuxeo.elasticsearch.ElasticSearchComponent; import org.nuxeo.elasticsearch.api.ElasticSearchService; import org.nuxeo.runtime.api.Framework; diff --git a/services/JaxRsServiceProvider/src/main/java/org/collectionspace/services/jaxrs/CollectionSpaceJaxRsApplication.java b/services/JaxRsServiceProvider/src/main/java/org/collectionspace/services/jaxrs/CollectionSpaceJaxRsApplication.java index c815d4ddbc..451688298f 100644 --- a/services/JaxRsServiceProvider/src/main/java/org/collectionspace/services/jaxrs/CollectionSpaceJaxRsApplication.java +++ b/services/JaxRsServiceProvider/src/main/java/org/collectionspace/services/jaxrs/CollectionSpaceJaxRsApplication.java @@ -27,6 +27,7 @@ import org.collectionspace.services.blob.BlobResource; import org.collectionspace.services.chronology.ChronologyAuthorityResource; import org.collectionspace.services.collectionobject.CollectionObjectResource; +import org.collectionspace.services.common.provider.JakartaJAXBProvider; import org.collectionspace.services.consultation.ConsultationResource; import org.collectionspace.services.deaccession.DeaccessionResource; import org.collectionspace.services.dutyofcare.DutyofcareResource; @@ -109,8 +110,8 @@ */ public class CollectionSpaceJaxRsApplication extends Application implements ResourceMapHolder { - private Set singletons = new HashSet(); - private Set> empty = new HashSet>(); + private Set singletons = new HashSet<>(); + private Set> empty = new HashSet<>(); private ResourceMap resourceMap = new ResourceMapImpl(); private ServletContext servletContext = null; @@ -119,6 +120,7 @@ public CollectionSpaceJaxRsApplication() { // Instantiate all our JaxRS resources // singletons.add(new SecurityInterceptor()); + singletons.add(new JakartaJAXBProvider<>()); singletons.add(new AccountResource()); singletons.add(new TenantResource()); diff --git a/services/PerformanceTests/pom.xml b/services/PerformanceTests/pom.xml index 32899a68c3..ced8d44ce1 100644 --- a/services/PerformanceTests/pom.xml +++ b/services/PerformanceTests/pom.xml @@ -59,11 +59,7 @@ org.jboss.resteasy - resteasy-jaxrs - - - org.jboss.resteasy - resteasy-jaxb-provider + resteasy-client org.jboss.resteasy diff --git a/services/PerformanceTests/src/test/java/org/collectionspace/services/PerformanceTests/test/CollectionSpacePerformanceTest.java b/services/PerformanceTests/src/test/java/org/collectionspace/services/PerformanceTests/test/CollectionSpacePerformanceTest.java index 7e3c487d28..2cff17fcf6 100644 --- a/services/PerformanceTests/src/test/java/org/collectionspace/services/PerformanceTests/test/CollectionSpacePerformanceTest.java +++ b/services/PerformanceTests/src/test/java/org/collectionspace/services/PerformanceTests/test/CollectionSpacePerformanceTest.java @@ -28,12 +28,9 @@ import java.util.ArrayList; import java.util.List; -import java.util.Random; import javax.ws.rs.core.MultivaluedMap; import javax.ws.rs.core.Response; -import jakarta.xml.bind.JAXBContext; -import jakarta.xml.bind.Marshaller; import org.collectionspace.services.collectionobject.CollectionobjectsCommon; import org.collectionspace.services.collectionobject.TitleGroup; @@ -194,38 +191,7 @@ void verbose(String msg) { // System.out.println(msg); } - /** - * Verbose. - * - * @param msg the msg - * @param o the o - * @param clazz the clazz - */ - void verbose(String msg, Object o, Class clazz) { - try { - verbose(msg); - JAXBContext jc = JAXBContext.newInstance(clazz); - Marshaller m = jc.createMarshaller(); - m.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, Boolean.TRUE); - m.marshal(o, System.out); - } catch (Exception e) { - e.printStackTrace(); - } - } - - /** - * Verbose map. - * - * @param map the map - */ - void verboseMap(MultivaluedMap map) { - for (Object entry : map.entrySet()) { - MultivaluedMap.Entry mentry = (MultivaluedMap.Entry) entry; - verbose(" name=" + mentry.getKey() + " value=" + mentry.getValue()); - } - } - - boolean isEnabled() { + boolean isEnabled() { return Boolean.getBoolean("cspace.perf"); } diff --git a/services/account/client/pom.xml b/services/account/client/pom.xml index 148b6c9c29..5adf04f413 100644 --- a/services/account/client/pom.xml +++ b/services/account/client/pom.xml @@ -56,11 +56,7 @@ --> org.jboss.resteasy - resteasy-jaxrs - - - org.jboss.resteasy - resteasy-jaxb-provider + resteasy-client org.jboss.resteasy diff --git a/services/account/client/src/test/java/org/collectionspace/services/account/client/test/AccountRoleServiceTest.java b/services/account/client/src/test/java/org/collectionspace/services/account/client/test/AccountRoleServiceTest.java index 967e2d9d01..7962dde883 100644 --- a/services/account/client/src/test/java/org/collectionspace/services/account/client/test/AccountRoleServiceTest.java +++ b/services/account/client/src/test/java/org/collectionspace/services/account/client/test/AccountRoleServiceTest.java @@ -207,8 +207,7 @@ public void readNoRelationship(String testName) throws Exception { assertStatusCode(res, testName); AccountRole output = res.readEntity(AccountRole.class); if(logger.isDebugEnabled()) { - org.collectionspace.services.authorization.ObjectFactory objectFactory = new org.collectionspace.services.authorization.ObjectFactory(); - String sOutput = objectAsXmlString(objectFactory.createAccountRole(output), AccountRole.class); + String sOutput = objectAsXmlString(output, AccountRole.class); logger.debug(testName + " received " + sOutput); } } finally { @@ -453,8 +452,7 @@ static public AccountRole createAccountRoleInstance(AccountValue pv, if (logger.isDebugEnabled()) { logger.debug("to be created, accRole common"); - org.collectionspace.services.authorization.ObjectFactory objectFactory = new org.collectionspace.services.authorization.ObjectFactory(); - logger.debug(objectAsXmlString(objectFactory.createAccountRole(accRole), AccountRole.class)); + logger.debug(objectAsXmlString(accRole, AccountRole.class)); } return accRole; } diff --git a/services/account/jaxb/src/main/resources/org/collectionspace/services/account/jaxb.index b/services/account/jaxb/src/main/resources/org/collectionspace/services/account/jaxb.index new file mode 100644 index 0000000000..c666eac228 --- /dev/null +++ b/services/account/jaxb/src/main/resources/org/collectionspace/services/account/jaxb.index @@ -0,0 +1,10 @@ +AccountListItem +AccountTenant +AccountsCommon +AccountsCommonList +RoleList +RoleValue +Status +Tenant +TenantListItem +TenantsList diff --git a/services/account/service/pom.xml b/services/account/service/pom.xml index 9d1465b1ac..70f272ce7a 100644 --- a/services/account/service/pom.xml +++ b/services/account/service/pom.xml @@ -89,11 +89,7 @@ org.jboss.resteasy - resteasy-jaxrs - - - org.jboss.resteasy - resteasy-jaxb-provider + resteasy-client org.jboss.resteasy diff --git a/services/acquisition/client/pom.xml b/services/acquisition/client/pom.xml index 622359253c..2c85caf637 100644 --- a/services/acquisition/client/pom.xml +++ b/services/acquisition/client/pom.xml @@ -48,11 +48,7 @@ org.jboss.resteasy - resteasy-jaxrs - - - org.jboss.resteasy - resteasy-jaxb-provider + resteasy-client org.jboss.resteasy diff --git a/services/advancedsearch/client/pom.xml b/services/advancedsearch/client/pom.xml index 6b3226169e..8ebd6ab394 100644 --- a/services/advancedsearch/client/pom.xml +++ b/services/advancedsearch/client/pom.xml @@ -32,7 +32,7 @@ org.jboss.resteasy - resteasy-jaxrs + resteasy-client @@ -41,10 +41,6 @@ - - org.jboss.resteasy - resteasy-jaxb-provider - org.jboss.resteasy resteasy-multipart-provider @@ -58,4 +54,4 @@ collectionspace-services-advancedsearch-client - \ No newline at end of file + diff --git a/services/advancedsearch/service/pom.xml b/services/advancedsearch/service/pom.xml index b77426cfc1..25dcdd58a1 100644 --- a/services/advancedsearch/service/pom.xml +++ b/services/advancedsearch/service/pom.xml @@ -74,7 +74,7 @@ org.jboss.resteasy - resteasy-jaxrs + resteasy-client tjws @@ -82,10 +82,6 @@ - - org.jboss.resteasy - resteasy-jaxb-provider - org.jboss.resteasy resteasy-multipart-provider diff --git a/services/authentication/jaxb/src/main/java/org/collectionspace/services/authentication/Passwordreset.java b/services/authentication/jaxb/src/main/java/org/collectionspace/services/authentication/Passwordreset.java index df40b27f40..c9e7a4b226 100644 --- a/services/authentication/jaxb/src/main/java/org/collectionspace/services/authentication/Passwordreset.java +++ b/services/authentication/jaxb/src/main/java/org/collectionspace/services/authentication/Passwordreset.java @@ -4,10 +4,8 @@ import jakarta.xml.bind.annotation.XmlAccessorType; import jakarta.xml.bind.annotation.XmlElement; import jakarta.xml.bind.annotation.XmlRootElement; -import jakarta.xml.bind.annotation.XmlType; @XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "") @XmlRootElement(name = "passwordreset") public class Passwordreset { diff --git a/services/authentication/jaxb/src/main/java/org/collectionspace/services/authentication/Token.java b/services/authentication/jaxb/src/main/java/org/collectionspace/services/authentication/Token.java index 192018dfe0..f87eaed8a6 100644 --- a/services/authentication/jaxb/src/main/java/org/collectionspace/services/authentication/Token.java +++ b/services/authentication/jaxb/src/main/java/org/collectionspace/services/authentication/Token.java @@ -18,12 +18,10 @@ import jakarta.xml.bind.annotation.XmlElement; import jakarta.xml.bind.annotation.XmlRootElement; import jakarta.xml.bind.annotation.XmlSchemaType; -import jakarta.xml.bind.annotation.XmlType; import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import org.collectionspace.services.jaxb.adapter.DateAdapter; @XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "") @XmlRootElement(name = "token") @Entity(name = "Token") @Table(name = "tokens") diff --git a/services/authentication/jaxb/src/main/java/org/collectionspace/services/authentication/User.java b/services/authentication/jaxb/src/main/java/org/collectionspace/services/authentication/User.java index 60f2565787..b27ead0c65 100644 --- a/services/authentication/jaxb/src/main/java/org/collectionspace/services/authentication/User.java +++ b/services/authentication/jaxb/src/main/java/org/collectionspace/services/authentication/User.java @@ -17,12 +17,10 @@ import jakarta.xml.bind.annotation.XmlElement; import jakarta.xml.bind.annotation.XmlRootElement; import jakarta.xml.bind.annotation.XmlSchemaType; -import jakarta.xml.bind.annotation.XmlType; import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import org.collectionspace.services.jaxb.adapter.DateAdapter; @XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "") @XmlRootElement(name = "user") @Entity(name = "User") @Table(name = "users") diff --git a/services/authentication/jaxb/src/main/java/org/collectionspace/services/authentication/package-info.java b/services/authentication/jaxb/src/main/java/org/collectionspace/services/authentication/package-info.java new file mode 100644 index 0000000000..50126239ee --- /dev/null +++ b/services/authentication/jaxb/src/main/java/org/collectionspace/services/authentication/package-info.java @@ -0,0 +1,4 @@ +@XmlSchema(namespace = "http://collectionspace.org/services/authentication") +package org.collectionspace.services.authentication; + +import jakarta.xml.bind.annotation.XmlSchema; \ No newline at end of file diff --git a/services/authentication/jaxb/src/main/resources/org/collectionspace/services/authentication/jaxb.index b/services/authentication/jaxb/src/main/resources/org/collectionspace/services/authentication/jaxb.index new file mode 100644 index 0000000000..3d69c33e3d --- /dev/null +++ b/services/authentication/jaxb/src/main/resources/org/collectionspace/services/authentication/jaxb.index @@ -0,0 +1,3 @@ +Passwordreset +Token +User diff --git a/services/authority/pom.xml b/services/authority/pom.xml index eba0994ce5..ed0b2d782b 100644 --- a/services/authority/pom.xml +++ b/services/authority/pom.xml @@ -57,11 +57,7 @@ org.jboss.resteasy - resteasy-jaxrs - - - org.jboss.resteasy - resteasy-jaxb-provider + resteasy-client org.jboss.resteasy diff --git a/services/authority/service/pom.xml b/services/authority/service/pom.xml index 739d2b073b..759d54f54e 100644 --- a/services/authority/service/pom.xml +++ b/services/authority/service/pom.xml @@ -149,11 +149,7 @@ org.jboss.resteasy - resteasy-jaxrs - - - org.jboss.resteasy - resteasy-jaxb-provider + resteasy-client org.jboss.resteasy diff --git a/services/authorization-mgt/client/pom.xml b/services/authorization-mgt/client/pom.xml index 3bfc04abb6..aa2c82491d 100644 --- a/services/authorization-mgt/client/pom.xml +++ b/services/authorization-mgt/client/pom.xml @@ -44,31 +44,14 @@ - org.testng testng org.jboss.resteasy - resteasy-jaxrs - - - org.jboss.resteasy - resteasy-jaxb-provider - - commons-httpclient commons-httpclient diff --git a/services/authorization-mgt/client/src/test/java/org/collectionspace/services/authorization/client/test/RoleServiceTest.java b/services/authorization-mgt/client/src/test/java/org/collectionspace/services/authorization/client/test/RoleServiceTest.java index 18a65b3b0e..87faeaf62c 100644 --- a/services/authorization-mgt/client/src/test/java/org/collectionspace/services/authorization/client/test/RoleServiceTest.java +++ b/services/authorization-mgt/client/src/test/java/org/collectionspace/services/authorization/client/test/RoleServiceTest.java @@ -751,9 +751,7 @@ public void update(String testName) throws Exception { roleToUpdate.setDescription("updated role description"); if (logger.isDebugEnabled()) { logger.debug("updated object"); - org.collectionspace.services.authorization.ObjectFactory objectFactory = new org.collectionspace.services.authorization.ObjectFactory(); - logger.debug(objectAsXmlString(objectFactory.createRole(roleToUpdate), - Role.class)); + logger.debug(objectAsXmlString(roleToUpdate, Role.class)); } RoleClient client = new RoleClient(); // Submit the request to the service and store the response. @@ -859,9 +857,7 @@ public void verifyProtectionReadOnly(String testName) throws Exception { Assert.assertNotNull(roleUpdated); if (logger.isDebugEnabled()) { logger.debug(testName + "Updated role: "); - org.collectionspace.services.authorization.ObjectFactory objectFactory = new org.collectionspace.services.authorization.ObjectFactory(); - logger.debug(objectAsXmlString(objectFactory.createRole(roleUpdated), - Role.class)); + logger.debug(objectAsXmlString(roleUpdated, Role.class)); } Assert.assertFalse(RoleClient.IMMUTABLE.equalsIgnoreCase(roleUpdated.getMetadataProtection()), @@ -887,9 +883,7 @@ public void updateNotAllowed(String testName) throws Exception { roleToUpdate.setDisplayName("UPDATED-ROLE_USERS_TEST"); if (logger.isDebugEnabled()) { logger.debug("updated object"); - org.collectionspace.services.authorization.ObjectFactory objectFactory = new org.collectionspace.services.authorization.ObjectFactory(); - logger.debug(objectAsXmlString(objectFactory.createRole(roleToUpdate), - Role.class)); + logger.debug(objectAsXmlString(roleToUpdate, Role.class)); } RoleClient client = new RoleClient(); // Submit the request to the service and store the response. @@ -1063,9 +1057,7 @@ public Role createRoleInstance(String roleName, if (logger.isDebugEnabled()) { logger.debug("to be created, role"); - org.collectionspace.services.authorization.ObjectFactory objectFactory = new org.collectionspace.services.authorization.ObjectFactory(); - logger.debug(objectAsXmlString(objectFactory.createRole(role), - Role.class)); + logger.debug(objectAsXmlString(role, Role.class)); } return role; diff --git a/services/authorization-mgt/import/src/main/java/org/collectionspace/services/authorization/importer/AuthorizationGen.java b/services/authorization-mgt/import/src/main/java/org/collectionspace/services/authorization/importer/AuthorizationGen.java index 7c14e70c82..d712f2eb16 100644 --- a/services/authorization-mgt/import/src/main/java/org/collectionspace/services/authorization/importer/AuthorizationGen.java +++ b/services/authorization-mgt/import/src/main/java/org/collectionspace/services/authorization/importer/AuthorizationGen.java @@ -44,6 +44,7 @@ import org.collectionspace.services.common.authorization_mgt.AuthorizationCommon; import org.collectionspace.services.common.config.ServicesConfigReaderImpl; import org.collectionspace.services.common.config.TenantBindingConfigReaderImpl; +import org.collectionspace.services.common.jaxb.JAXBContextCache; import org.collectionspace.services.common.security.SecurityUtils; import org.collectionspace.services.common.storage.jpa.JPATransactionContext; import org.collectionspace.services.config.service.ServiceBindingType; @@ -472,13 +473,7 @@ private Role buildTenantMgmntRole() { public void exportDefaultRoles(String fileName) { RolesList rList = new RolesList(); rList.setRole(this.getDefaultRoles()); - // - // Since it is missing the @XMLRootElement annotation, create a JAXBElement wrapper for the RoleList instance - // so we can have it marshalled it correctly. - // - org.collectionspace.services.authorization.ObjectFactory objectFactory = new org.collectionspace.services.authorization.ObjectFactory(); - toFile(objectFactory.createRolesList(rList), RolesList.class, - fileName); + toFile(rList, RolesList.class, fileName); if (logger.isDebugEnabled()) { logger.debug("exported roles to " + fileName); } @@ -487,11 +482,7 @@ public void exportDefaultRoles(String fileName) { public void exportDefaultPermissions(String fileName) { PermissionsList pcList = new PermissionsList(); pcList.setPermission(this.getDefaultPermissions()); - org.collectionspace.services.authorization.ObjectFactory objectFactory = - new org.collectionspace.services.authorization.ObjectFactory(); - toFile(pcList, PermissionsList.class, -// toFile(objectFactory.createPermissionsList(pcList), PermissionsList.class, - fileName); + toFile(pcList, PermissionsList.class, fileName); if (logger.isDebugEnabled()) { logger.debug("exported permissions to " + fileName); } @@ -500,8 +491,7 @@ public void exportDefaultPermissions(String fileName) { public void exportDefaultPermissionRoles(String fileName) { PermissionsRolesList psrsl = new PermissionsRolesList(); psrsl.setPermissionRole(this.getDefaultAdminPermissionRoles()); - toFile(psrsl, PermissionsRolesList.class, - fileName); + toFile(psrsl, PermissionsRolesList.class, fileName); if (logger.isDebugEnabled()) { logger.debug("exported permissions-roles to " + fileName); } @@ -510,10 +500,9 @@ public void exportDefaultPermissionRoles(String fileName) { private void toFile(Object o, Class jaxbClass, String fileName) { File f = new File(fileName); try { - JAXBContext jc = JAXBContext.newInstance(jaxbClass); + JAXBContext jc = JAXBContextCache.getInstance().getCachedJAXBContext(jaxbClass); Marshaller m = jc.createMarshaller(); - m.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, - Boolean.TRUE); + m.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, Boolean.TRUE); m.marshal(o, f); } catch (Exception e) { e.printStackTrace(); diff --git a/services/authorization-mgt/import/src/main/java/org/collectionspace/services/authorization/importer/AuthorizationSeed.java b/services/authorization-mgt/import/src/main/java/org/collectionspace/services/authorization/importer/AuthorizationSeed.java index b4f04d4802..64e57c76ea 100644 --- a/services/authorization-mgt/import/src/main/java/org/collectionspace/services/authorization/importer/AuthorizationSeed.java +++ b/services/authorization-mgt/import/src/main/java/org/collectionspace/services/authorization/importer/AuthorizationSeed.java @@ -34,6 +34,7 @@ import org.collectionspace.services.authorization.perms.Permission; import org.collectionspace.services.authorization.perms.PermissionsList; import org.collectionspace.services.common.authorization_mgt.AuthorizationCommon; +import org.collectionspace.services.common.jaxb.JAXBContextCache; import org.collectionspace.services.common.storage.jpa.JPATransactionContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -142,20 +143,12 @@ private CSpaceAction getAction(ActionType action) { */ static Object fromFile(Class jaxbClass, String fileName) throws Exception { - InputStream is = new FileInputStream(fileName); - try { - JAXBContext context = JAXBContext.newInstance(jaxbClass); + try (InputStream is = new FileInputStream(fileName)) { + JAXBContext context = JAXBContextCache.getInstance().getCachedJAXBContext(jaxbClass); Unmarshaller unmarshaller = context.createUnmarshaller(); //note: setting schema to null will turn validator off unmarshaller.setSchema(null); return jaxbClass.cast(unmarshaller.unmarshal(is)); - } finally { - if (is != null) { - try { - is.close(); - } catch (Exception e) { - } - } } } } diff --git a/services/authorization-mgt/service/pom.xml b/services/authorization-mgt/service/pom.xml index 1ce9ae52e6..a6e4194e02 100644 --- a/services/authorization-mgt/service/pom.xml +++ b/services/authorization-mgt/service/pom.xml @@ -53,11 +53,7 @@ org.jboss.resteasy - resteasy-jaxrs - - - org.jboss.resteasy - resteasy-jaxb-provider + resteasy-client org.jboss.resteasy diff --git a/services/authorization-mgt/service/src/main/java/org/collectionspace/services/authorization/storage/PermissionValidatorHandler.java b/services/authorization-mgt/service/src/main/java/org/collectionspace/services/authorization/storage/PermissionValidatorHandler.java index 835b7c8939..a810bda645 100644 --- a/services/authorization-mgt/service/src/main/java/org/collectionspace/services/authorization/storage/PermissionValidatorHandler.java +++ b/services/authorization-mgt/service/src/main/java/org/collectionspace/services/authorization/storage/PermissionValidatorHandler.java @@ -117,12 +117,8 @@ private boolean validateActionFields(Action action, Permission permission) { } else { if (action.equals(Action.CREATE)) { result = false; - org.collectionspace.services.authorization.perms.ObjectFactory objectFactory = - new org.collectionspace.services.authorization.perms.ObjectFactory(); - JAXBElement permJaxbElement = objectFactory.createPermission(permission); - String msg = String.format("Either (or both) the 'action' or 'actiongroup' element needs to be set: %s", - JaxbUtils.toString(permJaxbElement, Permission.class)); - logger.error(msg); + logger.error("Either (or both) the 'action' or 'actiongroup' element needs to be set: {}", + JaxbUtils.toString(permission, Permission.class)); } } diff --git a/services/authorization-mgt/service/src/main/java/org/collectionspace/services/authorization/storage/RoleDocumentHandler.java b/services/authorization-mgt/service/src/main/java/org/collectionspace/services/authorization/storage/RoleDocumentHandler.java index 0d7ee53b87..88154ac297 100644 --- a/services/authorization-mgt/service/src/main/java/org/collectionspace/services/authorization/storage/RoleDocumentHandler.java +++ b/services/authorization-mgt/service/src/main/java/org/collectionspace/services/authorization/storage/RoleDocumentHandler.java @@ -154,9 +154,7 @@ private Role merge(Role from, Role to) throws Exception { } if (logger.isDebugEnabled()) { - org.collectionspace.services.authorization.ObjectFactory objectFactory = - new org.collectionspace.services.authorization.ObjectFactory(); - logger.debug("Merged role on update=" + JaxbUtils.toString(objectFactory.createRole(to), Role.class)); + logger.debug("Merged role on update= {}", JaxbUtils.toString(to, Role.class)); } return to; @@ -259,19 +257,19 @@ protected RolesList extractPagingInfoForRoles(RolesList roleList, DocumentWrappe return roleList; } - + @Override public RolesList extractCommonPartList( DocumentWrapper> wrapDoc) throws Exception { - RolesList rolesList = extractPagingInfoForRoles(new RolesList(), wrapDoc); + RolesList rolesList = extractPagingInfoForRoles(new RolesList(), wrapDoc); List list = new ArrayList(); rolesList.setRole(list); for (Role role : wrapDoc.getWrappedObject()) { sanitize(role); list.add(role); } - + return rolesList; } @@ -296,8 +294,7 @@ public void setCommonPartList(RolesList rolesList) { } @Override - public String getQProperty( - String prop) { + public String getQProperty(String prop) { return null; } diff --git a/services/authorization/jaxb/src/main/java/org/collectionspace/services/authorization/AccountPermission.java b/services/authorization/jaxb/src/main/java/org/collectionspace/services/authorization/AccountPermission.java index 4fb193c4c2..5e4099852b 100644 --- a/services/authorization/jaxb/src/main/java/org/collectionspace/services/authorization/AccountPermission.java +++ b/services/authorization/jaxb/src/main/java/org/collectionspace/services/authorization/AccountPermission.java @@ -6,11 +6,11 @@ import jakarta.xml.bind.annotation.XmlAccessType; import jakarta.xml.bind.annotation.XmlAccessorType; import jakarta.xml.bind.annotation.XmlElement; -import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlRootElement; import org.jspecify.annotations.NonNull; @XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "account_permission") +@XmlRootElement(name = "account_permission") public class AccountPermission { @XmlElement(required = true) diff --git a/services/authorization/jaxb/src/main/java/org/collectionspace/services/authorization/AccountRole.java b/services/authorization/jaxb/src/main/java/org/collectionspace/services/authorization/AccountRole.java index 7ca300364f..bec5515e6a 100644 --- a/services/authorization/jaxb/src/main/java/org/collectionspace/services/authorization/AccountRole.java +++ b/services/authorization/jaxb/src/main/java/org/collectionspace/services/authorization/AccountRole.java @@ -6,11 +6,11 @@ import jakarta.xml.bind.annotation.XmlAccessType; import jakarta.xml.bind.annotation.XmlAccessorType; import jakarta.xml.bind.annotation.XmlElement; -import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlRootElement; import org.jspecify.annotations.NonNull; @XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "account_role") +@XmlRootElement(name = "account_role") public class AccountRole { private SubjectType subject; diff --git a/services/authorization/jaxb/src/main/java/org/collectionspace/services/authorization/AccountRoleRel.java b/services/authorization/jaxb/src/main/java/org/collectionspace/services/authorization/AccountRoleRel.java index dcd2732775..54133869b1 100644 --- a/services/authorization/jaxb/src/main/java/org/collectionspace/services/authorization/AccountRoleRel.java +++ b/services/authorization/jaxb/src/main/java/org/collectionspace/services/authorization/AccountRoleRel.java @@ -19,13 +19,13 @@ import jakarta.xml.bind.annotation.XmlAccessorType; import jakarta.xml.bind.annotation.XmlAttribute; import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; import jakarta.xml.bind.annotation.XmlSchemaType; -import jakarta.xml.bind.annotation.XmlType; import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import org.collectionspace.services.jaxb.adapter.DateAdapter; @XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "account_role_rel") +@XmlRootElement(name = "account_role_rel") @Entity(name = "AccountRoleRel") @Table(name = "accounts_roles", uniqueConstraints = { @UniqueConstraint(columnNames = { diff --git a/services/authorization/jaxb/src/main/java/org/collectionspace/services/authorization/ObjectFactory.java b/services/authorization/jaxb/src/main/java/org/collectionspace/services/authorization/ObjectFactory.java deleted file mode 100644 index c16076a064..0000000000 --- a/services/authorization/jaxb/src/main/java/org/collectionspace/services/authorization/ObjectFactory.java +++ /dev/null @@ -1,56 +0,0 @@ -package org.collectionspace.services.authorization; - -import javax.xml.namespace.QName; - -import jakarta.xml.bind.JAXBElement; -import jakarta.xml.bind.annotation.XmlElementDecl; -import jakarta.xml.bind.annotation.XmlRegistry; - -@XmlRegistry -public class ObjectFactory { - - private static final String AUTHORIZATION_NS = "http://collectionspace.org/services/authorization"; - - private static final QName _AccountRole_QNAME = new QName(AUTHORIZATION_NS, "account_role"); - private static final QName _AccountRoleRel_QNAME = new QName(AUTHORIZATION_NS, "account_role_rel"); - private static final QName _AccountPermission_QNAME = new QName(AUTHORIZATION_NS, "account_permission"); - private static final QName _PermissionRoleRel_QNAME = new QName(AUTHORIZATION_NS, "permission_role_rel"); - private static final QName _Role_QNAME = new QName(AUTHORIZATION_NS, "role"); - private static final QName _RolesList_QNAME = new QName(AUTHORIZATION_NS, "roles_list"); - private static final QName _PermissionRole_QNAME = new QName(AUTHORIZATION_NS, "permission_role"); - - @XmlElementDecl(namespace = AUTHORIZATION_NS, name = "account_role") - public JAXBElement createAccountRole(AccountRole value) { - return new JAXBElement<>(_AccountRole_QNAME, AccountRole.class, null, value); - } - - @XmlElementDecl(namespace = AUTHORIZATION_NS, name = "account_role_rel") - public JAXBElement createAccountRoleRel(AccountRoleRel value) { - return new JAXBElement<>(_AccountRoleRel_QNAME, AccountRoleRel.class, null, value); - } - - @XmlElementDecl(namespace = AUTHORIZATION_NS, name = "account_permission") - public JAXBElement createAccountPermission(AccountPermission value) { - return new JAXBElement<>(_AccountPermission_QNAME, AccountPermission.class, null, value); - } - - @XmlElementDecl(namespace = AUTHORIZATION_NS, name = "permission_role_rel") - public JAXBElement createPermissionRoleRel(PermissionRoleRel value) { - return new JAXBElement<>(_PermissionRoleRel_QNAME, PermissionRoleRel.class, null, value); - } - - @XmlElementDecl(namespace = AUTHORIZATION_NS, name = "role") - public JAXBElement createRole(Role value) { - return new JAXBElement<>(_Role_QNAME, Role.class, null, value); - } - - @XmlElementDecl(namespace = AUTHORIZATION_NS, name = "roles_list") - public JAXBElement createRolesList(RolesList value) { - return new JAXBElement<>(_RolesList_QNAME, RolesList.class, null, value); - } - - @XmlElementDecl(namespace = AUTHORIZATION_NS, name = "permission_role") - public JAXBElement createPermissionRole(PermissionRole value) { - return new JAXBElement<>(_PermissionRole_QNAME, PermissionRole.class, null, value); - } -} diff --git a/services/authorization/jaxb/src/main/java/org/collectionspace/services/authorization/PermissionRole.java b/services/authorization/jaxb/src/main/java/org/collectionspace/services/authorization/PermissionRole.java index a80a011b3a..009cfe9654 100644 --- a/services/authorization/jaxb/src/main/java/org/collectionspace/services/authorization/PermissionRole.java +++ b/services/authorization/jaxb/src/main/java/org/collectionspace/services/authorization/PermissionRole.java @@ -6,11 +6,11 @@ import jakarta.xml.bind.annotation.XmlAccessType; import jakarta.xml.bind.annotation.XmlAccessorType; import jakarta.xml.bind.annotation.XmlElement; -import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlRootElement; import org.jspecify.annotations.NonNull; @XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "permission_role") +@XmlRootElement(name = "permission_role") public class PermissionRole { private SubjectType subject; diff --git a/services/authorization/jaxb/src/main/java/org/collectionspace/services/authorization/PermissionRoleRel.java b/services/authorization/jaxb/src/main/java/org/collectionspace/services/authorization/PermissionRoleRel.java index 6adf6e7ab0..e743739bb5 100644 --- a/services/authorization/jaxb/src/main/java/org/collectionspace/services/authorization/PermissionRoleRel.java +++ b/services/authorization/jaxb/src/main/java/org/collectionspace/services/authorization/PermissionRoleRel.java @@ -19,13 +19,13 @@ import jakarta.xml.bind.annotation.XmlAccessorType; import jakarta.xml.bind.annotation.XmlAttribute; import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; import jakarta.xml.bind.annotation.XmlSchemaType; -import jakarta.xml.bind.annotation.XmlType; import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import org.collectionspace.services.jaxb.adapter.DateAdapter; @XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "permission_role_rel") +@XmlRootElement(name = "permission_role_rel") @Entity(name = "PermissionRoleRel") @Table(name = "permissions_roles", uniqueConstraints = { @UniqueConstraint(columnNames = { diff --git a/services/authorization/jaxb/src/main/java/org/collectionspace/services/authorization/PermissionsRolesList.java b/services/authorization/jaxb/src/main/java/org/collectionspace/services/authorization/PermissionsRolesList.java index 92702470ee..ad9ce5b3ab 100644 --- a/services/authorization/jaxb/src/main/java/org/collectionspace/services/authorization/PermissionsRolesList.java +++ b/services/authorization/jaxb/src/main/java/org/collectionspace/services/authorization/PermissionsRolesList.java @@ -8,11 +8,9 @@ import jakarta.xml.bind.annotation.XmlAccessorType; import jakarta.xml.bind.annotation.XmlElement; import jakarta.xml.bind.annotation.XmlRootElement; -import jakarta.xml.bind.annotation.XmlType; import org.jspecify.annotations.NonNull; @XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "") @XmlRootElement(name = "permissions_roles_list") public class PermissionsRolesList { diff --git a/services/authorization/jaxb/src/main/java/org/collectionspace/services/authorization/Role.java b/services/authorization/jaxb/src/main/java/org/collectionspace/services/authorization/Role.java index 236c751079..053c7efc8b 100644 --- a/services/authorization/jaxb/src/main/java/org/collectionspace/services/authorization/Role.java +++ b/services/authorization/jaxb/src/main/java/org/collectionspace/services/authorization/Role.java @@ -20,14 +20,14 @@ import jakarta.xml.bind.annotation.XmlAccessorType; import jakarta.xml.bind.annotation.XmlAttribute; import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; import jakarta.xml.bind.annotation.XmlSchemaType; -import jakarta.xml.bind.annotation.XmlType; import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import org.collectionspace.services.jaxb.adapter.DateAdapter; import org.jspecify.annotations.NonNull; @XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "role") +@XmlRootElement(name = "role") @Entity(name = "Role") @Table(name = "roles", uniqueConstraints = { @UniqueConstraint(columnNames = { diff --git a/services/authorization/jaxb/src/main/java/org/collectionspace/services/authorization/RolesList.java b/services/authorization/jaxb/src/main/java/org/collectionspace/services/authorization/RolesList.java index a0182ec90c..e1757a2939 100644 --- a/services/authorization/jaxb/src/main/java/org/collectionspace/services/authorization/RolesList.java +++ b/services/authorization/jaxb/src/main/java/org/collectionspace/services/authorization/RolesList.java @@ -6,12 +6,12 @@ import jakarta.xml.bind.annotation.XmlAccessType; import jakarta.xml.bind.annotation.XmlAccessorType; import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; import jakarta.xml.bind.annotation.XmlSchemaType; -import jakarta.xml.bind.annotation.XmlType; import org.jspecify.annotations.NonNull; @XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "roles_list") +@XmlRootElement(name = "roles_list") public class RolesList { @XmlSchemaType(name = "unsignedInt") diff --git a/services/authorization/jaxb/src/main/java/org/collectionspace/services/authorization/package-info.java b/services/authorization/jaxb/src/main/java/org/collectionspace/services/authorization/package-info.java index 1305144dbc..5fe4f81301 100644 --- a/services/authorization/jaxb/src/main/java/org/collectionspace/services/authorization/package-info.java +++ b/services/authorization/jaxb/src/main/java/org/collectionspace/services/authorization/package-info.java @@ -1 +1,4 @@ -package org.collectionspace.services.authorization; \ No newline at end of file +@XmlSchema(namespace = "http://collectionspace.org/services/authorization") +package org.collectionspace.services.authorization; + +import jakarta.xml.bind.annotation.XmlSchema; \ No newline at end of file diff --git a/services/authorization/jaxb/src/main/resources/org/collectionspace/services/authorization/jaxb.index b/services/authorization/jaxb/src/main/resources/org/collectionspace/services/authorization/jaxb.index new file mode 100644 index 0000000000..87777afd24 --- /dev/null +++ b/services/authorization/jaxb/src/main/resources/org/collectionspace/services/authorization/jaxb.index @@ -0,0 +1,12 @@ +AccountPermission +AccountRole +AccountRoleRel +AccountValue +PermissionRole +PermissionRoleRel +PermissionValue +PermissionsRolesList +Role +RoleValue +RolesList +SubjectType diff --git a/services/batch/client/pom.xml b/services/batch/client/pom.xml index 8e977d900d..494e9066b7 100644 --- a/services/batch/client/pom.xml +++ b/services/batch/client/pom.xml @@ -52,11 +52,7 @@ org.jboss.resteasy - resteasy-jaxrs - - - org.jboss.resteasy - resteasy-jaxb-provider + resteasy-client org.jboss.resteasy diff --git a/services/batch/service/pom.xml b/services/batch/service/pom.xml index c7e75d7061..7a72cd0641 100644 --- a/services/batch/service/pom.xml +++ b/services/batch/service/pom.xml @@ -192,11 +192,7 @@ org.jboss.resteasy - resteasy-jaxrs - - - org.jboss.resteasy - resteasy-jaxb-provider + resteasy-client org.jboss.resteasy diff --git a/services/batch/service/src/main/java/org/collectionspace/services/batch/nuxeo/BatchDocumentModelHandler.java b/services/batch/service/src/main/java/org/collectionspace/services/batch/nuxeo/BatchDocumentModelHandler.java index 8e34182a3a..6a35c78fa8 100644 --- a/services/batch/service/src/main/java/org/collectionspace/services/batch/nuxeo/BatchDocumentModelHandler.java +++ b/services/batch/service/src/main/java/org/collectionspace/services/batch/nuxeo/BatchDocumentModelHandler.java @@ -299,7 +299,7 @@ public InvocationResults invokeBatchJob(ServiceContext org.jboss.resteasy - resteasy-jaxrs - - - org.jboss.resteasy - resteasy-jaxb-provider + resteasy-client org.jboss.resteasy diff --git a/services/chronology/client/pom.xml b/services/chronology/client/pom.xml index cd1f6f748b..eb06c53690 100644 --- a/services/chronology/client/pom.xml +++ b/services/chronology/client/pom.xml @@ -52,7 +52,7 @@ org.jboss.resteasy - resteasy-jaxrs + resteasy-client @@ -61,10 +61,6 @@ - - org.jboss.resteasy - resteasy-jaxb-provider - org.jboss.resteasy resteasy-multipart-provider diff --git a/services/chronology/service/pom.xml b/services/chronology/service/pom.xml index ac0dc1b00b..db50dcee54 100644 --- a/services/chronology/service/pom.xml +++ b/services/chronology/service/pom.xml @@ -59,7 +59,7 @@ org.jboss.resteasy - resteasy-jaxrs + resteasy-client tjws @@ -67,10 +67,6 @@ - - org.jboss.resteasy - resteasy-jaxb-provider - org.jboss.resteasy resteasy-multipart-provider diff --git a/services/citation/client/pom.xml b/services/citation/client/pom.xml index 2ab4202a17..25a608f5b2 100644 --- a/services/citation/client/pom.xml +++ b/services/citation/client/pom.xml @@ -47,11 +47,7 @@ org.jboss.resteasy - resteasy-jaxrs - - - org.jboss.resteasy - resteasy-jaxb-provider + resteasy-client org.jboss.resteasy diff --git a/services/citation/service/pom.xml b/services/citation/service/pom.xml index 7fa5c5a40d..6c240598e6 100644 --- a/services/citation/service/pom.xml +++ b/services/citation/service/pom.xml @@ -63,11 +63,7 @@ org.jboss.resteasy - resteasy-jaxrs - - - org.jboss.resteasy - resteasy-jaxb-provider + resteasy-client org.jboss.resteasy diff --git a/services/claim/client/pom.xml b/services/claim/client/pom.xml index f380bdf383..ffdf7b26a2 100644 --- a/services/claim/client/pom.xml +++ b/services/claim/client/pom.xml @@ -55,11 +55,7 @@ org.jboss.resteasy - resteasy-jaxrs - - - org.jboss.resteasy - resteasy-jaxb-provider + resteasy-client org.jboss.resteasy diff --git a/services/claim/service/pom.xml b/services/claim/service/pom.xml index 77bd509276..7d537b9f11 100644 --- a/services/claim/service/pom.xml +++ b/services/claim/service/pom.xml @@ -62,11 +62,7 @@ org.jboss.resteasy - resteasy-jaxrs - - - org.jboss.resteasy - resteasy-jaxb-provider + resteasy-client org.jboss.resteasy diff --git a/services/client/pom.xml b/services/client/pom.xml index 357531d52e..f499176248 100644 --- a/services/client/pom.xml +++ b/services/client/pom.xml @@ -13,6 +13,11 @@ + + org.collectionspace.services + common-http + ${project.version} + org.collectionspace.services @@ -53,11 +58,7 @@ org.jboss.resteasy - resteasy-jaxrs - - - org.jboss.resteasy - resteasy-jaxb-provider + resteasy-client org.jboss.resteasy diff --git a/services/client/src/main/java/org/collectionspace/services/client/AbstractServiceClientImpl.java b/services/client/src/main/java/org/collectionspace/services/client/AbstractServiceClientImpl.java index dbd124f3b0..0be7dd36c5 100644 --- a/services/client/src/main/java/org/collectionspace/services/client/AbstractServiceClientImpl.java +++ b/services/client/src/main/java/org/collectionspace/services/client/AbstractServiceClientImpl.java @@ -28,61 +28,25 @@ import java.net.MalformedURLException; import java.net.URL; import java.util.Properties; - +import javax.ws.rs.client.Client; +import javax.ws.rs.client.ClientBuilder; import javax.ws.rs.client.ClientRequestContext; import javax.ws.rs.client.ClientRequestFilter; import javax.ws.rs.core.MultivaluedMap; import javax.ws.rs.core.Response; -import jakarta.xml.bind.DatatypeConverter; +import jakarta.xml.bind.DatatypeConverter; import org.apache.commons.httpclient.HttpClient; import org.apache.commons.httpclient.UsernamePasswordCredentials; import org.apache.commons.httpclient.auth.AuthScope; +import org.apache.http.impl.client.DefaultHttpClient; import org.collectionspace.services.common.api.Tools; +import org.collectionspace.services.common.provider.JakartaJAXBProvider; import org.collectionspace.services.jaxb.AbstractCommonList; -import org.jboss.resteasy.client.jaxrs.ResteasyClient; -import org.jboss.resteasy.client.jaxrs.ResteasyClientBuilder; -import org.jboss.resteasy.client.jaxrs.engines.URLConnectionEngine; -import org.jboss.resteasy.client.core.executors.ApacheHttpClient4Executor; -import org.jboss.resteasy.plugins.providers.RegisterBuiltin; -import org.jboss.resteasy.spi.ResteasyProviderFactory; +import org.jboss.resteasy.client.jaxrs.ResteasyWebTarget; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -// FIXME: Deprecated classes that need to be updated -import org.jboss.resteasy.client.ProxyFactory; -import org.apache.http.impl.client.DefaultHttpClient; -import java.security.cert.CertificateException; -import java.security.cert.X509Certificate; - -import javax.net.ssl.X509TrustManager; - -/** - * Private class for SSL support - */ -class HttpsTrustManager implements X509TrustManager { - - @Override - public void checkClientTrusted(X509Certificate[] arg0, String arg1) - throws CertificateException { - // TODO Auto-generated method stub - - } - - @Override - public void checkServerTrusted(X509Certificate[] arg0, String arg1) - throws CertificateException { - // TODO Auto-generated method stub - - } - - @Override - public X509Certificate[] getAcceptedIssuers() { - return new X509Certificate[]{}; - } - -} - /** * Private class for JAX-RS authentication */ @@ -112,7 +76,7 @@ private String getBasicAuthentication() { } catch (UnsupportedEncodingException ex) { throw new IllegalStateException("Cannot encode with UTF-8", ex); } - + return result; } } @@ -195,9 +159,7 @@ private void init() throws Exception { throw new RuntimeException(e.getMessage()); } - ResteasyProviderFactory factory = ResteasyProviderFactory.getInstance(); - RegisterBuiltin.register(factory); - setProxy(); + setProxy(); } /** @@ -524,43 +486,25 @@ public P getProxy() { * allow to reset proxy as per security needs */ @Override - public void setProxy() throws Exception { - ResteasyClient client = null; + public void setProxy() { + Client client = null; String urlString = url.toString(); Class

proxyClass = this.getProxyClass(); - -// if (useSSL()) { -// SSLContext sslcontext = SSLContexts.custom().useSSL().build(); -// sslcontext.init(null, new X509TrustManager[]{new HttpsTrustManager()}, new SecureRandom()); -// client = (ResteasyClient)ClientBuilder.newBuilder().sslContext(sslcontext).build(); -// } else { -// client = (ResteasyClient)ClientBuilder.newClient(); -// } - - client = new ResteasyClientBuilder().httpEngine(new URLConnectionEngine()).build(); - + + if (useAuth()) { String user = properties.getProperty(USER_PROPERTY); String password = properties.getProperty(PASSWORD_PROPERTY); - client = client.register(new Authenticator(user, password)); - } - - proxy = client.target(urlString).proxy(proxyClass); - } - - /** - * allow to reset proxy as per security needs - */ - @Deprecated - public void _setProxy() { - Class

proxyClass = this.getProxyClass(); - if (useAuth()) { - proxy = ProxyFactory.create(proxyClass, - getBaseURL(), new ApacheHttpClient4Executor(getHttpClient4())); + client = ClientBuilder.newBuilder() + .register(new Authenticator(user, password)) + .register(new JakartaJAXBProvider<>()) + .build(); } else { - proxy = ProxyFactory.create(proxyClass, - getBaseURL()); + client = ClientBuilder.newBuilder().register(new JakartaJAXBProvider<>()).build(); } + + ResteasyWebTarget target = (ResteasyWebTarget) client.target(urlString); + proxy = target.proxy(proxyClass); } @Override @@ -586,6 +530,7 @@ public void setAuth(boolean useAuth, } try { + // TODO: Why does this get set twice? setupHttpClient(); setupHttpClient(); // temp fix for CSPACE-6281 } catch (Exception e) { diff --git a/services/client/src/main/java/org/collectionspace/services/client/CollectionSpaceClientUtils.java b/services/client/src/main/java/org/collectionspace/services/client/CollectionSpaceClientUtils.java index 842ade0289..fee21c5487 100644 --- a/services/client/src/main/java/org/collectionspace/services/client/CollectionSpaceClientUtils.java +++ b/services/client/src/main/java/org/collectionspace/services/client/CollectionSpaceClientUtils.java @@ -38,6 +38,7 @@ import javax.xml.parsers.DocumentBuilderFactory; import org.apache.commons.io.FileUtils; +import org.collectionspace.services.common.jaxb.JAXBContextCache; import org.jboss.resteasy.plugins.providers.multipart.InputPart; import org.jboss.resteasy.plugins.providers.multipart.MultipartInput; import org.slf4j.Logger; @@ -76,12 +77,12 @@ public class CollectionSpaceClientUtils { * @param res the res * @return the string */ - static public String extractId(Response res) { + public static String extractId(Response res) { MultivaluedMap mvm = res.getMetadata(); return extractIdFromResponseMetadata(mvm); } - static protected String extractIdFromResponseMetadata(MultivaluedMap mvm) { + protected static String extractIdFromResponseMetadata(MultivaluedMap mvm) { // mvm may return a java.net.URI which complains about casting to String... String uri = ((List) mvm.get("Location")).get(0).toString(); if (logger.isDebugEnabled()) { @@ -104,7 +105,7 @@ static protected String extractIdFromResponseMetadata(MultivaluedMap clazz) + protected static Object extractPart(PoxPayloadIn input, String label, Class clazz) throws Exception { Object result = null; PayloadInputPart payloadInputPart = input.getPart(label); @@ -127,7 +128,7 @@ static protected Object extractPart(PoxPayloadIn input, String label, Class c * @throws Exception the exception */ @Deprecated - static public Object extractPart(MultipartInput input, String label, Class clazz) + public static Object extractPart(MultipartInput input, String label, Class clazz) throws Exception { Object obj = null; String partLabel = ""; @@ -186,9 +187,9 @@ static public Object extractPart(MultipartInput input, String label, Class cl * @return the part object * @throws JAXBException the jAXB exception */ - static public Object getPartObject(String partStr, Class clazz) + public static Object getPartObject(String partStr, Class clazz) throws JAXBException { - JAXBContext jc = JAXBContext.newInstance(clazz); + JAXBContext jc = JAXBContextCache.getInstance().getCachedJAXBContext(clazz); ByteArrayInputStream bais = null; Object obj = null; try { @@ -216,10 +217,10 @@ static public Object getPartObject(String partStr, Class clazz) * @param clazz the clazz * @return the string */ - static public String objectAsXmlString(Object o, Class clazz) { + public static String objectAsXmlString(Object o, Class clazz) { StringWriter sw = new StringWriter(); try { - JAXBContext jc = JAXBContext.newInstance(clazz); + JAXBContext jc = JAXBContextCache.getInstance().getCachedJAXBContext(clazz); Marshaller m = jc.createMarshaller(); m.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, Boolean.TRUE); @@ -237,7 +238,7 @@ static public String objectAsXmlString(Object o, Class clazz) { * @return * @throws Exception */ - static public Object getObjectFromFile(Class jaxbClass, String fileName) + public static Object getObjectFromFile(Class jaxbClass, String fileName) throws Exception { ClassLoader tccl = Thread.currentThread().getContextClassLoader(); InputStream is = tccl.getResourceAsStream(fileName); @@ -251,7 +252,7 @@ static public Object getObjectFromFile(Class jaxbClass, String fileName) * @return the xml document * @throws Exception the exception */ - static public Document getXmlDocument(String fileName) throws Exception { + public static Document getXmlDocument(String fileName) throws Exception { DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance(); File f = new File(fileName); if (!f.exists()) { @@ -268,7 +269,7 @@ static public Document getXmlDocument(String fileName) throws Exception { * @return the xml document as string * @throws Exception the exception */ - static public String getXmlDocumentAsString(String fileName) throws Exception { + public static String getXmlDocumentAsString(String fileName) throws Exception { byte[] b = FileUtils.readFileToByteArray(new File(fileName)); return new String(b); } @@ -280,8 +281,8 @@ static public String getXmlDocumentAsString(String fileName) throws Exception { * @return * @throws Exception */ - static public Object getObjectFromStream(Class jaxbClass, InputStream is) throws Exception { - JAXBContext context = JAXBContext.newInstance(jaxbClass); + public static Object getObjectFromStream(Class jaxbClass, InputStream is) throws Exception { + JAXBContext context = JAXBContextCache.getInstance().getCachedJAXBContext(jaxbClass); Unmarshaller unmarshaller = context.createUnmarshaller(); //note: setting schema to null will turn validator off unmarshaller.setSchema(null); diff --git a/services/client/src/main/java/org/collectionspace/services/client/PoxPayload.java b/services/client/src/main/java/org/collectionspace/services/client/PoxPayload.java index a7e5adcefc..59c533e22c 100644 --- a/services/client/src/main/java/org/collectionspace/services/client/PoxPayload.java +++ b/services/client/src/main/java/org/collectionspace/services/client/PoxPayload.java @@ -19,6 +19,7 @@ import org.apache.commons.io.FileUtils; import org.apache.commons.lang3.StringUtils; +import org.collectionspace.services.common.jaxb.JAXBContextCache; import org.dom4j.Document; import org.dom4j.DocumentException; import org.dom4j.DocumentHelper; @@ -368,7 +369,8 @@ public static Object toObject(Element elementInput) { if (StringUtils.isNotEmpty(namespace.getURI())) { String thePackage = getPackage(namespace); - JAXBContext jc = JAXBContext.newInstance(thePackage); + logger.info("Searching for JAXBContext instance for {}", thePackage); + JAXBContext jc = JAXBContextCache.getInstance().getCachedJAXBContext(thePackage); Unmarshaller um = jc.createUnmarshaller(); result = um.unmarshal(new StreamSource(new StringReader(elementInput.asXML()))); @@ -376,7 +378,7 @@ public static Object toObject(Element elementInput) { } catch (Exception e) { if (logger.isInfoEnabled()) { String msg = String.format("Could not unmarshal XML element '%s' into a JAXB object.", elementInput.getName()); - logger.info(msg); + logger.error(msg, e); } } @@ -399,7 +401,7 @@ public static Element toElement(Object jaxbObject) { JAXBElement jaxbElement = (JAXBElement)jaxbObject; thePackage = jaxbElement.getValue().getClass().getPackage().getName(); } - JAXBContext jc = JAXBContext.newInstance(thePackage); + JAXBContext jc = JAXBContextCache.getInstance().getCachedJAXBContext(thePackage); //Create marshaller Marshaller m = jc.createMarshaller(); m.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, false); @@ -410,9 +412,7 @@ public static Element toElement(Object jaxbObject) { Document doc = DocumentHelper.parseText(text); result = doc.getRootElement(); //FIXME: REM - call .detach() to free the element } catch (Exception e) { - String msg = String.format("Could not marshal JAXB object '%s' to an XML element.", - jaxbObject.toString()); - logger.error(msg); + logger.error("Could not marshal JAXB object '{}' to an XML element.", jaxbObject, e); } return result; diff --git a/services/client/src/main/java/org/collectionspace/services/client/test/BaseServiceTest.java b/services/client/src/main/java/org/collectionspace/services/client/test/BaseServiceTest.java index 1e9a5dc73d..1964fd08f5 100644 --- a/services/client/src/main/java/org/collectionspace/services/client/test/BaseServiceTest.java +++ b/services/client/src/main/java/org/collectionspace/services/client/test/BaseServiceTest.java @@ -53,6 +53,7 @@ import org.apache.commons.httpclient.methods.PutMethod; import org.apache.commons.httpclient.methods.StringRequestEntity; import org.apache.commons.io.FileUtils; +import org.collectionspace.services.common.jaxb.JAXBContextCache; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.Assert; @@ -88,7 +89,7 @@ @SuppressWarnings("rawtypes") public abstract class BaseServiceTest { //A default MIME type result - static protected final String DEFAULT_MIME = "application/octet-stream; charset=ISO-8859-1"; + protected static final String DEFAULT_MIME = "application/octet-stream; charset=ISO-8859-1"; //Maven's base directory -i.e., the one containing the current pom.xml protected static final String MAVEN_BASEDIR_PROPERTY = "maven.basedir"; /** The Constant logger. */ @@ -114,7 +115,7 @@ public abstract class BaseServiceTest { /* Use this to track authority items */ protected Map allResourceItemIdsCreated = new HashMap(); /* itemCsid, parentCsid */ /* A runtime/command-line parameter to indicate if we should delete all the test related resource objects */ - static private final String NO_TEST_CLEANUP = "noTestCleanup"; + private static final String NO_TEST_CLEANUP = "noTestCleanup"; /* A random number generator */ protected static final Random random = new Random(System.currentTimeMillis()); @@ -153,7 +154,7 @@ public abstract class BaseServiceTest { // Ж : Cyrillic capital letter Zhe with breve (U+04C1) // Ŵ : Latin capital letter W with circumflex (U+0174) // Ω : Greek capital letter Omega (U+03A9) - private final static String UTF8_DATA_FRAGMENT = "utf-8-data-fragment:" + private static final String UTF8_DATA_FRAGMENT = "utf-8-data-fragment:" + '\u0394' + '\u04C1' + '\u0174' +'\u03A9'; // // Status constants @@ -222,7 +223,7 @@ protected void beforeMethod(Method m) { * @return the client * @throws Exception */ - abstract protected CollectionSpaceClient getClientInstance() throws Exception; + protected abstract CollectionSpaceClient getClientInstance() throws Exception; /** * Gets the client. @@ -230,7 +231,7 @@ protected void beforeMethod(Method m) { * @return the client * @throws Exception */ - abstract protected CollectionSpaceClient getClientInstance(String clientPropertiesFilename) throws Exception; + protected abstract CollectionSpaceClient getClientInstance(String clientPropertiesFilename) throws Exception; /* * Subclasses can override this method to return their AbstractCommonList subclass @@ -460,7 +461,7 @@ protected int submitRequest(String method, String url, String mediaType, String * @param res the res * @return the string */ - static protected String extractId(Response res) { + protected static String extractId(Response res) { return CollectionSpaceClientUtils.extractId(res); } @@ -509,7 +510,7 @@ protected String createNonExistentIdentifier() { * @return the object * @throws Exception the exception */ - static protected Object extractPart(PoxPayloadIn input, String label, Class clazz) throws Exception { + protected static Object extractPart(PoxPayloadIn input, String label, Class clazz) throws Exception { Object result = null; PayloadInputPart payloadInputPart = input.getPart(label); @@ -522,7 +523,7 @@ static protected Object extractPart(PoxPayloadIn input, String label, Class c return result; } - static protected Object extractPart(PoxPayloadOut output, String label, Class clazz) throws Exception { + protected static Object extractPart(PoxPayloadOut output, String label, Class clazz) throws Exception { Object result = null; PayloadOutputPart payloadOutPart = output.getPart(label); @@ -545,9 +546,9 @@ static protected Object extractPart(PoxPayloadOut output, String label, Class * @throws JAXBException the jAXB exception */ @Deprecated - static protected Object getPartObject(String partStr, Class clazz) + protected static Object getPartObject(String partStr, Class clazz) throws JAXBException { - JAXBContext jc = JAXBContext.newInstance(clazz); + JAXBContext jc = JAXBContextCache.getInstance().getCachedJAXBContext(clazz); ByteArrayInputStream bais = null; Object obj = null; try { @@ -575,11 +576,11 @@ static protected Object getPartObject(String partStr, Class clazz) * @param clazz the clazz * @return the string */ - static protected String objectAsXmlString(Object o, Class clazz) { + protected static String objectAsXmlString(Object o, Class clazz) { StringWriter sw = new StringWriter(); JAXBContext jc; try { - jc = JAXBContext.newInstance(clazz); + jc = JAXBContextCache.getInstance().getCachedJAXBContext(clazz); Marshaller m = jc.createMarshaller(); try { m.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, Boolean.TRUE); @@ -599,7 +600,7 @@ static protected String objectAsXmlString(Object o, Class clazz) { return sw.toString(); } - static protected String objectAsXmlString(Object o) { + protected static String objectAsXmlString(Object o) { return objectAsXmlString(o, o.getClass()); } @@ -610,7 +611,7 @@ static protected String objectAsXmlString(Object o) { * @return * @throws Exception */ - static protected Object getObjectFromFile(Class jaxbClass, String fileName) + protected static Object getObjectFromFile(Class jaxbClass, String fileName) throws Exception { Object result = null; @@ -626,7 +627,7 @@ static protected Object getObjectFromFile(Class jaxbClass, String fileName) * @return the xml document * @throws Exception the exception */ - static protected Document getXmlDocument(String fileName) throws Exception { + protected static Document getXmlDocument(String fileName) throws Exception { DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance(); File f = new File(fileName); if (!f.exists()) { @@ -643,7 +644,7 @@ static protected Document getXmlDocument(String fileName) throws Exception { * @return the xml document as string * @throws Exception the exception */ - static protected String getXmlDocumentAsString(String fileName) throws Exception { + protected static String getXmlDocumentAsString(String fileName) throws Exception { String result = FileUtils.readFileToString(new File(fileName), "UTF8"); return result; } diff --git a/services/collectionobject/client/pom.xml b/services/collectionobject/client/pom.xml index d31cfc5987..3e667ce46e 100644 --- a/services/collectionobject/client/pom.xml +++ b/services/collectionobject/client/pom.xml @@ -53,11 +53,7 @@ org.jboss.resteasy - resteasy-jaxrs - - - org.jboss.resteasy - resteasy-jaxb-provider + resteasy-client org.jboss.resteasy diff --git a/services/collectionobject/service/pom.xml b/services/collectionobject/service/pom.xml index cf4ca8120f..decee487af 100644 --- a/services/collectionobject/service/pom.xml +++ b/services/collectionobject/service/pom.xml @@ -77,11 +77,7 @@ org.jboss.resteasy - resteasy-jaxrs - - - org.jboss.resteasy - resteasy-jaxb-provider + resteasy-client org.jboss.resteasy diff --git a/services/common-api/pom.xml b/services/common-api/pom.xml index e315a06747..c94418ae0c 100644 --- a/services/common-api/pom.xml +++ b/services/common-api/pom.xml @@ -15,10 +15,15 @@ jakarta.xml.bind jakarta.xml.bind-api + + org.collectionspace.services + common-http + ${revision} + org.apache.commons commons-lang3 - 3.2.1 + ${commons-lang3.version} provided diff --git a/services/common-api/src/main/java/org/collectionspace/services/common/api/FileTools.java b/services/common-api/src/main/java/org/collectionspace/services/common/api/FileTools.java index b0943c235b..8070300461 100644 --- a/services/common-api/src/main/java/org/collectionspace/services/common/api/FileTools.java +++ b/services/common-api/src/main/java/org/collectionspace/services/common/api/FileTools.java @@ -23,12 +23,16 @@ */ package org.collectionspace.services.common.api; -// This class is designed to avoid dependencies, so it does not include logging, or apache commons. -// There is another cspace utility class, called -// org.collectionspace.services.common.FileUtils -// albeit with different functions, which does have dependencies. - -import java.io.*; +import java.io.BufferedReader; +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.PrintWriter; +import java.io.Reader; +import java.io.StringWriter; +import java.io.Writer; import java.nio.charset.Charset; import java.nio.file.Files; import java.nio.file.Path; @@ -36,15 +40,19 @@ import java.nio.file.StandardOpenOption; import java.util.ArrayList; import java.util.List; -import java.util.UUID; import jakarta.xml.bind.JAXBContext; import jakarta.xml.bind.Unmarshaller; - +import org.collectionspace.services.common.jaxb.JAXBContextCache; import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** + * + * This class is designed to avoid dependencies, so it does not include logging, or apache commons. + * There is another cspace utility class, called org.collectionspace.services.common.FileUtils + * albeit with different functions, which does have dependencies. + * * @author Laramie Crocker * $LastChangedRevision: $ * $LastChangedDate: $ @@ -64,18 +72,17 @@ public class FileTools { * @return * @throws Exception */ - static protected Object getObjectFromStream(Class jaxbClass, InputStream is) throws Exception { - JAXBContext context = JAXBContext.newInstance(jaxbClass); + protected static Object getObjectFromStream(Class jaxbClass, InputStream is) throws Exception { + JAXBContext context = JAXBContextCache.getInstance().getCachedJAXBContext(jaxbClass); Unmarshaller unmarshaller = context.createUnmarshaller(); //note: setting schema to null will turn validator off unmarshaller.setSchema(null); return jaxbClass.cast(unmarshaller.unmarshal(is)); } - static public Object getJaxbObjectFromFile(Class jaxbClass, String fileName) + public static Object getJaxbObjectFromFile(Class jaxbClass, String fileName) throws Exception { - - JAXBContext context = JAXBContext.newInstance(jaxbClass); + JAXBContext context = JAXBContextCache.getInstance().getCachedJAXBContext(jaxbClass); Unmarshaller unmarshaller = context.createUnmarshaller(); //note: setting schema to null will turn validator off unmarshaller.setSchema(null); diff --git a/services/common-http/pom.xml b/services/common-http/pom.xml new file mode 100644 index 0000000000..4e1e90ba7f --- /dev/null +++ b/services/common-http/pom.xml @@ -0,0 +1,29 @@ + + + 4.0.0 + + org.collectionspace.services + org.collectionspace.services.main + ${revision} + + + + common-http + ${revision} + + + + jakarta.xml.bind + jakarta.xml.bind-api + + + + javax.ws.rs + javax.ws.rs-api + 2.1 + + + + \ No newline at end of file diff --git a/services/common-http/src/main/java/org/collectionspace/services/common/jaxb/JAXBContextCache.java b/services/common-http/src/main/java/org/collectionspace/services/common/jaxb/JAXBContextCache.java new file mode 100644 index 0000000000..92c290d78d --- /dev/null +++ b/services/common-http/src/main/java/org/collectionspace/services/common/jaxb/JAXBContextCache.java @@ -0,0 +1,47 @@ +package org.collectionspace.services.common.jaxb; + +import java.util.concurrent.ConcurrentHashMap; + +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBException; + +/** + * Store our JAXBContexts so we don't need to reinitialize all the time. Note that we have to store a single context per + * class so that we don't pollute the namespace when marshalling XML. + *

+ * Might be worth exploring if this should be a ContextResolver instead of a singleton. + * + * @since 9.0.0 + */ +public class JAXBContextCache { + private static final JAXBContextCache INSTANCE = new JAXBContextCache(); + + /** + * Store a cache of JAXBContexts so that the namespace does not get polluted when marshalling + * + * TODO: Class or String? String gets us support for package based JAXBContext, which means fewer instances total + */ + ConcurrentHashMap contextCache = new ConcurrentHashMap<>(); + + private JAXBContextCache() { + } + + public static JAXBContextCache getInstance() { + return INSTANCE; + } + + public JAXBContext getCachedJAXBContext(final Class type) throws JAXBException { + final var packageName = type.getPackageName(); + return getCachedJAXBContext(packageName); + } + + public JAXBContext getCachedJAXBContext(final String packageName) throws JAXBException { + // avoid computeIfAbsent b/c newInstance can throw an exception + JAXBContext context = contextCache.get(packageName); + if (context == null) { + context = JAXBContext.newInstance(packageName); + contextCache.putIfAbsent(packageName, context); + } + return context; + } +} diff --git a/services/common-http/src/main/java/org/collectionspace/services/common/provider/JakartaJAXBProvider.java b/services/common-http/src/main/java/org/collectionspace/services/common/provider/JakartaJAXBProvider.java new file mode 100644 index 0000000000..e7d7e76e6b --- /dev/null +++ b/services/common-http/src/main/java/org/collectionspace/services/common/provider/JakartaJAXBProvider.java @@ -0,0 +1,91 @@ +package org.collectionspace.services.common.provider; + +import static javax.ws.rs.core.Response.Status.INTERNAL_SERVER_ERROR; + +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.OutputStream; +import java.lang.annotation.Annotation; +import java.lang.reflect.Type; +import java.nio.charset.StandardCharsets; +import javax.ws.rs.Produces; +import javax.ws.rs.WebApplicationException; +import javax.ws.rs.core.MediaType; +import javax.ws.rs.core.MultivaluedMap; +import javax.ws.rs.core.Response; +import javax.ws.rs.ext.MessageBodyReader; +import javax.ws.rs.ext.MessageBodyWriter; +import javax.ws.rs.ext.Provider; +import javax.xml.transform.stream.StreamSource; + +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; +import org.collectionspace.services.common.jaxb.JAXBContextCache; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * A MessageBodyWriter which can use the Jakarta XML bindings. This should only be necessary while we are on RESTEasy 5; + * once we move to 6 and have other Jakarta specs available we can use the provided writers. + *

+ * Additionally, this only supports marshalling {@link XmlRootElement}. We only have a few JAXB classes to support, and + * while some were previously annotated with {@link XmlType} I'm not really sure why. Supporting XmlTypes requires some + * reflection, instantiating the ObjectFactory, and wrapping the provided object T in a JAXBElement. If we do end up + * needing additional support, it would be better to have a separate provider which is created. + * + * @param The class type for the JAXB object + * @since 9.0.0 + */ +@Provider +@Produces({ "application/xml", "application/*+xml", "text/xml", "text/*+xml" }) +public class JakartaJAXBProvider implements MessageBodyWriter, MessageBodyReader { + + private static final Logger logger = LoggerFactory.getLogger(JakartaJAXBProvider.class); + + @Override + public boolean isWriteable(Class type, Type genericType, Annotation[] annotations, MediaType mediaType) { + return type.isAnnotationPresent(XmlRootElement.class); + } + + @Override + public boolean isReadable(Class type, Type genericType, Annotation[] annotations, MediaType mediaType) { + return type.isAnnotationPresent(XmlRootElement.class); + } + + @Override + public void writeTo(T t, Class type, Type genericType, Annotation[] annotations, MediaType mediaType, + MultivaluedMap multivaluedMap, OutputStream outputStream) + throws WebApplicationException { + try { + final var context = JAXBContextCache.getInstance().getCachedJAXBContext(type); + final var marshaller = context.createMarshaller(); + marshaller.marshal(t, outputStream); + } catch (JAXBException e) { + logger.error("Unable to marshal JAXB Object {}", type.getSimpleName(), e); + final var response = Response.status(INTERNAL_SERVER_ERROR).build(); + throw new WebApplicationException(response); + } + } + + @Override + public T readFrom(Class type, Type genericType, Annotation[] annotations, MediaType mediaType, + MultivaluedMap httpHeaders, InputStream entityStream) + throws WebApplicationException { + try { + StreamSource source; + final var context = JAXBContextCache.getInstance().getCachedJAXBContext(type); + final var unmarshaller = context.createUnmarshaller(); + if (mediaType != null && mediaType.getParameters().get("charset") == null) { + source = new StreamSource(new InputStreamReader(entityStream, StandardCharsets.UTF_8)); + } else { + source = new StreamSource(entityStream); + } + return (T) unmarshaller.unmarshal(source); + } catch (JAXBException e) { + logger.error("Unable to unmarshal JAXB Object {}", type.getSimpleName(), e); + final var response = Response.status(INTERNAL_SERVER_ERROR).build(); + throw new WebApplicationException(response); + } + } +} diff --git a/services/common-test/pom.xml b/services/common-test/pom.xml index 61cd855172..eb4a1a2176 100644 --- a/services/common-test/pom.xml +++ b/services/common-test/pom.xml @@ -31,11 +31,7 @@ org.jboss.resteasy - resteasy-jaxrs - - - org.jboss.resteasy - resteasy-jaxb-provider + resteasy-client org.jboss.resteasy diff --git a/services/common/pom.xml b/services/common/pom.xml index ceacd09ed5..11cb0b1495 100644 --- a/services/common/pom.xml +++ b/services/common/pom.xml @@ -205,11 +205,7 @@ org.jboss.resteasy - resteasy-jaxrs - - - org.jboss.resteasy - resteasy-jaxb-provider + resteasy-client org.jboss.resteasy diff --git a/services/common/src/main/java/org/collectionspace/services/common/ServiceMain.java b/services/common/src/main/java/org/collectionspace/services/common/ServiceMain.java index fd0803b46c..65d47cbd8a 100644 --- a/services/common/src/main/java/org/collectionspace/services/common/ServiceMain.java +++ b/services/common/src/main/java/org/collectionspace/services/common/ServiceMain.java @@ -1219,7 +1219,7 @@ public TenantBindingConfigReaderImpl getTenantBindingConfigReader() { public ResourceMap getJaxRSResourceMap() { ResourceMap result; - result = ResteasyProviderFactory.getContextData(ResourceMap.class); + result = ResteasyProviderFactory.getInstance().getContextData(ResourceMap.class); return result; } diff --git a/services/common/src/main/java/org/collectionspace/services/common/document/JaxbUtils.java b/services/common/src/main/java/org/collectionspace/services/common/document/JaxbUtils.java index 44355691ac..d62a368f3d 100644 --- a/services/common/src/main/java/org/collectionspace/services/common/document/JaxbUtils.java +++ b/services/common/src/main/java/org/collectionspace/services/common/document/JaxbUtils.java @@ -27,7 +27,6 @@ */ package org.collectionspace.services.common.document; -import java.io.InputStream; import java.io.StringWriter; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; @@ -35,9 +34,10 @@ import jakarta.xml.bind.JAXBElement; import jakarta.xml.bind.JAXBException; import jakarta.xml.bind.Marshaller; -import jakarta.xml.bind.Unmarshaller; + import javax.xml.namespace.QName; +import org.collectionspace.services.common.jaxb.JAXBContextCache; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -59,7 +59,7 @@ public static String toString(Object o, Class clazz) { StringWriter sw = new StringWriter(); try { - JAXBContext jc = JAXBContext.newInstance(clazz); + JAXBContext jc = JAXBContextCache.getInstance().getCachedJAXBContext(clazz); Marshaller m = jc.createMarshaller(); m.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, Boolean.TRUE); m.marshal(o, sw); @@ -83,7 +83,7 @@ private static String marshalWithoutRoot(Object o, Class clazz) { StringWriter sw = new StringWriter(); try { - JAXBContext jc = JAXBContext.newInstance(clazz); + JAXBContext jc = JAXBContextCache.getInstance().getCachedJAXBContext(clazz); Marshaller marshaller = jc.createMarshaller(); marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, Boolean.TRUE); marshaller.marshal(new JAXBElement(new QName("uri","local"), clazz, o), sw); @@ -94,40 +94,6 @@ private static String marshalWithoutRoot(Object o, Class clazz) { return sw.toString(); } - /** - * fromFile retrieves object of given class from given file (in classpath) - * @param jaxbClass - * @param fileName of the file to read to construct the object - * @return - * @throws Exception - */ - public static Object fromFile(Class jaxbClass, String fileName) - throws Exception { - - JAXBContext context = JAXBContext.newInstance(jaxbClass); - Unmarshaller unmarshaller = context.createUnmarshaller(); - //note: setting schema to null will turn validator off - unmarshaller.setSchema(null); - ClassLoader tccl = Thread.currentThread().getContextClassLoader(); - InputStream is = tccl.getResourceAsStream(fileName); - return fromStream(jaxbClass, is); - } - - /** - * fromStream retrieves object of given class from given inputstream - * @param jaxbClass - * @param is stream to read to construct the object - * @return - * @throws Exception - */ - public static Object fromStream(Class jaxbClass, InputStream is) throws Exception { - JAXBContext context = JAXBContext.newInstance(jaxbClass); - Unmarshaller unmarshaller = context.createUnmarshaller(); - //note: setting schema to null will turn validator off - unmarshaller.setSchema(null); - return jaxbClass.cast(unmarshaller.unmarshal(is)); - } - /** * getValue gets invokes specified accessor method on given object. Assumption * is that this is used for JavaBean pattern getXXX methods only. diff --git a/services/common/src/main/java/org/collectionspace/services/common/xmljson/XmlToJsonFilter.java b/services/common/src/main/java/org/collectionspace/services/common/xmljson/XmlToJsonFilter.java index d415f0acc8..bb8edf7b17 100644 --- a/services/common/src/main/java/org/collectionspace/services/common/xmljson/XmlToJsonFilter.java +++ b/services/common/src/main/java/org/collectionspace/services/common/xmljson/XmlToJsonFilter.java @@ -28,7 +28,6 @@ import org.apache.commons.io.IOUtils; import org.apache.commons.io.output.ByteArrayOutputStream; import org.apache.commons.lang.NotImplementedException; -import org.apache.commons.lang3.StringUtils; /** *

@@ -77,7 +76,8 @@ public void doFilter(ServletRequest request, ServletResponse response, FilterCha chain.doFilter(requestWrapper, responseWrapper); - if (StringUtils.equals(responseWrapper.getContentType(), MediaType.APPLICATION_XML)) { + final var contentType = response.getContentType(); + if (contentType != null && contentType.startsWith(MediaType.APPLICATION_XML)) { // Got an XML response. Translate it to JSON. response.setContentType(MediaType.APPLICATION_JSON); diff --git a/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/RemoteDocumentModelHandlerImpl.java b/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/RemoteDocumentModelHandlerImpl.java index e58ef5d664..b1f961c8c7 100644 --- a/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/RemoteDocumentModelHandlerImpl.java +++ b/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/RemoteDocumentModelHandlerImpl.java @@ -404,7 +404,7 @@ private void addExtraCoreValues(DocumentModel docModel, Map unQO private void addAccountPermissionsPart() throws Exception { Profiler profiler = new Profiler("addAccountPermissionsPart():", 1); profiler.start(); - + MultipartServiceContext ctx = (MultipartServiceContext) getServiceContext(); String currentServiceName = ctx.getServiceName(); String workflowSubResource = "/"; @@ -417,12 +417,9 @@ private void addAccountPermissionsPart() throws Exception { } AccountPermission accountPermission = JpaStorageUtils.getAccountPermissions(JpaStorageUtils.CS_CURRENT_USER, currentServiceName, workflowSubResource); - org.collectionspace.services.authorization.ObjectFactory objectFactory = - new org.collectionspace.services.authorization.ObjectFactory(); - JAXBElement ap = objectFactory.createAccountPermission(accountPermission); - PayloadOutputPart accountPermissionPart = new PayloadOutputPart("account_permission", ap); // REM - "account_permission" should be using a constant and not a literal + PayloadOutputPart accountPermissionPart = new PayloadOutputPart("account_permission", accountPermission); ctx.addOutputPart(accountPermissionPart); - + profiler.stop(); } diff --git a/services/concept/client/pom.xml b/services/concept/client/pom.xml index 9525e09204..9f9d250518 100644 --- a/services/concept/client/pom.xml +++ b/services/concept/client/pom.xml @@ -51,11 +51,7 @@ org.jboss.resteasy - resteasy-jaxrs - - - org.jboss.resteasy - resteasy-jaxb-provider + resteasy-client org.jboss.resteasy diff --git a/services/concept/service/pom.xml b/services/concept/service/pom.xml index 4ecf4e0e5c..186fd6d165 100644 --- a/services/concept/service/pom.xml +++ b/services/concept/service/pom.xml @@ -68,11 +68,7 @@ org.jboss.resteasy - resteasy-jaxrs - - - org.jboss.resteasy - resteasy-jaxb-provider + resteasy-client org.jboss.resteasy diff --git a/services/conditioncheck/client/pom.xml b/services/conditioncheck/client/pom.xml index 9f58d2302c..f026cee8a2 100644 --- a/services/conditioncheck/client/pom.xml +++ b/services/conditioncheck/client/pom.xml @@ -52,11 +52,7 @@ org.jboss.resteasy - resteasy-jaxrs - - - org.jboss.resteasy - resteasy-jaxb-provider + resteasy-client org.jboss.resteasy diff --git a/services/conditioncheck/service/pom.xml b/services/conditioncheck/service/pom.xml index 7f910e0ba5..e24cbf25bb 100644 --- a/services/conditioncheck/service/pom.xml +++ b/services/conditioncheck/service/pom.xml @@ -56,11 +56,7 @@ org.jboss.resteasy - resteasy-jaxrs - - - org.jboss.resteasy - resteasy-jaxb-provider + resteasy-client org.jboss.resteasy diff --git a/services/config/pom.xml b/services/config/pom.xml index 5354e0a496..3955bacda6 100644 --- a/services/config/pom.xml +++ b/services/config/pom.xml @@ -36,14 +36,6 @@ 2.12.2 test - - org.jvnet.jaxb jaxb-plugins-runtime @@ -53,6 +45,11 @@ org.collectionspace.services.common-api ${project.version} + + org.glassfish.jaxb + jaxb-runtime + test + diff --git a/services/config/src/main/java/org/collectionspace/services/common/config/AbstractConfigReaderImpl.java b/services/config/src/main/java/org/collectionspace/services/common/config/AbstractConfigReaderImpl.java index 8c501ee788..4fc64ed05a 100644 --- a/services/config/src/main/java/org/collectionspace/services/common/config/AbstractConfigReaderImpl.java +++ b/services/config/src/main/java/org/collectionspace/services/common/config/AbstractConfigReaderImpl.java @@ -36,6 +36,7 @@ import jakarta.xml.bind.Unmarshaller; import org.collectionspace.services.common.api.JEEServerDeployment; +import org.collectionspace.services.common.jaxb.JAXBContextCache; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -148,7 +149,7 @@ public Object parse(InputStream configFileStream, Class clazz) throws JAXBException { Object result = null; - JAXBContext jc = JAXBContext.newInstance(clazz); + JAXBContext jc = JAXBContextCache.getInstance().getCachedJAXBContext(clazz); Unmarshaller um = jc.createUnmarshaller(); result = um.unmarshal(configFileStream); diff --git a/services/conservation/client/pom.xml b/services/conservation/client/pom.xml index 2f3b35173d..de38d72d00 100644 --- a/services/conservation/client/pom.xml +++ b/services/conservation/client/pom.xml @@ -51,11 +51,7 @@ org.jboss.resteasy - resteasy-jaxrs - - - org.jboss.resteasy - resteasy-jaxb-provider + resteasy-client org.jboss.resteasy diff --git a/services/conservation/service/pom.xml b/services/conservation/service/pom.xml index 13fa909280..34f72da9b5 100644 --- a/services/conservation/service/pom.xml +++ b/services/conservation/service/pom.xml @@ -56,11 +56,7 @@ org.jboss.resteasy - resteasy-jaxrs - - - org.jboss.resteasy - resteasy-jaxb-provider + resteasy-client org.jboss.resteasy diff --git a/services/consultation/client/pom.xml b/services/consultation/client/pom.xml index 848d86dcae..df28c42ba8 100644 --- a/services/consultation/client/pom.xml +++ b/services/consultation/client/pom.xml @@ -32,7 +32,7 @@ org.jboss.resteasy - resteasy-jaxrs + resteasy-client @@ -41,10 +41,6 @@ - - org.jboss.resteasy - resteasy-jaxb-provider - org.jboss.resteasy resteasy-multipart-provider @@ -58,4 +54,4 @@ collectionspace-services-consultation-client - \ No newline at end of file + diff --git a/services/consultation/service/pom.xml b/services/consultation/service/pom.xml index 67491afc7d..0b3ef8df50 100644 --- a/services/consultation/service/pom.xml +++ b/services/consultation/service/pom.xml @@ -53,7 +53,7 @@ org.jboss.resteasy - resteasy-jaxrs + resteasy-client tjws @@ -61,10 +61,6 @@ - - org.jboss.resteasy - resteasy-jaxb-provider - org.jboss.resteasy resteasy-multipart-provider diff --git a/services/contact/client/pom.xml b/services/contact/client/pom.xml index bb18c23027..34b18f5d33 100644 --- a/services/contact/client/pom.xml +++ b/services/contact/client/pom.xml @@ -45,11 +45,7 @@ org.jboss.resteasy - resteasy-jaxrs - - - org.jboss.resteasy - resteasy-jaxb-provider + resteasy-client org.jboss.resteasy diff --git a/services/contact/service/pom.xml b/services/contact/service/pom.xml index e0484bcbf2..9edad6f47f 100644 --- a/services/contact/service/pom.xml +++ b/services/contact/service/pom.xml @@ -56,11 +56,7 @@ org.jboss.resteasy - resteasy-jaxrs - - - org.jboss.resteasy - resteasy-jaxb-provider + resteasy-client org.jboss.resteasy diff --git a/services/deaccession/client/pom.xml b/services/deaccession/client/pom.xml index fd8fa06172..caa0539c4d 100644 --- a/services/deaccession/client/pom.xml +++ b/services/deaccession/client/pom.xml @@ -32,7 +32,7 @@ org.jboss.resteasy - resteasy-jaxrs + resteasy-client @@ -41,10 +41,6 @@ - - org.jboss.resteasy - resteasy-jaxb-provider - org.jboss.resteasy resteasy-multipart-provider @@ -58,4 +54,4 @@ collectionspace-services-deaccession-client - \ No newline at end of file + diff --git a/services/deaccession/service/pom.xml b/services/deaccession/service/pom.xml index 6d8f01e25d..427e898745 100644 --- a/services/deaccession/service/pom.xml +++ b/services/deaccession/service/pom.xml @@ -53,7 +53,7 @@ org.jboss.resteasy - resteasy-jaxrs + resteasy-client tjws @@ -61,10 +61,6 @@ - - org.jboss.resteasy - resteasy-jaxb-provider - org.jboss.resteasy resteasy-multipart-provider diff --git a/services/dimension/client/pom.xml b/services/dimension/client/pom.xml index 57e8dcc42c..1e7b4832b0 100644 --- a/services/dimension/client/pom.xml +++ b/services/dimension/client/pom.xml @@ -45,11 +45,7 @@ org.jboss.resteasy - resteasy-jaxrs - - - org.jboss.resteasy - resteasy-jaxb-provider + resteasy-client org.jboss.resteasy diff --git a/services/dimension/service/pom.xml b/services/dimension/service/pom.xml index 43c341c546..0dd3eba750 100644 --- a/services/dimension/service/pom.xml +++ b/services/dimension/service/pom.xml @@ -57,11 +57,7 @@ org.jboss.resteasy - resteasy-jaxrs - - - org.jboss.resteasy - resteasy-jaxb-provider + resteasy-client org.jboss.resteasy diff --git a/services/dutyofcare/client/pom.xml b/services/dutyofcare/client/pom.xml index c5275152ac..22d1fbcc3f 100644 --- a/services/dutyofcare/client/pom.xml +++ b/services/dutyofcare/client/pom.xml @@ -52,7 +52,7 @@ org.jboss.resteasy - resteasy-jaxrs + resteasy-client @@ -61,10 +61,6 @@ - - org.jboss.resteasy - resteasy-jaxb-provider - org.jboss.resteasy resteasy-multipart-provider diff --git a/services/dutyofcare/service/pom.xml b/services/dutyofcare/service/pom.xml index 478e07674a..db5404ffea 100644 --- a/services/dutyofcare/service/pom.xml +++ b/services/dutyofcare/service/pom.xml @@ -55,7 +55,7 @@ org.jboss.resteasy - resteasy-jaxrs + resteasy-client tjws @@ -63,10 +63,6 @@ - - org.jboss.resteasy - resteasy-jaxb-provider - org.jboss.resteasy resteasy-multipart-provider diff --git a/services/exhibition/client/pom.xml b/services/exhibition/client/pom.xml index 7921ae8995..8fd3ca5b92 100644 --- a/services/exhibition/client/pom.xml +++ b/services/exhibition/client/pom.xml @@ -54,11 +54,7 @@ org.jboss.resteasy - resteasy-jaxrs - - - org.jboss.resteasy - resteasy-jaxb-provider + resteasy-client org.jboss.resteasy diff --git a/services/exhibition/service/pom.xml b/services/exhibition/service/pom.xml index 8b0ea97f62..4762a68d76 100644 --- a/services/exhibition/service/pom.xml +++ b/services/exhibition/service/pom.xml @@ -56,11 +56,7 @@ org.jboss.resteasy - resteasy-jaxrs - - - org.jboss.resteasy - resteasy-jaxb-provider + resteasy-client org.jboss.resteasy diff --git a/services/exit/client/pom.xml b/services/exit/client/pom.xml index d9ed912c9b..5f82cf3744 100644 --- a/services/exit/client/pom.xml +++ b/services/exit/client/pom.xml @@ -32,7 +32,7 @@ org.jboss.resteasy - resteasy-jaxrs + resteasy-client @@ -41,10 +41,6 @@ - - org.jboss.resteasy - resteasy-jaxb-provider - org.jboss.resteasy resteasy-multipart-provider diff --git a/services/exit/service/pom.xml b/services/exit/service/pom.xml index 6524f25138..80e68c7315 100644 --- a/services/exit/service/pom.xml +++ b/services/exit/service/pom.xml @@ -53,7 +53,7 @@ org.jboss.resteasy - resteasy-jaxrs + resteasy-client tjws @@ -61,10 +61,6 @@ - - org.jboss.resteasy - resteasy-jaxb-provider - org.jboss.resteasy resteasy-multipart-provider diff --git a/services/export/client/pom.xml b/services/export/client/pom.xml index 3b257b2cab..0edcbea446 100644 --- a/services/export/client/pom.xml +++ b/services/export/client/pom.xml @@ -61,11 +61,7 @@ org.jboss.resteasy - resteasy-jaxrs - - - org.jboss.resteasy - resteasy-jaxb-provider + resteasy-client org.jboss.resteasy diff --git a/services/export/service/pom.xml b/services/export/service/pom.xml index ae5d39314b..2480765e3b 100644 --- a/services/export/service/pom.xml +++ b/services/export/service/pom.xml @@ -48,7 +48,7 @@ org.jboss.resteasy - resteasy-jaxrs + resteasy-client diff --git a/services/group/client/pom.xml b/services/group/client/pom.xml index cb6bc5ce95..6afd946198 100644 --- a/services/group/client/pom.xml +++ b/services/group/client/pom.xml @@ -52,11 +52,7 @@ org.jboss.resteasy - resteasy-jaxrs - - - org.jboss.resteasy - resteasy-jaxb-provider + resteasy-client org.jboss.resteasy diff --git a/services/group/service/pom.xml b/services/group/service/pom.xml index f9345a581c..9cae3e1b9e 100644 --- a/services/group/service/pom.xml +++ b/services/group/service/pom.xml @@ -56,11 +56,7 @@ org.jboss.resteasy - resteasy-jaxrs - - - org.jboss.resteasy - resteasy-jaxb-provider + resteasy-client org.jboss.resteasy diff --git a/services/heldintrust/client/pom.xml b/services/heldintrust/client/pom.xml index c79bc4e623..aab99cdd50 100644 --- a/services/heldintrust/client/pom.xml +++ b/services/heldintrust/client/pom.xml @@ -32,7 +32,7 @@ org.jboss.resteasy - resteasy-jaxrs + resteasy-client @@ -41,10 +41,6 @@ - - org.jboss.resteasy - resteasy-jaxb-provider - org.jboss.resteasy resteasy-multipart-provider @@ -58,4 +54,4 @@ collectionspace-services-heldintrust-client - \ No newline at end of file + diff --git a/services/heldintrust/service/pom.xml b/services/heldintrust/service/pom.xml index ffdd17dc47..d2b382df3e 100644 --- a/services/heldintrust/service/pom.xml +++ b/services/heldintrust/service/pom.xml @@ -53,7 +53,7 @@ org.jboss.resteasy - resteasy-jaxrs + resteasy-client tjws @@ -61,10 +61,6 @@ - - org.jboss.resteasy - resteasy-jaxb-provider - org.jboss.resteasy resteasy-multipart-provider diff --git a/services/hyperjaxb/src/main/java/org/collectionspace/services/authorization/perms/ObjectFactory.java b/services/hyperjaxb/src/main/java/org/collectionspace/services/authorization/perms/ObjectFactory.java deleted file mode 100644 index fa58c9817b..0000000000 --- a/services/hyperjaxb/src/main/java/org/collectionspace/services/authorization/perms/ObjectFactory.java +++ /dev/null @@ -1,22 +0,0 @@ -package org.collectionspace.services.authorization.perms; - -import jakarta.xml.bind.JAXBElement; -import jakarta.xml.bind.annotation.XmlElementDecl; -import jakarta.xml.bind.annotation.XmlRegistry; -import javax.xml.namespace.QName; - -@XmlRegistry -public class ObjectFactory { - - private static final QName _Permission_QNAME = - new QName("http://collectionspace.org/services/authorization/perms", "permission"); - - public Permission createPermission() { - return new Permission(); - } - - @XmlElementDecl(namespace = "http://collectionspace.org/services/authorization/perms", name = "permission") - public JAXBElement createPermission(Permission value) { - return new JAXBElement<>(_Permission_QNAME, Permission.class, null, value); - } -} diff --git a/services/hyperjaxb/src/main/java/org/collectionspace/services/authorization/perms/Permission.java b/services/hyperjaxb/src/main/java/org/collectionspace/services/authorization/perms/Permission.java index 8bb3a8c720..04591b8e3a 100644 --- a/services/hyperjaxb/src/main/java/org/collectionspace/services/authorization/perms/Permission.java +++ b/services/hyperjaxb/src/main/java/org/collectionspace/services/authorization/perms/Permission.java @@ -23,14 +23,14 @@ import jakarta.xml.bind.annotation.XmlAccessorType; import jakarta.xml.bind.annotation.XmlAttribute; import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; import jakarta.xml.bind.annotation.XmlSchemaType; -import jakarta.xml.bind.annotation.XmlType; import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import org.collectionspace.services.jaxb.adapter.DateAdapter; import org.jspecify.annotations.NonNull; @XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "permission") +@XmlRootElement(name = "permission") @Entity(name = "Permission") @Table(name = "permissions") @Inheritance(strategy = InheritanceType.JOINED) diff --git a/services/hyperjaxb/src/main/java/org/collectionspace/services/authorization/perms/PermissionsList.java b/services/hyperjaxb/src/main/java/org/collectionspace/services/authorization/perms/PermissionsList.java index ea00dd66e2..762f6ddfc4 100644 --- a/services/hyperjaxb/src/main/java/org/collectionspace/services/authorization/perms/PermissionsList.java +++ b/services/hyperjaxb/src/main/java/org/collectionspace/services/authorization/perms/PermissionsList.java @@ -5,13 +5,11 @@ import jakarta.xml.bind.annotation.XmlElement; import jakarta.xml.bind.annotation.XmlRootElement; import jakarta.xml.bind.annotation.XmlSchemaType; -import jakarta.xml.bind.annotation.XmlType; import java.util.ArrayList; import java.util.List; import org.jspecify.annotations.NonNull; @XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "") @XmlRootElement(name = "permissions_list") public class PermissionsList { diff --git a/services/hyperjaxb/src/main/java/org/collectionspace/services/authorization/perms/package-info.java b/services/hyperjaxb/src/main/java/org/collectionspace/services/authorization/perms/package-info.java new file mode 100644 index 0000000000..e7e54891fe --- /dev/null +++ b/services/hyperjaxb/src/main/java/org/collectionspace/services/authorization/perms/package-info.java @@ -0,0 +1,4 @@ +@XmlSchema(namespace = "http://collectionspace.org/services/authorization/perms") +package org.collectionspace.services.authorization.perms; + +import jakarta.xml.bind.annotation.XmlSchema; \ No newline at end of file diff --git a/services/hyperjaxb/src/main/resources/org/collectionspace/services/authorization/perms/jaxb.index b/services/hyperjaxb/src/main/resources/org/collectionspace/services/authorization/perms/jaxb.index new file mode 100644 index 0000000000..512f6a8a26 --- /dev/null +++ b/services/hyperjaxb/src/main/resources/org/collectionspace/services/authorization/perms/jaxb.index @@ -0,0 +1,2 @@ +Permission +PermissionsList diff --git a/services/imports/service/pom.xml b/services/imports/service/pom.xml index 807a83afaf..cf9cab6f2c 100644 --- a/services/imports/service/pom.xml +++ b/services/imports/service/pom.xml @@ -73,11 +73,7 @@ org.jboss.resteasy - resteasy-jaxrs - - - org.jboss.resteasy - resteasy-jaxb-provider + resteasy-client org.jboss.resteasy diff --git a/services/index/client/pom.xml b/services/index/client/pom.xml index 08ea979cdc..5bf949817d 100644 --- a/services/index/client/pom.xml +++ b/services/index/client/pom.xml @@ -41,11 +41,7 @@ org.jboss.resteasy - resteasy-jaxrs - - - org.jboss.resteasy - resteasy-jaxb-provider + resteasy-client org.jboss.resteasy diff --git a/services/index/service/pom.xml b/services/index/service/pom.xml index d728467728..352687326f 100644 --- a/services/index/service/pom.xml +++ b/services/index/service/pom.xml @@ -46,11 +46,7 @@ org.jboss.resteasy - resteasy-jaxrs - - - org.jboss.resteasy - resteasy-jaxb-provider + resteasy-client org.jboss.resteasy diff --git a/services/insurance/client/pom.xml b/services/insurance/client/pom.xml index 180b9d413f..e4e5e0b27e 100644 --- a/services/insurance/client/pom.xml +++ b/services/insurance/client/pom.xml @@ -52,7 +52,7 @@ org.jboss.resteasy - resteasy-jaxrs + resteasy-client @@ -61,10 +61,6 @@ - - org.jboss.resteasy - resteasy-jaxb-provider - org.jboss.resteasy resteasy-multipart-provider diff --git a/services/insurance/service/pom.xml b/services/insurance/service/pom.xml index e8d4299f7c..bb5490f29a 100644 --- a/services/insurance/service/pom.xml +++ b/services/insurance/service/pom.xml @@ -56,7 +56,7 @@ org.jboss.resteasy - resteasy-jaxrs + resteasy-client tjws @@ -64,10 +64,6 @@ - - org.jboss.resteasy - resteasy-jaxb-provider - org.jboss.resteasy resteasy-multipart-provider diff --git a/services/intake/client/pom.xml b/services/intake/client/pom.xml index e066409ce6..ebbb40b90a 100644 --- a/services/intake/client/pom.xml +++ b/services/intake/client/pom.xml @@ -57,11 +57,7 @@ org.jboss.resteasy - resteasy-jaxrs - - - org.jboss.resteasy - resteasy-jaxb-provider + resteasy-client org.jboss.resteasy diff --git a/services/intake/service/pom.xml b/services/intake/service/pom.xml index 75275a4658..2df17db1fe 100644 --- a/services/intake/service/pom.xml +++ b/services/intake/service/pom.xml @@ -61,11 +61,7 @@ org.jboss.resteasy - resteasy-jaxrs - - - org.jboss.resteasy - resteasy-jaxb-provider + resteasy-client org.jboss.resteasy diff --git a/services/iterationreport/client/pom.xml b/services/iterationreport/client/pom.xml index 07d00e9d18..2010ea0788 100644 --- a/services/iterationreport/client/pom.xml +++ b/services/iterationreport/client/pom.xml @@ -52,7 +52,7 @@ org.jboss.resteasy - resteasy-jaxrs + resteasy-client @@ -61,10 +61,6 @@ - - org.jboss.resteasy - resteasy-jaxb-provider - org.jboss.resteasy resteasy-multipart-provider diff --git a/services/iterationreport/service/pom.xml b/services/iterationreport/service/pom.xml index 231731ce02..bf5a2097f4 100644 --- a/services/iterationreport/service/pom.xml +++ b/services/iterationreport/service/pom.xml @@ -56,7 +56,7 @@ org.jboss.resteasy - resteasy-jaxrs + resteasy-client tjws @@ -64,10 +64,6 @@ - - org.jboss.resteasy - resteasy-jaxb-provider - org.jboss.resteasy resteasy-multipart-provider diff --git a/services/loanin/client/pom.xml b/services/loanin/client/pom.xml index 494d55510e..3ca33c8452 100644 --- a/services/loanin/client/pom.xml +++ b/services/loanin/client/pom.xml @@ -51,11 +51,7 @@ org.jboss.resteasy - resteasy-jaxrs - - - org.jboss.resteasy - resteasy-jaxb-provider + resteasy-client org.jboss.resteasy diff --git a/services/loanin/service/pom.xml b/services/loanin/service/pom.xml index e45eb90659..df87d8f445 100644 --- a/services/loanin/service/pom.xml +++ b/services/loanin/service/pom.xml @@ -57,11 +57,7 @@ org.jboss.resteasy - resteasy-jaxrs - - - org.jboss.resteasy - resteasy-jaxb-provider + resteasy-client org.jboss.resteasy diff --git a/services/loanout/client/pom.xml b/services/loanout/client/pom.xml index 53875c5b46..a490e0f2b9 100644 --- a/services/loanout/client/pom.xml +++ b/services/loanout/client/pom.xml @@ -52,11 +52,7 @@ org.jboss.resteasy - resteasy-jaxrs - - - org.jboss.resteasy - resteasy-jaxb-provider + resteasy-client org.jboss.resteasy diff --git a/services/loanout/service/pom.xml b/services/loanout/service/pom.xml index 37cc0b6fc0..7dfa5f1932 100644 --- a/services/loanout/service/pom.xml +++ b/services/loanout/service/pom.xml @@ -56,11 +56,7 @@ org.jboss.resteasy - resteasy-jaxrs - - - org.jboss.resteasy - resteasy-jaxb-provider + resteasy-client org.jboss.resteasy diff --git a/services/location/client/pom.xml b/services/location/client/pom.xml index 966fb25490..55afa6e31f 100644 --- a/services/location/client/pom.xml +++ b/services/location/client/pom.xml @@ -51,11 +51,7 @@ org.jboss.resteasy - resteasy-jaxrs - - - org.jboss.resteasy - resteasy-jaxb-provider + resteasy-client org.jboss.resteasy diff --git a/services/location/service/pom.xml b/services/location/service/pom.xml index 3ad92fca1e..c825b5f181 100644 --- a/services/location/service/pom.xml +++ b/services/location/service/pom.xml @@ -68,11 +68,7 @@ org.jboss.resteasy - resteasy-jaxrs - - - org.jboss.resteasy - resteasy-jaxb-provider + resteasy-client org.jboss.resteasy diff --git a/services/login/service/pom.xml b/services/login/service/pom.xml index 62935bd696..f5d5831c97 100644 --- a/services/login/service/pom.xml +++ b/services/login/service/pom.xml @@ -38,7 +38,7 @@ org.jboss.resteasy - resteasy-jaxrs + resteasy-client org.springframework.security diff --git a/services/logout/service/pom.xml b/services/logout/service/pom.xml index fab7d12924..96f2f350f3 100644 --- a/services/logout/service/pom.xml +++ b/services/logout/service/pom.xml @@ -38,7 +38,7 @@ org.jboss.resteasy - resteasy-jaxrs + resteasy-client org.springframework.security diff --git a/services/material/client/pom.xml b/services/material/client/pom.xml index 78d9105039..155123e753 100644 --- a/services/material/client/pom.xml +++ b/services/material/client/pom.xml @@ -47,11 +47,7 @@ org.jboss.resteasy - resteasy-jaxrs - - - org.jboss.resteasy - resteasy-jaxb-provider + resteasy-client org.jboss.resteasy diff --git a/services/material/service/pom.xml b/services/material/service/pom.xml index 9a80fbd0c4..542e4502f4 100644 --- a/services/material/service/pom.xml +++ b/services/material/service/pom.xml @@ -64,11 +64,7 @@ org.jboss.resteasy - resteasy-jaxrs - - - org.jboss.resteasy - resteasy-jaxb-provider + resteasy-client org.jboss.resteasy diff --git a/services/media/client/pom.xml b/services/media/client/pom.xml index 14c06f01b9..45371dc121 100644 --- a/services/media/client/pom.xml +++ b/services/media/client/pom.xml @@ -63,11 +63,7 @@ org.jboss.resteasy - resteasy-jaxrs - - - org.jboss.resteasy - resteasy-jaxb-provider + resteasy-client org.jboss.resteasy diff --git a/services/media/service/pom.xml b/services/media/service/pom.xml index 41817229ce..cfd0cc3c36 100644 --- a/services/media/service/pom.xml +++ b/services/media/service/pom.xml @@ -73,11 +73,7 @@ org.jboss.resteasy - resteasy-jaxrs - - - org.jboss.resteasy - resteasy-jaxb-provider + resteasy-client org.jboss.resteasy diff --git a/services/movement/client/pom.xml b/services/movement/client/pom.xml index 9bbb016ea4..9ca0891569 100644 --- a/services/movement/client/pom.xml +++ b/services/movement/client/pom.xml @@ -53,11 +53,7 @@ org.jboss.resteasy - resteasy-jaxrs - - - org.jboss.resteasy - resteasy-jaxb-provider + resteasy-client org.jboss.resteasy diff --git a/services/movement/service/pom.xml b/services/movement/service/pom.xml index fbef801fb1..8ac3069a5b 100644 --- a/services/movement/service/pom.xml +++ b/services/movement/service/pom.xml @@ -60,11 +60,7 @@ org.jboss.resteasy - resteasy-jaxrs - - - org.jboss.resteasy - resteasy-jaxb-provider + resteasy-client org.jboss.resteasy diff --git a/services/nagprainventory/client/pom.xml b/services/nagprainventory/client/pom.xml index cb5308830b..0f0b158217 100644 --- a/services/nagprainventory/client/pom.xml +++ b/services/nagprainventory/client/pom.xml @@ -32,7 +32,7 @@ org.jboss.resteasy - resteasy-jaxrs + resteasy-client @@ -41,10 +41,6 @@ - - org.jboss.resteasy - resteasy-jaxb-provider - org.jboss.resteasy resteasy-multipart-provider @@ -58,4 +54,4 @@ collectionspace-services-nagprainventory-client - \ No newline at end of file + diff --git a/services/nagprainventory/service/pom.xml b/services/nagprainventory/service/pom.xml index 931497ebf9..662e1e9334 100644 --- a/services/nagprainventory/service/pom.xml +++ b/services/nagprainventory/service/pom.xml @@ -53,7 +53,7 @@ org.jboss.resteasy - resteasy-jaxrs + resteasy-client tjws @@ -61,10 +61,6 @@ - - org.jboss.resteasy - resteasy-jaxb-provider - org.jboss.resteasy resteasy-multipart-provider diff --git a/services/note/client/pom.xml b/services/note/client/pom.xml index ada93e07a4..9528e2c7e0 100644 --- a/services/note/client/pom.xml +++ b/services/note/client/pom.xml @@ -39,11 +39,7 @@ org.jboss.resteasy - resteasy-jaxrs - - - org.jboss.resteasy - resteasy-jaxb-provider + resteasy-client org.jboss.resteasy diff --git a/services/note/service/pom.xml b/services/note/service/pom.xml index 82f9573096..051bf1f41a 100644 --- a/services/note/service/pom.xml +++ b/services/note/service/pom.xml @@ -47,11 +47,7 @@ org.jboss.resteasy - resteasy-jaxrs - - - org.jboss.resteasy - resteasy-jaxb-provider + resteasy-client org.jboss.resteasy diff --git a/services/objectexit/client/pom.xml b/services/objectexit/client/pom.xml index d4b5c625f7..292526f5e4 100644 --- a/services/objectexit/client/pom.xml +++ b/services/objectexit/client/pom.xml @@ -52,11 +52,7 @@ org.jboss.resteasy - resteasy-jaxrs - - - org.jboss.resteasy - resteasy-jaxb-provider + resteasy-client org.jboss.resteasy diff --git a/services/objectexit/service/pom.xml b/services/objectexit/service/pom.xml index 9e92cc5d09..f629b77c0e 100644 --- a/services/objectexit/service/pom.xml +++ b/services/objectexit/service/pom.xml @@ -56,11 +56,7 @@ org.jboss.resteasy - resteasy-jaxrs - - - org.jboss.resteasy - resteasy-jaxb-provider + resteasy-client org.jboss.resteasy diff --git a/services/organization/client/pom.xml b/services/organization/client/pom.xml index 9bb8676521..e254e64bc8 100644 --- a/services/organization/client/pom.xml +++ b/services/organization/client/pom.xml @@ -46,11 +46,7 @@ org.jboss.resteasy - resteasy-jaxrs - - - org.jboss.resteasy - resteasy-jaxb-provider + resteasy-client org.jboss.resteasy diff --git a/services/organization/service/pom.xml b/services/organization/service/pom.xml index 96e83888a0..b6eb2b462a 100644 --- a/services/organization/service/pom.xml +++ b/services/organization/service/pom.xml @@ -69,11 +69,7 @@ org.jboss.resteasy - resteasy-jaxrs - - - org.jboss.resteasy - resteasy-jaxb-provider + resteasy-client org.jboss.resteasy diff --git a/services/osteology/client/pom.xml b/services/osteology/client/pom.xml index e72244becc..8aaf7fbf7c 100644 --- a/services/osteology/client/pom.xml +++ b/services/osteology/client/pom.xml @@ -52,7 +52,7 @@ org.jboss.resteasy - resteasy-jaxrs + resteasy-client @@ -61,10 +61,6 @@ - - org.jboss.resteasy - resteasy-jaxb-provider - org.jboss.resteasy resteasy-multipart-provider diff --git a/services/osteology/service/pom.xml b/services/osteology/service/pom.xml index df409c2f5b..500ead0763 100644 --- a/services/osteology/service/pom.xml +++ b/services/osteology/service/pom.xml @@ -56,7 +56,7 @@ org.jboss.resteasy - resteasy-jaxrs + resteasy-client tjws @@ -64,10 +64,6 @@ - - org.jboss.resteasy - resteasy-jaxb-provider - org.jboss.resteasy resteasy-multipart-provider diff --git a/services/person/client/pom.xml b/services/person/client/pom.xml index 4b423940fa..99571b8f53 100644 --- a/services/person/client/pom.xml +++ b/services/person/client/pom.xml @@ -47,11 +47,7 @@ org.jboss.resteasy - resteasy-jaxrs - - - org.jboss.resteasy - resteasy-jaxb-provider + resteasy-client org.jboss.resteasy diff --git a/services/person/service/pom.xml b/services/person/service/pom.xml index 8c6e8814c4..75cf28d3e3 100644 --- a/services/person/service/pom.xml +++ b/services/person/service/pom.xml @@ -72,11 +72,7 @@ org.jboss.resteasy - resteasy-jaxrs - - - org.jboss.resteasy - resteasy-jaxb-provider + resteasy-client org.jboss.resteasy diff --git a/services/place/client/pom.xml b/services/place/client/pom.xml index 44e900a5db..b667c06b30 100644 --- a/services/place/client/pom.xml +++ b/services/place/client/pom.xml @@ -47,11 +47,7 @@ org.jboss.resteasy - resteasy-jaxrs - - - org.jboss.resteasy - resteasy-jaxb-provider + resteasy-client org.jboss.resteasy diff --git a/services/place/service/pom.xml b/services/place/service/pom.xml index 911e1217fb..00f1c23b4a 100644 --- a/services/place/service/pom.xml +++ b/services/place/service/pom.xml @@ -64,11 +64,7 @@ org.jboss.resteasy - resteasy-jaxrs - - - org.jboss.resteasy - resteasy-jaxb-provider + resteasy-client org.jboss.resteasy diff --git a/services/pom.xml b/services/pom.xml index e9ee3623d0..c5100ceb7a 100644 --- a/services/pom.xml +++ b/services/pom.xml @@ -29,6 +29,7 @@ --> config + common-http common-api authentication authorization-common diff --git a/services/pottag/client/pom.xml b/services/pottag/client/pom.xml index 18cc3e5548..0fb83b1c2c 100644 --- a/services/pottag/client/pom.xml +++ b/services/pottag/client/pom.xml @@ -53,11 +53,7 @@ org.jboss.resteasy - resteasy-jaxrs - - - org.jboss.resteasy - resteasy-jaxb-provider + resteasy-client org.jboss.resteasy diff --git a/services/pottag/service/pom.xml b/services/pottag/service/pom.xml index 7d16a668bb..e3064f408c 100644 --- a/services/pottag/service/pom.xml +++ b/services/pottag/service/pom.xml @@ -62,11 +62,7 @@ org.jboss.resteasy - resteasy-jaxrs - - - org.jboss.resteasy - resteasy-jaxb-provider + resteasy-client org.jboss.resteasy diff --git a/services/propagation/client/pom.xml b/services/propagation/client/pom.xml index 802774a859..20098e6196 100644 --- a/services/propagation/client/pom.xml +++ b/services/propagation/client/pom.xml @@ -51,11 +51,7 @@ org.jboss.resteasy - resteasy-jaxrs - - - org.jboss.resteasy - resteasy-jaxb-provider + resteasy-client org.jboss.resteasy diff --git a/services/propagation/service/pom.xml b/services/propagation/service/pom.xml index cba945709f..50213062aa 100644 --- a/services/propagation/service/pom.xml +++ b/services/propagation/service/pom.xml @@ -67,11 +67,7 @@ org.jboss.resteasy - resteasy-jaxrs - - - org.jboss.resteasy - resteasy-jaxb-provider + resteasy-client org.jboss.resteasy diff --git a/services/publicitem/client/pom.xml b/services/publicitem/client/pom.xml index 5eef9a3656..20102aac25 100644 --- a/services/publicitem/client/pom.xml +++ b/services/publicitem/client/pom.xml @@ -46,11 +46,7 @@ org.jboss.resteasy - resteasy-jaxrs - - - org.jboss.resteasy - resteasy-jaxb-provider + resteasy-client org.jboss.resteasy diff --git a/services/publicitem/service/pom.xml b/services/publicitem/service/pom.xml index 0538d5db7c..c043450f6a 100644 --- a/services/publicitem/service/pom.xml +++ b/services/publicitem/service/pom.xml @@ -56,11 +56,7 @@ org.jboss.resteasy - resteasy-jaxrs - - - org.jboss.resteasy - resteasy-jaxb-provider + resteasy-client org.jboss.resteasy diff --git a/services/query/service/pom.xml b/services/query/service/pom.xml index 116181ec58..f739ff3a2c 100644 --- a/services/query/service/pom.xml +++ b/services/query/service/pom.xml @@ -32,11 +32,7 @@ org.jboss.resteasy - resteasy-jaxrs - - - org.jboss.resteasy - resteasy-jaxb-provider + resteasy-client org.jboss.resteasy diff --git a/services/relation/client/pom.xml b/services/relation/client/pom.xml index 96e89ab949..c85a18e729 100644 --- a/services/relation/client/pom.xml +++ b/services/relation/client/pom.xml @@ -46,11 +46,7 @@ org.jboss.resteasy - resteasy-jaxrs - - - org.jboss.resteasy - resteasy-jaxb-provider + resteasy-client org.jboss.resteasy diff --git a/services/relation/service/pom.xml b/services/relation/service/pom.xml index 5477f11faa..f02d595847 100644 --- a/services/relation/service/pom.xml +++ b/services/relation/service/pom.xml @@ -88,11 +88,7 @@ org.jboss.resteasy - resteasy-jaxrs - - - org.jboss.resteasy - resteasy-jaxb-provider + resteasy-client org.jboss.resteasy diff --git a/services/repatriationrequest/client/pom.xml b/services/repatriationrequest/client/pom.xml index aa3b731c34..48a882920c 100644 --- a/services/repatriationrequest/client/pom.xml +++ b/services/repatriationrequest/client/pom.xml @@ -32,7 +32,7 @@ org.jboss.resteasy - resteasy-jaxrs + resteasy-client @@ -41,10 +41,6 @@ - - org.jboss.resteasy - resteasy-jaxb-provider - org.jboss.resteasy resteasy-multipart-provider @@ -58,4 +54,4 @@ collectionspace-services-repatriationrequest-client - \ No newline at end of file + diff --git a/services/repatriationrequest/service/pom.xml b/services/repatriationrequest/service/pom.xml index d68c441af7..1d5169865b 100644 --- a/services/repatriationrequest/service/pom.xml +++ b/services/repatriationrequest/service/pom.xml @@ -57,7 +57,7 @@ org.jboss.resteasy - resteasy-jaxrs + resteasy-client tjws @@ -65,10 +65,6 @@ - - org.jboss.resteasy - resteasy-jaxb-provider - org.jboss.resteasy resteasy-multipart-provider @@ -90,4 +86,4 @@ collectionspace-services-repatriationrequest - \ No newline at end of file + diff --git a/services/report/client/pom.xml b/services/report/client/pom.xml index c14b8d6353..53de0cf1d8 100644 --- a/services/report/client/pom.xml +++ b/services/report/client/pom.xml @@ -61,11 +61,7 @@ org.jboss.resteasy - resteasy-jaxrs - - - org.jboss.resteasy - resteasy-jaxb-provider + resteasy-client org.jboss.resteasy diff --git a/services/report/service/pom.xml b/services/report/service/pom.xml index d8d6ea198e..089406b4cb 100644 --- a/services/report/service/pom.xml +++ b/services/report/service/pom.xml @@ -84,11 +84,7 @@ org.jboss.resteasy - resteasy-jaxrs - - - org.jboss.resteasy - resteasy-jaxb-provider + resteasy-client org.jboss.resteasy diff --git a/services/report/service/src/main/java/org/collectionspace/services/report/jasperreports/CSpaceRepositoryService.java b/services/report/service/src/main/java/org/collectionspace/services/report/jasperreports/CSpaceRepositoryService.java index bb29da9826..6dd6c02e13 100644 --- a/services/report/service/src/main/java/org/collectionspace/services/report/jasperreports/CSpaceRepositoryService.java +++ b/services/report/service/src/main/java/org/collectionspace/services/report/jasperreports/CSpaceRepositoryService.java @@ -59,7 +59,7 @@ private InputStreamResource getCSpaceResource(String resourcePath) { private InputStreamResource getMediaContentResource(String mediaCsid, String derivative) { if (StringUtils.isNotEmpty(mediaCsid) && StringUtils.isNotEmpty(derivative)) { - ResourceMap resourceMap = ResteasyProviderFactory.getContextData(ResourceMap.class); + ResourceMap resourceMap = ResteasyProviderFactory.getInstance().getContextData(ResourceMap.class); MediaResource mediaResource = (MediaResource) resourceMap.get(MediaClient.SERVICE_NAME); InputStream contentStream = null; diff --git a/services/restrictedmedia/client/pom.xml b/services/restrictedmedia/client/pom.xml index 2ccb0db6f1..ff91c09f5b 100644 --- a/services/restrictedmedia/client/pom.xml +++ b/services/restrictedmedia/client/pom.xml @@ -54,7 +54,7 @@ org.jboss.resteasy - resteasy-jaxrs + resteasy-client tjws @@ -62,10 +62,6 @@ - - org.jboss.resteasy - resteasy-jaxb-provider - org.jboss.resteasy resteasy-multipart-provider diff --git a/services/restrictedmedia/service/pom.xml b/services/restrictedmedia/service/pom.xml index 6a6530f22d..0775b6a11d 100644 --- a/services/restrictedmedia/service/pom.xml +++ b/services/restrictedmedia/service/pom.xml @@ -68,7 +68,7 @@ org.jboss.resteasy - resteasy-jaxrs + resteasy-client tjws @@ -76,10 +76,6 @@ - - org.jboss.resteasy - resteasy-jaxb-provider - org.jboss.resteasy resteasy-multipart-provider diff --git a/services/security/client/pom.xml b/services/security/client/pom.xml index e7dee9f82c..23074d0e11 100644 --- a/services/security/client/pom.xml +++ b/services/security/client/pom.xml @@ -57,11 +57,7 @@ org.jboss.resteasy - resteasy-jaxrs - - - org.jboss.resteasy - resteasy-jaxb-provider + resteasy-client org.jboss.resteasy diff --git a/services/servicegroup/client/pom.xml b/services/servicegroup/client/pom.xml index 14f5d3db5a..d5ab5d5477 100644 --- a/services/servicegroup/client/pom.xml +++ b/services/servicegroup/client/pom.xml @@ -41,11 +41,7 @@ org.jboss.resteasy - resteasy-jaxrs - - - org.jboss.resteasy - resteasy-jaxb-provider + resteasy-client org.jboss.resteasy diff --git a/services/servicegroup/service/pom.xml b/services/servicegroup/service/pom.xml index d4de08fe43..0f39d5528e 100644 --- a/services/servicegroup/service/pom.xml +++ b/services/servicegroup/service/pom.xml @@ -61,11 +61,7 @@ org.jboss.resteasy - resteasy-jaxrs - - - org.jboss.resteasy - resteasy-jaxb-provider + resteasy-client org.jboss.resteasy diff --git a/services/structureddate/client/pom.xml b/services/structureddate/client/pom.xml index 278020446e..fc768741a5 100644 --- a/services/structureddate/client/pom.xml +++ b/services/structureddate/client/pom.xml @@ -39,11 +39,7 @@ org.jboss.resteasy - resteasy-jaxrs - - - org.jboss.resteasy - resteasy-jaxb-provider + resteasy-client diff --git a/services/structureddate/service/pom.xml b/services/structureddate/service/pom.xml index 9e80fa1b1e..71bc39b548 100644 --- a/services/structureddate/service/pom.xml +++ b/services/structureddate/service/pom.xml @@ -58,11 +58,7 @@ org.jboss.resteasy - resteasy-jaxrs - - - org.jboss.resteasy - resteasy-jaxb-provider + resteasy-client org.jboss.resteasy diff --git a/services/summarydocumentation/client/pom.xml b/services/summarydocumentation/client/pom.xml index ed83674252..d88eb3ecb3 100644 --- a/services/summarydocumentation/client/pom.xml +++ b/services/summarydocumentation/client/pom.xml @@ -32,7 +32,7 @@ org.jboss.resteasy - resteasy-jaxrs + resteasy-client @@ -41,10 +41,6 @@ - - org.jboss.resteasy - resteasy-jaxb-provider - org.jboss.resteasy resteasy-multipart-provider @@ -54,4 +50,4 @@ collectionspace-services-summarydocumentation-client - \ No newline at end of file + diff --git a/services/summarydocumentation/service/pom.xml b/services/summarydocumentation/service/pom.xml index e5c5083f19..ffc63c2b2f 100644 --- a/services/summarydocumentation/service/pom.xml +++ b/services/summarydocumentation/service/pom.xml @@ -52,7 +52,7 @@ org.jboss.resteasy - resteasy-jaxrs + resteasy-client tjws @@ -60,10 +60,6 @@ - - org.jboss.resteasy - resteasy-jaxb-provider - org.jboss.resteasy resteasy-multipart-provider diff --git a/services/systeminfo/client/pom.xml b/services/systeminfo/client/pom.xml index 8d200e0fbd..c625004a8b 100644 --- a/services/systeminfo/client/pom.xml +++ b/services/systeminfo/client/pom.xml @@ -34,11 +34,7 @@ org.jboss.resteasy - resteasy-jaxrs - - - org.jboss.resteasy - resteasy-jaxb-provider + resteasy-client diff --git a/services/systeminfo/service/pom.xml b/services/systeminfo/service/pom.xml index af6c062f7b..27477e6f65 100644 --- a/services/systeminfo/service/pom.xml +++ b/services/systeminfo/service/pom.xml @@ -53,11 +53,7 @@ org.jboss.resteasy - resteasy-jaxrs - - - org.jboss.resteasy - resteasy-jaxb-provider + resteasy-client org.jboss.resteasy diff --git a/services/taxonomy/client/pom.xml b/services/taxonomy/client/pom.xml index 4f49883c92..50323980a7 100644 --- a/services/taxonomy/client/pom.xml +++ b/services/taxonomy/client/pom.xml @@ -51,11 +51,7 @@ org.jboss.resteasy - resteasy-jaxrs - - - org.jboss.resteasy - resteasy-jaxb-provider + resteasy-client org.jboss.resteasy diff --git a/services/taxonomy/service/pom.xml b/services/taxonomy/service/pom.xml index 5e63fa43c2..c9066c9478 100644 --- a/services/taxonomy/service/pom.xml +++ b/services/taxonomy/service/pom.xml @@ -63,11 +63,7 @@ org.jboss.resteasy - resteasy-jaxrs - - - org.jboss.resteasy - resteasy-jaxb-provider + resteasy-client org.jboss.resteasy diff --git a/services/transport/client/pom.xml b/services/transport/client/pom.xml index 4a72870df0..5cb6316888 100644 --- a/services/transport/client/pom.xml +++ b/services/transport/client/pom.xml @@ -52,7 +52,7 @@ org.jboss.resteasy - resteasy-jaxrs + resteasy-client @@ -61,10 +61,6 @@ - - org.jboss.resteasy - resteasy-jaxb-provider - org.jboss.resteasy resteasy-multipart-provider diff --git a/services/transport/service/pom.xml b/services/transport/service/pom.xml index e5993e1636..1fa223167c 100644 --- a/services/transport/service/pom.xml +++ b/services/transport/service/pom.xml @@ -58,7 +58,7 @@ org.jboss.resteasy - resteasy-jaxrs + resteasy-client tjws @@ -66,10 +66,6 @@ - - org.jboss.resteasy - resteasy-jaxb-provider - org.jboss.resteasy resteasy-multipart-provider diff --git a/services/uoc/client/pom.xml b/services/uoc/client/pom.xml index 05e8bd37a1..98c8f22b9a 100644 --- a/services/uoc/client/pom.xml +++ b/services/uoc/client/pom.xml @@ -51,11 +51,7 @@ org.jboss.resteasy - resteasy-jaxrs - - - org.jboss.resteasy - resteasy-jaxb-provider + resteasy-client org.jboss.resteasy diff --git a/services/uoc/service/pom.xml b/services/uoc/service/pom.xml index 57c7ad7d8f..f80d922d43 100644 --- a/services/uoc/service/pom.xml +++ b/services/uoc/service/pom.xml @@ -57,11 +57,7 @@ org.jboss.resteasy - resteasy-jaxrs - - - org.jboss.resteasy - resteasy-jaxb-provider + resteasy-client org.jboss.resteasy diff --git a/services/valuationcontrol/client/pom.xml b/services/valuationcontrol/client/pom.xml index 55372ae4b0..ea93fc2b85 100644 --- a/services/valuationcontrol/client/pom.xml +++ b/services/valuationcontrol/client/pom.xml @@ -52,11 +52,7 @@ org.jboss.resteasy - resteasy-jaxrs - - - org.jboss.resteasy - resteasy-jaxb-provider + resteasy-client org.jboss.resteasy diff --git a/services/valuationcontrol/service/pom.xml b/services/valuationcontrol/service/pom.xml index 08c50c5e41..25701ce45e 100644 --- a/services/valuationcontrol/service/pom.xml +++ b/services/valuationcontrol/service/pom.xml @@ -56,11 +56,7 @@ org.jboss.resteasy - resteasy-jaxrs - - - org.jboss.resteasy - resteasy-jaxb-provider + resteasy-client org.jboss.resteasy diff --git a/services/vocabulary/client/pom.xml b/services/vocabulary/client/pom.xml index 88bfddf698..8db995c3ef 100644 --- a/services/vocabulary/client/pom.xml +++ b/services/vocabulary/client/pom.xml @@ -43,11 +43,7 @@ org.jboss.resteasy - resteasy-jaxrs - - - org.jboss.resteasy - resteasy-jaxb-provider + resteasy-client org.jboss.resteasy diff --git a/services/vocabulary/service/pom.xml b/services/vocabulary/service/pom.xml index 6b13d244df..7df3feda03 100644 --- a/services/vocabulary/service/pom.xml +++ b/services/vocabulary/service/pom.xml @@ -69,11 +69,7 @@ org.jboss.resteasy - resteasy-jaxrs - - - org.jboss.resteasy - resteasy-jaxb-provider + resteasy-client org.jboss.resteasy diff --git a/services/work/client/pom.xml b/services/work/client/pom.xml index 1755a5ff05..c790d5a582 100644 --- a/services/work/client/pom.xml +++ b/services/work/client/pom.xml @@ -47,11 +47,7 @@ org.jboss.resteasy - resteasy-jaxrs - - - org.jboss.resteasy - resteasy-jaxb-provider + resteasy-client org.jboss.resteasy diff --git a/services/work/service/pom.xml b/services/work/service/pom.xml index 6f43e809b1..7150914ee6 100644 --- a/services/work/service/pom.xml +++ b/services/work/service/pom.xml @@ -64,11 +64,7 @@ org.jboss.resteasy - resteasy-jaxrs - - - org.jboss.resteasy - resteasy-jaxb-provider + resteasy-client org.jboss.resteasy diff --git a/services/workflow/client/pom.xml b/services/workflow/client/pom.xml index e4c171da45..701ea63f5f 100644 --- a/services/workflow/client/pom.xml +++ b/services/workflow/client/pom.xml @@ -41,11 +41,7 @@ org.jboss.resteasy - resteasy-jaxrs - - - org.jboss.resteasy - resteasy-jaxb-provider + resteasy-client org.jboss.resteasy diff --git a/services/workflow/service/pom.xml b/services/workflow/service/pom.xml index 41065d72dd..627496a374 100644 --- a/services/workflow/service/pom.xml +++ b/services/workflow/service/pom.xml @@ -50,11 +50,7 @@ org.jboss.resteasy - resteasy-jaxrs - - - org.jboss.resteasy - resteasy-jaxb-provider + resteasy-client org.jboss.resteasy From 5a448225bee5ced37e3a068cbd397bf308c5afca Mon Sep 17 00:00:00 2001 From: Michael Ritter Date: Thu, 7 May 2026 11:38:42 -0600 Subject: [PATCH 19/24] DRYD-2100: Configure legacy trash implementation (#531) --- .../9.10-HF30/config/trashservice-config.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 3rdparty/nuxeo/nuxeo-server/9.10-HF30/config/trashservice-config.xml diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/config/trashservice-config.xml b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/config/trashservice-config.xml new file mode 100644 index 0000000000..bac6f89e4f --- /dev/null +++ b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/config/trashservice-config.xml @@ -0,0 +1,12 @@ + + + + org.nuxeo.ecm.core.trash.service.migrator + + + + lifecycle + + + + From aceb02400cac5227b7fe47b0d0f8f8213a5c2cc9 Mon Sep 17 00:00:00 2001 From: Michael Ritter Date: Fri, 8 May 2026 14:48:52 -0600 Subject: [PATCH 20/24] DRYD-2101: Update Authority Fulltext Queries (#532) * Update fulltext query for authority refs * Add boolean parameter for toggling cleaning of keywords * Misc cleanup (type inference, modifier sorting, etc) --- .../services/client/IQueryManager.java | 153 +++++++++--------- .../services/common/query/QueryManager.java | 28 ++-- .../query/nuxeo/QueryManagerNuxeoImpl.java | 39 ++--- .../vocabulary/RefNameServiceUtils.java | 65 ++++---- 4 files changed, 134 insertions(+), 151 deletions(-) diff --git a/services/client/src/main/java/org/collectionspace/services/client/IQueryManager.java b/services/client/src/main/java/org/collectionspace/services/client/IQueryManager.java index dd4194c7c9..e70c7e7ea6 100644 --- a/services/client/src/main/java/org/collectionspace/services/client/IQueryManager.java +++ b/services/client/src/main/java/org/collectionspace/services/client/IQueryManager.java @@ -30,107 +30,106 @@ public interface IQueryManager { - final static String SEARCH_COMBINE_QUERY_PARAM = "combine"; - final static String SEARCH_COMBINE_AND = "and"; - final static String SEARCH_COMBINE_OR = "or"; - final static String SEARCH_GROUP_OPEN = "("; - final static String SEARCH_GROUP_CLOSE = ")"; - final static String SEARCH_TERM_SEPARATOR = " "; - final static String SEARCH_LIKE = " LIKE "; - final static String SEARCH_ILIKE = " ILIKE "; - final static String SEARCH_TYPE_KEYWORDS = "keywords"; - final static String SEARCH_TYPE_KEYWORDS_KW = "kw"; - final static String SEARCH_TYPE_KEYWORDS_AS = "as"; - final static String SEARCH_TYPE_PARTIALTERM = "pt"; - final static String SEARCH_TYPE_DOCTYPE = "doctype"; - final static String SEARCH_TYPE_FILENAME = "filename"; - final static String SEARCH_TYPE_CLASS_NAME = "classname"; - final static String SEARCH_TYPE_INVOCATION_MODE = "mode"; - final static String SEARCH_TYPE_INVOCATION = "inv"; - final static String SEARCH_QUALIFIER_AND = SEARCH_TERM_SEPARATOR + "AND" + SEARCH_TERM_SEPARATOR; - final static String SEARCH_QUALIFIER_OR = SEARCH_TERM_SEPARATOR + "OR" + SEARCH_TERM_SEPARATOR; - final static String DEFAULT_SELECT_CLAUSE = "SELECT * FROM "; - final static String CSID_QUERY_PARAM = "csid"; - final static String TAG_QUERY_PARAM = "servicetag"; + String SEARCH_COMBINE_QUERY_PARAM = "combine"; + String SEARCH_COMBINE_AND = "and"; + String SEARCH_COMBINE_OR = "or"; + String SEARCH_GROUP_OPEN = "("; + String SEARCH_GROUP_CLOSE = ")"; + String SEARCH_TERM_SEPARATOR = " "; + String SEARCH_LIKE = " LIKE "; + String SEARCH_ILIKE = " ILIKE "; + String SEARCH_TYPE_KEYWORDS = "keywords"; + String SEARCH_TYPE_KEYWORDS_KW = "kw"; + String SEARCH_TYPE_KEYWORDS_AS = "as"; + String SEARCH_TYPE_PARTIALTERM = "pt"; + String SEARCH_TYPE_DOCTYPE = "doctype"; + String SEARCH_TYPE_FILENAME = "filename"; + String SEARCH_TYPE_CLASS_NAME = "classname"; + String SEARCH_TYPE_INVOCATION_MODE = "mode"; + String SEARCH_TYPE_INVOCATION = "inv"; + String SEARCH_QUALIFIER_AND = SEARCH_TERM_SEPARATOR + "AND" + SEARCH_TERM_SEPARATOR; + String SEARCH_QUALIFIER_OR = SEARCH_TERM_SEPARATOR + "OR" + SEARCH_TERM_SEPARATOR; + String DEFAULT_SELECT_CLAUSE = "SELECT * FROM "; + String CSID_QUERY_PARAM = "csid"; + String TAG_QUERY_PARAM = "servicetag"; // // Nuxeo pseudo-values (and filters) for special document properties. // - final static String NUXEO_UUID = "ecm:uuid"; - final static String NUXEO_IS_PROXY = "ecm:isProxy"; - final static String NUXEO_IS_PROXY_FILTER = NUXEO_IS_PROXY + " = 0"; - final static String NUXEO_IS_VERSION = "ecm:isCheckedInVersion"; - final static String NUXEO_IS_VERSION_FILTER = NUXEO_IS_VERSION + " = 0"; + String NUXEO_UUID = "ecm:uuid"; + String NUXEO_IS_PROXY = "ecm:isProxy"; + String NUXEO_IS_PROXY_FILTER = NUXEO_IS_PROXY + " = 0"; + String NUXEO_IS_VERSION = "ecm:isCheckedInVersion"; + String NUXEO_IS_VERSION_FILTER = NUXEO_IS_VERSION + " = 0"; // In the CMIS context, the prefix is nuxeo, not ecm - final static String NUXEO_CMIS_IS_VERSION = "nuxeo:isVersion"; - final static String NUXEO_CMIS_IS_VERSION_FILTER = NUXEO_CMIS_IS_VERSION + " = false"; + String NUXEO_CMIS_IS_VERSION = "nuxeo:isVersion"; + String NUXEO_CMIS_IS_VERSION_FILTER = NUXEO_CMIS_IS_VERSION + " = false"; // // Query params for CMIS queries on the relationship (Relation) table. // - final static String SEARCH_RELATED_TO_CSID_AS_SUBJECT = "rtSbj"; - final static String SEARCH_RELATED_TO_CSID_AS_OBJECT = "rtObj"; - final static String SEARCH_RELATED_PREDICATE = "rtPredicate"; + String SEARCH_RELATED_TO_CSID_AS_SUBJECT = "rtSbj"; + String SEARCH_RELATED_TO_CSID_AS_OBJECT = "rtObj"; + String SEARCH_RELATED_PREDICATE = "rtPredicate"; - final static String SEARCH_RELATED_TO_CSID_AS_EITHER = "rtSbjOrObj"; - final static String SEARCH_RELATED_MATCH_OBJ_DOCTYPES = "rtObjDocTypes"; - final static String SELECT_DOC_TYPE_FIELD = "selectDocType"; + String SEARCH_RELATED_TO_CSID_AS_EITHER = "rtSbjOrObj"; + String SEARCH_RELATED_MATCH_OBJ_DOCTYPES = "rtObjDocTypes"; + String SELECT_DOC_TYPE_FIELD = "selectDocType"; - final static String MARK_RELATED_TO_CSID_AS_SUBJECT = "mkRtSbj"; - final static String MARK_RELATED_TO_CSID_AS_EITHER = "mkRtSbjOrObj"; + String MARK_RELATED_TO_CSID_AS_SUBJECT = "mkRtSbj"; + String MARK_RELATED_TO_CSID_AS_EITHER = "mkRtSbjOrObj"; // // Generic CMIS property mapping constants // - final static String CMIS_OBJECT_ID = "cmis:objectId"; - final static String CMIS_NUXEO_PATHSEGMENT = "nuxeo:pathSegment"; + String CMIS_OBJECT_ID = "cmis:objectId"; + String CMIS_NUXEO_PATHSEGMENT = "nuxeo:pathSegment"; // // Nuxeo related CMIS property mapping constants - final static String CMIS_NUXEO_ID = CMIS_OBJECT_ID; - final static String CMIS_NUXEO_NAME = CMIS_NUXEO_PATHSEGMENT; - final static String CMIS_NUXEO_TITLE = "dc:title"; - final static String CMIS_CS_UPDATED_AT = CollectionSpaceClient.COLLECTIONSPACE_CORE_SCHEMA + ":" + - CollectionSpaceClient.COLLECTIONSPACE_CORE_UPDATED_AT; + String CMIS_NUXEO_ID = CMIS_OBJECT_ID; + String CMIS_NUXEO_NAME = CMIS_NUXEO_PATHSEGMENT; + String CMIS_NUXEO_TITLE = "dc:title"; + String CMIS_CS_UPDATED_AT = CollectionSpaceClient.COLLECTIONSPACE_CORE_SCHEMA + ":" + + CollectionSpaceClient.COLLECTIONSPACE_CORE_UPDATED_AT; // CollectionSpace CMIS property mapping constants - final static String CMIS_TARGET_PREFIX = "DOC"; - final static String CMIS_CORESCHEMA_PREFIX = "CORE"; + String CMIS_TARGET_PREFIX = "DOC"; + String CMIS_CORESCHEMA_PREFIX = "CORE"; // Relations CMIS property mapping constants - final static String CMIS_RELATIONS_PREFIX = "REL"; + String CMIS_RELATIONS_PREFIX = "REL"; - final static String CMIS_JOIN_NUXEO_IS_VERSION_FILTER = + String CMIS_JOIN_NUXEO_IS_VERSION_FILTER = IQueryManager.CMIS_TARGET_PREFIX + "." + IQueryManager.NUXEO_CMIS_IS_VERSION_FILTER; - final static String CMIS_JOIN_TENANT_ID_FILTER = + String CMIS_JOIN_TENANT_ID_FILTER = IQueryManager.CMIS_RELATIONS_PREFIX + "." + CollectionSpaceClient.CORE_TENANTID; - final static String CMIS_TARGET_NUXEO_ID = CMIS_TARGET_PREFIX + "." + CMIS_NUXEO_ID; - final static String CMIS_TARGET_CSID = CMIS_TARGET_PREFIX + "." + CMIS_NUXEO_NAME; - final static String CMIS_TARGET_TITLE = CMIS_TARGET_PREFIX + "." + CMIS_NUXEO_TITLE; - final static String CMIS_TARGET_NAME = CMIS_TARGET_PREFIX + "." + CMIS_NUXEO_NAME; - final static String CMIS_TARGET_UPDATED_AT = CMIS_TARGET_PREFIX + "." + CMIS_CS_UPDATED_AT; + String CMIS_TARGET_NUXEO_ID = CMIS_TARGET_PREFIX + "." + CMIS_NUXEO_ID; + String CMIS_TARGET_CSID = CMIS_TARGET_PREFIX + "." + CMIS_NUXEO_NAME; + String CMIS_TARGET_TITLE = CMIS_TARGET_PREFIX + "." + CMIS_NUXEO_TITLE; + String CMIS_TARGET_NAME = CMIS_TARGET_PREFIX + "." + CMIS_NUXEO_NAME; + String CMIS_TARGET_UPDATED_AT = CMIS_TARGET_PREFIX + "." + CMIS_CS_UPDATED_AT; - final static String TENANT_USES_STARTING_WILDCARD_FOR_PARTIAL_TERM = "ptStartingWildcard"; - final static String MAX_LIST_ITEMS_RETURNED_LIMIT_ON_JDBC_QUERIES = "maxListItemsReturnedLimitOnJdbcQueries"; - final static String JDBC_QUERIES_ARE_TENANT_ID_RESTRICTED = "jdbcQueriesAreTenantIdRestricted"; + String TENANT_USES_STARTING_WILDCARD_FOR_PARTIAL_TERM = "ptStartingWildcard"; + String MAX_LIST_ITEMS_RETURNED_LIMIT_ON_JDBC_QUERIES = "maxListItemsReturnedLimitOnJdbcQueries"; + String JDBC_QUERIES_ARE_TENANT_ID_RESTRICTED = "jdbcQueriesAreTenantIdRestricted"; - public void execQuery(String queryString); - - public String getDatasourceName(); + String getDatasourceName(); /** * Creates the where clause from keywords. * * @param keywords the keywords + * @param clean if punctuation should be removed from the keywords * * @return the string */ - public String createWhereClauseFromKeywords(String keywords); + String createWhereClauseFromKeywords(String keywords, boolean clean); - public String createWhereClauseFromAdvancedSearch(String advancedSearch); + String createWhereClauseFromAdvancedSearch(String advancedSearch); - final static boolean FILTER_EXCLUDE = true; - final static boolean FILTER_INCLUDE = false; + boolean FILTER_EXCLUDE = true; + boolean FILTER_INCLUDE = false; /** * Creates a query to filter a qualified (string) field according to a list of string values. @@ -140,7 +139,7 @@ public interface IQueryManager { * If false, will require qualifiedField does match one of the filters strings. * @return queryString */ - public String createWhereClauseToFilterFromStringList(String qualifiedField, String[] filterTerms, boolean fExclude); + String createWhereClauseToFilterFromStringList(String qualifiedField, String[] filterTerms, boolean fExclude); /** * Creates the where clause for partial term match. @@ -150,12 +149,12 @@ public interface IQueryManager { * * @return the string */ - public String createWhereClauseForPartialMatch(String dataSourceName, - String repositoryName, - String cspaceInstanceId, - String field, - boolean startingWildcard, - String partialTerm); + String createWhereClauseForPartialMatch(String dataSourceName, + String repositoryName, + String cspaceInstanceId, + String field, + boolean startingWildcard, + String partialTerm); /** * Creates a filtering where clause from docType, for invocables. @@ -165,7 +164,7 @@ public String createWhereClauseForPartialMatch(String dataSourceName, * * @return the string */ - public String createWhereClauseForInvocableByDocType(String schema, String docType); + String createWhereClauseForInvocableByDocType(String schema, String docType); /** @@ -175,7 +174,7 @@ public String createWhereClauseForPartialMatch(String dataSourceName, * @param docType the filename * @return the where clause */ - public String createWhereClauseForInvocableByFilename(String schema, String filename); + String createWhereClauseForInvocableByFilename(String schema, String filename); /** * Creates a filtering where clause from class name, for invocables. @@ -184,7 +183,7 @@ public String createWhereClauseForPartialMatch(String dataSourceName, * @param docType the class name * @return the where clause */ - public String createWhereClauseForInvocableByClassName(String schema, String className); + String createWhereClauseForInvocableByClassName(String schema, String className); /** * Creates a filtering where clause from invocation mode, for invocables. @@ -194,13 +193,13 @@ public String createWhereClauseForPartialMatch(String dataSourceName, * * @return the string */ - public String createWhereClauseForInvocableByMode(String schema, String mode); + String createWhereClauseForInvocableByMode(String schema, String mode); - public String createWhereClauseForInvocableByMode(String schema, List modes); + String createWhereClauseForInvocableByMode(String schema, List modes); /* * */ - public String createWhereClauseFromCsid(String csid); + String createWhereClauseFromCsid(String csid); } diff --git a/services/common/src/main/java/org/collectionspace/services/common/query/QueryManager.java b/services/common/src/main/java/org/collectionspace/services/common/query/QueryManager.java index 775c1a270b..f580dc8e3b 100644 --- a/services/common/src/main/java/org/collectionspace/services/common/query/QueryManager.java +++ b/services/common/src/main/java/org/collectionspace/services/common/query/QueryManager.java @@ -37,7 +37,7 @@ import org.collectionspace.services.config.tenant.TenantBindingType; public class QueryManager { - static private final IQueryManager queryManager = new QueryManagerNuxeoImpl(); + private static final IQueryManager queryManager = new QueryManagerNuxeoImpl(); /** * Creates the where clause from keywords. @@ -46,15 +46,19 @@ public class QueryManager { * * @return the string */ - static public String createWhereClauseFromKeywords(String keywords) { - return queryManager.createWhereClauseFromKeywords(keywords); + public static String createWhereClauseFromKeywords(String keywords) { + return queryManager.createWhereClauseFromKeywords(keywords, true); } - static public String createWhereClauseFromAdvancedSearch(String keywords) { + public static String createWhereClauseFromKeywords(String keywords, boolean clean) { + return queryManager.createWhereClauseFromKeywords(keywords, clean); + } + + public static String createWhereClauseFromAdvancedSearch(String keywords) { return queryManager.createWhereClauseFromAdvancedSearch(keywords); } - static public String createWhereClauseFromCsid(String csid) { + public static String createWhereClauseFromCsid(String csid) { return queryManager.createWhereClauseFromCsid(csid); } @@ -66,7 +70,7 @@ static public String createWhereClauseFromCsid(String csid) { * * @return the string */ - static public String createWhereClauseForPartialMatch(ServiceContext ctx, + public static String createWhereClauseForPartialMatch(ServiceContext ctx, String field, String partialTerm) throws Exception { String cspaceInstanceId = ServiceMain.getInstance().getCspaceInstanceId(); @@ -92,7 +96,7 @@ static public String createWhereClauseForPartialMatch(ServiceContext ctx, * If false, will require qualifiedField does match one of the filters strings. * @return queryString */ - static public String createWhereClauseToFilterFromStringList(String qualifiedField, String[] filterTerms, boolean fExclude) { + public static String createWhereClauseToFilterFromStringList(String qualifiedField, String[] filterTerms, boolean fExclude) { return queryManager.createWhereClauseToFilterFromStringList(qualifiedField, filterTerms, fExclude); } @@ -105,7 +109,7 @@ static public String createWhereClauseToFilterFromStringList(String qualifiedFie * * @return the string */ - static public String createWhereClauseForInvocableByDocType(String schema, String docType) { + public static String createWhereClauseForInvocableByDocType(String schema, String docType) { return queryManager.createWhereClauseForInvocableByDocType(schema, docType); } @@ -116,7 +120,7 @@ static public String createWhereClauseForInvocableByDocType(String schema, Strin * @param docType the filename * @return the where clause */ - static public String createWhereClauseForInvocableByFilename(String schema, String filename) { + public static String createWhereClauseForInvocableByFilename(String schema, String filename) { return queryManager.createWhereClauseForInvocableByFilename(schema, filename); } @@ -127,7 +131,7 @@ static public String createWhereClauseForInvocableByFilename(String schema, Stri * @param docType the class name * @return the where clause */ - static public String createWhereClauseForInvocableByClassName(String schema, String className) { + public static String createWhereClauseForInvocableByClassName(String schema, String className) { return queryManager.createWhereClauseForInvocableByClassName(schema, className); } @@ -139,11 +143,11 @@ static public String createWhereClauseForInvocableByClassName(String schema, Str * * @return the string */ - static public String createWhereClauseForInvocableByMode(String schema, String mode) { + public static String createWhereClauseForInvocableByMode(String schema, String mode) { return queryManager.createWhereClauseForInvocableByMode(schema, mode); } - static public String createWhereClauseForInvocableByMode(String schema, List modes) { + public static String createWhereClauseForInvocableByMode(String schema, List modes) { return queryManager.createWhereClauseForInvocableByMode(schema, modes); } } diff --git a/services/common/src/main/java/org/collectionspace/services/common/query/nuxeo/QueryManagerNuxeoImpl.java b/services/common/src/main/java/org/collectionspace/services/common/query/nuxeo/QueryManagerNuxeoImpl.java index 0058c73b1c..f3ba49ed92 100644 --- a/services/common/src/main/java/org/collectionspace/services/common/query/nuxeo/QueryManagerNuxeoImpl.java +++ b/services/common/src/main/java/org/collectionspace/services/common/query/nuxeo/QueryManagerNuxeoImpl.java @@ -46,8 +46,7 @@ public class QueryManagerNuxeoImpl implements IQueryManager { - private static String ECM_FULLTEXT_LIKE = "ecm:fulltext" - + SEARCH_TERM_SEPARATOR + IQueryManager.SEARCH_LIKE; + private static String ECM_FULLTEXT_LIKE = "ecm:fulltext" + SEARCH_TERM_SEPARATOR + IQueryManager.SEARCH_LIKE; private static String SEARCH_LIKE_FORM = null; private final Logger logger = LoggerFactory @@ -82,22 +81,6 @@ public String getDatasourceName() { return JDBCTools.NUXEO_DATASOURCE_NAME; } - // TODO: This is currently just an example fixed query. This should - // eventually be - // removed or replaced with a more generic method. - /* - * (non-Javadoc) - * - * @see - * org.collectionspace.services.common.query.IQueryManager#execQuery(java - * .lang.String) - */ - @Override - @Deprecated - public void execQuery(String queryString) { - // Intentionally left blank - } - @Override public String createWhereClauseFromAdvancedSearch(String advancedSearch) { String result = null; @@ -105,14 +88,12 @@ public String createWhereClauseFromAdvancedSearch(String advancedSearch) { // Process search term. FIXME: REM - Do we need to perform any string filtering here? // if (advancedSearch != null && !advancedSearch.isEmpty()) { - // Filtering of advanced searches on a single '%' char, per CSPACE-5828 - Matcher regexMatcher = advSearchSqlWildcard.matcher(advancedSearch.trim()); - if (regexMatcher.matches()) { - return ""; - } - StringBuffer advancedSearchWhereClause = new StringBuffer( - advancedSearch); - result = advancedSearchWhereClause.toString(); + // Filtering of advanced searches on a single '%' char, per CSPACE-5828 + Matcher regexMatcher = advSearchSqlWildcard.matcher(advancedSearch.trim()); + if (regexMatcher.matches()) { + return ""; + } + result = advancedSearch; } return result; @@ -125,10 +106,10 @@ public String createWhereClauseFromAdvancedSearch(String advancedSearch) { * createWhereClauseFromKeywords(java.lang.String) */ @Override - public String createWhereClauseFromKeywords(String keywords) { - StringBuffer fullTextWhereClause = new StringBuffer(); + public String createWhereClauseFromKeywords(String keywords, boolean clean) { + StringBuilder fullTextWhereClause = new StringBuilder(); - String cleanKeywords = kwdSearchProblemChars.matcher(keywords).replaceAll(" ").trim(); + String cleanKeywords = clean ? kwdSearchProblemChars.matcher(keywords).replaceAll(" ").trim() : keywords; Matcher regexMatcher = kwdTokenizer.matcher(cleanKeywords); boolean addNOT = false; 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 3fca65de8f..eaf1d9f00d 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 @@ -84,20 +84,20 @@ */ public class RefNameServiceUtils { - public static enum SpecifierForm { + public enum SpecifierForm { CSID, URN_NAME // Either a CSID or a short ID - }; + } public static class Specifier { // // URN statics for things like urn:cspace:name(grover) // - final static String URN_PREFIX = "urn:cspace:"; - final static int URN_PREFIX_LEN = URN_PREFIX.length(); - final static String URN_PREFIX_NAME = "name("; - final static int URN_NAME_PREFIX_LEN = URN_PREFIX_LEN + URN_PREFIX_NAME.length(); - final static String URN_PREFIX_ID = "id("; - final static int URN_ID_PREFIX_LEN = URN_PREFIX_LEN + URN_PREFIX_ID.length(); + static final String URN_PREFIX = "urn:cspace:"; + static final int URN_PREFIX_LEN = URN_PREFIX.length(); + static final String URN_PREFIX_NAME = "name("; + static final int URN_NAME_PREFIX_LEN = URN_PREFIX_LEN + URN_PREFIX_NAME.length(); + static final String URN_PREFIX_ID = "id("; + static final int URN_ID_PREFIX_LEN = URN_PREFIX_LEN + URN_PREFIX_ID.length(); public SpecifierForm form; public String value; @@ -379,7 +379,7 @@ public static void updateRefNamesInRelations( public static List getConfiguredAuthorityRefs(ServiceContext ctx) { List authRefFields = ((AbstractServiceContextImpl) ctx).getAllPartsPropertyValues( ServiceBindingUtils.AUTH_REF_PROP, ServiceBindingUtils.QUALIFIED_PROP_NAMES); - ArrayList authRefsInfo = new ArrayList(authRefFields.size()); + ArrayList authRefsInfo = new ArrayList<>(authRefFields.size()); for (String spec : authRefFields) { AuthRefConfigInfo arci = new AuthRefConfigInfo(spec); authRefsInfo.add(arci); @@ -405,8 +405,8 @@ public static AuthorityRefDocList getAuthorityRefDocs( List list = wrapperList.getAuthorityRefDocItem(); - Map queriedServiceBindings = new HashMap(); - Map> authRefFieldsByService = new HashMap>(); + Map queriedServiceBindings = new HashMap<>(); + Map> authRefFieldsByService = new HashMap<>(); NuxeoRepositoryClientImpl nuxeoRepoClient = (NuxeoRepositoryClientImpl) repoClient; try { @@ -485,7 +485,7 @@ public static AuthorityRefDocList getAuthorityRefDocs( private static ArrayList getRefNameServiceTypes() { if (refNameServiceTypes == null) { - refNameServiceTypes = new ArrayList(); + refNameServiceTypes = new ArrayList<>(); refNameServiceTypes.add(ServiceBindingUtils.SERVICE_TYPE_AUTHORITY); refNameServiceTypes.add(ServiceBindingUtils.SERVICE_TYPE_OBJECT); refNameServiceTypes.add(ServiceBindingUtils.SERVICE_TYPE_PROCEDURE); @@ -504,8 +504,8 @@ public static int updateAuthorityRefDocs( String oldRefName, String newRefName, String refPropName) throws Exception { - Map queriedServiceBindings = new HashMap(); - Map> authRefFieldsByService = new HashMap>(); + Map queriedServiceBindings = new HashMap<>(); + Map> authRefFieldsByService = new HashMap<>(); int docsScanned = 0; int nRefsFound = 0; @@ -642,7 +642,7 @@ protected static DocumentModelList findAuthorityRefDocs( // Filter the list for current user rights servicebindings = SecurityUtils.getReadableServiceBindingsForCurrentUser(servicebindings); - ArrayList docTypes = new ArrayList(); + ArrayList docTypes = new ArrayList<>(); String query = computeWhereClauseForAuthorityRefDocs(refName, refPropName, docTypes, servicebindings, // REM - Side effect that docTypes, authRefFieldsByService, and queriedServiceBindings get set/change. Any others? queriedServiceBindings, authRefFieldsByService); @@ -671,7 +671,7 @@ protected static DocumentModelList findAuthorityRefDocs( return docList; } - private static final DocumentModelList findDocs( + private static DocumentModelList findDocs( RepositoryClient repoClient, ServiceContext ctx, CoreSessionInterface repoSession, @@ -755,7 +755,7 @@ private static String computeWhereClauseForAuthorityRefDocs( if (authRefFieldPaths.isEmpty()) { continue; } - ArrayList authRefsInfo = new ArrayList(); + ArrayList authRefsInfo = new ArrayList<>(); for (String spec : authRefFieldPaths) { AuthRefConfigInfo arci = new AuthRefConfigInfo(spec); authRefsInfo.add(arci); @@ -775,22 +775,21 @@ private static String computeWhereClauseForAuthorityRefDocs( // we compute actual matches. AuthorityTermInfo authTermInfo = RefNameUtils.parseAuthorityTermInfo(refName); - // Example refname: urn:cspace:pahma.cspace.berkeley.edu:personauthorities:name(person):item:name(ReneRichie1586477168934) - // Corresponding phrase: "urn cspace pahma cspace berkeley edu personauthorities name person item name ReneRichie1586477168934 - - String refnamePhrase = String.format("urn cspace %s %s name %s item name %s", - RefNameUtils.domainToPhrase(authTermInfo.inAuthority.domain), - authTermInfo.inAuthority.resource, - authTermInfo.inAuthority.name, - authTermInfo.name - ); - refnamePhrase = String.format("\"%s\"", refnamePhrase); // surround the phase in double quotes to indicate this is a NXQL phrase search + // As of Nuxeo LTS 2019, fulltext no longer has punctuation removed and as such when looking for authority + // references we want to provide a search string with the authority name, authority vocabulary name, and the + // short ID of the authority + // e.g. + // urn:cspace:pahma.cspace.berkeley.edu:personauthorities:name(person):item:name(ReneRichie1586477168934) + // becomes + // personauthorities person ReneRichie1586477168934 + // We also no longer need a phrase search because we would be required to retain punctuation + final var refnameQuery = authTermInfo.inAuthority.resource + + " " + authTermInfo.inAuthority.name + + " " + authTermInfo.name; - String whereClauseStr = QueryManager.createWhereClauseFromKeywords(refnamePhrase); + String whereClauseStr = QueryManager.createWhereClauseFromKeywords(refnameQuery, false); - if (logger.isTraceEnabled()) { - logger.trace("The 'where' clause to find refObjs is: ", refnamePhrase); - } + logger.trace("The 'where' clause to find refObjs is: {}", refnameQuery); return whereClauseStr; } @@ -915,7 +914,7 @@ private static long processRefObjsDocList( UriTemplateRegistryKey key = new UriTemplateRegistryKey(tenantId, docType); StoredValuesUriTemplate template = registry.get(key); if (template != null) { - Map additionalValues = new HashMap(); + Map additionalValues = new HashMap<>(); if (template.getUriTemplateType() == UriTemplateFactory.RESOURCE) { additionalValues.put(UriTemplateFactory.IDENTIFIER_VAR, csid); uri = template.buildUri(additionalValues); @@ -963,7 +962,7 @@ private static long processRefObjsDocList( "getAuthorityRefDocs: internal logic error: can't fetch authRefFields for DocType."); } - ArrayList foundProps = new ArrayList(); + ArrayList foundProps = new ArrayList<>(); try { findAuthRefPropertiesInDoc(docModel, matchingAuthRefFields, refName, matchBaseOnly, foundProps); // REM - side effect that foundProps is set if(!foundProps.isEmpty()) { From 9c0c7592d4452a527a8e0ea4ac01c9a94bd38ee0 Mon Sep 17 00:00:00 2001 From: Michael Ritter Date: Tue, 12 May 2026 14:00:45 -0600 Subject: [PATCH 21/24] DRYD-2089: Updates to Integration Tests (#534) * Add jaxb-runtime when required for testing * Add authorization jaxb when required for testing * URL Encode '%' in XMLReplayTest * Replace hibernate.cfg.xml with persistence.xml * Remove unnecessary hibernate/persistence files * Update tomcat version --- pom.xml | 2 +- .../xmlreplay/vocabulary/vocabulary.xml | 2 +- services/account/client/build.xml | 14 +- services/account/client/pom.xml | 9 +- .../test/resources/META-INF/persistence.xml | 8 +- .../src/test/resources/hibernate.cfg.xml | 24 --- services/account/pstore/build.xml | 44 +----- services/account/pstore/pom.xml | 117 --------------- .../test/resources/META-INF/persistence.xml | 20 --- .../src/test/resources/hibernate.cfg.xml | 24 --- services/authentication/client/.gitignore | 2 - services/authentication/client/build.xml | 139 ------------------ services/authentication/client/pom.xml | 59 -------- .../test/resources/META-INF/persistence.xml | 18 --- .../src/test/resources/hibernate.cfg.xml | 24 --- services/authentication/jaxb/pom.xml | 6 - .../test/resources/META-INF/persistence.xml | 17 --- .../jaxb/src/test/resources/hibernate.cfg.xml | 24 --- services/authentication/pom.xml | 1 - services/authentication/pstore/build.xml | 61 -------- services/authentication/pstore/pom.xml | 111 -------------- .../test/resources/META-INF/persistence.xml | 18 --- .../src/test/resources/hibernate.cfg.xml | 24 --- services/authorization/pstore/build.xml | 53 ------- services/authorization/pstore/pom.xml | 108 -------------- .../test/resources/META-INF/persistence.xml | 21 --- .../src/test/resources/hibernate.cfg.xml | 24 --- services/contact/client/pom.xml | 5 + services/deaccession/client/pom.xml | 5 + services/exit/client/pom.xml | 5 + services/heldintrust/client/pom.xml | 5 + services/nagprainventory/client/pom.xml | 5 + services/person/client/pom.xml | 6 + services/repatriationrequest/client/pom.xml | 5 + services/security/client/pom.xml | 20 --- .../test/resources/META-INF/persistence.xml | 18 --- .../src/test/resources/hibernate.cfg.xml | 24 --- services/summarydocumentation/client/pom.xml | 5 + 38 files changed, 57 insertions(+), 1020 deletions(-) delete mode 100644 services/account/client/src/test/resources/hibernate.cfg.xml delete mode 100644 services/account/pstore/src/test/resources/META-INF/persistence.xml delete mode 100644 services/account/pstore/src/test/resources/hibernate.cfg.xml delete mode 100644 services/authentication/client/.gitignore delete mode 100644 services/authentication/client/build.xml delete mode 100644 services/authentication/client/pom.xml delete mode 100644 services/authentication/client/src/test/resources/META-INF/persistence.xml delete mode 100644 services/authentication/client/src/test/resources/hibernate.cfg.xml delete mode 100644 services/authentication/jaxb/src/test/resources/META-INF/persistence.xml delete mode 100644 services/authentication/jaxb/src/test/resources/hibernate.cfg.xml delete mode 100644 services/authentication/pstore/src/test/resources/META-INF/persistence.xml delete mode 100644 services/authentication/pstore/src/test/resources/hibernate.cfg.xml delete mode 100644 services/authorization/pstore/src/test/resources/META-INF/persistence.xml delete mode 100644 services/authorization/pstore/src/test/resources/hibernate.cfg.xml delete mode 100644 services/security/client/src/test/resources/META-INF/persistence.xml delete mode 100644 services/security/client/src/test/resources/hibernate.cfg.xml diff --git a/pom.xml b/pom.xml index b850f604a6..bf44b47ce5 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ ${revision} ${revision} 17 - 8.5.40 + 9.0.99 2.0.14 diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/vocabulary/vocabulary.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/vocabulary/vocabulary.xml index 399bdebed0..24f1049f79 100644 --- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/vocabulary/vocabulary.xml +++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/vocabulary/vocabulary.xml @@ -708,7 +708,7 @@ GET - /cspace-services/vocabularies/${createShowItemsVocab.CSID}/items?as=(vocabularyitems_common:displayName+ILIKE+%22%ShowItemsItem2%25%22) + /cspace-services/vocabularies/${createShowItemsVocab.CSID}/items?as=(vocabularyitems_common:displayName+ILIKE+%22%25ShowItemsItem2%25%22) 1 diff --git a/services/account/client/build.xml b/services/account/client/build.xml index 5d06c5c52c..e8a6d88ba5 100644 --- a/services/account/client/build.xml +++ b/services/account/client/build.xml @@ -107,20 +107,16 @@ - - - - + + + + - - - - - + postgresql test - org.jboss.resteasy resteasy-client @@ -85,7 +78,7 @@ - + diff --git a/services/account/client/src/test/resources/META-INF/persistence.xml b/services/account/client/src/test/resources/META-INF/persistence.xml index c2db6ee442..e386cdc0b5 100644 --- a/services/account/client/src/test/resources/META-INF/persistence.xml +++ b/services/account/client/src/test/resources/META-INF/persistence.xml @@ -9,7 +9,13 @@ org.collectionspace.services.account.AccountTenant org.collectionspace.services.account.Status - + + + + + + + diff --git a/services/account/client/src/test/resources/hibernate.cfg.xml b/services/account/client/src/test/resources/hibernate.cfg.xml deleted file mode 100644 index eb577d2288..0000000000 --- a/services/account/client/src/test/resources/hibernate.cfg.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - @DB_CSPACE_URL@ - @DB_DRIVER_CLASS@ - @DB_CSPACE_USER@ - @DB_CSPACE_PASSWORD@ - @DB_DIALECT@ - org.hibernate.transaction.JDBCTransactionFactory - thread - true - - diff --git a/services/account/pstore/build.xml b/services/account/pstore/build.xml index bb75b1b62c..dec8478621 100644 --- a/services/account/pstore/build.xml +++ b/services/account/pstore/build.xml @@ -108,48 +108,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + org.collectionspace.services.account.pstore services.account.pstore - - account.sql - ${basedir}/src/main/resources/db - - - - - - - - org.postgresql - postgresql - ${postgres.driver.version} - - - - org.collectionspace.services - org.collectionspace.services.account.jaxb - ${project.version} - - - collectionspace-services-account-pstore - - - maven-antrun-plugin - - - subs-hibernate-config - generate-test-resources - - run - - - - - - - - - - - - - - - - ddl - - - - org.codehaus.mojo - properties-maven-plugin - - - ../../../build.properties - - - - - org.codehaus.mojo - hibernate3-maven-plugin - 2.2 - - - process-test-resources - - hbm2ddl - - - - - - - hbm2ddl - - - - ${sql.file} - jpaconfiguration - true - true - true - true - false - org.collectionspace.services.account - - - - - org.postgresql - postgresql - ${postgres.driver.version} - - - - - maven-antrun-plugin - - - process-test-resources - - - - - - - run - - - - - - - - - diff --git a/services/account/pstore/src/test/resources/META-INF/persistence.xml b/services/account/pstore/src/test/resources/META-INF/persistence.xml deleted file mode 100644 index f6e45ccfef..0000000000 --- a/services/account/pstore/src/test/resources/META-INF/persistence.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - org.collectionspace.services.account.AccountsCommon - org.collectionspace.services.account.Tenant - org.collectionspace.services.account.AccountTenant - org.collectionspace.services.account.Status - - - - - - - diff --git a/services/account/pstore/src/test/resources/hibernate.cfg.xml b/services/account/pstore/src/test/resources/hibernate.cfg.xml deleted file mode 100644 index eb577d2288..0000000000 --- a/services/account/pstore/src/test/resources/hibernate.cfg.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - @DB_CSPACE_URL@ - @DB_DRIVER_CLASS@ - @DB_CSPACE_USER@ - @DB_CSPACE_PASSWORD@ - @DB_DIALECT@ - org.hibernate.transaction.JDBCTransactionFactory - thread - true - - diff --git a/services/authentication/client/.gitignore b/services/authentication/client/.gitignore deleted file mode 100644 index 1dd3331081..0000000000 --- a/services/authentication/client/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/target/ -/target/ diff --git a/services/authentication/client/build.xml b/services/authentication/client/build.xml deleted file mode 100644 index 7e9e27052e..0000000000 --- a/services/authentication/client/build.xml +++ /dev/null @@ -1,139 +0,0 @@ - - - collectionspace authentication service - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/services/authentication/client/pom.xml b/services/authentication/client/pom.xml deleted file mode 100644 index 34cbe284d0..0000000000 --- a/services/authentication/client/pom.xml +++ /dev/null @@ -1,59 +0,0 @@ - - - - - org.collectionspace.services - org.collectionspace.services.authentication - ${revision} - - - 4.0.0 - org.collectionspace.services.authentication.client - services.authentication.client - - - - - org.collectionspace.services - org.collectionspace.services.authentication.jaxb - ${project.version} - - - org.collectionspace.services - org.collectionspace.services.authorization.jaxb - ${project.version} - - - org.collectionspace.services - org.collectionspace.services.client - ${project.version} - - - - - cspace-services-authentication-client - - - maven-antrun-plugin - - - subs-hibernate-config - generate-test-resources - - run - - - - - - - - - - - - - - diff --git a/services/authentication/client/src/test/resources/META-INF/persistence.xml b/services/authentication/client/src/test/resources/META-INF/persistence.xml deleted file mode 100644 index 9577e73190..0000000000 --- a/services/authentication/client/src/test/resources/META-INF/persistence.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - org.collectionspace.services.authentication.User - org.collectionspace.services.authorization.Role - - - - - - - diff --git a/services/authentication/client/src/test/resources/hibernate.cfg.xml b/services/authentication/client/src/test/resources/hibernate.cfg.xml deleted file mode 100644 index eb577d2288..0000000000 --- a/services/authentication/client/src/test/resources/hibernate.cfg.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - @DB_CSPACE_URL@ - @DB_DRIVER_CLASS@ - @DB_CSPACE_USER@ - @DB_CSPACE_PASSWORD@ - @DB_DIALECT@ - org.hibernate.transaction.JDBCTransactionFactory - thread - true - - diff --git a/services/authentication/jaxb/pom.xml b/services/authentication/jaxb/pom.xml index 5ad184ed7b..696bce1bfd 100644 --- a/services/authentication/jaxb/pom.xml +++ b/services/authentication/jaxb/pom.xml @@ -13,12 +13,6 @@ org.collectionspace.services.authentication.jaxb services.authentication.jaxb - - - authentication.sql - src/main/resources/db/mysql - - jakarta.xml.bind diff --git a/services/authentication/jaxb/src/test/resources/META-INF/persistence.xml b/services/authentication/jaxb/src/test/resources/META-INF/persistence.xml deleted file mode 100644 index a9564d02da..0000000000 --- a/services/authentication/jaxb/src/test/resources/META-INF/persistence.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - org.collectionspace.services.authentication.User - - - - - - - diff --git a/services/authentication/jaxb/src/test/resources/hibernate.cfg.xml b/services/authentication/jaxb/src/test/resources/hibernate.cfg.xml deleted file mode 100644 index d416bb08af..0000000000 --- a/services/authentication/jaxb/src/test/resources/hibernate.cfg.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - @DB_CSPACE_URL@ - @DB_DRIVER_CLASS@ - @DB_CSPACE_USER@ - @DB_CSPACE_PASSWORD@ - @DB_DIALECT@ - org.hibernate.transaction.JDBCTransactionFactory - thread - true - - diff --git a/services/authentication/pom.xml b/services/authentication/pom.xml index cbeea2588c..b186fdf918 100644 --- a/services/authentication/pom.xml +++ b/services/authentication/pom.xml @@ -18,7 +18,6 @@ jaxb pstore service - client diff --git a/services/authentication/pstore/build.xml b/services/authentication/pstore/build.xml index 372d052e8c..82941c5fe6 100644 --- a/services/authentication/pstore/build.xml +++ b/services/authentication/pstore/build.xml @@ -107,48 +107,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Creating users table in the cspace database using user ${db.cspace.user} @@ -161,25 +119,6 @@ - org.collectionspace.services.authentication.pstore services.authentication.pstore - - authentication.sql - ${basedir}/src/main/resources/db - - - - - org.postgresql - postgresql - - - - org.collectionspace.services - org.collectionspace.services.authentication.jaxb - ${project.version} - - - cspace-services-authentication-pstore - - - maven-antrun-plugin - - - subs-hibernate-config - generate-test-resources - - run - - - - - - - - - - - - - - - ddl - - - - org.codehaus.mojo - properties-maven-plugin - - - ../../../build.properties - - - - - org.codehaus.mojo - hibernate3-maven-plugin - 2.2 - - - process-test-resources - - hbm2ddl - - - - - - - hbm2ddl - - - - ${sql.file} - jpaconfiguration - true - true - true - true - false - org.collectionspace.services.authentication - - - - - org.postgresql - postgresql - ${postgres.driver.version} - - - - - maven-antrun-plugin - - - process-test-resources - - - - - - - run - - - - - - - - - diff --git a/services/authentication/pstore/src/test/resources/META-INF/persistence.xml b/services/authentication/pstore/src/test/resources/META-INF/persistence.xml deleted file mode 100644 index 2844198043..0000000000 --- a/services/authentication/pstore/src/test/resources/META-INF/persistence.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - org.collectionspace.services.authentication.User - org.collectionspace.services.authentication.Token - - - - - - - diff --git a/services/authentication/pstore/src/test/resources/hibernate.cfg.xml b/services/authentication/pstore/src/test/resources/hibernate.cfg.xml deleted file mode 100644 index eb577d2288..0000000000 --- a/services/authentication/pstore/src/test/resources/hibernate.cfg.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - @DB_CSPACE_URL@ - @DB_DRIVER_CLASS@ - @DB_CSPACE_USER@ - @DB_CSPACE_PASSWORD@ - @DB_DIALECT@ - org.hibernate.transaction.JDBCTransactionFactory - thread - true - - diff --git a/services/authorization/pstore/build.xml b/services/authorization/pstore/build.xml index ec73e8f9c2..c94dd05fa9 100644 --- a/services/authorization/pstore/build.xml +++ b/services/authorization/pstore/build.xml @@ -108,48 +108,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 4.0.0 org.collectionspace.services.authorization.pstore services.authorization.pstore - - authorization.sql - ${basedir}/src/main/resources/db - - - - org.collectionspace.services - org.collectionspace.services.authorization.jaxb - ${project.version} - - - org.postgresql - postgresql - - cspace-services-authorization-pstore - - - maven-antrun-plugin - - - subs-hibernate-config - generate-test-resources - - run - - - - - - - - - - - - - - - ddl - - - - org.codehaus.mojo - properties-maven-plugin - - - ../../../build.properties - - - - - org.codehaus.mojo - hibernate3-maven-plugin - 2.2 - - - process-test-resources - - hbm2ddl - - - - - - - hbm2ddl - - - - ${sql.file} - jpaconfiguration - true - true - true - true - false - org.collectionspace.services.authorization - - - - - org.postgresql - postgresql - ${postgres.driver.version} - - - - - maven-antrun-plugin - - - process-test-resources - - - - - - - run - - - - - - - - - diff --git a/services/authorization/pstore/src/test/resources/META-INF/persistence.xml b/services/authorization/pstore/src/test/resources/META-INF/persistence.xml deleted file mode 100644 index 52fe747e86..0000000000 --- a/services/authorization/pstore/src/test/resources/META-INF/persistence.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - org.collectionspace.services.authorization.perms.Permission - org.collectionspace.services.authorization.perms.PermissionAction - org.collectionspace.services.authorization.PermissionRoleRel - org.collectionspace.services.authorization.Role - org.collectionspace.services.authorization.AccountRoleRel - - - - - - - diff --git a/services/authorization/pstore/src/test/resources/hibernate.cfg.xml b/services/authorization/pstore/src/test/resources/hibernate.cfg.xml deleted file mode 100644 index eb577d2288..0000000000 --- a/services/authorization/pstore/src/test/resources/hibernate.cfg.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - @DB_CSPACE_URL@ - @DB_DRIVER_CLASS@ - @DB_CSPACE_USER@ - @DB_CSPACE_PASSWORD@ - @DB_DIALECT@ - org.hibernate.transaction.JDBCTransactionFactory - thread - true - - diff --git a/services/contact/client/pom.xml b/services/contact/client/pom.xml index 34b18f5d33..444867b187 100644 --- a/services/contact/client/pom.xml +++ b/services/contact/client/pom.xml @@ -55,6 +55,11 @@ commons-httpclient commons-httpclient + + org.glassfish.jaxb + jaxb-runtime + test + diff --git a/services/deaccession/client/pom.xml b/services/deaccession/client/pom.xml index caa0539c4d..0018558b11 100644 --- a/services/deaccession/client/pom.xml +++ b/services/deaccession/client/pom.xml @@ -49,6 +49,11 @@ commons-httpclient commons-httpclient + + org.glassfish.jaxb + jaxb-runtime + test + diff --git a/services/exit/client/pom.xml b/services/exit/client/pom.xml index 5f82cf3744..8846323656 100644 --- a/services/exit/client/pom.xml +++ b/services/exit/client/pom.xml @@ -49,6 +49,11 @@ commons-httpclient commons-httpclient + + org.glassfish.jaxb + jaxb-runtime + test + diff --git a/services/heldintrust/client/pom.xml b/services/heldintrust/client/pom.xml index aab99cdd50..217a1952ff 100644 --- a/services/heldintrust/client/pom.xml +++ b/services/heldintrust/client/pom.xml @@ -49,6 +49,11 @@ commons-httpclient commons-httpclient + + org.glassfish.jaxb + jaxb-runtime + test + diff --git a/services/nagprainventory/client/pom.xml b/services/nagprainventory/client/pom.xml index 0f0b158217..c0f7170a29 100644 --- a/services/nagprainventory/client/pom.xml +++ b/services/nagprainventory/client/pom.xml @@ -49,6 +49,11 @@ commons-httpclient commons-httpclient + + org.glassfish.jaxb + jaxb-runtime + test + diff --git a/services/person/client/pom.xml b/services/person/client/pom.xml index 99571b8f53..8d14ffc94e 100644 --- a/services/person/client/pom.xml +++ b/services/person/client/pom.xml @@ -39,6 +39,12 @@ org.collectionspace.services.contact.client ${project.version} + + org.collectionspace.services + org.collectionspace.services.authorization.jaxb + ${project.version} + test + org.testng diff --git a/services/repatriationrequest/client/pom.xml b/services/repatriationrequest/client/pom.xml index 48a882920c..c1719269c0 100644 --- a/services/repatriationrequest/client/pom.xml +++ b/services/repatriationrequest/client/pom.xml @@ -49,6 +49,11 @@ commons-httpclient commons-httpclient + + org.glassfish.jaxb + jaxb-runtime + test + diff --git a/services/security/client/pom.xml b/services/security/client/pom.xml index 23074d0e11..fcbd881339 100644 --- a/services/security/client/pom.xml +++ b/services/security/client/pom.xml @@ -77,25 +77,5 @@ cspace-services-security-client - - - maven-antrun-plugin - - - subs-hibernate-config - generate-test-resources - - run - - - - - - - - - - - diff --git a/services/security/client/src/test/resources/META-INF/persistence.xml b/services/security/client/src/test/resources/META-INF/persistence.xml deleted file mode 100644 index 9577e73190..0000000000 --- a/services/security/client/src/test/resources/META-INF/persistence.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - org.collectionspace.services.authentication.User - org.collectionspace.services.authorization.Role - - - - - - - diff --git a/services/security/client/src/test/resources/hibernate.cfg.xml b/services/security/client/src/test/resources/hibernate.cfg.xml deleted file mode 100644 index eb577d2288..0000000000 --- a/services/security/client/src/test/resources/hibernate.cfg.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - @DB_CSPACE_URL@ - @DB_DRIVER_CLASS@ - @DB_CSPACE_USER@ - @DB_CSPACE_PASSWORD@ - @DB_DIALECT@ - org.hibernate.transaction.JDBCTransactionFactory - thread - true - - diff --git a/services/summarydocumentation/client/pom.xml b/services/summarydocumentation/client/pom.xml index d88eb3ecb3..906798179e 100644 --- a/services/summarydocumentation/client/pom.xml +++ b/services/summarydocumentation/client/pom.xml @@ -45,6 +45,11 @@ org.jboss.resteasy resteasy-multipart-provider + + org.glassfish.jaxb + jaxb-runtime + test + From befa10b8a977d16cfb83eb09bd8b0ae8bf096238 Mon Sep 17 00:00:00 2001 From: Michael Ritter Date: Tue, 12 May 2026 16:33:58 -0600 Subject: [PATCH 22/24] DRYD-2102: Fixes for Thumbnail Derivative Generation (#533) * Replace deprecated blob creation methods * Configuration for Nuxeo's RecomputeViews bulk action * Handle view computation ourselves * Cleanup imports, logging, modifiers * Set variable when shutting down --- .../disable-picture-listener-config.xml | 10 + .../9.10-HF30/config/logmanager-config.xml | 8 + .../9.10-HF30/config/nuxeo.properties | 5 + ...CollectionSpaceServiceContextListener.java | 2 +- .../common/imaging/nuxeo/NuxeoBlobUtils.java | 236 ++++++++++-------- 5 files changed, 156 insertions(+), 105 deletions(-) create mode 100644 3rdparty/nuxeo/nuxeo-server/9.10-HF30/config/disable-picture-listener-config.xml create mode 100644 3rdparty/nuxeo/nuxeo-server/9.10-HF30/config/logmanager-config.xml diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/config/disable-picture-listener-config.xml b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/config/disable-picture-listener-config.xml new file mode 100644 index 0000000000..c2c0dc2fa8 --- /dev/null +++ b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/config/disable-picture-listener-config.xml @@ -0,0 +1,10 @@ + + + + org.nuxeo.ecm.platform.picture.listeners + + + + + + diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/config/logmanager-config.xml b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/config/logmanager-config.xml new file mode 100644 index 0000000000..b20ab2f72c --- /dev/null +++ b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/config/logmanager-config.xml @@ -0,0 +1,8 @@ + + + + org.nuxeo.ecm.core.bulk.config + + + + diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/config/nuxeo.properties b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/config/nuxeo.properties index 5f72426910..fb0efa56b4 100644 --- a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/config/nuxeo.properties +++ b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/config/nuxeo.properties @@ -24,6 +24,11 @@ nuxeo-client-jndi.java.naming.provider.url=jnp://%s:%s nuxeo-client-jndi.java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory nuxeo-client-jndi.java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces +# bulk action configs +# when recomputing views, use a single threaded approach to avoid concurrency exceptions +nuxeo.bulk.action.recomputeViews.defaultConcurrency=1 +nuxeo.bulk.action.recomputeViews.defaultPartitions=1 + # for email attachment, to decode the encoded(utf) filenames. mail.mime.decodefilename=true diff --git a/services/common/src/main/java/org/collectionspace/services/common/CollectionSpaceServiceContextListener.java b/services/common/src/main/java/org/collectionspace/services/common/CollectionSpaceServiceContextListener.java index dd2ce05e51..9d6d91e9dd 100644 --- a/services/common/src/main/java/org/collectionspace/services/common/CollectionSpaceServiceContextListener.java +++ b/services/common/src/main/java/org/collectionspace/services/common/CollectionSpaceServiceContextListener.java @@ -56,7 +56,7 @@ public void contextDestroyed(ServletContextEvent event) { ServiceMain instance = null; try { - ServiceMain.getInstance(); + instance = ServiceMain.getInstance(); } catch (Throwable t) { // Do nothing. Error already logged by the Services layer } finally { diff --git a/services/common/src/main/java/org/collectionspace/services/common/imaging/nuxeo/NuxeoBlobUtils.java b/services/common/src/main/java/org/collectionspace/services/common/imaging/nuxeo/NuxeoBlobUtils.java index 0aa2ceeef1..f4fe2f3a3b 100644 --- a/services/common/src/main/java/org/collectionspace/services/common/imaging/nuxeo/NuxeoBlobUtils.java +++ b/services/common/src/main/java/org/collectionspace/services/common/imaging/nuxeo/NuxeoBlobUtils.java @@ -29,9 +29,12 @@ import java.io.ByteArrayInputStream; import java.io.File; import java.io.FileNotFoundException; +import java.io.IOException; import java.io.InputStream; +import java.io.Serializable; import java.math.BigDecimal; import java.math.BigInteger; +import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; import java.util.HashSet; @@ -40,62 +43,61 @@ import java.util.Set; import java.util.UUID; -import org.nuxeo.runtime.api.Framework; -import org.nuxeo.ecm.platform.picture.api.ImageInfo; -import org.nuxeo.ecm.platform.picture.api.ImagingDocumentConstants; -import org.nuxeo.ecm.platform.picture.api.ImagingService; -import org.nuxeo.ecm.platform.picture.api.PictureView; -import org.nuxeo.ecm.platform.mimetype.MimetypeDetectionException; -import org.nuxeo.ecm.platform.mimetype.interfaces.MimetypeRegistry; -import org.nuxeo.ecm.platform.picture.api.adapters.PictureBlobHolder; -import org.nuxeo.ecm.platform.filemanager.api.FileManager; -import org.nuxeo.ecm.platform.filemanager.service.FileManagerService; -import org.nuxeo.ecm.platform.filemanager.service.extension.FileImporter; -import org.nuxeo.ecm.platform.filemanager.utils.FileManagerUtils; -import org.nuxeo.ecm.platform.types.TypeManager; -import org.nuxeo.ecm.core.api.IdRef; -import org.nuxeo.ecm.core.api.NuxeoException; -import org.nuxeo.ecm.core.api.blobholder.BlobHolder; -import org.nuxeo.ecm.core.api.blobholder.DocumentBlobHolder; -import org.nuxeo.ecm.core.api.impl.blob.FileBlob; -import org.nuxeo.ecm.core.api.model.Property; -import org.nuxeo.binary.metadata.api.BinaryMetadataService; -import org.nuxeo.ecm.core.api.Blob; -import org.nuxeo.ecm.core.api.DocumentModel; -import org.nuxeo.ecm.core.api.DocumentRef; -import org.nuxeo.ecm.core.api.PropertyException; -import org.nuxeo.ecm.core.blob.BlobManager; -import org.nuxeo.ecm.core.blob.BlobProvider; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.apache.commons.io.IOUtils; - +import org.collectionspace.services.blob.BlobsCommon; +import org.collectionspace.services.blob.DimensionSubGroup; +import org.collectionspace.services.blob.DimensionSubGroupList; +import org.collectionspace.services.blob.MeasuredPartGroup; +import org.collectionspace.services.blob.MeasuredPartGroupList; import org.collectionspace.services.client.PoxPayloadIn; import org.collectionspace.services.client.PoxPayloadOut; import org.collectionspace.services.common.FileUtilities; import org.collectionspace.services.common.ServiceMain; +import org.collectionspace.services.common.api.CommonAPI; +import org.collectionspace.services.common.api.GregorianCalendarDateTimeUtils; import org.collectionspace.services.common.blob.BlobInput; +import org.collectionspace.services.common.blob.BlobOutput; 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.TransactionException; import org.collectionspace.services.common.repository.RepositoryClient; -import org.collectionspace.services.common.api.CommonAPI; -import org.collectionspace.services.common.api.GregorianCalendarDateTimeUtils; -import org.collectionspace.services.common.blob.BlobOutput; -import org.collectionspace.services.blob.BlobsCommon; -import org.collectionspace.services.blob.DimensionSubGroup; -import org.collectionspace.services.blob.DimensionSubGroupList; -import org.collectionspace.services.blob.MeasuredPartGroup; -import org.collectionspace.services.blob.MeasuredPartGroupList; +import org.collectionspace.services.config.service.ListResultField; import org.collectionspace.services.jaxb.BlobJAXBSchema; import org.collectionspace.services.nuxeo.client.java.CommonList; import org.collectionspace.services.nuxeo.client.java.CoreSessionInterface; import org.collectionspace.services.nuxeo.client.java.NuxeoRepositoryClientImpl; import org.collectionspace.services.nuxeo.util.NuxeoUtils; import org.collectionspace.services.nuxeo.util.ThumbnailConstants; -import org.collectionspace.services.config.service.ListResultField; +import org.nuxeo.binary.metadata.api.BinaryMetadataService; +import org.nuxeo.ecm.core.api.Blob; +import org.nuxeo.ecm.core.api.DocumentModel; +import org.nuxeo.ecm.core.api.DocumentRef; +import org.nuxeo.ecm.core.api.IdRef; +import org.nuxeo.ecm.core.api.NuxeoException; +import org.nuxeo.ecm.core.api.PropertyException; +import org.nuxeo.ecm.core.api.blobholder.BlobHolder; +import org.nuxeo.ecm.core.api.blobholder.DocumentBlobHolder; +import org.nuxeo.ecm.core.api.impl.blob.FileBlob; +import org.nuxeo.ecm.core.api.model.Property; +import org.nuxeo.ecm.core.blob.BlobManager; +import org.nuxeo.ecm.core.blob.BlobProvider; +import org.nuxeo.ecm.platform.filemanager.api.FileImporterContext; +import org.nuxeo.ecm.platform.filemanager.api.FileManager; +import org.nuxeo.ecm.platform.filemanager.service.FileManagerService; +import org.nuxeo.ecm.platform.filemanager.service.extension.FileImporter; +import org.nuxeo.ecm.platform.filemanager.utils.FileManagerUtils; +import org.nuxeo.ecm.platform.mimetype.MimetypeDetectionException; +import org.nuxeo.ecm.platform.mimetype.interfaces.MimetypeRegistry; +import org.nuxeo.ecm.platform.picture.api.ImageInfo; +import org.nuxeo.ecm.platform.picture.api.ImagingDocumentConstants; +import org.nuxeo.ecm.platform.picture.api.ImagingService; +import org.nuxeo.ecm.platform.picture.api.PictureView; +import org.nuxeo.ecm.platform.picture.api.adapters.PictureBlobHolder; +import org.nuxeo.ecm.platform.types.TypeManager; +import org.nuxeo.runtime.api.Framework; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Use Nuxeo's FileBlob class to create a temporary file that Nuxeo manages. @@ -226,13 +228,13 @@ private static String toStringPictureView(PictureView pictureView) { return strBuffer.toString(); } - static private String getDerivativeUri(String uri, String derivativeName) { + private static String getDerivativeUri(String uri, String derivativeName) { return uri + derivativeName + "/" + BlobInput.URI_CONTENT_PATH; } - static private HashMap createBlobListItem(Blob blob, - String uri, - String derivativeName) { + private static HashMap createBlobListItem(Blob blob, + String uri, + String derivativeName) { HashMap item = new HashMap(); String value = getDerivativeUri(uri, derivativeName); @@ -262,14 +264,14 @@ static private HashMap createBlobListItem(Blob blob, return item; } - static public String getSanizitedFilename(File srcFile) throws Exception { + public static String getSanizitedFilename(File srcFile) throws Exception { return getSanizitedFilename(srcFile.getName()); } /* * Valid Nuxeo file names are a subset of *nix and Windows filenames, so we need to check. */ - static public String getSanizitedFilename(String fileName) throws Exception { + public static String getSanizitedFilename(String fileName) throws Exception { String result = fileName; if (fileName != null && fileName.matches(NUXEO_FILENAME_VALID_STRING) == false) { @@ -284,7 +286,7 @@ static public String getSanizitedFilename(String fileName) throws Exception { if (result != null && logger.isDebugEnabled() == true) { if (result.equals(fileName) == false) { - logger.debug(String.format("The file name '%s' was sanizitized to '%s'.", fileName, result)); + logger.debug("The file name '{}' was sanizitized to '{}'.", fileName, result); } } @@ -336,8 +338,8 @@ private static void handlePictureViewBlobs(PictureBlobHolder pictureBlobHolder, commonList.setItemsInPage(total); } - static public CommonList getBlobDerivatives(CoreSessionInterface repoSession, - String repositoryId, List resultsFields, String uri) + public static CommonList getBlobDerivatives(CoreSessionInterface repoSession, + String repositoryId, List resultsFields, String uri) throws Exception { CommonList commonList = new CommonList(); int nFields = resultsFields.size() + 2; @@ -382,7 +384,7 @@ private static Map getMetadata(Blob nuxeoBlob) throws Exception return binaryMetadataService.readMetadata(nuxeoBlob, false); } - static private MeasuredPartGroupList getDimensions( + private static MeasuredPartGroupList getDimensions( DocumentModel documentModel, Blob nuxeoBlob) { MeasuredPartGroupList result = null; @@ -455,19 +457,19 @@ static private MeasuredPartGroupList getDimensions( // FIXME: Add error checking here, as none of these calls return an // Exception - static private BigDecimal intToBigDecimal(int i) { + private static BigDecimal intToBigDecimal(int i) { BigInteger bigint = BigInteger.valueOf(i); BigDecimal bigdec = new BigDecimal(bigint); return bigdec; } - static private BlobsCommon createBlobsCommon(ServiceContext ctx, DocumentModel documentModel, - Blob nuxeoBlob) { + private static BlobsCommon createBlobsCommon(ServiceContext ctx, DocumentModel documentModel, + Blob nuxeoBlob) { return createBlobsCommon(ctx, documentModel, nuxeoBlob, false); } - static private BlobsCommon createBlobsCommon(ServiceContext ctx, DocumentModel documentModel, - Blob nuxeoBlob, Boolean getContentFlag) { + private static BlobsCommon createBlobsCommon(ServiceContext ctx, DocumentModel documentModel, + Blob nuxeoBlob, Boolean getContentFlag) { BlobsCommon result = new BlobsCommon(); if (documentModel != null && nuxeoBlob != null) { @@ -483,7 +485,7 @@ static private BlobsCommon createBlobsCommon(ServiceContext ctx, DocumentModel d BlobProvider bp = blobManager.getBlobProvider(ctx.getRepositoryName()); digest = bp.getBinaryManager().getBinary(nuxeoBlob).getDigest(); } catch (Exception e) { - logger.warn(String.format("Could not compute digest value for uploaded media '%s'.", nuxeoBlob.getFilename())); + logger.warn("Could not compute digest value for uploaded media '{}'.", nuxeoBlob.getFilename()); } } result.setDigest(digest); @@ -528,7 +530,7 @@ static private BlobsCommon createBlobsCommon(ServiceContext ctx, DocumentModel d return result; } - static private Blob checkMimeType(Blob blob, String fullname) + private static Blob checkMimeType(Blob blob, String fullname) throws NuxeoException { final String mimeType = blob.getMimeType(); if (mimeType != null && !mimeType.equals("application/octet-stream") @@ -617,8 +619,8 @@ private static FileManagerService getFileManagerService() throws NuxeoException } - static private CoreSessionInterface getRepositorySession(ServiceContext ctx, - RepositoryClient repositoryClient) { + private static CoreSessionInterface getRepositorySession(ServiceContext ctx, + RepositoryClient repositoryClient) { CoreSessionInterface result = null; NuxeoRepositoryClientImpl nuxeoClient = (NuxeoRepositoryClientImpl)repositoryClient; @@ -631,14 +633,14 @@ static private CoreSessionInterface getRepositorySession(ServiceContext ctx, - RepositoryClient repositoryClient, - CoreSessionInterface repoSession) throws TransactionException { + private static void releaseRepositorySession(ServiceContext ctx, + RepositoryClient repositoryClient, + CoreSessionInterface repoSession) throws TransactionException { NuxeoRepositoryClientImpl nuxeoClient = (NuxeoRepositoryClientImpl)repositoryClient; nuxeoClient.releaseRepositorySession(ctx, repoSession); } - static private MimetypeRegistry getMimeService() throws NuxeoException { + private static MimetypeRegistry getMimeService() throws NuxeoException { MimetypeRegistry result = null; try { @@ -659,40 +661,63 @@ private static DocumentModel createDocumentFromBlob( boolean useNuxeoAdaptors) throws Exception { DocumentModel result = null; - boolean createdFromAdaptor = false; - if (useNuxeoAdaptors == true) try { - // - // Use Nuxeo's high-level create method which looks for plugin adapters that match the MIME type. For example, - // for image blobs, Nuxeo's file manager will pick a special image plugin that will automatically generate - // image derivatives. - // - result = getFileManager().createDocumentFromBlob( - repoSession.getCoreSession(), inputStreamBlob, blobLocation, overwrite, blobName); - createdFromAdaptor = true; - } catch (NuxeoException ne) { - logger.warn(String.format("Tried but failed to use Nuxeo import adaptor to download '%s'. Falling back to generic file importer", - blobName)); + // useNuxeoAdaptors is kind of a misnomer because we always use Nuxeo to create the Blob document + // instead now it's more used to show where the call has come from (PublicItem vs BlobDocumentModelHandler) + // and to determine if we want to generate derivatives or not + if (!useNuxeoAdaptors) { + inputStreamBlob = checkMimeType(inputStreamBlob, blobName); } - if (createdFromAdaptor == false) { - // - // User Nuxeo's default file importer/adapter explicitly. This avoids specialized functionality from happening like - // image derivative creation. - // - String digestAlgorithm = getFileManager().getDigestAlgorithm(); // Only call this because we seem to need some way of initializing Nuxeo's FileManager with a call. - - FileManagerService fileManagerService = getFileManagerService(); - inputStreamBlob = checkMimeType(inputStreamBlob, blobName); + final var context = FileImporterContext.builder(repoSession.getCoreSession(), inputStreamBlob, blobLocation) + .overwrite(overwrite) + .fileName(blobName) + .build(); + result = getFileManager().createOrUpdateDocument(context); - FileImporter defaultFileImporter = fileManagerService.getPluginByName("DefaultFileImporter"); - result = defaultFileImporter.create( - repoSession.getCoreSession(), inputStreamBlob, blobLocation, overwrite, blobName, getTypeService()); + // Compute the views now instead of relying on Nuxeo to populate them + if (result != null && isBlobAnImage(inputStreamBlob) && useNuxeoAdaptors) { + computeViews(result, inputStreamBlob); } return result; } - static public BlobsCommon createBlobInRepository( + /** + * Compute the derivative views and add them to our document. This assumes the view list is not populated and in the + * future we might need to clear existing views before setting the value. + * + * @param doc The Blob's document + * @param blob The Blob + */ + private static void computeViews(DocumentModel doc, Blob blob) { + final var convert = true; + final var imagingService = Framework.getService(ImagingService.class); + if (imagingService == null) { + logger.warn("Unable to compute views for {}, ImagingService not found", blob.getFilename()); + return; + } + + final var views = new ArrayList>(); + final var imageInfo = imagingService.getImageInfo(blob); + if (imageInfo == null) { + logger.warn("Unable to generate imageInfo for {}, skipping derivative generation", blob.getFilename()); + return; + } + + try { + final var computedViews = imagingService.computeViewsFor(doc, blob, imageInfo, convert); + for (var view : computedViews) { + views.add(view.asMap()); + } + doc.setPropertyValue(VIEWS_PROPERTY, views); + } catch (PropertyException e) { + logger.error("Unable to set view property for document {}", blob.getFilename(), e); + } catch (IOException e) { + logger.error("Unable to compute views for document {}", blob.getFilename(), e); + } + } + + public static BlobsCommon createBlobInRepository( ServiceContext ctx, RepositoryClient repositoryClient, InputStream inputStream, @@ -767,8 +792,9 @@ public static BlobsCommon createBlobInRepository( if (sanitizedName.equals(originalFile.getName()) == false) { targetFile = FileUtilities.createTmpFile(originalFile, sanitizedName); if (logger.isDebugEnabled() == true) { - logger.debug(String.format("The file '%s''s name has characters that Nuxeo can't deal with. Rather than renaming the file, we created a new temp file at '%s'", - originalFile.getName(), targetFile.getAbsolutePath())); + logger.debug( + "The file '{}''s name has characters that Nuxeo can't deal with. Rather than renaming the file, we created a new temp file at '{}'", + originalFile.getName(), targetFile.getAbsolutePath()); } } @@ -801,7 +827,7 @@ public static BlobsCommon createBlobInRepository( // if (targetFile.equals(originalFile) == false) { if (targetFile.delete() == false) { - logger.warn(String.format("Attempt to delete temporary file '%s' failed.", targetFile.getAbsolutePath())); + logger.warn("Attempt to delete temporary file '{}' failed.", targetFile.getAbsolutePath()); } } } @@ -813,7 +839,7 @@ public static BlobsCommon createBlobInRepository( * Find out if this document's blob/file-contents are allowed to be purged. For instance, we currently * only want to allow the purging the contents of Nuxeo "Picture" documents. */ - static private boolean isPurgeAllowed(DocumentModel docModel) { + private static boolean isPurgeAllowed(DocumentModel docModel) { boolean result = false; if (docModel.hasFacet(ImagingDocumentConstants.PICTURE_FACET) == true) { @@ -838,7 +864,7 @@ static private boolean isPurgeAllowed(DocumentModel docModel) { * the mime type * @return the string */ - static private BlobsCommon createBlobInRepository(ServiceContext ctx, + private static BlobsCommon createBlobInRepository(ServiceContext ctx, CoreSessionInterface nuxeoSession, DocumentModel blobLocation, boolean purgeOriginal, @@ -876,8 +902,9 @@ static private BlobsCommon createBlobInRepository(ServiceContext ctx, String source = (String)documentModel.getProperty(CommonAPI.NUXEO_DUBLINCORE_SCHEMANAME, CommonAPI.NUXEO_DUBLINCORE_SOURCE); if (source != null) { - logger.warn(String.format("The Nuxeo dublin core property '%s' is set to '%s'. We expected it to be empty. See JIRA issue CSPACE-6679 for details.", - CommonAPI.NUXEO_DUBLINCORE_SOURCE, source)); + logger.warn( + "The Nuxeo dublin core property '{}' is set to '{}'. We expected it to be empty. See JIRA issue CSPACE-6679 for details.", + CommonAPI.NUXEO_DUBLINCORE_SOURCE, source); } documentModel.setProperty(CommonAPI.NUXEO_DUBLINCORE_SCHEMANAME, CommonAPI.NUXEO_DUBLINCORE_SOURCE, CommonAPI.URL_SOURCED_PICTURE); @@ -947,10 +974,10 @@ public static InputStream getResource(String resourceName) { return result; } - static public BlobOutput getBlobOutput(ServiceContext ctx, - RepositoryClient repositoryClient, - String repositoryId, - StringBuffer outMimeType) throws TransactionException, DocumentNotFoundException { + public static BlobOutput getBlobOutput(ServiceContext ctx, + RepositoryClient repositoryClient, + String repositoryId, + StringBuffer outMimeType) throws TransactionException, DocumentNotFoundException { BlobOutput result = null; boolean repoSessionCleanup = false; @@ -986,7 +1013,7 @@ static public BlobOutput getBlobOutput(ServiceContext getPictureViewNameSet(CoreSessionInterface repoSession, String repositoryId) throws PropertyException { + public static Set getPictureViewNameSet(CoreSessionInterface repoSession, String repositoryId) throws PropertyException { Set result = null; DocumentModel docModel = repoSession.getDocument(new IdRef(repositoryId)); @@ -1043,7 +1071,7 @@ static public Set getPictureViewNameSet(CoreSessionInterface repoSession * @return the image * @throws DocumentNotFoundException */ - static public BlobOutput getBlobOutput(ServiceContext ctx, + public static BlobOutput getBlobOutput(ServiceContext ctx, CoreSessionInterface repoSession, String repositoryId, String derivativeTerm, From a7d3e566bc26e902932176a5cc1ef427c970358e Mon Sep 17 00:00:00 2001 From: Michael Ritter Date: Thu, 14 May 2026 13:15:18 -0600 Subject: [PATCH 23/24] Update ES Mappings and Analysis Config (#536) --- .../9.10-HF30/config/proto-elasticsearch-extension.xml | 7 ++----- .../tenants/anthro/anthro-tenant-bindings.delta.xml | 3 --- .../tenants/bonsai/bonsai-tenant-bindings.delta.xml | 3 --- .../services/tenants/fcart/fcart-tenant-bindings.delta.xml | 3 --- .../services/tenants/lhmc/lhmc-tenant-bindings.delta.xml | 3 --- .../tenants/materials/materials-tenant-bindings.delta.xml | 3 --- .../services/tenants/tenant-bindings-proto-unified.xml | 3 --- 7 files changed, 2 insertions(+), 23 deletions(-) diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/config/proto-elasticsearch-extension.xml b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/config/proto-elasticsearch-extension.xml index b732c6c059..444e6c3069 100644 --- a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/config/proto-elasticsearch-extension.xml +++ b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/config/proto-elasticsearch-extension.xml @@ -56,9 +56,9 @@ "type": "path_hierarchy" }, "ngram_tokenizer": { - "type": "nGram", + "type": "ngram", "min_gram": 3, - "max_gram": 12 + "max_gram": 3 } }, "analyzer": { @@ -137,9 +137,6 @@ // index as small as possible. We may want to turn this on in the future, to support arbitrary // searches through Elasticsearch, e.g. NXQL queries for ad hoc reporting in the CSpace UI. "dynamic": false, - "_all": { - "enabled": false - }, "properties": { "all_field": { "type": "text", diff --git a/services/common/src/main/cspace/config/services/tenants/anthro/anthro-tenant-bindings.delta.xml b/services/common/src/main/cspace/config/services/tenants/anthro/anthro-tenant-bindings.delta.xml index 5d2b1c2844..e2510418d3 100644 --- a/services/common/src/main/cspace/config/services/tenants/anthro/anthro-tenant-bindings.delta.xml +++ b/services/common/src/main/cspace/config/services/tenants/anthro/anthro-tenant-bindings.delta.xml @@ -44,9 +44,6 @@ // index as small as possible. We may want to turn this on in the future, to support arbitrary // searches through Elasticsearch, e.g. NXQL queries for ad hoc reporting in the CSpace UI. "dynamic": false, - "_all" : { - "enabled": false - }, "_source": { "includes": [ "collectionobjects_common:briefDescriptions", diff --git a/services/common/src/main/cspace/config/services/tenants/bonsai/bonsai-tenant-bindings.delta.xml b/services/common/src/main/cspace/config/services/tenants/bonsai/bonsai-tenant-bindings.delta.xml index 2f12109df3..976c9ef2c0 100644 --- a/services/common/src/main/cspace/config/services/tenants/bonsai/bonsai-tenant-bindings.delta.xml +++ b/services/common/src/main/cspace/config/services/tenants/bonsai/bonsai-tenant-bindings.delta.xml @@ -15,9 +15,6 @@ // index as small as possible. We may want to turn this on in the future, to support arbitrary // searches through Elasticsearch, e.g. NXQL queries for ad hoc reporting in the CSpace UI. "dynamic": false, - "_all" : { - "enabled": false - }, "_source": { "includes": [ "collectionobjects_common:briefDescriptions", diff --git a/services/common/src/main/cspace/config/services/tenants/fcart/fcart-tenant-bindings.delta.xml b/services/common/src/main/cspace/config/services/tenants/fcart/fcart-tenant-bindings.delta.xml index 0045ce0287..a449679117 100644 --- a/services/common/src/main/cspace/config/services/tenants/fcart/fcart-tenant-bindings.delta.xml +++ b/services/common/src/main/cspace/config/services/tenants/fcart/fcart-tenant-bindings.delta.xml @@ -24,9 +24,6 @@ // index as small as possible. We may want to turn this on in the future, to support arbitrary // searches through Elasticsearch, e.g. NXQL queries for ad hoc reporting in the CSpace UI. "dynamic": false, - "_all" : { - "enabled": false - }, "_source": { "includes": [ "collectionobjects_common:briefDescriptions", diff --git a/services/common/src/main/cspace/config/services/tenants/lhmc/lhmc-tenant-bindings.delta.xml b/services/common/src/main/cspace/config/services/tenants/lhmc/lhmc-tenant-bindings.delta.xml index f836218cc5..71b91a369f 100644 --- a/services/common/src/main/cspace/config/services/tenants/lhmc/lhmc-tenant-bindings.delta.xml +++ b/services/common/src/main/cspace/config/services/tenants/lhmc/lhmc-tenant-bindings.delta.xml @@ -15,9 +15,6 @@ // index as small as possible. We may want to turn this on in the future, to support arbitrary // searches through Elasticsearch, e.g. NXQL queries for ad hoc reporting in the CSpace UI. "dynamic": false, - "_all" : { - "enabled": false - }, "_source": { "includes": [ "collectionobjects_common:briefDescriptions", diff --git a/services/common/src/main/cspace/config/services/tenants/materials/materials-tenant-bindings.delta.xml b/services/common/src/main/cspace/config/services/tenants/materials/materials-tenant-bindings.delta.xml index 64e57db8e8..771e303a78 100644 --- a/services/common/src/main/cspace/config/services/tenants/materials/materials-tenant-bindings.delta.xml +++ b/services/common/src/main/cspace/config/services/tenants/materials/materials-tenant-bindings.delta.xml @@ -19,9 +19,6 @@ // index as small as possible. We may want to turn this on in the future, to support arbitrary // searches through Elasticsearch, e.g. NXQL queries for ad hoc reporting in the CSpace UI. "dynamic": false, - "_all" : { - "enabled": false - }, "_source": { "includes": [ "collectionspace_denorm:*", diff --git a/services/common/src/main/cspace/config/services/tenants/tenant-bindings-proto-unified.xml b/services/common/src/main/cspace/config/services/tenants/tenant-bindings-proto-unified.xml index 91411631c4..42834cb08d 100644 --- a/services/common/src/main/cspace/config/services/tenants/tenant-bindings-proto-unified.xml +++ b/services/common/src/main/cspace/config/services/tenants/tenant-bindings-proto-unified.xml @@ -1174,9 +1174,6 @@ // index as small as possible. We may want to turn this on in the future, to support arbitrary // searches through Elasticsearch, e.g. NXQL queries for ad hoc reporting in the CSpace UI. "dynamic": false, - "_all" : { - "enabled": false - }, "_source": { "includes": [ "collectionobjects_common:briefDescriptions", From 5ecf54a8e55397a19f6c70d212c5500a418692c3 Mon Sep 17 00:00:00 2001 From: Michael Ritter Date: Thu, 14 May 2026 13:23:33 -0600 Subject: [PATCH 24/24] Disable DTD when parsing XML --- .../services/client/PoxPayload.java | 46 ++++++++++++------- .../common/provider/JakartaJAXBProvider.java | 20 ++++++-- 2 files changed, 46 insertions(+), 20 deletions(-) diff --git a/services/client/src/main/java/org/collectionspace/services/client/PoxPayload.java b/services/client/src/main/java/org/collectionspace/services/client/PoxPayload.java index 59c533e22c..b384b20822 100644 --- a/services/client/src/main/java/org/collectionspace/services/client/PoxPayload.java +++ b/services/client/src/main/java/org/collectionspace/services/client/PoxPayload.java @@ -4,6 +4,7 @@ import java.io.File; import java.io.IOException; import java.io.StringReader; +import java.nio.charset.Charset; import java.util.ArrayList; import java.util.Arrays; import java.util.HashSet; @@ -15,6 +16,9 @@ import jakarta.xml.bind.JAXBElement; import jakarta.xml.bind.Marshaller; import jakarta.xml.bind.Unmarshaller; + +import javax.xml.stream.XMLInputFactory; +import javax.xml.stream.XMLStreamReader; import javax.xml.transform.stream.StreamSource; import org.apache.commons.io.FileUtils; @@ -29,6 +33,7 @@ import org.glassfish.jaxb.core.api.impl.NameConverter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.xml.sax.SAXException; /** * The Class PoxPayload. @@ -80,8 +85,19 @@ public Set getValidRootElementLables() { return validRootElementLabels; } - private void setDomDocument(Document dom) throws DocumentException { - this.domDocument = dom; + private void setDomDocument(final String xmlPayload) throws DocumentException { + SAXReader reader = new SAXReader(); + try { + reader.setFeature("http://apache.org/xml/features/disallow-doctype-decl", true); + reader.setFeature("http://xml.org/sax/features/external-general-entities", false); + reader.setFeature("http://xml.org/sax/features/external-parameter-entities", false); + } catch (SAXException saxException) { + final var error = "Unable to disable Doctype features, aborting document read"; + logger.error(error, saxException); + throw new DocumentException(error); + } + + this.domDocument = reader.read(new StringReader(xmlPayload)); this.parts = null; String label = domDocument.getRootElement().getName().toLowerCase(); @@ -140,13 +156,11 @@ protected Document createDOMFromParts() { * Instantiates a new PoxPayload by parsing the payload into a DOM4j * Document instance * - * @param payloadName the payload name + * @param xmlPayload the payload */ protected PoxPayload(String xmlPayload) throws DocumentException { this.xmlPayload = xmlPayload; - SAXReader reader = new SAXReader(); - Document dom = reader.read(new StringReader(xmlPayload)); - setDomDocument(dom); + setDomDocument(xmlPayload); } /** @@ -157,10 +171,8 @@ protected PoxPayload(String xmlPayload) throws DocumentException { * @throws IOException Signals that an I/O exception has occurred. */ protected PoxPayload(File file) throws DocumentException, IOException { - this.xmlPayload = FileUtils.readFileToString(file); - SAXReader reader = new SAXReader(); - Document dom = reader.read(file); - setDomDocument(dom); + this.xmlPayload = FileUtils.readFileToString(file, Charset.defaultCharset()); + setDomDocument(xmlPayload); } /** @@ -364,22 +376,24 @@ private static String getPackage(Namespace namespace) { public static Object toObject(Element elementInput) { Object result = null; + try { + final XMLInputFactory xmlInputFactory = XMLInputFactory.newFactory(); + xmlInputFactory.setProperty(XMLInputFactory.SUPPORT_DTD, false); + xmlInputFactory.setProperty(XMLInputFactory.IS_SUPPORTING_EXTERNAL_ENTITIES, false); Namespace namespace = elementInput.getNamespace(); if (StringUtils.isNotEmpty(namespace.getURI())) { String thePackage = getPackage(namespace); - logger.info("Searching for JAXBContext instance for {}", thePackage); JAXBContext jc = JAXBContextCache.getInstance().getCachedJAXBContext(thePackage); Unmarshaller um = jc.createUnmarshaller(); - result = um.unmarshal(new StreamSource(new StringReader(elementInput.asXML()))); + XMLStreamReader xmlStream = xmlInputFactory.createXMLStreamReader( + new StreamSource(new StringReader(elementInput.asXML()))); + result = um.unmarshal(xmlStream); } } catch (Exception e) { - if (logger.isInfoEnabled()) { - String msg = String.format("Could not unmarshal XML element '%s' into a JAXB object.", elementInput.getName()); - logger.error(msg, e); - } + logger.error("Could not unmarshal XML element '{}' into a JAXB object.", elementInput.getName(), e); } return result; diff --git a/services/common-http/src/main/java/org/collectionspace/services/common/provider/JakartaJAXBProvider.java b/services/common-http/src/main/java/org/collectionspace/services/common/provider/JakartaJAXBProvider.java index e7d7e76e6b..af328de192 100644 --- a/services/common-http/src/main/java/org/collectionspace/services/common/provider/JakartaJAXBProvider.java +++ b/services/common-http/src/main/java/org/collectionspace/services/common/provider/JakartaJAXBProvider.java @@ -16,6 +16,9 @@ import javax.ws.rs.ext.MessageBodyReader; import javax.ws.rs.ext.MessageBodyWriter; import javax.ws.rs.ext.Provider; +import javax.xml.stream.XMLInputFactory; +import javax.xml.stream.XMLStreamException; +import javax.xml.stream.XMLStreamReader; import javax.xml.transform.stream.StreamSource; import jakarta.xml.bind.JAXBException; @@ -73,19 +76,28 @@ public T readFrom(Class type, Type genericType, Annotation[] annotations, Med MultivaluedMap httpHeaders, InputStream entityStream) throws WebApplicationException { try { - StreamSource source; + final var xmlInputFactory = XMLInputFactory.newFactory(); + xmlInputFactory.setProperty(XMLInputFactory.SUPPORT_DTD, false); + xmlInputFactory.setProperty(XMLInputFactory.IS_SUPPORTING_EXTERNAL_ENTITIES, false); + + final XMLStreamReader xmlStream; final var context = JAXBContextCache.getInstance().getCachedJAXBContext(type); final var unmarshaller = context.createUnmarshaller(); if (mediaType != null && mediaType.getParameters().get("charset") == null) { - source = new StreamSource(new InputStreamReader(entityStream, StandardCharsets.UTF_8)); + xmlStream = xmlInputFactory.createXMLStreamReader(new StreamSource( + new InputStreamReader(entityStream, StandardCharsets.UTF_8))); } else { - source = new StreamSource(entityStream); + xmlStream = xmlInputFactory.createXMLStreamReader(new StreamSource(entityStream)); } - return (T) unmarshaller.unmarshal(source); + return (T) unmarshaller.unmarshal(xmlStream); } catch (JAXBException e) { logger.error("Unable to unmarshal JAXB Object {}", type.getSimpleName(), e); final var response = Response.status(INTERNAL_SERVER_ERROR).build(); throw new WebApplicationException(response); + } catch (XMLStreamException e) { + logger.error("Unable to create XMLStreamReader for JAXB Object {}", type.getSimpleName(), e); + final var response = Response.status(INTERNAL_SERVER_ERROR).build(); + throw new WebApplicationException(response); } } }