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/06/11 18:30:05 UTC
svn commit: r953757 - in /james/server/trunk:
core-function/src/main/java/org/apache/james/dnsserver/
core-function/src/main/java/org/apache/james/domain/
core-function/src/test/java/org/apache/james/domain/
dnsserver/src/main/java/org/apache/james/api...
Author: norman
Date: Fri Jun 11 16:30:04 2010
New Revision: 953757
URL: http://svn.apache.org/viewvc?rev=953757&view=rev
Log:
Rename package
Added:
james/server/trunk/dnsserver/src/main/java/org/apache/james/dnsservice/
james/server/trunk/dnsserver/src/main/java/org/apache/james/dnsservice/DNSService.java
- copied, changed from r953754, james/server/trunk/dnsserver/src/main/java/org/apache/james/api/dnsservice/DNSService.java
james/server/trunk/dnsserver/src/main/java/org/apache/james/dnsservice/TemporaryResolutionException.java
- copied, changed from r953754, james/server/trunk/dnsserver/src/main/java/org/apache/james/api/dnsservice/TemporaryResolutionException.java
james/server/trunk/dnsserver/src/main/java/org/apache/james/dnsservice/impl/
james/server/trunk/dnsserver/src/main/java/org/apache/james/dnsservice/impl/util/
- copied from r953754, james/server/trunk/dnsserver/src/main/java/org/apache/james/api/dnsservice/util/
Removed:
james/server/trunk/dnsserver/src/main/java/org/apache/james/api/dnsservice/DNSService.java
james/server/trunk/dnsserver/src/main/java/org/apache/james/api/dnsservice/TemporaryResolutionException.java
james/server/trunk/dnsserver/src/main/java/org/apache/james/api/dnsservice/util/
Modified:
james/server/trunk/core-function/src/main/java/org/apache/james/dnsserver/DNSServer.java
james/server/trunk/core-function/src/main/java/org/apache/james/domain/AbstractDomainList.java
james/server/trunk/core-function/src/test/java/org/apache/james/domain/JDBCDomainListTest.java
james/server/trunk/core-function/src/test/java/org/apache/james/domain/XMLDomainListTest.java
james/server/trunk/dnsserver/src/main/java/org/apache/james/dnsservice/impl/util/InetNetwork.java
james/server/trunk/dnsserver/src/main/java/org/apache/james/dnsservice/impl/util/NetMatcher.java
james/server/trunk/dnsserver/src/test/java/org/apache/james/api/dnsservice/AbstractDNSServer.java
james/server/trunk/fetchmail/src/main/java/org/apache/james/fetchmail/FetchMail.java
james/server/trunk/fetchmail/src/main/java/org/apache/james/fetchmail/FetchScheduler.java
james/server/trunk/fetchmail/src/main/java/org/apache/james/fetchmail/ParsedConfiguration.java
james/server/trunk/fetchmail/src/main/java/org/apache/james/fetchmail/ProcessorAbstract.java
james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/AbstractRedirect.java
james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/AbstractVirtualUserTable.java
james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/AbstractNetworkMatcher.java
james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/InSpammerBlacklist.java
james/server/trunk/mailets/src/test/java/org/apache/james/transport/matchers/AbstractRemoteAddrInNetworkTest.java
james/server/trunk/mailets/src/test/java/org/apache/james/transport/matchers/InSpammerBlacklistTest.java
james/server/trunk/netty-socket/src/main/java/org/apache/james/socket/netty/AbstractConfigurableAsyncServer.java
james/server/trunk/pop3server/src/test/java/org/apache/james/pop3server/AbstractAsyncPOP3ServerTest.java
james/server/trunk/remotemanager/src/test/java/org/apache/james/remotemanager/AbstractRemoteManagerTest.java
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/SMTPServerDNSServiceAdapter.java
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/DNSRBLHandler.java
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/JDBCGreylistHandler.java
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/ResolvableEhloHeloHandler.java
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/ReverseEqualsEhloHeloHandler.java
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/URIRBLHandler.java
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptMX.java
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/ValidSenderDomainHandler.java
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/netty/NioSMTPServer.java
james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/AbstractSMTPServerTest.java
james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/URIRBLHandlerTest.java
james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/ValidRcptMXTest.java
james/server/trunk/spoolmanager/src/main/java/org/apache/james/AbstractMailServer.java
james/server/trunk/spoolmanager/src/main/java/org/apache/james/JamesMailetContext.java
james/server/trunk/spoolmanager/src/main/java/org/apache/james/transport/mailets/AbstractRemoteDelivery.java
james/server/trunk/spoolmanager/src/test/java/org/apache/james/transport/remotedeliverytester/RemoteDeliveryTestable.java
james/server/trunk/spoolmanager/src/test/java/org/apache/james/transport/remotedeliverytester/Tester.java
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/core-function/src/main/java/org/apache/james/dnsserver/DNSServer.java
URL: http://svn.apache.org/viewvc/james/server/trunk/core-function/src/main/java/org/apache/james/dnsserver/DNSServer.java?rev=953757&r1=953756&r2=953757&view=diff
==============================================================================
--- james/server/trunk/core-function/src/main/java/org/apache/james/dnsserver/DNSServer.java (original)
+++ james/server/trunk/core-function/src/main/java/org/apache/james/dnsserver/DNSServer.java Fri Jun 11 16:30:04 2010
@@ -24,8 +24,8 @@ package org.apache.james.dnsserver;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.HierarchicalConfiguration;
import org.apache.commons.logging.Log;
-import org.apache.james.api.dnsservice.DNSService;
-import org.apache.james.api.dnsservice.TemporaryResolutionException;
+import org.apache.james.dnsservice.DNSService;
+import org.apache.james.dnsservice.TemporaryResolutionException;
import org.apache.james.lifecycle.Configurable;
import org.apache.james.lifecycle.LogEnabled;
import org.apache.mailet.HostAddress;
@@ -302,7 +302,7 @@ public class DNSServer implements DNSSer
}
/**
- * @see org.apache.james.api.dnsservice.DNSService#findMXRecords(String)
+ * @see org.apache.james.dnsservice.DNSService#findMXRecords(String)
*/
public Collection<String> findMXRecords(String hostname) throws TemporaryResolutionException {
List<String> servers = new ArrayList<String>();
@@ -416,7 +416,7 @@ public class DNSServer implements DNSSer
}
/**
- * @see org.apache.james.api.dnsservice.DNSService#getSMTPHostAddresses(String)
+ * @see org.apache.james.dnsservice.DNSService#getSMTPHostAddresses(String)
*/
public Iterator<HostAddress> getSMTPHostAddresses(final String domainName) throws TemporaryResolutionException {
return new Iterator<HostAddress>() {
@@ -509,7 +509,7 @@ public class DNSServer implements DNSSer
}
/**
- * @see org.apache.james.api.dnsservice.DNSService#getByName(String)
+ * @see org.apache.james.dnsservice.DNSService#getByName(String)
*/
public InetAddress getByName(String host) throws UnknownHostException {
String name = allowIPLiteral(host);
@@ -532,7 +532,7 @@ public class DNSServer implements DNSSer
}
/**
- * @see org.apache.james.api.dnsservice.DNSService#getAllByName(String)
+ * @see org.apache.james.dnsservice.DNSService#getAllByName(String)
*/
public InetAddress[] getAllByName(String host) throws UnknownHostException {
String name = allowIPLiteral(host);
@@ -559,7 +559,7 @@ public class DNSServer implements DNSSer
}
/**
- * @see org.apache.james.api.dnsservice.DNSService#findTXTRecords(String)
+ * @see org.apache.james.dnsservice.DNSService#findTXTRecords(String)
*/
public Collection<String> findTXTRecords(String hostname){
List<String> txtR = new ArrayList<String>();
@@ -576,7 +576,7 @@ public class DNSServer implements DNSSer
}
/**
- * @see org.apache.james.api.dnsservice.DNSService#getHostName(java.net.InetAddress)
+ * @see org.apache.james.dnsservice.DNSService#getHostName(java.net.InetAddress)
*/
public String getHostName(InetAddress addr){
String result = null;
@@ -593,7 +593,7 @@ public class DNSServer implements DNSSer
}
/**
- * @see org.apache.james.api.dnsservice.DNSService#getLocalHost()
+ * @see org.apache.james.dnsservice.DNSService#getLocalHost()
*/
public InetAddress getLocalHost() throws UnknownHostException {
return InetAddress.getLocalHost();
Modified: james/server/trunk/core-function/src/main/java/org/apache/james/domain/AbstractDomainList.java
URL: http://svn.apache.org/viewvc/james/server/trunk/core-function/src/main/java/org/apache/james/domain/AbstractDomainList.java?rev=953757&r1=953756&r2=953757&view=diff
==============================================================================
--- james/server/trunk/core-function/src/main/java/org/apache/james/domain/AbstractDomainList.java (original)
+++ james/server/trunk/core-function/src/main/java/org/apache/james/domain/AbstractDomainList.java Fri Jun 11 16:30:04 2010
@@ -31,8 +31,8 @@ import java.util.Locale;
import javax.annotation.Resource;
import org.apache.commons.logging.Log;
-import org.apache.james.api.dnsservice.DNSService;
import org.apache.james.api.domainlist.ManageableDomainList;
+import org.apache.james.dnsservice.DNSService;
import org.apache.james.lifecycle.LogEnabled;
/**
Modified: james/server/trunk/core-function/src/test/java/org/apache/james/domain/JDBCDomainListTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/core-function/src/test/java/org/apache/james/domain/JDBCDomainListTest.java?rev=953757&r1=953756&r2=953757&view=diff
==============================================================================
--- james/server/trunk/core-function/src/test/java/org/apache/james/domain/JDBCDomainListTest.java (original)
+++ james/server/trunk/core-function/src/test/java/org/apache/james/domain/JDBCDomainListTest.java Fri Jun 11 16:30:04 2010
@@ -37,7 +37,7 @@ import org.apache.commons.configuration.
import org.apache.commons.configuration.HierarchicalConfiguration;
import org.apache.commons.logging.impl.SimpleLog;
import org.apache.james.api.dnsservice.AbstractDNSServer;
-import org.apache.james.api.dnsservice.DNSService;
+import org.apache.james.dnsservice.DNSService;
import org.apache.james.services.DataSourceSelector;
import org.apache.james.test.mock.james.MockFileSystem;
import org.apache.james.test.util.Util;
Modified: james/server/trunk/core-function/src/test/java/org/apache/james/domain/XMLDomainListTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/core-function/src/test/java/org/apache/james/domain/XMLDomainListTest.java?rev=953757&r1=953756&r2=953757&view=diff
==============================================================================
--- james/server/trunk/core-function/src/test/java/org/apache/james/domain/XMLDomainListTest.java (original)
+++ james/server/trunk/core-function/src/test/java/org/apache/james/domain/XMLDomainListTest.java Fri Jun 11 16:30:04 2010
@@ -31,7 +31,7 @@ import org.apache.commons.configuration.
import org.apache.commons.configuration.HierarchicalConfiguration;
import org.apache.commons.logging.impl.SimpleLog;
import org.apache.james.api.dnsservice.AbstractDNSServer;
-import org.apache.james.api.dnsservice.DNSService;
+import org.apache.james.dnsservice.DNSService;
import junit.framework.TestCase;
Copied: james/server/trunk/dnsserver/src/main/java/org/apache/james/dnsservice/DNSService.java (from r953754, james/server/trunk/dnsserver/src/main/java/org/apache/james/api/dnsservice/DNSService.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/dnsserver/src/main/java/org/apache/james/dnsservice/DNSService.java?p2=james/server/trunk/dnsserver/src/main/java/org/apache/james/dnsservice/DNSService.java&p1=james/server/trunk/dnsserver/src/main/java/org/apache/james/api/dnsservice/DNSService.java&r1=953754&r2=953757&rev=953757&view=diff
==============================================================================
--- james/server/trunk/dnsserver/src/main/java/org/apache/james/api/dnsservice/DNSService.java (original)
+++ james/server/trunk/dnsserver/src/main/java/org/apache/james/dnsservice/DNSService.java Fri Jun 11 16:30:04 2010
@@ -19,7 +19,7 @@
-package org.apache.james.api.dnsservice;
+package org.apache.james.dnsservice;
import java.net.InetAddress;
import java.net.UnknownHostException;
Copied: james/server/trunk/dnsserver/src/main/java/org/apache/james/dnsservice/TemporaryResolutionException.java (from r953754, james/server/trunk/dnsserver/src/main/java/org/apache/james/api/dnsservice/TemporaryResolutionException.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/dnsserver/src/main/java/org/apache/james/dnsservice/TemporaryResolutionException.java?p2=james/server/trunk/dnsserver/src/main/java/org/apache/james/dnsservice/TemporaryResolutionException.java&p1=james/server/trunk/dnsserver/src/main/java/org/apache/james/api/dnsservice/TemporaryResolutionException.java&r1=953754&r2=953757&rev=953757&view=diff
==============================================================================
--- james/server/trunk/dnsserver/src/main/java/org/apache/james/api/dnsservice/TemporaryResolutionException.java (original)
+++ james/server/trunk/dnsserver/src/main/java/org/apache/james/dnsservice/TemporaryResolutionException.java Fri Jun 11 16:30:04 2010
@@ -20,7 +20,7 @@
-package org.apache.james.api.dnsservice;
+package org.apache.james.dnsservice;
import java.io.IOException;
Modified: james/server/trunk/dnsserver/src/main/java/org/apache/james/dnsservice/impl/util/InetNetwork.java
URL: http://svn.apache.org/viewvc/james/server/trunk/dnsserver/src/main/java/org/apache/james/dnsservice/impl/util/InetNetwork.java?rev=953757&r1=953754&r2=953757&view=diff
==============================================================================
--- james/server/trunk/dnsserver/src/main/java/org/apache/james/dnsservice/impl/util/InetNetwork.java (original)
+++ james/server/trunk/dnsserver/src/main/java/org/apache/james/dnsservice/impl/util/InetNetwork.java Fri Jun 11 16:30:04 2010
@@ -19,12 +19,12 @@
-package org.apache.james.api.dnsservice.util;
+package org.apache.james.dnsservice.impl.util;
import java.net.InetAddress;
import java.net.UnknownHostException;
-import org.apache.james.api.dnsservice.DNSService;
+import org.apache.james.dnsservice.DNSService;
class InetNetwork
{
Modified: james/server/trunk/dnsserver/src/main/java/org/apache/james/dnsservice/impl/util/NetMatcher.java
URL: http://svn.apache.org/viewvc/james/server/trunk/dnsserver/src/main/java/org/apache/james/dnsservice/impl/util/NetMatcher.java?rev=953757&r1=953754&r2=953757&view=diff
==============================================================================
--- james/server/trunk/dnsserver/src/main/java/org/apache/james/dnsservice/impl/util/NetMatcher.java (original)
+++ james/server/trunk/dnsserver/src/main/java/org/apache/james/dnsservice/impl/util/NetMatcher.java Fri Jun 11 16:30:04 2010
@@ -17,14 +17,14 @@
* under the License. *
****************************************************************/
-package org.apache.james.api.dnsservice.util;
+package org.apache.james.dnsservice.impl.util;
import java.net.InetAddress;
import java.util.Collection;
import java.util.ArrayList;
import java.util.Iterator;
-import org.apache.james.api.dnsservice.DNSService;
+import org.apache.james.dnsservice.DNSService;
/**
* Class which can be used to check if an ipAddress match a network
Modified: james/server/trunk/dnsserver/src/test/java/org/apache/james/api/dnsservice/AbstractDNSServer.java
URL: http://svn.apache.org/viewvc/james/server/trunk/dnsserver/src/test/java/org/apache/james/api/dnsservice/AbstractDNSServer.java?rev=953757&r1=953756&r2=953757&view=diff
==============================================================================
--- james/server/trunk/dnsserver/src/test/java/org/apache/james/api/dnsservice/AbstractDNSServer.java (original)
+++ james/server/trunk/dnsserver/src/test/java/org/apache/james/api/dnsservice/AbstractDNSServer.java Fri Jun 11 16:30:04 2010
@@ -27,6 +27,7 @@ import java.net.UnknownHostException;
import java.util.Collection;
import java.util.Iterator;
+import org.apache.james.dnsservice.DNSService;
import org.apache.mailet.HostAddress;
/**
@@ -35,49 +36,49 @@ import org.apache.mailet.HostAddress;
public class AbstractDNSServer implements DNSService {
/**
- * @see org.apache.james.api.dnsservice.DNSService#findMXRecords(String)
+ * @see org.apache.james.dnsservice.DNSService#findMXRecords(String)
*/
public Collection<String> findMXRecords(String hostname) {
throw new UnsupportedOperationException("Unimplemented Stub Method");
}
/**
- * @see org.apache.james.api.dnsservice.DNSService#findTXTRecords(String)
+ * @see org.apache.james.dnsservice.DNSService#findTXTRecords(String)
*/
public Collection<String> findTXTRecords(String hostname) {
throw new UnsupportedOperationException("Unimplemented Stub Method");
}
/**
- * @see org.apache.james.api.dnsservice.DNSService#getAllByName(String)
+ * @see org.apache.james.dnsservice.DNSService#getAllByName(String)
*/
public InetAddress[] getAllByName(String host) throws UnknownHostException {
throw new UnsupportedOperationException("Unimplemented Stub Method");
}
/**
- * @see org.apache.james.api.dnsservice.DNSService#getByName(String)
+ * @see org.apache.james.dnsservice.DNSService#getByName(String)
*/
public InetAddress getByName(String host) throws UnknownHostException {
throw new UnsupportedOperationException("Unimplemented Stub Method");
}
/**
- * @see org.apache.james.api.dnsservice.DNSService#getSMTPHostAddresses(String)
+ * @see org.apache.james.dnsservice.DNSService#getSMTPHostAddresses(String)
*/
public Iterator<HostAddress> getSMTPHostAddresses(String domainName) {
throw new UnsupportedOperationException("Unimplemented Stub Method");
}
/**
- * @see org.apache.james.api.dnsservice.DNSService#getHostName(java.net.InetAddress)
+ * @see org.apache.james.dnsservice.DNSService#getHostName(java.net.InetAddress)
*/
public String getHostName(InetAddress addr) {
throw new UnsupportedOperationException("Unimplemented Stub Method");
}
/**
- * @see org.apache.james.api.dnsservice.DNSService#getLocalHost()
+ * @see org.apache.james.dnsservice.DNSService#getLocalHost()
*/
public InetAddress getLocalHost() throws UnknownHostException {
throw new UnsupportedOperationException("Unimplemented Stub Method");
Modified: james/server/trunk/fetchmail/src/main/java/org/apache/james/fetchmail/FetchMail.java
URL: http://svn.apache.org/viewvc/james/server/trunk/fetchmail/src/main/java/org/apache/james/fetchmail/FetchMail.java?rev=953757&r1=953756&r2=953757&view=diff
==============================================================================
--- james/server/trunk/fetchmail/src/main/java/org/apache/james/fetchmail/FetchMail.java (original)
+++ james/server/trunk/fetchmail/src/main/java/org/apache/james/fetchmail/FetchMail.java Fri Jun 11 16:30:04 2010
@@ -37,8 +37,8 @@ import javax.mail.Session;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.HierarchicalConfiguration;
import org.apache.commons.logging.Log;
-import org.apache.james.api.dnsservice.DNSService;
import org.apache.james.api.user.UsersRepository;
+import org.apache.james.dnsservice.DNSService;
import org.apache.james.lifecycle.Configurable;
import org.apache.james.lifecycle.LogEnabled;
import org.apache.james.services.MailServer;
Modified: james/server/trunk/fetchmail/src/main/java/org/apache/james/fetchmail/FetchScheduler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/fetchmail/src/main/java/org/apache/james/fetchmail/FetchScheduler.java?rev=953757&r1=953756&r2=953757&view=diff
==============================================================================
--- james/server/trunk/fetchmail/src/main/java/org/apache/james/fetchmail/FetchScheduler.java (original)
+++ james/server/trunk/fetchmail/src/main/java/org/apache/james/fetchmail/FetchScheduler.java Fri Jun 11 16:30:04 2010
@@ -35,8 +35,8 @@ import javax.annotation.Resource;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.HierarchicalConfiguration;
import org.apache.commons.logging.Log;
-import org.apache.james.api.dnsservice.DNSService;
import org.apache.james.api.user.UsersRepository;
+import org.apache.james.dnsservice.DNSService;
import org.apache.james.lifecycle.Configurable;
import org.apache.james.lifecycle.LogEnabled;
import org.apache.james.services.MailServer;
Modified: james/server/trunk/fetchmail/src/main/java/org/apache/james/fetchmail/ParsedConfiguration.java
URL: http://svn.apache.org/viewvc/james/server/trunk/fetchmail/src/main/java/org/apache/james/fetchmail/ParsedConfiguration.java?rev=953757&r1=953756&r2=953757&view=diff
==============================================================================
--- james/server/trunk/fetchmail/src/main/java/org/apache/james/fetchmail/ParsedConfiguration.java (original)
+++ james/server/trunk/fetchmail/src/main/java/org/apache/james/fetchmail/ParsedConfiguration.java Fri Jun 11 16:30:04 2010
@@ -31,8 +31,8 @@ import javax.mail.internet.ParseExceptio
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.HierarchicalConfiguration;
import org.apache.commons.logging.Log;
-import org.apache.james.api.dnsservice.DNSService;
import org.apache.james.api.user.UsersRepository;
+import org.apache.james.dnsservice.DNSService;
import org.apache.james.services.MailServer;
import org.apache.mailet.MailAddress;
Modified: james/server/trunk/fetchmail/src/main/java/org/apache/james/fetchmail/ProcessorAbstract.java
URL: http://svn.apache.org/viewvc/james/server/trunk/fetchmail/src/main/java/org/apache/james/fetchmail/ProcessorAbstract.java?rev=953757&r1=953756&r2=953757&view=diff
==============================================================================
--- james/server/trunk/fetchmail/src/main/java/org/apache/james/fetchmail/ProcessorAbstract.java (original)
+++ james/server/trunk/fetchmail/src/main/java/org/apache/james/fetchmail/ProcessorAbstract.java Fri Jun 11 16:30:04 2010
@@ -28,8 +28,8 @@ import javax.mail.MessagingException;
import javax.mail.Session;
import org.apache.commons.logging.Log;
-import org.apache.james.api.dnsservice.DNSService;
import org.apache.james.api.user.UsersRepository;
+import org.apache.james.dnsservice.DNSService;
import org.apache.james.services.MailServer;
import org.apache.mailet.MailAddress;
Modified: james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/AbstractRedirect.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/AbstractRedirect.java?rev=953757&r1=953756&r2=953757&view=diff
==============================================================================
--- james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/AbstractRedirect.java (original)
+++ james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/AbstractRedirect.java Fri Jun 11 16:30:04 2010
@@ -46,9 +46,9 @@ import javax.mail.internet.MimeMultipart
import org.apache.mailet.base.RFC2822Headers;
import org.apache.mailet.base.RFC822DateFormat;
-import org.apache.james.api.dnsservice.DNSService;
import org.apache.james.core.MailImpl;
import org.apache.james.core.MimeMessageUtil;
+import org.apache.james.dnsservice.DNSService;
import org.apache.james.services.MailServer;
import org.apache.mailet.base.GenericMailet;
Modified: james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/AbstractVirtualUserTable.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/AbstractVirtualUserTable.java?rev=953757&r1=953756&r2=953757&view=diff
==============================================================================
--- james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/AbstractVirtualUserTable.java (original)
+++ james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/AbstractVirtualUserTable.java Fri Jun 11 16:30:04 2010
@@ -34,8 +34,8 @@ import javax.annotation.Resource;
import javax.mail.MessagingException;
import javax.mail.internet.ParseException;
-import org.apache.james.api.dnsservice.DNSService;
import org.apache.james.core.MailImpl;
+import org.apache.james.dnsservice.DNSService;
import org.apache.james.impl.vut.VirtualUserTableUtil;
import org.apache.james.services.MailServer;
import org.apache.mailet.Mail;
Modified: james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/AbstractNetworkMatcher.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/AbstractNetworkMatcher.java?rev=953757&r1=953756&r2=953757&view=diff
==============================================================================
--- james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/AbstractNetworkMatcher.java (original)
+++ james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/AbstractNetworkMatcher.java Fri Jun 11 16:30:04 2010
@@ -21,8 +21,8 @@
package org.apache.james.transport.matchers;
-import org.apache.james.api.dnsservice.DNSService;
-import org.apache.james.api.dnsservice.util.NetMatcher;
+import org.apache.james.dnsservice.DNSService;
+import org.apache.james.dnsservice.impl.util.NetMatcher;
import javax.annotation.Resource;
import javax.mail.MessagingException;
Modified: james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/InSpammerBlacklist.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/InSpammerBlacklist.java?rev=953757&r1=953756&r2=953757&view=diff
==============================================================================
--- james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/InSpammerBlacklist.java (original)
+++ james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/InSpammerBlacklist.java Fri Jun 11 16:30:04 2010
@@ -28,7 +28,7 @@ import java.util.StringTokenizer;
import javax.annotation.Resource;
import javax.mail.MessagingException;
-import org.apache.james.api.dnsservice.DNSService;
+import org.apache.james.dnsservice.DNSService;
import org.apache.mailet.base.GenericMatcher;
import org.apache.mailet.Mail;
import org.apache.mailet.MailAddress;
Modified: james/server/trunk/mailets/src/test/java/org/apache/james/transport/matchers/AbstractRemoteAddrInNetworkTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets/src/test/java/org/apache/james/transport/matchers/AbstractRemoteAddrInNetworkTest.java?rev=953757&r1=953756&r2=953757&view=diff
==============================================================================
--- james/server/trunk/mailets/src/test/java/org/apache/james/transport/matchers/AbstractRemoteAddrInNetworkTest.java (original)
+++ james/server/trunk/mailets/src/test/java/org/apache/james/transport/matchers/AbstractRemoteAddrInNetworkTest.java Fri Jun 11 16:30:04 2010
@@ -37,7 +37,7 @@ import javax.mail.internet.ParseExceptio
import junit.framework.TestCase;
import org.apache.james.api.dnsservice.AbstractDNSServer;
-import org.apache.james.api.dnsservice.DNSService;
+import org.apache.james.dnsservice.DNSService;
import org.apache.mailet.base.test.FakeMailContext;
import org.apache.mailet.base.test.FakeMatcherConfig;
import org.apache.mailet.Mail;
Modified: james/server/trunk/mailets/src/test/java/org/apache/james/transport/matchers/InSpammerBlacklistTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets/src/test/java/org/apache/james/transport/matchers/InSpammerBlacklistTest.java?rev=953757&r1=953756&r2=953757&view=diff
==============================================================================
--- james/server/trunk/mailets/src/test/java/org/apache/james/transport/matchers/InSpammerBlacklistTest.java (original)
+++ james/server/trunk/mailets/src/test/java/org/apache/james/transport/matchers/InSpammerBlacklistTest.java Fri Jun 11 16:30:04 2010
@@ -21,7 +21,7 @@
package org.apache.james.transport.matchers;
import org.apache.james.api.dnsservice.AbstractDNSServer;
-import org.apache.james.api.dnsservice.DNSService;
+import org.apache.james.dnsservice.DNSService;
import org.apache.mailet.base.test.FakeMail;
import org.apache.mailet.base.test.FakeMailContext;
import org.apache.mailet.base.test.FakeMatcherConfig;
Modified: james/server/trunk/netty-socket/src/main/java/org/apache/james/socket/netty/AbstractConfigurableAsyncServer.java
URL: http://svn.apache.org/viewvc/james/server/trunk/netty-socket/src/main/java/org/apache/james/socket/netty/AbstractConfigurableAsyncServer.java?rev=953757&r1=953756&r2=953757&view=diff
==============================================================================
--- james/server/trunk/netty-socket/src/main/java/org/apache/james/socket/netty/AbstractConfigurableAsyncServer.java (original)
+++ james/server/trunk/netty-socket/src/main/java/org/apache/james/socket/netty/AbstractConfigurableAsyncServer.java Fri Jun 11 16:30:04 2010
@@ -33,7 +33,7 @@ import org.apache.commons.configuration.
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.HierarchicalConfiguration;
import org.apache.commons.logging.Log;
-import org.apache.james.api.dnsservice.DNSService;
+import org.apache.james.dnsservice.DNSService;
import org.apache.james.lifecycle.Configurable;
import org.apache.james.lifecycle.LogEnabled;
import org.apache.james.protocols.impl.AbstractAsyncServer;
Modified: james/server/trunk/pop3server/src/test/java/org/apache/james/pop3server/AbstractAsyncPOP3ServerTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/test/java/org/apache/james/pop3server/AbstractAsyncPOP3ServerTest.java?rev=953757&r1=953756&r2=953757&view=diff
==============================================================================
--- james/server/trunk/pop3server/src/test/java/org/apache/james/pop3server/AbstractAsyncPOP3ServerTest.java (original)
+++ james/server/trunk/pop3server/src/test/java/org/apache/james/pop3server/AbstractAsyncPOP3ServerTest.java Fri Jun 11 16:30:04 2010
@@ -37,9 +37,9 @@ import org.apache.commons.net.pop3.POP3C
import org.apache.commons.net.pop3.POP3MessageInfo;
import org.apache.commons.net.pop3.POP3Reply;
import org.apache.james.api.dnsservice.AbstractDNSServer;
-import org.apache.james.api.dnsservice.DNSService;
import org.apache.james.api.kernel.mock.FakeLoader;
import org.apache.james.api.user.UsersRepository;
+import org.apache.james.dnsservice.DNSService;
import org.apache.james.imap.inmemory.InMemoryMailboxManager;
import org.apache.james.imap.inmemory.InMemoryMailboxSessionMapperFactory;
import org.apache.james.imap.inmemory.InMemorySubscriptionManager;
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=953757&r1=953756&r2=953757&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 Fri Jun 11 16:30:04 2010
@@ -37,7 +37,6 @@ import junit.framework.TestCase;
import org.apache.commons.logging.impl.SimpleLog;
import org.apache.commons.net.telnet.TelnetClient;
import org.apache.james.api.dnsservice.AbstractDNSServer;
-import org.apache.james.api.dnsservice.DNSService;
import org.apache.james.api.domainlist.ManageableDomainList;
import org.apache.james.api.domainlist.SimpleDomainList;
import org.apache.james.api.kernel.mock.FakeLoader;
@@ -45,6 +44,7 @@ import org.apache.james.api.user.UsersRe
import org.apache.james.api.user.UsersStore;
import org.apache.james.api.vut.management.MockVirtualUserTableManagementService;
import org.apache.james.api.vut.management.VirtualUserTableManagementService;
+import org.apache.james.dnsservice.DNSService;
import org.apache.james.lifecycle.LifecycleUtil;
import org.apache.james.management.BayesianAnalyzerManagementException;
import org.apache.james.management.BayesianAnalyzerManagementService;
Modified: james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/SMTPServerDNSServiceAdapter.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/SMTPServerDNSServiceAdapter.java?rev=953757&r1=953756&r2=953757&view=diff
==============================================================================
--- james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/SMTPServerDNSServiceAdapter.java (original)
+++ james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/SMTPServerDNSServiceAdapter.java Fri Jun 11 16:30:04 2010
@@ -29,10 +29,10 @@ import org.apache.mailet.HostAddress;
public class SMTPServerDNSServiceAdapter implements DNSService{
- private org.apache.james.api.dnsservice.DNSService dns;
+ private org.apache.james.dnsservice.DNSService dns;
- public SMTPServerDNSServiceAdapter(org.apache.james.api.dnsservice.DNSService dns) {
+ public SMTPServerDNSServiceAdapter(org.apache.james.dnsservice.DNSService dns) {
this.dns = dns;
}
@@ -42,7 +42,7 @@ public class SMTPServerDNSServiceAdapter
public Collection<String> findMXRecords(String hostname) throws TemporaryResolutionException {
try {
return dns.findMXRecords(hostname);
- } catch (org.apache.james.api.dnsservice.TemporaryResolutionException e) {
+ } catch (org.apache.james.dnsservice.TemporaryResolutionException e) {
throw new TemporaryResolutionException(e.getMessage());
}
}
@@ -88,7 +88,7 @@ public class SMTPServerDNSServiceAdapter
public Iterator<HostAddress> getSMTPHostAddresses(String domainName) throws TemporaryResolutionException {
try {
return dns.getSMTPHostAddresses(domainName);
- } catch (org.apache.james.api.dnsservice.TemporaryResolutionException e) {
+ } catch (org.apache.james.dnsservice.TemporaryResolutionException e) {
throw new TemporaryResolutionException(e.getMessage());
}
}
Modified: james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/DNSRBLHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/DNSRBLHandler.java?rev=953757&r1=953756&r2=953757&view=diff
==============================================================================
--- james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/DNSRBLHandler.java (original)
+++ james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/DNSRBLHandler.java Fri Jun 11 16:30:04 2010
@@ -27,7 +27,7 @@ import javax.annotation.Resource;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.HierarchicalConfiguration;
-import org.apache.james.api.dnsservice.DNSService;
+import org.apache.james.dnsservice.DNSService;
import org.apache.james.lifecycle.Configurable;
import org.apache.james.smtpserver.SMTPServerDNSServiceAdapter;
Modified: james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/JDBCGreylistHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/JDBCGreylistHandler.java?rev=953757&r1=953756&r2=953757&view=diff
==============================================================================
--- james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/JDBCGreylistHandler.java (original)
+++ james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/JDBCGreylistHandler.java Fri Jun 11 16:30:04 2010
@@ -40,8 +40,8 @@ import org.apache.commons.configuration.
import org.apache.commons.configuration.HierarchicalConfiguration;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.james.api.dnsservice.DNSService;
-import org.apache.james.api.dnsservice.util.NetMatcher;
+import org.apache.james.dnsservice.DNSService;
+import org.apache.james.dnsservice.impl.util.NetMatcher;
import org.apache.james.lifecycle.Configurable;
import org.apache.james.lifecycle.LogEnabled;
import org.apache.james.protocols.smtp.SMTPSession;
Modified: james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/ResolvableEhloHeloHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/ResolvableEhloHeloHandler.java?rev=953757&r1=953756&r2=953757&view=diff
==============================================================================
--- james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/ResolvableEhloHeloHandler.java (original)
+++ james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/ResolvableEhloHeloHandler.java Fri Jun 11 16:30:04 2010
@@ -21,7 +21,7 @@ package org.apache.james.smtpserver.fast
import javax.annotation.Resource;
-import org.apache.james.api.dnsservice.DNSService;
+import org.apache.james.dnsservice.DNSService;
import org.apache.james.smtpserver.SMTPServerDNSServiceAdapter;
public class ResolvableEhloHeloHandler extends org.apache.james.protocols.smtp.core.fastfail.ResolvableEhloHeloHandler {
Modified: james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/ReverseEqualsEhloHeloHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/ReverseEqualsEhloHeloHandler.java?rev=953757&r1=953756&r2=953757&view=diff
==============================================================================
--- james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/ReverseEqualsEhloHeloHandler.java (original)
+++ james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/ReverseEqualsEhloHeloHandler.java Fri Jun 11 16:30:04 2010
@@ -21,7 +21,7 @@ package org.apache.james.smtpserver.fast
import javax.annotation.Resource;
-import org.apache.james.api.dnsservice.DNSService;
+import org.apache.james.dnsservice.DNSService;
import org.apache.james.smtpserver.SMTPServerDNSServiceAdapter;
public class ReverseEqualsEhloHeloHandler extends org.apache.james.protocols.smtp.core.fastfail.ReverseEqualsEhloHeloHandler{
Modified: james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/URIRBLHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/URIRBLHandler.java?rev=953757&r1=953756&r2=953757&view=diff
==============================================================================
--- james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/URIRBLHandler.java (original)
+++ james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/URIRBLHandler.java Fri Jun 11 16:30:04 2010
@@ -40,7 +40,7 @@ import org.apache.commons.configuration.
import org.apache.commons.configuration.HierarchicalConfiguration;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.james.api.dnsservice.DNSService;
+import org.apache.james.dnsservice.DNSService;
import org.apache.james.lifecycle.Configurable;
import org.apache.james.lifecycle.LogEnabled;
import org.apache.james.protocols.smtp.SMTPSession;
Modified: james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptMX.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptMX.java?rev=953757&r1=953756&r2=953757&view=diff
==============================================================================
--- james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptMX.java (original)
+++ james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptMX.java Fri Jun 11 16:30:04 2010
@@ -31,9 +31,9 @@ import org.apache.commons.configuration.
import org.apache.commons.configuration.HierarchicalConfiguration;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.james.api.dnsservice.DNSService;
-import org.apache.james.api.dnsservice.TemporaryResolutionException;
-import org.apache.james.api.dnsservice.util.NetMatcher;
+import org.apache.james.dnsservice.DNSService;
+import org.apache.james.dnsservice.TemporaryResolutionException;
+import org.apache.james.dnsservice.impl.util.NetMatcher;
import org.apache.james.lifecycle.Configurable;
import org.apache.james.lifecycle.LogEnabled;
import org.apache.james.protocols.smtp.SMTPRetCode;
Modified: james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/ValidSenderDomainHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/ValidSenderDomainHandler.java?rev=953757&r1=953756&r2=953757&view=diff
==============================================================================
--- james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/ValidSenderDomainHandler.java (original)
+++ james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/ValidSenderDomainHandler.java Fri Jun 11 16:30:04 2010
@@ -22,7 +22,7 @@ package org.apache.james.smtpserver.fast
import javax.annotation.Resource;
-import org.apache.james.api.dnsservice.DNSService;
+import org.apache.james.dnsservice.DNSService;
import org.apache.james.smtpserver.SMTPServerDNSServiceAdapter;
public class ValidSenderDomainHandler extends org.apache.james.protocols.smtp.core.fastfail.ValidSenderDomainHandler{
Modified: james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/netty/NioSMTPServer.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/netty/NioSMTPServer.java?rev=953757&r1=953756&r2=953757&view=diff
==============================================================================
--- james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/netty/NioSMTPServer.java (original)
+++ james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/netty/NioSMTPServer.java Fri Jun 11 16:30:04 2010
@@ -22,7 +22,7 @@ import javax.net.ssl.SSLContext;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.HierarchicalConfiguration;
-import org.apache.james.api.dnsservice.util.NetMatcher;
+import org.apache.james.dnsservice.impl.util.NetMatcher;
import org.apache.james.protocols.api.ProtocolHandlerChain;
import org.apache.james.protocols.impl.AbstractSSLAwareChannelPipelineFactory;
import org.apache.james.protocols.smtp.SMTPConfiguration;
Modified: james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/AbstractSMTPServerTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/AbstractSMTPServerTest.java?rev=953757&r1=953756&r2=953757&view=diff
==============================================================================
--- james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/AbstractSMTPServerTest.java (original)
+++ james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/AbstractSMTPServerTest.java Fri Jun 11 16:30:04 2010
@@ -41,10 +41,10 @@ import junit.framework.TestCase;
import org.apache.commons.logging.impl.SimpleLog;
import org.apache.commons.net.smtp.SMTPClient;
import org.apache.commons.net.smtp.SMTPReply;
-import org.apache.james.api.dnsservice.DNSService;
import org.apache.james.api.kernel.mock.FakeLoader;
import org.apache.james.api.user.UsersRepository;
import org.apache.james.api.vut.VirtualUserTableStore;
+import org.apache.james.dnsservice.DNSService;
import org.apache.james.lifecycle.LifecycleUtil;
import org.apache.james.services.FileSystem;
import org.apache.james.services.MailServer;
Modified: james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/URIRBLHandlerTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/URIRBLHandlerTest.java?rev=953757&r1=953756&r2=953757&view=diff
==============================================================================
--- james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/URIRBLHandlerTest.java (original)
+++ james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/URIRBLHandlerTest.java Fri Jun 11 16:30:04 2010
@@ -39,7 +39,7 @@ import javax.mail.internet.MimeMultipart
import junit.framework.TestCase;
import org.apache.james.api.dnsservice.AbstractDNSServer;
-import org.apache.james.api.dnsservice.DNSService;
+import org.apache.james.dnsservice.DNSService;
import org.apache.james.protocols.smtp.BaseFakeSMTPSession;
import org.apache.james.protocols.smtp.SMTPSession;
import org.apache.james.protocols.smtp.hook.HookResult;
Modified: james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/ValidRcptMXTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/ValidRcptMXTest.java?rev=953757&r1=953756&r2=953757&view=diff
==============================================================================
--- james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/ValidRcptMXTest.java (original)
+++ james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/ValidRcptMXTest.java Fri Jun 11 16:30:04 2010
@@ -29,7 +29,7 @@ import java.util.Map;
import javax.mail.internet.ParseException;
import org.apache.james.api.dnsservice.AbstractDNSServer;
-import org.apache.james.api.dnsservice.DNSService;
+import org.apache.james.dnsservice.DNSService;
import org.apache.james.protocols.smtp.BaseFakeSMTPSession;
import org.apache.james.protocols.smtp.SMTPSession;
import org.apache.james.protocols.smtp.hook.HookReturnCode;
Modified: james/server/trunk/spoolmanager/src/main/java/org/apache/james/AbstractMailServer.java
URL: http://svn.apache.org/viewvc/james/server/trunk/spoolmanager/src/main/java/org/apache/james/AbstractMailServer.java?rev=953757&r1=953756&r2=953757&view=diff
==============================================================================
--- james/server/trunk/spoolmanager/src/main/java/org/apache/james/AbstractMailServer.java (original)
+++ james/server/trunk/spoolmanager/src/main/java/org/apache/james/AbstractMailServer.java Fri Jun 11 16:30:04 2010
@@ -49,12 +49,12 @@ import org.apache.camel.builder.RouteBui
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.HierarchicalConfiguration;
import org.apache.commons.logging.Log;
-import org.apache.james.api.dnsservice.DNSService;
import org.apache.james.api.domainlist.DomainList;
import org.apache.james.api.domainlist.ManageableDomainList;
import org.apache.james.api.user.UsersRepository;
import org.apache.james.core.MailHeaders;
import org.apache.james.core.MailImpl;
+import org.apache.james.dnsservice.DNSService;
import org.apache.james.impl.jamesuser.JamesUsersRepository;
import org.apache.james.lifecycle.Configurable;
import org.apache.james.lifecycle.LifecycleUtil;
Modified: james/server/trunk/spoolmanager/src/main/java/org/apache/james/JamesMailetContext.java
URL: http://svn.apache.org/viewvc/james/server/trunk/spoolmanager/src/main/java/org/apache/james/JamesMailetContext.java?rev=953757&r1=953756&r2=953757&view=diff
==============================================================================
--- james/server/trunk/spoolmanager/src/main/java/org/apache/james/JamesMailetContext.java (original)
+++ james/server/trunk/spoolmanager/src/main/java/org/apache/james/JamesMailetContext.java Fri Jun 11 16:30:04 2010
@@ -41,11 +41,11 @@ import javax.mail.internet.ParseExceptio
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.HierarchicalConfiguration;
import org.apache.commons.logging.Log;
-import org.apache.james.api.dnsservice.DNSService;
-import org.apache.james.api.dnsservice.TemporaryResolutionException;
import org.apache.james.api.domainlist.DomainList;
import org.apache.james.api.user.UsersRepository;
import org.apache.james.core.MailImpl;
+import org.apache.james.dnsservice.DNSService;
+import org.apache.james.dnsservice.TemporaryResolutionException;
import org.apache.james.lifecycle.Configurable;
import org.apache.james.lifecycle.LifecycleUtil;
import org.apache.james.lifecycle.LogEnabled;
@@ -301,7 +301,7 @@ public class JamesMailetContext implemen
* sorted by MX priority. If no host is found for domainName, the Iterator
* returned will be empty and the first call to hasNext() will return false.
*
- * @see org.apache.james.api.dnsservice.DNSService#getSMTPHostAddresses(String)
+ * @see org.apache.james.dnsservice.DNSService#getSMTPHostAddresses(String)
* @since Mailet API v2.2.0a16-unstable
* @param domainName
* - the domain for which to find mail servers
Modified: james/server/trunk/spoolmanager/src/main/java/org/apache/james/transport/mailets/AbstractRemoteDelivery.java
URL: http://svn.apache.org/viewvc/james/server/trunk/spoolmanager/src/main/java/org/apache/james/transport/mailets/AbstractRemoteDelivery.java?rev=953757&r1=953756&r2=953757&view=diff
==============================================================================
--- james/server/trunk/spoolmanager/src/main/java/org/apache/james/transport/mailets/AbstractRemoteDelivery.java (original)
+++ james/server/trunk/spoolmanager/src/main/java/org/apache/james/transport/mailets/AbstractRemoteDelivery.java Fri Jun 11 16:30:04 2010
@@ -58,9 +58,9 @@ import org.apache.camel.Message;
import org.apache.camel.Processor;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.james.api.dnsservice.DNSService;
-import org.apache.james.api.dnsservice.TemporaryResolutionException;
import org.apache.james.core.MailImpl;
+import org.apache.james.dnsservice.DNSService;
+import org.apache.james.dnsservice.TemporaryResolutionException;
import org.apache.james.services.MailServer;
import org.apache.james.transport.camel.DisposeProcessor;
import org.apache.james.transport.camel.JamesCamelConstants;
Modified: james/server/trunk/spoolmanager/src/test/java/org/apache/james/transport/remotedeliverytester/RemoteDeliveryTestable.java
URL: http://svn.apache.org/viewvc/james/server/trunk/spoolmanager/src/test/java/org/apache/james/transport/remotedeliverytester/RemoteDeliveryTestable.java?rev=953757&r1=953756&r2=953757&view=diff
==============================================================================
--- james/server/trunk/spoolmanager/src/test/java/org/apache/james/transport/remotedeliverytester/RemoteDeliveryTestable.java (original)
+++ james/server/trunk/spoolmanager/src/test/java/org/apache/james/transport/remotedeliverytester/RemoteDeliveryTestable.java Fri Jun 11 16:30:04 2010
@@ -22,7 +22,7 @@ package org.apache.james.transport.remot
import javax.mail.MessagingException;
import org.apache.camel.CamelContextAware;
-import org.apache.james.api.dnsservice.DNSService;
+import org.apache.james.dnsservice.DNSService;
import org.apache.james.services.MailServer;
import org.apache.mailet.Mail;
import org.apache.mailet.MailetConfig;
Modified: james/server/trunk/spoolmanager/src/test/java/org/apache/james/transport/remotedeliverytester/Tester.java
URL: http://svn.apache.org/viewvc/james/server/trunk/spoolmanager/src/test/java/org/apache/james/transport/remotedeliverytester/Tester.java?rev=953757&r1=953756&r2=953757&view=diff
==============================================================================
--- james/server/trunk/spoolmanager/src/test/java/org/apache/james/transport/remotedeliverytester/Tester.java (original)
+++ james/server/trunk/spoolmanager/src/test/java/org/apache/james/transport/remotedeliverytester/Tester.java Fri Jun 11 16:30:04 2010
@@ -20,9 +20,9 @@
package org.apache.james.transport.remotedeliverytester;
import org.apache.camel.CamelContext;
-import org.apache.james.api.dnsservice.DNSService;
-import org.apache.james.api.dnsservice.TemporaryResolutionException;
import org.apache.james.core.MailImpl;
+import org.apache.james.dnsservice.DNSService;
+import org.apache.james.dnsservice.TemporaryResolutionException;
import org.apache.james.services.MailRepository;
import org.apache.james.services.MailServer;
import org.apache.james.services.store.Store;
Modified: james/server/trunk/user-library/src/main/java/org/apache/james/impl/vut/AbstractVirtualUserTable.java
URL: http://svn.apache.org/viewvc/james/server/trunk/user-library/src/main/java/org/apache/james/impl/vut/AbstractVirtualUserTable.java?rev=953757&r1=953756&r2=953757&view=diff
==============================================================================
--- james/server/trunk/user-library/src/main/java/org/apache/james/impl/vut/AbstractVirtualUserTable.java (original)
+++ james/server/trunk/user-library/src/main/java/org/apache/james/impl/vut/AbstractVirtualUserTable.java Fri Jun 11 16:30:04 2010
@@ -37,12 +37,12 @@ import javax.mail.internet.ParseExceptio
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.HierarchicalConfiguration;
import org.apache.commons.logging.Log;
-import org.apache.james.api.dnsservice.DNSService;
import org.apache.james.api.domainlist.DomainList;
import org.apache.james.api.vut.ErrorMappingException;
import org.apache.james.api.vut.VirtualUserTable;
import org.apache.james.api.vut.management.InvalidMappingException;
import org.apache.james.api.vut.management.VirtualUserTableManagement;
+import org.apache.james.dnsservice.DNSService;
import org.apache.james.lifecycle.Configurable;
import org.apache.james.lifecycle.LogEnabled;
import org.apache.mailet.MailAddress;
Modified: james/server/trunk/user-library/src/test/java/org/apache/james/vut/AbstractVirtualUserTableTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/user-library/src/test/java/org/apache/james/vut/AbstractVirtualUserTableTest.java?rev=953757&r1=953756&r2=953757&view=diff
==============================================================================
--- james/server/trunk/user-library/src/test/java/org/apache/james/vut/AbstractVirtualUserTableTest.java (original)
+++ james/server/trunk/user-library/src/test/java/org/apache/james/vut/AbstractVirtualUserTableTest.java Fri Jun 11 16:30:04 2010
@@ -25,11 +25,11 @@ import java.util.Collection;
import java.util.Iterator;
import java.util.Map;
-import org.apache.james.api.dnsservice.DNSService;
-import org.apache.james.api.dnsservice.TemporaryResolutionException;
import org.apache.james.api.vut.ErrorMappingException;
import org.apache.james.api.vut.VirtualUserTable;
import org.apache.james.api.vut.management.InvalidMappingException;
+import org.apache.james.dnsservice.DNSService;
+import org.apache.james.dnsservice.TemporaryResolutionException;
import org.apache.james.impl.vut.AbstractVirtualUserTable;
import org.apache.james.lifecycle.LifecycleUtil;
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org