james-server-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From b...@apache.org
Subject svn commit: r572835 [1/2] - in /james/jspf/trunk/src: main/java/org/apache/james/jspf/ main/java/org/apache/james/jspf/core/ main/java/org/apache/james/jspf/dns/ main/java/org/apache/james/jspf/exceptions/ main/java/org/apache/james/jspf/executor/ main...
Date Tue, 04 Sep 2007 23:30:09 GMT
Author: bago
Date: Tue Sep  4 16:30:02 2007
New Revision: 572835

URL: http://svn.apache.org/viewvc?rev=572835&view=rev
Log:
Big class-shake to try removing a cyclic dependencies hell, Part 1 (JSPF-54)

Added:
    james/jspf/trunk/src/main/java/org/apache/james/jspf/core/FutureSPFResult.java
      - copied, changed from r549905, james/jspf/trunk/src/main/java/org/apache/james/jspf/FutureSPFResult.java
    james/jspf/trunk/src/main/java/org/apache/james/jspf/core/MacroData.java
      - copied, changed from r549905, james/jspf/trunk/src/main/java/org/apache/james/jspf/macro/MacroData.java
    james/jspf/trunk/src/main/java/org/apache/james/jspf/core/SPF1Utils.java
      - copied, changed from r549905, james/jspf/trunk/src/main/java/org/apache/james/jspf/util/SPF1Utils.java
    james/jspf/trunk/src/main/java/org/apache/james/jspf/core/SPFResult.java
      - copied, changed from r549905, james/jspf/trunk/src/main/java/org/apache/james/jspf/SPFResult.java
    james/jspf/trunk/src/main/java/org/apache/james/jspf/dns/
    james/jspf/trunk/src/main/java/org/apache/james/jspf/dns/DNSAsynchLookupService.java
      - copied, changed from r549905, james/jspf/trunk/src/main/java/org/apache/james/jspf/core/DNSAsynchLookupService.java
    james/jspf/trunk/src/main/java/org/apache/james/jspf/dns/DNSLookupContinuation.java
      - copied, changed from r572825, james/jspf/trunk/src/main/java/org/apache/james/jspf/core/DNSLookupContinuation.java
    james/jspf/trunk/src/main/java/org/apache/james/jspf/dns/DNSRequest.java
      - copied, changed from r572825, james/jspf/trunk/src/main/java/org/apache/james/jspf/core/DNSRequest.java
    james/jspf/trunk/src/main/java/org/apache/james/jspf/dns/DNSResponse.java
      - copied, changed from r549905, james/jspf/trunk/src/main/java/org/apache/james/jspf/core/DNSResponse.java
    james/jspf/trunk/src/main/java/org/apache/james/jspf/dns/DNSService.java
      - copied, changed from r572825, james/jspf/trunk/src/main/java/org/apache/james/jspf/core/DNSService.java
    james/jspf/trunk/src/main/java/org/apache/james/jspf/dns/IResponse.java
      - copied, changed from r549905, james/jspf/trunk/src/main/java/org/apache/james/jspf/core/IResponse.java
    james/jspf/trunk/src/main/java/org/apache/james/jspf/dns/IResponseImpl.java
      - copied, changed from r549905, james/jspf/trunk/src/main/java/org/apache/james/jspf/core/IResponseImpl.java
    james/jspf/trunk/src/main/java/org/apache/james/jspf/dns/IResponseQueue.java
      - copied, changed from r549905, james/jspf/trunk/src/main/java/org/apache/james/jspf/core/IResponseQueue.java
    james/jspf/trunk/src/main/java/org/apache/james/jspf/dns/SPFCheckerDNSResponseListener.java
      - copied, changed from r549905, james/jspf/trunk/src/main/java/org/apache/james/jspf/core/SPFCheckerDNSResponseListener.java
    james/jspf/trunk/src/main/java/org/apache/james/jspf/exceptions/SPFErrorConstants.java   (with props)
    james/jspf/trunk/src/main/java/org/apache/james/jspf/executor/
    james/jspf/trunk/src/main/java/org/apache/james/jspf/executor/SPFExecutor.java
      - copied, changed from r549905, james/jspf/trunk/src/main/java/org/apache/james/jspf/core/SPFExecutor.java
    james/jspf/trunk/src/main/java/org/apache/james/jspf/executor/StagedMultipleSPFExecutor.java
      - copied, changed from r549905, james/jspf/trunk/src/main/java/org/apache/james/jspf/core/StagedMultipleSPFExecutor.java
    james/jspf/trunk/src/main/java/org/apache/james/jspf/executor/SynchronousSPFExecutor.java
      - copied, changed from r549905, james/jspf/trunk/src/main/java/org/apache/james/jspf/core/SynchronousSPFExecutor.java
Removed:
    james/jspf/trunk/src/main/java/org/apache/james/jspf/FutureSPFResult.java
    james/jspf/trunk/src/main/java/org/apache/james/jspf/SPFResult.java
    james/jspf/trunk/src/main/java/org/apache/james/jspf/core/DNSAsynchLookupService.java
    james/jspf/trunk/src/main/java/org/apache/james/jspf/core/DNSLookupContinuation.java
    james/jspf/trunk/src/main/java/org/apache/james/jspf/core/DNSRequest.java
    james/jspf/trunk/src/main/java/org/apache/james/jspf/core/DNSResponse.java
    james/jspf/trunk/src/main/java/org/apache/james/jspf/core/DNSService.java
    james/jspf/trunk/src/main/java/org/apache/james/jspf/core/IResponse.java
    james/jspf/trunk/src/main/java/org/apache/james/jspf/core/IResponseImpl.java
    james/jspf/trunk/src/main/java/org/apache/james/jspf/core/IResponseQueue.java
    james/jspf/trunk/src/main/java/org/apache/james/jspf/core/SPFCheckerDNSResponseListener.java
    james/jspf/trunk/src/main/java/org/apache/james/jspf/core/SPFExecutor.java
    james/jspf/trunk/src/main/java/org/apache/james/jspf/core/StagedMultipleSPFExecutor.java
    james/jspf/trunk/src/main/java/org/apache/james/jspf/core/SynchronousSPFExecutor.java
    james/jspf/trunk/src/main/java/org/apache/james/jspf/macro/MacroData.java
    james/jspf/trunk/src/main/java/org/apache/james/jspf/util/SPF1Utils.java
Modified:
    james/jspf/trunk/src/main/java/org/apache/james/jspf/SPF.java
    james/jspf/trunk/src/main/java/org/apache/james/jspf/core/Directive.java
    james/jspf/trunk/src/main/java/org/apache/james/jspf/core/SPFChecker.java
    james/jspf/trunk/src/main/java/org/apache/james/jspf/core/SPFSession.java
    james/jspf/trunk/src/main/java/org/apache/james/jspf/exceptions/NeutralException.java
    james/jspf/trunk/src/main/java/org/apache/james/jspf/exceptions/NoneException.java
    james/jspf/trunk/src/main/java/org/apache/james/jspf/exceptions/PermErrorException.java
    james/jspf/trunk/src/main/java/org/apache/james/jspf/exceptions/TempErrorException.java
    james/jspf/trunk/src/main/java/org/apache/james/jspf/impl/DNSJnioAsynchService.java
    james/jspf/trunk/src/main/java/org/apache/james/jspf/impl/DNSServiceAsynchSimulator.java
    james/jspf/trunk/src/main/java/org/apache/james/jspf/impl/DNSServiceXBillImpl.java
    james/jspf/trunk/src/main/java/org/apache/james/jspf/impl/SPFQuery.java
    james/jspf/trunk/src/main/java/org/apache/james/jspf/macro/MacroExpand.java
    james/jspf/trunk/src/main/java/org/apache/james/jspf/policies/InitialChecksPolicy.java
    james/jspf/trunk/src/main/java/org/apache/james/jspf/policies/NeutralIfNotMatchPolicy.java
    james/jspf/trunk/src/main/java/org/apache/james/jspf/policies/SPFRetriever.java
    james/jspf/trunk/src/main/java/org/apache/james/jspf/policies/SPFStrictCheckerRetriever.java
    james/jspf/trunk/src/main/java/org/apache/james/jspf/policies/local/BestGuessPolicy.java
    james/jspf/trunk/src/main/java/org/apache/james/jspf/policies/local/DefaultExplanationPolicy.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/AllMechanism.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/GenericModifier.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/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
    james/jspf/trunk/src/main/java/org/apache/james/jspf/wiring/DNSServiceEnabled.java
    james/jspf/trunk/src/test/java/org/apache/james/jspf/AbstractYamlTest.java
    james/jspf/trunk/src/test/java/org/apache/james/jspf/LoggingDNSService.java
    james/jspf/trunk/src/test/java/org/apache/james/jspf/MailZoneAsynchronousYamlTest.java
    james/jspf/trunk/src/test/java/org/apache/james/jspf/MailZoneYamlTest.java
    james/jspf/trunk/src/test/java/org/apache/james/jspf/dnsserver/DNSTestingServerTest.java
    james/jspf/trunk/src/test/java/org/apache/james/jspf/macro/MacroExpandTest.java

Modified: james/jspf/trunk/src/main/java/org/apache/james/jspf/SPF.java
URL: http://svn.apache.org/viewvc/james/jspf/trunk/src/main/java/org/apache/james/jspf/SPF.java?rev=572835&r1=572834&r2=572835&view=diff
==============================================================================
--- james/jspf/trunk/src/main/java/org/apache/james/jspf/SPF.java (original)
+++ james/jspf/trunk/src/main/java/org/apache/james/jspf/SPF.java Tue Sep  4 16:30:02 2007
@@ -20,22 +20,26 @@
 
 package org.apache.james.jspf;
 
-import org.apache.james.jspf.core.DNSLookupContinuation;
-import org.apache.james.jspf.core.DNSService;
+import org.apache.james.jspf.dns.DNSLookupContinuation;
+import org.apache.james.jspf.core.FutureSPFResult;
 import org.apache.james.jspf.core.Logger;
 import org.apache.james.jspf.core.SPF1Constants;
 import org.apache.james.jspf.core.SPF1Record;
+import org.apache.james.jspf.core.SPF1Utils;
 import org.apache.james.jspf.core.SPFChecker;
 import org.apache.james.jspf.core.SPFCheckerExceptionCatcher;
-import org.apache.james.jspf.core.SPFExecutor;
 import org.apache.james.jspf.core.SPFRecordParser;
+import org.apache.james.jspf.core.SPFResult;
 import org.apache.james.jspf.core.SPFSession;
-import org.apache.james.jspf.core.SynchronousSPFExecutor;
+import org.apache.james.jspf.dns.DNSService;
 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.SPFErrorConstants;
 import org.apache.james.jspf.exceptions.SPFResultException;
 import org.apache.james.jspf.exceptions.TempErrorException;
+import org.apache.james.jspf.executor.SPFExecutor;
+import org.apache.james.jspf.executor.SynchronousSPFExecutor;
 import org.apache.james.jspf.macro.MacroExpand;
 import org.apache.james.jspf.parser.DefaultSPF1Parser;
 import org.apache.james.jspf.parser.DefaultTermsFactory;
@@ -52,7 +56,6 @@
 import org.apache.james.jspf.policies.local.FallbackPolicy;
 import org.apache.james.jspf.policies.local.OverridePolicy;
 import org.apache.james.jspf.policies.local.TrustedForwarderPolicy;
-import org.apache.james.jspf.util.SPF1Utils;
 import org.apache.james.jspf.wiring.DNSServiceEnabled;
 import org.apache.james.jspf.wiring.LogEnabled;
 import org.apache.james.jspf.wiring.MacroExpandEnabled;
@@ -90,7 +93,7 @@
             String result;
             if (exception instanceof SPFResultException) {
                 result = ((SPFResultException) exception).getResult();
-                if (!SPF1Utils.NEUTRAL_CONV.equals(result)) {
+                if (!SPFErrorConstants.NEUTRAL_CONV.equals(result)) {
                     log.warn(exception.getMessage(),exception);
                 }
             } else {
@@ -113,9 +116,9 @@
                 throws PermErrorException, TempErrorException,
                 NeutralException, NoneException {
             
-            SPF1Record spfRecord = (SPF1Record) spfData.getAttribute(ATTRIBUTE_SPF1_RECORD);
+            SPF1Record spfRecord = (SPF1Record) spfData.getAttribute(SPF1Utils.ATTRIBUTE_SPF1_RECORD);
             // make sure we cleanup the record, for recursion support
-            spfData.removeAttribute(ATTRIBUTE_SPF1_RECORD);
+            spfData.removeAttribute(SPF1Utils.ATTRIBUTE_SPF1_RECORD);
             
             LinkedList policyCheckers = new LinkedList();
             
@@ -174,10 +177,10 @@
         public DNSLookupContinuation checkSPF(SPFSession spfData)
                 throws PermErrorException, TempErrorException,
                 NeutralException, NoneException {
-            SPF1Record res = (SPF1Record) spfData.getAttribute(ATTRIBUTE_SPF1_RECORD);
+            SPF1Record res = (SPF1Record) spfData.getAttribute(SPF1Utils.ATTRIBUTE_SPF1_RECORD);
             if (res == null) {
                 res = policy.getSPFRecord(spfData.getCurrentDomain());
-                spfData.setAttribute(ATTRIBUTE_SPF1_RECORD, res);
+                spfData.setAttribute(SPF1Utils.ATTRIBUTE_SPF1_RECORD, res);
             }
             return null;
         }
@@ -203,9 +206,9 @@
         public DNSLookupContinuation checkSPF(SPFSession spfData)
                 throws PermErrorException, TempErrorException,
                 NeutralException, NoneException {
-            SPF1Record res = (SPF1Record) spfData.getAttribute(ATTRIBUTE_SPF1_RECORD);
+            SPF1Record res = (SPF1Record) spfData.getAttribute(SPF1Utils.ATTRIBUTE_SPF1_RECORD);
             res = policy.getSPFRecord(spfData.getCurrentDomain(), res);
-            spfData.setAttribute(ATTRIBUTE_SPF1_RECORD, res);
+            spfData.setAttribute(SPF1Utils.ATTRIBUTE_SPF1_RECORD, res);
             return null;
         }
         
@@ -214,8 +217,6 @@
         }
 
     }
-
-    public static final String ATTRIBUTE_SPF1_RECORD = "SPF.SPF1Record";
 
     DNSService dnsProbe;
 

Modified: james/jspf/trunk/src/main/java/org/apache/james/jspf/core/Directive.java
URL: http://svn.apache.org/viewvc/james/jspf/trunk/src/main/java/org/apache/james/jspf/core/Directive.java?rev=572835&r1=572834&r2=572835&view=diff
==============================================================================
--- james/jspf/trunk/src/main/java/org/apache/james/jspf/core/Directive.java (original)
+++ james/jspf/trunk/src/main/java/org/apache/james/jspf/core/Directive.java Tue Sep  4 16:30:02 2007
@@ -20,6 +20,7 @@
 
 package org.apache.james.jspf.core;
 
+import org.apache.james.jspf.dns.DNSLookupContinuation;
 import org.apache.james.jspf.exceptions.NeutralException;
 import org.apache.james.jspf.exceptions.NoneException;
 import org.apache.james.jspf.exceptions.PermErrorException;

Copied: james/jspf/trunk/src/main/java/org/apache/james/jspf/core/FutureSPFResult.java (from r549905, james/jspf/trunk/src/main/java/org/apache/james/jspf/FutureSPFResult.java)
URL: http://svn.apache.org/viewvc/james/jspf/trunk/src/main/java/org/apache/james/jspf/core/FutureSPFResult.java?p2=james/jspf/trunk/src/main/java/org/apache/james/jspf/core/FutureSPFResult.java&p1=james/jspf/trunk/src/main/java/org/apache/james/jspf/FutureSPFResult.java&r1=549905&r2=572835&rev=572835&view=diff
==============================================================================
--- james/jspf/trunk/src/main/java/org/apache/james/jspf/FutureSPFResult.java (original)
+++ james/jspf/trunk/src/main/java/org/apache/james/jspf/core/FutureSPFResult.java Tue Sep  4 16:30:02 2007
@@ -17,9 +17,8 @@
  * under the License.                                           *
  ****************************************************************/
 
-package org.apache.james.jspf;
+package org.apache.james.jspf.core;
 
-import org.apache.james.jspf.core.SPFSession;
 
 /**
  * A Blocking version of SPFResult which block until the SPFResult is fully set
@@ -60,7 +59,7 @@
     }
 
     /**
-     * @see org.apache.james.jspf.SPFResult#getExplanation()
+     * @see org.apache.james.jspf.core.SPFResult#getExplanation()
      */
     public String getExplanation() {
         checkReady();
@@ -68,7 +67,7 @@
     }
 
     /**
-     * @see org.apache.james.jspf.SPFResult#getHeader()
+     * @see org.apache.james.jspf.core.SPFResult#getHeader()
      */
     public String getHeader() {
         checkReady();
@@ -76,7 +75,7 @@
     }
 
     /**
-     * @see org.apache.james.jspf.SPFResult#getHeaderName()
+     * @see org.apache.james.jspf.core.SPFResult#getHeaderName()
      */
     public String getHeaderName() {
         checkReady();
@@ -84,7 +83,7 @@
     }
 
     /**
-     * @see org.apache.james.jspf.SPFResult#getHeaderText()
+     * @see org.apache.james.jspf.core.SPFResult#getHeaderText()
      */
     public String getHeaderText() {
         checkReady();
@@ -92,7 +91,7 @@
     }
 
     /**
-     * @see org.apache.james.jspf.SPFResult#getResult()
+     * @see org.apache.james.jspf.core.SPFResult#getResult()
      */
     public String getResult() {
         checkReady();

Copied: james/jspf/trunk/src/main/java/org/apache/james/jspf/core/MacroData.java (from r549905, james/jspf/trunk/src/main/java/org/apache/james/jspf/macro/MacroData.java)
URL: http://svn.apache.org/viewvc/james/jspf/trunk/src/main/java/org/apache/james/jspf/core/MacroData.java?p2=james/jspf/trunk/src/main/java/org/apache/james/jspf/core/MacroData.java&p1=james/jspf/trunk/src/main/java/org/apache/james/jspf/macro/MacroData.java&r1=549905&r2=572835&rev=572835&view=diff
==============================================================================
--- james/jspf/trunk/src/main/java/org/apache/james/jspf/macro/MacroData.java (original)
+++ james/jspf/trunk/src/main/java/org/apache/james/jspf/core/MacroData.java Tue Sep  4 16:30:02 2007
@@ -18,7 +18,7 @@
  ****************************************************************/
 
 
-package org.apache.james.jspf.macro;
+package org.apache.james.jspf.core;
 
 /**
  * This interface represent all the macros which can be used in SPF-Records.

Copied: james/jspf/trunk/src/main/java/org/apache/james/jspf/core/SPF1Utils.java (from r549905, james/jspf/trunk/src/main/java/org/apache/james/jspf/util/SPF1Utils.java)
URL: http://svn.apache.org/viewvc/james/jspf/trunk/src/main/java/org/apache/james/jspf/core/SPF1Utils.java?p2=james/jspf/trunk/src/main/java/org/apache/james/jspf/core/SPF1Utils.java&p1=james/jspf/trunk/src/main/java/org/apache/james/jspf/util/SPF1Utils.java&r1=549905&r2=572835&rev=572835&view=diff
==============================================================================
--- james/jspf/trunk/src/main/java/org/apache/james/jspf/util/SPF1Utils.java (original)
+++ james/jspf/trunk/src/main/java/org/apache/james/jspf/core/SPF1Utils.java Tue Sep  4 16:30:02 2007
@@ -18,9 +18,10 @@
  ****************************************************************/
 
 
-package org.apache.james.jspf.util;
+package org.apache.james.jspf.core;
+
+import org.apache.james.jspf.exceptions.SPFErrorConstants;
 
-import org.apache.james.jspf.core.SPF1Constants;
 
 /**
  * 
@@ -31,20 +32,6 @@
 
 public class SPF1Utils {
 
-    public static final String PERM_ERROR_CONV = "permerror";
-
-    public static final String NONE_CONV = "none";
-
-    public static final String TEMP_ERROR_CONV = "temperror";
-
-    public static final String PASS_CONV = "pass";
-
-    public static final String NEUTRAL_CONV = "neutral";
-
-    public static final String FAIL_CONV = "fail";
-
-    public static final String SOFTFAIL_CONV = "softfail";
-    
     public static final String DEFAULT_EXPLANATION = "http://www.openspf.org/why.html?sender=%{S}&ip=%{I}";
     
     public static final String BEST_GUESS_RECORD = "v=spf1 a/24 mx/24 ptr ?all";
@@ -58,15 +45,15 @@
     public static String resultToName(String result) {
 
         if (result.equals(SPF1Constants.PASS)) {
-            return PASS_CONV;
+            return SPFErrorConstants.PASS_CONV;
         } else if (result.equals(SPF1Constants.FAIL)) {
-            return FAIL_CONV;
+            return SPFErrorConstants.FAIL_CONV;
         } else if (result.equals(SPF1Constants.NEUTRAL)) {
-            return NEUTRAL_CONV;
+            return SPFErrorConstants.NEUTRAL_CONV;
         } else if (result.equals(SPF1Constants.SOFTFAIL)) {
-            return SOFTFAIL_CONV;
+            return SPFErrorConstants.SOFTFAIL_CONV;
         } else {
-            return NEUTRAL_CONV;
+            return SPFErrorConstants.NEUTRAL_CONV;
         }
 
     }
@@ -85,5 +72,7 @@
             return false;
         }
     }
+
+    public static final String ATTRIBUTE_SPF1_RECORD = "SPF.SPF1Record";
 
 }

Modified: james/jspf/trunk/src/main/java/org/apache/james/jspf/core/SPFChecker.java
URL: http://svn.apache.org/viewvc/james/jspf/trunk/src/main/java/org/apache/james/jspf/core/SPFChecker.java?rev=572835&r1=572834&r2=572835&view=diff
==============================================================================
--- james/jspf/trunk/src/main/java/org/apache/james/jspf/core/SPFChecker.java (original)
+++ james/jspf/trunk/src/main/java/org/apache/james/jspf/core/SPFChecker.java Tue Sep  4 16:30:02 2007
@@ -19,6 +19,7 @@
 
 package org.apache.james.jspf.core;
 
+import org.apache.james.jspf.dns.DNSLookupContinuation;
 import org.apache.james.jspf.exceptions.NeutralException;
 import org.apache.james.jspf.exceptions.NoneException;
 import org.apache.james.jspf.exceptions.PermErrorException;

Copied: james/jspf/trunk/src/main/java/org/apache/james/jspf/core/SPFResult.java (from r549905, james/jspf/trunk/src/main/java/org/apache/james/jspf/SPFResult.java)
URL: http://svn.apache.org/viewvc/james/jspf/trunk/src/main/java/org/apache/james/jspf/core/SPFResult.java?p2=james/jspf/trunk/src/main/java/org/apache/james/jspf/core/SPFResult.java&p1=james/jspf/trunk/src/main/java/org/apache/james/jspf/SPFResult.java&r1=549905&r2=572835&rev=572835&view=diff
==============================================================================
--- james/jspf/trunk/src/main/java/org/apache/james/jspf/SPFResult.java (original)
+++ james/jspf/trunk/src/main/java/org/apache/james/jspf/core/SPFResult.java Tue Sep  4 16:30:02 2007
@@ -18,10 +18,10 @@
  ****************************************************************/
 
 
-package org.apache.james.jspf;
+package org.apache.james.jspf.core;
+
+import org.apache.james.jspf.exceptions.SPFErrorConstants;
 
-import org.apache.james.jspf.core.SPFSession;
-import org.apache.james.jspf.util.SPF1Utils;
 
 /**
  * This class is used to return the result of an SPF lookup.
@@ -99,29 +99,29 @@
 
         StringBuffer headerText = new StringBuffer();
 
-        if (result.equals(SPF1Utils.PASS_CONV)) {
+        if (result.equals(SPFErrorConstants.PASS_CONV)) {
             headerText.append(result + " (spfCheck: domain of "
                     + spfData.getCurrentDomain() + " designates "
                     + spfData.getIpAddress() + " as permitted sender) ");
-        } else if (result.equals(SPF1Utils.FAIL_CONV)) {
+        } else if (result.equals(SPFErrorConstants.FAIL_CONV)) {
             headerText.append(result + " (spfCheck: domain of "
                     + spfData.getCurrentDomain() + " does not designate "
                     + spfData.getIpAddress() + " as permitted sender) ");
-        } else if (result.equals(SPF1Utils.NEUTRAL_CONV)
-                || result.equals(SPF1Utils.NONE_CONV)) {
+        } else if (result.equals(SPFErrorConstants.NEUTRAL_CONV)
+                || result.equals(SPFErrorConstants.NONE_CONV)) {
             headerText.append(result + " (spfCheck: " + spfData.getIpAddress()
                     + " is neither permitted nor denied by domain of "
                     + spfData.getCurrentDomain() + ") ");
 
-        } else if (result.equals(SPF1Utils.SOFTFAIL_CONV)) {
+        } else if (result.equals(SPFErrorConstants.SOFTFAIL_CONV)) {
             headerText.append(result + " (spfCheck: transitioning domain of "
                     + spfData.getCurrentDomain() + " does not designate "
                     + spfData.getIpAddress() + " as permitted sender) ");
-        } else if (result.equals(SPF1Utils.PERM_ERROR_CONV)) {
+        } else if (result.equals(SPFErrorConstants.PERM_ERROR_CONV)) {
             headerText.append(result
                     + " (spfCheck: Error in processing SPF Record) ");
 
-        } else if (result.equals(SPF1Utils.TEMP_ERROR_CONV)) {
+        } else if (result.equals(SPFErrorConstants.TEMP_ERROR_CONV)) {
             headerText.append(result
                     + " (spfCheck: Error in retrieving data from DNS) ");
 

Modified: james/jspf/trunk/src/main/java/org/apache/james/jspf/core/SPFSession.java
URL: http://svn.apache.org/viewvc/james/jspf/trunk/src/main/java/org/apache/james/jspf/core/SPFSession.java?rev=572835&r1=572834&r2=572835&view=diff
==============================================================================
--- james/jspf/trunk/src/main/java/org/apache/james/jspf/core/SPFSession.java (original)
+++ james/jspf/trunk/src/main/java/org/apache/james/jspf/core/SPFSession.java Tue Sep  4 16:30:02 2007
@@ -22,7 +22,6 @@
 
 import org.apache.james.jspf.exceptions.NoneException;
 import org.apache.james.jspf.exceptions.PermErrorException;
-import org.apache.james.jspf.macro.MacroData;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -147,42 +146,42 @@
     }
 
     /**
-     * @see org.apache.james.jspf.macro.MacroData#getCurrentSenderPart()
+     * @see org.apache.james.jspf.core.MacroData#getCurrentSenderPart()
      */
     public String getCurrentSenderPart() {
         return currentSenderPart;
     }
 
     /**
-     * @see org.apache.james.jspf.macro.MacroData#getMailFrom()
+     * @see org.apache.james.jspf.core.MacroData#getMailFrom()
      */
     public String getMailFrom() {
         return mailFrom;
     }
 
     /**
-     * @see org.apache.james.jspf.macro.MacroData#getHostName()
+     * @see org.apache.james.jspf.core.MacroData#getHostName()
      */
     public String getHostName() {
         return hostName;
     }
 
     /**
-     * @see org.apache.james.jspf.macro.MacroData#getCurrentDomain()
+     * @see org.apache.james.jspf.core.MacroData#getCurrentDomain()
      */
     public String getCurrentDomain() {
         return currentDomain;
     }
 
     /**
-     * @see org.apache.james.jspf.macro.MacroData#getInAddress()
+     * @see org.apache.james.jspf.core.MacroData#getInAddress()
      */
     public String getInAddress() {
         return inAddress;
     }
 
     /**
-     * @see org.apache.james.jspf.macro.MacroData#getClientDomain()
+     * @see org.apache.james.jspf.core.MacroData#getClientDomain()
      */
     public String getClientDomain() {
         return clientDomain;
@@ -197,7 +196,7 @@
     }
 
     /**
-     * @see org.apache.james.jspf.macro.MacroData#getSenderDomain()
+     * @see org.apache.james.jspf.core.MacroData#getSenderDomain()
      */
     public String getSenderDomain() {
         return senderDomain;
@@ -213,7 +212,7 @@
     }
     
     /**
-     * @see org.apache.james.jspf.macro.MacroData#getMacroIpAddress()
+     * @see org.apache.james.jspf.core.MacroData#getMacroIpAddress()
      */
     public String getMacroIpAddress() {
         
@@ -229,14 +228,14 @@
     }
 
     /**
-     * @see org.apache.james.jspf.macro.MacroData#getTimeStamp()
+     * @see org.apache.james.jspf.core.MacroData#getTimeStamp()
      */
     public long getTimeStamp() {
         return System.currentTimeMillis();
     }
 
     /**
-     * @see org.apache.james.jspf.macro.MacroData#getReadableIP()
+     * @see org.apache.james.jspf.core.MacroData#getReadableIP()
      */
     public String getReadableIP() {
         if (readableIP == null) {
@@ -246,7 +245,7 @@
     }
 
     /**
-     * @see org.apache.james.jspf.macro.MacroData#getReceivingDomain()
+     * @see org.apache.james.jspf.core.MacroData#getReceivingDomain()
      */
     public String getReceivingDomain() {
         return receivingDomain;

Copied: james/jspf/trunk/src/main/java/org/apache/james/jspf/dns/DNSAsynchLookupService.java (from r549905, james/jspf/trunk/src/main/java/org/apache/james/jspf/core/DNSAsynchLookupService.java)
URL: http://svn.apache.org/viewvc/james/jspf/trunk/src/main/java/org/apache/james/jspf/dns/DNSAsynchLookupService.java?p2=james/jspf/trunk/src/main/java/org/apache/james/jspf/dns/DNSAsynchLookupService.java&p1=james/jspf/trunk/src/main/java/org/apache/james/jspf/core/DNSAsynchLookupService.java&r1=549905&r2=572835&rev=572835&view=diff
==============================================================================
--- james/jspf/trunk/src/main/java/org/apache/james/jspf/core/DNSAsynchLookupService.java (original)
+++ james/jspf/trunk/src/main/java/org/apache/james/jspf/dns/DNSAsynchLookupService.java Tue Sep  4 16:30:02 2007
@@ -17,7 +17,8 @@
  * under the License.                                           *
  ****************************************************************/
 
-package org.apache.james.jspf.core;
+package org.apache.james.jspf.dns;
+
 
 
 /**

Copied: james/jspf/trunk/src/main/java/org/apache/james/jspf/dns/DNSLookupContinuation.java (from r572825, james/jspf/trunk/src/main/java/org/apache/james/jspf/core/DNSLookupContinuation.java)
URL: http://svn.apache.org/viewvc/james/jspf/trunk/src/main/java/org/apache/james/jspf/dns/DNSLookupContinuation.java?p2=james/jspf/trunk/src/main/java/org/apache/james/jspf/dns/DNSLookupContinuation.java&p1=james/jspf/trunk/src/main/java/org/apache/james/jspf/core/DNSLookupContinuation.java&r1=572825&r2=572835&rev=572835&view=diff
==============================================================================
--- james/jspf/trunk/src/main/java/org/apache/james/jspf/core/DNSLookupContinuation.java (original)
+++ james/jspf/trunk/src/main/java/org/apache/james/jspf/dns/DNSLookupContinuation.java Tue Sep  4 16:30:02 2007
@@ -17,11 +17,17 @@
  * under the License.                                           *
  ****************************************************************/
 
-package org.apache.james.jspf.core;
+package org.apache.james.jspf.dns;
+
+import org.apache.james.jspf.dns.DNSRequest;
+import org.apache.james.jspf.dns.SPFCheckerDNSResponseListener;
+
 
 /**
- * 
- *
+ * This object is used as the return value for spf resolving tasks.
+ * Every time a DNS resolution is needed the task should simply return
+ * this one including the DNSRequest and a listener to be invoked
+ * when the answer will be available.
  */
 public class DNSLookupContinuation {
     

Copied: james/jspf/trunk/src/main/java/org/apache/james/jspf/dns/DNSRequest.java (from r572825, james/jspf/trunk/src/main/java/org/apache/james/jspf/core/DNSRequest.java)
URL: http://svn.apache.org/viewvc/james/jspf/trunk/src/main/java/org/apache/james/jspf/dns/DNSRequest.java?p2=james/jspf/trunk/src/main/java/org/apache/james/jspf/dns/DNSRequest.java&p1=james/jspf/trunk/src/main/java/org/apache/james/jspf/core/DNSRequest.java&r1=572825&r2=572835&rev=572835&view=diff
==============================================================================
--- james/jspf/trunk/src/main/java/org/apache/james/jspf/core/DNSRequest.java (original)
+++ james/jspf/trunk/src/main/java/org/apache/james/jspf/dns/DNSRequest.java Tue Sep  4 16:30:02 2007
@@ -17,7 +17,7 @@
  * under the License.                                           *
  ****************************************************************/
 
-package org.apache.james.jspf.core;
+package org.apache.james.jspf.dns;
 
 import org.apache.james.jspf.exceptions.NoneException;
 import org.xbill.DNS.Name;

Copied: james/jspf/trunk/src/main/java/org/apache/james/jspf/dns/DNSResponse.java (from r549905, james/jspf/trunk/src/main/java/org/apache/james/jspf/core/DNSResponse.java)
URL: http://svn.apache.org/viewvc/james/jspf/trunk/src/main/java/org/apache/james/jspf/dns/DNSResponse.java?p2=james/jspf/trunk/src/main/java/org/apache/james/jspf/dns/DNSResponse.java&p1=james/jspf/trunk/src/main/java/org/apache/james/jspf/core/DNSResponse.java&r1=549905&r2=572835&rev=572835&view=diff
==============================================================================
--- james/jspf/trunk/src/main/java/org/apache/james/jspf/core/DNSResponse.java (original)
+++ james/jspf/trunk/src/main/java/org/apache/james/jspf/dns/DNSResponse.java Tue Sep  4 16:30:02 2007
@@ -17,9 +17,9 @@
  * under the License.                                           *
  ****************************************************************/
 
-package org.apache.james.jspf.core;
+package org.apache.james.jspf.dns;
 
-import org.apache.james.jspf.core.DNSService.TimeoutException;
+import org.apache.james.jspf.dns.DNSService.TimeoutException;
 
 import java.util.List;
 

Copied: james/jspf/trunk/src/main/java/org/apache/james/jspf/dns/DNSService.java (from r572825, james/jspf/trunk/src/main/java/org/apache/james/jspf/core/DNSService.java)
URL: http://svn.apache.org/viewvc/james/jspf/trunk/src/main/java/org/apache/james/jspf/dns/DNSService.java?p2=james/jspf/trunk/src/main/java/org/apache/james/jspf/dns/DNSService.java&p1=james/jspf/trunk/src/main/java/org/apache/james/jspf/core/DNSService.java&r1=572825&r2=572835&rev=572835&view=diff
==============================================================================
--- james/jspf/trunk/src/main/java/org/apache/james/jspf/core/DNSService.java (original)
+++ james/jspf/trunk/src/main/java/org/apache/james/jspf/dns/DNSService.java Tue Sep  4 16:30:02 2007
@@ -17,7 +17,7 @@
  * under the License.                                           *
  ****************************************************************/
 
-package org.apache.james.jspf.core;
+package org.apache.james.jspf.dns;
 
 import java.util.List;
 

Copied: james/jspf/trunk/src/main/java/org/apache/james/jspf/dns/IResponse.java (from r549905, james/jspf/trunk/src/main/java/org/apache/james/jspf/core/IResponse.java)
URL: http://svn.apache.org/viewvc/james/jspf/trunk/src/main/java/org/apache/james/jspf/dns/IResponse.java?p2=james/jspf/trunk/src/main/java/org/apache/james/jspf/dns/IResponse.java&p1=james/jspf/trunk/src/main/java/org/apache/james/jspf/core/IResponse.java&r1=549905&r2=572835&rev=572835&view=diff
==============================================================================
--- james/jspf/trunk/src/main/java/org/apache/james/jspf/core/IResponse.java (original)
+++ james/jspf/trunk/src/main/java/org/apache/james/jspf/dns/IResponse.java Tue Sep  4 16:30:02 2007
@@ -17,7 +17,7 @@
  * under the License.                                           *
  ****************************************************************/
 
-package org.apache.james.jspf.core;
+package org.apache.james.jspf.dns;
 
 public interface IResponse {
     

Copied: james/jspf/trunk/src/main/java/org/apache/james/jspf/dns/IResponseImpl.java (from r549905, james/jspf/trunk/src/main/java/org/apache/james/jspf/core/IResponseImpl.java)
URL: http://svn.apache.org/viewvc/james/jspf/trunk/src/main/java/org/apache/james/jspf/dns/IResponseImpl.java?p2=james/jspf/trunk/src/main/java/org/apache/james/jspf/dns/IResponseImpl.java&p1=james/jspf/trunk/src/main/java/org/apache/james/jspf/core/IResponseImpl.java&r1=549905&r2=572835&rev=572835&view=diff
==============================================================================
--- james/jspf/trunk/src/main/java/org/apache/james/jspf/core/IResponseImpl.java (original)
+++ james/jspf/trunk/src/main/java/org/apache/james/jspf/dns/IResponseImpl.java Tue Sep  4 16:30:02 2007
@@ -17,7 +17,7 @@
  * under the License.                                           *
  ****************************************************************/
 
-package org.apache.james.jspf.core;
+package org.apache.james.jspf.dns;
 
 
 import java.util.List;
@@ -42,21 +42,21 @@
     }
     
     /**
-     * @see org.apache.james.jspf.core.IResponse#getException()
+     * @see org.apache.james.jspf.dns.IResponse#getException()
      */
     public Exception getException() {
         return exception;
     }
     
     /**
-     * @see org.apache.james.jspf.core.IResponse#getId()
+     * @see org.apache.james.jspf.dns.IResponse#getId()
      */
     public Object getId() {
         return id;
     }
     
     /**
-     * @see org.apache.james.jspf.core.IResponse#getValue()
+     * @see org.apache.james.jspf.dns.IResponse#getValue()
      */
     public Object getValue() {
         return value;

Copied: james/jspf/trunk/src/main/java/org/apache/james/jspf/dns/IResponseQueue.java (from r549905, james/jspf/trunk/src/main/java/org/apache/james/jspf/core/IResponseQueue.java)
URL: http://svn.apache.org/viewvc/james/jspf/trunk/src/main/java/org/apache/james/jspf/dns/IResponseQueue.java?p2=james/jspf/trunk/src/main/java/org/apache/james/jspf/dns/IResponseQueue.java&p1=james/jspf/trunk/src/main/java/org/apache/james/jspf/core/IResponseQueue.java&r1=549905&r2=572835&rev=572835&view=diff
==============================================================================
--- james/jspf/trunk/src/main/java/org/apache/james/jspf/core/IResponseQueue.java (original)
+++ james/jspf/trunk/src/main/java/org/apache/james/jspf/dns/IResponseQueue.java Tue Sep  4 16:30:02 2007
@@ -17,7 +17,7 @@
  * under the License.                                           *
  ****************************************************************/
 
-package org.apache.james.jspf.core;
+package org.apache.james.jspf.dns;
 
 import java.util.List;
 

Copied: james/jspf/trunk/src/main/java/org/apache/james/jspf/dns/SPFCheckerDNSResponseListener.java (from r549905, james/jspf/trunk/src/main/java/org/apache/james/jspf/core/SPFCheckerDNSResponseListener.java)
URL: http://svn.apache.org/viewvc/james/jspf/trunk/src/main/java/org/apache/james/jspf/dns/SPFCheckerDNSResponseListener.java?p2=james/jspf/trunk/src/main/java/org/apache/james/jspf/dns/SPFCheckerDNSResponseListener.java&p1=james/jspf/trunk/src/main/java/org/apache/james/jspf/core/SPFCheckerDNSResponseListener.java&r1=549905&r2=572835&rev=572835&view=diff
==============================================================================
--- james/jspf/trunk/src/main/java/org/apache/james/jspf/core/SPFCheckerDNSResponseListener.java (original)
+++ james/jspf/trunk/src/main/java/org/apache/james/jspf/dns/SPFCheckerDNSResponseListener.java Tue Sep  4 16:30:02 2007
@@ -17,8 +17,10 @@
  * under the License.                                           *
  ****************************************************************/
 
-package org.apache.james.jspf.core;
+package org.apache.james.jspf.dns;
 
+import org.apache.james.jspf.dns.DNSLookupContinuation;
+import org.apache.james.jspf.core.SPFSession;
 import org.apache.james.jspf.exceptions.NeutralException;
 import org.apache.james.jspf.exceptions.NoneException;
 import org.apache.james.jspf.exceptions.PermErrorException;

Modified: james/jspf/trunk/src/main/java/org/apache/james/jspf/exceptions/NeutralException.java
URL: http://svn.apache.org/viewvc/james/jspf/trunk/src/main/java/org/apache/james/jspf/exceptions/NeutralException.java?rev=572835&r1=572834&r2=572835&view=diff
==============================================================================
--- james/jspf/trunk/src/main/java/org/apache/james/jspf/exceptions/NeutralException.java (original)
+++ james/jspf/trunk/src/main/java/org/apache/james/jspf/exceptions/NeutralException.java Tue Sep  4 16:30:02 2007
@@ -20,7 +20,6 @@
 
 package org.apache.james.jspf.exceptions;
 
-import org.apache.james.jspf.util.SPF1Utils;
 
 /**
  * This exception get thrown if the result should be neutral
@@ -36,7 +35,7 @@
      * @see org.apache.james.jspf.exceptions.SPFResultException#getResult()
      */
     public String getResult() {
-        return SPF1Utils.NEUTRAL_CONV;
+        return SPFErrorConstants.NEUTRAL_CONV;
     }
 
 }

Modified: james/jspf/trunk/src/main/java/org/apache/james/jspf/exceptions/NoneException.java
URL: http://svn.apache.org/viewvc/james/jspf/trunk/src/main/java/org/apache/james/jspf/exceptions/NoneException.java?rev=572835&r1=572834&r2=572835&view=diff
==============================================================================
--- james/jspf/trunk/src/main/java/org/apache/james/jspf/exceptions/NoneException.java (original)
+++ james/jspf/trunk/src/main/java/org/apache/james/jspf/exceptions/NoneException.java Tue Sep  4 16:30:02 2007
@@ -20,7 +20,6 @@
 
 package org.apache.james.jspf.exceptions;
 
-import org.apache.james.jspf.util.SPF1Utils;
 
 /**
  * This exception get thrown if the result should be none
@@ -36,7 +35,7 @@
      * @see org.apache.james.jspf.exceptions.SPFResultException#getResult()
      */
     public String getResult() {
-        return SPF1Utils.NONE_CONV;
+        return SPFErrorConstants.NONE_CONV;
     }
 
 }

Modified: james/jspf/trunk/src/main/java/org/apache/james/jspf/exceptions/PermErrorException.java
URL: http://svn.apache.org/viewvc/james/jspf/trunk/src/main/java/org/apache/james/jspf/exceptions/PermErrorException.java?rev=572835&r1=572834&r2=572835&view=diff
==============================================================================
--- james/jspf/trunk/src/main/java/org/apache/james/jspf/exceptions/PermErrorException.java (original)
+++ james/jspf/trunk/src/main/java/org/apache/james/jspf/exceptions/PermErrorException.java Tue Sep  4 16:30:02 2007
@@ -20,7 +20,6 @@
 
 package org.apache.james.jspf.exceptions;
 
-import org.apache.james.jspf.util.SPF1Utils;
 
 /**
  * This exception get thrown if the result should be PermError
@@ -36,7 +35,7 @@
      * @see org.apache.james.jspf.exceptions.SPFResultException#getResult()
      */
     public String getResult() {
-        return SPF1Utils.PERM_ERROR_CONV;
+        return SPFErrorConstants.PERM_ERROR_CONV;
     }
 
 }

Added: james/jspf/trunk/src/main/java/org/apache/james/jspf/exceptions/SPFErrorConstants.java
URL: http://svn.apache.org/viewvc/james/jspf/trunk/src/main/java/org/apache/james/jspf/exceptions/SPFErrorConstants.java?rev=572835&view=auto
==============================================================================
--- james/jspf/trunk/src/main/java/org/apache/james/jspf/exceptions/SPFErrorConstants.java (added)
+++ james/jspf/trunk/src/main/java/org/apache/james/jspf/exceptions/SPFErrorConstants.java Tue Sep  4 16:30:02 2007
@@ -0,0 +1,33 @@
+/****************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one   *
+ * or more contributor license agreements.  See the NOTICE file *
+ * distributed with this work for additional information        *
+ * regarding copyright ownership.  The ASF licenses this file   *
+ * to you under the Apache License, Version 2.0 (the            *
+ * "License"); you may not use this file except in compliance   *
+ * with the License.  You may obtain a copy of the License at   *
+ *                                                              *
+ *   http://www.apache.org/licenses/LICENSE-2.0                 *
+ *                                                              *
+ * Unless required by applicable law or agreed to in writing,   *
+ * software distributed under the License is distributed on an  *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
+ * KIND, either express or implied.  See the License for the    *
+ * specific language governing permissions and limitations      *
+ * under the License.                                           *
+ ****************************************************************/
+
+
+package org.apache.james.jspf.exceptions;
+
+public interface SPFErrorConstants {
+
+    public static final String PERM_ERROR_CONV = "permerror";
+    public static final String TEMP_ERROR_CONV = "temperror";
+    public static final String NONE_CONV = "none";
+    public static final String PASS_CONV = "pass";
+    public static final String NEUTRAL_CONV = "neutral";
+    public static final String FAIL_CONV = "fail";
+    public static final String SOFTFAIL_CONV = "softfail";
+
+}

Propchange: james/jspf/trunk/src/main/java/org/apache/james/jspf/exceptions/SPFErrorConstants.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: james/jspf/trunk/src/main/java/org/apache/james/jspf/exceptions/TempErrorException.java
URL: http://svn.apache.org/viewvc/james/jspf/trunk/src/main/java/org/apache/james/jspf/exceptions/TempErrorException.java?rev=572835&r1=572834&r2=572835&view=diff
==============================================================================
--- james/jspf/trunk/src/main/java/org/apache/james/jspf/exceptions/TempErrorException.java (original)
+++ james/jspf/trunk/src/main/java/org/apache/james/jspf/exceptions/TempErrorException.java Tue Sep  4 16:30:02 2007
@@ -20,7 +20,6 @@
 
 package org.apache.james.jspf.exceptions;
 
-import org.apache.james.jspf.util.SPF1Utils;
 
 /**
  * This exception get thrown if the result should be TempError
@@ -36,7 +35,7 @@
      * @see org.apache.james.jspf.exceptions.SPFResultException#getResult()
      */
     public String getResult() {
-        return SPF1Utils.TEMP_ERROR_CONV;
+        return SPFErrorConstants.TEMP_ERROR_CONV;
     }
 
 }

Copied: james/jspf/trunk/src/main/java/org/apache/james/jspf/executor/SPFExecutor.java (from r549905, james/jspf/trunk/src/main/java/org/apache/james/jspf/core/SPFExecutor.java)
URL: http://svn.apache.org/viewvc/james/jspf/trunk/src/main/java/org/apache/james/jspf/executor/SPFExecutor.java?p2=james/jspf/trunk/src/main/java/org/apache/james/jspf/executor/SPFExecutor.java&p1=james/jspf/trunk/src/main/java/org/apache/james/jspf/core/SPFExecutor.java&r1=549905&r2=572835&rev=572835&view=diff
==============================================================================
--- james/jspf/trunk/src/main/java/org/apache/james/jspf/core/SPFExecutor.java (original)
+++ james/jspf/trunk/src/main/java/org/apache/james/jspf/executor/SPFExecutor.java Tue Sep  4 16:30:02 2007
@@ -17,9 +17,10 @@
  * under the License.                                           *
  ****************************************************************/
 
-package org.apache.james.jspf.core;
+package org.apache.james.jspf.executor;
 
-import org.apache.james.jspf.FutureSPFResult;
+import org.apache.james.jspf.core.FutureSPFResult;
+import org.apache.james.jspf.core.SPFSession;
 
 public interface SPFExecutor {
 

Copied: james/jspf/trunk/src/main/java/org/apache/james/jspf/executor/StagedMultipleSPFExecutor.java (from r549905, james/jspf/trunk/src/main/java/org/apache/james/jspf/core/StagedMultipleSPFExecutor.java)
URL: http://svn.apache.org/viewvc/james/jspf/trunk/src/main/java/org/apache/james/jspf/executor/StagedMultipleSPFExecutor.java?p2=james/jspf/trunk/src/main/java/org/apache/james/jspf/executor/StagedMultipleSPFExecutor.java&p1=james/jspf/trunk/src/main/java/org/apache/james/jspf/core/StagedMultipleSPFExecutor.java&r1=549905&r2=572835&rev=572835&view=diff
==============================================================================
--- james/jspf/trunk/src/main/java/org/apache/james/jspf/core/StagedMultipleSPFExecutor.java (original)
+++ james/jspf/trunk/src/main/java/org/apache/james/jspf/executor/StagedMultipleSPFExecutor.java Tue Sep  4 16:30:02 2007
@@ -17,10 +17,19 @@
  * under the License.                                           *
  ****************************************************************/
 
-package org.apache.james.jspf.core;
+package org.apache.james.jspf.executor;
 
-import org.apache.james.jspf.FutureSPFResult;
-import org.apache.james.jspf.core.DNSService.TimeoutException;
+import org.apache.james.jspf.dns.DNSLookupContinuation;
+import org.apache.james.jspf.core.FutureSPFResult;
+import org.apache.james.jspf.core.Logger;
+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.dns.DNSAsynchLookupService;
+import org.apache.james.jspf.dns.DNSResponse;
+import org.apache.james.jspf.dns.IResponse;
+import org.apache.james.jspf.dns.IResponseQueue;
+import org.apache.james.jspf.dns.DNSService.TimeoutException;
 import org.apache.james.jspf.exceptions.SPFResultException;
 
 import java.util.Collections;
@@ -42,7 +51,7 @@
         private int waitingThreads = 0;
 
         /**
-         * @see org.apache.james.jspf.core.IResponseQueue#insertResponse(org.apache.james.jspf.core.IResponse)
+         * @see org.apache.james.jspf.dns.IResponseQueue#insertResponse(org.apache.james.jspf.dns.IResponse)
          */
         public synchronized void insertResponse(IResponse r) {
             addLast(r);
@@ -50,7 +59,7 @@
         }
 
         /**
-         * @see org.apache.james.jspf.core.IResponseQueue#removeResponse()
+         * @see org.apache.james.jspf.dns.IResponseQueue#removeResponse()
          */
         public synchronized IResponse removeResponse() {
             if ( (size() - waitingThreads <= 0) ) {
@@ -103,7 +112,7 @@
      * If the working queue is full (50 pending responses) this method will not return
      * until the queue is again not full.
      * 
-     * @see org.apache.james.jspf.core.SPFExecutor#execute(org.apache.james.jspf.core.SPFSession, org.apache.james.jspf.FutureSPFResult)
+     * @see org.apache.james.jspf.executor.SPFExecutor#execute(org.apache.james.jspf.core.SPFSession, org.apache.james.jspf.core.FutureSPFResult)
      */
     public void execute(SPFSession session, FutureSPFResult result) {
         execute(session, result, true);

Copied: james/jspf/trunk/src/main/java/org/apache/james/jspf/executor/SynchronousSPFExecutor.java (from r549905, james/jspf/trunk/src/main/java/org/apache/james/jspf/core/SynchronousSPFExecutor.java)
URL: http://svn.apache.org/viewvc/james/jspf/trunk/src/main/java/org/apache/james/jspf/executor/SynchronousSPFExecutor.java?p2=james/jspf/trunk/src/main/java/org/apache/james/jspf/executor/SynchronousSPFExecutor.java&p1=james/jspf/trunk/src/main/java/org/apache/james/jspf/core/SynchronousSPFExecutor.java&r1=549905&r2=572835&rev=572835&view=diff
==============================================================================
--- james/jspf/trunk/src/main/java/org/apache/james/jspf/core/SynchronousSPFExecutor.java (original)
+++ james/jspf/trunk/src/main/java/org/apache/james/jspf/executor/SynchronousSPFExecutor.java Tue Sep  4 16:30:02 2007
@@ -17,10 +17,17 @@
  * under the License.                                           *
  ****************************************************************/
 
-package org.apache.james.jspf.core;
+package org.apache.james.jspf.executor;
 
-import org.apache.james.jspf.FutureSPFResult;
-import org.apache.james.jspf.core.DNSService.TimeoutException;
+import org.apache.james.jspf.dns.DNSLookupContinuation;
+import org.apache.james.jspf.core.FutureSPFResult;
+import org.apache.james.jspf.core.Logger;
+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.dns.DNSResponse;
+import org.apache.james.jspf.dns.DNSService;
+import org.apache.james.jspf.dns.DNSService.TimeoutException;
 import org.apache.james.jspf.exceptions.SPFResultException;
 
 /**
@@ -37,7 +44,7 @@
     }
 
     /**
-     * @see org.apache.james.jspf.core.SPFExecutor#execute(org.apache.james.jspf.core.SPFSession, org.apache.james.jspf.FutureSPFResult)
+     * @see org.apache.james.jspf.executor.SPFExecutor#execute(org.apache.james.jspf.core.SPFSession, org.apache.james.jspf.core.FutureSPFResult)
      */
     public void execute(SPFSession session, FutureSPFResult result) {
         SPFChecker checker;

Modified: james/jspf/trunk/src/main/java/org/apache/james/jspf/impl/DNSJnioAsynchService.java
URL: http://svn.apache.org/viewvc/james/jspf/trunk/src/main/java/org/apache/james/jspf/impl/DNSJnioAsynchService.java?rev=572835&r1=572834&r2=572835&view=diff
==============================================================================
--- james/jspf/trunk/src/main/java/org/apache/james/jspf/impl/DNSJnioAsynchService.java (original)
+++ james/jspf/trunk/src/main/java/org/apache/james/jspf/impl/DNSJnioAsynchService.java Tue Sep  4 16:30:02 2007
@@ -19,11 +19,11 @@
 
 package org.apache.james.jspf.impl;
 
-import org.apache.james.jspf.core.DNSAsynchLookupService;
-import org.apache.james.jspf.core.DNSRequest;
-import org.apache.james.jspf.core.DNSService;
-import org.apache.james.jspf.core.IResponse;
-import org.apache.james.jspf.core.IResponseQueue;
+import org.apache.james.jspf.dns.DNSAsynchLookupService;
+import org.apache.james.jspf.dns.DNSRequest;
+import org.apache.james.jspf.dns.DNSService;
+import org.apache.james.jspf.dns.IResponse;
+import org.apache.james.jspf.dns.IResponseQueue;
 import org.xbill.DNS.DClass;
 import org.xbill.DNS.ExtendedNonblockingResolver;
 import org.xbill.DNS.LookupAsynch;
@@ -112,7 +112,7 @@
     }
     
     /**
-     * @see org.apache.james.jspf.core.DNSAsynchLookupService#getRecordsAsynch(org.apache.james.jspf.core.DNSRequest, java.lang.Object, org.apache.james.jspf.core.IResponseQueue)
+     * @see org.apache.james.jspf.dns.DNSAsynchLookupService#getRecordsAsynch(org.apache.james.jspf.dns.DNSRequest, java.lang.Object, org.apache.james.jspf.dns.IResponseQueue)
      */
     public void getRecordsAsynch(DNSRequest request, int id,
             IResponseQueue responsePool) {

Modified: james/jspf/trunk/src/main/java/org/apache/james/jspf/impl/DNSServiceAsynchSimulator.java
URL: http://svn.apache.org/viewvc/james/jspf/trunk/src/main/java/org/apache/james/jspf/impl/DNSServiceAsynchSimulator.java?rev=572835&r1=572834&r2=572835&view=diff
==============================================================================
--- james/jspf/trunk/src/main/java/org/apache/james/jspf/impl/DNSServiceAsynchSimulator.java (original)
+++ james/jspf/trunk/src/main/java/org/apache/james/jspf/impl/DNSServiceAsynchSimulator.java Tue Sep  4 16:30:02 2007
@@ -19,12 +19,12 @@
 
 package org.apache.james.jspf.impl;
 
-import org.apache.james.jspf.core.DNSAsynchLookupService;
-import org.apache.james.jspf.core.DNSRequest;
-import org.apache.james.jspf.core.DNSService;
-import org.apache.james.jspf.core.IResponseImpl;
-import org.apache.james.jspf.core.IResponseQueue;
-import org.apache.james.jspf.core.DNSService.TimeoutException;
+import org.apache.james.jspf.dns.DNSAsynchLookupService;
+import org.apache.james.jspf.dns.DNSRequest;
+import org.apache.james.jspf.dns.DNSService;
+import org.apache.james.jspf.dns.IResponseImpl;
+import org.apache.james.jspf.dns.IResponseQueue;
+import org.apache.james.jspf.dns.DNSService.TimeoutException;
 
 import java.util.LinkedList;
 
@@ -74,7 +74,7 @@
     }
 
     /**
-     * @see org.apache.james.jspf.core.DNSService#getRecordsAsynch(java.lang.String, int, java.lang.Object, org.apache.james.jspf.core.IResponseQueue)
+     * @see org.apache.james.jspf.dns.DNSService#getRecordsAsynch(java.lang.String, int, java.lang.Object, org.apache.james.jspf.dns.IResponseQueue)
      */
     public void getRecordsAsynch(DNSRequest request, int id,
             final IResponseQueue responsePool) {

Modified: james/jspf/trunk/src/main/java/org/apache/james/jspf/impl/DNSServiceXBillImpl.java
URL: http://svn.apache.org/viewvc/james/jspf/trunk/src/main/java/org/apache/james/jspf/impl/DNSServiceXBillImpl.java?rev=572835&r1=572834&r2=572835&view=diff
==============================================================================
--- james/jspf/trunk/src/main/java/org/apache/james/jspf/impl/DNSServiceXBillImpl.java (original)
+++ james/jspf/trunk/src/main/java/org/apache/james/jspf/impl/DNSServiceXBillImpl.java Tue Sep  4 16:30:02 2007
@@ -19,10 +19,10 @@
 
 package org.apache.james.jspf.impl;
 
-import org.apache.james.jspf.core.DNSRequest;
-import org.apache.james.jspf.core.DNSService;
 import org.apache.james.jspf.core.IPAddr;
 import org.apache.james.jspf.core.Logger;
+import org.apache.james.jspf.dns.DNSRequest;
+import org.apache.james.jspf.dns.DNSService;
 import org.xbill.DNS.AAAARecord;
 import org.xbill.DNS.ARecord;
 import org.xbill.DNS.Lookup;
@@ -64,7 +64,7 @@
     }
 
     /**
-     * @see org.apache.james.jspf.core.DNSService#setTimeOut(int)
+     * @see org.apache.james.jspf.dns.DNSService#setTimeOut(int)
      */
     public synchronized void setTimeOut(int timeOut) {
         this.timeOut = timeOut;
@@ -110,7 +110,7 @@
     }
     
     /**
-     * @see org.apache.james.jspf.core.DNSService#getRecords(org.apache.james.jspf.core.DNSRequest)
+     * @see org.apache.james.jspf.dns.DNSService#getRecords(org.apache.james.jspf.dns.DNSRequest)
      */
     public List getRecords(DNSRequest request)
             throws TimeoutException {

Modified: james/jspf/trunk/src/main/java/org/apache/james/jspf/impl/SPFQuery.java
URL: http://svn.apache.org/viewvc/james/jspf/trunk/src/main/java/org/apache/james/jspf/impl/SPFQuery.java?rev=572835&r1=572834&r2=572835&view=diff
==============================================================================
--- james/jspf/trunk/src/main/java/org/apache/james/jspf/impl/SPFQuery.java (original)
+++ james/jspf/trunk/src/main/java/org/apache/james/jspf/impl/SPFQuery.java Tue Sep  4 16:30:02 2007
@@ -26,8 +26,8 @@
 import org.apache.commons.cli.ParseException;
 import org.apache.commons.cli.PosixParser;
 import org.apache.james.jspf.SPF;
-import org.apache.james.jspf.SPFResult;
-import org.apache.james.jspf.util.SPF1Utils;
+import org.apache.james.jspf.core.SPFResult;
+import org.apache.james.jspf.exceptions.SPFErrorConstants;
 import org.apache.log4j.ConsoleAppender;
 import org.apache.log4j.Level;
 import org.apache.log4j.Logger;
@@ -185,19 +185,19 @@
      */
     private static int getReturnCode(String result) {
 
-        if (result.equals(SPF1Utils.PASS_CONV)) {
+        if (result.equals(SPFErrorConstants.PASS_CONV)) {
             return PASS_RCODE;
-        } else if (result.equals(SPF1Utils.FAIL_CONV)) {
+        } else if (result.equals(SPFErrorConstants.FAIL_CONV)) {
             return FAIL_RCODE;
-        } else if (result.equals(SPF1Utils.SOFTFAIL_CONV)) {
+        } else if (result.equals(SPFErrorConstants.SOFTFAIL_CONV)) {
             return SOFTFAIL_RCODE;
-        } else if (result.equals(SPF1Utils.NEUTRAL_CONV)) {
+        } else if (result.equals(SPFErrorConstants.NEUTRAL_CONV)) {
             return NEUTRAL_RCODE;
-        } else if (result.equals(SPF1Utils.TEMP_ERROR_CONV)) {
+        } else if (result.equals(SPFErrorConstants.TEMP_ERROR_CONV)) {
             return TEMP_ERROR_RCODE;
-        } else if (result.equals(SPF1Utils.PERM_ERROR_CONV)) {
+        } else if (result.equals(SPFErrorConstants.PERM_ERROR_CONV)) {
             return PERM_ERROR_RCODE;
-        } else if (result.equals(SPF1Utils.NONE_CONV)) {
+        } else if (result.equals(SPFErrorConstants.NONE_CONV)) {
             return NONE_RCODE;
         }
 

Modified: james/jspf/trunk/src/main/java/org/apache/james/jspf/macro/MacroExpand.java
URL: http://svn.apache.org/viewvc/james/jspf/trunk/src/main/java/org/apache/james/jspf/macro/MacroExpand.java?rev=572835&r1=572834&r2=572835&view=diff
==============================================================================
--- james/jspf/trunk/src/main/java/org/apache/james/jspf/macro/MacroExpand.java (original)
+++ james/jspf/trunk/src/main/java/org/apache/james/jspf/macro/MacroExpand.java Tue Sep  4 16:30:02 2007
@@ -26,20 +26,21 @@
  * 
  */
 
-import org.apache.james.jspf.core.DNSLookupContinuation;
-import org.apache.james.jspf.core.DNSRequest;
-import org.apache.james.jspf.core.DNSResponse;
-import org.apache.james.jspf.core.DNSService;
+import org.apache.james.jspf.dns.DNSLookupContinuation;
 import org.apache.james.jspf.core.IPAddr;
 import org.apache.james.jspf.core.Logger;
-import org.apache.james.jspf.core.SPFCheckerDNSResponseListener;
+import org.apache.james.jspf.core.MacroData;
+import org.apache.james.jspf.core.SPF1Utils;
 import org.apache.james.jspf.core.SPFSession;
-import org.apache.james.jspf.core.DNSService.TimeoutException;
+import org.apache.james.jspf.dns.DNSRequest;
+import org.apache.james.jspf.dns.DNSResponse;
+import org.apache.james.jspf.dns.DNSService;
+import org.apache.james.jspf.dns.SPFCheckerDNSResponseListener;
+import org.apache.james.jspf.dns.DNSService.TimeoutException;
 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.SPF1Utils;
 import org.apache.james.jspf.util.SPFTermsRegexps;
 
 import java.io.UnsupportedEncodingException;
@@ -97,7 +98,7 @@
             SPFCheckerDNSResponseListener {
         
         /**
-         * @see org.apache.james.jspf.core.SPFCheckerDNSResponseListener#onDNSResponse(org.apache.james.jspf.core.DNSResponse, org.apache.james.jspf.core.SPFSession)
+         * @see org.apache.james.jspf.dns.SPFCheckerDNSResponseListener#onDNSResponse(org.apache.james.jspf.dns.DNSResponse, org.apache.james.jspf.core.SPFSession)
          */
         public DNSLookupContinuation onDNSResponse(DNSResponse response, SPFSession session)
                 throws PermErrorException, NoneException, TempErrorException,
@@ -134,7 +135,7 @@
             SPFCheckerDNSResponseListener {
 
         /**
-         * @see org.apache.james.jspf.core.SPFCheckerDNSResponseListener#onDNSResponse(org.apache.james.jspf.core.DNSResponse, org.apache.james.jspf.core.SPFSession)
+         * @see org.apache.james.jspf.dns.SPFCheckerDNSResponseListener#onDNSResponse(org.apache.james.jspf.dns.DNSResponse, org.apache.james.jspf.core.SPFSession)
          */
         public DNSLookupContinuation onDNSResponse(DNSResponse response, SPFSession session)
                 throws PermErrorException, NoneException, TempErrorException,

Modified: james/jspf/trunk/src/main/java/org/apache/james/jspf/policies/InitialChecksPolicy.java
URL: http://svn.apache.org/viewvc/james/jspf/trunk/src/main/java/org/apache/james/jspf/policies/InitialChecksPolicy.java?rev=572835&r1=572834&r2=572835&view=diff
==============================================================================
--- james/jspf/trunk/src/main/java/org/apache/james/jspf/policies/InitialChecksPolicy.java (original)
+++ james/jspf/trunk/src/main/java/org/apache/james/jspf/policies/InitialChecksPolicy.java Tue Sep  4 16:30:02 2007
@@ -19,9 +19,9 @@
 
 package org.apache.james.jspf.policies;
 
-import org.apache.james.jspf.SPF;
-import org.apache.james.jspf.core.DNSLookupContinuation;
+import org.apache.james.jspf.dns.DNSLookupContinuation;
 import org.apache.james.jspf.core.SPF1Record;
+import org.apache.james.jspf.core.SPF1Utils;
 import org.apache.james.jspf.core.SPFChecker;
 import org.apache.james.jspf.core.SPFSession;
 import org.apache.james.jspf.exceptions.NeutralException;
@@ -44,7 +44,7 @@
     public DNSLookupContinuation checkSPF(SPFSession spfData)
             throws PermErrorException, TempErrorException, NeutralException,
             NoneException {
-        SPF1Record res = (SPF1Record) spfData.getAttribute(SPF.ATTRIBUTE_SPF1_RECORD);
+        SPF1Record res = (SPF1Record) spfData.getAttribute(SPF1Utils.ATTRIBUTE_SPF1_RECORD);
         if (res == null) {
 
             // Initial checks (spec 4.3)

Modified: james/jspf/trunk/src/main/java/org/apache/james/jspf/policies/NeutralIfNotMatchPolicy.java
URL: http://svn.apache.org/viewvc/james/jspf/trunk/src/main/java/org/apache/james/jspf/policies/NeutralIfNotMatchPolicy.java?rev=572835&r1=572834&r2=572835&view=diff
==============================================================================
--- james/jspf/trunk/src/main/java/org/apache/james/jspf/policies/NeutralIfNotMatchPolicy.java (original)
+++ james/jspf/trunk/src/main/java/org/apache/james/jspf/policies/NeutralIfNotMatchPolicy.java Tue Sep  4 16:30:02 2007
@@ -19,7 +19,7 @@
 
 package org.apache.james.jspf.policies;
 
-import org.apache.james.jspf.core.DNSLookupContinuation;
+import org.apache.james.jspf.dns.DNSLookupContinuation;
 import org.apache.james.jspf.core.SPF1Constants;
 import org.apache.james.jspf.core.SPFSession;
 import org.apache.james.jspf.core.SPF1Record;

Modified: james/jspf/trunk/src/main/java/org/apache/james/jspf/policies/SPFRetriever.java
URL: http://svn.apache.org/viewvc/james/jspf/trunk/src/main/java/org/apache/james/jspf/policies/SPFRetriever.java?rev=572835&r1=572834&r2=572835&view=diff
==============================================================================
--- james/jspf/trunk/src/main/java/org/apache/james/jspf/policies/SPFRetriever.java (original)
+++ james/jspf/trunk/src/main/java/org/apache/james/jspf/policies/SPFRetriever.java Tue Sep  4 16:30:02 2007
@@ -1,16 +1,16 @@
 package org.apache.james.jspf.policies;
 
-import org.apache.james.jspf.SPF;
-import org.apache.james.jspf.core.DNSLookupContinuation;
-import org.apache.james.jspf.core.DNSRequest;
-import org.apache.james.jspf.core.DNSResponse;
-import org.apache.james.jspf.core.DNSService;
+import org.apache.james.jspf.dns.DNSLookupContinuation;
 import org.apache.james.jspf.core.SPF1Constants;
 import org.apache.james.jspf.core.SPF1Record;
+import org.apache.james.jspf.core.SPF1Utils;
 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.DNSService.TimeoutException;
+import org.apache.james.jspf.dns.DNSRequest;
+import org.apache.james.jspf.dns.DNSResponse;
+import org.apache.james.jspf.dns.DNSService;
+import org.apache.james.jspf.dns.SPFCheckerDNSResponseListener;
+import org.apache.james.jspf.dns.DNSService.TimeoutException;
 import org.apache.james.jspf.exceptions.NeutralException;
 import org.apache.james.jspf.exceptions.NoneException;
 import org.apache.james.jspf.exceptions.PermErrorException;
@@ -27,7 +27,7 @@
     private static final class SPFRecordHandlerDNSResponseListener implements SPFCheckerDNSResponseListener {
 
         /**
-         * @see org.apache.james.jspf.core.SPFCheckerDNSResponseListener#onDNSResponse(org.apache.james.jspf.core.DNSResponse, org.apache.james.jspf.core.SPFSession)
+         * @see org.apache.james.jspf.dns.SPFCheckerDNSResponseListener#onDNSResponse(org.apache.james.jspf.dns.DNSResponse, org.apache.james.jspf.core.SPFSession)
          */
         public DNSLookupContinuation onDNSResponse(
                 DNSResponse response, SPFSession session)
@@ -40,7 +40,7 @@
                 spfR = response.getResponse();
                 String record = extractSPFRecord(spfR);
                 if (record != null) {
-                    session.setAttribute(SPF.ATTRIBUTE_SPF1_RECORD, new SPF1Record(record));
+                    session.setAttribute(SPF1Utils.ATTRIBUTE_SPF1_RECORD, new SPF1Record(record));
                 }
             } catch (TimeoutException e) {
                 throw new TempErrorException("Timeout querying dns");
@@ -54,7 +54,7 @@
     private static final class SPFRetrieverDNSResponseListener implements SPFCheckerDNSResponseListener {
 
         /**
-         * @see org.apache.james.jspf.core.SPFCheckerDNSResponseListener#onDNSResponse(org.apache.james.jspf.core.DNSResponse, org.apache.james.jspf.core.SPFSession)
+         * @see org.apache.james.jspf.dns.SPFCheckerDNSResponseListener#onDNSResponse(org.apache.james.jspf.dns.DNSResponse, org.apache.james.jspf.core.SPFSession)
          */
         public DNSLookupContinuation onDNSResponse(
                 DNSResponse response, SPFSession session)
@@ -72,7 +72,7 @@
                     
                     String record = extractSPFRecord(spfR);
                     if (record != null) {
-                        session.setAttribute(SPF.ATTRIBUTE_SPF1_RECORD, new SPF1Record(record));
+                        session.setAttribute(SPF1Utils.ATTRIBUTE_SPF1_RECORD, new SPF1Record(record));
                     }
                     
                 }
@@ -139,7 +139,7 @@
     public DNSLookupContinuation checkSPF(SPFSession spfData)
             throws PermErrorException, TempErrorException, NeutralException,
             NoneException {
-        SPF1Record res = (SPF1Record) spfData.getAttribute(SPF.ATTRIBUTE_SPF1_RECORD);
+        SPF1Record res = (SPF1Record) spfData.getAttribute(SPF1Utils.ATTRIBUTE_SPF1_RECORD);
         if (res == null) {
             String currentDomain = spfData.getCurrentDomain();
             if (CHECK_ONLY_TXT_RECORDS) {

Modified: james/jspf/trunk/src/main/java/org/apache/james/jspf/policies/SPFStrictCheckerRetriever.java
URL: http://svn.apache.org/viewvc/james/jspf/trunk/src/main/java/org/apache/james/jspf/policies/SPFStrictCheckerRetriever.java?rev=572835&r1=572834&r2=572835&view=diff
==============================================================================
--- james/jspf/trunk/src/main/java/org/apache/james/jspf/policies/SPFStrictCheckerRetriever.java (original)
+++ james/jspf/trunk/src/main/java/org/apache/james/jspf/policies/SPFStrictCheckerRetriever.java Tue Sep  4 16:30:02 2007
@@ -1,14 +1,14 @@
 package org.apache.james.jspf.policies;
 
-import org.apache.james.jspf.SPF;
-import org.apache.james.jspf.core.DNSLookupContinuation;
-import org.apache.james.jspf.core.DNSRequest;
-import org.apache.james.jspf.core.DNSResponse;
-import org.apache.james.jspf.core.DNSService;
+import org.apache.james.jspf.dns.DNSLookupContinuation;
 import org.apache.james.jspf.core.SPF1Record;
-import org.apache.james.jspf.core.SPFCheckerDNSResponseListener;
+import org.apache.james.jspf.core.SPF1Utils;
 import org.apache.james.jspf.core.SPFSession;
-import org.apache.james.jspf.core.DNSService.TimeoutException;
+import org.apache.james.jspf.dns.DNSRequest;
+import org.apache.james.jspf.dns.DNSResponse;
+import org.apache.james.jspf.dns.DNSService;
+import org.apache.james.jspf.dns.SPFCheckerDNSResponseListener;
+import org.apache.james.jspf.dns.DNSService.TimeoutException;
 import org.apache.james.jspf.exceptions.NeutralException;
 import org.apache.james.jspf.exceptions.NoneException;
 import org.apache.james.jspf.exceptions.PermErrorException;
@@ -28,7 +28,7 @@
     private static final class SPFStrictSPFRecordsDNSResponseListener implements SPFCheckerDNSResponseListener {
 
         /**
-         * @see org.apache.james.jspf.core.SPFCheckerDNSResponseListener#onDNSResponse(org.apache.james.jspf.core.DNSResponse, org.apache.james.jspf.core.SPFSession)
+         * @see org.apache.james.jspf.dns.SPFCheckerDNSResponseListener#onDNSResponse(org.apache.james.jspf.dns.DNSResponse, org.apache.james.jspf.core.SPFSession)
          */
         public DNSLookupContinuation onDNSResponse(
                 DNSResponse response, SPFSession session)
@@ -46,7 +46,7 @@
 
             String record = calculateSpfRecord(spfR, spfTxtR);
             if (record != null) {
-                session.setAttribute(SPF.ATTRIBUTE_SPF1_RECORD, new SPF1Record(record));
+                session.setAttribute(SPF1Utils.ATTRIBUTE_SPF1_RECORD, new SPF1Record(record));
             }
 
             return null;
@@ -59,7 +59,7 @@
     private static final class SPFStrictCheckDNSResponseListener implements SPFCheckerDNSResponseListener {
 
         /**
-         * @see org.apache.james.jspf.core.SPFCheckerDNSResponseListener#onDNSResponse(org.apache.james.jspf.core.DNSResponse, org.apache.james.jspf.core.SPFSession)
+         * @see org.apache.james.jspf.dns.SPFCheckerDNSResponseListener#onDNSResponse(org.apache.james.jspf.dns.DNSResponse, org.apache.james.jspf.core.SPFSession)
          */
         public DNSLookupContinuation onDNSResponse(
                 DNSResponse response, SPFSession session)
@@ -88,7 +88,7 @@
     public DNSLookupContinuation checkSPF(SPFSession spfData)
             throws PermErrorException, TempErrorException, NeutralException,
             NoneException {
-        SPF1Record res = (SPF1Record) spfData.getAttribute(SPF.ATTRIBUTE_SPF1_RECORD);
+        SPF1Record res = (SPF1Record) spfData.getAttribute(SPF1Utils.ATTRIBUTE_SPF1_RECORD);
         if (res == null) {
             String currentDomain = spfData.getCurrentDomain();
 

Modified: james/jspf/trunk/src/main/java/org/apache/james/jspf/policies/local/BestGuessPolicy.java
URL: http://svn.apache.org/viewvc/james/jspf/trunk/src/main/java/org/apache/james/jspf/policies/local/BestGuessPolicy.java?rev=572835&r1=572834&r2=572835&view=diff
==============================================================================
--- james/jspf/trunk/src/main/java/org/apache/james/jspf/policies/local/BestGuessPolicy.java (original)
+++ james/jspf/trunk/src/main/java/org/apache/james/jspf/policies/local/BestGuessPolicy.java Tue Sep  4 16:30:02 2007
@@ -20,12 +20,12 @@
 package org.apache.james.jspf.policies.local;
 
 import org.apache.james.jspf.core.SPF1Record;
+import org.apache.james.jspf.core.SPF1Utils;
 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.policies.PolicyPostFilter;
-import org.apache.james.jspf.util.SPF1Utils;
 
 /**
  * PolicyPostFilter which handles best guess. 

Modified: james/jspf/trunk/src/main/java/org/apache/james/jspf/policies/local/DefaultExplanationPolicy.java
URL: http://svn.apache.org/viewvc/james/jspf/trunk/src/main/java/org/apache/james/jspf/policies/local/DefaultExplanationPolicy.java?rev=572835&r1=572834&r2=572835&view=diff
==============================================================================
--- james/jspf/trunk/src/main/java/org/apache/james/jspf/policies/local/DefaultExplanationPolicy.java (original)
+++ james/jspf/trunk/src/main/java/org/apache/james/jspf/policies/local/DefaultExplanationPolicy.java Tue Sep  4 16:30:02 2007
@@ -19,10 +19,11 @@
 
 package org.apache.james.jspf.policies.local;
 
-import org.apache.james.jspf.core.DNSLookupContinuation;
+import org.apache.james.jspf.dns.DNSLookupContinuation;
 import org.apache.james.jspf.core.Logger;
 import org.apache.james.jspf.core.SPF1Constants;
 import org.apache.james.jspf.core.SPF1Record;
+import org.apache.james.jspf.core.SPF1Utils;
 import org.apache.james.jspf.core.SPFChecker;
 import org.apache.james.jspf.core.SPFSession;
 import org.apache.james.jspf.exceptions.NeutralException;
@@ -31,7 +32,6 @@
 import org.apache.james.jspf.exceptions.TempErrorException;
 import org.apache.james.jspf.macro.MacroExpand;
 import org.apache.james.jspf.policies.PolicyPostFilter;
-import org.apache.james.jspf.util.SPF1Utils;
 
 /**
  * Policy to add a default explanation

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=572835&r1=572834&r2=572835&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 Tue Sep  4 16:30:02 2007
@@ -21,15 +21,15 @@
 package org.apache.james.jspf.terms;
 
 import org.apache.james.jspf.core.Configuration;
-import org.apache.james.jspf.core.DNSLookupContinuation;
-import org.apache.james.jspf.core.DNSRequest;
-import org.apache.james.jspf.core.DNSResponse;
-import org.apache.james.jspf.core.DNSService;
+import org.apache.james.jspf.dns.DNSLookupContinuation;
 import org.apache.james.jspf.core.Directive;
 import org.apache.james.jspf.core.IPAddr;
 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.dns.DNSRequest;
+import org.apache.james.jspf.dns.DNSResponse;
+import org.apache.james.jspf.dns.DNSService;
+import org.apache.james.jspf.dns.SPFCheckerDNSResponseListener;
 import org.apache.james.jspf.exceptions.NeutralException;
 import org.apache.james.jspf.exceptions.NoneException;
 import org.apache.james.jspf.exceptions.PermErrorException;
@@ -251,7 +251,7 @@
     }
 
     /**
-     * @see org.apache.james.jspf.core.SPFCheckerDNSResponseListener#onDNSResponse(org.apache.james.jspf.core.DNSResponse, org.apache.james.jspf.core.SPFSession)
+     * @see org.apache.james.jspf.dns.SPFCheckerDNSResponseListener#onDNSResponse(org.apache.james.jspf.dns.DNSResponse, org.apache.james.jspf.core.SPFSession)
      */
     public DNSLookupContinuation onDNSResponse(DNSResponse response, SPFSession spfSession)
         throws PermErrorException, TempErrorException, NoneException, NeutralException {

Modified: james/jspf/trunk/src/main/java/org/apache/james/jspf/terms/AllMechanism.java
URL: http://svn.apache.org/viewvc/james/jspf/trunk/src/main/java/org/apache/james/jspf/terms/AllMechanism.java?rev=572835&r1=572834&r2=572835&view=diff
==============================================================================
--- james/jspf/trunk/src/main/java/org/apache/james/jspf/terms/AllMechanism.java (original)
+++ james/jspf/trunk/src/main/java/org/apache/james/jspf/terms/AllMechanism.java Tue Sep  4 16:30:02 2007
@@ -22,7 +22,7 @@
 
 import org.apache.james.jspf.core.Configurable;
 import org.apache.james.jspf.core.Configuration;
-import org.apache.james.jspf.core.DNSLookupContinuation;
+import org.apache.james.jspf.dns.DNSLookupContinuation;
 import org.apache.james.jspf.core.Mechanism;
 import org.apache.james.jspf.core.SPFSession;
 import org.apache.james.jspf.exceptions.PermErrorException;

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=572835&r1=572834&r2=572835&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 Tue Sep  4 16:30:02 2007
@@ -20,14 +20,14 @@
 
 package org.apache.james.jspf.terms;
 
-import org.apache.james.jspf.core.DNSLookupContinuation;
-import org.apache.james.jspf.core.DNSRequest;
-import org.apache.james.jspf.core.DNSResponse;
-import org.apache.james.jspf.core.DNSService;
+import org.apache.james.jspf.dns.DNSLookupContinuation;
 import org.apache.james.jspf.core.Directive;
 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.dns.DNSRequest;
+import org.apache.james.jspf.dns.DNSResponse;
+import org.apache.james.jspf.dns.DNSService;
+import org.apache.james.jspf.dns.SPFCheckerDNSResponseListener;
 import org.apache.james.jspf.exceptions.NeutralException;
 import org.apache.james.jspf.exceptions.NoneException;
 import org.apache.james.jspf.exceptions.PermErrorException;
@@ -76,7 +76,7 @@
     }
 
     /**
-     * @see org.apache.james.jspf.core.SPFCheckerDNSResponseListener#onDNSResponse(org.apache.james.jspf.core.DNSResponse, org.apache.james.jspf.core.SPFSession)
+     * @see org.apache.james.jspf.dns.SPFCheckerDNSResponseListener#onDNSResponse(org.apache.james.jspf.dns.DNSResponse, org.apache.james.jspf.core.SPFSession)
      */
     public DNSLookupContinuation onDNSResponse(DNSResponse response, SPFSession spfSession) throws PermErrorException, TempErrorException {
         List aRecords;

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=572835&r1=572834&r2=572835&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 Tue Sep  4 16:30:02 2007
@@ -20,14 +20,14 @@
 
 package org.apache.james.jspf.terms;
 
-import org.apache.james.jspf.core.DNSLookupContinuation;
-import org.apache.james.jspf.core.DNSRequest;
-import org.apache.james.jspf.core.DNSResponse;
-import org.apache.james.jspf.core.DNSService;
+import org.apache.james.jspf.dns.DNSLookupContinuation;
 import org.apache.james.jspf.core.SPF1Constants;
 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.dns.DNSRequest;
+import org.apache.james.jspf.dns.DNSResponse;
+import org.apache.james.jspf.dns.DNSService;
+import org.apache.james.jspf.dns.SPFCheckerDNSResponseListener;
 import org.apache.james.jspf.exceptions.NeutralException;
 import org.apache.james.jspf.exceptions.NoneException;
 import org.apache.james.jspf.exceptions.PermErrorException;
@@ -145,7 +145,7 @@
      */
     
     /**
-     * @see org.apache.james.jspf.core.SPFCheckerDNSResponseListener#onDNSResponse(org.apache.james.jspf.core.DNSResponse, org.apache.james.jspf.core.SPFSession)
+     * @see org.apache.james.jspf.dns.SPFCheckerDNSResponseListener#onDNSResponse(org.apache.james.jspf.dns.DNSResponse, org.apache.james.jspf.core.SPFSession)
      */
     public DNSLookupContinuation onDNSResponse(DNSResponse lookup, SPFSession spfData) throws PermErrorException, TempErrorException, NeutralException, NoneException {
         try {

Modified: james/jspf/trunk/src/main/java/org/apache/james/jspf/terms/GenericModifier.java
URL: http://svn.apache.org/viewvc/james/jspf/trunk/src/main/java/org/apache/james/jspf/terms/GenericModifier.java?rev=572835&r1=572834&r2=572835&view=diff
==============================================================================
--- james/jspf/trunk/src/main/java/org/apache/james/jspf/terms/GenericModifier.java (original)
+++ james/jspf/trunk/src/main/java/org/apache/james/jspf/terms/GenericModifier.java Tue Sep  4 16:30:02 2007
@@ -22,7 +22,7 @@
 
 import org.apache.james.jspf.core.Configurable;
 import org.apache.james.jspf.core.Configuration;
-import org.apache.james.jspf.core.DNSLookupContinuation;
+import org.apache.james.jspf.dns.DNSLookupContinuation;
 import org.apache.james.jspf.core.Logger;
 import org.apache.james.jspf.core.Modifier;
 import org.apache.james.jspf.core.SPFSession;

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=572835&r1=572834&r2=572835&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 Tue Sep  4 16:30:02 2007
@@ -21,7 +21,7 @@
 package org.apache.james.jspf.terms;
 
 import org.apache.james.jspf.core.Configuration;
-import org.apache.james.jspf.core.DNSLookupContinuation;
+import org.apache.james.jspf.dns.DNSLookupContinuation;
 import org.apache.james.jspf.core.Directive;
 import org.apache.james.jspf.core.IPAddr;
 import org.apache.james.jspf.core.SPFSession;

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=572835&r1=572834&r2=572835&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 Tue Sep  4 16:30:02 2007
@@ -22,8 +22,7 @@
 
 import org.apache.james.jspf.core.Configurable;
 import org.apache.james.jspf.core.Configuration;
-import org.apache.james.jspf.core.DNSLookupContinuation;
-import org.apache.james.jspf.core.DNSResponse;
+import org.apache.james.jspf.dns.DNSLookupContinuation;
 import org.apache.james.jspf.core.Directive;
 import org.apache.james.jspf.core.Logger;
 import org.apache.james.jspf.core.Mechanism;
@@ -31,6 +30,7 @@
 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.dns.DNSResponse;
 import org.apache.james.jspf.exceptions.NeutralException;
 import org.apache.james.jspf.exceptions.NoneException;
 import org.apache.james.jspf.exceptions.PermErrorException;

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=572835&r1=572834&r2=572835&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 Tue Sep  4 16:30:02 2007
@@ -20,15 +20,15 @@
 
 package org.apache.james.jspf.terms;
 
-import org.apache.james.jspf.core.DNSLookupContinuation;
-import org.apache.james.jspf.core.DNSRequest;
-import org.apache.james.jspf.core.DNSResponse;
-import org.apache.james.jspf.core.DNSService;
+import org.apache.james.jspf.dns.DNSLookupContinuation;
 import org.apache.james.jspf.core.Directive;
 import org.apache.james.jspf.core.IPAddr;
 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.dns.DNSRequest;
+import org.apache.james.jspf.dns.DNSResponse;
+import org.apache.james.jspf.dns.DNSService;
+import org.apache.james.jspf.dns.SPFCheckerDNSResponseListener;
 import org.apache.james.jspf.exceptions.NeutralException;
 import org.apache.james.jspf.exceptions.NoneException;
 import org.apache.james.jspf.exceptions.PermErrorException;
@@ -85,7 +85,7 @@
     }
 
     /**
-     * @see org.apache.james.jspf.terms.AMechanism#onDNSResponse(org.apache.james.jspf.core.DNSResponse, org.apache.james.jspf.core.SPFSession)
+     * @see org.apache.james.jspf.terms.AMechanism#onDNSResponse(org.apache.james.jspf.dns.DNSResponse, org.apache.james.jspf.core.SPFSession)
      */
     public DNSLookupContinuation onDNSResponse(DNSResponse response, SPFSession spfSession)
         throws PermErrorException, TempErrorException, NoneException, NeutralException {

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=572835&r1=572834&r2=572835&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 Tue Sep  4 16:30:02 2007
@@ -20,15 +20,15 @@
 
 package org.apache.james.jspf.terms;
 
-import org.apache.james.jspf.core.DNSLookupContinuation;
-import org.apache.james.jspf.core.DNSRequest;
-import org.apache.james.jspf.core.DNSResponse;
-import org.apache.james.jspf.core.DNSService;
+import org.apache.james.jspf.dns.DNSLookupContinuation;
 import org.apache.james.jspf.core.Directive;
 import org.apache.james.jspf.core.IPAddr;
 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.dns.DNSRequest;
+import org.apache.james.jspf.dns.DNSResponse;
+import org.apache.james.jspf.dns.DNSService;
+import org.apache.james.jspf.dns.SPFCheckerDNSResponseListener;
 import org.apache.james.jspf.exceptions.NeutralException;
 import org.apache.james.jspf.exceptions.NoneException;
 import org.apache.james.jspf.exceptions.PermErrorException;
@@ -111,14 +111,14 @@
     }
 
     /**
-     * @see org.apache.james.jspf.wiring.DNSServiceEnabled#enableDNSService(org.apache.james.jspf.core.DNSService)
+     * @see org.apache.james.jspf.wiring.DNSServiceEnabled#enableDNSService(org.apache.james.jspf.dns.DNSService)
      */
     public void enableDNSService(DNSService service) {
         this.dnsService = service;
     }
 
     /**
-     * @see org.apache.james.jspf.core.SPFCheckerDNSResponseListener#onDNSResponse(org.apache.james.jspf.core.DNSResponse, org.apache.james.jspf.core.SPFSession)
+     * @see org.apache.james.jspf.dns.SPFCheckerDNSResponseListener#onDNSResponse(org.apache.james.jspf.dns.DNSResponse, org.apache.james.jspf.core.SPFSession)
      */
     public DNSLookupContinuation onDNSResponse(DNSResponse response, SPFSession spfSession)
             throws PermErrorException, TempErrorException, NoneException, NeutralException {

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=572835&r1=572834&r2=572835&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 Tue Sep  4 16:30:02 2007
@@ -19,7 +19,7 @@
 
 package org.apache.james.jspf.terms;
 
-import org.apache.james.jspf.core.DNSLookupContinuation;
+import org.apache.james.jspf.dns.DNSLookupContinuation;
 import org.apache.james.jspf.core.SPFChecker;
 import org.apache.james.jspf.core.SPFCheckerExceptionCatcher;
 import org.apache.james.jspf.core.SPFSession;



---------------------------------------------------------------------
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