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 2010/11/07 20:46:31 UTC

svn commit: r1032368 - in /james/server/trunk: core-api/src/main/java/org/apache/james/services/ core-function/src/main/java/org/apache/james/ core-library/src/test/java/org/apache/james/services/ fetchmail/ fetchmail/src/main/java/org/apache/james/fet...

Author: norman
Date: Sun Nov  7 19:46:30 2010
New Revision: 1032368

URL: http://svn.apache.org/viewvc?rev=1032368&view=rev
Log:
Remove isLocalServer from MailServer interface. Its just a duplicate of DomainList.containsDomain(...). See JAMES-1117

Modified:
    james/server/trunk/core-api/src/main/java/org/apache/james/services/MailServer.java
    james/server/trunk/core-function/src/main/java/org/apache/james/JamesMailServer.java
    james/server/trunk/core-library/src/test/java/org/apache/james/services/MockMailServer.java
    james/server/trunk/fetchmail/pom.xml
    james/server/trunk/fetchmail/src/main/java/org/apache/james/fetchmail/MessageProcessor.java
    james/server/trunk/fetchmail/src/main/java/org/apache/james/fetchmail/ParsedConfiguration.java
    james/server/trunk/mailetcontainer-library/pom.xml
    james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/lib/JamesMailetContext.java
    james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/SieveMailet.java
    james/server/trunk/smtpserver/pom.xml
    james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/AuthRequiredToRelayRcptHook.java
    james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/SenderAuthIdentifyVerificationRcptHook.java
    james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptHandler.java
    james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/AbstractSMTPServerTest.java
    james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/ValidRcptHandlerTest.java

Modified: james/server/trunk/core-api/src/main/java/org/apache/james/services/MailServer.java
URL: http://svn.apache.org/viewvc/james/server/trunk/core-api/src/main/java/org/apache/james/services/MailServer.java?rev=1032368&r1=1032367&r2=1032368&view=diff
==============================================================================
--- james/server/trunk/core-api/src/main/java/org/apache/james/services/MailServer.java (original)
+++ james/server/trunk/core-api/src/main/java/org/apache/james/services/MailServer.java Sun Nov  7 19:46:30 2010
@@ -38,14 +38,6 @@ public interface MailServer{
      * @return the new identifier
      */
     String getId();
-
-    /**
-     * Checks if a server is serviced by mail context
-     *
-     * @param serverName - name of server.
-     * @return true if server is local, i.e. serviced by this mail context
-     */
-    boolean isLocalServer(String serverName);
     
     /**
      * Return true if virtualHosting support is enabled, otherwise false

Modified: james/server/trunk/core-function/src/main/java/org/apache/james/JamesMailServer.java
URL: http://svn.apache.org/viewvc/james/server/trunk/core-function/src/main/java/org/apache/james/JamesMailServer.java?rev=1032368&r1=1032367&r2=1032368&view=diff
==============================================================================
--- james/server/trunk/core-function/src/main/java/org/apache/james/JamesMailServer.java (original)
+++ james/server/trunk/core-function/src/main/java/org/apache/james/JamesMailServer.java Sun Nov  7 19:46:30 2010
@@ -204,21 +204,6 @@ public class JamesMailServer
         return idBuffer.toString();
     }
 
- 
-    /**
-     * @see org.apache.james.services.MailServer#isLocalServer(java.lang.String)
-     */
-    public boolean isLocalServer( final String serverName ) {
-        String lowercase = serverName.toLowerCase(Locale.US);
-       
-        // Check if the serverName is localhost or the DomainList implementation contains the serverName. This
-        // allow some implementations to act more dynamic
-        if ("localhost".equals(serverName) || domains.containsDomain(lowercase)){
-            return  true;
-        } else {
-            return false;
-        }
-    }
     /**
      * @see org.apache.james.services.MailServer#supportVirtualHosting()
      */
@@ -281,7 +266,7 @@ public class JamesMailServer
         }
         this.postmaster = new MailAddress(postMasterAddress);
 
-        if (!isLocalServer(postmaster.getDomain())) {
+        if (!domains.containsDomain(postmaster.getDomain())) {
             StringBuffer warnBuffer = new StringBuffer(320).append("The specified postmaster address ( ").append(postmaster).append(
                     " ) is not a local address.  This is not necessarily a problem, but it does mean that emails addressed to the postmaster will be routed to another server.  For some configurations this may cause problems.");
             logger.warn(warnBuffer.toString());

Modified: james/server/trunk/core-library/src/test/java/org/apache/james/services/MockMailServer.java
URL: http://svn.apache.org/viewvc/james/server/trunk/core-library/src/test/java/org/apache/james/services/MockMailServer.java?rev=1032368&r1=1032367&r2=1032368&view=diff
==============================================================================
--- james/server/trunk/core-library/src/test/java/org/apache/james/services/MockMailServer.java (original)
+++ james/server/trunk/core-library/src/test/java/org/apache/james/services/MockMailServer.java Sun Nov  7 19:46:30 2010
@@ -35,9 +35,6 @@ public class MockMailServer implements M
         return MailUtil.newId();
     }
 
-    public boolean isLocalServer(String serverName) {
-        return "localhost".equals(serverName);
-    }
     
     public void setVirtualHosting(boolean virtualHosting) {
         this.virtualHosting = virtualHosting;

Modified: james/server/trunk/fetchmail/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/fetchmail/pom.xml?rev=1032368&r1=1032367&r2=1032368&view=diff
==============================================================================
--- james/server/trunk/fetchmail/pom.xml (original)
+++ james/server/trunk/fetchmail/pom.xml Sun Nov  7 19:46:30 2010
@@ -38,6 +38,10 @@
     </dependency>
     <dependency>
       <groupId>org.apache.james</groupId>
+      <artifactId>james-server-domainlist-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.james</groupId>
       <artifactId>james-server-user-api</artifactId>
     </dependency>
     <dependency>
@@ -69,4 +73,4 @@
       <artifactId>jsr250-api</artifactId>
     </dependency>
   </dependencies>
-</project>
\ No newline at end of file
+</project>

Modified: james/server/trunk/fetchmail/src/main/java/org/apache/james/fetchmail/MessageProcessor.java
URL: http://svn.apache.org/viewvc/james/server/trunk/fetchmail/src/main/java/org/apache/james/fetchmail/MessageProcessor.java?rev=1032368&r1=1032367&r2=1032368&view=diff
==============================================================================
--- james/server/trunk/fetchmail/src/main/java/org/apache/james/fetchmail/MessageProcessor.java (original)
+++ james/server/trunk/fetchmail/src/main/java/org/apache/james/fetchmail/MessageProcessor.java Sun Nov  7 19:46:30 2010
@@ -903,7 +903,7 @@ public class MessageProcessor extends Pr
      */
     protected boolean isLocalServer(MailAddress recipient)
     {
-        return getServer().isLocalServer(recipient.getDomain());
+        return getConfiguration().getDomainList().containsDomain(recipient.getDomain());
     }
     
     /**

Modified: james/server/trunk/fetchmail/src/main/java/org/apache/james/fetchmail/ParsedConfiguration.java
URL: http://svn.apache.org/viewvc/james/server/trunk/fetchmail/src/main/java/org/apache/james/fetchmail/ParsedConfiguration.java?rev=1032368&r1=1032367&r2=1032368&view=diff
==============================================================================
--- james/server/trunk/fetchmail/src/main/java/org/apache/james/fetchmail/ParsedConfiguration.java (original)
+++ james/server/trunk/fetchmail/src/main/java/org/apache/james/fetchmail/ParsedConfiguration.java Sun Nov  7 19:46:30 2010
@@ -32,6 +32,7 @@ import org.apache.commons.configuration.
 import org.apache.commons.configuration.HierarchicalConfiguration;
 import org.apache.commons.logging.Log;
 import org.apache.james.dnsservice.api.DNSService;
+import org.apache.james.domainlist.api.DomainList;
 import org.apache.james.queue.api.MailQueue;
 import org.apache.james.services.MailServer;
 import org.apache.james.user.api.UsersRepository;
@@ -311,6 +312,8 @@ class ParsedConfiguration
 
     private MailQueue queue;
 
+    private DomainList domainList;
+
 
 
     /**
@@ -878,7 +881,7 @@ protected void setDNSServer(DNSService d
      */
     protected void validateDefaultDomainName(String defaultDomainName) throws ConfigurationException
     {
-        if (!getServer().isLocalServer(defaultDomainName))
+        if (!getDomainList().containsDomain(defaultDomainName))
         {
             throw new ConfigurationException(
                 "Default domain name is not a local server: "
@@ -1192,4 +1195,11 @@ protected void setDNSServer(DNSService d
         return queue;
     }
 
+    public DomainList getDomainList() {
+        return domainList;
+    }
+    
+    public void setDomainList(DomainList domainList) {
+        this.domainList = domainList;
+    }
 }

Modified: james/server/trunk/mailetcontainer-library/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/mailetcontainer-library/pom.xml?rev=1032368&r1=1032367&r2=1032368&view=diff
==============================================================================
--- james/server/trunk/mailetcontainer-library/pom.xml (original)
+++ james/server/trunk/mailetcontainer-library/pom.xml Sun Nov  7 19:46:30 2010
@@ -34,6 +34,10 @@
     </dependency>
     <dependency>
       <groupId>org.apache.james</groupId>
+      <artifactId>james-server-domainlist-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.james</groupId>
       <artifactId>james-server-mailetcontainer-api</artifactId>
     </dependency>
      <dependency>

Modified: james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/lib/JamesMailetContext.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/lib/JamesMailetContext.java?rev=1032368&r1=1032367&r2=1032368&view=diff
==============================================================================
--- james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/lib/JamesMailetContext.java (original)
+++ james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/lib/JamesMailetContext.java Sun Nov  7 19:46:30 2010
@@ -41,6 +41,7 @@ import org.apache.commons.logging.Log;
 import org.apache.james.core.MailImpl;
 import org.apache.james.dnsservice.api.DNSService;
 import org.apache.james.dnsservice.api.TemporaryResolutionException;
+import org.apache.james.domainlist.api.DomainList;
 import org.apache.james.lifecycle.LifecycleUtil;
 import org.apache.james.lifecycle.LogEnabled;
 import org.apache.james.mailetcontainer.api.MailProcessor;
@@ -68,6 +69,8 @@ public class JamesMailetContext implemen
 
     private MailProcessor processorList;
 
+    private DomainList domains;
+
     @Resource(name = "mailserver")
     public void setMailServer(MailServer mailServer) {
         this.mailServer = mailServer;
@@ -89,6 +92,13 @@ public class JamesMailetContext implemen
         this.localusers = localusers;
     }
     
+
+
+    @Resource(name="domainlist")
+    public void setDomainList(DomainList domains) {
+        this.domains = domains;
+    }
+    
     
     /**
      * @see org.apache.mailet.MailetContext#getMailServers(String)
@@ -317,7 +327,7 @@ public class JamesMailetContext implemen
      * @see org.apache.mailet.MailetContext#isLocalServer(java.lang.String)
      */
     public boolean isLocalServer(String name) {
-        return mailServer.isLocalServer(name);
+        return domains.containsDomain(name);
     }
 
     /*

Modified: james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/SieveMailet.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/SieveMailet.java?rev=1032368&r1=1032367&r2=1032368&view=diff
==============================================================================
--- james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/SieveMailet.java (original)
+++ james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/SieveMailet.java Sun Nov  7 19:46:30 2010
@@ -108,7 +108,7 @@ public class SieveMailet extends SieveMa
                     final int endOfHost = url.indexOf('/', startOfHost);
                     final String host = url.substring(startOfHost, endOfHost);
                     // if (!"localhost".equals(host)) {
-                    if (mailServer.isLocalServer(host) == false) {
+                    if (getMailetContext().isLocalUser(user) == false) {
                         // TODO: possible support for clustering?
                         throw new MessagingException("Only local mailboxes are supported");
                     } else {

Modified: james/server/trunk/smtpserver/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/pom.xml?rev=1032368&r1=1032367&r2=1032368&view=diff
==============================================================================
--- james/server/trunk/smtpserver/pom.xml (original)
+++ james/server/trunk/smtpserver/pom.xml Sun Nov  7 19:46:30 2010
@@ -42,6 +42,10 @@
     </dependency>
     <dependency>
       <groupId>org.apache.james</groupId>
+      <artifactId>james-server-domainlist-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.james</groupId>
       <artifactId>james-server-core-api</artifactId>
     </dependency>
     <dependency>
@@ -169,5 +173,11 @@
       <scope>test</scope>
       <type>test-jar</type>
     </dependency>
+    <dependency>
+      <groupId>org.apache.james</groupId>
+      <artifactId>james-server-domainlist-api</artifactId>
+      <scope>test</scope>
+      <type>test-jar</type>
+    </dependency>
   </dependencies>
 </project>

Modified: james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/AuthRequiredToRelayRcptHook.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/AuthRequiredToRelayRcptHook.java?rev=1032368&r1=1032367&r2=1032368&view=diff
==============================================================================
--- james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/AuthRequiredToRelayRcptHook.java (original)
+++ james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/AuthRequiredToRelayRcptHook.java Sun Nov  7 19:46:30 2010
@@ -20,34 +20,24 @@ package org.apache.james.smtpserver;
 
 import javax.annotation.Resource;
 
+import org.apache.james.domainlist.api.DomainList;
 import org.apache.james.protocols.smtp.core.AbstractAuthRequiredToRelayRcptHook;
-import org.apache.james.services.MailServer;
 
-public class AuthRequiredToRelayRcptHook extends AbstractAuthRequiredToRelayRcptHook {
-    private MailServer mailServer;
-    
-    /**
-     * Gets the mail server.
-     * @return the mailServer
-     */
-    public final MailServer getMailServer() {
-        return mailServer;
-    }
+public class AuthRequiredToRelayRcptHook extends AbstractAuthRequiredToRelayRcptHook {  
 
-    /**
-     * Sets the mail server.
-     * @param mailServer the mailServer to set
-     */
-    @Resource(name="mailserver")
-    public final void setMailServer(MailServer mailServer) {
-        this.mailServer = mailServer;
-    }
 
+    private DomainList domains;
+
+    @Resource(name="domainlist")
+    public void setDomainList(DomainList domains) {
+        this.domains = domains;
+    }
+    
     /**
      * (non-Javadoc)
      * @see org.apache.james.protocols.smtp.core.AbstractAuthRequiredToRelayRcptHook#isLocalDomain(java.lang.String)
      */
     protected boolean isLocalDomain(String domain) {
-        return mailServer.isLocalServer(domain);
+        return domains.containsDomain(domain);
     }
 }

Modified: james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/SenderAuthIdentifyVerificationRcptHook.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/SenderAuthIdentifyVerificationRcptHook.java?rev=1032368&r1=1032367&r2=1032368&view=diff
==============================================================================
--- james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/SenderAuthIdentifyVerificationRcptHook.java (original)
+++ james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/SenderAuthIdentifyVerificationRcptHook.java Sun Nov  7 19:46:30 2010
@@ -20,6 +20,7 @@ package org.apache.james.smtpserver;
 
 import javax.annotation.Resource;
 
+import org.apache.james.domainlist.api.DomainList;
 import org.apache.james.protocols.smtp.SMTPSession;
 import org.apache.james.protocols.smtp.core.AbstractSenderAuthIdentifyVerificationRcptHook;
 import org.apache.james.protocols.smtp.hook.HookResult;
@@ -34,14 +35,8 @@ import org.apache.mailet.MailAddress;
 public class SenderAuthIdentifyVerificationRcptHook extends AbstractSenderAuthIdentifyVerificationRcptHook {
 
     private MailServer mailServer;
+    private DomainList domains;
     
-    /**
-     * Gets the mail server.
-     * @return the mailServer
-     */
-    public final MailServer getMailServer() {
-        return mailServer;
-    }
 
     /**
      * Sets the mail server.
@@ -52,6 +47,13 @@ public class SenderAuthIdentifyVerificat
         this.mailServer = mailServer;
     }
 
+
+    @Resource(name="domainlist")
+    public void setDomainList(DomainList domains) {
+        this.domains = domains;
+    }
+    
+    
     @Override
     public HookResult doRcpt(SMTPSession session, MailAddress sender,
             MailAddress rcpt) {
@@ -67,7 +69,7 @@ public class SenderAuthIdentifyVerificat
      * @see org.apache.james.protocols.smtp.core.AbstractSenderAuthIdentifyVerificationRcptHook#isLocalDomain(java.lang.String)
      */
     protected boolean isLocalDomain(String domain) {
-        return mailServer.isLocalServer(domain);
+        return domains.containsDomain(domain);
     }
 
     @Override

Modified: james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptHandler.java?rev=1032368&r1=1032367&r2=1032368&view=diff
==============================================================================
--- james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptHandler.java (original)
+++ james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptHandler.java Sun Nov  7 19:46:30 2010
@@ -25,6 +25,7 @@ import javax.annotation.Resource;
 
 import org.apache.commons.configuration.ConfigurationException;
 import org.apache.commons.configuration.HierarchicalConfiguration;
+import org.apache.james.domainlist.api.DomainList;
 import org.apache.james.lifecycle.Configurable;
 import org.apache.james.protocols.smtp.SMTPSession;
 import org.apache.james.protocols.smtp.core.fastfail.AbstractValidRcptHandler;
@@ -48,6 +49,8 @@ public class ValidRcptHandler extends Ab
 
     private MailServer mailServer;
 
+    private DomainList domains;
+
 	/**
 	 * Gets the users repository.
 	 * 
@@ -78,11 +81,17 @@ public class ValidRcptHandler extends Ab
 	public final void setVirtualUserTable(VirtualUserTable vut) {
 		this.vut = vut;
 	}
-	
-	@Resource(name = "mailserver")
-	public void setMailServer(MailServer mailServer) {
-	    this.mailServer = mailServer;
-	}
+
+
+    @Resource(name="domainlist")
+    public void setDomainList(DomainList domains) {
+        this.domains = domains;
+    }
+    
+    @Resource(name="mailserver")
+    public final void setMailServer(MailServer mailServer) {
+        this.mailServer = mailServer;
+    }
 
 	/**
 	 * @see org.apache.james.lifecycle.Configurable#configure(org.apache.commons.configuration.Configuration)
@@ -101,7 +110,7 @@ public class ValidRcptHandler extends Ab
 	protected boolean isValidRecipient(SMTPSession session,
 			MailAddress recipient) {
 
-	    if (mailServer.isLocalServer(recipient.getDomain()) == false) {
+	    if (domains.containsDomain(recipient.getDomain()) == false) {
             session.getLogger().debug("Unknown domain " + recipient.getDomain() + " so reject it");
 
 	        return false;

Modified: james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/AbstractSMTPServerTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/AbstractSMTPServerTest.java?rev=1032368&r1=1032367&r2=1032368&view=diff
==============================================================================
--- james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/AbstractSMTPServerTest.java (original)
+++ james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/AbstractSMTPServerTest.java Sun Nov  7 19:46:30 2010
@@ -46,6 +46,7 @@ import org.apache.james.queue.api.MockMa
 import org.apache.james.queue.api.MockMailQueueFactory;
 import org.apache.james.services.MockJSR250Loader;
 import org.apache.james.dnsservice.api.DNSService;
+import org.apache.james.domainlist.api.SimpleDomainList;
 import org.apache.james.lifecycle.LifecycleUtil;
 import org.apache.james.mailstore.MockMailStore;
 import org.apache.james.services.MockFileSystem;
@@ -299,6 +300,11 @@ public abstract class AbstractSMTPServer
         queueFactory = new MockMailQueueFactory();
         queue = (MockMailQueue) queueFactory.getQueue(MockMailQueueFactory.SPOOL);
         m_serviceManager.put("mailQueueFactory", queueFactory);
+        m_serviceManager.put("domainlist", new SimpleDomainList() {
+            public boolean containsDomain(String serverName) {
+                return "localhost".equals(serverName);
+            }
+        });
     }
 
     public void testSimpleMailSendWithEHLO() throws Exception {

Modified: james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/ValidRcptHandlerTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/ValidRcptHandlerTest.java?rev=1032368&r1=1032367&r2=1032368&view=diff
==============================================================================
--- james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/ValidRcptHandlerTest.java (original)
+++ james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/ValidRcptHandlerTest.java Sun Nov  7 19:46:30 2010
@@ -27,10 +27,10 @@ import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.mail.MessagingException;
 
 import junit.framework.TestCase;
 
+import org.apache.james.domainlist.api.DomainList;
 import org.apache.james.protocols.smtp.BaseFakeSMTPSession;
 import org.apache.james.protocols.smtp.SMTPConfiguration;
 import org.apache.james.protocols.smtp.SMTPSession;
@@ -40,7 +40,6 @@ import org.apache.james.smtpserver.fastf
 import org.apache.james.user.api.UsersRepository;
 import org.apache.james.user.lib.MockUsersRepository;
 import org.apache.james.vut.api.VirtualUserTable;
-import org.apache.mailet.Mail;
 import org.apache.mailet.MailAddress;
 
 public class ValidRcptHandlerTest extends TestCase {
@@ -78,22 +77,37 @@ public class ValidRcptHandlerTest extend
                 return null;
             }
 
-
-            public boolean isLocalServer(String serverName) {
-                return serverName.equals(VALID_DOMAIN);
+            public boolean supportVirtualHosting() {
+                // TODO Auto-generated method stub
+                return false;
             }
 
-       
+            public MailAddress getPostmaster() {
+                // TODO Auto-generated method stub
+                return null;
+            }
+            
+        });
+        handler.setDomainList(new DomainList() {
 
-            public boolean supportVirtualHosting() {
+            public boolean addDomain(String domain) {
                 // TODO Auto-generated method stub
                 return false;
             }
 
-            public MailAddress getPostmaster() {
+            public boolean containsDomain(String domain) {
+                return domain.equals(VALID_DOMAIN);
+            }
+
+            public String[] getDomains() {
                 // TODO Auto-generated method stub
                 return null;
             }
+
+            public boolean removeDomain(String domain) {
+                // TODO Auto-generated method stub
+                return false;
+            }
             
         });
     }



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