From: Richard Millet <remillet@yahoo.com>
Date: Thu, 15 Nov 2018 16:56:49 +0000 (-0800)
Subject: DRYD-541: Changed ant import task to create roles/perms only for enabled tenants.
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=df69fb7e5c9243a315460a7cb110ab581464f5f8;p=tmp%2Fjakarta-migration.git

DRYD-541: Changed ant import task to create roles/perms only for enabled tenants.
---

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()) {