[prev in list] [next in list] [prev in thread] [next in thread] 

List:       james-dev
Subject:    svn commit: r894058 [3/3] - in
From:       norman () apache ! org
Date:       2009-12-27 12:01:57
Message-ID: 20091227120205.6B60C2388A56 () eris ! apache ! org
[Download RAW message or body]

Modified: james/server/sandbox/active/pure_spring_deployment/user-library/src/main/java/org/apache/james/impl/vut/AbstractVirtualUserTable.java
                
URL: http://svn.apache.org/viewvc/james/server/sandbox/active/pure_spring_deployment/u \
ser-library/src/main/java/org/apache/james/impl/vut/AbstractVirtualUserTable.java?rev=894058&r1=894057&r2=894058&view=diff
 ==============================================================================
--- james/server/sandbox/active/pure_spring_deployment/user-library/src/main/java/org/apache/james/impl/vut/AbstractVirtualUserTable.java \
                (original)
+++ james/server/sandbox/active/pure_spring_deployment/user-library/src/main/java/org/apache/james/impl/vut/AbstractVirtualUserTable.java \
Sun Dec 27 12:01:18 2009 @@ -43,6 +43,8 @@
 import org.apache.james.api.vut.VirtualUserTable;
 import org.apache.james.api.vut.management.InvalidMappingException;
 import org.apache.james.api.vut.management.VirtualUserTableManagement;
+import org.apache.james.lifecycle.Configurable;
+import org.apache.james.lifecycle.LogEnabled;
 import org.apache.mailet.MailAddress;
 import org.apache.oro.text.regex.MalformedPatternException;
 import org.apache.oro.text.regex.Perl5Compiler;
@@ -50,7 +52,7 @@
 /**
  * 
  */
-public abstract class AbstractVirtualUserTable implements VirtualUserTable, \
VirtualUserTableManagement, DomainList { +public abstract class \
AbstractVirtualUserTable implements VirtualUserTable, VirtualUserTableManagement, \
DomainList, LogEnabled, Configurable {  
     private boolean autoDetect = true;
     private boolean autoDetectIP = true;
@@ -69,18 +71,8 @@
         this.dns = dns;
     }
 
-    @Resource(name="org.apache.commons.configuration.Configuration")
-    public void setConfiguration(HierarchicalConfiguration config) {
-        this.config = config;
-    }
-
-    @Resource(name="org.apache.commons.logging.Log")
-    public void setLogger(Log logger) {
-        this.logger = logger;
-    }
-    
-    private void configure() throws ConfigurationException {
-        setRecursiveMapping(config.getBoolean("recursiveMapping", true));
+    public void configure(HierarchicalConfiguration config) throws \
ConfigurationException { +    \
setRecursiveMapping(config.getBoolean("recursiveMapping", true));  try {
             setMappingLimit(config.getInt("mappingLimit",10));
         } catch (IllegalArgumentException e) {
@@ -88,6 +80,11 @@
         }
         doConfigure(config);
     }
+
+    public void setLog(Log logger) {
+        this.logger = logger;
+    }
+    
     
     protected void doConfigure(HierarchicalConfiguration conf) throws \
ConfigurationException {  
@@ -97,10 +94,6 @@
         this.recursive = recursive;
     }
     
-    @PostConstruct
-    public void init() throws Exception {
-        configure();
-    }
     
     /**
      * Set the mappingLimit

Modified: james/server/sandbox/active/pure_spring_deployment/user-library/src/test/java/org/apache/james/userrepository/MockUsersRepositoryTest.java
                
URL: http://svn.apache.org/viewvc/james/server/sandbox/active/pure_spring_deployment/u \
ser-library/src/test/java/org/apache/james/userrepository/MockUsersRepositoryTest.java?rev=894058&r1=894057&r2=894058&view=diff
 ==============================================================================
--- james/server/sandbox/active/pure_spring_deployment/user-library/src/test/java/org/apache/james/userrepository/MockUsersRepositoryTest.java \
                (original)
+++ james/server/sandbox/active/pure_spring_deployment/user-library/src/test/java/org/apache/james/userrepository/MockUsersRepositoryTest.java \
Sun Dec 27 12:01:18 2009 @@ -49,9 +49,8 @@
      */
     protected UsersRepository getUsersRepository() throws Exception {
         MockUsersRepository repos = new MockUsersRepository();
-        repos.setLogger(new SimpleLog("MockLog"));
-        repos.setConfiguration(new DefaultConfigurationBuilder());
-        repos.init();
+        repos.setLog(new SimpleLog("MockLog"));
+        repos.configure(new DefaultConfigurationBuilder());
         return repos;
     }
 



---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org


[prev in list] [next in list] [prev in thread] [next in thread]