From 8581c334f9b9fa216d2ee36e72332d8b0baff12d Mon Sep 17 00:00:00 2001 From: Jan Vonka Date: Tue, 31 Mar 2009 13:03:24 +0000 Subject: [PATCH] MT Share - minor fix to upgrade patch for existing tenants (result message) git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13783 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- config/alfresco/messages/patch-service.properties | 1 + .../admin/patch/impl/MultiTShareExistingTenantsPatch.java | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/config/alfresco/messages/patch-service.properties b/config/alfresco/messages/patch-service.properties index 00ed868ae9..129d0635c3 100644 --- a/config/alfresco/messages/patch-service.properties +++ b/config/alfresco/messages/patch-service.properties @@ -258,3 +258,4 @@ patch.webSiteAddModerated.result=Changed Web Site visibility. patch.mtShareExistingTenants.description=Update existing tenants for MT Share. patch.mtShareExistingTenants.result=Update existing tenants for MT Share. +patch.mtShareExistingTenants.result.not_applicable=Patch applied, although no changes made since MT is not enabled. diff --git a/source/java/org/alfresco/repo/admin/patch/impl/MultiTShareExistingTenantsPatch.java b/source/java/org/alfresco/repo/admin/patch/impl/MultiTShareExistingTenantsPatch.java index bc0f7e4f0c..af6bd64862 100644 --- a/source/java/org/alfresco/repo/admin/patch/impl/MultiTShareExistingTenantsPatch.java +++ b/source/java/org/alfresco/repo/admin/patch/impl/MultiTShareExistingTenantsPatch.java @@ -38,7 +38,8 @@ import org.alfresco.repo.workflow.WorkflowDeployer; */ public class MultiTShareExistingTenantsPatch extends AbstractPatch { - private static final String MSG_RESULT = "patch.mtShareExitingTenants.result"; + private static final String MSG_RESULT = "patch.mtShareExistingTenants.result"; + private static final String MSG_RESULT_NA = "patch.mtShareExistingTenants.result.not_applicable"; private SiteAVMBootstrap siteBootstrap; private WorkflowDeployer workflowPatchDeployer; @@ -81,6 +82,11 @@ public class MultiTShareExistingTenantsPatch extends AbstractPatch @Override protected String applyInternal() throws Exception { + if (!tenantService.isEnabled()) + { + return I18NUtil.getMessage(MSG_RESULT_NA); + } + if (! tenantService.getCurrentUserDomain().equals(TenantService.DEFAULT_DOMAIN)) { this.siteBootstrap.bootstrap();