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 no...@apache.org on 2006/09/29 15:52:38 UTC

svn commit: r451292 - in /james/server/trunk/src: conf/ java/org/apache/james/core/ java/org/apache/james/dnsserver/ java/org/apache/james/pop3server/ java/org/apache/james/remotemanager/ java/org/apache/james/services/ test/org/apache/james/pop3server...

Author: norman
Date: Fri Sep 29 06:52:36 2006
New Revision: 451292

URL: http://svn.apache.org/viewvc?view=rev&rev=451292
Log:
Replace InetAddress usage to lookup dns. See JAMES-643

Modified:
    james/server/trunk/src/conf/james-assembly.xml
    james/server/trunk/src/java/org/apache/james/core/AbstractJamesHandler.java
    james/server/trunk/src/java/org/apache/james/core/AbstractJamesService.java
    james/server/trunk/src/java/org/apache/james/dnsserver/DNSServer.java
    james/server/trunk/src/java/org/apache/james/pop3server/POP3Server.xinfo
    james/server/trunk/src/java/org/apache/james/remotemanager/RemoteManager.xinfo
    james/server/trunk/src/java/org/apache/james/services/DNSServer.java
    james/server/trunk/src/test/org/apache/james/pop3server/POP3ServerTest.java
    james/server/trunk/src/test/org/apache/james/remotemanager/RemoteManagerTest.java
    james/server/trunk/src/test/org/apache/james/services/AbstractDNSServer.java
    james/server/trunk/src/test/org/apache/james/smtpserver/DNSRBLHandlerTest.java
    james/server/trunk/src/test/org/apache/james/smtpserver/SMTPServerTest.java
    james/server/trunk/src/test/org/apache/james/smtpserver/URIRBLHandlerTest.java
    james/server/trunk/src/test/org/apache/james/smtpserver/ValidRcptMXTest.java
    james/server/trunk/src/test/org/apache/james/smtpserver/ValidSenderDomainHandlerTest.java
    james/server/trunk/src/test/org/apache/james/transport/matchers/AbstractRemoteAddrInNetworkTest.java

Modified: james/server/trunk/src/conf/james-assembly.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/src/conf/james-assembly.xml?view=diff&rev=451292&r1=451291&r2=451292
==============================================================================
--- james/server/trunk/src/conf/james-assembly.xml (original)
+++ james/server/trunk/src/conf/james-assembly.xml Fri Sep 29 06:52:36 2006
@@ -79,6 +79,7 @@
              role="org.apache.james.services.SpoolManagementService"/>
     <provide name="bayesiananalyzermanagement"
              role="org.apache.james.services.BayesianAnalyzerManagementService"/>
+    <provide name="dnsserver" role="org.apache.james.services.DNSServer"/>
   </block>
 
   <!-- The User Management block  -->
@@ -97,6 +98,7 @@
     <provide name="James" role="org.apache.james.services.MailServer"/>
     <provide name="thread-manager"
              role="org.apache.avalon.cornerstone.services.threads.ThreadManager" />
+    <provide name="dnsserver" role="org.apache.james.services.DNSServer"/>
   </block>
 
   <!-- SMTP Server -->

Modified: james/server/trunk/src/java/org/apache/james/core/AbstractJamesHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/src/java/org/apache/james/core/AbstractJamesHandler.java?view=diff&rev=451292&r1=451291&r2=451292
==============================================================================
--- james/server/trunk/src/java/org/apache/james/core/AbstractJamesHandler.java (original)
+++ james/server/trunk/src/java/org/apache/james/core/AbstractJamesHandler.java Fri Sep 29 06:52:36 2006
@@ -25,6 +25,10 @@
 import org.apache.avalon.excalibur.pool.Poolable;
 import org.apache.avalon.framework.container.ContainerUtil;
 import org.apache.avalon.framework.logger.AbstractLogEnabled;
+import org.apache.avalon.framework.service.ServiceException;
+import org.apache.avalon.framework.service.ServiceManager;
+import org.apache.avalon.framework.service.Serviceable;
+import org.apache.james.services.DNSServer;
 import org.apache.james.util.CRLFTerminatedReader;
 import org.apache.james.util.InternetPrintWriter;
 import org.apache.james.util.watchdog.Watchdog;
@@ -43,7 +47,7 @@
 /**
  * Common Handler code
  */
-public abstract class AbstractJamesHandler extends AbstractLogEnabled implements ConnectionHandler, Poolable {
+public abstract class AbstractJamesHandler extends AbstractLogEnabled implements ConnectionHandler, Poolable,Serviceable {
 
 
     /**
@@ -106,6 +110,18 @@
      */
     protected String remoteIP = null;
 
+    /**
+     * The DNSServer
+     */
+    protected DNSServer dnsServer = null;
+    
+
+    /**
+     * @see org.apache.avalon.framework.service.Serviceable#service(org.apache.avalon.framework.service.ServiceManager)
+     */
+    public void service(ServiceManager arg0) throws ServiceException {
+        dnsServer = (DNSServer) arg0.lookup(DNSServer.ROLE);
+    }
 
     /**
      * Helper method for accepting connections.
@@ -117,7 +133,7 @@
     protected void initHandler( Socket connection ) throws IOException {
         this.socket = connection;
         remoteIP = socket.getInetAddress().getHostAddress();
-        remoteHost = socket.getInetAddress().getHostName();
+        remoteHost = dnsServer.getHostName(socket.getInetAddress());
         try {
             synchronized (this) {
                 handlerThread = Thread.currentThread();
@@ -378,7 +394,6 @@
         out.println(responseString);
         logResponseString(responseString);
     }
-
 
     /**
      * A private inner class which serves as an adaptor

Modified: james/server/trunk/src/java/org/apache/james/core/AbstractJamesService.java
URL: http://svn.apache.org/viewvc/james/server/trunk/src/java/org/apache/james/core/AbstractJamesService.java?view=diff&rev=451292&r1=451291&r2=451292
==============================================================================
--- james/server/trunk/src/java/org/apache/james/core/AbstractJamesService.java (original)
+++ james/server/trunk/src/java/org/apache/james/core/AbstractJamesService.java Fri Sep 29 06:52:36 2006
@@ -620,5 +620,14 @@
     public void decommission( Object object ) throws Exception {
         return;
     }
+
+    /**
+     * @see org.apache.avalon.cornerstone.services.connection.AbstractHandlerFactory#createConnectionHandler()
+     */
+    public ConnectionHandler createConnectionHandler() throws Exception {
+        ConnectionHandler conn = super.createConnectionHandler();
+        ContainerUtil.service(conn, componentManager);
+        return conn;
+    }
 }
 

Modified: james/server/trunk/src/java/org/apache/james/dnsserver/DNSServer.java
URL: http://svn.apache.org/viewvc/james/server/trunk/src/java/org/apache/james/dnsserver/DNSServer.java?view=diff&rev=451292&r1=451291&r2=451292
==============================================================================
--- james/server/trunk/src/java/org/apache/james/dnsserver/DNSServer.java (original)
+++ james/server/trunk/src/java/org/apache/james/dnsserver/DNSServer.java Fri Sep 29 06:52:36 2006
@@ -532,4 +532,11 @@
         return txtR;
     }
 
+    /**
+     * @see org.apache.james.services.DNSServer#getHostName(java.net.InetAddress)
+     */
+    public String getHostName(InetAddress addr) throws UnknownHostException {
+        return org.xbill.DNS.Address.getHostName(addr);
+    }
+
 }

Modified: james/server/trunk/src/java/org/apache/james/pop3server/POP3Server.xinfo
URL: http://svn.apache.org/viewvc/james/server/trunk/src/java/org/apache/james/pop3server/POP3Server.xinfo?view=diff&rev=451292&r1=451291&r2=451292
==============================================================================
--- james/server/trunk/src/java/org/apache/james/pop3server/POP3Server.xinfo (original)
+++ james/server/trunk/src/java/org/apache/james/pop3server/POP3Server.xinfo Fri Sep 29 06:52:36 2006
@@ -28,6 +28,9 @@
     <dependency>
       <service name="org.apache.avalon.cornerstone.services.threads.ThreadManager" version="1.0"/>
     </dependency>
+     <dependency>
+      <service name="org.apache.james.services.DNSServer" version="1.0"/>
+    </dependency>
   </dependencies>
 
 </blockinfo>

Modified: james/server/trunk/src/java/org/apache/james/remotemanager/RemoteManager.xinfo
URL: http://svn.apache.org/viewvc/james/server/trunk/src/java/org/apache/james/remotemanager/RemoteManager.xinfo?view=diff&rev=451292&r1=451291&r2=451292
==============================================================================
--- james/server/trunk/src/java/org/apache/james/remotemanager/RemoteManager.xinfo (original)
+++ james/server/trunk/src/java/org/apache/james/remotemanager/RemoteManager.xinfo Fri Sep 29 06:52:36 2006
@@ -40,5 +40,8 @@
     <dependency>
       <service name="org.apache.james.services.BayesianAnalyzerManagementService" version="1.0"/>
     </dependency>
+    <dependency>
+      <service name="org.apache.james.services.DNSServer" version="1.0"/>
+    </dependency>
   </dependencies>
 </blockinfo>

Modified: james/server/trunk/src/java/org/apache/james/services/DNSServer.java
URL: http://svn.apache.org/viewvc/james/server/trunk/src/java/org/apache/james/services/DNSServer.java?view=diff&rev=451292&r1=451291&r2=451292
==============================================================================
--- james/server/trunk/src/java/org/apache/james/services/DNSServer.java (original)
+++ james/server/trunk/src/java/org/apache/james/services/DNSServer.java Fri Sep 29 06:52:36 2006
@@ -90,4 +90,9 @@
      * @see java.net.InetAddress#getByName(String)
      */
     public InetAddress getByName(String host) throws UnknownHostException;
+
+    /**
+     * @see org.xbill.DNS.Address#getHostName(InetAddress)
+     */
+    public String getHostName(InetAddress addr) throws UnknownHostException;
 }

Modified: james/server/trunk/src/test/org/apache/james/pop3server/POP3ServerTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/src/test/org/apache/james/pop3server/POP3ServerTest.java?view=diff&rev=451292&r1=451291&r2=451292
==============================================================================
--- james/server/trunk/src/test/org/apache/james/pop3server/POP3ServerTest.java (original)
+++ james/server/trunk/src/test/org/apache/james/pop3server/POP3ServerTest.java Fri Sep 29 06:52:36 2006
@@ -22,9 +22,12 @@
 import org.apache.avalon.cornerstone.services.sockets.SocketManager;
 import org.apache.avalon.cornerstone.services.threads.ThreadManager;
 import org.apache.avalon.framework.container.ContainerUtil;
+import org.apache.avalon.framework.service.ServiceException;
 import org.apache.commons.net.pop3.POP3Client;
 import org.apache.commons.net.pop3.POP3MessageInfo;
 import org.apache.james.core.MailImpl;
+import org.apache.james.services.AbstractDNSServer;
+import org.apache.james.services.DNSServer;
 import org.apache.james.services.JamesConnectionManager;
 import org.apache.james.services.MailRepository;
 import org.apache.james.services.MailServer;
@@ -46,6 +49,7 @@
 
 import java.io.InputStream;
 import java.io.Reader;
+import java.net.InetAddress;
 import java.util.ArrayList;
 
 import junit.framework.TestCase;
@@ -87,10 +91,11 @@
         ContainerUtil.initialize(m_pop3Server);
     }
 
-    private MockServiceManager setUpServiceManager() {
+    private MockServiceManager setUpServiceManager() throws ServiceException {
         MockServiceManager serviceManager = new MockServiceManager();
         SimpleConnectionManager connectionManager = new SimpleConnectionManager();
         ContainerUtil.enableLogging(connectionManager, new MockLogger());
+        ContainerUtil.service(connectionManager, serviceManager);
         serviceManager.put(JamesConnectionManager.ROLE, connectionManager);
         m_mailServer = new MockMailServer();
         serviceManager
@@ -100,9 +105,18 @@
         serviceManager.put(SocketManager.ROLE, new MockSocketManager(
                 m_pop3ListenerPort));
         serviceManager.put(ThreadManager.ROLE, new MockThreadManager());
+        serviceManager.put(DNSServer.ROLE, setUpDNSServer());
         return serviceManager;
     }
 
+    private DNSServer setUpDNSServer() {
+    DNSServer dns = new AbstractDNSServer() {
+        public String getHostName(InetAddress addr) {
+        return "localhost";
+        }
+    };
+    return dns;
+    }
     protected void tearDown() throws Exception {
         if (m_pop3Protocol != null) {
             m_pop3Protocol.sendCommand("quit");

Modified: james/server/trunk/src/test/org/apache/james/remotemanager/RemoteManagerTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/src/test/org/apache/james/remotemanager/RemoteManagerTest.java?view=diff&rev=451292&r1=451291&r2=451292
==============================================================================
--- james/server/trunk/src/test/org/apache/james/remotemanager/RemoteManagerTest.java (original)
+++ james/server/trunk/src/test/org/apache/james/remotemanager/RemoteManagerTest.java Fri Sep 29 06:52:36 2006
@@ -25,6 +25,8 @@
 import org.apache.avalon.cornerstone.services.threads.ThreadManager;
 import org.apache.avalon.framework.container.ContainerUtil;
 import org.apache.commons.net.telnet.TelnetClient;
+import org.apache.james.services.AbstractDNSServer;
+import org.apache.james.services.DNSServer;
 import org.apache.james.services.JamesConnectionManager;
 import org.apache.james.services.MailServer;
 import org.apache.james.services.UsersRepository;
@@ -46,6 +48,7 @@
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
+import java.net.InetAddress;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
@@ -166,7 +169,18 @@
         serviceManager.put(UsersStore.ROLE, new MockUsersStore(m_mockUsersRepository));
         serviceManager.put(SocketManager.ROLE, new MockSocketManager(m_remoteManagerListenerPort));
         serviceManager.put(ThreadManager.ROLE, new MockThreadManager());
+        serviceManager.put(DNSServer.ROLE, setUpDNSServer());
         return serviceManager;
+    }
+    
+    private DNSServer setUpDNSServer() {
+    DNSServer dns = new AbstractDNSServer() {
+        public String getHostName(InetAddress addr) {
+        return "localhost";
+        }
+    };
+    
+    return dns;
     }
 
     public void testLogin() throws IOException {

Modified: james/server/trunk/src/test/org/apache/james/services/AbstractDNSServer.java
URL: http://svn.apache.org/viewvc/james/server/trunk/src/test/org/apache/james/services/AbstractDNSServer.java?view=diff&rev=451292&r1=451291&r2=451292
==============================================================================
--- james/server/trunk/src/test/org/apache/james/services/AbstractDNSServer.java (original)
+++ james/server/trunk/src/test/org/apache/james/services/AbstractDNSServer.java Fri Sep 29 06:52:36 2006
@@ -66,4 +66,11 @@
         throw new UnsupportedOperationException("Unimplemented Stub Method");
     }
 
+    /**
+     * @see org.apache.james.services.DNSServer#getHostName(java.net.InetAddress)
+     */
+    public String getHostName(InetAddress addr) throws UnknownHostException {
+        throw new UnsupportedOperationException("Unimplemented Stub Method");
+    }
+
 }

Modified: james/server/trunk/src/test/org/apache/james/smtpserver/DNSRBLHandlerTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/src/test/org/apache/james/smtpserver/DNSRBLHandlerTest.java?view=diff&rev=451292&r1=451291&r2=451292
==============================================================================
--- james/server/trunk/src/test/org/apache/james/smtpserver/DNSRBLHandlerTest.java (original)
+++ james/server/trunk/src/test/org/apache/james/smtpserver/DNSRBLHandlerTest.java Fri Sep 29 06:52:36 2006
@@ -33,6 +33,7 @@
 import org.apache.avalon.framework.configuration.ConfigurationException;
 import org.apache.avalon.framework.configuration.DefaultConfiguration;
 import org.apache.avalon.framework.container.ContainerUtil;
+import org.apache.james.services.AbstractDNSServer;
 import org.apache.james.services.DNSServer;
 import org.apache.james.smtpserver.core.filter.fastfail.DNSRBLHandler;
 import org.apache.james.test.mock.avalon.MockLogger;
@@ -82,7 +83,7 @@
      *
      */
     private void setupMockedDnsServer() {
-        mockedDnsServer = new DNSServer() {
+        mockedDnsServer = new AbstractDNSServer() {
 
             public Collection findMXRecords(String hostname) {
                 throw new UnsupportedOperationException("Unimplemented in mock");
@@ -98,15 +99,6 @@
                     res.add("Blocked - see http://www.spamcop.net/bl.shtml?127.0.0.2");
                 }
                 return res;
-            }
-
-            public Iterator getSMTPHostAddresses(String domainName) {
-                throw new UnsupportedOperationException("Unimplemented in mock");
-            }
-
-            public InetAddress[] getAllByName(String host)
-                    throws UnknownHostException {
-                throw new UnsupportedOperationException("Unimplemented in mock");
             }
 
             public InetAddress getByName(String host)

Modified: james/server/trunk/src/test/org/apache/james/smtpserver/SMTPServerTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/src/test/org/apache/james/smtpserver/SMTPServerTest.java?view=diff&rev=451292&r1=451291&r2=451292
==============================================================================
--- james/server/trunk/src/test/org/apache/james/smtpserver/SMTPServerTest.java (original)
+++ james/server/trunk/src/test/org/apache/james/smtpserver/SMTPServerTest.java Fri Sep 29 06:52:36 2006
@@ -138,6 +138,10 @@
         public void setLocalhostByName(InetAddress localhostByName) {
             this.localhostByName = localhostByName;
         }
+
+        public String getHostName(InetAddress addr) throws UnknownHostException {
+        return "localhost";
+        }
     }
 
 

Modified: james/server/trunk/src/test/org/apache/james/smtpserver/URIRBLHandlerTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/src/test/org/apache/james/smtpserver/URIRBLHandlerTest.java?view=diff&rev=451292&r1=451291&r2=451292
==============================================================================
--- james/server/trunk/src/test/org/apache/james/smtpserver/URIRBLHandlerTest.java (original)
+++ james/server/trunk/src/test/org/apache/james/smtpserver/URIRBLHandlerTest.java Fri Sep 29 06:52:36 2006
@@ -40,6 +40,7 @@
 import junit.framework.TestCase;
 
 import org.apache.avalon.framework.container.ContainerUtil;
+import org.apache.james.services.AbstractDNSServer;
 import org.apache.james.services.DNSServer;
 import org.apache.james.smtpserver.core.filter.fastfail.URIRBLHandler;
 import org.apache.james.test.mock.avalon.MockLogger;
@@ -161,11 +162,7 @@
      *
      */
     private DNSServer setupMockedDnsServer() {
-        DNSServer mockedDnsServer = new DNSServer() {
-
-            public Collection findMXRecords(String hostname) {
-                throw new UnsupportedOperationException("Unimplemented in mock");
-            }
+        DNSServer mockedDnsServer = new AbstractDNSServer() {
 
             public Collection findTXTRecords(String hostname) {
                 List res = new ArrayList();
@@ -177,15 +174,6 @@
                     res.add("Blocked - see http://www.surbl.org");
                 }
                 return res;
-            }
-
-            public Iterator getSMTPHostAddresses(String domainName) {
-                throw new UnsupportedOperationException("Unimplemented in mock");
-            }
-
-            public InetAddress[] getAllByName(String host)
-                    throws UnknownHostException {
-                throw new UnsupportedOperationException("Unimplemented in mock");
             }
 
             public InetAddress getByName(String host)

Modified: james/server/trunk/src/test/org/apache/james/smtpserver/ValidRcptMXTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/src/test/org/apache/james/smtpserver/ValidRcptMXTest.java?view=diff&rev=451292&r1=451291&r2=451292
==============================================================================
--- james/server/trunk/src/test/org/apache/james/smtpserver/ValidRcptMXTest.java (original)
+++ james/server/trunk/src/test/org/apache/james/smtpserver/ValidRcptMXTest.java Fri Sep 29 06:52:36 2006
@@ -30,6 +30,7 @@
 import javax.mail.internet.ParseException;
 
 import org.apache.avalon.framework.container.ContainerUtil;
+import org.apache.james.services.AbstractDNSServer;
 import org.apache.james.services.DNSServer;
 import org.apache.james.smtpserver.core.filter.fastfail.ValidRcptMX;
 import org.apache.james.test.mock.avalon.MockLogger;
@@ -70,7 +71,7 @@
     }
 
     private DNSServer setupMockedDNSServer() {
-        DNSServer dns = new DNSServer() {
+        DNSServer dns = new AbstractDNSServer() {
 
             public Collection findMXRecords(String hostname) {
                 Collection mx = new ArrayList();
@@ -80,15 +81,7 @@
                 }
                 return mx;
             }
-
-            public Collection findTXTRecords(String hostname) {
-                throw new UnsupportedOperationException("Unimplemented Stub Method");
-            }
-
-            public InetAddress[] getAllByName(String host) throws UnknownHostException {
-                throw new UnsupportedOperationException("Unimplemented Stub Method");
-            }
-
+            
             public InetAddress getByName(String host) throws UnknownHostException {
                 if (host.equals(INVALID_MX) || host.equals(LOOPBACK)) {
                     return InetAddress.getByName(LOOPBACK);
@@ -96,10 +89,6 @@
                     return InetAddress.getByName("255.255.255.255");
                 }
                 throw new UnknownHostException("Unknown host");
-            }
-
-            public Iterator getSMTPHostAddresses(String domainName) {
-                throw new UnsupportedOperationException("Unimplemented Stub Method");
             }
 
         };

Modified: james/server/trunk/src/test/org/apache/james/smtpserver/ValidSenderDomainHandlerTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/src/test/org/apache/james/smtpserver/ValidSenderDomainHandlerTest.java?view=diff&rev=451292&r1=451291&r2=451292
==============================================================================
--- james/server/trunk/src/test/org/apache/james/smtpserver/ValidSenderDomainHandlerTest.java (original)
+++ james/server/trunk/src/test/org/apache/james/smtpserver/ValidSenderDomainHandlerTest.java Fri Sep 29 06:52:36 2006
@@ -28,6 +28,7 @@
 import java.util.Map;
 
 import org.apache.avalon.framework.container.ContainerUtil;
+import org.apache.james.services.AbstractDNSServer;
 import org.apache.james.services.DNSServer;
 import org.apache.james.smtpserver.core.filter.fastfail.ValidSenderDomainHandler;
 import org.apache.james.test.mock.avalon.MockLogger;
@@ -44,7 +45,7 @@
     }
     
     private DNSServer setupDNSServer() {
-        DNSServer dns = new DNSServer(){
+        DNSServer dns = new AbstractDNSServer(){
 
             public Collection findMXRecords(String hostname) {
                 Collection mx = new ArrayList();
@@ -52,22 +53,6 @@
                     mx.add("mail.james.apache.org");
                 }
                 return mx;
-            }
-
-            public Collection findTXTRecords(String hostname) {
-                throw new UnsupportedOperationException("Unimplemented mock service");
-            }
-
-            public InetAddress[] getAllByName(String host) throws UnknownHostException {
-                throw new UnsupportedOperationException("Unimplemented mock service");
-            }
-
-            public InetAddress getByName(String host) throws UnknownHostException {
-                throw new UnsupportedOperationException("Unimplemented mock service");
-            }
-
-            public Iterator getSMTPHostAddresses(String domainName) {
-                throw new UnsupportedOperationException("Unimplemented mock service");
             }
             
         };

Modified: james/server/trunk/src/test/org/apache/james/transport/matchers/AbstractRemoteAddrInNetworkTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/src/test/org/apache/james/transport/matchers/AbstractRemoteAddrInNetworkTest.java?view=diff&rev=451292&r1=451291&r2=451292
==============================================================================
--- james/server/trunk/src/test/org/apache/james/transport/matchers/AbstractRemoteAddrInNetworkTest.java (original)
+++ james/server/trunk/src/test/org/apache/james/transport/matchers/AbstractRemoteAddrInNetworkTest.java Fri Sep 29 06:52:36 2006
@@ -37,6 +37,7 @@
 import junit.framework.TestCase;
 
 import org.apache.james.Constants;
+import org.apache.james.services.AbstractDNSServer;
 import org.apache.james.services.DNSServer;
 import org.apache.james.test.mock.avalon.MockServiceManager;
 import org.apache.james.test.mock.mailet.MockMailContext;
@@ -190,29 +191,7 @@
     }
 
     protected void setupDNSServer() {
-        dnsServer = new DNSServer() {
-
-            public Collection findMXRecords(String hostname) {
-                throw new UnsupportedOperationException(
-                        "Unimplemented mock service");
-            }
-
-            public Collection findTXTRecords(String hostname) {
-                throw new UnsupportedOperationException(
-                        "Unimplemented mock service");
-            }
-
-            public Iterator getSMTPHostAddresses(String domainName) {
-                throw new UnsupportedOperationException(
-                        "Unimplemented mock service");
-            }
-
-            public InetAddress[] getAllByName(String host)
-                    throws UnknownHostException {
-                throw new UnsupportedOperationException(
-                        "Unimplemented mock service");
-            }
-
+        dnsServer = new AbstractDNSServer() {
             public InetAddress getByName(String host)
                     throws UnknownHostException {
                 if ("192.168.200.0".equals(host) || "255.255.255.0".equals(host) || "192.168.200.1".equals(host) || "192.168.0.1".equals(host) || "192.168.1.1".equals(host)) {



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