Author: thiagohp
Date: Wed Mar 11 00:16:27 2009
New Revision: 752313
URL: http://svn.apache.org/viewvc?rev=752313&view=rev
Log:
TAP5-557: some refactorings and copyright fixes.
Added:
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/URLRewriterRequestFilter.java
(contents, props changed)
- copied, changed from r751937,
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/urlrewriter/URLRewriterRequestFilter.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/URLRewriterRequestFilterTest.java
(contents, props changed)
- copied, changed from r751937,
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/urlrewriter/URLRewriterRequestFilterTest.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/services/DelegatingRequest.java
Removed:
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/urlrewriter/URLRewriterRequestFilter.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/urlrewriter/URLRewriterRequestFilterTest.java
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/TapestryModule.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/urlrewriter/SimpleRequestWrapper.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/urlrewriter/URLRewriterRule.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app3/pages/URLRewriteSuccess.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/urlrewriter/IntegrationTests.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/urlrewriter/SimpleRequestWrapperTest.java
Copied:
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/URLRewriterRequestFilter.java
(from r751937,
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/urlrewriter/URLRewriterRequestFilter.java)
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/URLRewriterRequestFilter.java?p2=tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/URLRewriterRequestFilter.java&p1=tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/urlrewriter/URLRewriterRequestFilter.java&r1=751937&r2=752313&rev=752313&view=diff
==============================================================================
---
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/urlrewriter/URLRewriterRequestFilter.java
(original)
+++
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/URLRewriterRequestFilter.java
Wed Mar 11 00:16:27 2009
@@ -1,4 +1,4 @@
-// Copyright 2006, 2007, 2008, 2009 The Apache Software Foundation
+// Copyright 2009 The Apache Software Foundation
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -11,7 +11,7 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry5.urlrewriter;
+package org.apache.tapestry5.internal.services;
import java.io.IOException;
import java.util.List;
@@ -21,6 +21,7 @@
import org.apache.tapestry5.services.RequestFilter;
import org.apache.tapestry5.services.RequestHandler;
import org.apache.tapestry5.services.Response;
+import org.apache.tapestry5.urlrewriter.URLRewriterRule;
/**
* <code>RequestFilter</code> that applies the URL rewriting rules to requests.
@@ -54,8 +55,8 @@
request = rule.process(request);
if (request == null)
{
- throw new RuntimeException(
- "URLRewriterRule.process() returned null");
+ throw new NullPointerException(
+ "URLRewriterRule.process() returned null.");
}
}
Propchange:
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/URLRewriterRequestFilter.java
------------------------------------------------------------------------------
svn:mergeinfo =
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/TapestryModule.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/TapestryModule.java?rev=752313&r1=752312&r2=752313&view=diff
==============================================================================
---
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/TapestryModule.java
(original)
+++
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/TapestryModule.java
Wed Mar 11 00:16:27 2009
@@ -52,7 +52,6 @@
import org.apache.tapestry5.runtime.RenderCommand;
import org.apache.tapestry5.runtime.RenderQueue;
import org.apache.tapestry5.services.ajax.MultiZoneUpdateEventResultProcessor;
-import org.apache.tapestry5.urlrewriter.URLRewriterRequestFilter;
import org.apache.tapestry5.urlrewriter.URLRewriterRule;
import org.apache.tapestry5.util.StringToEnumCoercion;
import org.apache.tapestry5.validator.*;
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/urlrewriter/SimpleRequestWrapper.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/urlrewriter/SimpleRequestWrapper.java?rev=752313&r1=752312&r2=752313&view=diff
==============================================================================
---
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/urlrewriter/SimpleRequestWrapper.java
(original)
+++
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/urlrewriter/SimpleRequestWrapper.java
Wed Mar 11 00:16:27 2009
@@ -1,4 +1,4 @@
-// Copyright 2006, 2007, 2008, 2009 The Apache Software Foundation
+// Copyright 2009 The Apache Software Foundation
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -13,22 +13,17 @@
// limitations under the License.
package org.apache.tapestry5.urlrewriter;
-import java.util.List;
-import java.util.Locale;
-
import org.apache.tapestry5.ioc.internal.util.Defense;
+import org.apache.tapestry5.services.DelegatingRequest;
import org.apache.tapestry5.services.Request;
-import org.apache.tapestry5.services.Session;
/**
* Class that wraps a {...@linkplain Request}. It delegates all methods except
ones related to URL
* rewriting.
*/
-public class SimpleRequestWrapper implements Request
+public class SimpleRequestWrapper extends DelegatingRequest
{
- final private Request request;
-
final private String path;
final private String serverName;
@@ -45,11 +40,11 @@
*/
public SimpleRequestWrapper(Request request, String serverName, String
path)
{
- Defense.notNull(request, "request");
+
+ super(request);
Defense.notNull(serverName, "serverName");
Defense.notNull(path, "path");
- this.request = request;
this.serverName = serverName;
this.path = path;
@@ -66,100 +61,28 @@
*/
public SimpleRequestWrapper(Request request, String path) {
+ super(request);
+
Defense.notNull(request, "request");
final String serverName = request.getServerName();
Defense.notNull(serverName, "serverName");
Defense.notNull(path, "path");
- this.request = request;
this.serverName = serverName;
this.path = path;
}
+ @Override
public String getPath()
{
return path;
}
+ @Override
public String getServerName()
{
return serverName;
}
- public Object getAttribute(String name)
- {
- return request.getAttribute(name);
- }
-
- public String getContextPath()
- {
- return request.getContextPath();
- }
-
- public long getDateHeader(String name)
- {
- return request.getDateHeader(name);
- }
-
- public String getHeader(String name)
- {
- return request.getHeader(name);
- }
-
- public List<String> getHeaderNames()
- {
- return request.getHeaderNames();
- }
-
- public Locale getLocale()
- {
- return request.getLocale();
- }
-
- public String getMethod()
- {
- return request.getMethod();
- }
-
- public String getParameter(String name)
- {
- return request.getParameter(name);
- }
-
- public List<String> getParameterNames()
- {
- return request.getParameterNames();
- }
-
- public String[] getParameters(String name)
- {
- return request.getParameters(name);
- }
-
- public Session getSession(boolean create)
- {
- return request.getSession(create);
- }
-
- public boolean isRequestedSessionIdValid()
- {
- return request.isRequestedSessionIdValid();
- }
-
- public boolean isSecure()
- {
- return request.isSecure();
- }
-
- public boolean isXHR()
- {
- return request.isXHR();
- }
-
- public void setAttribute(String name, Object value)
- {
- request.setAttribute(name, value);
- }
-
}
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/urlrewriter/URLRewriterRule.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/urlrewriter/URLRewriterRule.java?rev=752313&r1=752312&r2=752313&view=diff
==============================================================================
---
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/urlrewriter/URLRewriterRule.java
(original)
+++
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/urlrewriter/URLRewriterRule.java
Wed Mar 11 00:16:27 2009
@@ -1,4 +1,4 @@
-// Copyright 2006, 2007, 2008, 2009 The Apache Software Foundation
+// Copyright 2009 The Apache Software Foundation
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app3/pages/URLRewriteSuccess.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app3/pages/URLRewriteSuccess.java?rev=752313&r1=752312&r2=752313&view=diff
==============================================================================
---
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app3/pages/URLRewriteSuccess.java
(original)
+++
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app3/pages/URLRewriteSuccess.java
Wed Mar 11 00:16:27 2009
@@ -1,4 +1,4 @@
-// Copyright 2006, 2007, 2008, 2009 The Apache Software Foundation
+// Copyright 2009 The Apache Software Foundation
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
Copied:
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/URLRewriterRequestFilterTest.java
(from r751937,
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/urlrewriter/URLRewriterRequestFilterTest.java)
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/URLRewriterRequestFilterTest.java?p2=tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/URLRewriterRequestFilterTest.java&p1=tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/urlrewriter/URLRewriterRequestFilterTest.java&r1=751937&r2=752313&rev=752313&view=diff
==============================================================================
---
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/urlrewriter/URLRewriterRequestFilterTest.java
(original)
+++
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/URLRewriterRequestFilterTest.java
Wed Mar 11 00:16:27 2009
@@ -1,4 +1,4 @@
-// Copyright 2006, 2007, 2008, 2009 The Apache Software Foundation
+// Copyright 2009 The Apache Software Foundation
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -11,24 +11,24 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry5.urlrewriter;
+package org.apache.tapestry5.internal.services;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
-import java.util.Locale;
+import org.apache.tapestry5.internal.services.URLRewriterRequestFilter;
import org.apache.tapestry5.ioc.test.TestBase;
+import org.apache.tapestry5.services.DelegatingRequest;
import org.apache.tapestry5.services.Request;
import org.apache.tapestry5.services.RequestHandler;
import org.apache.tapestry5.services.Response;
-import org.apache.tapestry5.services.Session;
-import org.apache.tapestry5.urlrewriter.URLRewriterRequestFilter;
+import org.apache.tapestry5.urlrewriter.SimpleRequestWrapper;
import org.apache.tapestry5.urlrewriter.URLRewriterRule;
import org.testng.annotations.Test;
/**
- * Tests {...@linkplain
org.apache.tapestry5.internal.services.URLRewriterRequestFilter}.
+ * Tests {...@linkplain
org.org.apache.tapestry5.internal.services.URLRewriterRequestFilter}.
*/
public class URLRewriterRequestFilterTest extends TestBase
{
@@ -133,101 +133,4 @@
}
- final private static class DelegatingRequest implements Request
- {
-
- private Request request;
-
- public void setRequest(Request request)
- {
- this.request = request;
- }
-
- public Object getAttribute(String name)
- {
- return request.getAttribute(name);
- }
-
- public String getContextPath()
- {
- return request.getContextPath();
- }
-
- public long getDateHeader(String name)
- {
- return request.getDateHeader(name);
- }
-
- public String getHeader(String name)
- {
- return request.getHeader(name);
- }
-
- public List<String> getHeaderNames()
- {
- return request.getHeaderNames();
- }
-
- public Locale getLocale()
- {
- return request.getLocale();
- }
-
- public String getMethod()
- {
- return request.getMethod();
- }
-
- public String getParameter(String name)
- {
- return request.getParameter(name);
- }
-
- public List<String> getParameterNames()
- {
- return request.getParameterNames();
- }
-
- public String[] getParameters(String name)
- {
- return request.getParameters(name);
- }
-
- public String getPath()
- {
- return request.getPath();
- }
-
- public String getServerName()
- {
- return request.getServerName();
- }
-
- public Session getSession(boolean create)
- {
- return request.getSession(create);
- }
-
- public boolean isRequestedSessionIdValid()
- {
- return request.isRequestedSessionIdValid();
- }
-
- public boolean isSecure()
- {
- return request.isSecure();
- }
-
- public boolean isXHR()
- {
- return request.isXHR();
- }
-
- public void setAttribute(String name, Object value)
- {
- request.setAttribute(name, value);
- }
-
- }
-
}
Propchange:
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/URLRewriterRequestFilterTest.java
------------------------------------------------------------------------------
svn:mergeinfo =
Added:
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/services/DelegatingRequest.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/services/DelegatingRequest.java?rev=752313&view=auto
==============================================================================
---
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/services/DelegatingRequest.java
(added)
+++
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/services/DelegatingRequest.java
Wed Mar 11 00:16:27 2009
@@ -0,0 +1,131 @@
+package org.apache.tapestry5.services;
+
+import java.util.List;
+import java.util.Locale;
+
+import org.apache.tapestry5.ioc.internal.util.Defense;
+import org.apache.tapestry5.services.Request;
+import org.apache.tapestry5.services.Session;
+
+/**
+ * Class that wraps an {...@linkplain Request}, delegating all its methods.
+ *
+ * @since 5.1.0.1
+ */
+public class DelegatingRequest implements Request
+{
+
+ private Request request;
+
+ /**
+ * No-arg constructor. It should only be used for testing purposes.
+ */
+ public DelegatingRequest() {
+ }
+
+ /**
+ * Constructor that receives a {...@linkplain Request}.
+ *
+ * @param request a {...@link Request}. It cannot be null.
+ */
+ public DelegatingRequest(Request request)
+ {
+ setRequest(request);
+ }
+
+ /**
+ * Sets the delegate request.
+ * @param request a {...@link Request}. It cannot be null.
+ */
+ public void setRequest(Request request)
+ {
+ Defense.notNull(request, "request");
+ this.request = request;
+ }
+
+ public Object getAttribute(String name)
+ {
+ return request.getAttribute(name);
+ }
+
+ public String getContextPath()
+ {
+ return request.getContextPath();
+ }
+
+ public long getDateHeader(String name)
+ {
+ return request.getDateHeader(name);
+ }
+
+ public String getHeader(String name)
+ {
+ return request.getHeader(name);
+ }
+
+ public List<String> getHeaderNames()
+ {
+ return request.getHeaderNames();
+ }
+
+ public Locale getLocale()
+ {
+ return request.getLocale();
+ }
+
+ public String getMethod()
+ {
+ return request.getMethod();
+ }
+
+ public String getParameter(String name)
+ {
+ return request.getParameter(name);
+ }
+
+ public List<String> getParameterNames()
+ {
+ return request.getParameterNames();
+ }
+
+ public String[] getParameters(String name)
+ {
+ return request.getParameters(name);
+ }
+
+ public String getPath()
+ {
+ return request.getPath();
+ }
+
+ public String getServerName()
+ {
+ return request.getServerName();
+ }
+
+ public Session getSession(boolean create)
+ {
+ return request.getSession(create);
+ }
+
+ public boolean isRequestedSessionIdValid()
+ {
+ return request.isRequestedSessionIdValid();
+ }
+
+ public boolean isSecure()
+ {
+ return request.isSecure();
+ }
+
+ public boolean isXHR()
+ {
+ return request.isXHR();
+ }
+
+ public void setAttribute(String name, Object value)
+ {
+ request.setAttribute(name, value);
+ }
+
+}
\ No newline at end of file
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/urlrewriter/IntegrationTests.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/urlrewriter/IntegrationTests.java?rev=752313&r1=752312&r2=752313&view=diff
==============================================================================
---
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/urlrewriter/IntegrationTests.java
(original)
+++
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/urlrewriter/IntegrationTests.java
Wed Mar 11 00:16:27 2009
@@ -1,4 +1,4 @@
-// Copyright 2006, 2007, 2008, 2009 The Apache Software Foundation
+// Copyright 2009 The Apache Software Foundation
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@
* listening on localhost:80.
*/
@SuppressWarnings({ "JavaDoc" })
-...@test(timeOut = 50000000, sequential = true)
+...@test(timeOut = 30000, sequential = true)
public class IntegrationTests extends AbstractIntegrationTestSuite
{
public IntegrationTests()
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/urlrewriter/SimpleRequestWrapperTest.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/urlrewriter/SimpleRequestWrapperTest.java?rev=752313&r1=752312&r2=752313&view=diff
==============================================================================
---
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/urlrewriter/SimpleRequestWrapperTest.java
(original)
+++
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/urlrewriter/SimpleRequestWrapperTest.java
Wed Mar 11 00:16:27 2009
@@ -1,4 +1,4 @@
-// Copyright 2006, 2007, 2008, 2009 The Apache Software Foundation
+// Copyright 2009 The Apache Software Foundation
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -19,12 +19,14 @@
import java.util.Locale;
import org.apache.tapestry5.ioc.test.TestBase;
+import org.apache.tapestry5.services.DelegatingRequest;
import org.apache.tapestry5.services.Request;
import org.apache.tapestry5.services.Session;
import org.testng.annotations.Test;
/**
- * Tests {...@linkplain
org.apache.tapestry5.urlrewritter.SimpleRequestWrapper}.
+ * Tests {...@linkplain org.apache.tapestry5.urlrewritter.SimpleRequestWrapper}
+ * and {...@link DelegatingRequest}.
*/
public class SimpleRequestWrapperTest extends TestBase
{
