CSPACE-4734: 1) Updated trunk pom files to be use version v2.2-SNAPSHOT. 2) Some...

diff --git a/services/IntegrationTests/pom.xml b/services/IntegrationTests/pom.xml
index 7886f8529d930b46f27157fb3fee7de2c3125a42..de513d3fc9b704a34911e0ad44a6978031643821 100644 (file)
--- a/services/IntegrationTests/pom.xml
+++ b/services/IntegrationTests/pom.xml
@@ -3,7 +3,7 @@
     <parent>\r
         <groupId>org.collectionspace.services</groupId>\r
         <artifactId>org.collectionspace.services.main</artifactId>\r
-        <version>2.1-SNAPSHOT</version>\r
+        <version>2.2-SNAPSHOT</version>\r
     </parent>\r
     \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/JaxRsServiceProvider/pom.xml b/services/JaxRsServiceProvider/pom.xml
index 7cece4828851e3a76fe22684d03fc5f46924575c..574af7305232bf6a59e4a6f3d3cc7d6b5591d73c 100644 (file)
--- a/services/JaxRsServiceProvider/pom.xml
+++ b/services/JaxRsServiceProvider/pom.xml
@@ -4,7 +4,7 @@
     <parent>\r
         <artifactId>org.collectionspace.services.main</artifactId>\r
         <groupId>org.collectionspace.services</groupId>\r
-        <version>2.1-SNAPSHOT</version>\r
+        <version>2.2-SNAPSHOT</version>\r
     </parent>\r
 \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/PerformanceTests/pom.xml b/services/PerformanceTests/pom.xml
index 92ebab5d1c2920983a8a755b4611a6b10aeb2b60..d29967f75825aa9a47c268f67e58bafbd2a29c86 100644 (file)
--- a/services/PerformanceTests/pom.xml
+++ b/services/PerformanceTests/pom.xml
@@ -3,7 +3,7 @@
     <parent>\r
         <artifactId>org.collectionspace.services.main</artifactId>\r
         <groupId>org.collectionspace.services</groupId>\r
-        <version>2.1-SNAPSHOT</version>\r
+        <version>2.2-SNAPSHOT</version>\r
     </parent>\r
     \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/account/client/pom.xml b/services/account/client/pom.xml
index c0397f3b35034a6f04a73bbfc5fb34708b423436..17950e929425b8473720c44981c80901b54ab695 100644 (file)
--- a/services/account/client/pom.xml
+++ b/services/account/client/pom.xml
@@ -5,7 +5,7 @@
     <parent>\r
         <groupId>org.collectionspace.services</groupId>\r
         <artifactId>org.collectionspace.services.account</artifactId>\r
-        <version>2.1-SNAPSHOT</version>\r
+        <version>2.2-SNAPSHOT</version>\r
     </parent>\r
 \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/account/jaxb/pom.xml b/services/account/jaxb/pom.xml
index 2e6a479230c11568b7bbdded05ef885ff1c7b1c7..5bafa22d181dc4d67389ea5f1c2cce0b986ff330 100644 (file)
--- a/services/account/jaxb/pom.xml
+++ b/services/account/jaxb/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.account</artifactId>
-        <version>2.1-SNAPSHOT</version>
+        <version>2.2-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/account/jaxb/src/main/resources/accounts_common.xsd b/services/account/jaxb/src/main/resources/accounts_common.xsd
index be8385a37fef64bd0c71cc13568c79114bf54e89..bde9eca831df96f88633322abdb43ced69664294 100644 (file)
--- a/services/account/jaxb/src/main/resources/accounts_common.xsd
+++ b/services/account/jaxb/src/main/resources/accounts_common.xsd
@@ -36,45 +36,7 @@
                        </jaxb:globalBindings>
                </xs:appinfo>
        </xs:annotation>
-       
-    <xs:element name="bar-common-list">
-        <xs:complexType>
-            <xs:annotation>
-                <xs:documentation>
-                    AccountsCommonList contains information about one or more
-                    accounts. An instance of this type could be returned on
-                    index and search operations.
-                </xs:documentation>
-                <xs:appinfo>
-                    <hj:ignored/>
-                </xs:appinfo>
-            </xs:annotation>
-            <xs:complexContent>
-                <xs:extension base="abstractCommonList">                    
-                           <xs:sequence>
-                               <xs:element name="bar-list-item" maxOccurs="unbounded">
-                                   <xs:complexType>
-                                       <xs:annotation>
-                                           <xs:appinfo>
-                                               <hj:ignored/>
-                                           </xs:appinfo>
-                                       </xs:annotation>
-                                       <xs:sequence>
-                                           <xs:element name="screenName" type="xs:string" minOccurs="1"/>
-                                           <xs:element name="personRefName" type="xs:string" minOccurs="1" />
-                                           <xs:element name="email" type="xs:string" minOccurs="1" />
-                                           <!-- uri to retrive collection object details -->
-                                           <xs:element name="uri" type="xs:anyURI" minOccurs="1" />
-                                           <xs:element name="csid" type="xs:string" minOccurs="1" />
-                                       </xs:sequence>
-                                   </xs:complexType>
-                               </xs:element>
-                           </xs:sequence>
-                </xs:extension>
-            </xs:complexContent>        
-        </xs:complexType>
-    </xs:element>
-       
+               
     <!-- accounts-common -->
     <!-- convention: <servicename>-common  -->
     <xs:element name="accounts_common">

diff --git a/services/account/pom.xml b/services/account/pom.xml
index 6b611044b228f6753867893839e8ed4c00d64481..ff6fc045372cfbe7c106041694ac031653c7e7ff 100644 (file)
--- a/services/account/pom.xml
+++ b/services/account/pom.xml
@@ -3,7 +3,7 @@
     <parent>\r
         <groupId>org.collectionspace.services</groupId>\r
         <artifactId>org.collectionspace.services.main</artifactId>\r
-        <version>2.1-SNAPSHOT</version>\r
+        <version>2.2-SNAPSHOT</version>\r
     </parent>\r
     \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/account/pstore/pom.xml b/services/account/pstore/pom.xml
index 4cb44da35e0c129b5c3bf9007d96478ff1ff8011..b0a5639ddc1ad0aad8de335aeacf98b8c2335eb5 100644 (file)
--- a/services/account/pstore/pom.xml
+++ b/services/account/pstore/pom.xml
@@ -4,7 +4,7 @@
        <parent>\r
                <artifactId>org.collectionspace.services.account</artifactId>\r
                <groupId>org.collectionspace.services</groupId>\r
-               <version>2.1-SNAPSHOT</version>\r
+               <version>2.2-SNAPSHOT</version>\r
        </parent>\r
 \r
        <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/account/service/pom.xml b/services/account/service/pom.xml
index e46830595279766ecc70996dbff62d64a6f27c0f..be5114c0f5ed1f9ddd7add21e38efa37a137d527 100644 (file)
--- a/services/account/service/pom.xml
+++ b/services/account/service/pom.xml
@@ -3,7 +3,7 @@
     <parent>\r
         <artifactId>org.collectionspace.services.account</artifactId>\r
         <groupId>org.collectionspace.services</groupId>\r
-        <version>2.1-SNAPSHOT</version>\r
+        <version>2.2-SNAPSHOT</version>\r
     </parent>\r
 \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/pom.xml b/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/pom.xml
index 067442e69017d22be77c23a3e08d0bd06088a456..1795ebcf251bc0d1b28e7023c8072c8ca8e0274b 100644 (file)
--- a/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/pom.xml
+++ b/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.acquisition.3rdparty</artifactId>
-        <version>2.1-SNAPSHOT</version>
+        <version>2.2-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/acquisition/3rdparty/pom.xml b/services/acquisition/3rdparty/pom.xml
index 2028f0fc4429462d6404c1c995c99ab9b89f31f6..4e8482b3e871983897160284d2bc7a57de7dee06 100644 (file)
--- a/services/acquisition/3rdparty/pom.xml
+++ b/services/acquisition/3rdparty/pom.xml
@@ -5,7 +5,7 @@
     <parent>\r
         <groupId>org.collectionspace.services</groupId>\r
         <artifactId>org.collectionspace.services.acquisition</artifactId>\r
-        <version>2.1-SNAPSHOT</version> \r
+        <version>2.2-SNAPSHOT</version> \r
     </parent>\r
     \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/acquisition/client/pom.xml b/services/acquisition/client/pom.xml
index 0fb156387b30cafb1c4ed63a8d28d05a6a2c0ff7..9241c5f4e2d2ea47e559964bf964617140a9d5c4 100644 (file)
--- a/services/acquisition/client/pom.xml
+++ b/services/acquisition/client/pom.xml
@@ -5,7 +5,7 @@
     <parent>\r
         <groupId>org.collectionspace.services</groupId>\r
         <artifactId>org.collectionspace.services.acquisition</artifactId>\r
-        <version>2.1-SNAPSHOT</version>\r
+        <version>2.2-SNAPSHOT</version>\r
     </parent>\r
 \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/acquisition/jaxb/pom.xml b/services/acquisition/jaxb/pom.xml
index dc970bd9604f832d05e80e8191ad65cff9e01bb8..6fe650bf7dd4c68f03e708c0e1a3c45fa25fb7d2 100644 (file)
--- a/services/acquisition/jaxb/pom.xml
+++ b/services/acquisition/jaxb/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>org.collectionspace.services.acquisition</artifactId>
         <groupId>org.collectionspace.services</groupId>
-        <version>2.1-SNAPSHOT</version>
+        <version>2.2-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/acquisition/pom.xml b/services/acquisition/pom.xml
index 3b055d1a162cff45baabbb05673e154d89ce47c8..b79b44a59b0a83504a5015e6a84a19eeec1277d3 100644 (file)
--- a/services/acquisition/pom.xml
+++ b/services/acquisition/pom.xml
@@ -4,7 +4,7 @@
     <parent>\r
         <groupId>org.collectionspace.services</groupId>\r
         <artifactId>org.collectionspace.services.main</artifactId>\r
-        <version>2.1-SNAPSHOT</version>\r
+        <version>2.2-SNAPSHOT</version>\r
     </parent>\r
 \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/acquisition/service/pom.xml b/services/acquisition/service/pom.xml
index 52aa1539aab3fc6ade314d4a713c60fd4cb36fd1..6b8e67f9ac3183ede910796bd6d0618822a0b0a4 100644 (file)
--- a/services/acquisition/service/pom.xml
+++ b/services/acquisition/service/pom.xml
@@ -3,7 +3,7 @@
     <parent>\r
         <artifactId>org.collectionspace.services.acquisition</artifactId>\r
         <groupId>org.collectionspace.services</groupId>\r
-        <version>2.1-SNAPSHOT</version>\r
+        <version>2.2-SNAPSHOT</version>\r
     </parent>\r
     \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/authentication/client/pom.xml b/services/authentication/client/pom.xml
index b6853b477d807d4216ae6b4ace09eb8d12c71735..51e8b91120a49b84fa9fdb018a921f60bfd66ec1 100644 (file)
--- a/services/authentication/client/pom.xml
+++ b/services/authentication/client/pom.xml
@@ -6,7 +6,7 @@
     <parent>\r
         <groupId>org.collectionspace.services</groupId>\r
         <artifactId>org.collectionspace.services.authentication</artifactId>\r
-        <version>2.1-SNAPSHOT</version>\r
+        <version>2.2-SNAPSHOT</version>\r
     </parent>\r
 \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/authentication/jaxb/pom.xml b/services/authentication/jaxb/pom.xml
index 29abc870845a6debbd2106a293a7f3be994cc30c..fd241ff1046e777f404c1baeb2ee34cd5dd202e3 100644 (file)
--- a/services/authentication/jaxb/pom.xml
+++ b/services/authentication/jaxb/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.authentication</artifactId>
-        <version>2.1-SNAPSHOT</version>
+        <version>2.2-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/authentication/pom.xml b/services/authentication/pom.xml
index d3e01239fa78fa420cb5f76e2268e4fc28a1d4b3..781c958c57429efbb96e2c6533791bc4aefe3a18 100644 (file)
--- a/services/authentication/pom.xml
+++ b/services/authentication/pom.xml
@@ -3,7 +3,7 @@
     <parent>\r
         <groupId>org.collectionspace.services</groupId>\r
         <artifactId>org.collectionspace.services.main</artifactId>\r
-        <version>2.1-SNAPSHOT</version>\r
+        <version>2.2-SNAPSHOT</version>\r
     </parent>\r
     \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/authentication/pstore/pom.xml b/services/authentication/pstore/pom.xml
index 6d7b1aee705a853db2caf9ddf81692f2b3709b4e..d3293bacc407e2a6f8d5fcf25c2cfc2a73483a8f 100644 (file)
--- a/services/authentication/pstore/pom.xml
+++ b/services/authentication/pstore/pom.xml
@@ -6,7 +6,7 @@
     <parent>\r
         <groupId>org.collectionspace.services</groupId>\r
         <artifactId>org.collectionspace.services.authentication</artifactId>\r
-        <version>2.1-SNAPSHOT</version>\r
+        <version>2.2-SNAPSHOT</version>\r
     </parent>\r
 \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/authentication/service/pom.xml b/services/authentication/service/pom.xml
index 51b57215d52788d239a83531d78d3d4b73d382d9..10425db2630a2091ee8ecaaf98267a21e9da1827 100644 (file)
--- a/services/authentication/service/pom.xml
+++ b/services/authentication/service/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.authentication</artifactId>
-        <version>2.1-SNAPSHOT</version>
+        <version>2.2-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/authority/jaxb/pom.xml b/services/authority/jaxb/pom.xml
index 7e3c1c5aad5a753c2e9ca49963443e2d7c5ac216..ca52572a1f8b06ec4af90fc7bcf0c0ef332e3332 100644 (file)
--- a/services/authority/jaxb/pom.xml
+++ b/services/authority/jaxb/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>org.collectionspace.services.authority</artifactId>
         <groupId>org.collectionspace.services</groupId>
-        <version>2.1-SNAPSHOT</version>
+        <version>2.2-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/authority/pom.xml b/services/authority/pom.xml
index 220140349b6e78e88e71c8ec6c5eb2cbbf0f10e9..0efd0c7a15ea00a9ba468bf3f0025c51afb92a11 100644 (file)
--- a/services/authority/pom.xml
+++ b/services/authority/pom.xml
@@ -5,7 +5,7 @@
     <parent>\r
         <groupId>org.collectionspace.services</groupId>\r
         <artifactId>org.collectionspace.services.main</artifactId>\r
-        <version>2.1-SNAPSHOT</version>\r
+        <version>2.2-SNAPSHOT</version>\r
     </parent>\r
 \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/authority/service/pom.xml b/services/authority/service/pom.xml
index e12cab699a8dbd5b701f127bf231d3ee01712ff7..0fb36cf38ba946683a3f8f03e7899f6c09f131dc 100644 (file)
--- a/services/authority/service/pom.xml
+++ b/services/authority/service/pom.xml
@@ -5,7 +5,7 @@
     <parent>\r
         <groupId>org.collectionspace.services</groupId>\r
         <artifactId>org.collectionspace.services.authority</artifactId>\r
-        <version>2.1-SNAPSHOT</version>\r
+        <version>2.2-SNAPSHOT</version>\r
     </parent>\r
 \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/authorization-mgt/client/pom.xml b/services/authorization-mgt/client/pom.xml
index 201c23b246aa626437112c27f5e4578ee1fcf53f..fb964121e01418470c62a507fa920d61ed2b5020 100644 (file)
--- a/services/authorization-mgt/client/pom.xml
+++ b/services/authorization-mgt/client/pom.xml
@@ -5,7 +5,7 @@
     <parent>\r
         <groupId>org.collectionspace.services</groupId>\r
         <artifactId>org.collectionspace.services.authorization-mgt</artifactId>\r
-        <version>2.1-SNAPSHOT</version>\r
+        <version>2.2-SNAPSHOT</version>\r
     </parent>\r
 \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/authorization-mgt/import/pom.xml b/services/authorization-mgt/import/pom.xml
index 8088be1c2cc8e12bc157324863962dd721f0fbb6..46e537da3f1fef9542eab717e597f6d4cdde5a8b 100644 (file)
--- a/services/authorization-mgt/import/pom.xml
+++ b/services/authorization-mgt/import/pom.xml
@@ -5,7 +5,7 @@
     <parent>\r
         <groupId>org.collectionspace.services</groupId>\r
         <artifactId>org.collectionspace.services.authorization-mgt</artifactId>\r
-        <version>2.1-SNAPSHOT</version>\r
+        <version>2.2-SNAPSHOT</version>\r
     </parent>\r
 \r
     <modelVersion>4.0.0</modelVersion>\r

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 56a42a27956b1f0aba8b400b94d2c764b9875b26..737bbcec6ca6ab642147b4163c9e9d84502e9364 100644 (file)
--- 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
@@ -37,6 +37,7 @@ import org.collectionspace.services.authorization.importer.AuthorizationGen;
 import org.collectionspace.services.authorization.importer.AuthorizationSeed;
 import org.collectionspace.services.authorization.importer.AuthorizationStore;
 import org.collectionspace.services.authorization.storage.PermissionRoleUtil;
+import org.hibernate.exception.ConstraintViolationException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
@@ -128,8 +129,9 @@ public class AuthorizationSeedDriver {
             setupSpring();
             status = beginTransaction("seedData");
             AuthorizationSeed authzSeed = new AuthorizationSeed();
-            authzSeed.seedPermissions(exportDir + File.separator + PERMISSION_FILE,
-                    exportDir + File.separator + PERMISSION_ROLE_FILE);
+            authzSeed.seedPermissions(authzGen.getDefaultPermissions(), authzGen.getDefaultPermissionRoles());
+//            authzSeed.seedPermissions(exportDir + File.separator + PERMISSION_FILE,
+//                    exportDir + File.separator + PERMISSION_ROLE_FILE);
             if (logger.isDebugEnabled()) {
                 logger.debug("authorization seeding completed ");
             }
@@ -186,7 +188,19 @@ public class AuthorizationSeedDriver {
     private void store() throws Exception {
         AuthorizationStore authzStore = new AuthorizationStore();
         for (Role role : authzGen.getDefaultRoles()) {
-            authzStore.store(role);
+               try {
+                       authzStore.store(role);
+               } catch (Exception e) {
+                       //
+                       // If the role already exists, read it in and replace the instance
+                       // we're trying to import with the exist one.  This will ensure that the rest
+                       // of import uses the correct CSID.
+                       if (e.getCause() instanceof ConstraintViolationException) {
+                               Role existingRole = authzStore.getRoleByName(role.getRoleName(), role.getTenantId());
+                               //
+                               role = existingRole;
+                       }
+               }
         }
 
         for (Permission perm : authzGen.getDefaultPermissions()) {

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 ffaa8f7d5e63a9ad48149bd991c4889abf7d8e36..cd9b16612841b1589065b3f418caa399645fad91 100644 (file)
--- 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
@@ -85,6 +85,12 @@ public class AuthorizationGen {
     private Role cspaceAdminRole;
     private Hashtable<String, TenantBindingType> tenantBindings =
             new Hashtable<String, TenantBindingType>();
+       //
+    // Store the list of default roles, perms, and roleperms
+    //
+    private List<PermissionRole> allPermRoleList = null;
+       private List<Permission> allPermList;
+       private List<Role> allRoleList;
 
     public void initialize(String tenantRootDirPath) throws Exception {
         TenantBindingConfigReaderImpl tenantBindingConfigReader =
@@ -237,9 +243,11 @@ public class AuthorizationGen {
     }
 
     public List<Permission> getDefaultPermissions() {
-        List<Permission> allPermList = new ArrayList<Permission>();
-        allPermList.addAll(adminPermList);
-        allPermList.addAll(readerPermList);
+       if (allPermList == null) {
+               allPermList = new ArrayList<Permission>();
+               allPermList.addAll(adminPermList);
+               allPermList.addAll(readerPermList);
+       }
         return allPermList;
     }
 
@@ -275,25 +283,33 @@ public class AuthorizationGen {
     }
 
     private Role buildTenantRole(String tenantId, String name, String type) {
-        Role role = new Role();
-        role.setCreatedAtItem(new Date());
-        role.setDisplayName(name);
-        role.setRoleName(ROLE_PREFIX +
-                       tenantId + "_" +
-                       role.getDisplayName());
-        String id = UUID.randomUUID().toString();
-        role.setCsid(id);
-        role.setDescription("generated tenant "+type+" role");
-        role.setTenantId(tenantId);
-        role.setMetadataProtection(RoleClient.IMMUTABLE);
-        role.setPermsProtection(RoleClient.IMMUTABLE);
+       Role role = null;
+       
+       String roleName = ROLE_PREFIX + tenantId + "_" + name;
+       role = AuthorizationStore.getRoleByName(roleName, tenantId);
+       if (role == null) {
+               // the role doesn't exist already, so we need to create it
+               role = new Role();
+               role.setCreatedAtItem(new Date());
+               role.setDisplayName(name);
+               role.setRoleName(roleName);
+               String id = UUID.randomUUID().toString();
+               role.setCsid(id);
+                       role.setDescription("generated tenant " + type + " role");
+               role.setTenantId(tenantId);
+               role.setMetadataProtection(RoleClient.IMMUTABLE);
+               role.setPermsProtection(RoleClient.IMMUTABLE);
+       }
+        
         return role;
     }
 
     public List<Role> getDefaultRoles() {
-        List<Role> allRoleList = new ArrayList<Role>();
-        allRoleList.addAll(adminRoles);
-        allRoleList.addAll(readerRoles);
+       if (allRoleList == null) {
+               allRoleList = new ArrayList<Role>();
+               allRoleList.addAll(adminRoles);
+               allRoleList.addAll(readerRoles);
+       }
         return allRoleList;
     }
 
@@ -380,9 +396,11 @@ public class AuthorizationGen {
     }
 
     public List<PermissionRole> getDefaultPermissionRoles() {
-        List<PermissionRole> allPermRoleList = new ArrayList<PermissionRole>();
-        allPermRoleList.addAll(adminPermRoleList);
-        allPermRoleList.addAll(readerPermRoleList);
+       if (allPermRoleList  == null) {
+               allPermRoleList = new ArrayList<PermissionRole>();
+               allPermRoleList.addAll(adminPermRoleList);
+               allPermRoleList.addAll(readerPermRoleList);
+       }
         return allPermRoleList;
     }
 
@@ -405,10 +423,7 @@ public class AuthorizationGen {
 
     public void exportDefaultRoles(String fileName) {
         RolesList rList = new RolesList();
-        List<Role> allRoleList = new ArrayList<Role>();
-        allRoleList.addAll(adminRoles);
-        allRoleList.addAll(readerRoles);
-        rList.setRole(allRoleList);
+        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.
@@ -423,10 +438,7 @@ public class AuthorizationGen {
 
     public void exportDefaultPermissions(String fileName) {
         PermissionsList pcList = new PermissionsList();
-        List<Permission> allPermList = new ArrayList<Permission>();
-        allPermList.addAll(adminPermList);
-        allPermList.addAll(readerPermList);
-        pcList.setPermission(allPermList);
+        pcList.setPermission(this.getDefaultPermissions());
         org.collectionspace.services.authorization.ObjectFactory objectFactory =
                new org.collectionspace.services.authorization.ObjectFactory();
         toFile(pcList, PermissionsList.class,
@@ -439,10 +451,7 @@ public class AuthorizationGen {
 
     public void exportDefaultPermissionRoles(String fileName) {
         PermissionsRolesList psrsl = new PermissionsRolesList();
-        List<PermissionRole> allPermRoleList = new ArrayList<PermissionRole>();
-        allPermRoleList.addAll(adminPermRoleList);
-        allPermRoleList.addAll(readerPermRoleList);
-        psrsl.setPermissionRole(allPermRoleList);
+        psrsl.setPermissionRole(this.getDefaultAdminPermissionRoles());
         toFile(psrsl, PermissionsRolesList.class,
                 fileName);
         if (logger.isDebugEnabled()) {

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 cd99f641ec04b4af1ff8248f0449a6dc751c68db..1fa6a01b3bd6d2121bc3539747b2186f1bddf327 100644 (file)
--- 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,13 +25,17 @@ package org.collectionspace.services.authorization.importer;
 
 import java.io.FileInputStream;
 import java.io.InputStream;
+
 import java.util.ArrayList;
 import java.util.List;
+
 import javax.xml.bind.JAXBContext;
 import javax.xml.bind.Unmarshaller;
-import org.collectionspace.services.authorization.perms.ActionType;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+
+import org.springframework.security.acls.model.AlreadyExistsException;
 import org.collectionspace.services.authorization.AuthZ;
 import org.collectionspace.services.authorization.CSpaceAction;
 import org.collectionspace.services.authorization.perms.EffectType;
@@ -84,19 +88,31 @@ public class AuthorizationSeed {
      */
     public void seedPermissions(PermissionsList permList, PermissionsRolesList permRoleList)
             throws Exception {
-        for (Permission p : permList.getPermission()) {
+       
+       seedPermissions(permList.getPermission(), permRoleList.getPermissionRole());
+    }
+    
+    /**
+     * seedPermissions seed permissions from given permisison and permission role lists
+     * @param permList
+     * @param permRoleList
+     * @throws Exception
+     */
+    public void seedPermissions(List<Permission> permList, List<PermissionRole> permRoleList)
+            throws Exception {
+        for (Permission p : permList) {
             if (logger.isTraceEnabled()) {
                 logger.trace("adding permission for res=" + p.getResourceName() +
                         " for tenant=" + p.getTenantId());
             }
-            for (PermissionRole pr : permRoleList.getPermissionRole()) {
+            for (PermissionRole pr : permRoleList) {
                 if (pr.getPermission().get(0).getPermissionId().equals(p.getCsid())) {
                     addPermissionsForUri(p, pr);
                 }
             }
         }
     }
-
+    
     /**
      * addPermissionsForUri add permissions from given permission configuration
      * with assumption that resource is of type URI
@@ -116,11 +132,20 @@ public class AuthorizationSeed {
         }
         List<PermissionAction> permActions = perm.getAction();
         for (PermissionAction permAction : permActions) {
-            CSpaceAction action = URIResourceImpl.getAction(permAction.getName());
-            URIResourceImpl uriRes = new URIResourceImpl(perm.getTenantId(),
-                    perm.getResourceName(), action);
-            boolean grant = perm.getEffect().equals(EffectType.PERMIT) ? true : false;
-            AuthZ.get().addPermissions(uriRes, principals.toArray(new String[0]), grant);
+               try {
+                   CSpaceAction action = URIResourceImpl.getAction(permAction.getName());
+                   URIResourceImpl uriRes = new URIResourceImpl(perm.getTenantId(),
+                           perm.getResourceName(), action);
+                   boolean grant = perm.getEffect().equals(EffectType.PERMIT) ? true : false;
+                   AuthZ.get().addPermissions(uriRes, principals.toArray(new String[0]), grant);
+               } catch (PermissionException e) {
+                       //
+                       // Only throw the exception if it is *not* an already-exists exception
+                       //
+                       if (e.getCause() instanceof AlreadyExistsException == false) {
+                               throw e;
+                       }
+               }
         }
     }
 

diff --git a/services/authorization-mgt/import/src/main/java/org/collectionspace/services/authorization/importer/AuthorizationStore.java b/services/authorization-mgt/import/src/main/java/org/collectionspace/services/authorization/importer/AuthorizationStore.java
index c6c79bf6ff10bb6670f56c6380b8ef0d4405eeea..593101fda8ad5d2999989cef8a17c653a3b8c3d0 100644 (file)
--- a/services/authorization-mgt/import/src/main/java/org/collectionspace/services/authorization/importer/AuthorizationStore.java
+++ b/services/authorization-mgt/import/src/main/java/org/collectionspace/services/authorization/importer/AuthorizationStore.java
@@ -30,6 +30,10 @@ package org.collectionspace.services.authorization.importer;
 import java.util.Date;
 import javax.persistence.EntityManager;
 import javax.persistence.EntityManagerFactory;
+
+import org.collectionspace.services.authorization.Role;
+import org.collectionspace.services.authorization.perms.Permission;
+import org.collectionspace.services.authorization.storage.RoleStorageConstants;
 import org.collectionspace.services.common.document.JaxbUtils;
 import org.collectionspace.services.common.storage.jpa.JpaStorageUtils;
 import org.slf4j.Logger;
@@ -41,9 +45,35 @@ import org.slf4j.LoggerFactory;
  */
 public class AuthorizationStore {
 
-    private final Logger logger = LoggerFactory.getLogger(AuthorizationStore.class);
+    private static final Logger logger = LoggerFactory.getLogger(AuthorizationStore.class);
     private final static String PERSISTENCE_UNIT = "org.collectionspace.services.authorization";
 
+    static public Role getRoleByName(String roleName, String tenantId) {
+       Role theRole = null;
+       
+       try {
+               theRole = (Role)JpaStorageUtils.getEnityByKey(Role.class.getName(),
+                               RoleStorageConstants.ROLE_NAME, roleName, tenantId);
+       } catch (Exception e) {
+               if (logger.isTraceEnabled() == true) {
+                       logger.trace("Could not retrieve role with name =" + roleName, e);
+               }
+       }
+       
+       return theRole;
+    }
+    
+    static public Permission getPermission(Permission permission) {
+       Permission result = null;
+       //
+       // We need to perform a DB lookup to see if this permission already exists.  If so,
+       // we should return the existing permission.
+       //
+       result = permission;
+       
+       return result;
+    }
+    
     /**
      * store the given entity
      * @param entity

diff --git a/services/authorization-mgt/pom.xml b/services/authorization-mgt/pom.xml
index add6408f30dbe02819efc82abc62cc367dbe7af4..e0640d3345ea11f6d08eef84c8b5fe088468c54f 100644 (file)
--- a/services/authorization-mgt/pom.xml
+++ b/services/authorization-mgt/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>org.collectionspace.services.main</artifactId>
         <groupId>org.collectionspace.services</groupId>
-        <version>2.1-SNAPSHOT</version>
+        <version>2.2-SNAPSHOT</version>
     </parent>
 
     <groupId>org.collectionspace.services</groupId>

diff --git a/services/authorization-mgt/service/pom.xml b/services/authorization-mgt/service/pom.xml
index 9f48c102175678c949624872c4a60c5c81b536dc..17229558d69c9d48c32e8b3286a1e22f562bb7ee 100644 (file)
--- a/services/authorization-mgt/service/pom.xml
+++ b/services/authorization-mgt/service/pom.xml
@@ -4,7 +4,7 @@
     <parent>\r
         <artifactId>org.collectionspace.services.authorization-mgt</artifactId>\r
         <groupId>org.collectionspace.services</groupId>\r
-        <version>2.1-SNAPSHOT</version>\r
+        <version>2.2-SNAPSHOT</version>\r
     </parent>\r
     <groupId>org.collectionspace.services</groupId>\r
     <artifactId>org.collectionspace.services.authorization-mgt.service</artifactId>\r

diff --git a/services/authorization/jaxb/pom.xml b/services/authorization/jaxb/pom.xml
index 4e601f9dfba28a45038d790d144509bfc1d8cf86..0e373a0e469e62ed9a04d4b1c6b499c15c51e184 100644 (file)
--- a/services/authorization/jaxb/pom.xml
+++ b/services/authorization/jaxb/pom.xml
@@ -4,7 +4,7 @@
     <parent>\r
         <artifactId>org.collectionspace.services.authorization</artifactId>\r
         <groupId>org.collectionspace.services</groupId>\r
-        <version>2.1-SNAPSHOT</version>\r
+        <version>2.2-SNAPSHOT</version>\r
     </parent>\r
 \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/authorization/pom.xml b/services/authorization/pom.xml
index 2f0743f326cc55488222a77840ac4b14c1906b69..0a99773dc28c78637a61b30d8d78c888382a8e40 100644 (file)
--- a/services/authorization/pom.xml
+++ b/services/authorization/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>org.collectionspace.services.main</artifactId>
         <groupId>org.collectionspace.services</groupId>
-        <version>2.1-SNAPSHOT</version>
+        <version>2.2-SNAPSHOT</version>
     </parent>
     <groupId>org.collectionspace.services</groupId>
     <artifactId>org.collectionspace.services.authorization</artifactId>

diff --git a/services/authorization/pstore/pom.xml b/services/authorization/pstore/pom.xml
index bcbb95f06f74be8acba5117727e795eed997dfbc..8b2bba97eb645ad4dbe91d59af07b89f66bb9a03 100644 (file)
--- a/services/authorization/pstore/pom.xml
+++ b/services/authorization/pstore/pom.xml
@@ -4,7 +4,7 @@
     <parent>\r
         <artifactId>org.collectionspace.services.authorization</artifactId>\r
         <groupId>org.collectionspace.services</groupId>\r
-        <version>2.1-SNAPSHOT</version>\r
+        <version>2.2-SNAPSHOT</version>\r
     </parent>\r
 \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/authorization/service/pom.xml b/services/authorization/service/pom.xml
index 8ad4df4ad1475094af16468491fe66aef593abc6..4000e515b14d41b5eb5c15e59b7ae835325a48f1 100644 (file)
--- a/services/authorization/service/pom.xml
+++ b/services/authorization/service/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <artifactId>org.collectionspace.services.authorization</artifactId>
         <groupId>org.collectionspace.services</groupId>
-        <version>2.1-SNAPSHOT</version>
+        <version>2.2-SNAPSHOT</version>
     </parent>
     <groupId>org.collectionspace.services</groupId>
     <artifactId>org.collectionspace.services.authorization.service</artifactId>

diff --git a/services/authorization/service/src/main/java/org/collectionspace/services/authorization/spring/SpringPermissionManager.java b/services/authorization/service/src/main/java/org/collectionspace/services/authorization/spring/SpringPermissionManager.java
index a8ab08b9cbf91b9511c825dd7306594208a9299c..8518a92db0c8033831f8da903ff8b8c2eafa4809 100644 (file)
--- a/services/authorization/service/src/main/java/org/collectionspace/services/authorization/spring/SpringPermissionManager.java
+++ b/services/authorization/service/src/main/java/org/collectionspace/services/authorization/spring/SpringPermissionManager.java
@@ -26,13 +26,16 @@ package org.collectionspace.services.authorization.spring;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
+
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+
 import org.collectionspace.services.authorization.CSpaceAction;
 import org.collectionspace.services.authorization.spi.CSpacePermissionManager;
 import org.collectionspace.services.authorization.CSpaceResource;
 import org.collectionspace.services.authorization.PermissionException;
 import org.collectionspace.services.authorization.PermissionNotFoundException;
+
 import org.springframework.security.acls.model.AccessControlEntry;
 import org.springframework.security.acls.model.AclDataAccessException;
 import org.springframework.security.acls.model.AlreadyExistsException;
@@ -97,7 +100,7 @@ public class SpringPermissionManager implements CSpacePermissionManager {
                             + " oid=" + oid.toString()
                             + " perm=" + p.toString(), aex);
                 }
-                //keep going
+                throw new PermissionException("Permission already exists", aex);
             } catch (Exception ex) {
                 String msg = "addpermissions(res,action,prin[], grant) failed,"
                         + " oid=" + oid.toString()

diff --git a/services/batch/3rdparty/nuxeo-platform-cs-batch/pom.xml b/services/batch/3rdparty/nuxeo-platform-cs-batch/pom.xml
index 485e9ab5a399498a14f9a60dbca7dea3514ad3fd..b8356a0314a81f19f1801a34a2924db73a7e9eae 100644 (file)
--- a/services/batch/3rdparty/nuxeo-platform-cs-batch/pom.xml
+++ b/services/batch/3rdparty/nuxeo-platform-cs-batch/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.batch.3rdparty</artifactId>
-        <version>2.1-SNAPSHOT</version>
+        <version>2.2-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/batch/3rdparty/pom.xml b/services/batch/3rdparty/pom.xml
index 8cb3048ff33785a00eaff344e4f4d3fa70aa7762..2314593a4ae764a471280c2ac8869f7df9be7bac 100644 (file)
--- a/services/batch/3rdparty/pom.xml
+++ b/services/batch/3rdparty/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>org.collectionspace.services.batch</artifactId>
         <groupId>org.collectionspace.services</groupId>
-        <version>2.1-SNAPSHOT</version>
+        <version>2.2-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/batch/client/pom.xml b/services/batch/client/pom.xml
index cd0f1ea5316948b1bf5236e63318a951e3b6b9df..519c1aeaf64101277c2ef460a2d2cacbb0e76335 100644 (file)
--- a/services/batch/client/pom.xml
+++ b/services/batch/client/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.batch</artifactId>
-        <version>2.1-SNAPSHOT</version>
+        <version>2.2-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/batch/jaxb/pom.xml b/services/batch/jaxb/pom.xml
index 47ff4c1a9851b452ae87cb12396789e1c1e25dcf..b40609032e3b0ca7ff6785411ade1626b968cad6 100644 (file)
--- a/services/batch/jaxb/pom.xml
+++ b/services/batch/jaxb/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>org.collectionspace.services.batch</artifactId>
         <groupId>org.collectionspace.services</groupId>
-        <version>2.1-SNAPSHOT</version>
+        <version>2.2-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/batch/pom.xml b/services/batch/pom.xml
index ac54d3eeb074fe89a10a7c035a8887e3c38463e6..b7574a8a1f451f169bc2e97c231db1b5ff8a1423 100644 (file)
--- a/services/batch/pom.xml
+++ b/services/batch/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.main</artifactId>
-        <version>2.1-SNAPSHOT</version>
+        <version>2.2-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/batch/service/pom.xml b/services/batch/service/pom.xml
index d2e347ee9f271e29bcf66919a14350b67fe65a05..052f10bc51dd1436de420a4167ee3a4d26f5a8c8 100644 (file)
--- a/services/batch/service/pom.xml
+++ b/services/batch/service/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.batch</artifactId>        
-        <version>2.1-SNAPSHOT</version>
+        <version>2.2-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/blob/3rdparty/nuxeo-platform-cs-blob/pom.xml b/services/blob/3rdparty/nuxeo-platform-cs-blob/pom.xml
index 9bc29211b06063a4b813223ab5e3c7a6d956b6ed..2d307c7d43c1ee26f28a6d030b5bc81ef27073e6 100644 (file)
--- a/services/blob/3rdparty/nuxeo-platform-cs-blob/pom.xml
+++ b/services/blob/3rdparty/nuxeo-platform-cs-blob/pom.xml
@@ -5,7 +5,7 @@
        <parent>
                <groupId>org.collectionspace.services</groupId>
                <artifactId>org.collectionspace.services.blob.3rdparty</artifactId>
-               <version>2.1-SNAPSHOT</version>
+               <version>2.2-SNAPSHOT</version>
        </parent>
     
     <groupId>org.collectionspace.services</groupId>

diff --git a/services/blob/3rdparty/pom.xml b/services/blob/3rdparty/pom.xml
index 06deff5e2332678d1e4fa0fcf240145e7f99a56f..a8f3607b597b9974433aedc1b7977b24073c7dc0 100644 (file)
--- a/services/blob/3rdparty/pom.xml
+++ b/services/blob/3rdparty/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>org.collectionspace.services.blob</artifactId>
         <groupId>org.collectionspace.services</groupId>
-        <version>2.1-SNAPSHOT</version>
+        <version>2.2-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/blob/client/pom.xml b/services/blob/client/pom.xml
index 12be2c20364d11d295ddd2e62e855c65ebf3ad1f..8d2596e044b4820e52f76a7f8dc8d63d0a0c3c59 100644 (file)
--- a/services/blob/client/pom.xml
+++ b/services/blob/client/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.blob</artifactId>
-        <version>2.1-SNAPSHOT</version>
+        <version>2.2-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/blob/jaxb/pom.xml b/services/blob/jaxb/pom.xml
index 95c23ef144b69a520c91c90a8396e8334f9f9e41..22584ec2eaf8098a50c7eb00f685807827a98c5e 100644 (file)
--- a/services/blob/jaxb/pom.xml
+++ b/services/blob/jaxb/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>org.collectionspace.services.blob</artifactId>
         <groupId>org.collectionspace.services</groupId>
-        <version>2.1-SNAPSHOT</version>
+        <version>2.2-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/blob/pom.xml b/services/blob/pom.xml
index ea0561fef45844321c65aa47d6913090eea2d51c..6354f3cb7d2f9e64efb5fc5e0c6ffdfb4cce6efc 100644 (file)
--- a/services/blob/pom.xml
+++ b/services/blob/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>org.collectionspace.services.main</artifactId>
         <groupId>org.collectionspace.services</groupId>
-        <version>2.1-SNAPSHOT</version>
+        <version>2.2-SNAPSHOT</version>
     </parent>
     
     <artifactId>org.collectionspace.services.blob</artifactId>

diff --git a/services/blob/service/pom.xml b/services/blob/service/pom.xml
index 3d933d96b529d936158350fd7998ec39bd125940..61b76134da09871870197e953086860330e3612c 100644 (file)
--- a/services/blob/service/pom.xml
+++ b/services/blob/service/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.blob</artifactId>        
-        <version>2.1-SNAPSHOT</version>
+        <version>2.2-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>

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 3f96de158723590d399b81a0c8c9c4245a0e4084..afa7c4b53856da1a833dadc7c15a6ada7ea097af 100644 (file)
--- 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
@@ -165,7 +165,7 @@ extends DocHandlerBase<BlobsCommon> {
                // fall into this block of code.  Otherwise, we'll just call our parent to deal with a plain-old-blob payload.
                //
                if (derivativeTerm != null || getContentFlag == true) {
-                       BlobOutput blobOutput = NuxeoImageUtils.getBlobOutput(ctx, repoSession,
+                       BlobOutput blobOutput = NuxeoImageUtils.getBlobOutput(ctx, repoSession, //FIXME: REM - If the blob's binary has been removed from the file system, then this call will return null.  We need to at least spit out a meaningful error/warning message
                                        blobRepositoryId, derivativeTerm, getContentFlag);
                        if (getContentFlag == true) {
                                blobInput.setContentStream(blobOutput.getBlobInputStream());

diff --git a/services/client/pom.xml b/services/client/pom.xml
index 8ff6556ec0f7c6689c700bea8bda034becb8a5b7..bc4973af3d763539345fe807db417c1b2b5af167 100644 (file)
--- a/services/client/pom.xml
+++ b/services/client/pom.xml
@@ -3,7 +3,7 @@
     <parent>\r
         <groupId>org.collectionspace.services</groupId>\r
         <artifactId>org.collectionspace.services.main</artifactId>\r
-        <version>2.1-SNAPSHOT</version>\r
+        <version>2.2-SNAPSHOT</version>\r
     </parent>\r
 \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/collectionobject/3rdparty/nuxeo-platform-collectionobject-lifesci/pom.xml b/services/collectionobject/3rdparty/nuxeo-platform-collectionobject-lifesci/pom.xml
index 717518792ea5542f4cebe29ea47e0b6d1d8585af..97b6765a8cbc43f8f5ba272fbff9f6734144c419 100644 (file)
--- a/services/collectionobject/3rdparty/nuxeo-platform-collectionobject-lifesci/pom.xml
+++ b/services/collectionobject/3rdparty/nuxeo-platform-collectionobject-lifesci/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.collectionobject.3rdparty</artifactId>
-        <version>2.1-SNAPSHOT</version>
+        <version>2.2-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/pom.xml b/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/pom.xml
index 596cd2ba30035f75d664208334c1d66314a8da60..152eccc905242e50a97c49a9728dd0ef0ebef613 100644 (file)
--- a/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/pom.xml
+++ b/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.collectionobject.3rdparty</artifactId>
-        <version>2.1-SNAPSHOT</version>
+        <version>2.2-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/collectionobject/3rdparty/pom.xml b/services/collectionobject/3rdparty/pom.xml
index 68281d15aa102999a71b40c273e1d1973d83f8c4..3586d1a09df04a471132bff0b42b1be6ef58f65b 100644 (file)
--- a/services/collectionobject/3rdparty/pom.xml
+++ b/services/collectionobject/3rdparty/pom.xml
@@ -5,7 +5,7 @@
     <parent>\r
         <groupId>org.collectionspace.services</groupId>\r
         <artifactId>org.collectionspace.services.collectionobject</artifactId>\r
-        <version>2.1-SNAPSHOT</version>\r
+        <version>2.2-SNAPSHOT</version>\r
     </parent>\r
 \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/collectionobject/client/pom.xml b/services/collectionobject/client/pom.xml
index 789e592a4d97bb645f41e5e373fc746d4a97ef9d..43b6a042585644a1782fcd37f700d2713e0ce634 100644 (file)
--- a/services/collectionobject/client/pom.xml
+++ b/services/collectionobject/client/pom.xml
@@ -5,7 +5,7 @@
     <parent>\r
         <groupId>org.collectionspace.services</groupId>\r
         <artifactId>org.collectionspace.services.collectionobject</artifactId>\r
-        <version>2.1-SNAPSHOT</version>\r
+        <version>2.2-SNAPSHOT</version>\r
     </parent>\r
 \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/collectionobject/jaxb/pom.xml b/services/collectionobject/jaxb/pom.xml
index 5e11212c886567e0ef4852a09fb9a1c124d0bc8c..a9c551d1390ef9f885be1a38faf737a2a3a422b7 100644 (file)
--- a/services/collectionobject/jaxb/pom.xml
+++ b/services/collectionobject/jaxb/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.collectionobject</artifactId>
-        <version>2.1-SNAPSHOT</version>
+        <version>2.2-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/collectionobject/pom.xml b/services/collectionobject/pom.xml
index 1037713cc2c3dcce3321e90605125294294e358e..adc09fc186903693802d4944a50135998862b592 100644 (file)
--- a/services/collectionobject/pom.xml
+++ b/services/collectionobject/pom.xml
@@ -3,7 +3,7 @@
     <parent>\r
         <groupId>org.collectionspace.services</groupId>\r
         <artifactId>org.collectionspace.services.main</artifactId>\r
-        <version>2.1-SNAPSHOT</version>        \r
+        <version>2.2-SNAPSHOT</version>        \r
     </parent>\r
     \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/collectionobject/sample/pom.xml b/services/collectionobject/sample/pom.xml
index c57dba246bbdccf5651f3484d8cc710d9726cc8e..68b899119ffa50baf4aeec7764f4120b92394235 100644 (file)
--- a/services/collectionobject/sample/pom.xml
+++ b/services/collectionobject/sample/pom.xml
@@ -4,7 +4,7 @@
     <groupId>org.collectionspace.services</groupId>
     <artifactId>org.collectionspace.services.collectionobject.client.samples</artifactId>
     <packaging>pom</packaging>
-    <version>2.1-SNAPSHOT</version>
+    <version>2.2-SNAPSHOT</version>
     <name>collectionobject.client.samples</name>
 
     <modules>

diff --git a/services/collectionobject/sample/sample/pom.xml b/services/collectionobject/sample/sample/pom.xml
index a1986fdaf6507235cdeef8c383f8918ebacf3dcd..3a412f3bb49218e4acdf091010efada1051cc89f 100644 (file)
--- a/services/collectionobject/sample/sample/pom.xml
+++ b/services/collectionobject/sample/sample/pom.xml
@@ -5,7 +5,7 @@
     <artifactId>org.collectionspace.services.collectionobject.client.sample</artifactId>
     <packaging>jar</packaging>
     <name>collectionobject.client.sample</name>
-    <version>2.1-SNAPSHOT</version>
+    <version>2.2-SNAPSHOT</version>
     
     <dependencies>
         <!-- keep slf4j dependencies on the top -->

diff --git a/services/collectionobject/service/pom.xml b/services/collectionobject/service/pom.xml
index fb0c0cdb41fc62f59f2f686611313e45baee37c2..60f9545a20e0ec8cc57b20bf0fc7d3e187f11ca8 100644 (file)
--- a/services/collectionobject/service/pom.xml
+++ b/services/collectionobject/service/pom.xml
@@ -3,7 +3,7 @@
     <parent>\r
         <groupId>org.collectionspace.services</groupId>\r
         <artifactId>org.collectionspace.services.collectionobject</artifactId>\r
-        <version>2.1-SNAPSHOT</version>\r
+        <version>2.2-SNAPSHOT</version>\r
     </parent>\r
     \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/common-api/pom.xml b/services/common-api/pom.xml
index 4ce437113b84850a4347a1c5855003a789e870d8..a3bbef45bdabb75bf67fd87b4cf9ffddc41c1a44 100755 (executable)
--- a/services/common-api/pom.xml
+++ b/services/common-api/pom.xml
@@ -3,7 +3,7 @@
     <parent>\r
         <groupId>org.collectionspace.services</groupId>\r
         <artifactId>org.collectionspace.services.main</artifactId>\r
-        <version>2.1-SNAPSHOT</version>\r
+        <version>2.2-SNAPSHOT</version>\r
     </parent>\r
 \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/common-test/pom.xml b/services/common-test/pom.xml
index e3431e680f8fffe8477ebb7e68aaff05c3a30380..5226fc23e6628bb7f7f382ba9c6125cec5d492b5 100644 (file)
--- a/services/common-test/pom.xml
+++ b/services/common-test/pom.xml
@@ -4,11 +4,11 @@
     <parent>
         <artifactId>org.collectionspace.services.main</artifactId>
         <groupId>org.collectionspace.services</groupId>
-        <version>2.1-SNAPSHOT</version>
+        <version>2.2-SNAPSHOT</version>
     </parent>
     <groupId>org.collectionspace.services</groupId>
     <artifactId>org.collectionspace.services.common-test</artifactId>
-    <version>2.1-SNAPSHOT</version>
+    <version>2.2-SNAPSHOT</version>
     <name>services.common-test</name>
     <url>http://maven.apache.org</url>
     <packaging>jar</packaging>

diff --git a/services/common/pom.xml b/services/common/pom.xml
index ded6381d2ebc1d644387ef9ebef96ac7bd02bd7e..cb15ea4fef72e5156729b92005d182a58d81944f 100644 (file)
--- a/services/common/pom.xml
+++ b/services/common/pom.xml
@@ -3,7 +3,7 @@
     <parent>\r
         <groupId>org.collectionspace.services</groupId>\r
         <artifactId>org.collectionspace.services.main</artifactId>\r
-        <version>2.1-SNAPSHOT</version>\r
+        <version>2.2-SNAPSHOT</version>\r
     </parent>\r
 \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/common/src/main/java/org/collectionspace/services/common/SecurityResourceBase.java b/services/common/src/main/java/org/collectionspace/services/common/SecurityResourceBase.java
index 596a88d291eae1e5e44e4677360c82abb1fdc733..8573b994775247a19d4eec41968c12950348c254 100644 (file)
--- a/services/common/src/main/java/org/collectionspace/services/common/SecurityResourceBase.java
+++ b/services/common/src/main/java/org/collectionspace/services/common/SecurityResourceBase.java
@@ -1,6 +1,5 @@
 package org.collectionspace.services.common;
 
-import org.collectionspace.services.authorization.Role;
 import org.collectionspace.services.common.context.ServiceContext;
 import org.collectionspace.services.common.document.DocumentFilter;
 import org.collectionspace.services.common.document.DocumentHandler;

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 26fa885132e13bf842bc005c9e6dcd11f4dd245a..0c8d4b377e5dd688656f480156c29966cbef94b7 100644 (file)
--- 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
@@ -1,7 +1,7 @@
 /**
  *  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:
+ *  for museums and related institutions.
 
  *  http://www.collectionspace.org
  *  http://wiki.collectionspace.org

diff --git a/services/common/src/main/java/org/collectionspace/services/common/imaging/nuxeo/NuxeoImageUtils.java b/services/common/src/main/java/org/collectionspace/services/common/imaging/nuxeo/NuxeoImageUtils.java
index 0f663c42988b26377282d6941323f23fa7656795..656ccc5a044c81cf2cf21b79fb9f447b6dbf02d9 100644 (file)
--- a/services/common/src/main/java/org/collectionspace/services/common/imaging/nuxeo/NuxeoImageUtils.java
+++ b/services/common/src/main/java/org/collectionspace/services/common/imaging/nuxeo/NuxeoImageUtils.java
@@ -16,7 +16,7 @@
  * http://www.collectionspace.org\r
  * http://wiki.collectionspace.org\r
  *\r
- * Copyright © 2009 {Contributing Institution}\r
+ * Copyright © 2009 {Contributing Institution}.\r
  *\r
  * Licensed under the Educational Community License (ECL), Version 2.0.\r
  * You may not use this file except in compliance with this License.\r
@@ -38,8 +38,8 @@ import java.util.List;
 import java.util.Map;\r
 \r
 import org.nuxeo.runtime.api.Framework;\r
-import org.nuxeo.runtime.api.ServiceManager;\r
-import org.nuxeo.runtime.api.ServiceDescriptor;\r
+//import org.nuxeo.runtime.api.ServiceManager;\r
+//import org.nuxeo.runtime.api.ServiceDescriptor;\r
 \r
 //import org.nuxeo.common.utils.FileUtils;\r
 \r
@@ -57,8 +57,8 @@ import org.nuxeo.ecm.core.repository.RepositoryDescriptor;
 import org.nuxeo.ecm.core.repository.RepositoryManager;\r
 \r
 import org.nuxeo.ecm.core.repository.RepositoryService;\r
-import org.nuxeo.runtime.model.ComponentManager;\r
-import org.nuxeo.runtime.model.impl.ComponentManagerImpl;\r
+//import org.nuxeo.runtime.model.ComponentManager;\r
+//import org.nuxeo.runtime.model.impl.ComponentManagerImpl;\r
 //import org.nuxeo.ecm.core.api.ejb.DocumentManagerBean;\r
 //import org.nuxeo.ecm.core.storage.sql.RepositoryImpl;\r
 //import org.nuxeo.ecm.core.storage.sql.Repository;\r

diff --git a/services/common/src/main/java/org/collectionspace/services/common/security/SecurityUtils.java b/services/common/src/main/java/org/collectionspace/services/common/security/SecurityUtils.java
index 42ae418886d0150e345d854e7e10d692e8d97a87..92ff4be67ec58f1b4d489b284938bd11ddb280e2 100644 (file)
--- a/services/common/src/main/java/org/collectionspace/services/common/security/SecurityUtils.java
+++ b/services/common/src/main/java/org/collectionspace/services/common/security/SecurityUtils.java
@@ -45,6 +45,7 @@ import org.jboss.security.Base64Utils;
  */
 public class SecurityUtils {
 
+       private static final String ADMIN_TENANT_ID = "0";
     private static final Logger logger = LoggerFactory.getLogger(SecurityUtils.class);
     public static final String URI_PATH_SEPARATOR = "/";
     public static final int MIN_PASSWORD_LENGTH = 8;
@@ -205,16 +206,22 @@ public class SecurityUtils {
      * @return
      */
     public static boolean isCSpaceAdmin() {
-        String tenantId = AuthN.get().getCurrentTenantId();
+       boolean result = false;
+       
+       String tenantId = null;
+       try {
+               tenantId = AuthN.get().getCurrentTenantId();
+       } catch (Throwable e) {
+               tenantId = ADMIN_TENANT_ID;
+       }
+       
         if (tenantId != null) {
-            if (!"0".equals(tenantId)) {
-                return false;
-            } else {
-                return true;
+            if (ADMIN_TENANT_ID.equals(tenantId) == true) {
+                result = true;
             }
-        } else {
-            return false;
         }
+        
+        return result;
     }
     
     public static String createPasswordHash(String hashAlgorithm, String hashEncoding, String hashCharset, String username, String password)

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 60685d6fb07d296111994c084abe9fc53e4d51d2..01153762e9a0ba3e28ecc8db671326b91cd9373d 100644 (file)
--- 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
@@ -11,7 +11,7 @@
  *  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
+ *  You may obtain a copy of the ECL 2.0 License at:
 
  *  https://source.collectionspace.org/collection-space/LICENSE.txt
 
@@ -34,17 +34,13 @@ import javax.persistence.EntityManagerFactory;
 import javax.persistence.NoResultException;
 import javax.persistence.Persistence;
 import javax.persistence.Query;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.Response;
 
 import org.collectionspace.authentication.AuthN;
 import org.collectionspace.services.authorization.AccountPermission;
 import org.collectionspace.services.authorization.AccountValue;
-import org.collectionspace.services.authorization.AccountRole;
 import org.collectionspace.services.authorization.AccountRoleRel;
 import org.collectionspace.services.authorization.AuthZ;
 import org.collectionspace.services.authorization.CSpaceResource;
-import org.collectionspace.services.authorization.PermissionRole;
 import org.collectionspace.services.authorization.PermissionRoleRel;
 import org.collectionspace.services.authorization.PermissionValue;
 import org.collectionspace.services.authorization.URIResourceImpl;
@@ -64,10 +60,14 @@ import org.slf4j.LoggerFactory;
 public class JpaStorageUtils {
 
     final private static Logger logger = LoggerFactory.getLogger(JpaStorageUtils.class);
+    
     /** The Constant CS_PERSISTENCE_UNIT. */
     public final static String CS_PERSISTENCE_UNIT = "org.collectionspace.services";
     private final static String CS_AUTHZ_PERSISTENCE_UNIT = "org.collectionspace.services.authorization";
     public final static String CS_CURRENT_USER = "0";
+    
+    // This is the column name for ID field of all the JPA objects
+    public static final String CSID_LABEL = "csid";
 
     /**
      * getEntity for given id and class
@@ -295,7 +295,70 @@ public class JpaStorageUtils {
         }
         return result;
     }
+    
+    public static Object getEnityByKey(String entityName, String key, String value,
+            String tenantId) {
+        EntityManagerFactory emf = null;
+        EntityManager em = null;
+        Object o = null;
+        
+        if (entityName == null) {
+            throw new IllegalArgumentException("entityName is required");
+        }
+        if (key == null) {
+            throw new IllegalArgumentException("id is required");
+        }
+        if (tenantId == null) {
+            throw new IllegalArgumentException("tenantId is required");
+        }
+        try {
+            StringBuilder queryStrBldr = new StringBuilder("SELECT a FROM ");
+            queryStrBldr.append(entityName);
+            queryStrBldr.append(" a");
+            queryStrBldr.append(" WHERE " + key + " = :" + key);
+            boolean csAdmin = SecurityUtils.isCSpaceAdmin();
+            if (!csAdmin) {
+                queryStrBldr.append(" AND tenantId = :tenantId");
+            }
+            emf = getEntityManagerFactory();
+            em = emf.createEntityManager();
+            String queryStr = queryStrBldr.toString(); //for debugging
+            Query q = em.createQuery(queryStr);
+            q.setParameter(key, value);
+            if (!csAdmin) {
+                q.setParameter("tenantId", tenantId);
+            }
+            o = q.getSingleResult();
+        } catch (NoResultException nre) {
+            if (em != null && em.getTransaction().isActive()) {
+                em.getTransaction().rollback();
+            }
+            if (logger.isDebugEnabled()) {
+                logger.debug("Could not find entity with key ={" + key + "=" + value + "}", nre);
+            }
+            //returns null
+        } catch (Exception e) {
+            if (em != null && em.getTransaction().isActive()) {
+                em.getTransaction().rollback();
+            }
+            if (logger.isDebugEnabled()) {
+                logger.debug("could not find entity(2) with id=" + key, e);
+            }
+            //returns null
+        } finally {
+            if (em != null) {
+                releaseEntityManagerFactory(emf);
+            }
+        }
+        
+        return o;
+    }
 
+    public static Object getEntity(String entityName, String id,
+            String tenantId) {
+       return getEnityByKey(entityName, CSID_LABEL, id, tenantId);
+    }
+    
     /**
      * getEntity 
      * @param entityName fully qualified entity name
@@ -303,7 +366,8 @@ public class JpaStorageUtils {
      * @param tenantId
      * @return null if entity is not found
      */
-    public static Object getEntity(String entityName, String id,
+    @Deprecated
+    public static Object oldgetEntity(String entityName, String id,
             String tenantId) {
         EntityManagerFactory emf = null;
         EntityManager em = null;

diff --git a/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/RepositoryJavaClientImpl.java b/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/RepositoryJavaClientImpl.java
index 0972066ea0705f9e61c90d32af7ba9256400b953..9b66ad51ef3f2a688ebf54ae54cab4a73662b053 100644 (file)
--- a/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/RepositoryJavaClientImpl.java
+++ b/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/RepositoryJavaClientImpl.java
@@ -17,7 +17,9 @@
  */
 package org.collectionspace.services.nuxeo.client.java;
 
+import java.util.ArrayList;
 import java.util.Hashtable;
+import java.util.Iterator;
 import java.util.List;
 import java.util.UUID;
 
@@ -1015,6 +1017,35 @@ public class RepositoryJavaClientImpl implements RepositoryClient<PoxPayloadIn,
         return domainId;
     }
 
+    /*
+        * Returns the workspaces root directory for a given domain.
+        */
+       private DocumentModel getWorkspacesRoot(RepositoryInstance repoSession,
+                       String domainName) throws Exception {
+               DocumentModel result = null;
+               
+               String domainPath = "/" + domainName;
+               DocumentRef parentDocRef = new PathRef(domainPath);
+               DocumentModelList domainChildrenList = repoSession.getChildren(
+                               parentDocRef);
+               Iterator<DocumentModel> witer = domainChildrenList.iterator();
+               while (witer.hasNext()) {
+                       DocumentModel childNode = witer.next();
+                       if (NuxeoUtils.Workspaces.equalsIgnoreCase(childNode.getName())) {
+                               result = childNode;
+                               logger.trace("Found workspaces directory at: " + result.getPathAsString());
+                               break;
+                       }
+               }
+               
+               if (result == null) {
+                       throw new ClientException("Could not find workspace root directory in: "
+                                       + domainPath);
+               }
+
+               return result;
+       }
+    
     /* (non-Javadoc)
      * @see org.collectionspace.services.common.repository.RepositoryClient#createWorkspace(java.lang.String, java.lang.String)
      */
@@ -1024,26 +1055,9 @@ public class RepositoryJavaClientImpl implements RepositoryClient<PoxPayloadIn,
         String workspaceId = null;
         try {
             repoSession = getRepositorySession();
-            String parentDocRefPath = "/" + domainName + "/" + NuxeoUtils.Workspaces;
-            DocumentRef parentDocRef = new PathRef(
-                    "/" + domainName
-                    + "/" + NuxeoUtils.Workspaces);
-            if (logger.isDebugEnabled()) {
-                logger.debug("Fetching "+NuxeoUtils.Workspaces+", path=" + parentDocRefPath
-                        + " docRef:" + parentDocRef.toString());
-            }
-            DocumentModel parentDoc = null;
-            try {
-               parentDoc = repoSession.getDocument(parentDocRef);
-            } catch(ClientException ce) {
-                logger.error("Failed to get "+NuxeoUtils.Workspaces+", path=" + parentDocRefPath
-                        + " docRef:" + parentDocRef.toString());
-               // try again for debugging
-                parentDoc = repoSession.getDocument(parentDocRef);
-                //throw ce;
-            }
+            DocumentModel parentDoc = getWorkspacesRoot(repoSession, domainName);            
             DocumentModel doc = repoSession.createDocumentModel(parentDoc.getPathAsString(),
-                    workspaceName, "Workspace");
+                    workspaceName, NuxeoUtils.WORKSPACE_DOCUMENT_TYPE);
             doc.setPropertyValue("dc:title", workspaceName);
             doc.setPropertyValue("dc:description", "A CollectionSpace workspace for "
                     + workspaceName);
@@ -1051,7 +1065,7 @@ public class RepositoryJavaClientImpl implements RepositoryClient<PoxPayloadIn,
             workspaceId = doc.getId();
             repoSession.save();
             if (logger.isDebugEnabled()) {
-                logger.debug("created workspace name=" + workspaceName
+                logger.debug("Created workspace name=" + workspaceName
                         + " id=" + workspaceId);
             }
         } catch (Exception e) {

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 7888850c16b8c27935a96013597e650bb0b9da94..614d32e624995aef926568d3ba81ca549c8a85fc 100644 (file)
--- 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
@@ -86,9 +86,11 @@ public class NuxeoUtils {
     // Base document type in Nuxeo is "Document"
     //
     public static final String BASE_DOCUMENT_TYPE = "Document";
-//    public static final String WORKSPACES = "workspaces";
-    public static final String Workspaces = "Workspaces";
+    public static final String WORKSPACE_DOCUMENT_TYPE = "Workspace";
     
+    public static final String Workspaces = "Workspaces";
+    public static final String workspaces = "workspaces"; // to make it easier to migrate older versions of the CollectionSpace services -i.e., pre v2.0.
+        
     // Regular expressions pattern for identifying valid ORDER BY clauses.
     // FIXME: Currently supports only USASCII word characters in field names.
     //private static final String ORDER_BY_CLAUSE_REGEX = "\\w+(_\\w+)?:\\w+( ASC| DESC)?(, \\w+(_\\w+)?:\\w+( ASC| DESC)?)*";    

diff --git a/services/contact/3rdparty/nuxeo-platform-cs-contact/pom.xml b/services/contact/3rdparty/nuxeo-platform-cs-contact/pom.xml
index c24aeef7111c1ecf60128bd60856b6c0e6fda9f8..dbe06841f9d4bd6cf07a437a43176e06018ab786 100644 (file)
--- a/services/contact/3rdparty/nuxeo-platform-cs-contact/pom.xml
+++ b/services/contact/3rdparty/nuxeo-platform-cs-contact/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.contact.3rdparty</artifactId>
-        <version>2.1-SNAPSHOT</version>
+        <version>2.2-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/contact/3rdparty/pom.xml b/services/contact/3rdparty/pom.xml
index 2be58d6acde7bd2404fa98daeaeca1f5e947c257..f0a849ade4db214719572747c03919546b95cca6 100644 (file)
--- a/services/contact/3rdparty/pom.xml
+++ b/services/contact/3rdparty/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.contact</artifactId>
-        <version>2.1-SNAPSHOT</version>
+        <version>2.2-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/contact/client/pom.xml b/services/contact/client/pom.xml
index 5d19581997e57369a9bb02c53be49a9442e2636f..f65850946bd5da744964cb02bb058591c8b1bf30 100644 (file)
--- a/services/contact/client/pom.xml
+++ b/services/contact/client/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>org.collectionspace.services.contact</artifactId>
         <groupId>org.collectionspace.services</groupId>
-        <version>2.1-SNAPSHOT</version>
+        <version>2.2-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/contact/jaxb/pom.xml b/services/contact/jaxb/pom.xml
index 92a8e48a10922439f999273b76f8e141901939e8..10da82ca1f673d03e8467dea80f9dab6929a1c0b 100644 (file)
--- a/services/contact/jaxb/pom.xml
+++ b/services/contact/jaxb/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.contact</artifactId>
-        <version>2.1-SNAPSHOT</version>
+        <version>2.2-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/contact/pom.xml b/services/contact/pom.xml
index dfb73705565e25e559e0e849a908e147fe884a84..ee7db8be2d416664ef8da16db5f6ab8b8da61f8d 100644 (file)
--- a/services/contact/pom.xml
+++ b/services/contact/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>org.collectionspace.services.main</artifactId>
         <groupId>org.collectionspace.services</groupId>
-        <version>2.1-SNAPSHOT</version>
+        <version>2.2-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/contact/service/pom.xml b/services/contact/service/pom.xml
index c7a414cc2ba78344dd675dbd1e5af3d1b22c4d9f..a31e97dd81831e5f4c4383dec8df30243aede7ee 100644 (file)
--- a/services/contact/service/pom.xml
+++ b/services/contact/service/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>org.collectionspace.services.contact</artifactId>
         <groupId>org.collectionspace.services</groupId>
-        <version>2.1-SNAPSHOT</version>
+        <version>2.2-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/dimension/3rdparty/nuxeo-platform-cs-dimension/pom.xml b/services/dimension/3rdparty/nuxeo-platform-cs-dimension/pom.xml
index d4476ec9b15df18d05ccd59661b6b9f8a43272eb..6ba8f27078a665f1732ff31d95fb76193c18f799 100644 (file)
--- a/services/dimension/3rdparty/nuxeo-platform-cs-dimension/pom.xml
+++ b/services/dimension/3rdparty/nuxeo-platform-cs-dimension/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.dimension.3rdparty</artifactId>
-        <version>2.1-SNAPSHOT</version>
+        <version>2.2-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/dimension/3rdparty/pom.xml b/services/dimension/3rdparty/pom.xml
index f5a76db79f9e371b1f471e8c80bc472a4937c417..4e722219571e6b01a2aa2a7d4b7c6aeb4ca29585 100644 (file)
--- a/services/dimension/3rdparty/pom.xml
+++ b/services/dimension/3rdparty/pom.xml
@@ -5,7 +5,7 @@
     <parent>\r
         <groupId>org.collectionspace.services</groupId>\r
         <artifactId>org.collectionspace.services.dimension</artifactId>\r
-        <version>2.1-SNAPSHOT</version>\r
+        <version>2.2-SNAPSHOT</version>\r
     </parent>\r
     \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/dimension/client/pom.xml b/services/dimension/client/pom.xml
index f10ab8f0cccdd98659018877bb70ef7e3e06583d..20784b837216cc79dc4b100877a2a24f10707e23 100644 (file)
--- a/services/dimension/client/pom.xml
+++ b/services/dimension/client/pom.xml
@@ -6,7 +6,7 @@
     <parent>\r
         <groupId>org.collectionspace.services</groupId>\r
         <artifactId>org.collectionspace.services.dimension</artifactId>\r
-        <version>2.1-SNAPSHOT</version>\r
+        <version>2.2-SNAPSHOT</version>\r
     </parent>\r
 \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/dimension/jaxb/pom.xml b/services/dimension/jaxb/pom.xml
index 3bbba1b9064a0170676cf553dea23f9f11b19c12..988e9964d98dd604dc81470c5a0ef2a860a74e6e 100644 (file)
--- a/services/dimension/jaxb/pom.xml
+++ b/services/dimension/jaxb/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.dimension</artifactId>
-        <version>2.1-SNAPSHOT</version>
+        <version>2.2-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/dimension/pom.xml b/services/dimension/pom.xml
index b1097c2c9c67d05bbe23124cd8a21c35b2e796f2..e30e2fc0da6ac5e8a0b4d41b05dac148b3ba2fe3 100644 (file)
--- a/services/dimension/pom.xml
+++ b/services/dimension/pom.xml
@@ -5,7 +5,7 @@
     <parent>\r
         <artifactId>org.collectionspace.services.main</artifactId>\r
         <groupId>org.collectionspace.services</groupId>\r
-        <version>2.1-SNAPSHOT</version>\r
+        <version>2.2-SNAPSHOT</version>\r
     </parent>\r
 \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/dimension/service/pom.xml b/services/dimension/service/pom.xml
index 39787294ba52413a9218ee00b6e1caf66c716ac2..f254634de5a22432a46d456a26881fd87f37c1c4 100644 (file)
--- a/services/dimension/service/pom.xml
+++ b/services/dimension/service/pom.xml
@@ -4,7 +4,7 @@
     <parent>\r
         <groupId>org.collectionspace.services</groupId>\r
         <artifactId>org.collectionspace.services.dimension</artifactId>\r
-        <version>2.1-SNAPSHOT</version>\r
+        <version>2.2-SNAPSHOT</version>\r
     </parent>\r
     \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/group/3rdparty/nuxeo-platform-cs-group/pom.xml b/services/group/3rdparty/nuxeo-platform-cs-group/pom.xml
index b223d1d424b6c912c9ce22afe46f50a5596cc571..7c073f5ef21dcd7acda8e38d63b1713aa7cefcba 100644 (file)
--- a/services/group/3rdparty/nuxeo-platform-cs-group/pom.xml
+++ b/services/group/3rdparty/nuxeo-platform-cs-group/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.group.3rdparty</artifactId>
-        <version>2.1-SNAPSHOT</version>
+        <version>2.2-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/group/3rdparty/pom.xml b/services/group/3rdparty/pom.xml
index f78f7624602509992c3c6287c1954d0f855176e8..1d911565d9968755434e71818fd9517d73efbb3b 100644 (file)
--- a/services/group/3rdparty/pom.xml
+++ b/services/group/3rdparty/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>org.collectionspace.services.group</artifactId>
         <groupId>org.collectionspace.services</groupId>
-        <version>2.1-SNAPSHOT</version>
+        <version>2.2-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/group/client/pom.xml b/services/group/client/pom.xml
index a4ae3bdff00731f206da5fbde453b98c9c293095..98ef64b805c6a845060b41ed80b9b85bb8017bdd 100644 (file)
--- a/services/group/client/pom.xml
+++ b/services/group/client/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.group</artifactId>
-        <version>2.1-SNAPSHOT</version>
+        <version>2.2-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/group/jaxb/pom.xml b/services/group/jaxb/pom.xml
index 77dcdcf54f35e01c5af83b453460e103e9caf0dd..c48602cd4fe611774860ef827d890fa2812303d4 100644 (file)
--- a/services/group/jaxb/pom.xml
+++ b/services/group/jaxb/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>org.collectionspace.services.group</artifactId>
         <groupId>org.collectionspace.services</groupId>
-        <version>2.1-SNAPSHOT</version>
+        <version>2.2-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/group/pom.xml b/services/group/pom.xml
index 5274cb40b48844624ca2d1848969e04677a7a39e..37e6fa0d197b9ec893617bf275d99e274101174d 100644 (file)
--- a/services/group/pom.xml
+++ b/services/group/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.main</artifactId>
-        <version>2.1-SNAPSHOT</version>
+        <version>2.2-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/group/service/pom.xml b/services/group/service/pom.xml
index a3464eea70fd71448ac97ccf3ecc68b7e0c49582..15653a7d361081fdd18ca9a83f88a23f4c62f34c 100644 (file)
--- a/services/group/service/pom.xml
+++ b/services/group/service/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.group</artifactId>        
-        <version>2.1-SNAPSHOT</version>
+        <version>2.2-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/hyperjaxb/pom.xml b/services/hyperjaxb/pom.xml
index 09adf7a576b67627719bc8328eca6f04c8923fce..d1f7d570910e598afe5cf120184ca76f1c0377eb 100644 (file)
--- a/services/hyperjaxb/pom.xml
+++ b/services/hyperjaxb/pom.xml
@@ -26,7 +26,7 @@
   <parent>\r
     <groupId>org.collectionspace.services</groupId>\r
     <artifactId>org.collectionspace.services.main</artifactId>\r
-    <version>2.1-SNAPSHOT</version>\r
+    <version>2.2-SNAPSHOT</version>\r
   </parent>\r
   \r
   <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/id/3rdparty/pom.xml b/services/id/3rdparty/pom.xml
index aba75763ea81d1cb1d5b4cfd6ad7231e96429a41..6959e4704b56477222b05731e8c2a503a9619638 100644 (file)
--- a/services/id/3rdparty/pom.xml
+++ b/services/id/3rdparty/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.id</artifactId>
-        <version>2.1-SNAPSHOT</version>
+        <version>2.2-SNAPSHOT</version>
     </parent>
         
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/id/client/pom.xml b/services/id/client/pom.xml
index 48a95f4fc57e133d8b0f4c60ec3d822c63b55c92..813fc6cdd067a096ca3afff9bca3ca4f87f80f2c 100644 (file)
--- a/services/id/client/pom.xml
+++ b/services/id/client/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.id</artifactId>
-        <version>2.1-SNAPSHOT</version>
+        <version>2.2-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
@@ -22,7 +22,7 @@
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.id.service</artifactId>
-            <version>2.1-SNAPSHOT</version>
+            <version>2.2-SNAPSHOT</version>
             <scope>test</scope>
             <type>jar</type>
         </dependency>

diff --git a/services/id/jaxb/pom.xml b/services/id/jaxb/pom.xml
index 04a4520a401598221eeb78de35d5b05eefd80632..8ab76966a4e62ffc1b5e2a9659eba559ce6c81e6 100644 (file)
--- a/services/id/jaxb/pom.xml
+++ b/services/id/jaxb/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.collectionspace.services</groupId>
     <artifactId>org.collectionspace.services.id</artifactId>
-    <version>2.1-SNAPSHOT</version>
+    <version>2.2-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

diff --git a/services/id/pom.xml b/services/id/pom.xml
index 21c17f2ea2f19a021011702cca353815542e6175..bdde9bfe0610e22f18e0ae828fb5daac92e96d68 100644 (file)
--- a/services/id/pom.xml
+++ b/services/id/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.collectionspace.services</groupId>
     <artifactId>org.collectionspace.services.main</artifactId>
-    <version>2.1-SNAPSHOT</version>
+    <version>2.2-SNAPSHOT</version>
   </parent>
   
   <modelVersion>4.0.0</modelVersion>

diff --git a/services/id/service/pom.xml b/services/id/service/pom.xml
index 736bdd52164bbc15258667125ab94be8df6fdf67..242237580fbaac388cef9116b4ca71ea98db25ef 100644 (file)
--- a/services/id/service/pom.xml
+++ b/services/id/service/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <artifactId>org.collectionspace.services.id</artifactId>
     <groupId>org.collectionspace.services</groupId>
-    <version>2.1-SNAPSHOT</version>
+    <version>2.2-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

diff --git a/services/imports/3rdparty/nuxeo-platform-cs-imports/pom.xml b/services/imports/3rdparty/nuxeo-platform-cs-imports/pom.xml
index ce76192a71d5f90017f11b8fa75676248c330ea0..73092de592a3720ea1c7bf0a99271ee1c95fe714 100755 (executable)
--- a/services/imports/3rdparty/nuxeo-platform-cs-imports/pom.xml
+++ b/services/imports/3rdparty/nuxeo-platform-cs-imports/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.imports.3rdparty</artifactId>
-        <version>2.1-SNAPSHOT</version>
+        <version>2.2-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/imports/3rdparty/pom.xml b/services/imports/3rdparty/pom.xml
index ce0fa9afcab31fc196e901625f1042f547b6f6b5..8ae733ce8c0db1b3cc47431a7939092b3b3614b1 100755 (executable)
--- a/services/imports/3rdparty/pom.xml
+++ b/services/imports/3rdparty/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>org.collectionspace.services.imports</artifactId>
         <groupId>org.collectionspace.services</groupId>
-        <version>2.1-SNAPSHOT</version>
+        <version>2.2-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/imports/jaxb/pom.xml b/services/imports/jaxb/pom.xml
index 13c0fb16827d7e6ee83abb7fb03c37bb3352ecf7..60a3fed9ec5519fb361c58ef6f9a25b8aca9016a 100755 (executable)
--- a/services/imports/jaxb/pom.xml
+++ b/services/imports/jaxb/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>org.collectionspace.services.imports</artifactId>
         <groupId>org.collectionspace.services</groupId>
-        <version>2.1-SNAPSHOT</version>
+        <version>2.2-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/imports/pom.xml b/services/imports/pom.xml
index 0cfe8085191d6f7fb9e94228caf5ad40246ad2ab..aa0e42093b3d7f1a0dbf1d390e64347747574c59 100755 (executable)
--- a/services/imports/pom.xml
+++ b/services/imports/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.main</artifactId>
-        <version>2.1-SNAPSHOT</version>
+        <version>2.2-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/imports/service/pom.xml b/services/imports/service/pom.xml
index 2363444a91c3dffaedfe3b329cc76717d2c5979e..5709397230472aa2cb11f8c96d7915524ebed7ad 100755 (executable)
--- a/services/imports/service/pom.xml
+++ b/services/imports/service/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.imports</artifactId>        
-        <version>2.1-SNAPSHOT</version>
+        <version>2.2-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/intake/3rdparty/nuxeo-platform-cs-intake/pom.xml b/services/intake/3rdparty/nuxeo-platform-cs-intake/pom.xml
index bb7944392e202d416aafe2d5b329f02580ed01ab..fdc41aa9edebb8d693b66047e83ed7364f236259 100644 (file)
--- a/services/intake/3rdparty/nuxeo-platform-cs-intake/pom.xml
+++ b/services/intake/3rdparty/nuxeo-platform-cs-intake/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.intake.3rdparty</artifactId>
-        <version>2.1-SNAPSHOT</version>
+        <version>2.2-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/intake/3rdparty/pom.xml b/services/intake/3rdparty/pom.xml
index a3ab20bb36ba06c553eb40f9b5bb5ef42bf50152..5c061bd83a20eb68b20e0879c8b8247601d80b42 100644 (file)
--- a/services/intake/3rdparty/pom.xml
+++ b/services/intake/3rdparty/pom.xml
@@ -5,7 +5,7 @@
     <parent>\r
         <artifactId>org.collectionspace.services.intake</artifactId>\r
         <groupId>org.collectionspace.services</groupId>\r
-        <version>2.1-SNAPSHOT</version>\r
+        <version>2.2-SNAPSHOT</version>\r
     </parent>\r
     \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/intake/client/pom.xml b/services/intake/client/pom.xml
index 241e62f8f97368e437dc90aad01d23d69f8756d5..151e44cf3a3ed91d64a37622132e8ccf25924851 100644 (file)
--- a/services/intake/client/pom.xml
+++ b/services/intake/client/pom.xml
@@ -5,7 +5,7 @@
     <parent>\r
         <groupId>org.collectionspace.services</groupId>\r
         <artifactId>org.collectionspace.services.intake</artifactId>\r
-        <version>2.1-SNAPSHOT</version>\r
+        <version>2.2-SNAPSHOT</version>\r
     </parent>\r
 \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/intake/jaxb/pom.xml b/services/intake/jaxb/pom.xml
index f40af5579e38b55a0a1e4d5d0c17418809baabc9..844038dd2aea486918a4ed384d83b7990fc98366 100644 (file)
--- a/services/intake/jaxb/pom.xml
+++ b/services/intake/jaxb/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>org.collectionspace.services.intake</artifactId>
         <groupId>org.collectionspace.services</groupId>
-        <version>2.1-SNAPSHOT</version>
+        <version>2.2-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/intake/pom.xml b/services/intake/pom.xml
index 8aeb948ebfa8b50824a2f1427b788620b5dc8953..01cd251644c72a3f32b96413b90a02ea6335389b 100644 (file)
--- a/services/intake/pom.xml
+++ b/services/intake/pom.xml
@@ -4,7 +4,7 @@
     <parent>\r
         <groupId>org.collectionspace.services</groupId>\r
         <artifactId>org.collectionspace.services.main</artifactId>\r
-        <version>2.1-SNAPSHOT</version>\r
+        <version>2.2-SNAPSHOT</version>\r
     </parent>\r
     \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/intake/service/pom.xml b/services/intake/service/pom.xml
index 4ecea62b7dcfdd4bd97f5d96422ec7e3d4ba94b2..55a4a64b5c2b18e7cdb153991135ecf01bb35474 100644 (file)
--- a/services/intake/service/pom.xml
+++ b/services/intake/service/pom.xml
@@ -4,7 +4,7 @@
     <parent>\r
         <groupId>org.collectionspace.services</groupId>\r
         <artifactId>org.collectionspace.services.intake</artifactId>        \r
-        <version>2.1-SNAPSHOT</version>\r
+        <version>2.2-SNAPSHOT</version>\r
     </parent>\r
     \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/jaxb/pom.xml b/services/jaxb/pom.xml
index 74899d25f22e28b666e2634f301751cae4bcf2b4..a25ba55da93223ca1669129d9a442c2e0ebac6ac 100644 (file)
--- a/services/jaxb/pom.xml
+++ b/services/jaxb/pom.xml
@@ -14,7 +14,7 @@
        <parent>\r
                <groupId>org.collectionspace.services</groupId>\r
                <artifactId>org.collectionspace.services.main</artifactId>\r
-               <version>2.1-SNAPSHOT</version>\r
+               <version>2.2-SNAPSHOT</version>\r
        </parent>\r
 \r
        <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/loanin/3rdparty/nuxeo-platform-cs-loanin/pom.xml b/services/loanin/3rdparty/nuxeo-platform-cs-loanin/pom.xml
index 203486bda419727e4b7356f1c0eb4bad7210bb65..27b9b5d1de8b56d13f498abfb492b346be86aae5 100644 (file)
--- a/services/loanin/3rdparty/nuxeo-platform-cs-loanin/pom.xml
+++ b/services/loanin/3rdparty/nuxeo-platform-cs-loanin/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.loanin.3rdparty</artifactId>
-        <version>2.1-SNAPSHOT</version>
+        <version>2.2-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/loanin/3rdparty/pom.xml b/services/loanin/3rdparty/pom.xml
index 9c037f8b15f0e0e0fa227d309fdc0e66af42a85e..cb211605de3cdd2ed143a19ee1c8eaf3c44f4ff6 100644 (file)
--- a/services/loanin/3rdparty/pom.xml
+++ b/services/loanin/3rdparty/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>org.collectionspace.services.loanin</artifactId>
         <groupId>org.collectionspace.services</groupId>
-        <version>2.1-SNAPSHOT</version>
+        <version>2.2-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/loanin/client/pom.xml b/services/loanin/client/pom.xml
index 9e86adbdfdab9cca41358085350fa484c18d248f..a8837e72f426d7d07718487571a594adc09fe794 100644 (file)
--- a/services/loanin/client/pom.xml
+++ b/services/loanin/client/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.loanin</artifactId>
-        <version>2.1-SNAPSHOT</version>
+        <version>2.2-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/loanin/jaxb/pom.xml b/services/loanin/jaxb/pom.xml
index 910b1243ae5f1d628d9c772bc166ff4b7f312649..7207aa9fc137040a8063b3b5e5cf8d0a1b832ae0 100644 (file)
--- a/services/loanin/jaxb/pom.xml
+++ b/services/loanin/jaxb/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>org.collectionspace.services.loanin</artifactId>
         <groupId>org.collectionspace.services</groupId>
-        <version>2.1-SNAPSHOT</version>
+        <version>2.2-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/loanin/pom.xml b/services/loanin/pom.xml
index af49323ecadebcaf597cc6e6d92625c8b2c0f96d..04782992e2ed95346ec6cfada2aa8d19f0758c5f 100644 (file)
--- a/services/loanin/pom.xml
+++ b/services/loanin/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.main</artifactId>
-        <version>2.1-SNAPSHOT</version>
+        <version>2.2-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/loanin/service/pom.xml b/services/loanin/service/pom.xml
index 1933f2dbd837537a0a46e7f066717b901460970f..cb96f0324691eb41abef70d11152f50ae4fe53c0 100644 (file)
--- a/services/loanin/service/pom.xml
+++ b/services/loanin/service/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.loanin</artifactId>        
-        <version>2.1-SNAPSHOT</version>
+        <version>2.2-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/loanout/3rdparty/nuxeo-platform-cs-loanout/pom.xml b/services/loanout/3rdparty/nuxeo-platform-cs-loanout/pom.xml
index a5d57419ccd45fd923b8287992d94d66e0d4d516..5189d2dabf19258a90794b433dcb005202070dc9 100644 (file)
--- a/services/loanout/3rdparty/nuxeo-platform-cs-loanout/pom.xml
+++ b/services/loanout/3rdparty/nuxeo-platform-cs-loanout/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.loanout.3rdparty</artifactId>
-        <version>2.1-SNAPSHOT</version>
+        <version>2.2-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/loanout/3rdparty/pom.xml b/services/loanout/3rdparty/pom.xml
index 55430eb8f7b881e845f33fa1bd98b151127e6cdf..c8c231aea146ec02626d6f45af74cfbf03f84a6d 100644 (file)
--- a/services/loanout/3rdparty/pom.xml
+++ b/services/loanout/3rdparty/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>org.collectionspace.services.loanout</artifactId>
         <groupId>org.collectionspace.services</groupId>
-        <version>2.1-SNAPSHOT</version>
+        <version>2.2-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/loanout/client/pom.xml b/services/loanout/client/pom.xml
index da2c7d6b04e78ae35aa4ad99691ec14b19138828..addfa565a54f2175941e9aef676bddbf204a583e 100644 (file)
--- a/services/loanout/client/pom.xml
+++ b/services/loanout/client/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.loanout</artifactId>
-        <version>2.1-SNAPSHOT</version>
+        <version>2.2-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/loanout/jaxb/pom.xml b/services/loanout/jaxb/pom.xml
index 49740bbd7cff8e55304bee0bf5174159c42dee63..29cfe7771249d76421e20ee13453a1bf5013b07b 100644 (file)
--- a/services/loanout/jaxb/pom.xml
+++ b/services/loanout/jaxb/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>org.collectionspace.services.loanout</artifactId>
         <groupId>org.collectionspace.services</groupId>
-        <version>2.1-SNAPSHOT</version>
+        <version>2.2-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/loanout/pom.xml b/services/loanout/pom.xml
index 6a82974f7fb9682aaca05ee93b4ade29dd8e457d..37b48d38fbc4cb329142ba89408f70ca7f3d27c8 100644 (file)
--- a/services/loanout/pom.xml
+++ b/services/loanout/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.main</artifactId>
-        <version>2.1-SNAPSHOT</version>
+        <version>2.2-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/loanout/service/pom.xml b/services/loanout/service/pom.xml
index 5f80ca17d6e2355927267afea45c6a425bb6a3d3..e0cfa5a48cb034188f2c7d3d2edff81893f55b33 100644 (file)
--- a/services/loanout/service/pom.xml
+++ b/services/loanout/service/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.loanout</artifactId>        
-        <version>2.1-SNAPSHOT</version>
+        <version>2.2-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/location/3rdparty/nuxeo-platform-cs-location/pom.xml b/services/location/3rdparty/nuxeo-platform-cs-location/pom.xml
index d427c10d433e2dd5726abb4e05834e68afb52425..bd8303805e34bfaa83b8204a90697daa9291c567 100644 (file)
--- a/services/location/3rdparty/nuxeo-platform-cs-location/pom.xml
+++ b/services/location/3rdparty/nuxeo-platform-cs-location/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.location.3rdparty</artifactId>
-        <version>2.1-SNAPSHOT</version>
+        <version>2.2-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/location/3rdparty/pom.xml b/services/location/3rdparty/pom.xml
index f12ff7e0f84b091481f7ca0248efa787d38f8c81..4708e1566c51ebb6a0e5463f15a4180b63eac4ea 100644 (file)
--- a/services/location/3rdparty/pom.xml
+++ b/services/location/3rdparty/pom.xml
@@ -5,7 +5,7 @@
     <parent>\r
         <groupId>org.collectionspace.services</groupId>\r
         <artifactId>org.collectionspace.services.location</artifactId>\r
-        <version>2.1-SNAPSHOT</version>\r
+        <version>2.2-SNAPSHOT</version>\r
     </parent>\r
     \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/location/client/pom.xml b/services/location/client/pom.xml
index a62213f36b1a57c3c8e04f0ed6826dc9ed29d678..3cc8b17fb78f6070e082fc34778c535055469479 100644 (file)
--- a/services/location/client/pom.xml
+++ b/services/location/client/pom.xml
@@ -5,7 +5,7 @@
     <parent>\r
         <groupId>org.collectionspace.services</groupId>\r
         <artifactId>org.collectionspace.services.location</artifactId>\r
-        <version>2.1-SNAPSHOT</version>\r
+        <version>2.2-SNAPSHOT</version>\r
     </parent>\r
 \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/location/jaxb/pom.xml b/services/location/jaxb/pom.xml
index eec81618dc0e97cc631447ac5a433d2fe31e3d2f..0851eebbe05dcfd352763b21682c1415324aa25b 100644 (file)
--- a/services/location/jaxb/pom.xml
+++ b/services/location/jaxb/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.location</artifactId>
-        <version>2.1-SNAPSHOT</version>
+        <version>2.2-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/location/pom.xml b/services/location/pom.xml
index de7187d3889d0f362db377e49966955372cfd03b..8ad94cf4f68ae78db1a3606d3212cff5480b3762 100644 (file)
--- a/services/location/pom.xml
+++ b/services/location/pom.xml
@@ -3,7 +3,7 @@
     <parent>\r
         <groupId>org.collectionspace.services</groupId>\r
         <artifactId>org.collectionspace.services.main</artifactId>\r
-        <version>2.1-SNAPSHOT</version>\r
+        <version>2.2-SNAPSHOT</version>\r
     </parent>\r
 \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/location/service/pom.xml b/services/location/service/pom.xml
index 6af2334469ec5573d2b85b315deece34b2c31907..a051e5de498d49f752265769c6be3964464cceec 100644 (file)
--- a/services/location/service/pom.xml
+++ b/services/location/service/pom.xml
@@ -3,7 +3,7 @@
     <parent>\r
         <groupId>org.collectionspace.services</groupId>\r
         <artifactId>org.collectionspace.services.location</artifactId>\r
-        <version>2.1-SNAPSHOT</version>\r
+        <version>2.2-SNAPSHOT</version>\r
     </parent>\r
     \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/media/3rdparty/nuxeo-platform-cs-media/pom.xml b/services/media/3rdparty/nuxeo-platform-cs-media/pom.xml
index 7bb099e0b5f64b56341e7ace348e2af2e5853a2e..3ef7ef522d3d8d57a630459a8075c7869054d78c 100644 (file)
--- a/services/media/3rdparty/nuxeo-platform-cs-media/pom.xml
+++ b/services/media/3rdparty/nuxeo-platform-cs-media/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.media.3rdparty</artifactId>
-        <version>2.1-SNAPSHOT</version>
+        <version>2.2-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/media/3rdparty/pom.xml b/services/media/3rdparty/pom.xml
index 0bff8d71c14413340b10c6a9e5852545ca7eb7e5..01cc55528913a80c22bab11c3d6a7fee1661b972 100644 (file)
--- a/services/media/3rdparty/pom.xml
+++ b/services/media/3rdparty/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>org.collectionspace.services.media</artifactId>
         <groupId>org.collectionspace.services</groupId>
-        <version>2.1-SNAPSHOT</version>
+        <version>2.2-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/media/client/pom.xml b/services/media/client/pom.xml
index 066984d91c861d195300079cd7b11d0abdf57ded..fde3f2a748ede31cd9d54f6dfe58e8f898ea6ff3 100644 (file)
--- a/services/media/client/pom.xml
+++ b/services/media/client/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.media</artifactId>
-        <version>2.1-SNAPSHOT</version>
+        <version>2.2-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/media/jaxb/pom.xml b/services/media/jaxb/pom.xml
index 48e300c7935ed106684a9a778879cf421fd3f608..67a64d532f8b8298d32cef111d1fa75a6de7fb9f 100644 (file)
--- a/services/media/jaxb/pom.xml
+++ b/services/media/jaxb/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>org.collectionspace.services.media</artifactId>
         <groupId>org.collectionspace.services</groupId>
-        <version>2.1-SNAPSHOT</version>
+        <version>2.2-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/media/pom.xml b/services/media/pom.xml
index 9ff655220f3139d4291c8b6f2f292b433ba3e690..770f962ac5037364f661879fd9b2afb891e669ef 100644 (file)
--- a/services/media/pom.xml
+++ b/services/media/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.main</artifactId>
-        <version>2.1-SNAPSHOT</version>
+        <version>2.2-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/media/service/pom.xml b/services/media/service/pom.xml
index 5d04019ea52bb2cbcfd6cf2d2981089e8fbe422f..3dc963200ffbc54d48a48f220f5559b5dabe933d 100644 (file)
--- a/services/media/service/pom.xml
+++ b/services/media/service/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.media</artifactId>        
-        <version>2.1-SNAPSHOT</version>
+        <version>2.2-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/movement/3rdparty/nuxeo-platform-cs-movement/pom.xml b/services/movement/3rdparty/nuxeo-platform-cs-movement/pom.xml
index 0f252e6c59aed1157a1c91742f54ff02ff6e3023..0fceb5f5a8867a02cf74efaff3ac4033c6bf7ea0 100644 (file)
--- a/services/movement/3rdparty/nuxeo-platform-cs-movement/pom.xml
+++ b/services/movement/3rdparty/nuxeo-platform-cs-movement/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.movement.3rdparty</artifactId>
-        <version>2.1-SNAPSHOT</version>
+        <version>2.2-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/movement/3rdparty/pom.xml b/services/movement/3rdparty/pom.xml
index c1422649af4c822453e35f45fbd27dbfa5075490..882be4fbee1f5b688e4da08f88b1e929109a1a91 100644 (file)
--- a/services/movement/3rdparty/pom.xml
+++ b/services/movement/3rdparty/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>org.collectionspace.services.movement</artifactId>
         <groupId>org.collectionspace.services</groupId>
-        <version>2.1-SNAPSHOT</version>
+        <version>2.2-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/movement/client/pom.xml b/services/movement/client/pom.xml
index d0de00df37c90b373cf85422b9d94289b2ff6699..36362989a5eff653264cedef669439237ac04fbc 100644 (file)
--- a/services/movement/client/pom.xml
+++ b/services/movement/client/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.movement</artifactId>
-        <version>2.1-SNAPSHOT</version>
+        <version>2.2-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/movement/jaxb/pom.xml b/services/movement/jaxb/pom.xml
index ed6dfde0adf2e6dd55d0a548890920a5784f5e90..b9281ae997fea5dcf8bd6c52ae0fb4d823e43bbf 100644 (file)
--- a/services/movement/jaxb/pom.xml
+++ b/services/movement/jaxb/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>org.collectionspace.services.movement</artifactId>
         <groupId>org.collectionspace.services</groupId>
-        <version>2.1-SNAPSHOT</version>
+        <version>2.2-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/movement/pom.xml b/services/movement/pom.xml
index 2ee811adacca2c9cd8d15656b8ab002d8fcefe57..7179649521a9ba9aa1c4265f14e3d72c10c5bc24 100644 (file)
--- a/services/movement/pom.xml
+++ b/services/movement/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.main</artifactId>
-        <version>2.1-SNAPSHOT</version>
+        <version>2.2-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/movement/service/pom.xml b/services/movement/service/pom.xml
index 3ebae0ddb2a6ff491e2f46b3c6295ef7a0c05b23..0be808e6a474d3f95a84d7c6a7dd7fcfe548c21e 100644 (file)
--- a/services/movement/service/pom.xml
+++ b/services/movement/service/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.movement</artifactId>        
-        <version>2.1-SNAPSHOT</version>
+        <version>2.2-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/note/3rdparty/nuxeo-platform-cs-note/pom.xml b/services/note/3rdparty/nuxeo-platform-cs-note/pom.xml
index d0d4ae0e954850c3e94586b618cf6f6ec8c6ed3a..6d4621d330acd62be36b8107c49cc5becff05108 100644 (file)
--- a/services/note/3rdparty/nuxeo-platform-cs-note/pom.xml
+++ b/services/note/3rdparty/nuxeo-platform-cs-note/pom.xml
@@ -4,7 +4,7 @@
     <parent>\r
         <groupId>org.collectionspace.services</groupId>\r
         <artifactId>org.collectionspace.services.note.3rdparty</artifactId>\r
-        <version>2.1-SNAPSHOT</version>\r
+        <version>2.2-SNAPSHOT</version>\r
     </parent>\r
     \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/note/3rdparty/pom.xml b/services/note/3rdparty/pom.xml
index 168c53789d853f80b467676d1575b03b8dcdd07e..a575a89d5ffb7dc4f1343e335858e88313ff791c 100644 (file)
--- a/services/note/3rdparty/pom.xml
+++ b/services/note/3rdparty/pom.xml
@@ -5,7 +5,7 @@
     <parent>\r
         <groupId>org.collectionspace.services</groupId>\r
         <artifactId>org.collectionspace.services.note</artifactId>\r
-        <version>2.1-SNAPSHOT</version>\r
+        <version>2.2-SNAPSHOT</version>\r
     </parent>\r
 \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/note/client/pom.xml b/services/note/client/pom.xml
index 22ca843471eda8d38c8fe6bddcb7160f434c574f..351d0449bc39fa7854328f36ca558939d6e57473 100644 (file)
--- a/services/note/client/pom.xml
+++ b/services/note/client/pom.xml
@@ -5,7 +5,7 @@
     <parent>\r
         <artifactId>org.collectionspace.services.note</artifactId>\r
         <groupId>org.collectionspace.services</groupId>\r
-        <version>2.1-SNAPSHOT</version>\r
+        <version>2.2-SNAPSHOT</version>\r
     </parent>\r
 \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/note/jaxb/pom.xml b/services/note/jaxb/pom.xml
index 417d7d0038280c49d4696de058ef66bf0926554a..64fb7b8e28ea95c5d0b0284617473ec47ae78a78 100644 (file)
--- a/services/note/jaxb/pom.xml
+++ b/services/note/jaxb/pom.xml
@@ -5,7 +5,7 @@
     <parent>\r
         <groupId>org.collectionspace.services</groupId>\r
         <artifactId>org.collectionspace.services.note</artifactId>\r
-        <version>2.1-SNAPSHOT</version>\r
+        <version>2.2-SNAPSHOT</version>\r
     </parent>\r
     \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/note/pom.xml b/services/note/pom.xml
index ab79e5c279021c4a6ce3cb3693282f7294c534d3..918c4e9f5d7442ed011852deccc7536dfe0cab8d 100644 (file)
--- a/services/note/pom.xml
+++ b/services/note/pom.xml
@@ -4,7 +4,7 @@
     <parent>\r
         <artifactId>org.collectionspace.services.main</artifactId>\r
         <groupId>org.collectionspace.services</groupId>\r
-        <version>2.1-SNAPSHOT</version>\r
+        <version>2.2-SNAPSHOT</version>\r
     </parent>\r
     \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/note/service/pom.xml b/services/note/service/pom.xml
index ece15b7a0fcbdd07c870b31b4f366298127e7e19..0a530970a834b45e15f29c6c308efd3096744343 100644 (file)
--- a/services/note/service/pom.xml
+++ b/services/note/service/pom.xml
@@ -3,7 +3,7 @@
     <parent>\r
         <artifactId>org.collectionspace.services.note</artifactId>\r
         <groupId>org.collectionspace.services</groupId>\r
-        <version>2.1-SNAPSHOT</version>\r
+        <version>2.2-SNAPSHOT</version>\r
     </parent>\r
     \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/objectexit/3rdparty/nuxeo-platform-cs-objectexit/pom.xml b/services/objectexit/3rdparty/nuxeo-platform-cs-objectexit/pom.xml
index 19376122c2bed1d1e6f52ecc226005ac690e6951..5631df821c1ce822428b80e8372829c42599a78b 100644 (file)
--- a/services/objectexit/3rdparty/nuxeo-platform-cs-objectexit/pom.xml
+++ b/services/objectexit/3rdparty/nuxeo-platform-cs-objectexit/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.objectexit.3rdparty</artifactId>
-        <version>2.1-SNAPSHOT</version>
+        <version>2.2-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/objectexit/3rdparty/pom.xml b/services/objectexit/3rdparty/pom.xml
index 0d7427d4c0da8ab40f5ff59e918bd1472b9421b1..cb9e21c92ae7d7b62ba14189dcc1790ff08d702f 100644 (file)
--- a/services/objectexit/3rdparty/pom.xml
+++ b/services/objectexit/3rdparty/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>org.collectionspace.services.objectexit</artifactId>
         <groupId>org.collectionspace.services</groupId>
-        <version>2.1-SNAPSHOT</version>
+        <version>2.2-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/objectexit/client/pom.xml b/services/objectexit/client/pom.xml
index fafa40ba57e3291b1e1863780f7730f719f6e115..8fc63f80eda074b43705cacd1bc966022a46836a 100644 (file)
--- a/services/objectexit/client/pom.xml
+++ b/services/objectexit/client/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.objectexit</artifactId>
-        <version>2.1-SNAPSHOT</version>
+        <version>2.2-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/objectexit/jaxb/pom.xml b/services/objectexit/jaxb/pom.xml
index 9488285af4764cdaf4aea328bec7daf2e08f9169..4cc8d51c5d878548a5e7063560ef73976d77d09e 100644 (file)
--- a/services/objectexit/jaxb/pom.xml
+++ b/services/objectexit/jaxb/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>org.collectionspace.services.objectexit</artifactId>
         <groupId>org.collectionspace.services</groupId>
-        <version>2.1-SNAPSHOT</version>
+        <version>2.2-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/objectexit/pom.xml b/services/objectexit/pom.xml
index 411762782014cbc39a8667c23842e557cfc305c4..9b10149c5891f3e533afd1f1459d170e533c5436 100644 (file)
--- a/services/objectexit/pom.xml
+++ b/services/objectexit/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.main</artifactId>
-        <version>2.1-SNAPSHOT</version>
+        <version>2.2-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/objectexit/service/pom.xml b/services/objectexit/service/pom.xml
index a0e0a1effdafe2b309faed7f3166c9cd78444c02..b10155e5cab5d379982bbe40a29fbfb4f4003a94 100644 (file)
--- a/services/objectexit/service/pom.xml
+++ b/services/objectexit/service/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.objectexit</artifactId>        
-        <version>2.1-SNAPSHOT</version>
+        <version>2.2-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/organization/3rdparty/nuxeo-platform-cs-organization/pom.xml b/services/organization/3rdparty/nuxeo-platform-cs-organization/pom.xml
index e9e9747a92e0d18906234462911ce9a4adf2866e..37bd71dd1d4b03bb0de5378a9b5e3bc405b6325f 100644 (file)
--- a/services/organization/3rdparty/nuxeo-platform-cs-organization/pom.xml
+++ b/services/organization/3rdparty/nuxeo-platform-cs-organization/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.organization.3rdparty</artifactId>
-        <version>2.1-SNAPSHOT</version>
+        <version>2.2-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/organization/3rdparty/pom.xml b/services/organization/3rdparty/pom.xml
index 341a7bee9860029cbde0e46c9089ed5373ec97e7..3764682dfb86aefd58499ca493a26c037863c793 100644 (file)
--- a/services/organization/3rdparty/pom.xml
+++ b/services/organization/3rdparty/pom.xml
@@ -5,7 +5,7 @@
     <parent>\r
         <groupId>org.collectionspace.services</groupId>\r
         <artifactId>org.collectionspace.services.organization</artifactId>\r
-        <version>2.1-SNAPSHOT</version>\r
+        <version>2.2-SNAPSHOT</version>\r
     </parent>\r
     \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/organization/client/pom.xml b/services/organization/client/pom.xml
index ba8bfbc3cd8059c4753eef9f0fb53d1eb62c0d49..85ea2ef9ddb6d2b17ebc92f745543bdac1e9f871 100644 (file)
--- a/services/organization/client/pom.xml
+++ b/services/organization/client/pom.xml
@@ -5,7 +5,7 @@
     <parent>\r
         <groupId>org.collectionspace.services</groupId>\r
         <artifactId>org.collectionspace.services.organization</artifactId>\r
-        <version>2.1-SNAPSHOT</version>\r
+        <version>2.2-SNAPSHOT</version>\r
     </parent>\r
 \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/organization/jaxb/pom.xml b/services/organization/jaxb/pom.xml
index 61199c5ae44c029b6d87cf9fa34eb6ed413e33b3..f8f3c34a141122af9ff820285b7d3244ddc1080d 100644 (file)
--- a/services/organization/jaxb/pom.xml
+++ b/services/organization/jaxb/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>org.collectionspace.services.organization</artifactId>
         <groupId>org.collectionspace.services</groupId>
-        <version>2.1-SNAPSHOT</version>
+        <version>2.2-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/organization/pom.xml b/services/organization/pom.xml
index 6b6feb70d7b44be43be854c9907b5c22ed59f4fd..21afc2991f68cc816d7c0c8c3426a46e12acd145 100644 (file)
--- a/services/organization/pom.xml
+++ b/services/organization/pom.xml
@@ -3,7 +3,7 @@
     <parent>\r
         <groupId>org.collectionspace.services</groupId>\r
         <artifactId>org.collectionspace.services.main</artifactId>\r
-        <version>2.1-SNAPSHOT</version>\r
+        <version>2.2-SNAPSHOT</version>\r
     </parent>\r
 \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/organization/sample/pom.xml b/services/organization/sample/pom.xml
index b9725b50c7bd9294b2e615f419b05648e484c8b0..588e72ecd7704685a4653a420594adb87e7c8c12 100644 (file)
--- a/services/organization/sample/pom.xml
+++ b/services/organization/sample/pom.xml
@@ -4,7 +4,7 @@
     <groupId>org.collectionspace.services</groupId>\r
     <artifactId>org.collectionspace.services.organization.client.samples</artifactId>\r
     <packaging>pom</packaging>\r
-    <version>2.1-SNAPSHOT</version>\r
+    <version>2.2-SNAPSHOT</version>\r
     <name>organization.client.samples</name>\r
 \r
     <modules>\r

diff --git a/services/organization/sample/sample/pom.xml b/services/organization/sample/sample/pom.xml
index 6cb094b0aa20e27770de9c7c20bc4b3cd0e772c0..0bf4cc8625f5053c1caa8d5e7543cbe7c0a621a3 100644 (file)
--- a/services/organization/sample/sample/pom.xml
+++ b/services/organization/sample/sample/pom.xml
@@ -4,7 +4,7 @@
     <groupId>org.collectionspace.services</groupId>\r
     <artifactId>org.collectionspace.services.organization.client.sample</artifactId>\r
     <packaging>jar</packaging>\r
-    <version>2.1-SNAPSHOT</version>\r
+    <version>2.2-SNAPSHOT</version>\r
     <name>organization.client.sample</name>\r
     \r
     <dependencies>\r

diff --git a/services/organization/service/pom.xml b/services/organization/service/pom.xml
index 4208e044d80431f096fec66dcef6e6bdc034ae71..895b91faec12efeb12ce7939845fa0d54081f045 100644 (file)
--- a/services/organization/service/pom.xml
+++ b/services/organization/service/pom.xml
@@ -3,7 +3,7 @@
     <parent>\r
         <groupId>org.collectionspace.services</groupId>\r
         <artifactId>org.collectionspace.services.organization</artifactId>\r
-        <version>2.1-SNAPSHOT</version>\r
+        <version>2.2-SNAPSHOT</version>\r
     </parent>\r
     \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/person/3rdparty/nuxeo-platform-cs-person/pom.xml b/services/person/3rdparty/nuxeo-platform-cs-person/pom.xml
index ffe765c54fa369d9f7cb35dd5368acc3ae8abb06..be2ea9387afe89fc79d4771baefcd1ce9acd2419 100644 (file)
--- a/services/person/3rdparty/nuxeo-platform-cs-person/pom.xml
+++ b/services/person/3rdparty/nuxeo-platform-cs-person/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.person.3rdparty</artifactId>
-        <version>2.1-SNAPSHOT</version>
+        <version>2.2-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/person/3rdparty/pom.xml b/services/person/3rdparty/pom.xml
index 62565fb94b5d3e345c86cbd4bc2fe5bc9cebb51b..e25a2d0ecfddff24e9076ef160a3307e44fdce49 100644 (file)
--- a/services/person/3rdparty/pom.xml
+++ b/services/person/3rdparty/pom.xml
@@ -5,7 +5,7 @@
     <parent>\r
         <groupId>org.collectionspace.services</groupId>\r
         <artifactId>org.collectionspace.services.person</artifactId>\r
-        <version>2.1-SNAPSHOT</version>\r
+        <version>2.2-SNAPSHOT</version>\r
     </parent>\r
     \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/person/client/pom.xml b/services/person/client/pom.xml
index 024a82e264548dbdce8ac6f46a43c1ef7745fdc3..46f50cf4253ba6a223e899c05827f8f5220a869b 100644 (file)
--- a/services/person/client/pom.xml
+++ b/services/person/client/pom.xml
@@ -5,7 +5,7 @@
     <parent>\r
         <groupId>org.collectionspace.services</groupId>\r
         <artifactId>org.collectionspace.services.person</artifactId>\r
-        <version>2.1-SNAPSHOT</version>\r
+        <version>2.2-SNAPSHOT</version>\r
     </parent>\r
 \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/person/jaxb/pom.xml b/services/person/jaxb/pom.xml
index ab6c73677d681973a76be026603a6d0bc1a42f02..ea28ea0078dd049fcb4b6330e4700c2465bf847a 100644 (file)
--- a/services/person/jaxb/pom.xml
+++ b/services/person/jaxb/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.person</artifactId>
-        <version>2.1-SNAPSHOT</version>
+        <version>2.2-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/person/pom.xml b/services/person/pom.xml
index a1218ab8125410a2b810784c70f07501c0c862db..f1d116d295b39ea846d69de5df01c226ffe5fa34 100644 (file)
--- a/services/person/pom.xml
+++ b/services/person/pom.xml
@@ -3,7 +3,7 @@
     <parent>\r
         <groupId>org.collectionspace.services</groupId>\r
         <artifactId>org.collectionspace.services.main</artifactId>\r
-        <version>2.1-SNAPSHOT</version>\r
+        <version>2.2-SNAPSHOT</version>\r
     </parent>\r
 \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/person/sample/sample/pom.xml b/services/person/sample/sample/pom.xml
index 9a249a10d3ffb5af754dc26fadc37de2f89326a9..ca11a5cd291a90d37fc2c3ddc1b4f189f7b34596 100644 (file)
--- a/services/person/sample/sample/pom.xml
+++ b/services/person/sample/sample/pom.xml
@@ -11,17 +11,17 @@
         <dependency>\r
             <groupId>org.collectionspace.services</groupId>\r
             <artifactId>org.collectionspace.services.person.jaxb</artifactId>\r
-            <version>2.1-SNAPSHOT</version>\r
+            <version>2.2-SNAPSHOT</version>\r
         </dependency>\r
         <dependency>\r
             <groupId>org.collectionspace.services</groupId>\r
             <artifactId>org.collectionspace.services.client</artifactId>\r
-            <version>2.1-SNAPSHOT</version>\r
+            <version>2.2-SNAPSHOT</version>\r
         </dependency>\r
         <dependency>\r
             <groupId>org.collectionspace.services</groupId>\r
             <artifactId>org.collectionspace.services.person.client</artifactId>\r
-            <version>2.1-SNAPSHOT</version>\r
+            <version>2.2-SNAPSHOT</version>\r
         </dependency>\r
     </dependencies>\r
     \r

diff --git a/services/person/service/pom.xml b/services/person/service/pom.xml
index 8a0b046fe05079e7a4d1c3b1578df75779f4a51a..3ad0de00d5040fc81966eedce0162a5f3b994935 100644 (file)
--- a/services/person/service/pom.xml
+++ b/services/person/service/pom.xml
@@ -3,7 +3,7 @@
     <parent>\r
         <groupId>org.collectionspace.services</groupId>\r
         <artifactId>org.collectionspace.services.person</artifactId>\r
-        <version>2.1-SNAPSHOT</version>\r
+        <version>2.2-SNAPSHOT</version>\r
     </parent>\r
     \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/pom.xml b/services/pom.xml
index 61fcf8ceabf48d207b009f50f30a4732365d653b..50393361a2eef6c58fdb0449f19151e7c01dc809 100644 (file)
--- a/services/pom.xml
+++ b/services/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services</artifactId>
-        <version>2.1-SNAPSHOT</version>
+        <version>2.2-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/query/pom.xml b/services/query/pom.xml
index 3dcb1100f01242a87fbf41d7cf19d364b70c0b61..dd58c8266f6af0582760ca67eb4a8db14295ee2b 100644 (file)
--- a/services/query/pom.xml
+++ b/services/query/pom.xml
@@ -3,7 +3,7 @@
     <parent>\r
         <artifactId>org.collectionspace.services.main</artifactId>\r
         <groupId>org.collectionspace.services</groupId>\r
-        <version>2.1-SNAPSHOT</version>\r
+        <version>2.2-SNAPSHOT</version>\r
     </parent>\r
     \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/query/service/pom.xml b/services/query/service/pom.xml
index f45021241d13e9efdd05c9cd0e35c598cdc3ead5..182ac7f3b2fbc01ca808638dc337bc0e562e21bb 100644 (file)
--- a/services/query/service/pom.xml
+++ b/services/query/service/pom.xml
@@ -5,7 +5,7 @@
     <parent>\r
         <groupId>org.collectionspace.services</groupId>\r
         <artifactId>org.collectionspace.services.query</artifactId>\r
-        <version>2.1-SNAPSHOT</version>\r
+        <version>2.2-SNAPSHOT</version>\r
     </parent>\r
     \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/relation/3rdparty/nuxeo-platform-cs-relation/pom.xml b/services/relation/3rdparty/nuxeo-platform-cs-relation/pom.xml
index 285100947b388a44bbc9e7c428a8ca8d71662ff5..ceece479fa666fc8c1f2ed382306dfe450bb2a28 100644 (file)
--- a/services/relation/3rdparty/nuxeo-platform-cs-relation/pom.xml
+++ b/services/relation/3rdparty/nuxeo-platform-cs-relation/pom.xml
@@ -4,7 +4,7 @@
   <parent>\r
     <groupId>org.collectionspace.services</groupId>\r
     <artifactId>org.collectionspace.services.relation.3rdparty</artifactId>\r
-    <version>2.1-SNAPSHOT</version>\r
+    <version>2.2-SNAPSHOT</version>\r
   </parent>\r
 \r
   <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/relation/3rdparty/pom.xml b/services/relation/3rdparty/pom.xml
index e5d19fbf73230050d5b9450a830173bdf41c6e78..cb0d07fe4d671217bcc1b47a77a9a5d9601eecdb 100644 (file)
--- a/services/relation/3rdparty/pom.xml
+++ b/services/relation/3rdparty/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>org.collectionspace.services.relation</artifactId>
         <groupId>org.collectionspace.services</groupId>
-        <version>2.1-SNAPSHOT</version>
+        <version>2.2-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/relation/client/pom.xml b/services/relation/client/pom.xml
index b3f90862897a3bc012c6389a6b2dd49ff03aa89d..48a81324d2501a241de1ec5839d0bca5bccfa691 100644 (file)
--- a/services/relation/client/pom.xml
+++ b/services/relation/client/pom.xml
@@ -5,7 +5,7 @@
     <parent>\r
         <groupId>org.collectionspace.services</groupId>\r
         <artifactId>org.collectionspace.services.relation</artifactId>\r
-        <version>2.1-SNAPSHOT</version>\r
+        <version>2.2-SNAPSHOT</version>\r
     </parent>\r
 \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/relation/pom.xml b/services/relation/pom.xml
index 78633f7040f1dd6c731c80bb1bb3f13a8b194356..e152792dbc598a7e8a777b775436bc50d7ca18ce 100644 (file)
--- a/services/relation/pom.xml
+++ b/services/relation/pom.xml
@@ -3,7 +3,7 @@
     <parent>\r
         <groupId>org.collectionspace.services</groupId>\r
         <artifactId>org.collectionspace.services.main</artifactId>\r
-        <version>2.1-SNAPSHOT</version>\r
+        <version>2.2-SNAPSHOT</version>\r
     </parent>\r
     \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/relation/service/pom.xml b/services/relation/service/pom.xml
index 1007a6825df704d1c72cc660a7e1ba1be074e884..083b707cf07db30819d4ab79099b80ebf66ba047 100644 (file)
--- a/services/relation/service/pom.xml
+++ b/services/relation/service/pom.xml
@@ -3,7 +3,7 @@
     <parent>\r
         <groupId>org.collectionspace.services</groupId>\r
         <artifactId>org.collectionspace.services.relation</artifactId>\r
-        <version>2.1-SNAPSHOT</version>\r
+        <version>2.2-SNAPSHOT</version>\r
     </parent>\r
     \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/report/3rdparty/nuxeo-platform-cs-report/pom.xml b/services/report/3rdparty/nuxeo-platform-cs-report/pom.xml
index 447c24c4ec672193ee19d65ce472df3a01db68e9..e422d738dc4df2c74b6b383706c73bae4373e692 100644 (file)
--- a/services/report/3rdparty/nuxeo-platform-cs-report/pom.xml
+++ b/services/report/3rdparty/nuxeo-platform-cs-report/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.report.3rdparty</artifactId>
-        <version>2.1-SNAPSHOT</version>
+        <version>2.2-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/report/3rdparty/pom.xml b/services/report/3rdparty/pom.xml
index f9e2342ad743bf5f986e635c49bd3d79a53019db..51ecf71addaef8f3d8629cc19b057e4897c6a655 100644 (file)
--- a/services/report/3rdparty/pom.xml
+++ b/services/report/3rdparty/pom.xml
@@ -5,7 +5,7 @@
     <parent>\r
         <artifactId>org.collectionspace.services.report</artifactId>\r
         <groupId>org.collectionspace.services</groupId>\r
-        <version>2.1-SNAPSHOT</version>\r
+        <version>2.2-SNAPSHOT</version>\r
     </parent>\r
     \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/report/client/pom.xml b/services/report/client/pom.xml
index f5f12af59c4e0c2bcdd50537137dfcc4592deb78..5dc3c4a5184e1c056d2b5d80abda8b14893d2ea3 100644 (file)
--- a/services/report/client/pom.xml
+++ b/services/report/client/pom.xml
@@ -5,7 +5,7 @@
     <parent>\r
         <groupId>org.collectionspace.services</groupId>\r
         <artifactId>org.collectionspace.services.report</artifactId>\r
-        <version>2.1-SNAPSHOT</version>\r
+        <version>2.2-SNAPSHOT</version>\r
     </parent>\r
 \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/report/jaxb/pom.xml b/services/report/jaxb/pom.xml
index b27273a9e264323a62238b0cfc4175750f7fcdc0..5c906ae80437beb277bd40cb664518b8c1a19718 100644 (file)
--- a/services/report/jaxb/pom.xml
+++ b/services/report/jaxb/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>org.collectionspace.services.report</artifactId>
         <groupId>org.collectionspace.services</groupId>
-        <version>2.1-SNAPSHOT</version>
+        <version>2.2-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/report/pom.xml b/services/report/pom.xml
index f297690905e9f594cc85ecff99e580c6a5560e40..a5f09ba95505e26879ff9c1b558a45ff256af81f 100644 (file)
--- a/services/report/pom.xml
+++ b/services/report/pom.xml
@@ -4,7 +4,7 @@
     <parent>\r
         <groupId>org.collectionspace.services</groupId>\r
         <artifactId>org.collectionspace.services.main</artifactId>\r
-        <version>2.1-SNAPSHOT</version>\r
+        <version>2.2-SNAPSHOT</version>\r
     </parent>\r
     \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/report/service/pom.xml b/services/report/service/pom.xml
index 54dedbe7cdc5f4968ff1087f68b09f7b987554bb..54a899aec578a3d1ee3bf30bd12e5ee657279978 100644 (file)
--- a/services/report/service/pom.xml
+++ b/services/report/service/pom.xml
@@ -4,7 +4,7 @@
     <parent>\r
         <groupId>org.collectionspace.services</groupId>\r
         <artifactId>org.collectionspace.services.report</artifactId>        \r
-        <version>2.1-SNAPSHOT</version>\r
+        <version>2.2-SNAPSHOT</version>\r
     </parent>\r
     \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/sdk/pom.xml b/services/sdk/pom.xml
index 4aa467e1b66227e624cb8406e994797cdced94f6..63f4293975856da79e213e677cf4d19b3fc0d842 100644 (file)
--- a/services/sdk/pom.xml
+++ b/services/sdk/pom.xml
@@ -5,7 +5,7 @@
     <artifactId>org.collectionspace.services.sdk</artifactId>\r
     <packaging>pom</packaging>\r
     <name>services.sdk</name>\r
-    <version>2.1-SNAPSHOT</version>\r
+    <version>2.2-SNAPSHOT</version>\r
     \r
     <distributionManagement>\r
         <repository>\r

diff --git a/services/sdk/sample/pom.xml b/services/sdk/sample/pom.xml
index b959c4ef6ca9963d699aa8c274ea511b755790c6..d17fbf2338bd11d558b0410607f65ea6616a99fd 100644 (file)
--- a/services/sdk/sample/pom.xml
+++ b/services/sdk/sample/pom.xml
@@ -5,13 +5,13 @@
     <artifactId>org.collectionspace.services.client.sample</artifactId>\r
     <packaging>jar</packaging>\r
     <name>client.sample</name>\r
-    <version>2.1-SNAPSHOT</version>\r
+    <version>2.2-SNAPSHOT</version>\r
     \r
     <dependencies>\r
         <dependency>\r
             <groupId>org.collectionspace.services</groupId>\r
             <artifactId>org.collectionspace.services.collectionobject.client</artifactId>\r
-            <version>2.1-SNAPSHOT</version>\r
+            <version>2.2-SNAPSHOT</version>\r
         </dependency>\r
         <dependency>\r
             <groupId>org.slf4j</groupId>\r

diff --git a/services/security/client/pom.xml b/services/security/client/pom.xml
index f8659117cb6df6d6b17ad58b71820f011e08766a..c986ec52b0702e681a60bc703cec7bb8a8d98100 100644 (file)
--- a/services/security/client/pom.xml
+++ b/services/security/client/pom.xml
@@ -5,7 +5,7 @@
     <parent>\r
         <artifactId>org.collectionspace.services.security</artifactId>\r
         <groupId>org.collectionspace.services</groupId>\r
-        <version>2.1-SNAPSHOT</version>\r
+        <version>2.2-SNAPSHOT</version>\r
     </parent>\r
 \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/security/pom.xml b/services/security/pom.xml
index f0d23e08f087deb6178a337a78bfcf6f99691918..eca96ca3d0e6af7aa23702b0833009fd6a7eae9d 100644 (file)
--- a/services/security/pom.xml
+++ b/services/security/pom.xml
@@ -3,7 +3,7 @@
     <parent>\r
         <artifactId>org.collectionspace.services.main</artifactId>\r
         <groupId>org.collectionspace.services</groupId>\r
-        <version>2.1-SNAPSHOT</version>\r
+        <version>2.2-SNAPSHOT</version>\r
     </parent>\r
     \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/taxonomy/3rdparty/nuxeo-platform-cs-taxonomy/pom.xml b/services/taxonomy/3rdparty/nuxeo-platform-cs-taxonomy/pom.xml
index 5a4233f2b0418f44d98f44fc398dd679331b47d2..321e218fd0f92202fcc3d64202013a070090d819 100644 (file)
--- a/services/taxonomy/3rdparty/nuxeo-platform-cs-taxonomy/pom.xml
+++ b/services/taxonomy/3rdparty/nuxeo-platform-cs-taxonomy/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.taxonomy.3rdparty</artifactId>
-        <version>2.1-SNAPSHOT</version>
+        <version>2.2-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/taxonomy/3rdparty/pom.xml b/services/taxonomy/3rdparty/pom.xml
index 746c2247c996c2f7d63cbaa6430a61d492c93bc4..9ffd67485ec3107ce722debd853f0067b7767cb1 100644 (file)
--- a/services/taxonomy/3rdparty/pom.xml
+++ b/services/taxonomy/3rdparty/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.taxonomy</artifactId>
-        <version>2.1-SNAPSHOT</version>
+        <version>2.2-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/taxonomy/client/pom.xml b/services/taxonomy/client/pom.xml
index 5f66bdc6a842fcec1dec23e6b4a655ee4a3ad62a..1c84919dbc2999cd52715970a0aa1ca60786dd7e 100644 (file)
--- a/services/taxonomy/client/pom.xml
+++ b/services/taxonomy/client/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.taxonomy</artifactId>
-        <version>2.1-SNAPSHOT</version>
+        <version>2.2-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/taxonomy/jaxb/pom.xml b/services/taxonomy/jaxb/pom.xml
index 63d162499f07e2ec5212f89630204aaf221aa03e..ec3fad0ebf1ed256f16197c6e6fd1bc4c896bac0 100644 (file)
--- a/services/taxonomy/jaxb/pom.xml
+++ b/services/taxonomy/jaxb/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.taxonomy</artifactId>
-        <version>2.1-SNAPSHOT</version>
+        <version>2.2-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/taxonomy/pom.xml b/services/taxonomy/pom.xml
index 9aa65c0b5849725832c9ca8927c1217bd4a67734..c0432a53795d7b61fed4b4a0aa3295a36da37b9c 100644 (file)
--- a/services/taxonomy/pom.xml
+++ b/services/taxonomy/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.main</artifactId>
-        <version>2.1-SNAPSHOT</version>
+        <version>2.2-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/taxonomy/service/pom.xml b/services/taxonomy/service/pom.xml
index ba3946b0546bf6a1fbd11cf48d287204ba08d537..15ca5b0b4e2a8bdd90b0c4b2b0f7c7a71e95fe4d 100644 (file)
--- a/services/taxonomy/service/pom.xml
+++ b/services/taxonomy/service/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.taxonomy</artifactId>
-        <version>2.1-SNAPSHOT</version>
+        <version>2.2-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/vocabulary/3rdparty/nuxeo-platform-cs-vocabulary/pom.xml b/services/vocabulary/3rdparty/nuxeo-platform-cs-vocabulary/pom.xml
index 7586929e4faecda1eb1114e55cdd2fb6636f5329..b104bf0e6ee5be167b27ab330822e19472129226 100644 (file)
--- a/services/vocabulary/3rdparty/nuxeo-platform-cs-vocabulary/pom.xml
+++ b/services/vocabulary/3rdparty/nuxeo-platform-cs-vocabulary/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.vocabulary.3rdparty</artifactId>
-        <version>2.1-SNAPSHOT</version>
+        <version>2.2-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/vocabulary/3rdparty/pom.xml b/services/vocabulary/3rdparty/pom.xml
index f387376f5da088e9f220b62c1bf2b562760b52c2..f06f34dc3c6b590c07aaf4da191d266902f7bdcd 100644 (file)
--- a/services/vocabulary/3rdparty/pom.xml
+++ b/services/vocabulary/3rdparty/pom.xml
@@ -5,7 +5,7 @@
     <parent>\r
         <groupId>org.collectionspace.services</groupId>\r
         <artifactId>org.collectionspace.services.vocabulary</artifactId>\r
-        <version>2.1-SNAPSHOT</version>\r
+        <version>2.2-SNAPSHOT</version>\r
     </parent>\r
 \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/vocabulary/client/pom.xml b/services/vocabulary/client/pom.xml
index c1fbef4d12ce1f5755ab23bdd4220af1e132c37d..9634684a04dc00aeb05fade22a45923679c33052 100644 (file)
--- a/services/vocabulary/client/pom.xml
+++ b/services/vocabulary/client/pom.xml
@@ -6,7 +6,7 @@
     <parent>\r
         <groupId>org.collectionspace.services</groupId>\r
         <artifactId>org.collectionspace.services.vocabulary</artifactId>\r
-        <version>2.1-SNAPSHOT</version>\r
+        <version>2.2-SNAPSHOT</version>\r
     </parent>\r
 \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/vocabulary/jaxb/pom.xml b/services/vocabulary/jaxb/pom.xml
index 7cc96eec6888e425051e161cf814b0bef565a022..3e1613248ed08bc332efc86198e176f6a45feeed 100644 (file)
--- a/services/vocabulary/jaxb/pom.xml
+++ b/services/vocabulary/jaxb/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.vocabulary</artifactId>
-        <version>2.1-SNAPSHOT</version>
+        <version>2.2-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/vocabulary/pom.xml b/services/vocabulary/pom.xml
index aa928fd15a6066db4eef1e4889de10e5fad1419c..d38c366b969ae6c6d694d27a5e509abaf130c2b1 100644 (file)
--- a/services/vocabulary/pom.xml
+++ b/services/vocabulary/pom.xml
@@ -5,7 +5,7 @@
     <parent>\r
         <artifactId>org.collectionspace.services.main</artifactId>\r
         <groupId>org.collectionspace.services</groupId>\r
-        <version>2.1-SNAPSHOT</version>\r
+        <version>2.2-SNAPSHOT</version>\r
     </parent>\r
 \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/vocabulary/sample/sample/pom.xml b/services/vocabulary/sample/sample/pom.xml
index 34363c993594f8bbdb2ceb304f16aef5298ede95..1a8e45aeac6e917238d5118e340fad1cdb7e84bb 100644 (file)
--- a/services/vocabulary/sample/sample/pom.xml
+++ b/services/vocabulary/sample/sample/pom.xml
@@ -4,7 +4,7 @@
     <groupId>org.collectionspace.services</groupId>\r
     <artifactId>org.collectionspace.services.vocabulary.client.sample</artifactId>\r
     <packaging>jar</packaging>\r
-    <version>2.1-SNAPSHOT</version>\r
+    <version>2.2-SNAPSHOT</version>\r
     <name>vocabulary.client.sample</name>\r
     \r
     <dependencies>\r

diff --git a/services/vocabulary/service/pom.xml b/services/vocabulary/service/pom.xml
index f43debd7b29538709fc12e0a3ddb13e76aba6cd8..05b700e8f8c969e93a1df2edfcad1b06f6f36299 100644 (file)
--- a/services/vocabulary/service/pom.xml
+++ b/services/vocabulary/service/pom.xml
@@ -3,7 +3,7 @@
     <parent>\r
         <groupId>org.collectionspace.services</groupId>\r
         <artifactId>org.collectionspace.services.vocabulary</artifactId>\r
-        <version>2.1-SNAPSHOT</version>\r
+        <version>2.2-SNAPSHOT</version>\r
     </parent>\r
     \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/workflow/3rdparty/nuxeo-platform-cs-workflow/pom.xml b/services/workflow/3rdparty/nuxeo-platform-cs-workflow/pom.xml
index c518bdeaa2e11ef203bed25712b8ab28d7d4577f..afa08a807884c083b90c21d4b2eb81e510dea68e 100644 (file)
--- a/services/workflow/3rdparty/nuxeo-platform-cs-workflow/pom.xml
+++ b/services/workflow/3rdparty/nuxeo-platform-cs-workflow/pom.xml
@@ -5,7 +5,7 @@
        <parent>
                <groupId>org.collectionspace.services</groupId>
                <artifactId>org.collectionspace.services.workflow.3rdparty</artifactId>
-               <version>2.1-SNAPSHOT</version>
+               <version>2.2-SNAPSHOT</version>
        </parent>
     
     <groupId>org.collectionspace.services</groupId>

diff --git a/services/workflow/3rdparty/pom.xml b/services/workflow/3rdparty/pom.xml
index b320d2432246956b9366e97dc46e959a7af1237c..74ae6fafddbfe646665601f085057403cceb0a34 100644 (file)
--- a/services/workflow/3rdparty/pom.xml
+++ b/services/workflow/3rdparty/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>org.collectionspace.services.workflow</artifactId>
         <groupId>org.collectionspace.services</groupId>
-        <version>2.1-SNAPSHOT</version>
+        <version>2.2-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/workflow/client/pom.xml b/services/workflow/client/pom.xml
index 8f386a73cf97fe4c0c7078963e64d84caf796d8f..701d20ae429637f5741078feba9d72cf3c888e91 100644 (file)
--- a/services/workflow/client/pom.xml
+++ b/services/workflow/client/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.workflow</artifactId>
-        <version>2.1-SNAPSHOT</version>
+        <version>2.2-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/workflow/jaxb/pom.xml b/services/workflow/jaxb/pom.xml
index de673536feb9ca1f2e3c869d99bfacdbf209ea60..13d5aa53a8a8eca2fb3f6d86f59593cd46b845d4 100644 (file)
--- a/services/workflow/jaxb/pom.xml
+++ b/services/workflow/jaxb/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>org.collectionspace.services.workflow</artifactId>
         <groupId>org.collectionspace.services</groupId>
-        <version>2.1-SNAPSHOT</version>
+        <version>2.2-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/workflow/pom.xml b/services/workflow/pom.xml
index 2584aa544a7bc6e57bcc1467f5bf01d6365933d9..0ae211e3ea3301ffecaa27cb953e7bc5a7308a5b 100644 (file)
--- a/services/workflow/pom.xml
+++ b/services/workflow/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.main</artifactId>
-        <version>2.1-SNAPSHOT</version>
+        <version>2.2-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/workflow/service/pom.xml b/services/workflow/service/pom.xml
index 2f85981def3113ac857f968912c61819ae5f1462..ccd045fa25523373baa449616117ba87f4b8e636 100644 (file)
--- a/services/workflow/service/pom.xml
+++ b/services/workflow/service/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.workflow</artifactId>        
-        <version>2.1-SNAPSHOT</version>
+        <version>2.2-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>