You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tapestry.apache.org by hl...@apache.org on 2008/01/26 00:30:28 UTC
svn commit: r615398 - in /tapestry/tapestry5/trunk/tapestry-core/src:
main/java/org/apache/tapestry/internal/services/
main/java/org/apache/tapestry/internal/test/
main/java/org/apache/tapestry/services/
test/java/org/apache/tapestry/internal/services/
Author: hlship
Date: Fri Jan 25 15:30:27 2008
New Revision: 615398
URL: http://svn.apache.org/viewvc?rev=615398&view=rev
Log:
TAPESTRY-2046: Optimized paths broken for pages with activation contexts
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ImmediateActionRenderResponseGenerator.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/test/ActionLinkInvoker.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/TapestryModule.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ComponentEventDispatcherTest.java
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ImmediateActionRenderResponseGenerator.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ImmediateActionRenderResponseGenerator.java?rev=615398&r1=615397&r2=615398&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ImmediateActionRenderResponseGenerator.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ImmediateActionRenderResponseGenerator.java Fri Jan 25 15:30:27 2008
@@ -38,7 +38,7 @@
{
Defense.notNull(page, "page");
- // This can happen when the ComponentActionRequestHandlerImpl notices that the response
+ // This can happen when the ComponentEventRequestHandlerImpl notices that the response
// is not yet committed, and sets up to render a default response for the page containing
// the component.
if (_request.getAttribute(InternalConstants.IMMEDIATE_RESPONSE_PAGE_ATTRIBUTE) != null) return;
@@ -46,7 +46,7 @@
// We are somewhere in the middle of processing an action request, possibly something
// complicated like a form submission. Tapestry components are not re-entrant, so we
// can't render the request right now, instead we record that we need to render
- // a response as an attribute, and let a filter on the ComponentActionRequestHandler service
+ // a response as an attribute, and let a filter on the ComponentEventRequestHandler service
// do the work.
_request.setAttribute(InternalConstants.IMMEDIATE_RESPONSE_PAGE_ATTRIBUTE, page);
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/test/ActionLinkInvoker.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/test/ActionLinkInvoker.java?rev=615398&r1=615397&r2=615398&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/test/ActionLinkInvoker.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/test/ActionLinkInvoker.java Fri Jan 25 15:30:27 2008
@@ -47,7 +47,7 @@
{
_registry = registry;
_followupInvoker = followupInvoker;
- _componentEventRequestHandler = _registry.getService("ComponentActionRequestHandler",
+ _componentEventRequestHandler = _registry.getService("ComponentEventRequestHandler",
ComponentEventRequestHandler.class);
_response = _registry.getObject(TestableResponse.class, null);
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/TapestryModule.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/TapestryModule.java?rev=615398&r1=615397&r2=615398&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/TapestryModule.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/TapestryModule.java Fri Jan 25 15:30:27 2008
@@ -1611,7 +1611,7 @@
* Filters on the request handler are supported here as well.
*/
@Marker(Ajax.class)
- public ComponentEventRequestHandler buildAjaxComponentActionRequestHandler(
+ public ComponentEventRequestHandler buildAjaxComponentEventRequestHandler(
List<ComponentEventRequestFilter> configuration, Logger logger, ServiceResources resources)
{
return _pipelineBuilder.build(logger, ComponentEventRequestHandler.class, ComponentEventRequestFilter.class,
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ComponentEventDispatcherTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ComponentEventDispatcherTest.java?rev=615398&r1=615397&r2=615398&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ComponentEventDispatcherTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ComponentEventDispatcherTest.java Fri Jan 25 15:30:27 2008
@@ -27,7 +27,7 @@
@Test
public void no_dot_or_colon_in_path() throws Exception
{
- ComponentEventRequestHandler handler = newComponentActionRequestHandler();
+ ComponentEventRequestHandler handler = newComponentEventRequestHandler();
Request request = mockRequest();
Response response = mockResponse();
@@ -42,7 +42,7 @@
verify();
}
- protected final ComponentEventRequestHandler newComponentActionRequestHandler()
+ protected final ComponentEventRequestHandler newComponentEventRequestHandler()
{
return newMock(ComponentEventRequestHandler.class);
}
@@ -117,7 +117,7 @@
@Test
public void page_activation_context_in_request() throws Exception
{
- ComponentEventRequestHandler handler = newComponentActionRequestHandler();
+ ComponentEventRequestHandler handler = newComponentEventRequestHandler();
Request request = mockRequest();
Response response = mockResponse();
ComponentClassResolver resolver = mockComponentClassResolver();
@@ -150,7 +150,7 @@
@Test
public void different_active_and_containing_pages() throws Exception
{
- ComponentEventRequestHandler handler = newComponentActionRequestHandler();
+ ComponentEventRequestHandler handler = newComponentEventRequestHandler();
Request request = mockRequest();
Response response = mockResponse();
ComponentClassResolver resolver = mockComponentClassResolver();
@@ -182,7 +182,7 @@
@Test
public void request_path_reference_non_existent_page() throws Exception
{
- ComponentEventRequestHandler handler = newComponentActionRequestHandler();
+ ComponentEventRequestHandler handler = newComponentEventRequestHandler();
Request request = mockRequest();
Response response = mockResponse();
ComponentClassResolver resolver = mockComponentClassResolver();
@@ -203,7 +203,7 @@
private void test(String requestPath, String containerPageName, String nestedComponentId, String eventType,
String... eventContext) throws IOException
{
- ComponentEventRequestHandler handler = newComponentActionRequestHandler();
+ ComponentEventRequestHandler handler = newComponentEventRequestHandler();
Request request = mockRequest();
Response response = mockResponse();
ComponentClassResolver resolver = mockComponentClassResolver();