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 ba...@apache.org on 2008/08/10 16:59:58 UTC
svn commit: r684514 [1/2] - in /james/server/trunk:
avalon-socket-library/src/main/java/org/apache/james/core/
avalon-user-function/src/main/java/org/apache/james/vut/
avalon-user-function/src/main/resources/org/apache/james/core/
avalon-user-function/...
Author: bago
Date: Sun Aug 10 07:59:55 2008
New Revision: 684514
URL: http://svn.apache.org/viewvc?rev=684514&view=rev
Log:
Repackaging for the domain api module, in progress.
created api.dnsserver and api.domainlist
Added:
james/server/trunk/domain-api/src/main/java/org/apache/james/api/
james/server/trunk/domain-api/src/main/java/org/apache/james/api/dnsserver/
james/server/trunk/domain-api/src/main/java/org/apache/james/api/dnsserver/DNSServer.java (contents, props changed)
- copied, changed from r684501, james/server/trunk/domain-api/src/main/java/org/apache/james/services/DNSServer.java
james/server/trunk/domain-api/src/main/java/org/apache/james/api/dnsserver/TemporaryResolutionException.java (contents, props changed)
- copied, changed from r684501, james/server/trunk/domain-api/src/main/java/org/apache/james/dnsserver/TemporaryResolutionException.java
james/server/trunk/domain-api/src/main/java/org/apache/james/api/domainlist/
james/server/trunk/domain-api/src/main/java/org/apache/james/api/domainlist/DomainList.java (contents, props changed)
- copied, changed from r684501, james/server/trunk/domain-api/src/main/java/org/apache/james/services/DomainList.java
james/server/trunk/domain-api/src/main/java/org/apache/james/api/domainlist/DomainListUtil.java (contents, props changed)
- copied, changed from r684501, james/server/trunk/domain-api/src/main/java/org/apache/james/util/DomainListUtil.java
Removed:
james/server/trunk/domain-api/src/main/java/org/apache/james/dnsserver/
james/server/trunk/domain-api/src/main/java/org/apache/james/services/
james/server/trunk/domain-api/src/main/java/org/apache/james/util/
Modified:
james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/core/AbstractJamesHandler.java
james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/core/AbstractJamesService.java
james/server/trunk/avalon-user-function/src/main/java/org/apache/james/vut/JDBCVirtualUserTable.java
james/server/trunk/avalon-user-function/src/main/resources/org/apache/james/core/AvalonVirtualUserTableStore.xinfo
james/server/trunk/avalon-user-function/src/main/resources/org/apache/james/vut/JDBCVirtualUserTable.xinfo
james/server/trunk/avalon-user-function/src/test/java/org/apache/james/vut/JDBCVirtualUserTableTest.java
james/server/trunk/basic-user-function/src/main/java/org/apache/james/vut/XMLVirtualUserTable.java
james/server/trunk/basic-user-function/src/main/resources/org/apache/james/vut/XMLVirtualUserTable.xinfo
james/server/trunk/basic-user-function/src/test/java/org/apache/james/vut/XMLVirtualUserTableTest.java
james/server/trunk/core-library/src/main/java/org/apache/james/dnsserver/DNSServer.java
james/server/trunk/core-library/src/main/java/org/apache/james/dnsserver/DNSServer.xinfo
james/server/trunk/core-library/src/main/java/org/apache/james/domain/AbstractDomainList.java
james/server/trunk/core-library/src/main/java/org/apache/james/domain/JDBCDomainList.java
james/server/trunk/core-library/src/main/java/org/apache/james/domain/JDBCDomainList.xinfo
james/server/trunk/core-library/src/main/java/org/apache/james/domain/XMLDomainList.java
james/server/trunk/core-library/src/main/java/org/apache/james/domain/XMLDomainList.xinfo
james/server/trunk/core-library/src/main/java/org/apache/james/management/DomainListManagement.java
james/server/trunk/core-library/src/main/java/org/apache/james/management/DomainListManagement.xinfo
james/server/trunk/core-library/src/main/java/org/apache/james/services/ManageableDomainList.java
james/server/trunk/core-library/src/main/java/org/apache/james/util/NetMatcher.java
james/server/trunk/core-library/src/test/java/org/apache/james/domain/JDBCDomainListTest.java
james/server/trunk/core-library/src/test/java/org/apache/james/domain/XMLDomainListTest.java
james/server/trunk/core-library/src/test/java/org/apache/james/services/AbstractDNSServer.java
james/server/trunk/experimental-seda-imap-function/src/main/java/org/apache/james/experimental/imapserver/ImapServer.xinfo
james/server/trunk/fetchmail-function/src/main/java/org/apache/james/fetchmail/FetchMail.java
james/server/trunk/fetchmail-function/src/main/java/org/apache/james/fetchmail/FetchScheduler.xinfo
james/server/trunk/fetchmail-function/src/main/java/org/apache/james/fetchmail/ParsedConfiguration.java
james/server/trunk/fetchmail-function/src/main/java/org/apache/james/fetchmail/ProcessorAbstract.java
james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/ImapServer.xinfo
james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/RemoteDelivery.java
james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/matchers/AbstractNetworkMatcher.java
james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/matchers/InSpammerBlacklist.java
james/server/trunk/mailets-function/src/test/java/org/apache/james/transport/mailets/StandardRemoteDeliveryTestable.java
james/server/trunk/mailets-function/src/test/java/org/apache/james/transport/matchers/AbstractRemoteAddrInNetworkTest.java
james/server/trunk/mailets-function/src/test/java/org/apache/james/transport/matchers/InSpammerBlacklistTest.java
james/server/trunk/mailets-function/src/test/java/org/apache/james/transport/remotedeliverytester/RemoteDeliveryTestable.java
james/server/trunk/mailets-function/src/test/java/org/apache/james/transport/remotedeliverytester/Tester.java
james/server/trunk/nntpserver-function/src/main/java/org/apache/james/nntpserver/NNTPServer.xinfo
james/server/trunk/phoenix-deployment/src/conf/james-assembly.xml
james/server/trunk/phoenix-deployment/src/test/org/apache/james/JamesTest.java
james/server/trunk/phoenix-deployment/src/test/org/apache/james/imapserver/util/ImapServerLauncher.java
james/server/trunk/phoenix-deployment/src/test/org/apache/james/smtpserver/SMTPServerRemoteDeliveryIntegrationTest.java
james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/POP3Server.xinfo
james/server/trunk/pop3server-function/src/test/java/org/apache/james/pop3server/POP3ServerTest.java
james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/RemoteManager.xinfo
james/server/trunk/remotemanager-function/src/test/java/org/apache/james/remotemanager/RemoteManagerTest.java
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPServer.java
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPServer.xinfo
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/filter/fastfail/DNSRBLHandler.java
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/filter/fastfail/GreylistHandler.java
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/filter/fastfail/ResolvableEhloHeloHandler.java
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/filter/fastfail/URIRBLHandler.java
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/filter/fastfail/ValidRcptMX.java
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/filter/fastfail/ValidSenderDomainHandler.java
james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/DNSRBLHandlerTest.java
james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/ResolvableEhloHeloHandlerTest.java
james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/SMTPServerTest.java
james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/URIRBLHandlerTest.java
james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/ValidRcptMXTest.java
james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/ValidSenderDomainHandlerTest.java
james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/James.java
james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/James.xinfo
james/server/trunk/spring-deployment/src/main/config/james/james-assembly.xml
james/server/trunk/spring-deployment/src/main/test/org/apache/james/container/spring/beanfactory/testing-james-assembly.xml
james/server/trunk/user-library/src/main/java/org/apache/james/impl/vut/AbstractVirtualUserTable.java
james/server/trunk/user-library/src/test/java/org/apache/james/vut/AbstractVirtualUserTableTest.java
Modified: james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/core/AbstractJamesHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/core/AbstractJamesHandler.java?rev=684514&r1=684513&r2=684514&view=diff
==============================================================================
--- james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/core/AbstractJamesHandler.java (original)
+++ james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/core/AbstractJamesHandler.java Sun Aug 10 07:59:55 2008
@@ -29,7 +29,7 @@
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.api.dnsserver.DNSServer;
import org.apache.james.util.CRLFTerminatedReader;
import org.apache.james.util.InternetPrintWriter;
import org.apache.james.util.watchdog.Watchdog;
Modified: james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/core/AbstractJamesService.java
URL: http://svn.apache.org/viewvc/james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/core/AbstractJamesService.java?rev=684514&r1=684513&r2=684514&view=diff
==============================================================================
--- james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/core/AbstractJamesService.java (original)
+++ james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/core/AbstractJamesService.java Sun Aug 10 07:59:55 2008
@@ -43,7 +43,7 @@
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.avalon.framework.service.Serviceable;
import org.apache.excalibur.thread.ThreadPool;
-import org.apache.james.services.DNSServer;
+import org.apache.james.api.dnsserver.DNSServer;
import org.apache.james.services.JamesConnectionManager;
import org.apache.james.util.watchdog.ThreadPerWatchdogFactory;
import org.apache.james.util.watchdog.Watchdog;
Modified: james/server/trunk/avalon-user-function/src/main/java/org/apache/james/vut/JDBCVirtualUserTable.java
URL: http://svn.apache.org/viewvc/james/server/trunk/avalon-user-function/src/main/java/org/apache/james/vut/JDBCVirtualUserTable.java?rev=684514&r1=684513&r2=684514&view=diff
==============================================================================
--- james/server/trunk/avalon-user-function/src/main/java/org/apache/james/vut/JDBCVirtualUserTable.java (original)
+++ james/server/trunk/avalon-user-function/src/main/java/org/apache/james/vut/JDBCVirtualUserTable.java Sun Aug 10 07:59:55 2008
@@ -542,7 +542,7 @@
}
/**
- * @see org.apache.james.services.DomainList#containsDomain(java.lang.String)
+ * @see org.apache.james.api.domainlist.DomainList#containsDomain(java.lang.String)
*/
public boolean containsDomain(String domain) {
Connection conn = null;
Modified: james/server/trunk/avalon-user-function/src/main/resources/org/apache/james/core/AvalonVirtualUserTableStore.xinfo
URL: http://svn.apache.org/viewvc/james/server/trunk/avalon-user-function/src/main/resources/org/apache/james/core/AvalonVirtualUserTableStore.xinfo?rev=684514&r1=684513&r2=684514&view=diff
==============================================================================
--- james/server/trunk/avalon-user-function/src/main/resources/org/apache/james/core/AvalonVirtualUserTableStore.xinfo (original)
+++ james/server/trunk/avalon-user-function/src/main/resources/org/apache/james/core/AvalonVirtualUserTableStore.xinfo Sun Aug 10 07:59:55 2008
@@ -32,7 +32,7 @@
<dependencies>
<dependency>
- <service name="org.apache.james.services.DNSServer" version="1.0"/>
+ <service name="org.apache.james.api.dnsserver.DNSServer" version="1.0"/>
</dependency>
<dependency>
<service name="org.apache.avalon.cornerstone.services.datasources.DataSourceSelector" version="1.0"/>
Modified: james/server/trunk/avalon-user-function/src/main/resources/org/apache/james/vut/JDBCVirtualUserTable.xinfo
URL: http://svn.apache.org/viewvc/james/server/trunk/avalon-user-function/src/main/resources/org/apache/james/vut/JDBCVirtualUserTable.xinfo?rev=684514&r1=684513&r2=684514&view=diff
==============================================================================
--- james/server/trunk/avalon-user-function/src/main/resources/org/apache/james/vut/JDBCVirtualUserTable.xinfo (original)
+++ james/server/trunk/avalon-user-function/src/main/resources/org/apache/james/vut/JDBCVirtualUserTable.xinfo Sun Aug 10 07:59:55 2008
@@ -28,7 +28,7 @@
<services>
<service name="org.apache.james.api.vut.management.VirtualUserTableManagement" version="1.0" />
<service name="org.apache.james.api.vut.VirtualUserTable" version="1.0" />
- <service name="org.apache.james.services.DomainList" version="1.0"/>
+ <service name="org.apache.james.api.domainlist.DomainList" version="1.0"/>
</services>
<dependencies>
@@ -39,7 +39,7 @@
<service name="org.apache.james.services.FileSystem" version="1.0"/>
</dependency>
<dependency>
- <service name="org.apache.james.services.DNSServer" version="1.0"/>
+ <service name="org.apache.james.api.dnsserver.DNSServer" version="1.0"/>
</dependency>
</dependencies>
</blockinfo>
Modified: james/server/trunk/avalon-user-function/src/test/java/org/apache/james/vut/JDBCVirtualUserTableTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/avalon-user-function/src/test/java/org/apache/james/vut/JDBCVirtualUserTableTest.java?rev=684514&r1=684513&r2=684514&view=diff
==============================================================================
--- james/server/trunk/avalon-user-function/src/test/java/org/apache/james/vut/JDBCVirtualUserTableTest.java (original)
+++ james/server/trunk/avalon-user-function/src/test/java/org/apache/james/vut/JDBCVirtualUserTableTest.java Sun Aug 10 07:59:55 2008
@@ -27,9 +27,9 @@
import org.apache.avalon.framework.service.DefaultServiceManager;
import org.apache.avalon.framework.service.ServiceException;
+import org.apache.james.api.dnsserver.DNSServer;
import org.apache.james.api.vut.management.InvalidMappingException;
import org.apache.james.impl.vut.AbstractVirtualUserTable;
-import org.apache.james.services.DNSServer;
import org.apache.james.services.FileSystem;
import org.apache.james.test.mock.avalon.MockLogger;
Modified: james/server/trunk/basic-user-function/src/main/java/org/apache/james/vut/XMLVirtualUserTable.java
URL: http://svn.apache.org/viewvc/james/server/trunk/basic-user-function/src/main/java/org/apache/james/vut/XMLVirtualUserTable.java?rev=684514&r1=684513&r2=684514&view=diff
==============================================================================
--- james/server/trunk/basic-user-function/src/main/java/org/apache/james/vut/XMLVirtualUserTable.java (original)
+++ james/server/trunk/basic-user-function/src/main/java/org/apache/james/vut/XMLVirtualUserTable.java Sun Aug 10 07:59:55 2008
@@ -140,7 +140,7 @@
}
/**
- * @see org.apache.james.services.DomainList#containsDomain(java.lang.String)
+ * @see org.apache.james.api.domainlist.DomainList#containsDomain(java.lang.String)
*/
public boolean containsDomain(String domain) {
if (domains == null) {
Modified: james/server/trunk/basic-user-function/src/main/resources/org/apache/james/vut/XMLVirtualUserTable.xinfo
URL: http://svn.apache.org/viewvc/james/server/trunk/basic-user-function/src/main/resources/org/apache/james/vut/XMLVirtualUserTable.xinfo?rev=684514&r1=684513&r2=684514&view=diff
==============================================================================
--- james/server/trunk/basic-user-function/src/main/resources/org/apache/james/vut/XMLVirtualUserTable.xinfo (original)
+++ james/server/trunk/basic-user-function/src/main/resources/org/apache/james/vut/XMLVirtualUserTable.xinfo Sun Aug 10 07:59:55 2008
@@ -28,12 +28,12 @@
<services>
<service name="org.apache.james.api.vut.management.VirtualUserTableManagement" version="1.0" />
<service name="org.apache.james.api.vut.VirtualUserTable" version="1.0" />
- <service name="org.apache.james.services.DomainList" version="1.0"/>
+ <service name="org.apache.james.api.domainlist.DomainList" version="1.0"/>
</services>
<dependencies>
<dependency>
- <service name="org.apache.james.services.DNSServer" version="1.0"/>
+ <service name="org.apache.james.api.dnsserver.DNSServer" version="1.0"/>
</dependency>
</dependencies>
</blockinfo>
Modified: james/server/trunk/basic-user-function/src/test/java/org/apache/james/vut/XMLVirtualUserTableTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/basic-user-function/src/test/java/org/apache/james/vut/XMLVirtualUserTableTest.java?rev=684514&r1=684513&r2=684514&view=diff
==============================================================================
--- james/server/trunk/basic-user-function/src/test/java/org/apache/james/vut/XMLVirtualUserTableTest.java (original)
+++ james/server/trunk/basic-user-function/src/test/java/org/apache/james/vut/XMLVirtualUserTableTest.java Sun Aug 10 07:59:55 2008
@@ -30,11 +30,11 @@
import org.apache.avalon.framework.container.ContainerUtil;
import org.apache.avalon.framework.service.DefaultServiceManager;
+import org.apache.james.api.dnsserver.DNSServer;
import org.apache.james.api.vut.VirtualUserTable;
import org.apache.james.api.vut.management.InvalidMappingException;
import org.apache.james.impl.vut.AbstractVirtualUserTable;
import org.apache.james.impl.vut.VirtualUserTableUtil;
-import org.apache.james.services.DNSServer;
import org.apache.james.services.FileSystem;
import org.apache.james.test.mock.avalon.MockLogger;
Modified: james/server/trunk/core-library/src/main/java/org/apache/james/dnsserver/DNSServer.java
URL: http://svn.apache.org/viewvc/james/server/trunk/core-library/src/main/java/org/apache/james/dnsserver/DNSServer.java?rev=684514&r1=684513&r2=684514&view=diff
==============================================================================
--- james/server/trunk/core-library/src/main/java/org/apache/james/dnsserver/DNSServer.java (original)
+++ james/server/trunk/core-library/src/main/java/org/apache/james/dnsserver/DNSServer.java Sun Aug 10 07:59:55 2008
@@ -26,6 +26,7 @@
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
+import org.apache.james.api.dnsserver.TemporaryResolutionException;
import org.xbill.DNS.ARecord;
import org.xbill.DNS.Cache;
import org.xbill.DNS.Credibility;
@@ -60,7 +61,7 @@
*/
public class DNSServer
extends AbstractLogEnabled
- implements Configurable, Initializable, org.apache.james.services.DNSServer, DNSServerMBean {
+ implements Configurable, Initializable, org.apache.james.api.dnsserver.DNSServer, DNSServerMBean {
/**
* A resolver instance used to retrieve DNS records. This
@@ -297,7 +298,7 @@
}
/**
- * @see org.apache.james.services.DNSServer#findMXRecords(String)
+ * @see org.apache.james.api.dnsserver.DNSServer#findMXRecords(String)
*/
public Collection findMXRecords(String hostname) throws TemporaryResolutionException {
List servers = new ArrayList();
@@ -411,7 +412,7 @@
}
/**
- * @see org.apache.james.services.DNSServer#getSMTPHostAddresses(String)
+ * @see org.apache.james.api.dnsserver.DNSServer#getSMTPHostAddresses(String)
*/
public Iterator getSMTPHostAddresses(final String domainName) throws TemporaryResolutionException {
return new Iterator() {
@@ -504,7 +505,7 @@
}
/**
- * @see org.apache.james.services.DNSServer#getByName(String)
+ * @see org.apache.james.api.dnsserver.DNSServer#getByName(String)
*/
public InetAddress getByName(String host) throws UnknownHostException {
String name = allowIPLiteral(host);
@@ -527,7 +528,7 @@
}
/**
- * @see org.apache.james.services.DNSServer#getAllByName(String)
+ * @see org.apache.james.api.dnsserver.DNSServer#getAllByName(String)
*/
public InetAddress[] getAllByName(String host) throws UnknownHostException {
String name = allowIPLiteral(host);
@@ -554,7 +555,7 @@
}
/**
- * @see org.apache.james.services.DNSServer#findTXTRecords(String)
+ * @see org.apache.james.api.dnsserver.DNSServer#findTXTRecords(String)
*/
public Collection findTXTRecords(String hostname){
List txtR = new ArrayList();
@@ -571,7 +572,7 @@
}
/**
- * @see org.apache.james.services.DNSServer#getHostName(java.net.InetAddress)
+ * @see org.apache.james.api.dnsserver.DNSServer#getHostName(java.net.InetAddress)
*/
public String getHostName(InetAddress addr){
String result = null;
@@ -588,7 +589,7 @@
}
/**
- * @see org.apache.james.services.DNSServer#getLocalHost()
+ * @see org.apache.james.api.dnsserver.DNSServer#getLocalHost()
*/
public InetAddress getLocalHost() throws UnknownHostException {
return InetAddress.getLocalHost();
Modified: james/server/trunk/core-library/src/main/java/org/apache/james/dnsserver/DNSServer.xinfo
URL: http://svn.apache.org/viewvc/james/server/trunk/core-library/src/main/java/org/apache/james/dnsserver/DNSServer.xinfo?rev=684514&r1=684513&r2=684514&view=diff
==============================================================================
--- james/server/trunk/core-library/src/main/java/org/apache/james/dnsserver/DNSServer.xinfo (original)
+++ james/server/trunk/core-library/src/main/java/org/apache/james/dnsserver/DNSServer.xinfo Sun Aug 10 07:59:55 2008
@@ -27,7 +27,7 @@
<!-- services that are offered by this block -->
<services>
- <service name="org.apache.james.services.DNSServer" version="1.0"/>
+ <service name="org.apache.james.api.dnsserver.DNSServer" version="1.0"/>
</services>
<!-- interfaces that may be exported to manange this block -->
Modified: james/server/trunk/core-library/src/main/java/org/apache/james/domain/AbstractDomainList.java
URL: http://svn.apache.org/viewvc/james/server/trunk/core-library/src/main/java/org/apache/james/domain/AbstractDomainList.java?rev=684514&r1=684513&r2=684514&view=diff
==============================================================================
--- james/server/trunk/core-library/src/main/java/org/apache/james/domain/AbstractDomainList.java (original)
+++ james/server/trunk/core-library/src/main/java/org/apache/james/domain/AbstractDomainList.java Sun Aug 10 07:59:55 2008
@@ -30,9 +30,9 @@
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.api.dnsserver.DNSServer;
+import org.apache.james.api.domainlist.DomainListUtil;
import org.apache.james.services.ManageableDomainList;
-import org.apache.james.util.DomainListUtil;
/**
* All implementations of the DomainList interface should extends this abstract class
@@ -51,7 +51,7 @@
/**
- * @see org.apache.james.services.DomainList#getDomains()
+ * @see org.apache.james.api.domainlist.DomainList#getDomains()
*/
public List getDomains() {
List domains = getDomainListInternal();
@@ -108,7 +108,7 @@
}
/**
- * @see org.apache.james.services.DomainList#setAutoDetect(boolean)
+ * @see org.apache.james.api.domainlist.DomainList#setAutoDetect(boolean)
*/
public synchronized void setAutoDetect(boolean autoDetect) {
getLogger().info("Set autodetect to: " + autoDetect);
@@ -116,7 +116,7 @@
}
/**
- * @see org.apache.james.services.DomainList#setAutoDetectIP(boolean)
+ * @see org.apache.james.api.domainlist.DomainList#setAutoDetectIP(boolean)
*/
public synchronized void setAutoDetectIP(boolean autoDetectIP) {
getLogger().info("Set autodetectIP to: " + autoDetectIP);
Modified: james/server/trunk/core-library/src/main/java/org/apache/james/domain/JDBCDomainList.java
URL: http://svn.apache.org/viewvc/james/server/trunk/core-library/src/main/java/org/apache/james/domain/JDBCDomainList.java?rev=684514&r1=684513&r2=684514&view=diff
==============================================================================
--- james/server/trunk/core-library/src/main/java/org/apache/james/domain/JDBCDomainList.java (original)
+++ james/server/trunk/core-library/src/main/java/org/apache/james/domain/JDBCDomainList.java Sun Aug 10 07:59:55 2008
@@ -276,7 +276,7 @@
}
/**
- * @see org.apache.james.services.DomainList#containsDomain(java.lang.String)
+ * @see org.apache.james.api.domainlist.DomainList#containsDomain(java.lang.String)
*/
public boolean containsDomain(String domain) {
Connection conn = null;
Modified: james/server/trunk/core-library/src/main/java/org/apache/james/domain/JDBCDomainList.xinfo
URL: http://svn.apache.org/viewvc/james/server/trunk/core-library/src/main/java/org/apache/james/domain/JDBCDomainList.xinfo?rev=684514&r1=684513&r2=684514&view=diff
==============================================================================
--- james/server/trunk/core-library/src/main/java/org/apache/james/domain/JDBCDomainList.xinfo (original)
+++ james/server/trunk/core-library/src/main/java/org/apache/james/domain/JDBCDomainList.xinfo Sun Aug 10 07:59:55 2008
@@ -27,12 +27,12 @@
<services>
<service name="org.apache.james.services.ManageableDomainList" version="1.0" />
- <service name="org.apache.james.services.DomainList" version="1.0" />
+ <service name="org.apache.james.api.domainlist.DomainList" version="1.0" />
</services>
<dependencies>
<dependency>
- <service name="org.apache.james.services.DNSServer" version="1.0"/>
+ <service name="org.apache.james.api.dnsserver.DNSServer" version="1.0"/>
</dependency>
<dependency>
<service name="org.apache.avalon.cornerstone.services.datasources.DataSourceSelector" version="1.0"/>
Modified: james/server/trunk/core-library/src/main/java/org/apache/james/domain/XMLDomainList.java
URL: http://svn.apache.org/viewvc/james/server/trunk/core-library/src/main/java/org/apache/james/domain/XMLDomainList.java?rev=684514&r1=684513&r2=684514&view=diff
==============================================================================
--- james/server/trunk/core-library/src/main/java/org/apache/james/domain/XMLDomainList.java (original)
+++ james/server/trunk/core-library/src/main/java/org/apache/james/domain/XMLDomainList.java Sun Aug 10 07:59:55 2008
@@ -75,7 +75,7 @@
}
/**
- * @see org.apache.james.services.DomainList#containsDomain(java.lang.String)
+ * @see org.apache.james.api.domainlist.DomainList#containsDomain(java.lang.String)
*/
public boolean containsDomain(String domains) {
if (domainNames == null) return false;
Modified: james/server/trunk/core-library/src/main/java/org/apache/james/domain/XMLDomainList.xinfo
URL: http://svn.apache.org/viewvc/james/server/trunk/core-library/src/main/java/org/apache/james/domain/XMLDomainList.xinfo?rev=684514&r1=684513&r2=684514&view=diff
==============================================================================
--- james/server/trunk/core-library/src/main/java/org/apache/james/domain/XMLDomainList.xinfo (original)
+++ james/server/trunk/core-library/src/main/java/org/apache/james/domain/XMLDomainList.xinfo Sun Aug 10 07:59:55 2008
@@ -27,12 +27,12 @@
<services>
<service name="org.apache.james.services.ManageableDomainList" version="1.0" />
- <service name="org.apache.james.services.DomainList" version="1.0" />
+ <service name="org.apache.james.api.domainlist.DomainList" version="1.0" />
</services>
<dependencies>
<dependency>
- <service name="org.apache.james.services.DNSServer" version="1.0"/>
+ <service name="org.apache.james.api.dnsserver.DNSServer" version="1.0"/>
</dependency>
</dependencies>
</blockinfo>
Modified: james/server/trunk/core-library/src/main/java/org/apache/james/management/DomainListManagement.java
URL: http://svn.apache.org/viewvc/james/server/trunk/core-library/src/main/java/org/apache/james/management/DomainListManagement.java?rev=684514&r1=684513&r2=684514&view=diff
==============================================================================
--- james/server/trunk/core-library/src/main/java/org/apache/james/management/DomainListManagement.java (original)
+++ james/server/trunk/core-library/src/main/java/org/apache/james/management/DomainListManagement.java Sun Aug 10 07:59:55 2008
@@ -26,7 +26,7 @@
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.DomainList;
+import org.apache.james.api.domainlist.DomainList;
import org.apache.james.services.DomainListManagementService;
import org.apache.james.services.ManageableDomainList;
Modified: james/server/trunk/core-library/src/main/java/org/apache/james/management/DomainListManagement.xinfo
URL: http://svn.apache.org/viewvc/james/server/trunk/core-library/src/main/java/org/apache/james/management/DomainListManagement.xinfo?rev=684514&r1=684513&r2=684514&view=diff
==============================================================================
--- james/server/trunk/core-library/src/main/java/org/apache/james/management/DomainListManagement.xinfo (original)
+++ james/server/trunk/core-library/src/main/java/org/apache/james/management/DomainListManagement.xinfo Sun Aug 10 07:59:55 2008
@@ -36,7 +36,7 @@
<dependencies>
<dependency>
- <service name="org.apache.james.services.DomainList" version="1.0"/>
+ <service name="org.apache.james.api.domainlist.DomainList" version="1.0"/>
</dependency>
</dependencies>
</blockinfo>
Modified: james/server/trunk/core-library/src/main/java/org/apache/james/services/ManageableDomainList.java
URL: http://svn.apache.org/viewvc/james/server/trunk/core-library/src/main/java/org/apache/james/services/ManageableDomainList.java?rev=684514&r1=684513&r2=684514&view=diff
==============================================================================
--- james/server/trunk/core-library/src/main/java/org/apache/james/services/ManageableDomainList.java (original)
+++ james/server/trunk/core-library/src/main/java/org/apache/james/services/ManageableDomainList.java Sun Aug 10 07:59:55 2008
@@ -21,6 +21,8 @@
package org.apache.james.services;
+import org.apache.james.api.domainlist.DomainList;
+
/**
* Services which allow to manage the DomainList should implement this interface
*/
Modified: james/server/trunk/core-library/src/main/java/org/apache/james/util/NetMatcher.java
URL: http://svn.apache.org/viewvc/james/server/trunk/core-library/src/main/java/org/apache/james/util/NetMatcher.java?rev=684514&r1=684513&r2=684514&view=diff
==============================================================================
--- james/server/trunk/core-library/src/main/java/org/apache/james/util/NetMatcher.java (original)
+++ james/server/trunk/core-library/src/main/java/org/apache/james/util/NetMatcher.java Sun Aug 10 07:59:55 2008
@@ -27,7 +27,7 @@
import java.util.ArrayList;
import java.util.Iterator;
-import org.apache.james.services.DNSServer;
+import org.apache.james.api.dnsserver.DNSServer;
/**
* Class which can be used to check if an ipAddress match a network
Modified: james/server/trunk/core-library/src/test/java/org/apache/james/domain/JDBCDomainListTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/core-library/src/test/java/org/apache/james/domain/JDBCDomainListTest.java?rev=684514&r1=684513&r2=684514&view=diff
==============================================================================
--- james/server/trunk/core-library/src/test/java/org/apache/james/domain/JDBCDomainListTest.java (original)
+++ james/server/trunk/core-library/src/test/java/org/apache/james/domain/JDBCDomainListTest.java Sun Aug 10 07:59:55 2008
@@ -36,8 +36,8 @@
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.api.dnsserver.DNSServer;
import org.apache.james.services.AbstractDNSServer;
-import org.apache.james.services.DNSServer;
import org.apache.james.services.FileSystem;
import org.apache.james.test.mock.avalon.MockLogger;
import org.apache.james.test.mock.avalon.MockServiceManager;
Modified: james/server/trunk/core-library/src/test/java/org/apache/james/domain/XMLDomainListTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/core-library/src/test/java/org/apache/james/domain/XMLDomainListTest.java?rev=684514&r1=684513&r2=684514&view=diff
==============================================================================
--- james/server/trunk/core-library/src/test/java/org/apache/james/domain/XMLDomainListTest.java (original)
+++ james/server/trunk/core-library/src/test/java/org/apache/james/domain/XMLDomainListTest.java Sun Aug 10 07:59:55 2008
@@ -29,8 +29,8 @@
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.DefaultConfiguration;
import org.apache.avalon.framework.container.ContainerUtil;
+import org.apache.james.api.dnsserver.DNSServer;
import org.apache.james.services.AbstractDNSServer;
-import org.apache.james.services.DNSServer;
import org.apache.james.services.ManageableDomainList;
import org.apache.james.test.mock.avalon.MockLogger;
import org.apache.james.test.mock.avalon.MockServiceManager;
Modified: james/server/trunk/core-library/src/test/java/org/apache/james/services/AbstractDNSServer.java
URL: http://svn.apache.org/viewvc/james/server/trunk/core-library/src/test/java/org/apache/james/services/AbstractDNSServer.java?rev=684514&r1=684513&r2=684514&view=diff
==============================================================================
--- james/server/trunk/core-library/src/test/java/org/apache/james/services/AbstractDNSServer.java (original)
+++ james/server/trunk/core-library/src/test/java/org/apache/james/services/AbstractDNSServer.java Sun Aug 10 07:59:55 2008
@@ -21,6 +21,8 @@
package org.apache.james.services;
+import org.apache.james.api.dnsserver.DNSServer;
+
import java.net.InetAddress;
import java.net.UnknownHostException;
import java.util.Collection;
@@ -32,49 +34,49 @@
public class AbstractDNSServer implements DNSServer {
/**
- * @see org.apache.james.services.DNSServer#findMXRecords(String)
+ * @see org.apache.james.api.dnsserver.DNSServer#findMXRecords(String)
*/
public Collection findMXRecords(String hostname) {
throw new UnsupportedOperationException("Unimplemented Stub Method");
}
/**
- * @see org.apache.james.services.DNSServer#findTXTRecords(String)
+ * @see org.apache.james.api.dnsserver.DNSServer#findTXTRecords(String)
*/
public Collection findTXTRecords(String hostname) {
throw new UnsupportedOperationException("Unimplemented Stub Method");
}
/**
- * @see org.apache.james.services.DNSServer#getAllByName(String)
+ * @see org.apache.james.api.dnsserver.DNSServer#getAllByName(String)
*/
public InetAddress[] getAllByName(String host) throws UnknownHostException {
throw new UnsupportedOperationException("Unimplemented Stub Method");
}
/**
- * @see org.apache.james.services.DNSServer#getByName(String)
+ * @see org.apache.james.api.dnsserver.DNSServer#getByName(String)
*/
public InetAddress getByName(String host) throws UnknownHostException {
throw new UnsupportedOperationException("Unimplemented Stub Method");
}
/**
- * @see org.apache.james.services.DNSServer#getSMTPHostAddresses(String)
+ * @see org.apache.james.api.dnsserver.DNSServer#getSMTPHostAddresses(String)
*/
public Iterator getSMTPHostAddresses(String domainName) {
throw new UnsupportedOperationException("Unimplemented Stub Method");
}
/**
- * @see org.apache.james.services.DNSServer#getHostName(java.net.InetAddress)
+ * @see org.apache.james.api.dnsserver.DNSServer#getHostName(java.net.InetAddress)
*/
public String getHostName(InetAddress addr) {
throw new UnsupportedOperationException("Unimplemented Stub Method");
}
/**
- * @see org.apache.james.services.DNSServer#getLocalHost()
+ * @see org.apache.james.api.dnsserver.DNSServer#getLocalHost()
*/
public InetAddress getLocalHost() throws UnknownHostException {
throw new UnsupportedOperationException("Unimplemented Stub Method");
Copied: james/server/trunk/domain-api/src/main/java/org/apache/james/api/dnsserver/DNSServer.java (from r684501, james/server/trunk/domain-api/src/main/java/org/apache/james/services/DNSServer.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/domain-api/src/main/java/org/apache/james/api/dnsserver/DNSServer.java?p2=james/server/trunk/domain-api/src/main/java/org/apache/james/api/dnsserver/DNSServer.java&p1=james/server/trunk/domain-api/src/main/java/org/apache/james/services/DNSServer.java&r1=684501&r2=684514&rev=684514&view=diff
==============================================================================
--- james/server/trunk/domain-api/src/main/java/org/apache/james/services/DNSServer.java (original)
+++ james/server/trunk/domain-api/src/main/java/org/apache/james/api/dnsserver/DNSServer.java Sun Aug 10 07:59:55 2008
@@ -19,14 +19,13 @@
-package org.apache.james.services;
+package org.apache.james.api.dnsserver;
import java.net.InetAddress;
import java.net.UnknownHostException;
import java.util.Collection;
import java.util.Iterator;
-import org.apache.james.dnsserver.TemporaryResolutionException;
/**
* Provides abstraction for DNS resolutions. The interface is Mail specific.
Propchange: james/server/trunk/domain-api/src/main/java/org/apache/james/api/dnsserver/DNSServer.java
------------------------------------------------------------------------------
cvs2svn:cvs-rev = 1.4.4.4
Propchange: james/server/trunk/domain-api/src/main/java/org/apache/james/api/dnsserver/DNSServer.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: james/server/trunk/domain-api/src/main/java/org/apache/james/api/dnsserver/DNSServer.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied: james/server/trunk/domain-api/src/main/java/org/apache/james/api/dnsserver/TemporaryResolutionException.java (from r684501, james/server/trunk/domain-api/src/main/java/org/apache/james/dnsserver/TemporaryResolutionException.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/domain-api/src/main/java/org/apache/james/api/dnsserver/TemporaryResolutionException.java?p2=james/server/trunk/domain-api/src/main/java/org/apache/james/api/dnsserver/TemporaryResolutionException.java&p1=james/server/trunk/domain-api/src/main/java/org/apache/james/dnsserver/TemporaryResolutionException.java&r1=684501&r2=684514&rev=684514&view=diff
==============================================================================
--- james/server/trunk/domain-api/src/main/java/org/apache/james/dnsserver/TemporaryResolutionException.java (original)
+++ james/server/trunk/domain-api/src/main/java/org/apache/james/api/dnsserver/TemporaryResolutionException.java Sun Aug 10 07:59:55 2008
@@ -20,7 +20,7 @@
-package org.apache.james.dnsserver;
+package org.apache.james.api.dnsserver;
import java.io.IOException;
Propchange: james/server/trunk/domain-api/src/main/java/org/apache/james/api/dnsserver/TemporaryResolutionException.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: james/server/trunk/domain-api/src/main/java/org/apache/james/api/domainlist/DomainList.java (from r684501, james/server/trunk/domain-api/src/main/java/org/apache/james/services/DomainList.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/domain-api/src/main/java/org/apache/james/api/domainlist/DomainList.java?p2=james/server/trunk/domain-api/src/main/java/org/apache/james/api/domainlist/DomainList.java&p1=james/server/trunk/domain-api/src/main/java/org/apache/james/services/DomainList.java&r1=684501&r2=684514&rev=684514&view=diff
==============================================================================
--- james/server/trunk/domain-api/src/main/java/org/apache/james/services/DomainList.java (original)
+++ james/server/trunk/domain-api/src/main/java/org/apache/james/api/domainlist/DomainList.java Sun Aug 10 07:59:55 2008
@@ -18,7 +18,7 @@
****************************************************************/
-package org.apache.james.services;
+package org.apache.james.api.domainlist;
import java.util.List;
Propchange: james/server/trunk/domain-api/src/main/java/org/apache/james/api/domainlist/DomainList.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: james/server/trunk/domain-api/src/main/java/org/apache/james/api/domainlist/DomainListUtil.java (from r684501, james/server/trunk/domain-api/src/main/java/org/apache/james/util/DomainListUtil.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/domain-api/src/main/java/org/apache/james/api/domainlist/DomainListUtil.java?p2=james/server/trunk/domain-api/src/main/java/org/apache/james/api/domainlist/DomainListUtil.java&p1=james/server/trunk/domain-api/src/main/java/org/apache/james/util/DomainListUtil.java&r1=684501&r2=684514&rev=684514&view=diff
==============================================================================
--- james/server/trunk/domain-api/src/main/java/org/apache/james/util/DomainListUtil.java (original)
+++ james/server/trunk/domain-api/src/main/java/org/apache/james/api/domainlist/DomainListUtil.java Sun Aug 10 07:59:55 2008
@@ -20,7 +20,7 @@
-package org.apache.james.util;
+package org.apache.james.api.domainlist;
import java.net.InetAddress;
import java.net.UnknownHostException;
@@ -28,7 +28,7 @@
import java.util.List;
import org.apache.avalon.framework.logger.Logger;
-import org.apache.james.services.DNSServer;
+import org.apache.james.api.dnsserver.DNSServer;
/**
*
Propchange: james/server/trunk/domain-api/src/main/java/org/apache/james/api/domainlist/DomainListUtil.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: james/server/trunk/experimental-seda-imap-function/src/main/java/org/apache/james/experimental/imapserver/ImapServer.xinfo
URL: http://svn.apache.org/viewvc/james/server/trunk/experimental-seda-imap-function/src/main/java/org/apache/james/experimental/imapserver/ImapServer.xinfo?rev=684514&r1=684513&r2=684514&view=diff
==============================================================================
--- james/server/trunk/experimental-seda-imap-function/src/main/java/org/apache/james/experimental/imapserver/ImapServer.xinfo (original)
+++ james/server/trunk/experimental-seda-imap-function/src/main/java/org/apache/james/experimental/imapserver/ImapServer.xinfo Sun Aug 10 07:59:55 2008
@@ -39,7 +39,7 @@
<service name="org.apache.avalon.cornerstone.services.threads.ThreadManager" version="1.0"/>
</dependency>
<dependency>
- <service name="org.apache.james.services.DNSServer" version="1.0"/>
+ <service name="org.apache.james.api.dnsserver.DNSServer" version="1.0"/>
</dependency>
<dependency>
<service name="org.apache.james.services.MailServer" version="1.0"/>
Modified: james/server/trunk/fetchmail-function/src/main/java/org/apache/james/fetchmail/FetchMail.java
URL: http://svn.apache.org/viewvc/james/server/trunk/fetchmail-function/src/main/java/org/apache/james/fetchmail/FetchMail.java?rev=684514&r1=684513&r2=684514&view=diff
==============================================================================
--- james/server/trunk/fetchmail-function/src/main/java/org/apache/james/fetchmail/FetchMail.java (original)
+++ james/server/trunk/fetchmail-function/src/main/java/org/apache/james/fetchmail/FetchMail.java Sun Aug 10 07:59:55 2008
@@ -41,9 +41,9 @@
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.api.dnsserver.DNSServer;
import org.apache.james.api.user.UsersRepository;
import org.apache.james.services.MailServer;
-import org.apache.james.services.DNSServer;
/**
* <p>Class <code>FetchMail</code> is an Avalon task that is periodically
Modified: james/server/trunk/fetchmail-function/src/main/java/org/apache/james/fetchmail/FetchScheduler.xinfo
URL: http://svn.apache.org/viewvc/james/server/trunk/fetchmail-function/src/main/java/org/apache/james/fetchmail/FetchScheduler.xinfo?rev=684514&r1=684513&r2=684514&view=diff
==============================================================================
--- james/server/trunk/fetchmail-function/src/main/java/org/apache/james/fetchmail/FetchScheduler.xinfo (original)
+++ james/server/trunk/fetchmail-function/src/main/java/org/apache/james/fetchmail/FetchScheduler.xinfo Sun Aug 10 07:59:55 2008
@@ -40,7 +40,7 @@
<service name="org.apache.james.api.user.UsersRepository" version="1.0"/>
</dependency>
<dependency>
- <service name="org.apache.james.services.DNSServer" version="1.0"/>
+ <service name="org.apache.james.api.dnsserver.DNSServer" version="1.0"/>
</dependency>
<dependency>
<service name="org.apache.avalon.cornerstone.services.scheduler.TimeScheduler" version="1.0"/>
Modified: james/server/trunk/fetchmail-function/src/main/java/org/apache/james/fetchmail/ParsedConfiguration.java
URL: http://svn.apache.org/viewvc/james/server/trunk/fetchmail-function/src/main/java/org/apache/james/fetchmail/ParsedConfiguration.java?rev=684514&r1=684513&r2=684514&view=diff
==============================================================================
--- james/server/trunk/fetchmail-function/src/main/java/org/apache/james/fetchmail/ParsedConfiguration.java (original)
+++ james/server/trunk/fetchmail-function/src/main/java/org/apache/james/fetchmail/ParsedConfiguration.java Sun Aug 10 07:59:55 2008
@@ -31,8 +31,8 @@
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.logger.Logger;
+import org.apache.james.api.dnsserver.DNSServer;
import org.apache.james.api.user.UsersRepository;
-import org.apache.james.services.DNSServer;
import org.apache.james.services.MailServer;
import org.apache.mailet.MailAddress;
Modified: james/server/trunk/fetchmail-function/src/main/java/org/apache/james/fetchmail/ProcessorAbstract.java
URL: http://svn.apache.org/viewvc/james/server/trunk/fetchmail-function/src/main/java/org/apache/james/fetchmail/ProcessorAbstract.java?rev=684514&r1=684513&r2=684514&view=diff
==============================================================================
--- james/server/trunk/fetchmail-function/src/main/java/org/apache/james/fetchmail/ProcessorAbstract.java (original)
+++ james/server/trunk/fetchmail-function/src/main/java/org/apache/james/fetchmail/ProcessorAbstract.java Sun Aug 10 07:59:55 2008
@@ -28,10 +28,10 @@
import javax.mail.Session;
import org.apache.avalon.framework.logger.Logger;
+import org.apache.james.api.dnsserver.DNSServer;
import org.apache.james.api.user.UsersRepository;
import org.apache.james.services.MailServer;
import org.apache.mailet.MailAddress;
-import org.apache.james.services.DNSServer;
/**
* <p>Class <code>ProcessorAbstract</code> is an abstract class that
Modified: james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/ImapServer.xinfo
URL: http://svn.apache.org/viewvc/james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/ImapServer.xinfo?rev=684514&r1=684513&r2=684514&view=diff
==============================================================================
--- james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/ImapServer.xinfo (original)
+++ james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/ImapServer.xinfo Sun Aug 10 07:59:55 2008
@@ -44,7 +44,7 @@
<service name="org.apache.avalon.cornerstone.services.threads.ThreadManager" version="1.0"/>
</dependency>
<dependency>
- <service name="org.apache.james.services.DNSServer" version="1.0"/>
+ <service name="org.apache.james.api.dnsserver.DNSServer" version="1.0"/>
</dependency>
<dependency>
<service name="org.apache.james.services.MailServer" version="1.0"/>
Modified: james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/RemoteDelivery.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/RemoteDelivery.java?rev=684514&r1=684513&r2=684514&view=diff
==============================================================================
--- james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/RemoteDelivery.java (original)
+++ james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/RemoteDelivery.java Sun Aug 10 07:59:55 2008
@@ -27,8 +27,8 @@
import org.apache.avalon.framework.service.ServiceException;
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.james.Constants;
-import org.apache.james.dnsserver.TemporaryResolutionException;
-import org.apache.james.services.DNSServer;
+import org.apache.james.api.dnsserver.DNSServer;
+import org.apache.james.api.dnsserver.TemporaryResolutionException;
import org.apache.james.services.SpoolRepository;
import org.apache.james.util.TimeConverter;
import org.apache.mailet.GenericMailet;
Modified: james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/matchers/AbstractNetworkMatcher.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/matchers/AbstractNetworkMatcher.java?rev=684514&r1=684513&r2=684514&view=diff
==============================================================================
--- james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/matchers/AbstractNetworkMatcher.java (original)
+++ james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/matchers/AbstractNetworkMatcher.java Sun Aug 10 07:59:55 2008
@@ -23,7 +23,7 @@
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.james.Constants;
-import org.apache.james.services.DNSServer;
+import org.apache.james.api.dnsserver.DNSServer;
import org.apache.james.util.NetMatcher;
import javax.mail.MessagingException;
import java.util.StringTokenizer;
Modified: james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/matchers/InSpammerBlacklist.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/matchers/InSpammerBlacklist.java?rev=684514&r1=684513&r2=684514&view=diff
==============================================================================
--- james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/matchers/InSpammerBlacklist.java (original)
+++ james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/matchers/InSpammerBlacklist.java Sun Aug 10 07:59:55 2008
@@ -30,7 +30,7 @@
import org.apache.avalon.framework.service.ServiceException;
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.james.Constants;
-import org.apache.james.services.DNSServer;
+import org.apache.james.api.dnsserver.DNSServer;
import org.apache.mailet.GenericMatcher;
import org.apache.mailet.Mail;
Modified: james/server/trunk/mailets-function/src/test/java/org/apache/james/transport/mailets/StandardRemoteDeliveryTestable.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets-function/src/test/java/org/apache/james/transport/mailets/StandardRemoteDeliveryTestable.java?rev=684514&r1=684513&r2=684514&view=diff
==============================================================================
--- james/server/trunk/mailets-function/src/test/java/org/apache/james/transport/mailets/StandardRemoteDeliveryTestable.java (original)
+++ james/server/trunk/mailets-function/src/test/java/org/apache/james/transport/mailets/StandardRemoteDeliveryTestable.java Sun Aug 10 07:59:55 2008
@@ -19,7 +19,7 @@
package org.apache.james.transport.mailets;
-import org.apache.james.services.DNSServer;
+import org.apache.james.api.dnsserver.DNSServer;
import org.apache.james.transport.remotedeliverytester.RemoteDeliveryTestable;
import org.apache.james.transport.remotedeliverytester.Tester;
Modified: james/server/trunk/mailets-function/src/test/java/org/apache/james/transport/matchers/AbstractRemoteAddrInNetworkTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets-function/src/test/java/org/apache/james/transport/matchers/AbstractRemoteAddrInNetworkTest.java?rev=684514&r1=684513&r2=684514&view=diff
==============================================================================
--- james/server/trunk/mailets-function/src/test/java/org/apache/james/transport/matchers/AbstractRemoteAddrInNetworkTest.java (original)
+++ james/server/trunk/mailets-function/src/test/java/org/apache/james/transport/matchers/AbstractRemoteAddrInNetworkTest.java Sun Aug 10 07:59:55 2008
@@ -37,8 +37,8 @@
import junit.framework.TestCase;
import org.apache.james.Constants;
+import org.apache.james.api.dnsserver.DNSServer;
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;
import org.apache.james.test.mock.mailet.MockMatcherConfig;
Modified: james/server/trunk/mailets-function/src/test/java/org/apache/james/transport/matchers/InSpammerBlacklistTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets-function/src/test/java/org/apache/james/transport/matchers/InSpammerBlacklistTest.java?rev=684514&r1=684513&r2=684514&view=diff
==============================================================================
--- james/server/trunk/mailets-function/src/test/java/org/apache/james/transport/matchers/InSpammerBlacklistTest.java (original)
+++ james/server/trunk/mailets-function/src/test/java/org/apache/james/transport/matchers/InSpammerBlacklistTest.java Sun Aug 10 07:59:55 2008
@@ -21,8 +21,8 @@
package org.apache.james.transport.matchers;
import org.apache.james.Constants;
+import org.apache.james.api.dnsserver.DNSServer;
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.MockMail;
import org.apache.james.test.mock.mailet.MockMailContext;
Modified: james/server/trunk/mailets-function/src/test/java/org/apache/james/transport/remotedeliverytester/RemoteDeliveryTestable.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets-function/src/test/java/org/apache/james/transport/remotedeliverytester/RemoteDeliveryTestable.java?rev=684514&r1=684513&r2=684514&view=diff
==============================================================================
--- james/server/trunk/mailets-function/src/test/java/org/apache/james/transport/remotedeliverytester/RemoteDeliveryTestable.java (original)
+++ james/server/trunk/mailets-function/src/test/java/org/apache/james/transport/remotedeliverytester/RemoteDeliveryTestable.java Sun Aug 10 07:59:55 2008
@@ -19,7 +19,7 @@
package org.apache.james.transport.remotedeliverytester;
-import org.apache.james.services.DNSServer;
+import org.apache.james.api.dnsserver.DNSServer;
import org.apache.mailet.Mail;
import org.apache.mailet.MailetConfig;
Modified: james/server/trunk/mailets-function/src/test/java/org/apache/james/transport/remotedeliverytester/Tester.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets-function/src/test/java/org/apache/james/transport/remotedeliverytester/Tester.java?rev=684514&r1=684513&r2=684514&view=diff
==============================================================================
--- james/server/trunk/mailets-function/src/test/java/org/apache/james/transport/remotedeliverytester/Tester.java (original)
+++ james/server/trunk/mailets-function/src/test/java/org/apache/james/transport/remotedeliverytester/Tester.java Sun Aug 10 07:59:55 2008
@@ -20,9 +20,9 @@
package org.apache.james.transport.remotedeliverytester;
import org.apache.avalon.framework.service.ServiceManager;
+import org.apache.james.api.dnsserver.DNSServer;
+import org.apache.james.api.dnsserver.TemporaryResolutionException;
import org.apache.james.core.MailImpl;
-import org.apache.james.dnsserver.TemporaryResolutionException;
-import org.apache.james.services.DNSServer;
import org.apache.mailet.HostAddress;
import org.apache.mailet.Mail;
import org.apache.mailet.MailAddress;
Modified: james/server/trunk/nntpserver-function/src/main/java/org/apache/james/nntpserver/NNTPServer.xinfo
URL: http://svn.apache.org/viewvc/james/server/trunk/nntpserver-function/src/main/java/org/apache/james/nntpserver/NNTPServer.xinfo?rev=684514&r1=684513&r2=684514&view=diff
==============================================================================
--- james/server/trunk/nntpserver-function/src/main/java/org/apache/james/nntpserver/NNTPServer.xinfo (original)
+++ james/server/trunk/nntpserver-function/src/main/java/org/apache/james/nntpserver/NNTPServer.xinfo Sun Aug 10 07:59:55 2008
@@ -46,7 +46,7 @@
<service name="org.apache.avalon.cornerstone.services.threads.ThreadManager" version="1.0"/>
</dependency>
<dependency>
- <service name="org.apache.james.services.DNSServer" version="1.0"/>
+ <service name="org.apache.james.api.dnsserver.DNSServer" version="1.0"/>
</dependency>
<dependency>
<service name="org.apache.james.services.MailServer" version="1.0"/>
Modified: james/server/trunk/phoenix-deployment/src/conf/james-assembly.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/phoenix-deployment/src/conf/james-assembly.xml?rev=684514&r1=684513&r2=684514&view=diff
==============================================================================
--- james/server/trunk/phoenix-deployment/src/conf/james-assembly.xml (original)
+++ james/server/trunk/phoenix-deployment/src/conf/james-assembly.xml Sun Aug 10 07:59:55 2008
@@ -41,13 +41,13 @@
<!-- Specify which components will provide the services required by this
block. The roles are specified in the code and the .xinfo file. The names
here must match the names specified for a Block in this xml file. -->
- <provide name="dnsserver" role="org.apache.james.services.DNSServer"/>
+ <provide name="dnsserver" role="org.apache.james.api.dnsserver.DNSServer"/>
<provide name="mailstore" role="org.apache.avalon.cornerstone.services.store.Store"/>
<provide name="users-store" role="org.apache.james.api.user.UsersStore"/>
<provide name="localusersrepository" role="org.apache.james.api.user.UsersRepository"/>
<provide name="spoolrepository" role="org.apache.james.services.SpoolRepository"/>
<provide name="filesystem" role="org.apache.james.services.FileSystem" />
- <provide name="domainlist" role="org.apache.james.services.DomainList" />
+ <provide name="domainlist" role="org.apache.james.api.domainlist.DomainList" />
<provide name="sockets"
role="org.apache.avalon.cornerstone.services.sockets.SocketManager"/>
<provide name="scheduler"
@@ -112,7 +112,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"/>
+ <provide name="dnsserver" role="org.apache.james.api.dnsserver.DNSServer"/>
<provide name="processormanagement" role="org.apache.james.services.ProcessorManagementService"/>
<provide name="virtualusertablemanagement" role="org.apache.james.api.vut.management.VirtualUserTableManagementService"/>
<provide name="domainlistmanagement" role="org.apache.james.services.DomainListManagementService"/>
@@ -142,7 +142,7 @@
role="org.apache.avalon.cornerstone.services.threads.ThreadManager" />
<provide name="mailboxmanager"
role="org.apache.james.mailboxmanager.manager.MailboxManagerProvider" />
- <provide name="dnsserver" role="org.apache.james.services.DNSServer"/>
+ <provide name="dnsserver" role="org.apache.james.api.dnsserver.DNSServer"/>
</block>
<!-- POP3 Server -->
@@ -155,14 +155,14 @@
<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"/>
+ <provide name="dnsserver" role="org.apache.james.api.dnsserver.DNSServer"/>
</block>
<!-- SMTP Server -->
<block name="smtpserver" class="org.apache.james.smtpserver.SMTPServer" >
<provide name="James" role="org.apache.mailet.MailetContext"/>
<provide name="localusersrepository" role="org.apache.james.api.user.UsersRepository"/>
- <provide name="dnsserver" role="org.apache.james.services.DNSServer"/>
+ <provide name="dnsserver" role="org.apache.james.api.dnsserver.DNSServer"/>
<provide name="sockets"
role="org.apache.avalon.cornerstone.services.sockets.SocketManager"/>
<provide name="connections"
@@ -188,7 +188,7 @@
role="org.apache.james.nntpserver.repository.NNTPRepository"/>
<provide name="thread-manager"
role="org.apache.avalon.cornerstone.services.threads.ThreadManager" />
- <provide name="dnsserver" role="org.apache.james.services.DNSServer"/>
+ <provide name="dnsserver" role="org.apache.james.api.dnsserver.DNSServer"/>
<provide name="James" role="org.apache.james.services.MailServer"/>
</block>
@@ -203,7 +203,7 @@
role="org.apache.avalon.cornerstone.services.scheduler.TimeScheduler"/>
<provide name="James" role="org.apache.james.services.MailServer"/>
<provide name="localusersrepository" role="org.apache.james.api.user.UsersRepository"/>
- <provide name="dnsserver" role="org.apache.james.services.DNSServer"/>
+ <provide name="dnsserver" role="org.apache.james.api.dnsserver.DNSServer"/>
</block>
<!-- JMS Service
@@ -262,7 +262,7 @@
<provide name="database-connections"
role="org.apache.avalon.cornerstone.services.datasources.DataSourceSelector"/>
<provide name="filesystem" role="org.apache.james.services.FileSystem"/>
- <provide name="dnsserver" role="org.apache.james.services.DNSServer"/>
+ <provide name="dnsserver" role="org.apache.james.api.dnsserver.DNSServer"/>
</block>
<block name="defaultvirtualusertable" class="org.apache.james.impl.vut.DefaultVirtualUserTable">
@@ -274,7 +274,7 @@
<!-- ######################################################################## -->
<!-- The context domainlist implementation -->
<block name="domainlist" class="org.apache.james.domain.XMLDomainList">
- <provide name="dnsserver" role="org.apache.james.services.DNSServer"/>
+ <provide name="dnsserver" role="org.apache.james.api.dnsserver.DNSServer"/>
</block>
<!-- JDBC implementation of the domainlist service-->
@@ -283,7 +283,7 @@
<provide name="database-connections"
role="org.apache.avalon.cornerstone.services.datasources.DataSourceSelector"/>
<provide name="filesystem" role="org.apache.james.services.FileSystem"/>
- <provide name="dnsserver" role="org.apache.james.services.DNSServer"/>
+ <provide name="dnsserver" role="org.apache.james.api.dnsserver.DNSServer"/>
</block>
-->
@@ -293,21 +293,21 @@
<provide name="database-connections"
role="org.apache.avalon.cornerstone.services.datasources.DataSourceSelector"/>
<provide name="filesystem" role="org.apache.james.services.FileSystem"/>
- <provide name="dnsserver" role="org.apache.james.services.DNSServer"/>
+ <provide name="dnsserver" role="org.apache.james.api.dnsserver.DNSServer"/>
</block>
-->
<!-- XML VirtualUserTable implementation of the domainlist service -->
<!--
<block name="domainlist" class="org.apache.james.vut.XMLVirtualUserTable">
- <provide name="dnsserver" role="org.apache.james.services.DNSServer"/>
+ <provide name="dnsserver" role="org.apache.james.api.dnsserver.DNSServer"/>
</block>
-->
<!-- #################################################################### -->
<block name="domainlistmanagement" class="org.apache.james.management.DomainListManagement">
<provide name="domainlist"
- role="org.apache.james.services.DomainList"/>
+ role="org.apache.james.api.domainlist.DomainList"/>
</block>
<!-- Configuration for Cornerstone Blocks only after here
Modified: james/server/trunk/phoenix-deployment/src/test/org/apache/james/JamesTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/phoenix-deployment/src/test/org/apache/james/JamesTest.java?rev=684514&r1=684513&r2=684514&view=diff
==============================================================================
--- james/server/trunk/phoenix-deployment/src/test/org/apache/james/JamesTest.java (original)
+++ james/server/trunk/phoenix-deployment/src/test/org/apache/james/JamesTest.java Sun Aug 10 07:59:55 2008
@@ -24,11 +24,11 @@
import org.apache.avalon.cornerstone.services.store.Store;
import org.apache.avalon.framework.container.ContainerUtil;
import org.apache.avalon.framework.service.ServiceException;
+import org.apache.james.api.dnsserver.DNSServer;
+import org.apache.james.api.domainlist.DomainList;
import org.apache.james.api.user.UsersRepository;
import org.apache.james.api.user.UsersStore;
import org.apache.james.services.AbstractDNSServer;
-import org.apache.james.services.DNSServer;
-import org.apache.james.services.DomainList;
import org.apache.james.services.FileSystem;
import org.apache.james.services.MailServer;
import org.apache.james.services.MailServerTestAllImplementations;
Modified: james/server/trunk/phoenix-deployment/src/test/org/apache/james/imapserver/util/ImapServerLauncher.java
URL: http://svn.apache.org/viewvc/james/server/trunk/phoenix-deployment/src/test/org/apache/james/imapserver/util/ImapServerLauncher.java?rev=684514&r1=684513&r2=684514&view=diff
==============================================================================
--- james/server/trunk/phoenix-deployment/src/test/org/apache/james/imapserver/util/ImapServerLauncher.java (original)
+++ james/server/trunk/phoenix-deployment/src/test/org/apache/james/imapserver/util/ImapServerLauncher.java Sun Aug 10 07:59:55 2008
@@ -21,12 +21,12 @@
import org.apache.avalon.framework.configuration.DefaultConfiguration;
import org.apache.avalon.framework.container.ContainerUtil;
+import org.apache.james.api.dnsserver.DNSServer;
import org.apache.james.imapserver.ImapHandler;
import org.apache.james.imapserver.TestConstants;
import org.apache.james.imapserver.mock.MockImapHandlerConfigurationData;
import org.apache.james.imapserver.mock.MockWatchdog;
import org.apache.james.mailboxmanager.MailboxManagerException;
-import org.apache.james.services.DNSServer;
import org.apache.james.test.mock.avalon.MockLogger;
import javax.mail.MessagingException;
Modified: james/server/trunk/phoenix-deployment/src/test/org/apache/james/smtpserver/SMTPServerRemoteDeliveryIntegrationTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/phoenix-deployment/src/test/org/apache/james/smtpserver/SMTPServerRemoteDeliveryIntegrationTest.java?rev=684514&r1=684513&r2=684514&view=diff
==============================================================================
--- james/server/trunk/phoenix-deployment/src/test/org/apache/james/smtpserver/SMTPServerRemoteDeliveryIntegrationTest.java (original)
+++ james/server/trunk/phoenix-deployment/src/test/org/apache/james/smtpserver/SMTPServerRemoteDeliveryIntegrationTest.java Sun Aug 10 07:59:55 2008
@@ -24,9 +24,9 @@
import org.apache.avalon.cornerstone.services.threads.ThreadManager;
import org.apache.avalon.framework.container.ContainerUtil;
import org.apache.james.Constants;
+import org.apache.james.api.dnsserver.DNSServer;
import org.apache.james.api.user.UsersRepository;
import org.apache.james.core.MailImpl;
-import org.apache.james.services.DNSServer;
import org.apache.james.services.JamesConnectionManager;
import org.apache.james.services.MailServer;
import org.apache.james.test.mock.avalon.MockLogger;
Modified: james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/POP3Server.xinfo
URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/POP3Server.xinfo?rev=684514&r1=684513&r2=684514&view=diff
==============================================================================
--- james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/POP3Server.xinfo (original)
+++ james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/POP3Server.xinfo Sun Aug 10 07:59:55 2008
@@ -46,7 +46,7 @@
<service name="org.apache.avalon.cornerstone.services.threads.ThreadManager" version="1.0"/>
</dependency>
<dependency>
- <service name="org.apache.james.services.DNSServer" version="1.0"/>
+ <service name="org.apache.james.api.dnsserver.DNSServer" version="1.0"/>
</dependency>
</dependencies>
Modified: james/server/trunk/pop3server-function/src/test/java/org/apache/james/pop3server/POP3ServerTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server-function/src/test/java/org/apache/james/pop3server/POP3ServerTest.java?rev=684514&r1=684513&r2=684514&view=diff
==============================================================================
--- james/server/trunk/pop3server-function/src/test/java/org/apache/james/pop3server/POP3ServerTest.java (original)
+++ james/server/trunk/pop3server-function/src/test/java/org/apache/james/pop3server/POP3ServerTest.java Sun Aug 10 07:59:55 2008
@@ -25,10 +25,10 @@
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.api.dnsserver.DNSServer;
import org.apache.james.api.user.UsersRepository;
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;
Modified: james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/RemoteManager.xinfo
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/RemoteManager.xinfo?rev=684514&r1=684513&r2=684514&view=diff
==============================================================================
--- james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/RemoteManager.xinfo (original)
+++ james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/RemoteManager.xinfo Sun Aug 10 07:59:55 2008
@@ -58,7 +58,7 @@
<service name="org.apache.james.services.BayesianAnalyzerManagementService" version="1.0"/>
</dependency>
<dependency>
- <service name="org.apache.james.services.DNSServer" version="1.0"/>
+ <service name="org.apache.james.api.dnsserver.DNSServer" version="1.0"/>
</dependency>
<dependency>
<service name="org.apache.james.services.ProcessorManagementService" version="1.0"/>
Modified: james/server/trunk/remotemanager-function/src/test/java/org/apache/james/remotemanager/RemoteManagerTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager-function/src/test/java/org/apache/james/remotemanager/RemoteManagerTest.java?rev=684514&r1=684513&r2=684514&view=diff
==============================================================================
--- james/server/trunk/remotemanager-function/src/test/java/org/apache/james/remotemanager/RemoteManagerTest.java (original)
+++ james/server/trunk/remotemanager-function/src/test/java/org/apache/james/remotemanager/RemoteManagerTest.java Sun Aug 10 07:59:55 2008
@@ -26,6 +26,7 @@
import org.apache.avalon.framework.container.ContainerUtil;
import org.apache.avalon.framework.service.ServiceException;
import org.apache.commons.net.telnet.TelnetClient;
+import org.apache.james.api.dnsserver.DNSServer;
import org.apache.james.api.user.UsersRepository;
import org.apache.james.api.user.UsersStore;
import org.apache.james.api.vut.management.VirtualUserTableManagementService;
@@ -33,7 +34,6 @@
import org.apache.james.impl.vut.VirtualUserTableManagement;
import org.apache.james.management.DomainListManagement;
import org.apache.james.services.AbstractDNSServer;
-import org.apache.james.services.DNSServer;
import org.apache.james.services.DomainListManagementService;
import org.apache.james.services.JamesConnectionManager;
import org.apache.james.services.MailServer;
Modified: james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPServer.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPServer.java?rev=684514&r1=684513&r2=684514&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPServer.java (original)
+++ james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPServer.java Sun Aug 10 07:59:55 2008
@@ -27,9 +27,9 @@
import org.apache.avalon.framework.service.ServiceException;
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.james.Constants;
+import org.apache.james.api.dnsserver.DNSServer;
import org.apache.james.api.user.UsersRepository;
import org.apache.james.core.AbstractJamesService;
-import org.apache.james.services.DNSServer;
import org.apache.james.services.MailServer;
import org.apache.james.util.NetMatcher;
import org.apache.mailet.MailetContext;
Modified: james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPServer.xinfo
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPServer.xinfo?rev=684514&r1=684513&r2=684514&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPServer.xinfo (original)
+++ james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPServer.xinfo Sun Aug 10 07:59:55 2008
@@ -37,7 +37,7 @@
<service name="org.apache.james.api.user.UsersRepository" version="1.0"/>
</dependency>
<dependency>
- <service name="org.apache.james.services.DNSServer" version="1.0"/>
+ <service name="org.apache.james.api.dnsserver.DNSServer" version="1.0"/>
</dependency>
<dependency>
<service name="org.apache.james.services.JamesConnectionManager" version="1.0"/>
Modified: james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/filter/fastfail/DNSRBLHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/filter/fastfail/DNSRBLHandler.java?rev=684514&r1=684513&r2=684514&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/filter/fastfail/DNSRBLHandler.java (original)
+++ james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/filter/fastfail/DNSRBLHandler.java Sun Aug 10 07:59:55 2008
@@ -27,7 +27,7 @@
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.james.services.DNSServer;
+import org.apache.james.api.dnsserver.DNSServer;
import org.apache.james.smtpserver.CommandHandler;
import org.apache.james.smtpserver.ConnectHandler;
import org.apache.james.smtpserver.SMTPSession;
Modified: james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/filter/fastfail/GreylistHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/filter/fastfail/GreylistHandler.java?rev=684514&r1=684513&r2=684514&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/filter/fastfail/GreylistHandler.java (original)
+++ james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/filter/fastfail/GreylistHandler.java Sun Aug 10 07:59:55 2008
@@ -44,7 +44,7 @@
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.avalon.framework.service.Serviceable;
-import org.apache.james.services.DNSServer;
+import org.apache.james.api.dnsserver.DNSServer;
import org.apache.james.services.FileSystem;
import org.apache.james.smtpserver.CommandHandler;
import org.apache.james.smtpserver.SMTPSession;
Modified: james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/filter/fastfail/ResolvableEhloHeloHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/filter/fastfail/ResolvableEhloHeloHandler.java?rev=684514&r1=684513&r2=684514&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/filter/fastfail/ResolvableEhloHeloHandler.java (original)
+++ james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/filter/fastfail/ResolvableEhloHeloHandler.java Sun Aug 10 07:59:55 2008
@@ -25,7 +25,7 @@
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.api.dnsserver.DNSServer;
import org.apache.james.smtpserver.CommandHandler;
import org.apache.james.smtpserver.SMTPSession;
import org.apache.james.util.junkscore.JunkScore;
Modified: james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/filter/fastfail/URIRBLHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/filter/fastfail/URIRBLHandler.java?rev=684514&r1=684513&r2=684514&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/filter/fastfail/URIRBLHandler.java (original)
+++ james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/filter/fastfail/URIRBLHandler.java Sun Aug 10 07:59:55 2008
@@ -41,7 +41,7 @@
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.api.dnsserver.DNSServer;
import org.apache.james.smtpserver.MessageHandler;
import org.apache.james.smtpserver.SMTPSession;
import org.apache.james.util.mail.dsn.DSNStatus;
Modified: james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/filter/fastfail/ValidRcptMX.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/filter/fastfail/ValidRcptMX.java?rev=684514&r1=684513&r2=684514&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/filter/fastfail/ValidRcptMX.java (original)
+++ james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/filter/fastfail/ValidRcptMX.java Sun Aug 10 07:59:55 2008
@@ -30,8 +30,8 @@
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.dnsserver.TemporaryResolutionException;
-import org.apache.james.services.DNSServer;
+import org.apache.james.api.dnsserver.DNSServer;
+import org.apache.james.api.dnsserver.TemporaryResolutionException;
import org.apache.james.smtpserver.CommandHandler;
import org.apache.james.smtpserver.SMTPSession;
import org.apache.james.util.NetMatcher;
Modified: james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/filter/fastfail/ValidSenderDomainHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/filter/fastfail/ValidSenderDomainHandler.java?rev=684514&r1=684513&r2=684514&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/filter/fastfail/ValidSenderDomainHandler.java (original)
+++ james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/filter/fastfail/ValidSenderDomainHandler.java Sun Aug 10 07:59:55 2008
@@ -30,8 +30,8 @@
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.dnsserver.TemporaryResolutionException;
-import org.apache.james.services.DNSServer;
+import org.apache.james.api.dnsserver.DNSServer;
+import org.apache.james.api.dnsserver.TemporaryResolutionException;
import org.apache.james.smtpserver.CommandHandler;
import org.apache.james.smtpserver.SMTPSession;
import org.apache.james.util.mail.dsn.DSNStatus;
Modified: james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/DNSRBLHandlerTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/DNSRBLHandlerTest.java?rev=684514&r1=684513&r2=684514&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/DNSRBLHandlerTest.java (original)
+++ james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/DNSRBLHandlerTest.java Sun Aug 10 07:59:55 2008
@@ -34,8 +34,8 @@
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.api.dnsserver.DNSServer;
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;
import org.apache.james.util.junkscore.JunkScore;
Modified: james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/ResolvableEhloHeloHandlerTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/ResolvableEhloHeloHandlerTest.java?rev=684514&r1=684513&r2=684514&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/ResolvableEhloHeloHandlerTest.java (original)
+++ james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/ResolvableEhloHeloHandlerTest.java Sun Aug 10 07:59:55 2008
@@ -31,8 +31,8 @@
import junit.framework.TestCase;
import org.apache.avalon.framework.container.ContainerUtil;
+import org.apache.james.api.dnsserver.DNSServer;
import org.apache.james.services.AbstractDNSServer;
-import org.apache.james.services.DNSServer;
import org.apache.james.smtpserver.core.filter.fastfail.ResolvableEhloHeloHandler;
import org.apache.james.test.mock.avalon.MockLogger;
import org.apache.james.util.junkscore.JunkScore;
Modified: james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/SMTPServerTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/SMTPServerTest.java?rev=684514&r1=684513&r2=684514&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/SMTPServerTest.java (original)
+++ james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/SMTPServerTest.java Sun Aug 10 07:59:55 2008
@@ -25,8 +25,8 @@
import org.apache.avalon.framework.container.ContainerUtil;
import org.apache.commons.net.smtp.SMTPClient;
import org.apache.commons.net.smtp.SMTPReply;
+import org.apache.james.api.dnsserver.DNSServer;
import org.apache.james.api.user.UsersRepository;
-import org.apache.james.services.DNSServer;
import org.apache.james.services.JamesConnectionManager;
import org.apache.james.services.MailServer;
import org.apache.james.test.mock.avalon.MockLogger;
Modified: james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/URIRBLHandlerTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/URIRBLHandlerTest.java?rev=684514&r1=684513&r2=684514&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/URIRBLHandlerTest.java (original)
+++ james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/URIRBLHandlerTest.java Sun Aug 10 07:59:55 2008
@@ -39,8 +39,8 @@
import junit.framework.TestCase;
import org.apache.avalon.framework.container.ContainerUtil;
+import org.apache.james.api.dnsserver.DNSServer;
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;
import org.apache.james.test.mock.javaxmail.MockMimeMessage;
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org