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

[hlship]

Author: hlship
Date: Thu Jul 21 18:21:27 2011
New Revision: 1149303

URL: http://svn.apache.org/viewvc?rev=1149303&view=rev
Log:
TAP5-1508: Reorder some workers to ensure that render phase methods written 
decorated by Import worker are not overwritten by RenderPhase worker

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=1149303&r1=1149302&r2=1149303&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
 Thu Jul 21 18:21:27 2011
@@ -519,7 +519,6 @@ public final class TapestryModule
             ComponentClassResolver resolver)
     {
         configuration.add("Property", new PropertyWorker());
-        configuration.addInstance("Import", ImportWorker.class, 
"after:SetupRender");
 
         configuration.add("RenderCommand", new RenderCommandWorker());
 
@@ -537,19 +536,22 @@ public final class TapestryModule
         configuration.addInstance("InjectContainer", 
InjectContainerWorker.class);
 
         // Default values for parameters are often some form of injection, so
-        // make sure
-        // that Parameter fields are processed after injections.
+        // make sure that Parameter fields are processed after injections.
+
+        configuration.addInstance("Parameter", ParameterWorker.class);
 
-        configuration.addInstance("Parameter", ParameterWorker.class, 
"after:Inject*");
         // bind parameter should always go after parameter to make sure all
         // parameters have been properly setup.
-
-        configuration.addInstance("BindParameter", BindParameterWorker.class, 
"after:Parameter");
+        configuration.addInstance("BindParameter", BindParameterWorker.class);
 
         configuration.add("SupportsInformalParameters", new 
SupportsInformalParametersWorker());
 
         configuration.addInstance("RenderPhase", 
RenderPhaseMethodWorker.class);
 
+        // Import advises methods, usually render phase methods, so it must 
come after RenderPhase.
+
+        configuration.addInstance("Import", ImportWorker.class);
+
         // This one is always last. Any additional private fields that aren't
         // annotated will
         // be converted to clear out at the end of the request.