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
This commit is contained in:
Jan Vonka
2009-06-05 17:12:00 +00:00
parent 1070ddd702
commit c1dc3189da

View File

@@ -434,6 +434,12 @@ public class WCMUtil
throw new IllegalArgumentException("Domain and port are mandatory."); 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, return MessageFormat.format(JNDIConstants.PREVIEW_SANDBOX_URL,
lookupStoreDNS(avmService, storeName), lookupStoreDNS(avmService, storeName),
domain, domain,