From df69fb7e5c9243a315460a7cb110ab581464f5f8 Mon Sep 17 00:00:00 2001 From: Richard Millet Date: Thu, 15 Nov 2018 08:56:49 -0800 Subject: [PATCH] DRYD-541: Changed ant import task to create roles/perms only for enabled tenants. --- .../authorization/importer/AuthorizationGen.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) 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 65054e810..51c722f65 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 @@ -103,10 +103,11 @@ public class AuthorizationGen { TenantBindingConfigReaderImpl tenantBindingConfigReader = new TenantBindingConfigReaderImpl(tenantRootDirPath); tenantBindingConfigReader.read(useAppGeneratedBindings); - // Note that we build permissions for all tenants, whether or not they are marked create disabled. - // This is a hack until we can correctly run an incremental import. - tenantBindings = tenantBindingConfigReader.getTenantBindings( - TenantBindingConfigReaderImpl.INCLUDE_CREATE_DISABLED_TENANTS); + + // + // Don't include disabled tenants + // + tenantBindings = tenantBindingConfigReader.getTenantBindings( TenantBindingConfigReaderImpl.EXCLUDE_CREATE_DISABLED_TENANTS); cspaceTenantMgmntRole = buildTenantMgmntRole(); if (logger.isDebugEnabled()) { -- 2.47.3