From c1dc3189da37a3dab86fd9a0d675e196d1639d49 Mon Sep 17 00:00:00 2001 From: Jan Vonka Date: Fri, 5 Jun 2009 17:12:00 +0000 Subject: [PATCH] Merged V3.1 to HEAD 14077: Merged V2.2 to V3.1 14074: Fix ETWOTWO-929 and ETWOTWO-1175 (WCM preview) git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@14568 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- source/java/org/alfresco/wcm/util/WCMUtil.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/source/java/org/alfresco/wcm/util/WCMUtil.java b/source/java/org/alfresco/wcm/util/WCMUtil.java index a572d4e8d0..09a9f57b6c 100644 --- a/source/java/org/alfresco/wcm/util/WCMUtil.java +++ b/source/java/org/alfresco/wcm/util/WCMUtil.java @@ -434,6 +434,12 @@ public class WCMUtil throw new IllegalArgumentException("Domain and port are mandatory."); } + // NOTE: for backwards compatibility - avmPath is converted to storeName (path is ignored) + if (storeName.indexOf(AVM_STORE_SEPARATOR) != -1) + { + storeName = storeName.substring(0, storeName.indexOf(AVM_STORE_SEPARATOR)); + } + return MessageFormat.format(JNDIConstants.PREVIEW_SANDBOX_URL, lookupStoreDNS(avmService, storeName), domain,