svn commit: r1521997 - /turbine/core/trunk/src/java/org/apache/turbine/pipeline/DefaultLoginValve.java

[tv]

Author: tv
Date: Wed Sep 11 19:24:37 2013
New Revision: 1521997

URL: http://svn.apache.org/r1521997
Log:
Use @TurbineConfiguration annotation instead of static accessors

Modified:
    
turbine/core/trunk/src/java/org/apache/turbine/pipeline/DefaultLoginValve.java

Modified: 
turbine/core/trunk/src/java/org/apache/turbine/pipeline/DefaultLoginValve.java
URL: 
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/pipeline/DefaultLoginValve.java?rev=1521997&r1=1521996&r2=1521997&view=diff
==============================================================================
--- 
turbine/core/trunk/src/java/org/apache/turbine/pipeline/DefaultLoginValve.java 
(original)
+++ 
turbine/core/trunk/src/java/org/apache/turbine/pipeline/DefaultLoginValve.java 
Wed Sep 11 19:24:37 2013
@@ -28,8 +28,9 @@ import java.util.List;
 
 import javax.servlet.http.HttpSession;
 
-import org.apache.turbine.Turbine;
+import org.apache.commons.configuration.Configuration;
 import org.apache.turbine.TurbineConstants;
+import org.apache.turbine.annotation.TurbineConfiguration;
 import org.apache.turbine.modules.Action;
 import org.apache.turbine.modules.ActionLoader;
 import org.apache.turbine.services.assemblerbroker.TurbineAssemblerBroker;
@@ -52,6 +53,9 @@ public class DefaultLoginValve
 {
     private ActionLoader actionLoader;
 
+    @TurbineConfiguration
+    private Configuration config;
+
     /**
      * Here we can setup objects that are thread safe and can be
      * reused. We setup the session validator and the access
@@ -114,9 +118,9 @@ public class DefaultLoginValve
         String actionName = data.getAction();
         if (data.hasAction() &&
             actionName.equalsIgnoreCase
-            
(Turbine.getConfiguration().getString(TurbineConstants.ACTION_LOGIN_KEY)) ||
+            (config.getString(TurbineConstants.ACTION_LOGIN_KEY)) ||
             actionName.equalsIgnoreCase
-            
(Turbine.getConfiguration().getString(TurbineConstants.ACTION_LOGOUT_KEY)))
+            (config.getString(TurbineConstants.ACTION_LOGOUT_KEY)))
         {
             // If a User is logging in, we should refresh the
             // session here.  Invalidating session and starting a
@@ -130,7 +134,7 @@ public class DefaultLoginValve
             // only keys stored in the session are "turbine.user"
             // and "turbine.acl".
             if (actionName.equalsIgnoreCase
-                
(Turbine.getConfiguration().getString(TurbineConstants.ACTION_LOGIN_KEY)))
+                (config.getString(TurbineConstants.ACTION_LOGIN_KEY)))
             {
                 @SuppressWarnings("unchecked")
                 Enumeration<String> names = 
data.getSession().getAttributeNames();