From c9c8cd14e16b63b9f6d75bbc4c9b7f7ac25babfe Mon Sep 17 00:00:00 2001 From: Derek Hulley Date: Wed, 10 Jul 2013 11:06:21 +0000 Subject: [PATCH] More for ALF-19207: ModuleServiceImpl now also prevents setting of applyToTenants git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@52399 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../java/org/alfresco/repo/module/ModuleComponentHelper.java | 3 +++ source/java/org/alfresco/repo/module/ModuleServiceImpl.java | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/source/java/org/alfresco/repo/module/ModuleComponentHelper.java b/source/java/org/alfresco/repo/module/ModuleComponentHelper.java index b89ee7d00a..c32e427baa 100644 --- a/source/java/org/alfresco/repo/module/ModuleComponentHelper.java +++ b/source/java/org/alfresco/repo/module/ModuleComponentHelper.java @@ -133,6 +133,9 @@ public class ModuleComponentHelper this.tenantAdminService = tenantAdminService; } + /** + * @throws UnsupportedOperationException This feature was never active and cannot be used (ALF-19207) + */ public void setApplyToTenants(boolean applyToTenants) { throw new UnsupportedOperationException("Applying modules to individual tenants is unsupported. See ALF-19207: MT module startup does not work"); diff --git a/source/java/org/alfresco/repo/module/ModuleServiceImpl.java b/source/java/org/alfresco/repo/module/ModuleServiceImpl.java index 44e2895b70..fd3da5d821 100644 --- a/source/java/org/alfresco/repo/module/ModuleServiceImpl.java +++ b/source/java/org/alfresco/repo/module/ModuleServiceImpl.java @@ -110,9 +110,12 @@ public class ModuleServiceImpl implements ApplicationContextAware, ModuleService this.moduleComponentHelper.setTenantAdminService(tenantAdminService); } + /** + * @throws UnsupportedOperationException This feature was never active and cannot be used (ALF-19207) + */ public void setApplyToTenants(boolean applyToTenants) { - this.moduleComponentHelper.setApplyToTenants(applyToTenants); + throw new UnsupportedOperationException("Applying modules to individual tenants is unsupported. See ALF-19207: MT module startup does not work"); } @Override