From: Richard Millet Date: Tue, 14 Feb 2012 20:00:10 +0000 (+0000) Subject: CSPACE-4734: 1) Updated trunk pom files to be use version v2.2-SNAPSHOT. 2) Some... X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=1e1e09363c5e9b7e94e6fa32c0737bfe6ba5b548;p=tmp%2Fjakarta-migration.git CSPACE-4734: 1) Updated trunk pom files to be use version v2.2-SNAPSHOT. 2) Some minor cleanup prior to GIT migration. 3) Also restored previous two commits that were lost when the slice was restored from a backup. --- diff --git a/services/IntegrationTests/pom.xml b/services/IntegrationTests/pom.xml index 7886f8529..de513d3fc 100644 --- a/services/IntegrationTests/pom.xml +++ b/services/IntegrationTests/pom.xml @@ -3,7 +3,7 @@ org.collectionspace.services org.collectionspace.services.main - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/JaxRsServiceProvider/pom.xml b/services/JaxRsServiceProvider/pom.xml index 7cece4828..574af7305 100644 --- a/services/JaxRsServiceProvider/pom.xml +++ b/services/JaxRsServiceProvider/pom.xml @@ -4,7 +4,7 @@ org.collectionspace.services.main org.collectionspace.services - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/PerformanceTests/pom.xml b/services/PerformanceTests/pom.xml index 92ebab5d1..d29967f75 100644 --- a/services/PerformanceTests/pom.xml +++ b/services/PerformanceTests/pom.xml @@ -3,7 +3,7 @@ org.collectionspace.services.main org.collectionspace.services - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/account/client/pom.xml b/services/account/client/pom.xml index c0397f3b3..17950e929 100644 --- a/services/account/client/pom.xml +++ b/services/account/client/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services org.collectionspace.services.account - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/account/jaxb/pom.xml b/services/account/jaxb/pom.xml index 2e6a47923..5bafa22d1 100644 --- a/services/account/jaxb/pom.xml +++ b/services/account/jaxb/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services org.collectionspace.services.account - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/account/jaxb/src/main/resources/accounts_common.xsd b/services/account/jaxb/src/main/resources/accounts_common.xsd index be8385a37..bde9eca83 100644 --- a/services/account/jaxb/src/main/resources/accounts_common.xsd +++ b/services/account/jaxb/src/main/resources/accounts_common.xsd @@ -36,45 +36,7 @@ - - - - - - AccountsCommonList contains information about one or more - accounts. An instance of this type could be returned on - index and search operations. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/services/account/pom.xml b/services/account/pom.xml index 6b611044b..ff6fc0453 100644 --- a/services/account/pom.xml +++ b/services/account/pom.xml @@ -3,7 +3,7 @@ org.collectionspace.services org.collectionspace.services.main - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/account/pstore/pom.xml b/services/account/pstore/pom.xml index 4cb44da35..b0a5639dd 100644 --- a/services/account/pstore/pom.xml +++ b/services/account/pstore/pom.xml @@ -4,7 +4,7 @@ org.collectionspace.services.account org.collectionspace.services - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/account/service/pom.xml b/services/account/service/pom.xml index e46830595..be5114c0f 100644 --- a/services/account/service/pom.xml +++ b/services/account/service/pom.xml @@ -3,7 +3,7 @@ org.collectionspace.services.account org.collectionspace.services - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/pom.xml b/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/pom.xml index 067442e69..1795ebcf2 100644 --- a/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/pom.xml +++ b/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/pom.xml @@ -4,7 +4,7 @@ org.collectionspace.services org.collectionspace.services.acquisition.3rdparty - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/acquisition/3rdparty/pom.xml b/services/acquisition/3rdparty/pom.xml index 2028f0fc4..4e8482b3e 100644 --- a/services/acquisition/3rdparty/pom.xml +++ b/services/acquisition/3rdparty/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services org.collectionspace.services.acquisition - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/acquisition/client/pom.xml b/services/acquisition/client/pom.xml index 0fb156387..9241c5f4e 100644 --- a/services/acquisition/client/pom.xml +++ b/services/acquisition/client/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services org.collectionspace.services.acquisition - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/acquisition/jaxb/pom.xml b/services/acquisition/jaxb/pom.xml index dc970bd96..6fe650bf7 100644 --- a/services/acquisition/jaxb/pom.xml +++ b/services/acquisition/jaxb/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services.acquisition org.collectionspace.services - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/acquisition/pom.xml b/services/acquisition/pom.xml index 3b055d1a1..b79b44a59 100644 --- a/services/acquisition/pom.xml +++ b/services/acquisition/pom.xml @@ -4,7 +4,7 @@ org.collectionspace.services org.collectionspace.services.main - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/acquisition/service/pom.xml b/services/acquisition/service/pom.xml index 52aa1539a..6b8e67f9a 100644 --- a/services/acquisition/service/pom.xml +++ b/services/acquisition/service/pom.xml @@ -3,7 +3,7 @@ org.collectionspace.services.acquisition org.collectionspace.services - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/authentication/client/pom.xml b/services/authentication/client/pom.xml index b6853b477..51e8b9112 100644 --- a/services/authentication/client/pom.xml +++ b/services/authentication/client/pom.xml @@ -6,7 +6,7 @@ org.collectionspace.services org.collectionspace.services.authentication - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/authentication/jaxb/pom.xml b/services/authentication/jaxb/pom.xml index 29abc8708..fd241ff10 100644 --- a/services/authentication/jaxb/pom.xml +++ b/services/authentication/jaxb/pom.xml @@ -6,7 +6,7 @@ org.collectionspace.services org.collectionspace.services.authentication - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/authentication/pom.xml b/services/authentication/pom.xml index d3e01239f..781c958c5 100644 --- a/services/authentication/pom.xml +++ b/services/authentication/pom.xml @@ -3,7 +3,7 @@ org.collectionspace.services org.collectionspace.services.main - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/authentication/pstore/pom.xml b/services/authentication/pstore/pom.xml index 6d7b1aee7..d3293bacc 100644 --- a/services/authentication/pstore/pom.xml +++ b/services/authentication/pstore/pom.xml @@ -6,7 +6,7 @@ org.collectionspace.services org.collectionspace.services.authentication - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/authentication/service/pom.xml b/services/authentication/service/pom.xml index 51b57215d..10425db26 100644 --- a/services/authentication/service/pom.xml +++ b/services/authentication/service/pom.xml @@ -3,7 +3,7 @@ org.collectionspace.services org.collectionspace.services.authentication - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/authority/jaxb/pom.xml b/services/authority/jaxb/pom.xml index 7e3c1c5aa..ca52572a1 100644 --- a/services/authority/jaxb/pom.xml +++ b/services/authority/jaxb/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services.authority org.collectionspace.services - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/authority/pom.xml b/services/authority/pom.xml index 220140349..0efd0c7a1 100644 --- a/services/authority/pom.xml +++ b/services/authority/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services org.collectionspace.services.main - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/authority/service/pom.xml b/services/authority/service/pom.xml index e12cab699..0fb36cf38 100644 --- a/services/authority/service/pom.xml +++ b/services/authority/service/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services org.collectionspace.services.authority - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/authorization-mgt/client/pom.xml b/services/authorization-mgt/client/pom.xml index 201c23b24..fb964121e 100644 --- a/services/authorization-mgt/client/pom.xml +++ b/services/authorization-mgt/client/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services org.collectionspace.services.authorization-mgt - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/authorization-mgt/import/pom.xml b/services/authorization-mgt/import/pom.xml index 8088be1c2..46e537da3 100644 --- a/services/authorization-mgt/import/pom.xml +++ b/services/authorization-mgt/import/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services org.collectionspace.services.authorization-mgt - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 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 56a42a279..737bbcec6 100644 --- a/services/authorization-mgt/import/src/main/java/org/collectionspace/services/authorization/driver/AuthorizationSeedDriver.java +++ b/services/authorization-mgt/import/src/main/java/org/collectionspace/services/authorization/driver/AuthorizationSeedDriver.java @@ -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 ffaa8f7d5..cd9b16612 100644 --- a/services/authorization-mgt/import/src/main/java/org/collectionspace/services/authorization/importer/AuthorizationGen.java +++ b/services/authorization-mgt/import/src/main/java/org/collectionspace/services/authorization/importer/AuthorizationGen.java @@ -85,6 +85,12 @@ public class AuthorizationGen { private Role cspaceAdminRole; private Hashtable tenantBindings = new Hashtable(); + // + // Store the list of default roles, perms, and roleperms + // + private List allPermRoleList = null; + private List allPermList; + private List allRoleList; public void initialize(String tenantRootDirPath) throws Exception { TenantBindingConfigReaderImpl tenantBindingConfigReader = @@ -237,9 +243,11 @@ public class AuthorizationGen { } public List getDefaultPermissions() { - List allPermList = new ArrayList(); - allPermList.addAll(adminPermList); - allPermList.addAll(readerPermList); + if (allPermList == null) { + allPermList = new ArrayList(); + 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 getDefaultRoles() { - List allRoleList = new ArrayList(); - allRoleList.addAll(adminRoles); - allRoleList.addAll(readerRoles); + if (allRoleList == null) { + allRoleList = new ArrayList(); + allRoleList.addAll(adminRoles); + allRoleList.addAll(readerRoles); + } return allRoleList; } @@ -380,9 +396,11 @@ public class AuthorizationGen { } public List getDefaultPermissionRoles() { - List allPermRoleList = new ArrayList(); - allPermRoleList.addAll(adminPermRoleList); - allPermRoleList.addAll(readerPermRoleList); + if (allPermRoleList == null) { + allPermRoleList = new ArrayList(); + 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 allRoleList = new ArrayList(); - 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 allPermList = new ArrayList(); - 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 allPermRoleList = new ArrayList(); - 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 cd99f641e..1fa6a01b3 100644 --- a/services/authorization-mgt/import/src/main/java/org/collectionspace/services/authorization/importer/AuthorizationSeed.java +++ b/services/authorization-mgt/import/src/main/java/org/collectionspace/services/authorization/importer/AuthorizationSeed.java @@ -25,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 permList, List 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 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 c6c79bf6f..593101fda 100644 --- 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 add6408f3..e0640d334 100644 --- a/services/authorization-mgt/pom.xml +++ b/services/authorization-mgt/pom.xml @@ -4,7 +4,7 @@ org.collectionspace.services.main org.collectionspace.services - 2.1-SNAPSHOT + 2.2-SNAPSHOT org.collectionspace.services diff --git a/services/authorization-mgt/service/pom.xml b/services/authorization-mgt/service/pom.xml index 9f48c1021..17229558d 100644 --- a/services/authorization-mgt/service/pom.xml +++ b/services/authorization-mgt/service/pom.xml @@ -4,7 +4,7 @@ org.collectionspace.services.authorization-mgt org.collectionspace.services - 2.1-SNAPSHOT + 2.2-SNAPSHOT org.collectionspace.services org.collectionspace.services.authorization-mgt.service diff --git a/services/authorization/jaxb/pom.xml b/services/authorization/jaxb/pom.xml index 4e601f9df..0e373a0e4 100644 --- a/services/authorization/jaxb/pom.xml +++ b/services/authorization/jaxb/pom.xml @@ -4,7 +4,7 @@ org.collectionspace.services.authorization org.collectionspace.services - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/authorization/pom.xml b/services/authorization/pom.xml index 2f0743f32..0a99773dc 100644 --- a/services/authorization/pom.xml +++ b/services/authorization/pom.xml @@ -4,7 +4,7 @@ org.collectionspace.services.main org.collectionspace.services - 2.1-SNAPSHOT + 2.2-SNAPSHOT org.collectionspace.services org.collectionspace.services.authorization diff --git a/services/authorization/pstore/pom.xml b/services/authorization/pstore/pom.xml index bcbb95f06..8b2bba97e 100644 --- a/services/authorization/pstore/pom.xml +++ b/services/authorization/pstore/pom.xml @@ -4,7 +4,7 @@ org.collectionspace.services.authorization org.collectionspace.services - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/authorization/service/pom.xml b/services/authorization/service/pom.xml index 8ad4df4ad..4000e515b 100644 --- a/services/authorization/service/pom.xml +++ b/services/authorization/service/pom.xml @@ -6,7 +6,7 @@ org.collectionspace.services.authorization org.collectionspace.services - 2.1-SNAPSHOT + 2.2-SNAPSHOT org.collectionspace.services org.collectionspace.services.authorization.service 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 a8ab08b9c..8518a92db 100644 --- 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 485e9ab5a..b8356a031 100644 --- a/services/batch/3rdparty/nuxeo-platform-cs-batch/pom.xml +++ b/services/batch/3rdparty/nuxeo-platform-cs-batch/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services org.collectionspace.services.batch.3rdparty - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/batch/3rdparty/pom.xml b/services/batch/3rdparty/pom.xml index 8cb3048ff..2314593a4 100644 --- a/services/batch/3rdparty/pom.xml +++ b/services/batch/3rdparty/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services.batch org.collectionspace.services - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/batch/client/pom.xml b/services/batch/client/pom.xml index cd0f1ea53..519c1aeaf 100644 --- a/services/batch/client/pom.xml +++ b/services/batch/client/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services org.collectionspace.services.batch - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/batch/jaxb/pom.xml b/services/batch/jaxb/pom.xml index 47ff4c1a9..b40609032 100644 --- a/services/batch/jaxb/pom.xml +++ b/services/batch/jaxb/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services.batch org.collectionspace.services - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/batch/pom.xml b/services/batch/pom.xml index ac54d3eeb..b7574a8a1 100644 --- a/services/batch/pom.xml +++ b/services/batch/pom.xml @@ -4,7 +4,7 @@ org.collectionspace.services org.collectionspace.services.main - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/batch/service/pom.xml b/services/batch/service/pom.xml index d2e347ee9..052f10bc5 100644 --- a/services/batch/service/pom.xml +++ b/services/batch/service/pom.xml @@ -4,7 +4,7 @@ org.collectionspace.services org.collectionspace.services.batch - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/blob/3rdparty/nuxeo-platform-cs-blob/pom.xml b/services/blob/3rdparty/nuxeo-platform-cs-blob/pom.xml index 9bc29211b..2d307c7d4 100644 --- a/services/blob/3rdparty/nuxeo-platform-cs-blob/pom.xml +++ b/services/blob/3rdparty/nuxeo-platform-cs-blob/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services org.collectionspace.services.blob.3rdparty - 2.1-SNAPSHOT + 2.2-SNAPSHOT org.collectionspace.services diff --git a/services/blob/3rdparty/pom.xml b/services/blob/3rdparty/pom.xml index 06deff5e2..a8f3607b5 100644 --- a/services/blob/3rdparty/pom.xml +++ b/services/blob/3rdparty/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services.blob org.collectionspace.services - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/blob/client/pom.xml b/services/blob/client/pom.xml index 12be2c203..8d2596e04 100644 --- a/services/blob/client/pom.xml +++ b/services/blob/client/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services org.collectionspace.services.blob - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/blob/jaxb/pom.xml b/services/blob/jaxb/pom.xml index 95c23ef14..22584ec2e 100644 --- a/services/blob/jaxb/pom.xml +++ b/services/blob/jaxb/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services.blob org.collectionspace.services - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/blob/pom.xml b/services/blob/pom.xml index ea0561fef..6354f3cb7 100644 --- a/services/blob/pom.xml +++ b/services/blob/pom.xml @@ -4,7 +4,7 @@ org.collectionspace.services.main org.collectionspace.services - 2.1-SNAPSHOT + 2.2-SNAPSHOT org.collectionspace.services.blob diff --git a/services/blob/service/pom.xml b/services/blob/service/pom.xml index 3d933d96b..61b76134d 100644 --- a/services/blob/service/pom.xml +++ b/services/blob/service/pom.xml @@ -4,7 +4,7 @@ org.collectionspace.services org.collectionspace.services.blob - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 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 3f96de158..afa7c4b53 100644 --- a/services/blob/service/src/main/java/org/collectionspace/services/blob/nuxeo/BlobDocumentModelHandler.java +++ b/services/blob/service/src/main/java/org/collectionspace/services/blob/nuxeo/BlobDocumentModelHandler.java @@ -165,7 +165,7 @@ extends DocHandlerBase { // 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 8ff6556ec..bc4973af3 100644 --- a/services/client/pom.xml +++ b/services/client/pom.xml @@ -3,7 +3,7 @@ org.collectionspace.services org.collectionspace.services.main - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/collectionobject/3rdparty/nuxeo-platform-collectionobject-lifesci/pom.xml b/services/collectionobject/3rdparty/nuxeo-platform-collectionobject-lifesci/pom.xml index 717518792..97b6765a8 100644 --- a/services/collectionobject/3rdparty/nuxeo-platform-collectionobject-lifesci/pom.xml +++ b/services/collectionobject/3rdparty/nuxeo-platform-collectionobject-lifesci/pom.xml @@ -4,7 +4,7 @@ org.collectionspace.services org.collectionspace.services.collectionobject.3rdparty - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/pom.xml b/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/pom.xml index 596cd2ba3..152eccc90 100644 --- a/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/pom.xml +++ b/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/pom.xml @@ -4,7 +4,7 @@ org.collectionspace.services org.collectionspace.services.collectionobject.3rdparty - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/collectionobject/3rdparty/pom.xml b/services/collectionobject/3rdparty/pom.xml index 68281d15a..3586d1a09 100644 --- a/services/collectionobject/3rdparty/pom.xml +++ b/services/collectionobject/3rdparty/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services org.collectionspace.services.collectionobject - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/collectionobject/client/pom.xml b/services/collectionobject/client/pom.xml index 789e592a4..43b6a0425 100644 --- a/services/collectionobject/client/pom.xml +++ b/services/collectionobject/client/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services org.collectionspace.services.collectionobject - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/collectionobject/jaxb/pom.xml b/services/collectionobject/jaxb/pom.xml index 5e11212c8..a9c551d13 100644 --- a/services/collectionobject/jaxb/pom.xml +++ b/services/collectionobject/jaxb/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services org.collectionspace.services.collectionobject - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/collectionobject/pom.xml b/services/collectionobject/pom.xml index 1037713cc..adc09fc18 100644 --- a/services/collectionobject/pom.xml +++ b/services/collectionobject/pom.xml @@ -3,7 +3,7 @@ org.collectionspace.services org.collectionspace.services.main - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/collectionobject/sample/pom.xml b/services/collectionobject/sample/pom.xml index c57dba246..68b899119 100644 --- a/services/collectionobject/sample/pom.xml +++ b/services/collectionobject/sample/pom.xml @@ -4,7 +4,7 @@ org.collectionspace.services org.collectionspace.services.collectionobject.client.samples pom - 2.1-SNAPSHOT + 2.2-SNAPSHOT collectionobject.client.samples diff --git a/services/collectionobject/sample/sample/pom.xml b/services/collectionobject/sample/sample/pom.xml index a1986fdaf..3a412f3bb 100644 --- a/services/collectionobject/sample/sample/pom.xml +++ b/services/collectionobject/sample/sample/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services.collectionobject.client.sample jar collectionobject.client.sample - 2.1-SNAPSHOT + 2.2-SNAPSHOT diff --git a/services/collectionobject/service/pom.xml b/services/collectionobject/service/pom.xml index fb0c0cdb4..60f9545a2 100644 --- a/services/collectionobject/service/pom.xml +++ b/services/collectionobject/service/pom.xml @@ -3,7 +3,7 @@ org.collectionspace.services org.collectionspace.services.collectionobject - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/common-api/pom.xml b/services/common-api/pom.xml index 4ce437113..a3bbef45b 100755 --- a/services/common-api/pom.xml +++ b/services/common-api/pom.xml @@ -3,7 +3,7 @@ org.collectionspace.services org.collectionspace.services.main - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/common-test/pom.xml b/services/common-test/pom.xml index e3431e680..5226fc23e 100644 --- a/services/common-test/pom.xml +++ b/services/common-test/pom.xml @@ -4,11 +4,11 @@ org.collectionspace.services.main org.collectionspace.services - 2.1-SNAPSHOT + 2.2-SNAPSHOT org.collectionspace.services org.collectionspace.services.common-test - 2.1-SNAPSHOT + 2.2-SNAPSHOT services.common-test http://maven.apache.org jar diff --git a/services/common/pom.xml b/services/common/pom.xml index ded6381d2..cb15ea4fe 100644 --- a/services/common/pom.xml +++ b/services/common/pom.xml @@ -3,7 +3,7 @@ org.collectionspace.services org.collectionspace.services.main - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 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 596a88d29..8573b9947 100644 --- 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 26fa88513..0c8d4b377 100644 --- a/services/common/src/main/java/org/collectionspace/services/common/document/JaxbUtils.java +++ b/services/common/src/main/java/org/collectionspace/services/common/document/JaxbUtils.java @@ -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 0f663c429..656ccc5a0 100644 --- 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 * http://wiki.collectionspace.org * - * Copyright © 2009 {Contributing Institution} + * Copyright © 2009 {Contributing Institution}. * * Licensed under the Educational Community License (ECL), Version 2.0. * You may not use this file except in compliance with this License. @@ -38,8 +38,8 @@ import java.util.List; import java.util.Map; import org.nuxeo.runtime.api.Framework; -import org.nuxeo.runtime.api.ServiceManager; -import org.nuxeo.runtime.api.ServiceDescriptor; +//import org.nuxeo.runtime.api.ServiceManager; +//import org.nuxeo.runtime.api.ServiceDescriptor; //import org.nuxeo.common.utils.FileUtils; @@ -57,8 +57,8 @@ import org.nuxeo.ecm.core.repository.RepositoryDescriptor; import org.nuxeo.ecm.core.repository.RepositoryManager; import org.nuxeo.ecm.core.repository.RepositoryService; -import org.nuxeo.runtime.model.ComponentManager; -import org.nuxeo.runtime.model.impl.ComponentManagerImpl; +//import org.nuxeo.runtime.model.ComponentManager; +//import org.nuxeo.runtime.model.impl.ComponentManagerImpl; //import org.nuxeo.ecm.core.api.ejb.DocumentManagerBean; //import org.nuxeo.ecm.core.storage.sql.RepositoryImpl; //import org.nuxeo.ecm.core.storage.sql.Repository; 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 42ae41888..92ff4be67 100644 --- 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 60685d6fb..01153762e 100644 --- a/services/common/src/main/java/org/collectionspace/services/common/storage/jpa/JpaStorageUtils.java +++ b/services/common/src/main/java/org/collectionspace/services/common/storage/jpa/JpaStorageUtils.java @@ -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 0972066ea..9b66ad51e 100644 --- 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 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 org.collectionspace.services org.collectionspace.services.contact.3rdparty - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/contact/3rdparty/pom.xml b/services/contact/3rdparty/pom.xml index 2be58d6ac..f0a849ade 100644 --- a/services/contact/3rdparty/pom.xml +++ b/services/contact/3rdparty/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services org.collectionspace.services.contact - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/contact/client/pom.xml b/services/contact/client/pom.xml index 5d1958199..f65850946 100644 --- a/services/contact/client/pom.xml +++ b/services/contact/client/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services.contact org.collectionspace.services - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/contact/jaxb/pom.xml b/services/contact/jaxb/pom.xml index 92a8e48a1..10da82ca1 100644 --- a/services/contact/jaxb/pom.xml +++ b/services/contact/jaxb/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services org.collectionspace.services.contact - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/contact/pom.xml b/services/contact/pom.xml index dfb737055..ee7db8be2 100644 --- a/services/contact/pom.xml +++ b/services/contact/pom.xml @@ -4,7 +4,7 @@ org.collectionspace.services.main org.collectionspace.services - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/contact/service/pom.xml b/services/contact/service/pom.xml index c7a414cc2..a31e97dd8 100644 --- a/services/contact/service/pom.xml +++ b/services/contact/service/pom.xml @@ -3,7 +3,7 @@ org.collectionspace.services.contact org.collectionspace.services - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/dimension/3rdparty/nuxeo-platform-cs-dimension/pom.xml b/services/dimension/3rdparty/nuxeo-platform-cs-dimension/pom.xml index d4476ec9b..6ba8f2707 100644 --- a/services/dimension/3rdparty/nuxeo-platform-cs-dimension/pom.xml +++ b/services/dimension/3rdparty/nuxeo-platform-cs-dimension/pom.xml @@ -4,7 +4,7 @@ org.collectionspace.services org.collectionspace.services.dimension.3rdparty - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/dimension/3rdparty/pom.xml b/services/dimension/3rdparty/pom.xml index f5a76db79..4e7222195 100644 --- a/services/dimension/3rdparty/pom.xml +++ b/services/dimension/3rdparty/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services org.collectionspace.services.dimension - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/dimension/client/pom.xml b/services/dimension/client/pom.xml index f10ab8f0c..20784b837 100644 --- a/services/dimension/client/pom.xml +++ b/services/dimension/client/pom.xml @@ -6,7 +6,7 @@ org.collectionspace.services org.collectionspace.services.dimension - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/dimension/jaxb/pom.xml b/services/dimension/jaxb/pom.xml index 3bbba1b90..988e9964d 100644 --- a/services/dimension/jaxb/pom.xml +++ b/services/dimension/jaxb/pom.xml @@ -6,7 +6,7 @@ org.collectionspace.services org.collectionspace.services.dimension - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/dimension/pom.xml b/services/dimension/pom.xml index b1097c2c9..e30e2fc0d 100644 --- a/services/dimension/pom.xml +++ b/services/dimension/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services.main org.collectionspace.services - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/dimension/service/pom.xml b/services/dimension/service/pom.xml index 39787294b..f254634de 100644 --- a/services/dimension/service/pom.xml +++ b/services/dimension/service/pom.xml @@ -4,7 +4,7 @@ org.collectionspace.services org.collectionspace.services.dimension - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/group/3rdparty/nuxeo-platform-cs-group/pom.xml b/services/group/3rdparty/nuxeo-platform-cs-group/pom.xml index b223d1d42..7c073f5ef 100644 --- a/services/group/3rdparty/nuxeo-platform-cs-group/pom.xml +++ b/services/group/3rdparty/nuxeo-platform-cs-group/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services org.collectionspace.services.group.3rdparty - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/group/3rdparty/pom.xml b/services/group/3rdparty/pom.xml index f78f76246..1d911565d 100644 --- a/services/group/3rdparty/pom.xml +++ b/services/group/3rdparty/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services.group org.collectionspace.services - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/group/client/pom.xml b/services/group/client/pom.xml index a4ae3bdff..98ef64b80 100644 --- a/services/group/client/pom.xml +++ b/services/group/client/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services org.collectionspace.services.group - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/group/jaxb/pom.xml b/services/group/jaxb/pom.xml index 77dcdcf54..c48602cd4 100644 --- a/services/group/jaxb/pom.xml +++ b/services/group/jaxb/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services.group org.collectionspace.services - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/group/pom.xml b/services/group/pom.xml index 5274cb40b..37e6fa0d1 100644 --- a/services/group/pom.xml +++ b/services/group/pom.xml @@ -4,7 +4,7 @@ org.collectionspace.services org.collectionspace.services.main - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/group/service/pom.xml b/services/group/service/pom.xml index a3464eea7..15653a7d3 100644 --- a/services/group/service/pom.xml +++ b/services/group/service/pom.xml @@ -4,7 +4,7 @@ org.collectionspace.services org.collectionspace.services.group - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/hyperjaxb/pom.xml b/services/hyperjaxb/pom.xml index 09adf7a57..d1f7d5709 100644 --- a/services/hyperjaxb/pom.xml +++ b/services/hyperjaxb/pom.xml @@ -26,7 +26,7 @@ org.collectionspace.services org.collectionspace.services.main - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/id/3rdparty/pom.xml b/services/id/3rdparty/pom.xml index aba75763e..6959e4704 100644 --- a/services/id/3rdparty/pom.xml +++ b/services/id/3rdparty/pom.xml @@ -24,7 +24,7 @@ org.collectionspace.services org.collectionspace.services.id - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/id/client/pom.xml b/services/id/client/pom.xml index 48a95f4fc..813fc6cdd 100644 --- a/services/id/client/pom.xml +++ b/services/id/client/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services org.collectionspace.services.id - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 @@ -22,7 +22,7 @@ org.collectionspace.services org.collectionspace.services.id.service - 2.1-SNAPSHOT + 2.2-SNAPSHOT test jar diff --git a/services/id/jaxb/pom.xml b/services/id/jaxb/pom.xml index 04a4520a4..8ab76966a 100644 --- a/services/id/jaxb/pom.xml +++ b/services/id/jaxb/pom.xml @@ -25,7 +25,7 @@ org.collectionspace.services org.collectionspace.services.id - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/id/pom.xml b/services/id/pom.xml index 21c17f2ea..bdde9bfe0 100644 --- a/services/id/pom.xml +++ b/services/id/pom.xml @@ -23,7 +23,7 @@ org.collectionspace.services org.collectionspace.services.main - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/id/service/pom.xml b/services/id/service/pom.xml index 736bdd521..242237580 100644 --- a/services/id/service/pom.xml +++ b/services/id/service/pom.xml @@ -23,7 +23,7 @@ org.collectionspace.services.id org.collectionspace.services - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/imports/3rdparty/nuxeo-platform-cs-imports/pom.xml b/services/imports/3rdparty/nuxeo-platform-cs-imports/pom.xml index ce76192a7..73092de59 100755 --- a/services/imports/3rdparty/nuxeo-platform-cs-imports/pom.xml +++ b/services/imports/3rdparty/nuxeo-platform-cs-imports/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services org.collectionspace.services.imports.3rdparty - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/imports/3rdparty/pom.xml b/services/imports/3rdparty/pom.xml index ce0fa9afc..8ae733ce8 100755 --- a/services/imports/3rdparty/pom.xml +++ b/services/imports/3rdparty/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services.imports org.collectionspace.services - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/imports/jaxb/pom.xml b/services/imports/jaxb/pom.xml index 13c0fb168..60a3fed9e 100755 --- a/services/imports/jaxb/pom.xml +++ b/services/imports/jaxb/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services.imports org.collectionspace.services - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/imports/pom.xml b/services/imports/pom.xml index 0cfe80851..aa0e42093 100755 --- a/services/imports/pom.xml +++ b/services/imports/pom.xml @@ -4,7 +4,7 @@ org.collectionspace.services org.collectionspace.services.main - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/imports/service/pom.xml b/services/imports/service/pom.xml index 2363444a9..570939723 100755 --- a/services/imports/service/pom.xml +++ b/services/imports/service/pom.xml @@ -4,7 +4,7 @@ org.collectionspace.services org.collectionspace.services.imports - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/intake/3rdparty/nuxeo-platform-cs-intake/pom.xml b/services/intake/3rdparty/nuxeo-platform-cs-intake/pom.xml index bb7944392..fdc41aa9e 100644 --- a/services/intake/3rdparty/nuxeo-platform-cs-intake/pom.xml +++ b/services/intake/3rdparty/nuxeo-platform-cs-intake/pom.xml @@ -6,7 +6,7 @@ org.collectionspace.services org.collectionspace.services.intake.3rdparty - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/intake/3rdparty/pom.xml b/services/intake/3rdparty/pom.xml index a3ab20bb3..5c061bd83 100644 --- a/services/intake/3rdparty/pom.xml +++ b/services/intake/3rdparty/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services.intake org.collectionspace.services - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/intake/client/pom.xml b/services/intake/client/pom.xml index 241e62f8f..151e44cf3 100644 --- a/services/intake/client/pom.xml +++ b/services/intake/client/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services org.collectionspace.services.intake - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/intake/jaxb/pom.xml b/services/intake/jaxb/pom.xml index f40af5579..844038dd2 100644 --- a/services/intake/jaxb/pom.xml +++ b/services/intake/jaxb/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services.intake org.collectionspace.services - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/intake/pom.xml b/services/intake/pom.xml index 8aeb948eb..01cd25164 100644 --- a/services/intake/pom.xml +++ b/services/intake/pom.xml @@ -4,7 +4,7 @@ org.collectionspace.services org.collectionspace.services.main - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/intake/service/pom.xml b/services/intake/service/pom.xml index 4ecea62b7..55a4a64b5 100644 --- a/services/intake/service/pom.xml +++ b/services/intake/service/pom.xml @@ -4,7 +4,7 @@ org.collectionspace.services org.collectionspace.services.intake - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/jaxb/pom.xml b/services/jaxb/pom.xml index 74899d25f..a25ba55da 100644 --- a/services/jaxb/pom.xml +++ b/services/jaxb/pom.xml @@ -14,7 +14,7 @@ org.collectionspace.services org.collectionspace.services.main - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/loanin/3rdparty/nuxeo-platform-cs-loanin/pom.xml b/services/loanin/3rdparty/nuxeo-platform-cs-loanin/pom.xml index 203486bda..27b9b5d1d 100644 --- a/services/loanin/3rdparty/nuxeo-platform-cs-loanin/pom.xml +++ b/services/loanin/3rdparty/nuxeo-platform-cs-loanin/pom.xml @@ -6,7 +6,7 @@ org.collectionspace.services org.collectionspace.services.loanin.3rdparty - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/loanin/3rdparty/pom.xml b/services/loanin/3rdparty/pom.xml index 9c037f8b1..cb211605d 100644 --- a/services/loanin/3rdparty/pom.xml +++ b/services/loanin/3rdparty/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services.loanin org.collectionspace.services - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/loanin/client/pom.xml b/services/loanin/client/pom.xml index 9e86adbdf..a8837e72f 100644 --- a/services/loanin/client/pom.xml +++ b/services/loanin/client/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services org.collectionspace.services.loanin - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/loanin/jaxb/pom.xml b/services/loanin/jaxb/pom.xml index 910b1243a..7207aa9fc 100644 --- a/services/loanin/jaxb/pom.xml +++ b/services/loanin/jaxb/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services.loanin org.collectionspace.services - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/loanin/pom.xml b/services/loanin/pom.xml index af49323ec..04782992e 100644 --- a/services/loanin/pom.xml +++ b/services/loanin/pom.xml @@ -4,7 +4,7 @@ org.collectionspace.services org.collectionspace.services.main - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/loanin/service/pom.xml b/services/loanin/service/pom.xml index 1933f2dbd..cb96f0324 100644 --- a/services/loanin/service/pom.xml +++ b/services/loanin/service/pom.xml @@ -4,7 +4,7 @@ org.collectionspace.services org.collectionspace.services.loanin - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/loanout/3rdparty/nuxeo-platform-cs-loanout/pom.xml b/services/loanout/3rdparty/nuxeo-platform-cs-loanout/pom.xml index a5d57419c..5189d2dab 100644 --- a/services/loanout/3rdparty/nuxeo-platform-cs-loanout/pom.xml +++ b/services/loanout/3rdparty/nuxeo-platform-cs-loanout/pom.xml @@ -6,7 +6,7 @@ org.collectionspace.services org.collectionspace.services.loanout.3rdparty - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/loanout/3rdparty/pom.xml b/services/loanout/3rdparty/pom.xml index 55430eb8f..c8c231aea 100644 --- a/services/loanout/3rdparty/pom.xml +++ b/services/loanout/3rdparty/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services.loanout org.collectionspace.services - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/loanout/client/pom.xml b/services/loanout/client/pom.xml index da2c7d6b0..addfa565a 100644 --- a/services/loanout/client/pom.xml +++ b/services/loanout/client/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services org.collectionspace.services.loanout - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/loanout/jaxb/pom.xml b/services/loanout/jaxb/pom.xml index 49740bbd7..29cfe7771 100644 --- a/services/loanout/jaxb/pom.xml +++ b/services/loanout/jaxb/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services.loanout org.collectionspace.services - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/loanout/pom.xml b/services/loanout/pom.xml index 6a82974f7..37b48d38f 100644 --- a/services/loanout/pom.xml +++ b/services/loanout/pom.xml @@ -4,7 +4,7 @@ org.collectionspace.services org.collectionspace.services.main - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/loanout/service/pom.xml b/services/loanout/service/pom.xml index 5f80ca17d..e0cfa5a48 100644 --- a/services/loanout/service/pom.xml +++ b/services/loanout/service/pom.xml @@ -4,7 +4,7 @@ org.collectionspace.services org.collectionspace.services.loanout - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/location/3rdparty/nuxeo-platform-cs-location/pom.xml b/services/location/3rdparty/nuxeo-platform-cs-location/pom.xml index d427c10d4..bd8303805 100644 --- a/services/location/3rdparty/nuxeo-platform-cs-location/pom.xml +++ b/services/location/3rdparty/nuxeo-platform-cs-location/pom.xml @@ -4,7 +4,7 @@ org.collectionspace.services org.collectionspace.services.location.3rdparty - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/location/3rdparty/pom.xml b/services/location/3rdparty/pom.xml index f12ff7e0f..4708e1566 100644 --- a/services/location/3rdparty/pom.xml +++ b/services/location/3rdparty/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services org.collectionspace.services.location - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/location/client/pom.xml b/services/location/client/pom.xml index a62213f36..3cc8b17fb 100644 --- a/services/location/client/pom.xml +++ b/services/location/client/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services org.collectionspace.services.location - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/location/jaxb/pom.xml b/services/location/jaxb/pom.xml index eec81618d..0851eebbe 100644 --- a/services/location/jaxb/pom.xml +++ b/services/location/jaxb/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services org.collectionspace.services.location - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/location/pom.xml b/services/location/pom.xml index de7187d38..8ad94cf4f 100644 --- a/services/location/pom.xml +++ b/services/location/pom.xml @@ -3,7 +3,7 @@ org.collectionspace.services org.collectionspace.services.main - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/location/service/pom.xml b/services/location/service/pom.xml index 6af233446..a051e5de4 100644 --- a/services/location/service/pom.xml +++ b/services/location/service/pom.xml @@ -3,7 +3,7 @@ org.collectionspace.services org.collectionspace.services.location - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/media/3rdparty/nuxeo-platform-cs-media/pom.xml b/services/media/3rdparty/nuxeo-platform-cs-media/pom.xml index 7bb099e0b..3ef7ef522 100644 --- a/services/media/3rdparty/nuxeo-platform-cs-media/pom.xml +++ b/services/media/3rdparty/nuxeo-platform-cs-media/pom.xml @@ -6,7 +6,7 @@ org.collectionspace.services org.collectionspace.services.media.3rdparty - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/media/3rdparty/pom.xml b/services/media/3rdparty/pom.xml index 0bff8d71c..01cc55528 100644 --- a/services/media/3rdparty/pom.xml +++ b/services/media/3rdparty/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services.media org.collectionspace.services - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/media/client/pom.xml b/services/media/client/pom.xml index 066984d91..fde3f2a74 100644 --- a/services/media/client/pom.xml +++ b/services/media/client/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services org.collectionspace.services.media - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/media/jaxb/pom.xml b/services/media/jaxb/pom.xml index 48e300c79..67a64d532 100644 --- a/services/media/jaxb/pom.xml +++ b/services/media/jaxb/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services.media org.collectionspace.services - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/media/pom.xml b/services/media/pom.xml index 9ff655220..770f962ac 100644 --- a/services/media/pom.xml +++ b/services/media/pom.xml @@ -4,7 +4,7 @@ org.collectionspace.services org.collectionspace.services.main - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/media/service/pom.xml b/services/media/service/pom.xml index 5d04019ea..3dc963200 100644 --- a/services/media/service/pom.xml +++ b/services/media/service/pom.xml @@ -4,7 +4,7 @@ org.collectionspace.services org.collectionspace.services.media - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/movement/3rdparty/nuxeo-platform-cs-movement/pom.xml b/services/movement/3rdparty/nuxeo-platform-cs-movement/pom.xml index 0f252e6c5..0fceb5f5a 100644 --- a/services/movement/3rdparty/nuxeo-platform-cs-movement/pom.xml +++ b/services/movement/3rdparty/nuxeo-platform-cs-movement/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services org.collectionspace.services.movement.3rdparty - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/movement/3rdparty/pom.xml b/services/movement/3rdparty/pom.xml index c1422649a..882be4fbe 100644 --- a/services/movement/3rdparty/pom.xml +++ b/services/movement/3rdparty/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services.movement org.collectionspace.services - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/movement/client/pom.xml b/services/movement/client/pom.xml index d0de00df3..36362989a 100644 --- a/services/movement/client/pom.xml +++ b/services/movement/client/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services org.collectionspace.services.movement - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/movement/jaxb/pom.xml b/services/movement/jaxb/pom.xml index ed6dfde0a..b9281ae99 100644 --- a/services/movement/jaxb/pom.xml +++ b/services/movement/jaxb/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services.movement org.collectionspace.services - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/movement/pom.xml b/services/movement/pom.xml index 2ee811ada..717964952 100644 --- a/services/movement/pom.xml +++ b/services/movement/pom.xml @@ -4,7 +4,7 @@ org.collectionspace.services org.collectionspace.services.main - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/movement/service/pom.xml b/services/movement/service/pom.xml index 3ebae0ddb..0be808e6a 100644 --- a/services/movement/service/pom.xml +++ b/services/movement/service/pom.xml @@ -4,7 +4,7 @@ org.collectionspace.services org.collectionspace.services.movement - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/note/3rdparty/nuxeo-platform-cs-note/pom.xml b/services/note/3rdparty/nuxeo-platform-cs-note/pom.xml index d0d4ae0e9..6d4621d33 100644 --- a/services/note/3rdparty/nuxeo-platform-cs-note/pom.xml +++ b/services/note/3rdparty/nuxeo-platform-cs-note/pom.xml @@ -4,7 +4,7 @@ org.collectionspace.services org.collectionspace.services.note.3rdparty - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/note/3rdparty/pom.xml b/services/note/3rdparty/pom.xml index 168c53789..a575a89d5 100644 --- a/services/note/3rdparty/pom.xml +++ b/services/note/3rdparty/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services org.collectionspace.services.note - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/note/client/pom.xml b/services/note/client/pom.xml index 22ca84347..351d0449b 100644 --- a/services/note/client/pom.xml +++ b/services/note/client/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services.note org.collectionspace.services - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/note/jaxb/pom.xml b/services/note/jaxb/pom.xml index 417d7d003..64fb7b8e2 100644 --- a/services/note/jaxb/pom.xml +++ b/services/note/jaxb/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services org.collectionspace.services.note - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/note/pom.xml b/services/note/pom.xml index ab79e5c27..918c4e9f5 100644 --- a/services/note/pom.xml +++ b/services/note/pom.xml @@ -4,7 +4,7 @@ org.collectionspace.services.main org.collectionspace.services - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/note/service/pom.xml b/services/note/service/pom.xml index ece15b7a0..0a530970a 100644 --- a/services/note/service/pom.xml +++ b/services/note/service/pom.xml @@ -3,7 +3,7 @@ org.collectionspace.services.note org.collectionspace.services - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/objectexit/3rdparty/nuxeo-platform-cs-objectexit/pom.xml b/services/objectexit/3rdparty/nuxeo-platform-cs-objectexit/pom.xml index 19376122c..5631df821 100644 --- a/services/objectexit/3rdparty/nuxeo-platform-cs-objectexit/pom.xml +++ b/services/objectexit/3rdparty/nuxeo-platform-cs-objectexit/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services org.collectionspace.services.objectexit.3rdparty - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/objectexit/3rdparty/pom.xml b/services/objectexit/3rdparty/pom.xml index 0d7427d4c..cb9e21c92 100644 --- a/services/objectexit/3rdparty/pom.xml +++ b/services/objectexit/3rdparty/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services.objectexit org.collectionspace.services - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/objectexit/client/pom.xml b/services/objectexit/client/pom.xml index fafa40ba5..8fc63f80e 100644 --- a/services/objectexit/client/pom.xml +++ b/services/objectexit/client/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services org.collectionspace.services.objectexit - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/objectexit/jaxb/pom.xml b/services/objectexit/jaxb/pom.xml index 9488285af..4cc8d51c5 100644 --- a/services/objectexit/jaxb/pom.xml +++ b/services/objectexit/jaxb/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services.objectexit org.collectionspace.services - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/objectexit/pom.xml b/services/objectexit/pom.xml index 411762782..9b10149c5 100644 --- a/services/objectexit/pom.xml +++ b/services/objectexit/pom.xml @@ -4,7 +4,7 @@ org.collectionspace.services org.collectionspace.services.main - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/objectexit/service/pom.xml b/services/objectexit/service/pom.xml index a0e0a1eff..b10155e5c 100644 --- a/services/objectexit/service/pom.xml +++ b/services/objectexit/service/pom.xml @@ -4,7 +4,7 @@ org.collectionspace.services org.collectionspace.services.objectexit - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/organization/3rdparty/nuxeo-platform-cs-organization/pom.xml b/services/organization/3rdparty/nuxeo-platform-cs-organization/pom.xml index e9e9747a9..37bd71dd1 100644 --- a/services/organization/3rdparty/nuxeo-platform-cs-organization/pom.xml +++ b/services/organization/3rdparty/nuxeo-platform-cs-organization/pom.xml @@ -4,7 +4,7 @@ org.collectionspace.services org.collectionspace.services.organization.3rdparty - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/organization/3rdparty/pom.xml b/services/organization/3rdparty/pom.xml index 341a7bee9..3764682df 100644 --- a/services/organization/3rdparty/pom.xml +++ b/services/organization/3rdparty/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services org.collectionspace.services.organization - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/organization/client/pom.xml b/services/organization/client/pom.xml index ba8bfbc3c..85ea2ef9d 100644 --- a/services/organization/client/pom.xml +++ b/services/organization/client/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services org.collectionspace.services.organization - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/organization/jaxb/pom.xml b/services/organization/jaxb/pom.xml index 61199c5ae..f8f3c34a1 100644 --- a/services/organization/jaxb/pom.xml +++ b/services/organization/jaxb/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services.organization org.collectionspace.services - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/organization/pom.xml b/services/organization/pom.xml index 6b6feb70d..21afc2991 100644 --- a/services/organization/pom.xml +++ b/services/organization/pom.xml @@ -3,7 +3,7 @@ org.collectionspace.services org.collectionspace.services.main - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/organization/sample/pom.xml b/services/organization/sample/pom.xml index b9725b50c..588e72ecd 100644 --- a/services/organization/sample/pom.xml +++ b/services/organization/sample/pom.xml @@ -4,7 +4,7 @@ org.collectionspace.services org.collectionspace.services.organization.client.samples pom - 2.1-SNAPSHOT + 2.2-SNAPSHOT organization.client.samples diff --git a/services/organization/sample/sample/pom.xml b/services/organization/sample/sample/pom.xml index 6cb094b0a..0bf4cc862 100644 --- a/services/organization/sample/sample/pom.xml +++ b/services/organization/sample/sample/pom.xml @@ -4,7 +4,7 @@ org.collectionspace.services org.collectionspace.services.organization.client.sample jar - 2.1-SNAPSHOT + 2.2-SNAPSHOT organization.client.sample diff --git a/services/organization/service/pom.xml b/services/organization/service/pom.xml index 4208e044d..895b91fae 100644 --- a/services/organization/service/pom.xml +++ b/services/organization/service/pom.xml @@ -3,7 +3,7 @@ org.collectionspace.services org.collectionspace.services.organization - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/person/3rdparty/nuxeo-platform-cs-person/pom.xml b/services/person/3rdparty/nuxeo-platform-cs-person/pom.xml index ffe765c54..be2ea9387 100644 --- a/services/person/3rdparty/nuxeo-platform-cs-person/pom.xml +++ b/services/person/3rdparty/nuxeo-platform-cs-person/pom.xml @@ -4,7 +4,7 @@ org.collectionspace.services org.collectionspace.services.person.3rdparty - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/person/3rdparty/pom.xml b/services/person/3rdparty/pom.xml index 62565fb94..e25a2d0ec 100644 --- a/services/person/3rdparty/pom.xml +++ b/services/person/3rdparty/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services org.collectionspace.services.person - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/person/client/pom.xml b/services/person/client/pom.xml index 024a82e26..46f50cf42 100644 --- a/services/person/client/pom.xml +++ b/services/person/client/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services org.collectionspace.services.person - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/person/jaxb/pom.xml b/services/person/jaxb/pom.xml index ab6c73677..ea28ea007 100644 --- a/services/person/jaxb/pom.xml +++ b/services/person/jaxb/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services org.collectionspace.services.person - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/person/pom.xml b/services/person/pom.xml index a1218ab81..f1d116d29 100644 --- a/services/person/pom.xml +++ b/services/person/pom.xml @@ -3,7 +3,7 @@ org.collectionspace.services org.collectionspace.services.main - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/person/sample/sample/pom.xml b/services/person/sample/sample/pom.xml index 9a249a10d..ca11a5cd2 100644 --- a/services/person/sample/sample/pom.xml +++ b/services/person/sample/sample/pom.xml @@ -11,17 +11,17 @@ org.collectionspace.services org.collectionspace.services.person.jaxb - 2.1-SNAPSHOT + 2.2-SNAPSHOT org.collectionspace.services org.collectionspace.services.client - 2.1-SNAPSHOT + 2.2-SNAPSHOT org.collectionspace.services org.collectionspace.services.person.client - 2.1-SNAPSHOT + 2.2-SNAPSHOT diff --git a/services/person/service/pom.xml b/services/person/service/pom.xml index 8a0b046fe..3ad0de00d 100644 --- a/services/person/service/pom.xml +++ b/services/person/service/pom.xml @@ -3,7 +3,7 @@ org.collectionspace.services org.collectionspace.services.person - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/pom.xml b/services/pom.xml index 61fcf8cea..50393361a 100644 --- a/services/pom.xml +++ b/services/pom.xml @@ -3,7 +3,7 @@ org.collectionspace.services org.collectionspace.services - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/query/pom.xml b/services/query/pom.xml index 3dcb1100f..dd58c8266 100644 --- a/services/query/pom.xml +++ b/services/query/pom.xml @@ -3,7 +3,7 @@ org.collectionspace.services.main org.collectionspace.services - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/query/service/pom.xml b/services/query/service/pom.xml index f45021241..182ac7f3b 100644 --- a/services/query/service/pom.xml +++ b/services/query/service/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services org.collectionspace.services.query - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/relation/3rdparty/nuxeo-platform-cs-relation/pom.xml b/services/relation/3rdparty/nuxeo-platform-cs-relation/pom.xml index 285100947..ceece479f 100644 --- a/services/relation/3rdparty/nuxeo-platform-cs-relation/pom.xml +++ b/services/relation/3rdparty/nuxeo-platform-cs-relation/pom.xml @@ -4,7 +4,7 @@ org.collectionspace.services org.collectionspace.services.relation.3rdparty - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/relation/3rdparty/pom.xml b/services/relation/3rdparty/pom.xml index e5d19fbf7..cb0d07fe4 100644 --- a/services/relation/3rdparty/pom.xml +++ b/services/relation/3rdparty/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services.relation org.collectionspace.services - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/relation/client/pom.xml b/services/relation/client/pom.xml index b3f908628..48a81324d 100644 --- a/services/relation/client/pom.xml +++ b/services/relation/client/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services org.collectionspace.services.relation - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/relation/pom.xml b/services/relation/pom.xml index 78633f704..e152792db 100644 --- a/services/relation/pom.xml +++ b/services/relation/pom.xml @@ -3,7 +3,7 @@ org.collectionspace.services org.collectionspace.services.main - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/relation/service/pom.xml b/services/relation/service/pom.xml index 1007a6825..083b707cf 100644 --- a/services/relation/service/pom.xml +++ b/services/relation/service/pom.xml @@ -3,7 +3,7 @@ org.collectionspace.services org.collectionspace.services.relation - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/report/3rdparty/nuxeo-platform-cs-report/pom.xml b/services/report/3rdparty/nuxeo-platform-cs-report/pom.xml index 447c24c4e..e422d738d 100644 --- a/services/report/3rdparty/nuxeo-platform-cs-report/pom.xml +++ b/services/report/3rdparty/nuxeo-platform-cs-report/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services org.collectionspace.services.report.3rdparty - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/report/3rdparty/pom.xml b/services/report/3rdparty/pom.xml index f9e2342ad..51ecf71ad 100644 --- a/services/report/3rdparty/pom.xml +++ b/services/report/3rdparty/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services.report org.collectionspace.services - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/report/client/pom.xml b/services/report/client/pom.xml index f5f12af59..5dc3c4a51 100644 --- a/services/report/client/pom.xml +++ b/services/report/client/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services org.collectionspace.services.report - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/report/jaxb/pom.xml b/services/report/jaxb/pom.xml index b27273a9e..5c906ae80 100644 --- a/services/report/jaxb/pom.xml +++ b/services/report/jaxb/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services.report org.collectionspace.services - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/report/pom.xml b/services/report/pom.xml index f29769090..a5f09ba95 100644 --- a/services/report/pom.xml +++ b/services/report/pom.xml @@ -4,7 +4,7 @@ org.collectionspace.services org.collectionspace.services.main - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/report/service/pom.xml b/services/report/service/pom.xml index 54dedbe7c..54a899aec 100644 --- a/services/report/service/pom.xml +++ b/services/report/service/pom.xml @@ -4,7 +4,7 @@ org.collectionspace.services org.collectionspace.services.report - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/sdk/pom.xml b/services/sdk/pom.xml index 4aa467e1b..63f429397 100644 --- a/services/sdk/pom.xml +++ b/services/sdk/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services.sdk pom services.sdk - 2.1-SNAPSHOT + 2.2-SNAPSHOT diff --git a/services/sdk/sample/pom.xml b/services/sdk/sample/pom.xml index b959c4ef6..d17fbf233 100644 --- a/services/sdk/sample/pom.xml +++ b/services/sdk/sample/pom.xml @@ -5,13 +5,13 @@ org.collectionspace.services.client.sample jar client.sample - 2.1-SNAPSHOT + 2.2-SNAPSHOT org.collectionspace.services org.collectionspace.services.collectionobject.client - 2.1-SNAPSHOT + 2.2-SNAPSHOT org.slf4j diff --git a/services/security/client/pom.xml b/services/security/client/pom.xml index f8659117c..c986ec52b 100644 --- a/services/security/client/pom.xml +++ b/services/security/client/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services.security org.collectionspace.services - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/security/pom.xml b/services/security/pom.xml index f0d23e08f..eca96ca3d 100644 --- a/services/security/pom.xml +++ b/services/security/pom.xml @@ -3,7 +3,7 @@ org.collectionspace.services.main org.collectionspace.services - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/taxonomy/3rdparty/nuxeo-platform-cs-taxonomy/pom.xml b/services/taxonomy/3rdparty/nuxeo-platform-cs-taxonomy/pom.xml index 5a4233f2b..321e218fd 100644 --- a/services/taxonomy/3rdparty/nuxeo-platform-cs-taxonomy/pom.xml +++ b/services/taxonomy/3rdparty/nuxeo-platform-cs-taxonomy/pom.xml @@ -4,7 +4,7 @@ org.collectionspace.services org.collectionspace.services.taxonomy.3rdparty - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/taxonomy/3rdparty/pom.xml b/services/taxonomy/3rdparty/pom.xml index 746c2247c..9ffd67485 100644 --- a/services/taxonomy/3rdparty/pom.xml +++ b/services/taxonomy/3rdparty/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services org.collectionspace.services.taxonomy - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/taxonomy/client/pom.xml b/services/taxonomy/client/pom.xml index 5f66bdc6a..1c84919db 100644 --- a/services/taxonomy/client/pom.xml +++ b/services/taxonomy/client/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services org.collectionspace.services.taxonomy - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/taxonomy/jaxb/pom.xml b/services/taxonomy/jaxb/pom.xml index 63d162499..ec3fad0eb 100644 --- a/services/taxonomy/jaxb/pom.xml +++ b/services/taxonomy/jaxb/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services org.collectionspace.services.taxonomy - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/taxonomy/pom.xml b/services/taxonomy/pom.xml index 9aa65c0b5..c0432a537 100644 --- a/services/taxonomy/pom.xml +++ b/services/taxonomy/pom.xml @@ -3,7 +3,7 @@ org.collectionspace.services org.collectionspace.services.main - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/taxonomy/service/pom.xml b/services/taxonomy/service/pom.xml index ba3946b05..15ca5b0b4 100644 --- a/services/taxonomy/service/pom.xml +++ b/services/taxonomy/service/pom.xml @@ -3,7 +3,7 @@ org.collectionspace.services org.collectionspace.services.taxonomy - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/vocabulary/3rdparty/nuxeo-platform-cs-vocabulary/pom.xml b/services/vocabulary/3rdparty/nuxeo-platform-cs-vocabulary/pom.xml index 7586929e4..b104bf0e6 100644 --- a/services/vocabulary/3rdparty/nuxeo-platform-cs-vocabulary/pom.xml +++ b/services/vocabulary/3rdparty/nuxeo-platform-cs-vocabulary/pom.xml @@ -4,7 +4,7 @@ org.collectionspace.services org.collectionspace.services.vocabulary.3rdparty - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/vocabulary/3rdparty/pom.xml b/services/vocabulary/3rdparty/pom.xml index f387376f5..f06f34dc3 100644 --- a/services/vocabulary/3rdparty/pom.xml +++ b/services/vocabulary/3rdparty/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services org.collectionspace.services.vocabulary - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/vocabulary/client/pom.xml b/services/vocabulary/client/pom.xml index c1fbef4d1..9634684a0 100644 --- a/services/vocabulary/client/pom.xml +++ b/services/vocabulary/client/pom.xml @@ -6,7 +6,7 @@ org.collectionspace.services org.collectionspace.services.vocabulary - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/vocabulary/jaxb/pom.xml b/services/vocabulary/jaxb/pom.xml index 7cc96eec6..3e1613248 100644 --- a/services/vocabulary/jaxb/pom.xml +++ b/services/vocabulary/jaxb/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services org.collectionspace.services.vocabulary - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/vocabulary/pom.xml b/services/vocabulary/pom.xml index aa928fd15..d38c366b9 100644 --- a/services/vocabulary/pom.xml +++ b/services/vocabulary/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services.main org.collectionspace.services - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/vocabulary/sample/sample/pom.xml b/services/vocabulary/sample/sample/pom.xml index 34363c993..1a8e45aea 100644 --- a/services/vocabulary/sample/sample/pom.xml +++ b/services/vocabulary/sample/sample/pom.xml @@ -4,7 +4,7 @@ org.collectionspace.services org.collectionspace.services.vocabulary.client.sample jar - 2.1-SNAPSHOT + 2.2-SNAPSHOT vocabulary.client.sample diff --git a/services/vocabulary/service/pom.xml b/services/vocabulary/service/pom.xml index f43debd7b..05b700e8f 100644 --- a/services/vocabulary/service/pom.xml +++ b/services/vocabulary/service/pom.xml @@ -3,7 +3,7 @@ org.collectionspace.services org.collectionspace.services.vocabulary - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/workflow/3rdparty/nuxeo-platform-cs-workflow/pom.xml b/services/workflow/3rdparty/nuxeo-platform-cs-workflow/pom.xml index c518bdeaa..afa08a807 100644 --- a/services/workflow/3rdparty/nuxeo-platform-cs-workflow/pom.xml +++ b/services/workflow/3rdparty/nuxeo-platform-cs-workflow/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services org.collectionspace.services.workflow.3rdparty - 2.1-SNAPSHOT + 2.2-SNAPSHOT org.collectionspace.services diff --git a/services/workflow/3rdparty/pom.xml b/services/workflow/3rdparty/pom.xml index b320d2432..74ae6fafd 100644 --- a/services/workflow/3rdparty/pom.xml +++ b/services/workflow/3rdparty/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services.workflow org.collectionspace.services - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/workflow/client/pom.xml b/services/workflow/client/pom.xml index 8f386a73c..701d20ae4 100644 --- a/services/workflow/client/pom.xml +++ b/services/workflow/client/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services org.collectionspace.services.workflow - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/workflow/jaxb/pom.xml b/services/workflow/jaxb/pom.xml index de673536f..13d5aa53a 100644 --- a/services/workflow/jaxb/pom.xml +++ b/services/workflow/jaxb/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services.workflow org.collectionspace.services - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/workflow/pom.xml b/services/workflow/pom.xml index 2584aa544..0ae211e3e 100644 --- a/services/workflow/pom.xml +++ b/services/workflow/pom.xml @@ -4,7 +4,7 @@ org.collectionspace.services org.collectionspace.services.main - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0 diff --git a/services/workflow/service/pom.xml b/services/workflow/service/pom.xml index 2f85981de..ccd045fa2 100644 --- a/services/workflow/service/pom.xml +++ b/services/workflow/service/pom.xml @@ -4,7 +4,7 @@ org.collectionspace.services org.collectionspace.services.workflow - 2.1-SNAPSHOT + 2.2-SNAPSHOT 4.0.0