From: Richard Millet Date: Thu, 12 Apr 2012 17:17:23 +0000 (-0700) Subject: CSPACE-4966: Adding a more general build mechanism for services to declare their... X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=43c316738cd4deb3621afe7fa1898253c4207aec;p=tmp%2Fjakarta-migration.git CSPACE-4966: Adding a more general build mechanism for services to declare their documents' lifecycle policy. --- diff --git a/3rdparty/nuxeo/nuxeo-doctype-custom/src/main/resources/OSGI-INF/life-cycle-contrib.xml b/3rdparty/nuxeo/nuxeo-doctype-custom/src/main/resources/OSGI-INF/life-cycle-contrib.xml index 3cb6b1008..42bdbfac9 100644 --- a/3rdparty/nuxeo/nuxeo-doctype-custom/src/main/resources/OSGI-INF/life-cycle-contrib.xml +++ b/3rdparty/nuxeo/nuxeo-doctype-custom/src/main/resources/OSGI-INF/life-cycle-contrib.xml @@ -3,7 +3,7 @@ - cs_default + ${Lifecycle} diff --git a/3rdparty/nuxeo/nuxeo-doctype/src/main/resources/OSGI-INF/life-cycle-contrib.xml b/3rdparty/nuxeo/nuxeo-doctype/src/main/resources/OSGI-INF/life-cycle-contrib.xml index 908b68716..6701a9969 100644 --- a/3rdparty/nuxeo/nuxeo-doctype/src/main/resources/OSGI-INF/life-cycle-contrib.xml +++ b/3rdparty/nuxeo/nuxeo-doctype/src/main/resources/OSGI-INF/life-cycle-contrib.xml @@ -4,7 +4,7 @@ - cs_default + ${Lifecycle} diff --git a/3rdparty/nuxeo/nuxeo-platform-quote-api/pom.xml b/3rdparty/nuxeo/nuxeo-platform-quote-api/pom.xml index 21e2433d8..618e7148d 100644 --- a/3rdparty/nuxeo/nuxeo-platform-quote-api/pom.xml +++ b/3rdparty/nuxeo/nuxeo-platform-quote-api/pom.xml @@ -24,6 +24,12 @@ + + + src/main/resources + true + + org.apache.maven.plugins diff --git a/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/pom.xml b/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/pom.xml index 1795ebcf2..2b12239f5 100644 --- a/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/pom.xml +++ b/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/pom.xml @@ -18,6 +18,7 @@ acquisition Acquisition acquisitions_common + cs_default diff --git a/services/batch/3rdparty/nuxeo-platform-cs-batch/pom.xml b/services/batch/3rdparty/nuxeo-platform-cs-batch/pom.xml index b8356a031..82052d597 100644 --- a/services/batch/3rdparty/nuxeo-platform-cs-batch/pom.xml +++ b/services/batch/3rdparty/nuxeo-platform-cs-batch/pom.xml @@ -18,6 +18,12 @@ + + + src/main/resources + true + + org.apache.maven.plugins diff --git a/services/batch/3rdparty/nuxeo-platform-cs-batch/src/main/resources/OSGI-INF/life-cycle-contrib.xml b/services/batch/3rdparty/nuxeo-platform-cs-batch/src/main/resources/OSGI-INF/life-cycle-contrib.xml index c5eae68e6..4c2f4af5c 100644 --- a/services/batch/3rdparty/nuxeo-platform-cs-batch/src/main/resources/OSGI-INF/life-cycle-contrib.xml +++ b/services/batch/3rdparty/nuxeo-platform-cs-batch/src/main/resources/OSGI-INF/life-cycle-contrib.xml @@ -4,7 +4,7 @@ - cs_default + ${Lifecycle} diff --git a/services/blob/3rdparty/nuxeo-platform-cs-blob/pom.xml b/services/blob/3rdparty/nuxeo-platform-cs-blob/pom.xml index 2d307c7d4..a6552be27 100644 --- a/services/blob/3rdparty/nuxeo-platform-cs-blob/pom.xml +++ b/services/blob/3rdparty/nuxeo-platform-cs-blob/pom.xml @@ -17,6 +17,12 @@ + + + src/main/resources + true + + org.apache.maven.plugins diff --git a/services/blob/3rdparty/nuxeo-platform-cs-blob/src/main/resources/OSGI-INF/life-cycle-contrib.xml b/services/blob/3rdparty/nuxeo-platform-cs-blob/src/main/resources/OSGI-INF/life-cycle-contrib.xml index 332faee35..a24d7aa06 100644 --- a/services/blob/3rdparty/nuxeo-platform-cs-blob/src/main/resources/OSGI-INF/life-cycle-contrib.xml +++ b/services/blob/3rdparty/nuxeo-platform-cs-blob/src/main/resources/OSGI-INF/life-cycle-contrib.xml @@ -4,7 +4,7 @@ - cs_locking + ${Lifecycle} diff --git a/services/collectionobject/3rdparty/pom.xml b/services/collectionobject/3rdparty/pom.xml index 3586d1a09..5e142fa40 100644 --- a/services/collectionobject/3rdparty/pom.xml +++ b/services/collectionobject/3rdparty/pom.xml @@ -22,6 +22,7 @@ CollectionObject collectionobjects_common Tenant + cs_default 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 c52219206..36d8d555c 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 @@ -864,7 +864,8 @@ public class AuthorizationCommon { logger.debug(e.getLocalizedMessage(), e); //We end up here if there is no document handler for the service -this is ok for some of the services. } } else { - logger.warn("AuthZ refresh service binding property is set to FALSE so default roles and permissions will NOT be refreshed."); + logger.warn("AuthZ refresh service binding property is set to FALSE so default permissions will NOT be refreshed for: " + + serviceBinding.getName()); } } } diff --git a/services/concept/3rdparty/nuxeo-platform-cs-concept/pom.xml b/services/concept/3rdparty/nuxeo-platform-cs-concept/pom.xml index c18c7a968..02b157921 100644 --- a/services/concept/3rdparty/nuxeo-platform-cs-concept/pom.xml +++ b/services/concept/3rdparty/nuxeo-platform-cs-concept/pom.xml @@ -17,6 +17,12 @@ + + + src/main/resources + true + + org.apache.maven.plugins diff --git a/services/concept/3rdparty/nuxeo-platform-cs-concept/src/main/resources/OSGI-INF/life-cycle-contrib.xml b/services/concept/3rdparty/nuxeo-platform-cs-concept/src/main/resources/OSGI-INF/life-cycle-contrib.xml index fd34d27cb..caa57b261 100644 --- a/services/concept/3rdparty/nuxeo-platform-cs-concept/src/main/resources/OSGI-INF/life-cycle-contrib.xml +++ b/services/concept/3rdparty/nuxeo-platform-cs-concept/src/main/resources/OSGI-INF/life-cycle-contrib.xml @@ -4,8 +4,8 @@ - cs_default - cs_default + ${Lifecycle} + ${Lifecycle} diff --git a/services/contact/3rdparty/nuxeo-platform-cs-contact/pom.xml b/services/contact/3rdparty/nuxeo-platform-cs-contact/pom.xml index dbe06841f..3c10f9d99 100644 --- a/services/contact/3rdparty/nuxeo-platform-cs-contact/pom.xml +++ b/services/contact/3rdparty/nuxeo-platform-cs-contact/pom.xml @@ -17,6 +17,12 @@ + + + src/main/resources + true + + org.apache.maven.plugins diff --git a/services/contact/3rdparty/nuxeo-platform-cs-contact/src/main/resources/OSGI-INF/life-cycle-contrib.xml b/services/contact/3rdparty/nuxeo-platform-cs-contact/src/main/resources/OSGI-INF/life-cycle-contrib.xml index 2d7295c13..e38d14baa 100644 --- a/services/contact/3rdparty/nuxeo-platform-cs-contact/src/main/resources/OSGI-INF/life-cycle-contrib.xml +++ b/services/contact/3rdparty/nuxeo-platform-cs-contact/src/main/resources/OSGI-INF/life-cycle-contrib.xml @@ -4,7 +4,7 @@ - cs_default + ${Lifecycle} diff --git a/services/dimension/3rdparty/nuxeo-platform-cs-dimension/pom.xml b/services/dimension/3rdparty/nuxeo-platform-cs-dimension/pom.xml index 6ba8f2707..19925571f 100644 --- a/services/dimension/3rdparty/nuxeo-platform-cs-dimension/pom.xml +++ b/services/dimension/3rdparty/nuxeo-platform-cs-dimension/pom.xml @@ -20,6 +20,7 @@ dimension Dimension dimensions_common + cs_default diff --git a/services/group/3rdparty/nuxeo-platform-cs-group/pom.xml b/services/group/3rdparty/nuxeo-platform-cs-group/pom.xml index 7c073f5ef..f29efec07 100644 --- a/services/group/3rdparty/nuxeo-platform-cs-group/pom.xml +++ b/services/group/3rdparty/nuxeo-platform-cs-group/pom.xml @@ -18,6 +18,12 @@ + + + src/main/resources + true + + org.apache.maven.plugins diff --git a/services/group/3rdparty/nuxeo-platform-cs-group/src/main/resources/OSGI-INF/life-cycle-contrib.xml b/services/group/3rdparty/nuxeo-platform-cs-group/src/main/resources/OSGI-INF/life-cycle-contrib.xml index c03e3f621..8387bb161 100644 --- a/services/group/3rdparty/nuxeo-platform-cs-group/src/main/resources/OSGI-INF/life-cycle-contrib.xml +++ b/services/group/3rdparty/nuxeo-platform-cs-group/src/main/resources/OSGI-INF/life-cycle-contrib.xml @@ -4,7 +4,7 @@ - cs_default + ${Lifecycle} diff --git a/services/imports/3rdparty/nuxeo-platform-cs-imports/pom.xml b/services/imports/3rdparty/nuxeo-platform-cs-imports/pom.xml index 73092de59..12969b7c3 100644 --- a/services/imports/3rdparty/nuxeo-platform-cs-imports/pom.xml +++ b/services/imports/3rdparty/nuxeo-platform-cs-imports/pom.xml @@ -18,6 +18,12 @@ + + + src/main/resources + true + + org.apache.maven.plugins diff --git a/services/intake/3rdparty/nuxeo-platform-cs-intake/pom.xml b/services/intake/3rdparty/nuxeo-platform-cs-intake/pom.xml index fdc41aa9e..f5bcfcee8 100644 --- a/services/intake/3rdparty/nuxeo-platform-cs-intake/pom.xml +++ b/services/intake/3rdparty/nuxeo-platform-cs-intake/pom.xml @@ -22,6 +22,7 @@ intake Intake intakes_common + cs_default diff --git a/services/loanin/3rdparty/nuxeo-platform-cs-loanin/pom.xml b/services/loanin/3rdparty/nuxeo-platform-cs-loanin/pom.xml index 27b9b5d1d..ae50e0209 100644 --- a/services/loanin/3rdparty/nuxeo-platform-cs-loanin/pom.xml +++ b/services/loanin/3rdparty/nuxeo-platform-cs-loanin/pom.xml @@ -22,6 +22,7 @@ loanin Loanin loansin_common + cs_default diff --git a/services/loanout/3rdparty/nuxeo-platform-cs-loanout/pom.xml b/services/loanout/3rdparty/nuxeo-platform-cs-loanout/pom.xml index 5189d2dab..8fef3e4cb 100644 --- a/services/loanout/3rdparty/nuxeo-platform-cs-loanout/pom.xml +++ b/services/loanout/3rdparty/nuxeo-platform-cs-loanout/pom.xml @@ -22,6 +22,7 @@ loanout Loanout loansout_common + cs_default diff --git a/services/location/3rdparty/nuxeo-platform-cs-location/pom.xml b/services/location/3rdparty/nuxeo-platform-cs-location/pom.xml index bd8303805..3f432a85e 100644 --- a/services/location/3rdparty/nuxeo-platform-cs-location/pom.xml +++ b/services/location/3rdparty/nuxeo-platform-cs-location/pom.xml @@ -17,13 +17,19 @@ + + + src/main/resources + true + + org.apache.maven.plugins maven-jar-plugin - src/main/resources/META-INF/MANIFEST.MF + src/main/resources/META-INF/MANIFEST.MF ${eclipseVersion} 2 diff --git a/services/location/3rdparty/nuxeo-platform-cs-location/src/main/resources/OSGI-INF/life-cycle-contrib.xml b/services/location/3rdparty/nuxeo-platform-cs-location/src/main/resources/OSGI-INF/life-cycle-contrib.xml index c25c48eb4..fb5788fed 100644 --- a/services/location/3rdparty/nuxeo-platform-cs-location/src/main/resources/OSGI-INF/life-cycle-contrib.xml +++ b/services/location/3rdparty/nuxeo-platform-cs-location/src/main/resources/OSGI-INF/life-cycle-contrib.xml @@ -4,8 +4,8 @@ - cs_default - cs_locking + ${Lifecycle} + ${Lifecycle} diff --git a/services/media/3rdparty/nuxeo-platform-cs-media/pom.xml b/services/media/3rdparty/nuxeo-platform-cs-media/pom.xml index 3ef7ef522..dc40b5eee 100644 --- a/services/media/3rdparty/nuxeo-platform-cs-media/pom.xml +++ b/services/media/3rdparty/nuxeo-platform-cs-media/pom.xml @@ -22,6 +22,7 @@ media Media media_common + cs_default diff --git a/services/movement/3rdparty/nuxeo-platform-cs-movement/pom.xml b/services/movement/3rdparty/nuxeo-platform-cs-movement/pom.xml index 0fceb5f5a..527d00e88 100644 --- a/services/movement/3rdparty/nuxeo-platform-cs-movement/pom.xml +++ b/services/movement/3rdparty/nuxeo-platform-cs-movement/pom.xml @@ -9,7 +9,6 @@ 4.0.0 - org.collectionspace.services org.collectionspace.services.movement.3rdparty.nuxeo services.movement.3rdparty.nuxeo jar @@ -21,6 +20,7 @@ movement Movement movements_common + cs_locking diff --git a/services/note/3rdparty/nuxeo-platform-cs-note/pom.xml b/services/note/3rdparty/nuxeo-platform-cs-note/pom.xml index 6d4621d33..38ce8f76b 100644 --- a/services/note/3rdparty/nuxeo-platform-cs-note/pom.xml +++ b/services/note/3rdparty/nuxeo-platform-cs-note/pom.xml @@ -17,6 +17,12 @@ + + + src/main/resources + true + + org.apache.maven.plugins diff --git a/services/note/3rdparty/nuxeo-platform-cs-note/src/main/resources/OSGI-INF/life-cycle-contrib.xml b/services/note/3rdparty/nuxeo-platform-cs-note/src/main/resources/OSGI-INF/life-cycle-contrib.xml index f13ab2d2d..8b07f9c93 100644 --- a/services/note/3rdparty/nuxeo-platform-cs-note/src/main/resources/OSGI-INF/life-cycle-contrib.xml +++ b/services/note/3rdparty/nuxeo-platform-cs-note/src/main/resources/OSGI-INF/life-cycle-contrib.xml @@ -4,7 +4,7 @@ - cs_default + ${Lifecycle} diff --git a/services/objectexit/3rdparty/nuxeo-platform-cs-objectexit/pom.xml b/services/objectexit/3rdparty/nuxeo-platform-cs-objectexit/pom.xml index 5631df821..5f86544ae 100644 --- a/services/objectexit/3rdparty/nuxeo-platform-cs-objectexit/pom.xml +++ b/services/objectexit/3rdparty/nuxeo-platform-cs-objectexit/pom.xml @@ -18,6 +18,12 @@ + + + src/main/resources + true + + org.apache.maven.plugins diff --git a/services/objectexit/3rdparty/nuxeo-platform-cs-objectexit/src/main/resources/OSGI-INF/life-cycle-contrib.xml b/services/objectexit/3rdparty/nuxeo-platform-cs-objectexit/src/main/resources/OSGI-INF/life-cycle-contrib.xml index 5a6a1152b..70bde6909 100644 --- a/services/objectexit/3rdparty/nuxeo-platform-cs-objectexit/src/main/resources/OSGI-INF/life-cycle-contrib.xml +++ b/services/objectexit/3rdparty/nuxeo-platform-cs-objectexit/src/main/resources/OSGI-INF/life-cycle-contrib.xml @@ -4,7 +4,7 @@ - cs_default + ${Lifecycle} diff --git a/services/organization/3rdparty/nuxeo-platform-cs-organization/pom.xml b/services/organization/3rdparty/nuxeo-platform-cs-organization/pom.xml index 37bd71dd1..38c5321d0 100644 --- a/services/organization/3rdparty/nuxeo-platform-cs-organization/pom.xml +++ b/services/organization/3rdparty/nuxeo-platform-cs-organization/pom.xml @@ -17,6 +17,12 @@ + + + src/main/resources + true + + org.apache.maven.plugins diff --git a/services/organization/3rdparty/nuxeo-platform-cs-organization/src/main/resources/OSGI-INF/life-cycle-contrib.xml b/services/organization/3rdparty/nuxeo-platform-cs-organization/src/main/resources/OSGI-INF/life-cycle-contrib.xml index 7af31c851..436fecc5e 100644 --- a/services/organization/3rdparty/nuxeo-platform-cs-organization/src/main/resources/OSGI-INF/life-cycle-contrib.xml +++ b/services/organization/3rdparty/nuxeo-platform-cs-organization/src/main/resources/OSGI-INF/life-cycle-contrib.xml @@ -4,8 +4,8 @@ - cs_default - cs_default + ${Lifecycle} + ${Lifecycle} diff --git a/services/person/3rdparty/nuxeo-platform-cs-person/pom.xml b/services/person/3rdparty/nuxeo-platform-cs-person/pom.xml index be2ea9387..e46845de5 100644 --- a/services/person/3rdparty/nuxeo-platform-cs-person/pom.xml +++ b/services/person/3rdparty/nuxeo-platform-cs-person/pom.xml @@ -17,6 +17,12 @@ + + + src/main/resources + true + + org.apache.maven.plugins diff --git a/services/person/3rdparty/nuxeo-platform-cs-person/src/main/resources/OSGI-INF/life-cycle-contrib.xml b/services/person/3rdparty/nuxeo-platform-cs-person/src/main/resources/OSGI-INF/life-cycle-contrib.xml index c93e93b58..3c561f962 100644 --- a/services/person/3rdparty/nuxeo-platform-cs-person/src/main/resources/OSGI-INF/life-cycle-contrib.xml +++ b/services/person/3rdparty/nuxeo-platform-cs-person/src/main/resources/OSGI-INF/life-cycle-contrib.xml @@ -4,8 +4,8 @@ - cs_default - cs_default + ${Lifecycle} + ${Lifecycle} diff --git a/services/person/3rdparty/nuxeo-platform-person-lifesci/src/main/resources/OSGI-INF/life-cycle-contrib.xml b/services/person/3rdparty/nuxeo-platform-person-lifesci/src/main/resources/OSGI-INF/life-cycle-contrib.xml index 0ae251640..e0b5d125b 100644 --- a/services/person/3rdparty/nuxeo-platform-person-lifesci/src/main/resources/OSGI-INF/life-cycle-contrib.xml +++ b/services/person/3rdparty/nuxeo-platform-person-lifesci/src/main/resources/OSGI-INF/life-cycle-contrib.xml @@ -4,7 +4,7 @@ - cs_default + ${Lifecycle} diff --git a/services/place/3rdparty/nuxeo-platform-cs-place/pom.xml b/services/place/3rdparty/nuxeo-platform-cs-place/pom.xml index f3daccadf..ea53b30de 100644 --- a/services/place/3rdparty/nuxeo-platform-cs-place/pom.xml +++ b/services/place/3rdparty/nuxeo-platform-cs-place/pom.xml @@ -17,6 +17,12 @@ + + + src/main/resources + true + + org.apache.maven.plugins diff --git a/services/place/3rdparty/nuxeo-platform-cs-place/src/main/resources/OSGI-INF/life-cycle-contrib.xml b/services/place/3rdparty/nuxeo-platform-cs-place/src/main/resources/OSGI-INF/life-cycle-contrib.xml index 3269c9c42..3a8c0ab34 100644 --- a/services/place/3rdparty/nuxeo-platform-cs-place/src/main/resources/OSGI-INF/life-cycle-contrib.xml +++ b/services/place/3rdparty/nuxeo-platform-cs-place/src/main/resources/OSGI-INF/life-cycle-contrib.xml @@ -4,8 +4,8 @@ - cs_default - cs_default + ${Lifecycle} + ${Lifecycle} diff --git a/services/pom.xml b/services/pom.xml index d04d5caec..0baa788f7 100644 --- a/services/pom.xml +++ b/services/pom.xml @@ -18,6 +18,8 @@ 2.2.4-1 5.1.8 8.4-702.jdbc4 + + cs_default