Author: eric
Date: Mon Sep 27 18:20:58 2010
New Revision: 1001853
URL: http://svn.apache.org/viewvc?rev=1001853&view=rev
Log:
Repackage NetMatcher and InetNetwork (JAMES-1050)
Added:
james/server/trunk/common-util/src/main/java/org/apache/james/util/inetnetwork/
james/server/trunk/common-util/src/main/java/org/apache/james/util/inetnetwork/InetNetworkBuilder.java
- copied, changed from r1001729,
james/server/trunk/common-util/src/main/java/org/apache/james/api/dnsservice/util/InetNetworkBuilder.java
james/server/trunk/common-util/src/main/java/org/apache/james/util/inetnetwork/model/
james/server/trunk/common-util/src/main/java/org/apache/james/util/inetnetwork/model/Inet4Network.java
- copied, changed from r1001721,
james/server/trunk/common-util/src/main/java/org/apache/james/api/dnsservice/model/Inet4Network.java
james/server/trunk/common-util/src/main/java/org/apache/james/util/inetnetwork/model/Inet6Network.java
- copied, changed from r1001721,
james/server/trunk/common-util/src/main/java/org/apache/james/api/dnsservice/model/Inet6Network.java
james/server/trunk/common-util/src/main/java/org/apache/james/util/inetnetwork/model/InetNetwork.java
- copied, changed from r1001721,
james/server/trunk/common-util/src/main/java/org/apache/james/api/dnsservice/model/InetNetwork.java
james/server/trunk/common-util/src/main/java/org/apache/james/util/netmatcher/
james/server/trunk/common-util/src/main/java/org/apache/james/util/netmatcher/NetMatcher.java
- copied, changed from r1001729,
james/server/trunk/common-util/src/main/java/org/apache/james/api/dnsservice/util/NetMatcher.java
james/server/trunk/common-util/src/test/java/org/apache/james/util/inetnetwork/
james/server/trunk/common-util/src/test/java/org/apache/james/util/inetnetwork/InetNetworkBuilderTest.java
- copied, changed from r1001729,
james/server/trunk/common-util/src/test/java/org/apache/james/api/dnsservice/util/InetNetworkBuilderTest.java
james/server/trunk/common-util/src/test/java/org/apache/james/util/inetnetwork/model/
james/server/trunk/common-util/src/test/java/org/apache/james/util/inetnetwork/model/InetNetworkTest.java
- copied, changed from r1001721,
james/server/trunk/common-util/src/test/java/org/apache/james/api/dnsservice/model/InetNetworkTest.java
james/server/trunk/common-util/src/test/java/org/apache/james/util/netmatcher/
james/server/trunk/common-util/src/test/java/org/apache/james/util/netmatcher/NetMatcherTest.java
- copied, changed from r1001729,
james/server/trunk/common-util/src/test/java/org/apache/james/api/dnsservice/util/NetMatcherTest.java
Removed:
james/server/trunk/common-util/src/main/java/org/apache/james/api/
james/server/trunk/common-util/src/test/java/org/apache/james/api/
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/NioSMTPServer.java
Copied:
james/server/trunk/common-util/src/main/java/org/apache/james/util/inetnetwork/InetNetworkBuilder.java
(from r1001729,
james/server/trunk/common-util/src/main/java/org/apache/james/api/dnsservice/util/InetNetworkBuilder.java)
URL:
http://svn.apache.org/viewvc/james/server/trunk/common-util/src/main/java/org/apache/james/util/inetnetwork/InetNetworkBuilder.java?p2=james/server/trunk/common-util/src/main/java/org/apache/james/util/inetnetwork/InetNetworkBuilder.java&p1=james/server/trunk/common-util/src/main/java/org/apache/james/api/dnsservice/util/InetNetworkBuilder.java&r1=1001729&r2=1001853&rev=1001853&view=diff
==============================================================================
---
james/server/trunk/common-util/src/main/java/org/apache/james/api/dnsservice/util/InetNetworkBuilder.java
(original)
+++
james/server/trunk/common-util/src/main/java/org/apache/james/util/inetnetwork/InetNetworkBuilder.java
Mon Sep 27 18:20:58 2010
@@ -16,14 +16,14 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.api.dnsservice.util;
+package org.apache.james.util.inetnetwork;
import java.net.UnknownHostException;
-import org.apache.james.api.dnsservice.model.Inet4Network;
-import org.apache.james.api.dnsservice.model.Inet6Network;
-import org.apache.james.api.dnsservice.model.InetNetwork;
import org.apache.james.dnsservice.api.DNSService;
+import org.apache.james.util.inetnetwork.model.Inet4Network;
+import org.apache.james.util.inetnetwork.model.Inet6Network;
+import org.apache.james.util.inetnetwork.model.InetNetwork;
/**
* Builds a InetNetwork (Inet4Network or Inet6Network) in function
Copied:
james/server/trunk/common-util/src/main/java/org/apache/james/util/inetnetwork/model/Inet4Network.java
(from r1001721,
james/server/trunk/common-util/src/main/java/org/apache/james/api/dnsservice/model/Inet4Network.java)
URL:
http://svn.apache.org/viewvc/james/server/trunk/common-util/src/main/java/org/apache/james/util/inetnetwork/model/Inet4Network.java?p2=james/server/trunk/common-util/src/main/java/org/apache/james/util/inetnetwork/model/Inet4Network.java&p1=james/server/trunk/common-util/src/main/java/org/apache/james/api/dnsservice/model/Inet4Network.java&r1=1001721&r2=1001853&rev=1001853&view=diff
==============================================================================
---
james/server/trunk/common-util/src/main/java/org/apache/james/api/dnsservice/model/Inet4Network.java
(original)
+++
james/server/trunk/common-util/src/main/java/org/apache/james/util/inetnetwork/model/Inet4Network.java
Mon Sep 27 18:20:58 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.api.dnsservice.model;
+package org.apache.james.util.inetnetwork.model;
import java.net.Inet4Address;
import java.net.InetAddress;
Copied:
james/server/trunk/common-util/src/main/java/org/apache/james/util/inetnetwork/model/Inet6Network.java
(from r1001721,
james/server/trunk/common-util/src/main/java/org/apache/james/api/dnsservice/model/Inet6Network.java)
URL:
http://svn.apache.org/viewvc/james/server/trunk/common-util/src/main/java/org/apache/james/util/inetnetwork/model/Inet6Network.java?p2=james/server/trunk/common-util/src/main/java/org/apache/james/util/inetnetwork/model/Inet6Network.java&p1=james/server/trunk/common-util/src/main/java/org/apache/james/api/dnsservice/model/Inet6Network.java&r1=1001721&r2=1001853&rev=1001853&view=diff
==============================================================================
---
james/server/trunk/common-util/src/main/java/org/apache/james/api/dnsservice/model/Inet6Network.java
(original)
+++
james/server/trunk/common-util/src/main/java/org/apache/james/util/inetnetwork/model/Inet6Network.java
Mon Sep 27 18:20:58 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.api.dnsservice.model;
+package org.apache.james.util.inetnetwork.model;
import java.net.Inet6Address;
import java.net.InetAddress;
Copied:
james/server/trunk/common-util/src/main/java/org/apache/james/util/inetnetwork/model/InetNetwork.java
(from r1001721,
james/server/trunk/common-util/src/main/java/org/apache/james/api/dnsservice/model/InetNetwork.java)
URL:
http://svn.apache.org/viewvc/james/server/trunk/common-util/src/main/java/org/apache/james/util/inetnetwork/model/InetNetwork.java?p2=james/server/trunk/common-util/src/main/java/org/apache/james/util/inetnetwork/model/InetNetwork.java&p1=james/server/trunk/common-util/src/main/java/org/apache/james/api/dnsservice/model/InetNetwork.java&r1=1001721&r2=1001853&rev=1001853&view=diff
==============================================================================
---
james/server/trunk/common-util/src/main/java/org/apache/james/api/dnsservice/model/InetNetwork.java
(original)
+++
james/server/trunk/common-util/src/main/java/org/apache/james/util/inetnetwork/model/InetNetwork.java
Mon Sep 27 18:20:58 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.api.dnsservice.model;
+package org.apache.james.util.inetnetwork.model;
import java.net.InetAddress;
Copied:
james/server/trunk/common-util/src/main/java/org/apache/james/util/netmatcher/NetMatcher.java
(from r1001729,
james/server/trunk/common-util/src/main/java/org/apache/james/api/dnsservice/util/NetMatcher.java)
URL:
http://svn.apache.org/viewvc/james/server/trunk/common-util/src/main/java/org/apache/james/util/netmatcher/NetMatcher.java?p2=james/server/trunk/common-util/src/main/java/org/apache/james/util/netmatcher/NetMatcher.java&p1=james/server/trunk/common-util/src/main/java/org/apache/james/api/dnsservice/util/NetMatcher.java&r1=1001729&r2=1001853&rev=1001853&view=diff
==============================================================================
---
james/server/trunk/common-util/src/main/java/org/apache/james/api/dnsservice/util/NetMatcher.java
(original)
+++
james/server/trunk/common-util/src/main/java/org/apache/james/util/netmatcher/NetMatcher.java
Mon Sep 27 18:20:58 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.api.dnsservice.util;
+package org.apache.james.util.netmatcher;
import java.net.InetAddress;
import java.net.UnknownHostException;
@@ -25,8 +25,9 @@ import java.util.HashSet;
import java.util.Iterator;
import java.util.Set;
-import org.apache.james.api.dnsservice.model.InetNetwork;
import org.apache.james.dnsservice.api.DNSService;
+import org.apache.james.util.inetnetwork.InetNetworkBuilder;
+import org.apache.james.util.inetnetwork.model.InetNetwork;
/**
* NetMatcher Class is used to check if an ipAddress match a network.
Copied:
james/server/trunk/common-util/src/test/java/org/apache/james/util/inetnetwork/InetNetworkBuilderTest.java
(from r1001729,
james/server/trunk/common-util/src/test/java/org/apache/james/api/dnsservice/util/InetNetworkBuilderTest.java)
URL:
http://svn.apache.org/viewvc/james/server/trunk/common-util/src/test/java/org/apache/james/util/inetnetwork/InetNetworkBuilderTest.java?p2=james/server/trunk/common-util/src/test/java/org/apache/james/util/inetnetwork/InetNetworkBuilderTest.java&p1=james/server/trunk/common-util/src/test/java/org/apache/james/api/dnsservice/util/InetNetworkBuilderTest.java&r1=1001729&r2=1001853&rev=1001853&view=diff
==============================================================================
---
james/server/trunk/common-util/src/test/java/org/apache/james/api/dnsservice/util/InetNetworkBuilderTest.java
(original)
+++
james/server/trunk/common-util/src/test/java/org/apache/james/util/inetnetwork/InetNetworkBuilderTest.java
Mon Sep 27 18:20:58 2010
@@ -16,14 +16,15 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.api.dnsservice.util;
+package org.apache.james.util.inetnetwork;
import java.net.UnknownHostException;
import junit.framework.TestCase;
-import org.apache.james.api.dnsservice.model.InetNetwork;
import org.apache.james.dnsservice.api.DNSFixture;
+import org.apache.james.util.inetnetwork.InetNetworkBuilder;
+import org.apache.james.util.inetnetwork.model.InetNetwork;
/**
* Test the InetNetworkBuilder.
Copied:
james/server/trunk/common-util/src/test/java/org/apache/james/util/inetnetwork/model/InetNetworkTest.java
(from r1001721,
james/server/trunk/common-util/src/test/java/org/apache/james/api/dnsservice/model/InetNetworkTest.java)
URL:
http://svn.apache.org/viewvc/james/server/trunk/common-util/src/test/java/org/apache/james/util/inetnetwork/model/InetNetworkTest.java?p2=james/server/trunk/common-util/src/test/java/org/apache/james/util/inetnetwork/model/InetNetworkTest.java&p1=james/server/trunk/common-util/src/test/java/org/apache/james/api/dnsservice/model/InetNetworkTest.java&r1=1001721&r2=1001853&rev=1001853&view=diff
==============================================================================
---
james/server/trunk/common-util/src/test/java/org/apache/james/api/dnsservice/model/InetNetworkTest.java
(original)
+++
james/server/trunk/common-util/src/test/java/org/apache/james/util/inetnetwork/model/InetNetworkTest.java
Mon Sep 27 18:20:58 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.api.dnsservice.model;
+package org.apache.james.util.inetnetwork.model;
import java.net.Inet4Address;
import java.net.Inet6Address;
@@ -24,6 +24,9 @@ import java.net.InetAddress;
import java.net.UnknownHostException;
import java.util.StringTokenizer;
+import org.apache.james.util.inetnetwork.model.Inet4Network;
+import org.apache.james.util.inetnetwork.model.Inet6Network;
+
import junit.framework.TestCase;
/**
Copied:
james/server/trunk/common-util/src/test/java/org/apache/james/util/netmatcher/NetMatcherTest.java
(from r1001729,
james/server/trunk/common-util/src/test/java/org/apache/james/api/dnsservice/util/NetMatcherTest.java)
URL:
http://svn.apache.org/viewvc/james/server/trunk/common-util/src/test/java/org/apache/james/util/netmatcher/NetMatcherTest.java?p2=james/server/trunk/common-util/src/test/java/org/apache/james/util/netmatcher/NetMatcherTest.java&p1=james/server/trunk/common-util/src/test/java/org/apache/james/api/dnsservice/util/NetMatcherTest.java&r1=1001729&r2=1001853&rev=1001853&view=diff
==============================================================================
---
james/server/trunk/common-util/src/test/java/org/apache/james/api/dnsservice/util/NetMatcherTest.java
(original)
+++
james/server/trunk/common-util/src/test/java/org/apache/james/util/netmatcher/NetMatcherTest.java
Mon Sep 27 18:20:58 2010
@@ -16,13 +16,14 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.api.dnsservice.util;
+package org.apache.james.util.netmatcher;
import java.net.UnknownHostException;
import junit.framework.TestCase;
import org.apache.james.dnsservice.api.DNSFixture;
+import org.apache.james.util.netmatcher.NetMatcher;
/**
* Test the NetMatcher class with various IPv4 and IPv6 parameters.
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=1001853&r1=1001852&r2=1001853&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 Sep 27 18:20:58 2010
@@ -24,8 +24,8 @@ import java.util.StringTokenizer;
import javax.annotation.Resource;
import javax.mail.MessagingException;
-import org.apache.james.api.dnsservice.util.NetMatcher;
import org.apache.james.dnsservice.api.DNSService;
+import org.apache.james.util.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.api.dnsservice.util.NetMatcher
+ * @see org.apache.james.util.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=1001853&r1=1001852&r2=1001853&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 Sep 27 18:20:58 2010
@@ -29,8 +29,8 @@ import java.util.Locale;
import javax.annotation.Resource;
import javax.mail.MessagingException;
-import org.apache.james.api.dnsservice.util.NetMatcher;
import org.apache.james.dnsservice.api.DNSService;
+import org.apache.james.util.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=1001853&r1=1001852&r2=1001853&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 Sep 27 18:20:58 2010
@@ -41,7 +41,6 @@ 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.util.NetMatcher;
import org.apache.james.dnsservice.api.DNSService;
import org.apache.james.lifecycle.Configurable;
import org.apache.james.lifecycle.LogEnabled;
@@ -52,6 +51,7 @@ import org.apache.james.protocols.smtp.h
import org.apache.james.services.DataSourceSelector;
import org.apache.james.services.FileSystem;
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=1001853&r1=1001852&r2=1001853&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 Sep 27 18:20:58 2010
@@ -31,7 +31,6 @@ 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.util.NetMatcher;
import org.apache.james.dnsservice.api.DNSService;
import org.apache.james.dnsservice.api.TemporaryResolutionException;
import org.apache.james.lifecycle.Configurable;
@@ -42,6 +41,7 @@ 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/NioSMTPServer.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/netty/NioSMTPServer.java?rev=1001853&r1=1001852&r2=1001853&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
Mon Sep 27 18:20:58 2010
@@ -23,13 +23,13 @@ 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.protocols.api.ProtocolHandlerChain;
import org.apache.james.protocols.impl.AbstractSSLAwareChannelPipelineFactory;
import org.apache.james.protocols.smtp.SMTPConfiguration;
import org.apache.james.protocols.smtp.SMTPServerMBean;
import org.apache.james.services.MailServer;
import org.apache.james.socket.netty.AbstractConfigurableAsyncServer;
+import org.apache.james.util.netmatcher.NetMatcher;
import org.jboss.netty.channel.ChannelPipelineFactory;
import org.jboss.netty.channel.ChannelUpstreamHandler;
import org.jboss.netty.channel.group.ChannelGroup;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
