From ed741873e5475bb05b6681ca000aa8b04dd41e34 Mon Sep 17 00:00:00 2001 From: Jon Cox Date: Sun, 24 Sep 2006 21:51:39 +0000 Subject: [PATCH] Preserving caps in mangling for prettier autogenerated URLs. TODO: Even with this change, the mangler still isn't quite right because if we adopt the convention: o Default mangled names approximate the navigation path, when possible Then if you're on the Moo website, and you're in the main layer of the "guest" sandbox viewing /my_webapp/xxx.jsp, then the url should look like this: http://www-Moo--guest.avm.localdomain.lan:8180/my_webapp/xxx.jsp Not like this: http://www-Moo--guest--main.avm.localdomain.lan:8180/my_webapp/xxx.jsp Put another way, if the "main" layer is imlicit for the user, it should not appear in the mangled name (note, the 'preview' layer is non-default, thus explicit). Therefore 'guest' on Moo should have the following name-mangled urls accessible: http://www-Moo--guest.avm.localdomain.lan:8180/my_webapp/xxx.jsp http://www-Moo--guest--preview.avm.localdomain.lan:8180/my_webapp/xxx.jsp NOTE: Consider how this would work with more complicated overlays. Example 1: Suppose we had a website named "Moo", and an author name "Alice" wanted to see template preview. We could autogenerate something like this: http://www-Moo--Alice--Preview.avm.localdomain.lan:8180/my_webapp/... The non-preview version would be in: http://www-Moo--Alice.avm.localdomain.lan:8180/my_webapp/... In the advanced GUI, just like you can see the Alice sandbox hanging off the Moo website, you'd be able to see/navigate to the "Preview" layer (though we would not expose such a thing by default in the simple gui). Example 2: Suppose we had a website named "Moo", and a content reviewer named "John Smith" wanted to see a submission from "Alice" We could autogenerate something like this: http://www-Moo--John-Smith--SUB-Alice.avm.localdomain.lan:8180/my_webapp/... (i.e.: autogenerated sumission layers could just be "SUB-" + DNS name of layer tha did the submit). git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3909 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- source/java/org/alfresco/web/bean/wcm/DNSNameMangler.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/source/java/org/alfresco/web/bean/wcm/DNSNameMangler.java b/source/java/org/alfresco/web/bean/wcm/DNSNameMangler.java index eb7b7d9cff..37a930b80d 100644 --- a/source/java/org/alfresco/web/bean/wcm/DNSNameMangler.java +++ b/source/java/org/alfresco/web/bean/wcm/DNSNameMangler.java @@ -32,9 +32,9 @@ class DNSNameMangler // Regular expressions. private static final Pattern RX_DNS_LEGAL = - Pattern.compile("^[a-z0-9][a-z0-9-]{0,57}[a-z0-9]$"); + Pattern.compile("^[a-zA-Z0-9][a-zA-Z0-9-]{0,57}[a-zA-Z0-9]$"); private static final Pattern RX_ILLEGAL_CHARS = - Pattern.compile("[^a-z0-9]"); + Pattern.compile("[^a-zA-Z0-9]"); private static final Pattern RX_HYPHENS = Pattern.compile("\\-+"); private static final Pattern RX_LEADING_HYPHEN = @@ -79,7 +79,9 @@ class DNSNameMangler */ static String MangleOne(String name) { - name = name.toLowerCase(); + // Preserve case for prettier auto-generated URLs + // name = name.toLowerCase(); + name = RX_ILLEGAL_CHARS.matcher(name).replaceAll("-"); name = RX_HYPHENS.matcher(name).replaceAll("-"); name = RX_LEADING_HYPHEN.matcher(name).replaceAll("x");