Author: ivaynberg
Date: Thu Jan 27 17:58:26 2011
New Revision: 1064234
URL: http://svn.apache.org/viewvc?rev=1064234&view=rev
Log:
Issue: WICKET-3399
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/ajax/AjaxRequestTarget.java
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/mock/MockWebResponse.java
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/BufferedWebResponse.java
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/HeaderBufferingWebResponse.java
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebResponse.java
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/response/ByteArrayResponse.java
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/response/NullResponse.java
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/response/StringResponse.java
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/request/cycle/BaseRequestHandlerStackTest.java
wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/Response.java
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/ajax/AjaxRequestTarget.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/ajax/AjaxRequestTarget.java?rev=1064234&r1=1064233&r2=1064234&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/ajax/AjaxRequestTarget.java
(original)
+++
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/ajax/AjaxRequestTarget.java
Thu Jan 27 17:58:26 2011
@@ -225,6 +225,12 @@ public class AjaxRequestTarget implement
{
throw new UnsupportedOperationException("Cannot write
binary data.");
}
+
+ @Override
+ public Object getContainerResponse()
+ {
+ return originalResponse.getContainerResponse();
+ }
}
private static final Logger LOG =
LoggerFactory.getLogger(AjaxRequestTarget.class);
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/mock/MockWebResponse.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/mock/MockWebResponse.java?rev=1064234&r1=1064233&r2=1064234&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/mock/MockWebResponse.java
(original)
+++
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/mock/MockWebResponse.java
Thu Jan 27 17:58:26 2011
@@ -329,4 +329,10 @@ public class MockWebResponse extends Web
}
}
+
+ @Override
+ public Object getContainerResponse()
+ {
+ return null;
+ }
}
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/BufferedWebResponse.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/BufferedWebResponse.java?rev=1064234&r1=1064233&r2=1064234&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/BufferedWebResponse.java
(original)
+++
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/BufferedWebResponse.java
Thu Jan 27 17:58:26 2011
@@ -551,4 +551,10 @@ public class BufferedWebResponse extends
return charSequenceAction.builder.toString();
}
+ @Override
+ public Object getContainerResponse()
+ {
+ return originalResponse.getContainerResponse();
+ }
+
}
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/HeaderBufferingWebResponse.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/HeaderBufferingWebResponse.java?rev=1064234&r1=1064233&r2=1064234&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/HeaderBufferingWebResponse.java
(original)
+++
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/HeaderBufferingWebResponse.java
Thu Jan 27 17:58:26 2011
@@ -180,4 +180,10 @@ class HeaderBufferingWebResponse extends
{
bufferedResponse.writeMetaData(webResponse);
}
+
+ @Override
+ public Object getContainerResponse()
+ {
+ return originalResponse.getContainerResponse();
+ }
}
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebResponse.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebResponse.java?rev=1064234&r1=1064233&r2=1064234&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebResponse.java
(original)
+++
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebResponse.java
Thu Jan 27 17:58:26 2011
@@ -289,4 +289,10 @@ public class ServletWebResponse extends
httpServletResponse.reset();
redirect = false;
}
+
+ @Override
+ public Object getContainerResponse()
+ {
+ return httpServletResponse;
+ }
}
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/response/ByteArrayResponse.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/response/ByteArrayResponse.java?rev=1064234&r1=1064233&r2=1064234&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/response/ByteArrayResponse.java
(original)
+++
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/response/ByteArrayResponse.java
Thu Jan 27 17:58:26 2011
@@ -115,4 +115,10 @@ public class ByteArrayResponse extends R
return url != null ? url.toString() : null;
}
}
+
+ @Override
+ public Object getContainerResponse()
+ {
+ return original.getContainerResponse();
+ }
}
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/response/NullResponse.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/response/NullResponse.java?rev=1064234&r1=1064233&r2=1064234&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/response/NullResponse.java
(original)
+++
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/response/NullResponse.java
Thu Jan 27 17:58:26 2011
@@ -63,4 +63,10 @@ public class NullResponse extends Respon
{
return url != null ? url.toString() : null;
}
+
+ @Override
+ public Object getContainerResponse()
+ {
+ return null;
+ }
}
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/response/StringResponse.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/response/StringResponse.java?rev=1064234&r1=1064233&r2=1064234&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/response/StringResponse.java
(original)
+++
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/response/StringResponse.java
Thu Jan 27 17:58:26 2011
@@ -90,4 +90,10 @@ public class StringResponse extends Resp
{
return url != null ? url.toString() : null;
}
+
+ @Override
+ public Object getContainerResponse()
+ {
+ return null;
+ }
}
Modified:
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/request/cycle/BaseRequestHandlerStackTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/request/cycle/BaseRequestHandlerStackTest.java?rev=1064234&r1=1064233&r2=1064234&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/request/cycle/BaseRequestHandlerStackTest.java
(original)
+++
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/request/cycle/BaseRequestHandlerStackTest.java
Thu Jan 27 17:58:26 2011
@@ -45,6 +45,12 @@ public abstract class BaseRequestHandler
{
return null;
}
+
+ @Override
+ public Object getContainerResponse()
+ {
+ return null;
+ }
};
}
Modified:
wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/Response.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/Response.java?rev=1064234&r1=1064233&r2=1064234&view=diff
==============================================================================
---
wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/Response.java
(original)
+++
wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/Response.java
Thu Jan 27 17:58:26 2011
@@ -69,4 +69,13 @@ public abstract class Response
public void reset()
{
}
+
+ /**
+ * Provides access to the low-level container response object that
implementaion of this
+ * {@link Response} delegate to. This allows users to access features
provided by the container
+ * response but not by generalized Wicket {@link Response} objects.
+ *
+ * @return low-level container response object, or {@code null} if none
+ */
+ public abstract Object getContainerResponse();
}
