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 65054e81081ebf3a32bc1b53ec4697ee08b8e300..51c722f65e076984299c8722a5fa2beaf0dd0b4a 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
@@ -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()) {