Revision: 623
http://stripes.svn.sourceforge.net/stripes/?rev=623&view=rev
Author: bengunter
Date: 2007-11-15 22:28:15 -0800 (Thu, 15 Nov 2007)
Log Message:
-----------
For STS-435: Change clean URLs not to rely on internal forwards. Reverted this
file back to revision 555, before the clean URL code. The filter is no longer
involved in processing clean URLs since it is not done using internal forwards
anymore.
Revision Links:
--------------
http://stripes.svn.sourceforge.net/stripes/?rev=555&view=rev
Modified Paths:
--------------
trunk/stripes/src/net/sourceforge/stripes/controller/StripesFilter.java
Modified:
trunk/stripes/src/net/sourceforge/stripes/controller/StripesFilter.java
===================================================================
--- trunk/stripes/src/net/sourceforge/stripes/controller/StripesFilter.java
2007-11-16 04:48:55 UTC (rev 622)
+++ trunk/stripes/src/net/sourceforge/stripes/controller/StripesFilter.java
2007-11-16 06:28:15 UTC (rev 623)
@@ -32,7 +32,6 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
-import java.net.URLEncoder;
import java.util.Locale;
import java.util.Map;
@@ -197,9 +196,7 @@
// Execute the rest of the chain
flashInbound(request);
- if (!rewriteRequest(httpRequest, httpResponse)) {
- filterChain.doFilter(request, servletResponse);
- }
+ filterChain.doFilter(request, servletResponse);
}
catch (Throwable t) {
this.configuration.getExceptionHandler().handle(t, httpRequest,
httpResponse);
@@ -269,70 +266,6 @@
}
}
- /**
- * Uses the [EMAIL PROTECTED] UrlBindingFactory} (if any) to determine if
this URL should be rewritten. If
- * necessary, the request will be rewritten and forwarded.
- *
- * @param request servlet request
- * @param response servlet response
- * @return True if the request was forwarded. False if it was not.
- * @throws ServletException
- * @throws IOException
- */
- protected boolean rewriteRequest(HttpServletRequest request,
HttpServletResponse response)
- throws ServletException, IOException {
- // if bypass flag not set, then check for rewrite
- boolean rewrite = false;
- UrlBinding binding = null;
- if (request.getAttribute(StripesConstants.REQ_ATTR_BYPASS_REWRITE) ==
null) {
- binding = UrlBindingFactory.getInstance().getBinding(request);
- rewrite = binding != null && binding.getParameters().size() > 0;
- }
-
- StringBuilder url = null;
- if (rewrite) {
- // get request URI sans the context path
- int length = request.getContextPath().length();
- if (length > 1)
- url = new
StringBuilder(request.getRequestURI().substring(length));
- else
- url = new StringBuilder(request.getRequestURI());
- length = url.length();
-
- // append the binding parameters to the query string
- char separator = '?';
- for (UrlBindingParameter p : binding.getParameters()) {
- String name = p.getName();
- if (name != null) {
- String value = p.getValue();
- if (UrlBindingParameter.PARAMETER_NAME_EVENT.equals(name))
{
- name = value;
- value = "";
- }
- if (name != null && value != null) {
- name = URLEncoder.encode(name, "UTF-8");
- value = URLEncoder.encode(value, "UTF-8");
-
url.append(separator).append(name).append('=').append(value);
- separator = '&';
- }
- }
- }
- rewrite = url.length() > length;
- }
-
- if (rewrite) {
- // forward to rewritten request
- request.setAttribute(StripesConstants.REQ_ATTR_BYPASS_REWRITE,
Boolean.TRUE);
- request.getRequestDispatcher(url.toString()).forward(request,
response);
- }
- else {
- // turn off the bypass flag
- request.removeAttribute(StripesConstants.REQ_ATTR_BYPASS_REWRITE);
- }
-
- return rewrite;
- }
-
/** Does nothing. */
public void destroy() {
// Do nothing
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Stripes-development mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/stripes-development
