You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by do...@apache.org on 2001/03/05 16:15:09 UTC

cvs commit: jakarta-james/src/org/apache/james/dnsserver DNSServer.java

donaldp     01/03/05 07:15:09

  Modified:    src/org/apache/james/dnsserver DNSServer.java
  Log:
  Updated to non-deprecated Configuration
  
  Submitted By: "Eung-ju Park" <co...@isoft.co.kr>
  
  Revision  Changes    Path
  1.8       +11 -11    jakarta-james/src/org/apache/james/dnsserver/DNSServer.java
  
  Index: DNSServer.java
  ===================================================================
  RCS file: /home/cvs/jakarta-james/src/org/apache/james/dnsserver/DNSServer.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- DNSServer.java	2001/02/18 05:37:38	1.7
  +++ DNSServer.java	2001/03/05 15:15:04	1.8
  @@ -11,8 +11,14 @@
   import java.io.*;
   import java.net.*;
   import java.util.*;
  -import org.apache.avalon.*;
   import org.apache.avalon.AbstractLoggable;
  +import org.apache.avalon.Contextualizable;
  +import org.apache.avalon.Context;
  +import org.apache.avalon.configuration.Configurable;
  +import org.apache.avalon.configuration.Configuration;
  +import org.apache.avalon.configuration.ConfigurationException;
  +import org.apache.avalon.Initializable;
  +import org.apache.avalon.Component;
   import org.apache.james.transport.Resources;
   import org.apache.mailet.Mail;
   import org.xbill.DNS.*;
  @@ -25,7 +31,6 @@
       extends AbstractLoggable
       implements Component, Configurable, Contextualizable, Initializable {
   
  -    private DefaultComponentManager compMgr;
       private Configuration conf;
       private Resolver resolver;
       private Cache cache;
  @@ -35,10 +40,6 @@
           this.conf = conf;
       }
   
  -    public void compose(ComponentManager comp) {
  -        compMgr = new DefaultComponentManager(comp);
  -    }
  -
       public void contextualize(Context context) {
       }
   
  @@ -49,8 +50,10 @@
           // Get this servers that this block will use for lookups
           Collection servers = new Vector();
           Configuration serversConf = conf.getChild("servers");
  -        for (Iterator it = serversConf.getChildren("server"); it.hasNext(); ) {
  -            servers.add(((Configuration) it.next()).getValue());
  +        final Configuration[] serverConfs = serversConf.getChildren( "server" );
  +        for ( int i = 0; i < serverConfs.length; i++ )
  +        {
  +            servers.add( serverConfs[i] );
           }
           if (servers.isEmpty()) {
               try {
  @@ -71,9 +74,6 @@
           dnsCredibility = authoritative ? Credibility.AUTH_ANSWER : Credibility.NONAUTH_ANSWER;
   
           cache = new Cache ();
  -
  -        // Add this to comp
  -        compMgr.put("DNS_SERVER", this);
   
           getLogger().info("DNSServer ...init end");
       }