svn commit: r992405 - /tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/TapestryModule.java

[hlship]

Author: hlship
Date: Fri Sep  3 18:25:12 2010
New Revision: 992405

URL: http://svn.apache.org/viewvc?rev=992405&view=rev
Log:
TAP5-1254: Ordering of MarkupRenderer (and PartialMarkupRender) filters can 
cause bad interraction between ClientBehaviorSupport and Heartbeat

Modified:
    
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/TapestryModule.java

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=992405&r1=992404&r2=992405&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
 Fri Sep  3 18:25:12 2010
@@ -2077,9 +2077,9 @@ public final class TapestryModule
         configuration.add("DocumentLinker", documentLinker);
         configuration.add("JavaScriptSupport", javaScriptSupport, 
"after:DocumentLinker");
         configuration.add("RenderSupport", renderSupport, 
"after:JavaScriptSupport");
-        configuration.add("InjectDefaultStyleheet", injectDefaultStylesheet, 
"after:RenderSupport");
+        configuration.add("InjectDefaultStyleheet", injectDefaultStylesheet, 
"after:JavaScriptSupport");
         configuration.add("ClientBehaviorSupport", clientBehaviorSupport, 
"after:JavaScriptSupport");
-        configuration.add("Heartbeat", heartbeat, "after:RenderSupport");
+        configuration.add("Heartbeat", heartbeat, 
"after:ClientBehaviorSupport");
         configuration.add("DefaultValidationDecorator", 
defaultValidationDecorator, "after:Heartbeat");
     }
 
@@ -2226,7 +2226,7 @@ public final class TapestryModule
         configuration.add("JavaScriptSupport", javascriptSupport, 
"after:DocumentLinker");
         configuration.add("RenderSupport", renderSupport, 
"after:JavaScriptSupport");
         configuration.add("ClientBehaviorSupport", clientBehaviorSupport, 
"after:JavaScriptSupport");
-        configuration.add("Heartbeat", heartbeat, "after:RenderSupport");
+        configuration.add("Heartbeat", heartbeat, 
"after:ClientBehaviorSupport");
         configuration.add("DefaultValidationDecorator", 
defaultValidationDecorator, "after:Heartbeat");
     }