CSPACE-4966: Adding a more general build mechanism for services to declare their...

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 3cb6b1008e25e52831aafeaf268978f4fa296896..42bdbfac9b9afbd4b30af338545a65fba6062759 100644 (file)
--- 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 @@
 
   <extension target="org.nuxeo.ecm.core.lifecycle.LifeCycleService" point="types">
     <types>
-      <type name="${NuxeoDocTypeName}${TenantPrefix}${TenantId}">cs_default</type>
+      <type name="${NuxeoDocTypeName}${TenantPrefix}${TenantId}">${Lifecycle}</type>
     </types>
   </extension>
 

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 908b68716a9f5f1e82555e670b1ed901674ee76f..6701a996979369f90164d2c849a619471410e5e1 100644 (file)
--- 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 @@
   <extension target="org.nuxeo.ecm.core.lifecycle.LifeCycleService"
              point="types">
     <types>
-      <type name="${NuxeoDocTypeName}">cs_default</type>
+      <type name="${NuxeoDocTypeName}">${Lifecycle}</type>
     </types>
   </extension>
 

diff --git a/3rdparty/nuxeo/nuxeo-platform-quote-api/pom.xml b/3rdparty/nuxeo/nuxeo-platform-quote-api/pom.xml
index 21e2433d845b5ca159ffe4a18aae3f0f7ffd410d..618e7148d8561bc308ab02fc9aace996966814ba 100644 (file)
--- a/3rdparty/nuxeo/nuxeo-platform-quote-api/pom.xml
+++ b/3rdparty/nuxeo/nuxeo-platform-quote-api/pom.xml
@@ -24,6 +24,12 @@
        </dependencies>\r
 \r
     <build>\r
+               <resources>\r
+            <resource>\r
+                <directory>src/main/resources</directory>\r
+                <filtering>true</filtering>\r
+            </resource>\r
+               </resources>\r
         <plugins>\r
             <plugin>\r
                 <groupId>org.apache.maven.plugins</groupId>\r

diff --git a/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/pom.xml b/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/pom.xml
index 1795ebcf251bc0d1b28e7023c8072c8ca8e0274b..2b12239f5c3da15c5b337f7b6a0d276034e000fa 100644 (file)
--- a/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/pom.xml
+++ b/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/pom.xml
@@ -18,6 +18,7 @@
         <ServiceName>acquisition</ServiceName>
         <NuxeoDocTypeName>Acquisition</NuxeoDocTypeName>
         <CommonSchemaName>acquisitions_common</CommonSchemaName>
+               <Lifecycle>cs_default</Lifecycle>
     </properties>
 
     <build>

diff --git a/services/batch/3rdparty/nuxeo-platform-cs-batch/pom.xml b/services/batch/3rdparty/nuxeo-platform-cs-batch/pom.xml
index b8356a0314a81f19f1801a34a2924db73a7e9eae..82052d59717037560be240cd270bca0351993c50 100644 (file)
--- a/services/batch/3rdparty/nuxeo-platform-cs-batch/pom.xml
+++ b/services/batch/3rdparty/nuxeo-platform-cs-batch/pom.xml
@@ -18,6 +18,12 @@
     </description>
 
     <build>
+               <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+               </resources>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>

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 c5eae68e625927c6acfd93bf08694a181a8eedf5..4c2f4af5cf17695542fcba6fe5d8c71fc6d1cb82 100644 (file)
--- 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 @@
   <extension target="org.nuxeo.ecm.core.lifecycle.LifeCycleService"
              point="types">
     <types>
-      <type name="Batch">cs_default</type>
+      <type name="Batch">${Lifecycle}</type>
     </types>
   </extension>
 

diff --git a/services/blob/3rdparty/nuxeo-platform-cs-blob/pom.xml b/services/blob/3rdparty/nuxeo-platform-cs-blob/pom.xml
index 2d307c7d43c1ee26f28a6d030b5bc81ef27073e6..a6552be27eac0c34ba6687aed36dde83d544936e 100644 (file)
--- a/services/blob/3rdparty/nuxeo-platform-cs-blob/pom.xml
+++ b/services/blob/3rdparty/nuxeo-platform-cs-blob/pom.xml
@@ -17,6 +17,12 @@
     </description>
 
     <build>
+               <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+               </resources>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>

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 332faee358c59de8c215a9505fdbce5fefc6a7fc..a24d7aa064471ff1e6130250e4fbe38c70a0afb1 100644 (file)
--- 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 @@
   <extension target="org.nuxeo.ecm.core.lifecycle.LifeCycleService"
              point="types">
     <types>
-      <type name="Blob">cs_locking</type>
+      <type name="Blob">${Lifecycle}</type>
     </types>
   </extension>
 

diff --git a/services/collectionobject/3rdparty/pom.xml b/services/collectionobject/3rdparty/pom.xml
index 3586d1a09df04a471132bff0b42b1be6ef58f65b..5e142fa40c7a17c26bdd1ceeceec601dde542a30 100644 (file)
--- a/services/collectionobject/3rdparty/pom.xml
+++ b/services/collectionobject/3rdparty/pom.xml
@@ -22,6 +22,7 @@
                <NuxeoDocTypeName>CollectionObject</NuxeoDocTypeName>   \r
                <CommonSchemaName>collectionobjects_common</CommonSchemaName>\r
                <TenantPrefix>Tenant</TenantPrefix>\r
+               <Lifecycle>cs_default</Lifecycle>\r
        </properties>\r
        \r
     <modules>\r

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 c5221920695a390866c3cff97cb733f67311ddd5..36d8d555c99df65d318939e0cbf5338a9af41dd0 100644 (file)
--- 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.\r
                                        }\r
                                } else {\r
-                                       logger.warn("AuthZ refresh service binding property is set to FALSE so default roles and permissions will NOT be refreshed.");\r
+                                       logger.warn("AuthZ refresh service binding property is set to FALSE so default permissions will NOT be refreshed for: "\r
+                                                       + serviceBinding.getName());\r
                                }\r
                        }\r
                }\r

diff --git a/services/concept/3rdparty/nuxeo-platform-cs-concept/pom.xml b/services/concept/3rdparty/nuxeo-platform-cs-concept/pom.xml
index c18c7a968697e1358cdc4333b00fff50164a9816..02b1579218728b4db6d2fbc926f6e05714178223 100644 (file)
--- a/services/concept/3rdparty/nuxeo-platform-cs-concept/pom.xml
+++ b/services/concept/3rdparty/nuxeo-platform-cs-concept/pom.xml
@@ -17,6 +17,12 @@
     </description>
     
     <build>
+               <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+               </resources>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>

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 fd34d27cbaaaf3dad8fc12961f38e4d35b470893..caa57b2616995a3945d09ac7911734b6e45f62d5 100644 (file)
--- 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 @@
   <extension target="org.nuxeo.ecm.core.lifecycle.LifeCycleService"
              point="types">
     <types>
-      <type name="Conceptauthority">cs_default</type>
-      <type name="Conceptitem">cs_default</type>
+      <type name="Conceptauthority">${Lifecycle}</type>
+      <type name="Conceptitem">${Lifecycle}</type>
     </types>
   </extension>
 

diff --git a/services/contact/3rdparty/nuxeo-platform-cs-contact/pom.xml b/services/contact/3rdparty/nuxeo-platform-cs-contact/pom.xml
index dbe06841f9d4bd6cf07a437a43176e06018ab786..3c10f9d9986ba61b48cd827026e49770c5d16ca0 100644 (file)
--- a/services/contact/3rdparty/nuxeo-platform-cs-contact/pom.xml
+++ b/services/contact/3rdparty/nuxeo-platform-cs-contact/pom.xml
@@ -17,6 +17,12 @@
     </description>
     
     <build>
+               <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+               </resources>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>

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 2d7295c136232948d5dfb62de831404605694b36..e38d14baaf4d1c25a497d5f8aa7d441752d113e7 100644 (file)
--- 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 @@
   <extension target="org.nuxeo.ecm.core.lifecycle.LifeCycleService"
              point="types">
     <types>
-      <type name="Contact">cs_default</type>
+      <type name="Contact">${Lifecycle}</type>
     </types>
   </extension>
 

diff --git a/services/dimension/3rdparty/nuxeo-platform-cs-dimension/pom.xml b/services/dimension/3rdparty/nuxeo-platform-cs-dimension/pom.xml
index 6ba8f27078a665f1732ff31d95fb76193c18f799..19925571f2a7f4e22a8917549f49da835ed73149 100644 (file)
--- a/services/dimension/3rdparty/nuxeo-platform-cs-dimension/pom.xml
+++ b/services/dimension/3rdparty/nuxeo-platform-cs-dimension/pom.xml
@@ -20,6 +20,7 @@
                <ServiceName>dimension</ServiceName>
                <NuxeoDocTypeName>Dimension</NuxeoDocTypeName>
                <CommonSchemaName>dimensions_common</CommonSchemaName>
+               <Lifecycle>cs_default</Lifecycle>
        </properties>
     
     <build>

diff --git a/services/group/3rdparty/nuxeo-platform-cs-group/pom.xml b/services/group/3rdparty/nuxeo-platform-cs-group/pom.xml
index 7c073f5ef21dcd7acda8e38d63b1713aa7cefcba..f29efec0701ad8436fb91389c6529f54fc49e6ff 100644 (file)
--- a/services/group/3rdparty/nuxeo-platform-cs-group/pom.xml
+++ b/services/group/3rdparty/nuxeo-platform-cs-group/pom.xml
@@ -18,6 +18,12 @@
     </description>
 
     <build>
+               <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+               </resources>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>

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 c03e3f62113d4ecd60c0b01d8403cbc7b4abf6aa..8387bb161ac97d9942298dc5feba3619e9a306af 100644 (file)
--- 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 @@
   <extension target="org.nuxeo.ecm.core.lifecycle.LifeCycleService"
              point="types">
     <types>
-      <type name="Group">cs_default</type>
+      <type name="Group">${Lifecycle}</type>
     </types>
   </extension>
 

diff --git a/services/imports/3rdparty/nuxeo-platform-cs-imports/pom.xml b/services/imports/3rdparty/nuxeo-platform-cs-imports/pom.xml
index 73092de592a3720ea1c7bf0a99271ee1c95fe714..12969b7c3c9c02045131b7a2ebdd91362726011f 100644 (file)
--- a/services/imports/3rdparty/nuxeo-platform-cs-imports/pom.xml
+++ b/services/imports/3rdparty/nuxeo-platform-cs-imports/pom.xml
@@ -18,6 +18,12 @@
     </description>
 
     <build>
+               <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+               </resources>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>

diff --git a/services/intake/3rdparty/nuxeo-platform-cs-intake/pom.xml b/services/intake/3rdparty/nuxeo-platform-cs-intake/pom.xml
index fdc41aa9edebb8d693b66047e83ed7364f236259..f5bcfcee8bdddc3aecc1920132ed21edf5214c8e 100644 (file)
--- a/services/intake/3rdparty/nuxeo-platform-cs-intake/pom.xml
+++ b/services/intake/3rdparty/nuxeo-platform-cs-intake/pom.xml
@@ -22,6 +22,7 @@
         <ServiceName>intake</ServiceName>
         <NuxeoDocTypeName>Intake</NuxeoDocTypeName>
         <CommonSchemaName>intakes_common</CommonSchemaName>
+               <Lifecycle>cs_default</Lifecycle>
     </properties>
     
     <build>

diff --git a/services/loanin/3rdparty/nuxeo-platform-cs-loanin/pom.xml b/services/loanin/3rdparty/nuxeo-platform-cs-loanin/pom.xml
index 27b9b5d1de8b56d13f498abfb492b346be86aae5..ae50e0209652c48e621e30605b5334d61ea63cfb 100644 (file)
--- a/services/loanin/3rdparty/nuxeo-platform-cs-loanin/pom.xml
+++ b/services/loanin/3rdparty/nuxeo-platform-cs-loanin/pom.xml
@@ -22,6 +22,7 @@
         <ServiceName>loanin</ServiceName>
         <NuxeoDocTypeName>Loanin</NuxeoDocTypeName>
         <CommonSchemaName>loansin_common</CommonSchemaName>
+               <Lifecycle>cs_default</Lifecycle>
     </properties>
 
     <build>

diff --git a/services/loanout/3rdparty/nuxeo-platform-cs-loanout/pom.xml b/services/loanout/3rdparty/nuxeo-platform-cs-loanout/pom.xml
index 5189d2dabf19258a90794b433dcb005202070dc9..8fef3e4cb19abe13fe9fea48de8701aeebbf94d2 100644 (file)
--- a/services/loanout/3rdparty/nuxeo-platform-cs-loanout/pom.xml
+++ b/services/loanout/3rdparty/nuxeo-platform-cs-loanout/pom.xml
@@ -22,6 +22,7 @@
         <ServiceName>loanout</ServiceName>
         <NuxeoDocTypeName>Loanout</NuxeoDocTypeName>
         <CommonSchemaName>loansout_common</CommonSchemaName>
+               <Lifecycle>cs_default</Lifecycle>
     </properties>
 
     <build>

diff --git a/services/location/3rdparty/nuxeo-platform-cs-location/pom.xml b/services/location/3rdparty/nuxeo-platform-cs-location/pom.xml
index bd8303805e34bfaa83b8204a90697daa9291c567..3f432a85ea11d21cae8807915dd3d2b97e0e1010 100644 (file)
--- a/services/location/3rdparty/nuxeo-platform-cs-location/pom.xml
+++ b/services/location/3rdparty/nuxeo-platform-cs-location/pom.xml
@@ -17,13 +17,19 @@
     </description>
     
     <build>
+                <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+               </resources>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
                 <configuration>
                     <archive>
-                        <manifestFile> src/main/resources/META-INF/MANIFEST.MF </manifestFile>
+                        <manifestFile>src/main/resources/META-INF/MANIFEST.MF </manifestFile>
                         <manifestEntries>
                             <Bundle-Version>${eclipseVersion}</Bundle-Version>
                             <Bundle-ManifestVersion>2</Bundle-ManifestVersion>

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 c25c48eb41536eabd082a40e93201489531d9ffc..fb5788fedc1af05d114153f60de104dd30320a3f 100644 (file)
--- 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 @@
   <extension target="org.nuxeo.ecm.core.lifecycle.LifeCycleService"
              point="types">
     <types>
-      <type name="Locationauthority">cs_default</type>
-      <type name="Locationitem">cs_locking</type>
+      <type name="Locationauthority">${Lifecycle}</type>
+      <type name="Locationitem">${Lifecycle}</type>
     </types>
   </extension>
 

diff --git a/services/media/3rdparty/nuxeo-platform-cs-media/pom.xml b/services/media/3rdparty/nuxeo-platform-cs-media/pom.xml
index 3ef7ef522d3d8d57a630459a8075c7869054d78c..dc40b5eee0bcbaf65fe77ba7e27b11fc73fb2239 100644 (file)
--- a/services/media/3rdparty/nuxeo-platform-cs-media/pom.xml
+++ b/services/media/3rdparty/nuxeo-platform-cs-media/pom.xml
@@ -22,6 +22,7 @@
         <ServiceName>media</ServiceName>
         <NuxeoDocTypeName>Media</NuxeoDocTypeName>
         <CommonSchemaName>media_common</CommonSchemaName>
+               <Lifecycle>cs_default</Lifecycle>
     </properties>
     
     <build>

diff --git a/services/movement/3rdparty/nuxeo-platform-cs-movement/pom.xml b/services/movement/3rdparty/nuxeo-platform-cs-movement/pom.xml
index 0fceb5f5a8867a02cf74efaff3ac4033c6bf7ea0..527d00e881fad6fd83e2742953a57b065df7280a 100644 (file)
--- a/services/movement/3rdparty/nuxeo-platform-cs-movement/pom.xml
+++ b/services/movement/3rdparty/nuxeo-platform-cs-movement/pom.xml
@@ -9,7 +9,6 @@
     </parent>
     
     <modelVersion>4.0.0</modelVersion>
-    <groupId>org.collectionspace.services</groupId>
     <artifactId>org.collectionspace.services.movement.3rdparty.nuxeo</artifactId>
     <name>services.movement.3rdparty.nuxeo</name>
     <packaging>jar</packaging>
@@ -21,6 +20,7 @@
         <ServiceName>movement</ServiceName>
         <NuxeoDocTypeName>Movement</NuxeoDocTypeName>
         <CommonSchemaName>movements_common</CommonSchemaName>
+               <Lifecycle>cs_locking</Lifecycle>
     </properties>
 
     <build>

diff --git a/services/note/3rdparty/nuxeo-platform-cs-note/pom.xml b/services/note/3rdparty/nuxeo-platform-cs-note/pom.xml
index 6d4621d330acd62be36b8107c49cc5becff05108..38ce8f76bfe50ac74bffe69455f67e619b987bb0 100644 (file)
--- a/services/note/3rdparty/nuxeo-platform-cs-note/pom.xml
+++ b/services/note/3rdparty/nuxeo-platform-cs-note/pom.xml
@@ -17,6 +17,12 @@
     </description>\r
     \r
     <build>\r
+               <resources>\r
+            <resource>\r
+                <directory>src/main/resources</directory>\r
+                <filtering>true</filtering>\r
+            </resource>\r
+               </resources>\r
         <plugins>\r
             <plugin>\r
                 <groupId>org.apache.maven.plugins</groupId>\r

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 f13ab2d2de2f035a539618a3dcf60442f6345126..8b07f9c93411413f765ee1a9314805a0a2bd4095 100644 (file)
--- 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 @@
   <extension target="org.nuxeo.ecm.core.lifecycle.LifeCycleService"
              point="types">
     <types>
-      <type name="CSNote">cs_default</type>
+      <type name="CSNote">${Lifecycle}</type>
     </types>
   </extension>
 

diff --git a/services/objectexit/3rdparty/nuxeo-platform-cs-objectexit/pom.xml b/services/objectexit/3rdparty/nuxeo-platform-cs-objectexit/pom.xml
index 5631df821c1ce822428b80e8372829c42599a78b..5f86544ae60209a02b248b5df5720fc797f4651b 100644 (file)
--- a/services/objectexit/3rdparty/nuxeo-platform-cs-objectexit/pom.xml
+++ b/services/objectexit/3rdparty/nuxeo-platform-cs-objectexit/pom.xml
@@ -18,6 +18,12 @@
     </description>
 
     <build>
+               <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+               </resources>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>

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 5a6a1152bba0ddee61b7a188184e1cc8d6603ce6..70bde69093e18b32b0ba1fad5185dfb38158c899 100644 (file)
--- 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 @@
   <extension target="org.nuxeo.ecm.core.lifecycle.LifeCycleService"
              point="types">
     <types>
-      <type name="ObjectExit">cs_default</type>
+      <type name="ObjectExit">${Lifecycle}</type>
     </types>
   </extension>
 

diff --git a/services/organization/3rdparty/nuxeo-platform-cs-organization/pom.xml b/services/organization/3rdparty/nuxeo-platform-cs-organization/pom.xml
index 37bd71dd1d4b03bb0de5378a9b5e3bc405b6325f..38c5321d0bdaeaa0bcb7d2451d9e7838a0fa428d 100644 (file)
--- a/services/organization/3rdparty/nuxeo-platform-cs-organization/pom.xml
+++ b/services/organization/3rdparty/nuxeo-platform-cs-organization/pom.xml
@@ -17,6 +17,12 @@
     </description>
     
     <build>
+               <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+               </resources>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>

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 7af31c8513013077fe4bb62f422fe65c4a65c5a0..436fecc5e215f9c4a326727a95b30f42f06a31d2 100644 (file)
--- 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 @@
   <extension target="org.nuxeo.ecm.core.lifecycle.LifeCycleService"
              point="types">
     <types>
-      <type name="Orgauthority">cs_default</type>
-      <type name="Organization">cs_default</type>
+      <type name="Orgauthority">${Lifecycle}</type>
+      <type name="Organization">${Lifecycle}</type>
     </types>
   </extension>
 

diff --git a/services/person/3rdparty/nuxeo-platform-cs-person/pom.xml b/services/person/3rdparty/nuxeo-platform-cs-person/pom.xml
index be2ea9387afe89fc79d4771baefcd1ce9acd2419..e46845de5e0114d075cde04847456bbc7030a5ba 100644 (file)
--- a/services/person/3rdparty/nuxeo-platform-cs-person/pom.xml
+++ b/services/person/3rdparty/nuxeo-platform-cs-person/pom.xml
@@ -17,6 +17,12 @@
     </description>
     
     <build>
+               <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+               </resources>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>

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 c93e93b58340941d815fa5446522f6254b5d24e9..3c561f96220ef53cc6f939283b120abedc9b11c7 100644 (file)
--- 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 @@
   <extension target="org.nuxeo.ecm.core.lifecycle.LifeCycleService"
              point="types">
     <types>
-      <type name="Personauthority">cs_default</type>
-      <type name="Person">cs_default</type>
+      <type name="Personauthority">${Lifecycle}</type>
+      <type name="Person">${Lifecycle}</type>
     </types>
   </extension>
 

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 0ae251640c0b4e14568071edc6402b2cb461df7b..e0b5d125bd406ffa8e5d4c279fa60106a35c0655 100644 (file)
--- 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 @@
   <extension target="org.nuxeo.ecm.core.lifecycle.LifeCycleService"
              point="types">
     <types>
-      <type name="PersonTenant2">cs_default</type>
+      <type name="PersonTenant2">${Lifecycle}</type>
     </types>
   </extension>
 

diff --git a/services/place/3rdparty/nuxeo-platform-cs-place/pom.xml b/services/place/3rdparty/nuxeo-platform-cs-place/pom.xml
index f3daccadf1d8583c0812d904f42c0b75fdf3497f..ea53b30deacbee89ae4f18863d922c719aa49f05 100644 (file)
--- a/services/place/3rdparty/nuxeo-platform-cs-place/pom.xml
+++ b/services/place/3rdparty/nuxeo-platform-cs-place/pom.xml
@@ -17,6 +17,12 @@
     </description>
     
     <build>
+               <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+               </resources>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>

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 3269c9c4279e3919b68efc8bb67423764c1d1f11..3a8c0ab34006aa2b6945798fd3cd49553c98f994 100644 (file)
--- 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 @@
   <extension target="org.nuxeo.ecm.core.lifecycle.LifeCycleService"
              point="types">
     <types>
-      <type name="Placeauthority">cs_default</type>
-      <type name="Placeitem">cs_default</type>
+      <type name="Placeauthority">${Lifecycle}</type>
+      <type name="Placeitem">${Lifecycle}</type>
     </types>
   </extension>
 

diff --git a/services/pom.xml b/services/pom.xml
index d04d5caec4cc6eb67d9d41ac5c3c7e4eb54d3c6c..0baa788f7aa67bb27d12917e6e720b2a759faa8b 100644 (file)
--- a/services/pom.xml
+++ b/services/pom.xml
@@ -18,6 +18,8 @@
                <jaxb.version>2.2.4-1</jaxb.version>
                <mysql.driver.version>5.1.8</mysql.driver.version>
                <postgres.driver.version>8.4-702.jdbc4</postgres.driver.version>
+               <!-- The default life cycle policy for Nuxeo document types -->
+               <Lifecycle>cs_default</Lifecycle>
        </properties>
 
     <!--

diff --git a/services/relation/3rdparty/nuxeo-platform-cs-relation/pom.xml b/services/relation/3rdparty/nuxeo-platform-cs-relation/pom.xml
index ceece479fa666fc8c1f2ed382306dfe450bb2a28..f4619d61faccfec06031377e75bf4470b55fc9fe 100644 (file)
--- a/services/relation/3rdparty/nuxeo-platform-cs-relation/pom.xml
+++ b/services/relation/3rdparty/nuxeo-platform-cs-relation/pom.xml
@@ -17,6 +17,12 @@
   </description>\r
 \r
   <build>\r
+       <resources>\r
+            <resource>\r
+                <directory>src/main/resources</directory>\r
+                <filtering>true</filtering>\r
+            </resource>\r
+               </resources>\r
     <plugins>\r
       <plugin>\r
         <groupId>org.apache.maven.plugins</groupId>\r

diff --git a/services/relation/3rdparty/nuxeo-platform-cs-relation/src/main/resources/OSGI-INF/life-cycle-contrib.xml b/services/relation/3rdparty/nuxeo-platform-cs-relation/src/main/resources/OSGI-INF/life-cycle-contrib.xml
index 42f109f4d1822e5f4f7eed6897f6b9805542765b..7e5915cab34f769f2489870789a90b5c57ab1b5e 100644 (file)
--- a/services/relation/3rdparty/nuxeo-platform-cs-relation/src/main/resources/OSGI-INF/life-cycle-contrib.xml
+++ b/services/relation/3rdparty/nuxeo-platform-cs-relation/src/main/resources/OSGI-INF/life-cycle-contrib.xml
@@ -4,7 +4,7 @@
   <extension target="org.nuxeo.ecm.core.lifecycle.LifeCycleService"
              point="types">
     <types>
-      <type name="Relation">cs_default</type>
+      <type name="Relation">${Lifecycle}</type>
     </types>
   </extension>
 

diff --git a/services/report/3rdparty/nuxeo-platform-cs-report/pom.xml b/services/report/3rdparty/nuxeo-platform-cs-report/pom.xml
index e422d738dc4df2c74b6b383706c73bae4373e692..040d670e50667e946081680d27c8ce50eabb56a9 100644 (file)
--- a/services/report/3rdparty/nuxeo-platform-cs-report/pom.xml
+++ b/services/report/3rdparty/nuxeo-platform-cs-report/pom.xml
@@ -18,6 +18,12 @@
     </description>
 
     <build>
+               <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+               </resources>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>

diff --git a/services/report/3rdparty/nuxeo-platform-cs-report/src/main/resources/OSGI-INF/life-cycle-contrib.xml b/services/report/3rdparty/nuxeo-platform-cs-report/src/main/resources/OSGI-INF/life-cycle-contrib.xml
index 433bea17a70100ccbaf54650dfd78ad6d9ec6427..b9fb59ce4973cd6505eb2ff316336120dac2cc55 100644 (file)
--- a/services/report/3rdparty/nuxeo-platform-cs-report/src/main/resources/OSGI-INF/life-cycle-contrib.xml
+++ b/services/report/3rdparty/nuxeo-platform-cs-report/src/main/resources/OSGI-INF/life-cycle-contrib.xml
@@ -4,7 +4,7 @@
   <extension target="org.nuxeo.ecm.core.lifecycle.LifeCycleService"
              point="types">
     <types>
-      <type name="Report">cs_default</type>
+      <type name="Report">${Lifecycle}</type>
     </types>
   </extension>
 

diff --git a/services/taxonomy/3rdparty/nuxeo-platform-cs-taxonomy/pom.xml b/services/taxonomy/3rdparty/nuxeo-platform-cs-taxonomy/pom.xml
index 321e218fd0f92202fcc3d64202013a070090d819..b9c16a45916db9a8ef1049f2d997361c8d3af1c5 100644 (file)
--- a/services/taxonomy/3rdparty/nuxeo-platform-cs-taxonomy/pom.xml
+++ b/services/taxonomy/3rdparty/nuxeo-platform-cs-taxonomy/pom.xml
@@ -17,6 +17,12 @@
     </description>
     
     <build>
+               <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+               </resources>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>

diff --git a/services/taxonomy/3rdparty/nuxeo-platform-cs-taxonomy/src/main/resources/OSGI-INF/life-cycle-contrib.xml b/services/taxonomy/3rdparty/nuxeo-platform-cs-taxonomy/src/main/resources/OSGI-INF/life-cycle-contrib.xml
index 169467a27fec9f58a702f0db6bd2b6682a96cb3c..d6b94aaefac3d3f30bfd8f1057edab14669f353b 100644 (file)
--- a/services/taxonomy/3rdparty/nuxeo-platform-cs-taxonomy/src/main/resources/OSGI-INF/life-cycle-contrib.xml
+++ b/services/taxonomy/3rdparty/nuxeo-platform-cs-taxonomy/src/main/resources/OSGI-INF/life-cycle-contrib.xml
@@ -4,8 +4,8 @@
   <extension target="org.nuxeo.ecm.core.lifecycle.LifeCycleService"
              point="types">
     <types>
-      <type name="Taxonomyauthority">cs_default</type>
-      <type name="Taxon">cs_default</type>
+      <type name="Taxonomyauthority">${Lifecycle}</type>
+      <type name="Taxon">${Lifecycle}</type>
     </types>
   </extension>
 

diff --git a/services/vocabulary/3rdparty/nuxeo-platform-cs-vocabulary/pom.xml b/services/vocabulary/3rdparty/nuxeo-platform-cs-vocabulary/pom.xml
index b104bf0e6ee5be167b27ab330822e19472129226..0d381a53dba015f3e72c0f4ab5cd9f74c031c5be 100644 (file)
--- a/services/vocabulary/3rdparty/nuxeo-platform-cs-vocabulary/pom.xml
+++ b/services/vocabulary/3rdparty/nuxeo-platform-cs-vocabulary/pom.xml
@@ -17,6 +17,12 @@
     </description>
     
     <build>
+               <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+               </resources>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>

diff --git a/services/vocabulary/3rdparty/nuxeo-platform-cs-vocabulary/src/main/resources/OSGI-INF/life-cycle-contrib.xml b/services/vocabulary/3rdparty/nuxeo-platform-cs-vocabulary/src/main/resources/OSGI-INF/life-cycle-contrib.xml
index 1cccb8c6c4749a0abe8770bbce8c751c93e2ae4c..d17f74db4311052e4918546a82a5b2f83ae5460b 100644 (file)
--- a/services/vocabulary/3rdparty/nuxeo-platform-cs-vocabulary/src/main/resources/OSGI-INF/life-cycle-contrib.xml
+++ b/services/vocabulary/3rdparty/nuxeo-platform-cs-vocabulary/src/main/resources/OSGI-INF/life-cycle-contrib.xml
@@ -4,8 +4,8 @@
   <extension target="org.nuxeo.ecm.core.lifecycle.LifeCycleService"
              point="types">
     <types>
-      <type name="Vocabulary">cs_default</type>
-      <type name="Vocabularyitem">cs_default</type>
+      <type name="Vocabulary">${Lifecycle}</type>
+      <type name="Vocabularyitem">${Lifecycle}</type>
     </types>
   </extension>
 

diff --git a/services/workflow/3rdparty/nuxeo-platform-cs-workflow/pom.xml b/services/workflow/3rdparty/nuxeo-platform-cs-workflow/pom.xml
index afa08a807884c083b90c21d4b2eb81e510dea68e..9959ad4e3db190a99f84f231a360a019f3490aa1 100644 (file)
--- a/services/workflow/3rdparty/nuxeo-platform-cs-workflow/pom.xml
+++ b/services/workflow/3rdparty/nuxeo-platform-cs-workflow/pom.xml
@@ -17,6 +17,12 @@
     </description>
 
     <build>
+               <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+               </resources>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>