svn commit: r563459 - /lenya/trunk/src/modules-core/ac/java/src/org/apache/lenya/ac/impl/DefaultAccessController.java

Author: nettings
Date: Tue Aug  7 05:00:20 2007
New Revision: 563459

URL: http://svn.apache.org/viewvc?view=rev&rev=563459
Log:
grouped properties by scope at the top.
no functional changes.

Modified:
    lenya/trunk/src/modules-core/ac/java/src/org/apache/lenya/ac/impl/DefaultAccessController.java

Modified: lenya/trunk/src/modules-core/ac/java/src/org/apache/lenya/ac/impl/DefaultAccessController.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/ac/java/src/org/apache/lenya/ac/impl/DefaultAccessController.java?view=diff&rev=563459&r1=563458&r2=563459
==============================================================================
--- lenya/trunk/src/modules-core/ac/java/src/org/apache/lenya/ac/impl/DefaultAccessController.java (original)
+++ lenya/trunk/src/modules-core/ac/java/src/org/apache/lenya/ac/impl/DefaultAccessController.java Tue Aug  7 05:00:20 2007
@@ -66,14 +66,15 @@
     protected static final String ACCREDITABLE_MANAGER_ELEMENT = "accreditable-manager";
     protected static final String POLICY_MANAGER_ELEMENT = "policy-manager";
 
-    private static final String REGEX = "([0-9]{1,3}\\.){3}[0-9]{1,3}";
+    private static final String VALID_IP = "([0-9]{1,3}\\.){3}[0-9]{1,3}";
+    private ServiceManager manager;
     private ServiceSelector accreditableManagerSelector;
-    private AccreditableManager accreditableManager;
     private ServiceSelector authorizerSelector;
-    private Map authorizers = new HashMap();
-    private List authorizerKeys = new ArrayList();
     private ServiceSelector policyManagerSelector;
+    private AccreditableManager accreditableManager;
     private PolicyManager policyManager;
+    private Map authorizers = new HashMap();
+    private List authorizerKeys = new ArrayList();
     private Authenticator authenticator;
 
     /**
@@ -136,23 +137,7 @@
         return authorized;
     }
 
-    /**
-     * @see org.apache.avalon.framework.configuration.Configurable#configure(org.apache.avalon.framework.configuration.Configuration)
-     */
-    public void configure(Configuration conf) throws ConfigurationException {
-
-        try {
-            setupAccreditableManager(conf);
-            setupAuthorizers(conf);
-            setupPolicyManager(conf);
-            setupAuthenticator();
-        } catch (ConfigurationException e) {
-            throw e;
-        } catch (Exception e) {
-            throw new ConfigurationException("Configuration failed: ", e);
-        }
-    }
-
+    
     /**
      * Configures or parameterizes a component, depending on the implementation
      * as Configurable or Parameterizable.
@@ -173,6 +158,23 @@
     }
 
     /**
+     * @see org.apache.avalon.framework.configuration.Configurable#configure(org.apache.avalon.framework.configuration.Configuration)
+     */
+    public void configure(Configuration conf) throws ConfigurationException {
+
+        try {
+            setupAccreditableManager(conf);
+            setupAuthorizers(conf);
+            setupPolicyManager(conf);
+            setupAuthenticator();
+        } catch (ConfigurationException e) {
+            throw e;
+        } catch (Exception e) {
+            throw new ConfigurationException("Configuration failed: ", e);
+        }
+    }
+
+    /**
      * Creates the accreditable manager.
      * 
      * @param configuration The access controller configuration.
@@ -258,8 +260,6 @@
         this.authenticator = (Authenticator) this.manager.lookup(Authenticator.ROLE);
     }
 
-    private ServiceManager manager;
-
     /**
      * Set the global component manager.
      * 
@@ -384,7 +384,7 @@
             String clientAddress = request.getHeader("x-forwarded-for");
 
             if (clientAddress != null) {
-                Pattern p = Pattern.compile(REGEX);
+                Pattern p = Pattern.compile(VALID_IP);
                 Matcher m = p.matcher(clientAddress);
 
                 if (m.find()) {