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/10/21 15:07:18 UTC
svn commit: r1025986 - in /james/server/trunk:
container-spring/src/main/config/james/
core-function/src/main/java/org/apache/james/
domainlist-api/src/main/java/org/apache/james/domainlist/api/
domainlist-api/src/test/java/org/apache/james/domainlist/...
Author: norman
Date: Thu Oct 21 13:07:17 2010
New Revision: 1025986
URL: http://svn.apache.org/viewvc?rev=1025986&view=rev
Log:
Merge ManageableDomainList and DomainList interface + rename MBean interface
Added:
james/server/trunk/domainlist-api/src/main/java/org/apache/james/domainlist/api/DomainListManagementMBean.java
- copied, changed from r1025966, james/server/trunk/domainlist-api/src/main/java/org/apache/james/domainlist/api/DomainListMBean.java
james/server/trunk/domainlist-library/src/main/java/org/apache/james/domainlist/lib/DomainListManagement.java
Removed:
james/server/trunk/domainlist-api/src/main/java/org/apache/james/domainlist/api/DomainListMBean.java
james/server/trunk/domainlist-api/src/main/java/org/apache/james/domainlist/api/ManageableDomainList.java
james/server/trunk/domainlist-api/src/main/java/org/apache/james/domainlist/api/ManageableDomainListMBean.java
Modified:
james/server/trunk/container-spring/src/main/config/james/spring-beans.xml
james/server/trunk/core-function/src/main/java/org/apache/james/JamesMailServer.java
james/server/trunk/domainlist-api/src/main/java/org/apache/james/domainlist/api/DomainList.java
james/server/trunk/domainlist-api/src/test/java/org/apache/james/domainlist/api/SimpleDomainList.java
james/server/trunk/domainlist-library/src/main/java/org/apache/james/domainlist/lib/AbstractDomainList.java
james/server/trunk/domainlist-library/src/main/java/org/apache/james/domainlist/lib/JamesDomainList.java
james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/AddDomainCmdHandler.java
james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/AddUserCmdHandler.java
james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/ListDomainsCmdHandler.java
james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/RemoveDomainCmdHandler.java
james/server/trunk/remotemanager/src/test/java/org/apache/james/remotemanager/AbstractRemoteManagerTest.java
Modified: james/server/trunk/container-spring/src/main/config/james/spring-beans.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/container-spring/src/main/config/james/spring-beans.xml?rev=1025986&r1=1025985&r2=1025986&view=diff
==============================================================================
--- james/server/trunk/container-spring/src/main/config/james/spring-beans.xml (original)
+++ james/server/trunk/container-spring/src/main/config/james/spring-beans.xml Thu Oct 21 13:07:17 2010
@@ -39,7 +39,7 @@
<entry key="org.apache.james:type=server,name=pop3server" value-ref="pop3server"/>
<entry key="org.apache.james:type=server,name=imapserver" value-ref="imapserver"/>
<entry key="org.apache.james:type=server,name=remotemanager" value-ref="remotemanager"/>
- <entry key="org.apache.james:type=component,name=domainlist" value-ref="domainlist"/>
+ <entry key="org.apache.james:type=component,name=domainlist" value-ref="domainlistmanagement"/>
<entry key="org.apache.james:type=component,name=dnsservice" value-ref="dnsservice"/>
<entry key="org.apache.james:type=component,name=processor" value-ref="processormanagement"/>
<entry key="org.apache.james:type=component,name=virtualusertable" value-ref="virtualusertablemanagement"/>
@@ -48,7 +48,7 @@
</property>
<property name="assembler">
<bean class="org.springframework.jmx.export.assembler.InterfaceBasedMBeanInfoAssembler">
- <property name="managedInterfaces" value="org.apache.james.smtpserver.SMTPServerMBean,org.apache.james.socket.ServerMBean,org.apache.james.domainlist.api.DomainListMBean,org.apache.james.domainlist.api.ManageableDomainListMBean,org.apache.james.dnsservice.api.DNSServiceMBean,org.apache.james.mailetcontainer.api.ProcessorManagementMBean,org.apache.james.vut.api.VirtualUserTableManagementMBean,org.apache.james.user.api.UserManagementMBean"/>
+ <property name="managedInterfaces" value="org.apache.james.smtpserver.SMTPServerMBean,org.apache.james.socket.ServerMBean,org.apache.james.domainlist.api.DomainListManagementMBean,org.apache.james.dnsservice.api.DNSServiceMBean,org.apache.james.mailetcontainer.api.ProcessorManagementMBean,org.apache.james.vut.api.VirtualUserTableManagementMBean,org.apache.james.user.api.UserManagementMBean"/>
</bean>
</property>
</bean>
@@ -71,6 +71,8 @@
<bean id="usermanagement" class="org.apache.james.user.lib.UserManagement" />
<bean id="virtualusertablemanagement" class="org.apache.james.vut.lib.VirtualUserTableManagement" />
+
+ <bean id="domainlistmanagement" class="org.apache.james.domainlist.lib.DomainListManagement" />
-->
<bean class="org.apache.james.container.spring.lifecycle.CommonsConfigurableBeanPostProcessor">
@@ -253,7 +255,7 @@
<bean id="virtualusertable" name="manageablevirtualusertable" class="org.apache.james.vut.lib.JamesVirtualUserTable" />
<!-- The context domainlist implementation -->
- <bean id="domainlist" name="domainlistmanagement" class="org.apache.james.domainlist.lib.JamesDomainList" />
+ <bean id="domainlist" class="org.apache.james.domainlist.lib.JamesDomainList" />
<!-- IMAP server Beans -->
<bean id="imapserver" class="org.apache.james.imapserver.netty.NioImapServer">
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=1025986&r1=1025985&r2=1025986&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 Thu Oct 21 13:07:17 2010
@@ -34,7 +34,6 @@ import org.apache.commons.configuration.
import org.apache.commons.logging.Log;
import org.apache.james.dnsservice.api.DNSService;
import org.apache.james.domainlist.api.DomainList;
-import org.apache.james.domainlist.api.ManageableDomainList;
import org.apache.james.lifecycle.Configurable;
import org.apache.james.lifecycle.LifecycleUtil;
import org.apache.james.lifecycle.LogEnabled;
@@ -178,13 +177,8 @@ public class JamesMailServer
private void initializeServernames() throws ConfigurationException, ParseException {
String defaultDomain = getDefaultDomain();
if (domains.containsDomain(defaultDomain) == false) {
- if (domains instanceof ManageableDomainList) {
- if(((ManageableDomainList) domains).addDomain(defaultDomain) == false) {
- throw new ConfigurationException("Configured defaultdomain could not get added to DomainList");
- }
- } else {
- throw new ConfigurationException("Configured defaultDomain not exist in DomainList");
- }
+ throw new ConfigurationException("Configured defaultDomain not exist in DomainList");
+
}
serverNames = domains.getDomains();
@@ -289,7 +283,7 @@ public class JamesMailServer
if (defaultDomain == null) {
String[] domainList = domains.getDomains();
if (domainList == null || domainList.length < 1) {
- return conf.getString("defaultDomain", "localhost");
+ return conf.getString("defaultDomain", "localhost");
} else {
return domainList[0];
}
Modified: james/server/trunk/domainlist-api/src/main/java/org/apache/james/domainlist/api/DomainList.java
URL: http://svn.apache.org/viewvc/james/server/trunk/domainlist-api/src/main/java/org/apache/james/domainlist/api/DomainList.java?rev=1025986&r1=1025985&r2=1025986&view=diff
==============================================================================
--- james/server/trunk/domainlist-api/src/main/java/org/apache/james/domainlist/api/DomainList.java (original)
+++ james/server/trunk/domainlist-api/src/main/java/org/apache/james/domainlist/api/DomainList.java Thu Oct 21 13:07:17 2010
@@ -43,4 +43,20 @@ public interface DomainList {
public boolean containsDomain(String domain);
+ /**
+ * Add domain to the service
+ *
+ * @param domain domain to add
+ * @return true if successfull
+ */
+ public boolean addDomain(String domain);
+
+ /**
+ * Remove domain from the service
+ *
+ * @param domain domain to remove
+ * @return true if successfull
+ */
+ public boolean removeDomain(String domain);
+
}
Copied: james/server/trunk/domainlist-api/src/main/java/org/apache/james/domainlist/api/DomainListManagementMBean.java (from r1025966, james/server/trunk/domainlist-api/src/main/java/org/apache/james/domainlist/api/DomainListMBean.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/domainlist-api/src/main/java/org/apache/james/domainlist/api/DomainListManagementMBean.java?p2=james/server/trunk/domainlist-api/src/main/java/org/apache/james/domainlist/api/DomainListManagementMBean.java&p1=james/server/trunk/domainlist-api/src/main/java/org/apache/james/domainlist/api/DomainListMBean.java&r1=1025966&r2=1025986&rev=1025986&view=diff
==============================================================================
--- james/server/trunk/domainlist-api/src/main/java/org/apache/james/domainlist/api/DomainListMBean.java (original)
+++ james/server/trunk/domainlist-api/src/main/java/org/apache/james/domainlist/api/DomainListManagementMBean.java Thu Oct 21 13:07:17 2010
@@ -22,6 +22,6 @@ package org.apache.james.domainlist.api;
* JMX MBean for DomainList
*
*/
-public interface DomainListMBean extends DomainList{
+public interface DomainListManagementMBean extends DomainList{
}
Modified: james/server/trunk/domainlist-api/src/test/java/org/apache/james/domainlist/api/SimpleDomainList.java
URL: http://svn.apache.org/viewvc/james/server/trunk/domainlist-api/src/test/java/org/apache/james/domainlist/api/SimpleDomainList.java?rev=1025986&r1=1025985&r2=1025986&view=diff
==============================================================================
--- james/server/trunk/domainlist-api/src/test/java/org/apache/james/domainlist/api/SimpleDomainList.java (original)
+++ james/server/trunk/domainlist-api/src/test/java/org/apache/james/domainlist/api/SimpleDomainList.java Thu Oct 21 13:07:17 2010
@@ -24,13 +24,11 @@ package org.apache.james.domainlist.api;
import java.util.LinkedList;
import java.util.List;
-import org.apache.james.domainlist.api.ManageableDomainList;
-
/**
* Simplest implementation for ManageableDomainList
*/
-public class SimpleDomainList implements ManageableDomainList {
- List<String> domains = new LinkedList<String>();
+public class SimpleDomainList implements DomainList {
+ private List<String> domains = new LinkedList<String>();
public boolean containsDomain(String domain) {
return domains.contains(domain);
@@ -40,14 +38,6 @@ public class SimpleDomainList implements
return domains.toArray(new String[domains.size()]);
}
- public void setAutoDetect(boolean autodetect) {
- // ignore
- }
-
- public void setAutoDetectIP(boolean autodetectIP) {
- // ignore
- }
-
public boolean addDomain(String domain) {
if (domains.contains(domain)) return false;
return domains.add(domain);
Modified: james/server/trunk/domainlist-library/src/main/java/org/apache/james/domainlist/lib/AbstractDomainList.java
URL: http://svn.apache.org/viewvc/james/server/trunk/domainlist-library/src/main/java/org/apache/james/domainlist/lib/AbstractDomainList.java?rev=1025986&r1=1025985&r2=1025986&view=diff
==============================================================================
--- james/server/trunk/domainlist-library/src/main/java/org/apache/james/domainlist/lib/AbstractDomainList.java (original)
+++ james/server/trunk/domainlist-library/src/main/java/org/apache/james/domainlist/lib/AbstractDomainList.java Thu Oct 21 13:07:17 2010
@@ -32,14 +32,13 @@ import javax.annotation.Resource;
import org.apache.commons.logging.Log;
import org.apache.james.dnsservice.api.DNSService;
-import org.apache.james.domainlist.api.ManageableDomainList;
-import org.apache.james.domainlist.api.ManageableDomainListMBean;
+import org.apache.james.domainlist.api.DomainList;
import org.apache.james.lifecycle.LogEnabled;
/**
* All implementations of the DomainList interface should extends this abstract class
*/
-public abstract class AbstractDomainList implements ManageableDomainList, LogEnabled, ManageableDomainListMBean {
+public abstract class AbstractDomainList implements DomainList, LogEnabled {
private DNSService dns;
private boolean autoDetect = true;
private boolean autoDetectIP = true;
Added: james/server/trunk/domainlist-library/src/main/java/org/apache/james/domainlist/lib/DomainListManagement.java
URL: http://svn.apache.org/viewvc/james/server/trunk/domainlist-library/src/main/java/org/apache/james/domainlist/lib/DomainListManagement.java?rev=1025986&view=auto
==============================================================================
--- james/server/trunk/domainlist-library/src/main/java/org/apache/james/domainlist/lib/DomainListManagement.java (added)
+++ james/server/trunk/domainlist-library/src/main/java/org/apache/james/domainlist/lib/DomainListManagement.java Thu Oct 21 13:07:17 2010
@@ -0,0 +1,57 @@
+/****************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one *
+ * or more contributor license agreements. See the NOTICE file *
+ * distributed with this work for additional information *
+ * regarding copyright ownership. The ASF licenses this file *
+ * to you under the Apache License, Version 2.0 (the *
+ * "License"); you may not use this file except in compliance *
+ * with the License. You may obtain a copy of the License at *
+ * *
+ * http://www.apache.org/licenses/LICENSE-2.0 *
+ * *
+ * Unless required by applicable law or agreed to in writing, *
+ * software distributed under the License is distributed on an *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY *
+ * KIND, either express or implied. See the License for the *
+ * specific language governing permissions and limitations *
+ * under the License. *
+ ****************************************************************/
+package org.apache.james.domainlist.lib;
+
+import javax.annotation.Resource;
+import javax.management.NotCompliantMBeanException;
+import javax.management.StandardMBean;
+
+import org.apache.james.domainlist.api.DomainList;
+import org.apache.james.domainlist.api.DomainListManagementMBean;
+
+public class DomainListManagement extends StandardMBean implements DomainListManagementMBean{
+
+ private DomainList domainList;
+
+ public DomainListManagement() throws NotCompliantMBeanException {
+ super(DomainListManagementMBean.class);
+ }
+
+ @Resource(name="domainlist")
+ public void setDomainList(DomainList domainList) {
+ this.domainList = domainList;
+ }
+
+ public boolean addDomain(String domain) {
+ return domainList.addDomain(domain);
+ }
+
+ public boolean containsDomain(String domain) {
+ return domainList.containsDomain(domain);
+ }
+
+ public String[] getDomains() {
+ return domainList.getDomains();
+ }
+
+ public boolean removeDomain(String domain) {
+ return domainList.removeDomain(domain);
+ }
+
+}
Modified: james/server/trunk/domainlist-library/src/main/java/org/apache/james/domainlist/lib/JamesDomainList.java
URL: http://svn.apache.org/viewvc/james/server/trunk/domainlist-library/src/main/java/org/apache/james/domainlist/lib/JamesDomainList.java?rev=1025986&r1=1025985&r2=1025986&view=diff
==============================================================================
--- james/server/trunk/domainlist-library/src/main/java/org/apache/james/domainlist/lib/JamesDomainList.java (original)
+++ james/server/trunk/domainlist-library/src/main/java/org/apache/james/domainlist/lib/JamesDomainList.java Thu Oct 21 13:07:17 2010
@@ -27,8 +27,6 @@ import org.apache.commons.configuration.
import org.apache.commons.configuration.HierarchicalConfiguration;
import org.apache.commons.logging.Log;
import org.apache.james.domainlist.api.DomainList;
-import org.apache.james.domainlist.api.ManageableDomainList;
-import org.apache.james.domainlist.api.ManageableDomainListMBean;
import org.apache.james.lifecycle.Configurable;
import org.apache.james.lifecycle.Disposable;
import org.apache.james.lifecycle.LogEnabled;
@@ -38,7 +36,7 @@ import org.apache.james.services.Instanc
*
*
*/
-public class JamesDomainList implements ManageableDomainList, ManageableDomainListMBean, LogEnabled, Configurable{
+public class JamesDomainList implements DomainList, LogEnabled, Configurable{
private InstanceFactory instanceFactory;
private HierarchicalConfiguration config;
@@ -92,10 +90,7 @@ public class JamesDomainList implements
* @see org.apache.james.api.domainlist.ManageableDomainList#addDomain(java.lang.String)
*/
public boolean addDomain(String domain) {
- if (domainList instanceof ManageableDomainList) {
- return ((ManageableDomainList) domainList).addDomain(domain);
- }
- return false;
+ return domainList.addDomain(domain);
}
/*
@@ -103,10 +98,7 @@ public class JamesDomainList implements
* @see org.apache.james.api.domainlist.ManageableDomainList#removeDomain(java.lang.String)
*/
public boolean removeDomain(String domain) {
- if (domainList instanceof ManageableDomainList) {
- return ((ManageableDomainList) domainList).removeDomain(domain);
- }
- return false;
+ return domainList.removeDomain(domain);
}
/*
Modified: james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/AddDomainCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/AddDomainCmdHandler.java?rev=1025986&r1=1025985&r2=1025986&view=diff
==============================================================================
--- james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/AddDomainCmdHandler.java (original)
+++ james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/AddDomainCmdHandler.java Thu Oct 21 13:07:17 2010
@@ -25,7 +25,7 @@ import java.util.List;
import javax.annotation.Resource;
-import org.apache.james.domainlist.api.ManageableDomainList;
+import org.apache.james.domainlist.api.DomainList;
import org.apache.james.protocols.api.Request;
import org.apache.james.protocols.api.Response;
import org.apache.james.remotemanager.CommandHandler;
@@ -42,10 +42,10 @@ public class AddDomainCmdHandler impleme
private final static String COMMAND_NAME = "ADDDOMAIN";
private CommandHelp help = new CommandHelp("adddomain [domainname]","add domain to local domains");
- private ManageableDomainList domList;
+ private DomainList domList;
- @Resource(name="domainlistmanagement")
- public final void setManageableDomainList(ManageableDomainList domList) {
+ @Resource(name="domainlist")
+ public final void setDomainList(DomainList domList) {
this.domList = domList;
}
Modified: james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/AddUserCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/AddUserCmdHandler.java?rev=1025986&r1=1025985&r2=1025986&view=diff
==============================================================================
--- james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/AddUserCmdHandler.java (original)
+++ james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/AddUserCmdHandler.java Thu Oct 21 13:07:17 2010
@@ -26,7 +26,7 @@ import java.util.List;
import javax.annotation.Resource;
-import org.apache.james.domainlist.api.ManageableDomainList;
+import org.apache.james.domainlist.api.DomainList;
import org.apache.james.protocols.api.Request;
import org.apache.james.protocols.api.Response;
import org.apache.james.remotemanager.CommandHandler;
@@ -48,10 +48,10 @@ public class AddUserCmdHandler implement
private UsersStore uStore;
private MailServer mailServer;
- private ManageableDomainList domList;
+ private DomainList domList;
- @Resource(name="domainlistmanagement")
- public final void setManageableDomainList(ManageableDomainList domList) {
+ @Resource(name="domainlist")
+ public final void setDomainList(DomainList domList) {
this.domList = domList;
}
Modified: james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/ListDomainsCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/ListDomainsCmdHandler.java?rev=1025986&r1=1025985&r2=1025986&view=diff
==============================================================================
--- james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/ListDomainsCmdHandler.java (original)
+++ james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/ListDomainsCmdHandler.java Thu Oct 21 13:07:17 2010
@@ -25,7 +25,7 @@ import java.util.List;
import javax.annotation.Resource;
-import org.apache.james.domainlist.api.ManageableDomainList;
+import org.apache.james.domainlist.api.DomainList;
import org.apache.james.protocols.api.Request;
import org.apache.james.protocols.api.Response;
import org.apache.james.remotemanager.CommandHandler;
@@ -41,10 +41,11 @@ public class ListDomainsCmdHandler imple
private final static String COMMAND_NAME = "LISTDOMAINS";
private CommandHelp help = new CommandHelp("listdomains","list local domains");
- private ManageableDomainList domList;
+ private DomainList domList;
- @Resource(name="domainlistmanagement")
- public final void setManageableDomainList(ManageableDomainList domList) {
+
+ @Resource(name="domainlist")
+ public final void setDomainList(DomainList domList) {
this.domList = domList;
}
/**
Modified: james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/RemoveDomainCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/RemoveDomainCmdHandler.java?rev=1025986&r1=1025985&r2=1025986&view=diff
==============================================================================
--- james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/RemoveDomainCmdHandler.java (original)
+++ james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/RemoveDomainCmdHandler.java Thu Oct 21 13:07:17 2010
@@ -26,7 +26,7 @@ import java.util.List;
import javax.annotation.Resource;
-import org.apache.james.domainlist.api.ManageableDomainList;
+import org.apache.james.domainlist.api.DomainList;
import org.apache.james.protocols.api.Request;
import org.apache.james.protocols.api.Response;
import org.apache.james.remotemanager.CommandHandler;
@@ -43,10 +43,11 @@ public class RemoveDomainCmdHandler impl
private final static String COMMAND_NAME = "REMOVEDOMAIN";
private CommandHelp help = new CommandHelp("removedomain [domainname]","remove domain from local domains");
- private ManageableDomainList domList;
+ private DomainList domList;
- @Resource(name="domainlistmanagement")
- public final void setManageableDomainList(ManageableDomainList domList) {
+
+ @Resource(name="domainlist")
+ public final void setDomainList(DomainList domList) {
this.domList = domList;
}
Modified: james/server/trunk/remotemanager/src/test/java/org/apache/james/remotemanager/AbstractRemoteManagerTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager/src/test/java/org/apache/james/remotemanager/AbstractRemoteManagerTest.java?rev=1025986&r1=1025985&r2=1025986&view=diff
==============================================================================
--- james/server/trunk/remotemanager/src/test/java/org/apache/james/remotemanager/AbstractRemoteManagerTest.java (original)
+++ james/server/trunk/remotemanager/src/test/java/org/apache/james/remotemanager/AbstractRemoteManagerTest.java Thu Oct 21 13:07:17 2010
@@ -41,7 +41,7 @@ import org.apache.james.services.MockFil
import org.apache.james.services.MockMailServer;
import org.apache.james.dnsservice.api.DNSService;
import org.apache.james.dnsservice.api.MockDNSService;
-import org.apache.james.domainlist.api.ManageableDomainList;
+import org.apache.james.domainlist.api.DomainList;
import org.apache.james.domainlist.api.SimpleDomainList;
import org.apache.james.lifecycle.LifecycleUtil;
import org.apache.james.mailstore.MockMailStore;
@@ -188,10 +188,10 @@ public abstract class AbstractRemoteMana
vutManagement = new MockVirtualUserTableManagementImpl();
serviceManager.put("manageablevirtualusertable", vutManagement);
- ManageableDomainList xml = new SimpleDomainList();
+ DomainList xml = new SimpleDomainList();
- serviceManager.put("domainlistmanagement", xml);
+ serviceManager.put("domainlist", xml);
serviceManager.put("mailStore", new MockMailStore());
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org