Author: rich
Date: Thu Feb 10 20:44:00 2005
New Revision: 153352
URL: http://svn.apache.org/viewcvs?view=rev&rev=153352
Log:
This is a contribution from Carlin Rogers:
"Change the URLRewriterService API to replace the method rewriteName() with
another method getNamePrefix(). The new method should get the prefix to use to
rewrite a URL query parameter name without requiring the name as an argument to
the URLRewriter method implementations."
DRT: netui (WinXP)
BB: self (linux)
Modified:
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowRequestProcessor.java
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/DefaultURLRewriter.java
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/util/OldURLRewriterWrapper.java
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/util/URLRewriterService.java
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/AbstractClassicTag.java
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Button.java
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Form.java
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/core/urls/URLRewriter.java
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/core/urls/URLRewriterService.java
Modified:
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowRequestProcessor.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowRequestProcessor.java?view=diff&r1=153351&r2=153352
==============================================================================
---
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowRequestProcessor.java
(original)
+++
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowRequestProcessor.java
Thu Feb 10 20:44:00 2005
@@ -1632,8 +1632,8 @@
String hash = Integer.toString( request.hashCode() );
String key = makeRedirectedRequestAttrsKey( webappRelativeURI,
hash );
request.getSession().setAttribute( key, attrs );
- queryString = URLRewriterService.rewriteName( servletContext,
request, REDIRECT_REQUEST_ATTRS_PARAM )
- + '=' + hash;
+ queryString = URLRewriterService.getNamePrefix( servletContext,
request )
+ + REDIRECT_REQUEST_ATTRS_PARAM + '=' + hash;
}
Modified:
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/DefaultURLRewriter.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/DefaultURLRewriter.java?view=diff&r1=153351&r2=153352
==============================================================================
---
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/DefaultURLRewriter.java
(original)
+++
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/DefaultURLRewriter.java
Thu Feb 10 20:44:00 2005
@@ -34,9 +34,9 @@
{
private static final Logger _log = Logger.getInstance(
DefaultURLRewriter.class );
- public String rewriteName( ServletContext servletContext, ServletRequest
request, String name )
+ public String getNamePrefix( ServletContext servletContext, ServletRequest
request )
{
- return name;
+ return "";
}
public void rewriteURL( ServletContext servletContext, ServletRequest
request,
Modified:
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/util/OldURLRewriterWrapper.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/util/OldURLRewriterWrapper.java?view=diff&r1=153351&r2=153352
==============================================================================
---
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/util/OldURLRewriterWrapper.java
(original)
+++
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/util/OldURLRewriterWrapper.java
Thu Feb 10 20:44:00 2005
@@ -56,9 +56,9 @@
return _oldURLRewriter;
}
- public String rewriteName( ServletContext servletContext, ServletRequest
request, String name )
+ public String getNamePrefix( ServletContext servletContext, ServletRequest
request )
{
- return _oldURLRewriter.rewriteName( servletContext, request, name );
+ return _oldURLRewriter.rewriteName( servletContext, request, "" );
}
public void rewriteURL( ServletContext servletContext, ServletRequest
request,
Modified:
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/util/URLRewriterService.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/util/URLRewriterService.java?view=diff&r1=153351&r2=153352
==============================================================================
---
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/util/URLRewriterService.java
(original)
+++
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/util/URLRewriterService.java
Thu Feb 10 20:44:00 2005
@@ -60,7 +60,7 @@
*/
public static String rewriteName(ServletContext servletContext,
ServletRequest request, String name)
{
- return
org.apache.beehive.netui.core.urls.URLRewriterService.rewriteName(
servletContext, request, name );
+ return
org.apache.beehive.netui.core.urls.URLRewriterService.getNamePrefix(
servletContext, request ) + name;
}
/**
Modified:
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/AbstractClassicTag.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/AbstractClassicTag.java?view=diff&r1=153351&r2=153352
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/AbstractClassicTag.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/AbstractClassicTag.java
Thu Feb 10 20:44:00 2005
@@ -274,7 +274,7 @@
*/
final protected String rewriteName(String name)
{
- return URLRewriterService.rewriteName(pageContext.getServletContext(),
pageContext.getRequest(), name);
+ return
URLRewriterService.getNamePrefix(pageContext.getServletContext(),
pageContext.getRequest()) + name;
}
/**
Modified:
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Button.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Button.java?view=diff&r1=153351&r2=153352
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Button.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Button.java
Thu Feb 10 20:44:00 2005
@@ -277,8 +277,8 @@
String overrideAction = ACTION_OVERRIDE + _action;
overrideAction = HtmlUtils.addParams(overrideAction, _params,
response.getCharacterEncoding());
- String buttonOutput =
URLRewriterService.rewriteName(pageContext.getServletContext(),
- pageContext.getRequest(), overrideAction);
+ String buttonOutput =
URLRewriterService.getNamePrefix(pageContext.getServletContext(),
+ pageContext.getRequest()) + overrideAction;
if (buttonOutput.indexOf(";") > -1) {
buttonOutput = buttonOutput.substring(0,
buttonOutput.indexOf(";"));
}
Modified:
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Form.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Form.java?view=diff&r1=153351&r2=153352
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Form.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Form.java
Thu Feb 10 20:44:00 2005
@@ -764,12 +764,12 @@
if (paramValue instanceof String[]) {
String[] paramValArray = (String[]) paramValue;
for (int i = 0; i < paramValArray.length; i++) {
- String paramName =
URLRewriterService.rewriteName(servletContext, request, paramKey.toString());
+ String paramName =
URLRewriterService.getNamePrefix(servletContext, request) + paramKey.toString();
writeHiddenParam(paramName, paramValArray[i], writer,
request, true);
}
}
else {
- String paramName =
URLRewriterService.rewriteName(servletContext, request, paramKey.toString());
+ String paramName =
URLRewriterService.getNamePrefix(servletContext, request) + paramKey.toString();
writeHiddenParam(paramName, paramValue.toString(), writer,
request, true);
}
}
Modified:
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/core/urls/URLRewriter.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/core/urls/URLRewriter.java?view=diff&r1=153351&r2=153352
==============================================================================
---
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/core/urls/URLRewriter.java
(original)
+++
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/core/urls/URLRewriter.java
Thu Feb 10 20:44:00 2005
@@ -51,14 +51,14 @@
}
/**
- * Rewrite the given query parameter name.
- *
+ * Get the prefix to use when rewriting a query parameter name.
+ * Loops through the list of registered URLRewriters to build up a the
prefix.
+ *
* @param servletContext the current ServletContext.
* @param request the current ServletRequest.
- * @param name the query parameter name to rewrite.
- * @return the rewritten query parameter name.
+ * @return a prefix to use to rewrite a query parameter name..
*/
- public abstract String rewriteName( ServletContext servletContext,
ServletRequest request, String name );
+ public abstract String getNamePrefix( ServletContext servletContext,
ServletRequest request );
/**
* Rewrite the given URL.
Modified:
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/core/urls/URLRewriterService.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/core/urls/URLRewriterService.java?view=diff&r1=153351&r2=153352
==============================================================================
---
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/core/urls/URLRewriterService.java
(original)
+++
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/core/urls/URLRewriterService.java
Thu Feb 10 20:44:00 2005
@@ -57,26 +57,29 @@
private static final DefaultTemplatedURLFormatter defaultFormatter = new
DefaultTemplatedURLFormatter();
/**
- * Rewrite the given parameter name, looping through the list of
registered URLRewriters.
+ * Get the prefix to use when rewriting a query parameter name.
+ * Loops through the list of registered URLRewriters to build up a the
prefix.
*
* @param servletContext the current ServletContext.
* @param request the current ServletRequest.
- * @param name the parameter name to rewrite.
- * @return the rewritten parameter name.
+ * @return a prefix to use to rewrite a query parameter name.
*/
- public static String rewriteName( ServletContext servletContext,
ServletRequest request, String name )
+ public static String getNamePrefix( ServletContext servletContext,
ServletRequest request )
{
ArrayList< URLRewriter > rewriters = getRewriters( request );
+ StringBuilder prefix = new StringBuilder();
+
if ( rewriters != null )
{
for ( URLRewriter rewriter : rewriters )
{
- name = rewriter.rewriteName( servletContext, request, name );
+ String nextPrefix = rewriter.getNamePrefix( servletContext,
request );
+ if ( nextPrefix != null ) { prefix.append( nextPrefix ); }
}
}
- return name;
+ return prefix.toString();
}
/**
