Author: bago
Date: Mon Jan 10 14:45:32 2011
New Revision: 1057217
URL: http://svn.apache.org/viewvc?rev=1057217&view=rev
Log:
Introducing a dnsservice-library module trying to reduce dependency layers
(JAMES-1181)
Update dependencies to account for package renames
Modified:
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/NetworkIsInWhitelist.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/ValidRcptMX.java
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/netty/SMTPServer.java
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=1057217&r1=1057216&r2=1057217&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
Mon Jan 10 14:45:32 2011
@@ -25,7 +25,7 @@ import javax.annotation.Resource;
import javax.mail.MessagingException;
import org.apache.james.dnsservice.api.DNSService;
-import org.apache.james.util.netmatcher.NetMatcher;
+import org.apache.james.dnsservice.library.netmatcher.NetMatcher;
import org.apache.mailet.base.GenericMatcher;
/**
@@ -40,7 +40,7 @@ import org.apache.mailet.base.GenericMat
* This abstract network matcher needs to be implemented by a concrete
class.<br/>
* The implementing concrete class will call the allowedNetworks or
matchNetwork methods.
*
- * @see org.apache.james.util.netmatcher.NetMatcher
+ * @see org.apache.james.dnsservice.library.netmatcher.NetMatcher
*/
public abstract class AbstractNetworkMatcher extends GenericMatcher {
Modified:
james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/NetworkIsInWhitelist.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/NetworkIsInWhitelist.java?rev=1057217&r1=1057216&r2=1057217&view=diff
==============================================================================
---
james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/NetworkIsInWhitelist.java
(original)
+++
james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/NetworkIsInWhitelist.java
Mon Jan 10 14:45:32 2011
@@ -30,7 +30,7 @@ import javax.annotation.Resource;
import javax.mail.MessagingException;
import org.apache.james.dnsservice.api.DNSService;
-import org.apache.james.util.netmatcher.NetMatcher;
+import org.apache.james.dnsservice.library.netmatcher.NetMatcher;
import org.apache.mailet.Mail;
import org.apache.mailet.MailAddress;
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=1057217&r1=1057216&r2=1057217&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
Mon Jan 10 14:45:32 2011
@@ -42,6 +42,7 @@ import org.apache.commons.configuration.
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.james.dnsservice.api.DNSService;
+import org.apache.james.dnsservice.library.netmatcher.NetMatcher;
import org.apache.james.filesystem.api.FileSystem;
import org.apache.james.lifecycle.api.Configurable;
import org.apache.james.lifecycle.api.LogEnabled;
@@ -50,7 +51,6 @@ import org.apache.james.protocols.smtp.c
import org.apache.james.protocols.smtp.hook.HookResult;
import org.apache.james.protocols.smtp.hook.HookReturnCode;
import org.apache.james.util.TimeConverter;
-import org.apache.james.util.netmatcher.NetMatcher;
import org.apache.james.util.sql.JDBCUtil;
import org.apache.james.util.sql.SqlResources;
import org.apache.mailet.MailAddress;
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=1057217&r1=1057216&r2=1057217&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
Mon Jan 10 14:45:32 2011
@@ -33,6 +33,7 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.james.dnsservice.api.DNSService;
import org.apache.james.dnsservice.api.TemporaryResolutionException;
+import org.apache.james.dnsservice.library.netmatcher.NetMatcher;
import org.apache.james.lifecycle.api.Configurable;
import org.apache.james.lifecycle.api.LogEnabled;
import org.apache.james.protocols.smtp.SMTPRetCode;
@@ -41,7 +42,6 @@ import org.apache.james.protocols.smtp.d
import org.apache.james.protocols.smtp.hook.HookResult;
import org.apache.james.protocols.smtp.hook.HookReturnCode;
import org.apache.james.protocols.smtp.hook.RcptHook;
-import org.apache.james.util.netmatcher.NetMatcher;
import org.apache.mailet.MailAddress;
/**
Modified:
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/netty/SMTPServer.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/netty/SMTPServer.java?rev=1057217&r1=1057216&r2=1057217&view=diff
==============================================================================
---
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/netty/SMTPServer.java
(original)
+++
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/netty/SMTPServer.java
Mon Jan 10 14:45:32 2011
@@ -24,11 +24,11 @@ import javax.net.ssl.SSLContext;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.HierarchicalConfiguration;
+import org.apache.james.dnsservice.library.netmatcher.NetMatcher;
import org.apache.james.protocols.api.ProtocolHandlerChain;
import org.apache.james.protocols.impl.AbstractSSLAwareChannelPipelineFactory;
import org.apache.james.protocols.smtp.SMTPConfiguration;
import org.apache.james.server.netty.AbstractConfigurableAsyncServer;
-import org.apache.james.util.netmatcher.NetMatcher;
import org.jboss.netty.channel.ChannelPipeline;
import org.jboss.netty.channel.ChannelPipelineFactory;
import org.jboss.netty.channel.ChannelUpstreamHandler;
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
