struts-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mr...@apache.org
Subject svn commit: r475013 - in /struts/struts2/trunk/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh: FreeMarkerPageFilter.java VelocityPageFilter.java
Date Tue, 14 Nov 2006 21:52:42 GMT
Author: mrdon
Date: Tue Nov 14 13:52:42 2006
New Revision: 475013

URL: http://svn.apache.org/viewvc?view=rev&rev=475013
Log:
Fixing template manager injections to be static
WW-1498

Modified:
    struts/struts2/trunk/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/FreeMarkerPageFilter.java
    struts/struts2/trunk/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/VelocityPageFilter.java

Modified: struts/struts2/trunk/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/FreeMarkerPageFilter.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/FreeMarkerPageFilter.java?view=diff&rev=475013&r1=475012&r2=475013
==============================================================================
--- struts/struts2/trunk/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/FreeMarkerPageFilter.java
(original)
+++ struts/struts2/trunk/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/FreeMarkerPageFilter.java
Tue Nov 14 13:52:42 2006
@@ -111,7 +111,7 @@
     private static FreemarkerManager freemarkerManager;
     
     @Inject
-    public void setFreemarkerManager(FreemarkerManager mgr) {
+    public static void setFreemarkerManager(FreemarkerManager mgr) {
         freemarkerManager = mgr;
     }
 

Modified: struts/struts2/trunk/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/VelocityPageFilter.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/VelocityPageFilter.java?view=diff&rev=475013&r1=475012&r2=475013
==============================================================================
--- struts/struts2/trunk/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/VelocityPageFilter.java
(original)
+++ struts/struts2/trunk/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/VelocityPageFilter.java
Tue Nov 14 13:52:42 2006
@@ -52,7 +52,7 @@
     private static VelocityManager velocityManager;
     
     @Inject
-    public void setVelocityManager(VelocityManager mgr) {
+    public static void setVelocityManager(VelocityManager mgr) {
         velocityManager = mgr;
     }
         



Mime
View raw message