james-server-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From b...@apache.org
Subject svn commit: r574394 - in /james/jspf/trunk/src/main/java/org/apache/james/jspf: core/ terms/ util/
Date Mon, 10 Sep 2007 22:39:10 GMT
Author: bago
Date: Mon Sep 10 15:39:04 2007
New Revision: 574394

URL: http://svn.apache.org/viewvc?rev=574394&view=rev
Log:
Move utils to core package (same afferent/efferent dependencies). 2 classes in a package was
too much fragmentation (all of the code depending on utils also depends on core).

Added:
    james/jspf/trunk/src/main/java/org/apache/james/jspf/core/Inet6Util.java
      - copied, changed from r549905, james/jspf/trunk/src/main/java/org/apache/james/jspf/util/Inet6Util.java
    james/jspf/trunk/src/main/java/org/apache/james/jspf/core/SPFTermsRegexps.java
      - copied, changed from r549905, james/jspf/trunk/src/main/java/org/apache/james/jspf/util/SPFTermsRegexps.java
Removed:
    james/jspf/trunk/src/main/java/org/apache/james/jspf/util/Inet6Util.java
    james/jspf/trunk/src/main/java/org/apache/james/jspf/util/SPFTermsRegexps.java
Modified:
    james/jspf/trunk/src/main/java/org/apache/james/jspf/core/IPAddr.java
    james/jspf/trunk/src/main/java/org/apache/james/jspf/core/MacroExpand.java
    james/jspf/trunk/src/main/java/org/apache/james/jspf/terms/AMechanism.java
    james/jspf/trunk/src/main/java/org/apache/james/jspf/terms/ExistsMechanism.java
    james/jspf/trunk/src/main/java/org/apache/james/jspf/terms/ExpModifier.java
    james/jspf/trunk/src/main/java/org/apache/james/jspf/terms/IP4Mechanism.java
    james/jspf/trunk/src/main/java/org/apache/james/jspf/terms/IP6Mechanism.java
    james/jspf/trunk/src/main/java/org/apache/james/jspf/terms/IncludeMechanism.java
    james/jspf/trunk/src/main/java/org/apache/james/jspf/terms/MXMechanism.java
    james/jspf/trunk/src/main/java/org/apache/james/jspf/terms/PTRMechanism.java
    james/jspf/trunk/src/main/java/org/apache/james/jspf/terms/RedirectModifier.java
    james/jspf/trunk/src/main/java/org/apache/james/jspf/terms/UnknownModifier.java

Modified: james/jspf/trunk/src/main/java/org/apache/james/jspf/core/IPAddr.java
URL: http://svn.apache.org/viewvc/james/jspf/trunk/src/main/java/org/apache/james/jspf/core/IPAddr.java?rev=574394&r1=574393&r2=574394&view=diff
==============================================================================
--- james/jspf/trunk/src/main/java/org/apache/james/jspf/core/IPAddr.java (original)
+++ james/jspf/trunk/src/main/java/org/apache/james/jspf/core/IPAddr.java Mon Sep 10 15:39:04
2007
@@ -22,7 +22,6 @@
 import java.net.UnknownHostException;
 
 import org.apache.james.jspf.exceptions.PermErrorException;
-import org.apache.james.jspf.util.Inet6Util;
 import org.xbill.DNS.Address;
 
 public class IPAddr {

Copied: james/jspf/trunk/src/main/java/org/apache/james/jspf/core/Inet6Util.java (from r549905,
james/jspf/trunk/src/main/java/org/apache/james/jspf/util/Inet6Util.java)
URL: http://svn.apache.org/viewvc/james/jspf/trunk/src/main/java/org/apache/james/jspf/core/Inet6Util.java?p2=james/jspf/trunk/src/main/java/org/apache/james/jspf/core/Inet6Util.java&p1=james/jspf/trunk/src/main/java/org/apache/james/jspf/util/Inet6Util.java&r1=549905&r2=574394&rev=574394&view=diff
==============================================================================
--- james/jspf/trunk/src/main/java/org/apache/james/jspf/util/Inet6Util.java (original)
+++ james/jspf/trunk/src/main/java/org/apache/james/jspf/core/Inet6Util.java Mon Sep 10 15:39:04
2007
@@ -17,7 +17,7 @@
  * under the License.                                           *
  ****************************************************************/
 
-package org.apache.james.jspf.util;
+package org.apache.james.jspf.core;
 
 import java.util.ArrayList;
 import java.util.StringTokenizer;
@@ -30,6 +30,10 @@
  * @see org.apache.harmony.util.Inet6Util
  */
 public class Inet6Util {
+    
+    private Inet6Util() {
+        // make this class a an utility class non-instantiable
+    }
 
     /**
      * Creates an byte[] based on an ipAddressString. No error handling is

Modified: james/jspf/trunk/src/main/java/org/apache/james/jspf/core/MacroExpand.java
URL: http://svn.apache.org/viewvc/james/jspf/trunk/src/main/java/org/apache/james/jspf/core/MacroExpand.java?rev=574394&r1=574393&r2=574394&view=diff
==============================================================================
--- james/jspf/trunk/src/main/java/org/apache/james/jspf/core/MacroExpand.java (original)
+++ james/jspf/trunk/src/main/java/org/apache/james/jspf/core/MacroExpand.java Mon Sep 10
15:39:04 2007
@@ -34,7 +34,6 @@
 import org.apache.james.jspf.exceptions.NoneException;
 import org.apache.james.jspf.exceptions.PermErrorException;
 import org.apache.james.jspf.exceptions.TempErrorException;
-import org.apache.james.jspf.util.SPFTermsRegexps;
 
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;

Copied: james/jspf/trunk/src/main/java/org/apache/james/jspf/core/SPFTermsRegexps.java (from
r549905, james/jspf/trunk/src/main/java/org/apache/james/jspf/util/SPFTermsRegexps.java)
URL: http://svn.apache.org/viewvc/james/jspf/trunk/src/main/java/org/apache/james/jspf/core/SPFTermsRegexps.java?p2=james/jspf/trunk/src/main/java/org/apache/james/jspf/core/SPFTermsRegexps.java&p1=james/jspf/trunk/src/main/java/org/apache/james/jspf/util/SPFTermsRegexps.java&r1=549905&r2=574394&rev=574394&view=diff
==============================================================================
--- james/jspf/trunk/src/main/java/org/apache/james/jspf/util/SPFTermsRegexps.java (original)
+++ james/jspf/trunk/src/main/java/org/apache/james/jspf/core/SPFTermsRegexps.java Mon Sep
10 15:39:04 2007
@@ -17,7 +17,7 @@
  * under the License.                                           *
  ****************************************************************/
 
-package org.apache.james.jspf.util;
+package org.apache.james.jspf.core;
 
 /**
  * This constants are used by Terms to define their matching rules.

Modified: james/jspf/trunk/src/main/java/org/apache/james/jspf/terms/AMechanism.java
URL: http://svn.apache.org/viewvc/james/jspf/trunk/src/main/java/org/apache/james/jspf/terms/AMechanism.java?rev=574394&r1=574393&r2=574394&view=diff
==============================================================================
--- james/jspf/trunk/src/main/java/org/apache/james/jspf/terms/AMechanism.java (original)
+++ james/jspf/trunk/src/main/java/org/apache/james/jspf/terms/AMechanism.java Mon Sep 10
15:39:04 2007
@@ -24,10 +24,12 @@
 import org.apache.james.jspf.core.DNSLookupContinuation;
 import org.apache.james.jspf.core.Directive;
 import org.apache.james.jspf.core.IPAddr;
+import org.apache.james.jspf.core.Inet6Util;
 import org.apache.james.jspf.core.MacroExpand;
 import org.apache.james.jspf.core.SPFChecker;
 import org.apache.james.jspf.core.SPFCheckerDNSResponseListener;
 import org.apache.james.jspf.core.SPFSession;
+import org.apache.james.jspf.core.SPFTermsRegexps;
 import org.apache.james.jspf.dns.DNSRequest;
 import org.apache.james.jspf.dns.DNSResponse;
 import org.apache.james.jspf.dns.TimeoutException;
@@ -35,8 +37,6 @@
 import org.apache.james.jspf.exceptions.NoneException;
 import org.apache.james.jspf.exceptions.PermErrorException;
 import org.apache.james.jspf.exceptions.TempErrorException;
-import org.apache.james.jspf.util.Inet6Util;
-import org.apache.james.jspf.util.SPFTermsRegexps;
 
 import java.util.ArrayList;
 import java.util.List;

Modified: james/jspf/trunk/src/main/java/org/apache/james/jspf/terms/ExistsMechanism.java
URL: http://svn.apache.org/viewvc/james/jspf/trunk/src/main/java/org/apache/james/jspf/terms/ExistsMechanism.java?rev=574394&r1=574393&r2=574394&view=diff
==============================================================================
--- james/jspf/trunk/src/main/java/org/apache/james/jspf/terms/ExistsMechanism.java (original)
+++ james/jspf/trunk/src/main/java/org/apache/james/jspf/terms/ExistsMechanism.java Mon Sep
10 15:39:04 2007
@@ -26,6 +26,7 @@
 import org.apache.james.jspf.core.SPFChecker;
 import org.apache.james.jspf.core.SPFCheckerDNSResponseListener;
 import org.apache.james.jspf.core.SPFSession;
+import org.apache.james.jspf.core.SPFTermsRegexps;
 import org.apache.james.jspf.dns.DNSRequest;
 import org.apache.james.jspf.dns.DNSResponse;
 import org.apache.james.jspf.dns.TimeoutException;
@@ -33,7 +34,6 @@
 import org.apache.james.jspf.exceptions.NoneException;
 import org.apache.james.jspf.exceptions.PermErrorException;
 import org.apache.james.jspf.exceptions.TempErrorException;
-import org.apache.james.jspf.util.SPFTermsRegexps;
 
 import java.util.List;
 

Modified: james/jspf/trunk/src/main/java/org/apache/james/jspf/terms/ExpModifier.java
URL: http://svn.apache.org/viewvc/james/jspf/trunk/src/main/java/org/apache/james/jspf/terms/ExpModifier.java?rev=574394&r1=574393&r2=574394&view=diff
==============================================================================
--- james/jspf/trunk/src/main/java/org/apache/james/jspf/terms/ExpModifier.java (original)
+++ james/jspf/trunk/src/main/java/org/apache/james/jspf/terms/ExpModifier.java Mon Sep 10
15:39:04 2007
@@ -26,6 +26,7 @@
 import org.apache.james.jspf.core.SPFChecker;
 import org.apache.james.jspf.core.SPFCheckerDNSResponseListener;
 import org.apache.james.jspf.core.SPFSession;
+import org.apache.james.jspf.core.SPFTermsRegexps;
 import org.apache.james.jspf.dns.DNSRequest;
 import org.apache.james.jspf.dns.DNSResponse;
 import org.apache.james.jspf.dns.TimeoutException;
@@ -33,7 +34,6 @@
 import org.apache.james.jspf.exceptions.NoneException;
 import org.apache.james.jspf.exceptions.PermErrorException;
 import org.apache.james.jspf.exceptions.TempErrorException;
-import org.apache.james.jspf.util.SPFTermsRegexps;
 import org.apache.james.jspf.wiring.MacroExpandEnabled;
 
 import java.util.List;

Modified: james/jspf/trunk/src/main/java/org/apache/james/jspf/terms/IP4Mechanism.java
URL: http://svn.apache.org/viewvc/james/jspf/trunk/src/main/java/org/apache/james/jspf/terms/IP4Mechanism.java?rev=574394&r1=574393&r2=574394&view=diff
==============================================================================
--- james/jspf/trunk/src/main/java/org/apache/james/jspf/terms/IP4Mechanism.java (original)
+++ james/jspf/trunk/src/main/java/org/apache/james/jspf/terms/IP4Mechanism.java Mon Sep 10
15:39:04 2007
@@ -24,9 +24,9 @@
 import org.apache.james.jspf.core.DNSLookupContinuation;
 import org.apache.james.jspf.core.Directive;
 import org.apache.james.jspf.core.IPAddr;
+import org.apache.james.jspf.core.Inet6Util;
 import org.apache.james.jspf.core.SPFSession;
 import org.apache.james.jspf.exceptions.PermErrorException;
-import org.apache.james.jspf.util.Inet6Util;
 
 /**
  * This class represent the ip4 mechanism
@@ -81,7 +81,7 @@
     }
 
     /**
-     * @see org.apache.james.jspf.util.Inet6Util#isValidIPV4Address(String)
+     * @see org.apache.james.jspf.core.Inet6Util#isValidIPV4Address(String)
      */
     protected boolean isValidAddress(String ipString) {
         return Inet6Util.isValidIPV4Address(ipString);

Modified: james/jspf/trunk/src/main/java/org/apache/james/jspf/terms/IP6Mechanism.java
URL: http://svn.apache.org/viewvc/james/jspf/trunk/src/main/java/org/apache/james/jspf/terms/IP6Mechanism.java?rev=574394&r1=574393&r2=574394&view=diff
==============================================================================
--- james/jspf/trunk/src/main/java/org/apache/james/jspf/terms/IP6Mechanism.java (original)
+++ james/jspf/trunk/src/main/java/org/apache/james/jspf/terms/IP6Mechanism.java Mon Sep 10
15:39:04 2007
@@ -20,7 +20,7 @@
 
 package org.apache.james.jspf.terms;
 
-import org.apache.james.jspf.util.Inet6Util;
+import org.apache.james.jspf.core.Inet6Util;
 
 /**
  * This class represent the ip6 mechanism

Modified: james/jspf/trunk/src/main/java/org/apache/james/jspf/terms/IncludeMechanism.java
URL: http://svn.apache.org/viewvc/james/jspf/trunk/src/main/java/org/apache/james/jspf/terms/IncludeMechanism.java?rev=574394&r1=574393&r2=574394&view=diff
==============================================================================
--- james/jspf/trunk/src/main/java/org/apache/james/jspf/terms/IncludeMechanism.java (original)
+++ james/jspf/trunk/src/main/java/org/apache/james/jspf/terms/IncludeMechanism.java Mon Sep
10 15:39:04 2007
@@ -31,11 +31,11 @@
 import org.apache.james.jspf.core.SPFChecker;
 import org.apache.james.jspf.core.SPFCheckerExceptionCatcher;
 import org.apache.james.jspf.core.SPFSession;
+import org.apache.james.jspf.core.SPFTermsRegexps;
 import org.apache.james.jspf.exceptions.NeutralException;
 import org.apache.james.jspf.exceptions.NoneException;
 import org.apache.james.jspf.exceptions.PermErrorException;
 import org.apache.james.jspf.exceptions.TempErrorException;
-import org.apache.james.jspf.util.SPFTermsRegexps;
 import org.apache.james.jspf.wiring.LogEnabled;
 import org.apache.james.jspf.wiring.MacroExpandEnabled;
 import org.apache.james.jspf.wiring.SPFCheckEnabled;

Modified: james/jspf/trunk/src/main/java/org/apache/james/jspf/terms/MXMechanism.java
URL: http://svn.apache.org/viewvc/james/jspf/trunk/src/main/java/org/apache/james/jspf/terms/MXMechanism.java?rev=574394&r1=574393&r2=574394&view=diff
==============================================================================
--- james/jspf/trunk/src/main/java/org/apache/james/jspf/terms/MXMechanism.java (original)
+++ james/jspf/trunk/src/main/java/org/apache/james/jspf/terms/MXMechanism.java Mon Sep 10
15:39:04 2007
@@ -27,6 +27,7 @@
 import org.apache.james.jspf.core.SPFChecker;
 import org.apache.james.jspf.core.SPFCheckerDNSResponseListener;
 import org.apache.james.jspf.core.SPFSession;
+import org.apache.james.jspf.core.SPFTermsRegexps;
 import org.apache.james.jspf.dns.DNSRequest;
 import org.apache.james.jspf.dns.DNSResponse;
 import org.apache.james.jspf.dns.TimeoutException;
@@ -34,7 +35,6 @@
 import org.apache.james.jspf.exceptions.NoneException;
 import org.apache.james.jspf.exceptions.PermErrorException;
 import org.apache.james.jspf.exceptions.TempErrorException;
-import org.apache.james.jspf.util.SPFTermsRegexps;
 
 import java.util.ArrayList;
 import java.util.List;

Modified: james/jspf/trunk/src/main/java/org/apache/james/jspf/terms/PTRMechanism.java
URL: http://svn.apache.org/viewvc/james/jspf/trunk/src/main/java/org/apache/james/jspf/terms/PTRMechanism.java?rev=574394&r1=574393&r2=574394&view=diff
==============================================================================
--- james/jspf/trunk/src/main/java/org/apache/james/jspf/terms/PTRMechanism.java (original)
+++ james/jspf/trunk/src/main/java/org/apache/james/jspf/terms/PTRMechanism.java Mon Sep 10
15:39:04 2007
@@ -27,6 +27,7 @@
 import org.apache.james.jspf.core.SPFChecker;
 import org.apache.james.jspf.core.SPFCheckerDNSResponseListener;
 import org.apache.james.jspf.core.SPFSession;
+import org.apache.james.jspf.core.SPFTermsRegexps;
 import org.apache.james.jspf.dns.DNSRequest;
 import org.apache.james.jspf.dns.DNSResponse;
 import org.apache.james.jspf.dns.DNSService;
@@ -35,7 +36,6 @@
 import org.apache.james.jspf.exceptions.NoneException;
 import org.apache.james.jspf.exceptions.PermErrorException;
 import org.apache.james.jspf.exceptions.TempErrorException;
-import org.apache.james.jspf.util.SPFTermsRegexps;
 import org.apache.james.jspf.wiring.DNSServiceEnabled;
 
 import java.util.List;

Modified: james/jspf/trunk/src/main/java/org/apache/james/jspf/terms/RedirectModifier.java
URL: http://svn.apache.org/viewvc/james/jspf/trunk/src/main/java/org/apache/james/jspf/terms/RedirectModifier.java?rev=574394&r1=574393&r2=574394&view=diff
==============================================================================
--- james/jspf/trunk/src/main/java/org/apache/james/jspf/terms/RedirectModifier.java (original)
+++ james/jspf/trunk/src/main/java/org/apache/james/jspf/terms/RedirectModifier.java Mon Sep
10 15:39:04 2007
@@ -24,11 +24,11 @@
 import org.apache.james.jspf.core.SPFChecker;
 import org.apache.james.jspf.core.SPFCheckerExceptionCatcher;
 import org.apache.james.jspf.core.SPFSession;
+import org.apache.james.jspf.core.SPFTermsRegexps;
 import org.apache.james.jspf.exceptions.NeutralException;
 import org.apache.james.jspf.exceptions.NoneException;
 import org.apache.james.jspf.exceptions.PermErrorException;
 import org.apache.james.jspf.exceptions.TempErrorException;
-import org.apache.james.jspf.util.SPFTermsRegexps;
 import org.apache.james.jspf.wiring.MacroExpandEnabled;
 import org.apache.james.jspf.wiring.SPFCheckEnabled;
 

Modified: james/jspf/trunk/src/main/java/org/apache/james/jspf/terms/UnknownModifier.java
URL: http://svn.apache.org/viewvc/james/jspf/trunk/src/main/java/org/apache/james/jspf/terms/UnknownModifier.java?rev=574394&r1=574393&r2=574394&view=diff
==============================================================================
--- james/jspf/trunk/src/main/java/org/apache/james/jspf/terms/UnknownModifier.java (original)
+++ james/jspf/trunk/src/main/java/org/apache/james/jspf/terms/UnknownModifier.java Mon Sep
10 15:39:04 2007
@@ -25,8 +25,8 @@
 import org.apache.james.jspf.core.DNSLookupContinuation;
 import org.apache.james.jspf.core.Modifier;
 import org.apache.james.jspf.core.SPFSession;
+import org.apache.james.jspf.core.SPFTermsRegexps;
 import org.apache.james.jspf.exceptions.PermErrorException;
-import org.apache.james.jspf.util.SPFTermsRegexps;
 
 /**
  * This Class represent an Unknown Modifier



---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org


Mime
View raw message