svn commit: r158002 - in incubator/beehive/trunk/netui: src/util/org/apache/beehive/netui/core/urls/DefaultTemplatedURLFormatter.java src/util/org/apache/beehive/netui/core/urltemplates/URLTemplateDescriptor.java test/webapps/urlTemplates/urlTemplates/WEB-INF/url-template-config.xml

[rich]

Author: rich
Date: Thu Mar 17 17:06:27 2005
New Revision: 158002

URL: http://svn.apache.org/viewcvs?view=rev&rev=158002
Log:
This is a contribution from Carlin Rogers to fix 
http://issues.apache.org/jira/browse/BEEHIVE-422 : template url rewriting does 
not support the URL fragment

Thanks Carlin!

tests: netui bvt (WinXP)
BB: self (linux)


Modified:
    
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/core/urls/DefaultTemplatedURLFormatter.java
    
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/core/urltemplates/URLTemplateDescriptor.java
    
incubator/beehive/trunk/netui/test/webapps/urlTemplates/urlTemplates/WEB-INF/url-template-config.xml

Modified: 
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/core/urls/DefaultTemplatedURLFormatter.java
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/core/urls/DefaultTemplatedURLFormatter.java?view=diff&r1=158001&r2=158002
==============================================================================
--- 
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/core/urls/DefaultTemplatedURLFormatter.java
 (original)
+++ 
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/core/urls/DefaultTemplatedURLFormatter.java
 Thu Mar 17 17:06:27 2005
@@ -93,6 +93,12 @@
 
         template.substitute( URLTemplateDescriptor.QUERY_STRING_TOKEN, query );
 
+        String fragment = uri.getFragment();
+
+        if ( fragment == null ) { fragment = ""; }
+
+        template.substitute( URLTemplateDescriptor.FRAGMENT_TOKEN, fragment );
+
         return template.toString();
     }
 }

Modified: 
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/core/urltemplates/URLTemplateDescriptor.java
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/core/urltemplates/URLTemplateDescriptor.java?view=diff&r1=158001&r2=158002
==============================================================================
--- 
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/core/urltemplates/URLTemplateDescriptor.java
 (original)
+++ 
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/core/urltemplates/URLTemplateDescriptor.java
 Thu Mar 17 17:06:27 2005
@@ -29,7 +29,7 @@
  */
 public class URLTemplateDescriptor
 {
-    // App descriptor
+    // Path to the URL template config file
     private static final String DESCRIPTOR_PATH = 
"/WEB-INF/url-template-config.xml";
 
     // Logger
@@ -54,9 +54,10 @@
     public static final String PORT_TOKEN = "{url:port}";
     public static final String PATH_TOKEN = "{url:path}";
     public static final String QUERY_STRING_TOKEN = "{url:queryString}";
+    public static final String FRAGMENT_TOKEN = "{url:fragment}";
 
     private static final List<String> KNOWN_TEMPLATE_TOKENS =
-            Arrays.asList( SCHEME_TOKEN, DOMAIN_TOKEN, PORT_TOKEN );
+            Arrays.asList( SCHEME_TOKEN, DOMAIN_TOKEN, PORT_TOKEN, 
FRAGMENT_TOKEN );
 
     private static final List<String> REQUIRED_TEMPLATE_TOKENS =
             Arrays.asList( PATH_TOKEN, QUERY_STRING_TOKEN );

Modified: 
incubator/beehive/trunk/netui/test/webapps/urlTemplates/urlTemplates/WEB-INF/url-template-config.xml
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/urlTemplates/urlTemplates/WEB-INF/url-template-config.xml?view=diff&r1=158001&r2=158002
==============================================================================
--- 
incubator/beehive/trunk/netui/test/webapps/urlTemplates/urlTemplates/WEB-INF/url-template-config.xml
 (original)
+++ 
incubator/beehive/trunk/netui/test/webapps/urlTemplates/urlTemplates/WEB-INF/url-template-config.xml
 Thu Mar 17 17:06:27 2005
@@ -2,7 +2,7 @@
 <url-template-config>
     <!-- URL templates -->
     <url-template name="default">
-        
{url:scheme}111://{url:domain}:{url:port}/{url:prefix}/{url:path}?{url:queryString}
+        
{url:scheme}://{url:domain}:{url:port}/{url:prefix}/{url:path}?{url:queryString}
     </url-template>
     <url-template name="jpf-action">
         
http://{url:domain}:{url:port}/{url:path}?URLTEMPLATE=action&amp;{url:queryString}