You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by ba...@apache.org on 2007/09/17 01:13:58 UTC
svn commit: r576206 [1/2] - in /james/jspf/trunk/src:
main/java/org/apache/james/jspf/core/
main/java/org/apache/james/jspf/core/exceptions/
main/java/org/apache/james/jspf/dns/
main/java/org/apache/james/jspf/exceptions/ main/java/org/apache/james/jsp...
Author: bago
Date: Sun Sep 16 16:13:53 2007
New Revision: 576206
URL: http://svn.apache.org/viewvc?rev=576206&view=rev
Log:
More packages reorganization.
Added:
james/jspf/trunk/src/main/java/org/apache/james/jspf/core/DNSRequest.java
- copied, changed from r575933, james/jspf/trunk/src/main/java/org/apache/james/jspf/dns/DNSRequest.java
james/jspf/trunk/src/main/java/org/apache/james/jspf/core/DNSResponse.java
- copied, changed from r575933, james/jspf/trunk/src/main/java/org/apache/james/jspf/dns/DNSResponse.java
james/jspf/trunk/src/main/java/org/apache/james/jspf/core/DNSService.java
- copied, changed from r575933, james/jspf/trunk/src/main/java/org/apache/james/jspf/dns/DNSService.java
james/jspf/trunk/src/main/java/org/apache/james/jspf/core/DNSServiceEnabled.java
- copied, changed from r576205, james/jspf/trunk/src/main/java/org/apache/james/jspf/dns/DNSServiceEnabled.java
james/jspf/trunk/src/main/java/org/apache/james/jspf/core/TimeoutException.java
- copied, changed from r575933, james/jspf/trunk/src/main/java/org/apache/james/jspf/dns/TimeoutException.java
james/jspf/trunk/src/main/java/org/apache/james/jspf/core/exceptions/
james/jspf/trunk/src/main/java/org/apache/james/jspf/core/exceptions/NeutralException.java
- copied, changed from r575933, james/jspf/trunk/src/main/java/org/apache/james/jspf/exceptions/NeutralException.java
james/jspf/trunk/src/main/java/org/apache/james/jspf/core/exceptions/NoneException.java
- copied, changed from r575933, james/jspf/trunk/src/main/java/org/apache/james/jspf/exceptions/NoneException.java
james/jspf/trunk/src/main/java/org/apache/james/jspf/core/exceptions/PermErrorException.java
- copied, changed from r575933, james/jspf/trunk/src/main/java/org/apache/james/jspf/exceptions/PermErrorException.java
james/jspf/trunk/src/main/java/org/apache/james/jspf/core/exceptions/SPFErrorConstants.java
- copied, changed from r575933, james/jspf/trunk/src/main/java/org/apache/james/jspf/exceptions/SPFErrorConstants.java
james/jspf/trunk/src/main/java/org/apache/james/jspf/core/exceptions/SPFResultException.java
- copied, changed from r575933, james/jspf/trunk/src/main/java/org/apache/james/jspf/exceptions/SPFResultException.java
james/jspf/trunk/src/main/java/org/apache/james/jspf/core/exceptions/TempErrorException.java
- copied, changed from r575933, james/jspf/trunk/src/main/java/org/apache/james/jspf/exceptions/TempErrorException.java
james/jspf/trunk/src/main/java/org/apache/james/jspf/executor/DNSAsynchLookupService.java
- copied, changed from r575933, james/jspf/trunk/src/main/java/org/apache/james/jspf/dns/DNSAsynchLookupService.java
james/jspf/trunk/src/main/java/org/apache/james/jspf/executor/FutureSPFResult.java
- copied, changed from r575933, james/jspf/trunk/src/main/java/org/apache/james/jspf/core/FutureSPFResult.java
james/jspf/trunk/src/main/java/org/apache/james/jspf/executor/IResponse.java
- copied, changed from r575933, james/jspf/trunk/src/main/java/org/apache/james/jspf/dns/IResponse.java
james/jspf/trunk/src/main/java/org/apache/james/jspf/executor/IResponseImpl.java
- copied, changed from r575933, james/jspf/trunk/src/main/java/org/apache/james/jspf/dns/IResponseImpl.java
james/jspf/trunk/src/main/java/org/apache/james/jspf/executor/IResponseQueue.java
- copied, changed from r575933, james/jspf/trunk/src/main/java/org/apache/james/jspf/dns/IResponseQueue.java
james/jspf/trunk/src/main/java/org/apache/james/jspf/executor/SPFResult.java
- copied, changed from r575933, james/jspf/trunk/src/main/java/org/apache/james/jspf/core/SPFResult.java
james/jspf/trunk/src/main/java/org/apache/james/jspf/terms/Directive.java
- copied, changed from r575933, james/jspf/trunk/src/main/java/org/apache/james/jspf/core/Directive.java
james/jspf/trunk/src/main/java/org/apache/james/jspf/terms/Mechanism.java
- copied, changed from r575933, james/jspf/trunk/src/main/java/org/apache/james/jspf/core/Mechanism.java
james/jspf/trunk/src/main/java/org/apache/james/jspf/terms/Modifier.java
- copied, changed from r575933, james/jspf/trunk/src/main/java/org/apache/james/jspf/core/Modifier.java
Removed:
james/jspf/trunk/src/main/java/org/apache/james/jspf/core/Directive.java
james/jspf/trunk/src/main/java/org/apache/james/jspf/core/FutureSPFResult.java
james/jspf/trunk/src/main/java/org/apache/james/jspf/core/Mechanism.java
james/jspf/trunk/src/main/java/org/apache/james/jspf/core/Modifier.java
james/jspf/trunk/src/main/java/org/apache/james/jspf/core/SPFResult.java
james/jspf/trunk/src/main/java/org/apache/james/jspf/dns/DNSAsynchLookupService.java
james/jspf/trunk/src/main/java/org/apache/james/jspf/dns/DNSRequest.java
james/jspf/trunk/src/main/java/org/apache/james/jspf/dns/DNSResponse.java
james/jspf/trunk/src/main/java/org/apache/james/jspf/dns/DNSService.java
james/jspf/trunk/src/main/java/org/apache/james/jspf/dns/DNSServiceEnabled.java
james/jspf/trunk/src/main/java/org/apache/james/jspf/dns/IResponse.java
james/jspf/trunk/src/main/java/org/apache/james/jspf/dns/IResponseImpl.java
james/jspf/trunk/src/main/java/org/apache/james/jspf/dns/IResponseQueue.java
james/jspf/trunk/src/main/java/org/apache/james/jspf/dns/TimeoutException.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/SPFErrorConstants.java
james/jspf/trunk/src/main/java/org/apache/james/jspf/exceptions/SPFResultException.java
james/jspf/trunk/src/main/java/org/apache/james/jspf/exceptions/TempErrorException.java
Modified:
james/jspf/trunk/src/main/java/org/apache/james/jspf/core/Configurable.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/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/core/SPF1Utils.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/SPFCheckerDNSResponseListener.java
james/jspf/trunk/src/main/java/org/apache/james/jspf/core/SPFCheckerExceptionCatcher.java
james/jspf/trunk/src/main/java/org/apache/james/jspf/core/SPFRecordParser.java
james/jspf/trunk/src/main/java/org/apache/james/jspf/core/SPFSession.java
james/jspf/trunk/src/main/java/org/apache/james/jspf/executor/SPFExecutor.java
james/jspf/trunk/src/main/java/org/apache/james/jspf/executor/StagedMultipleSPFExecutor.java
james/jspf/trunk/src/main/java/org/apache/james/jspf/executor/SynchronousSPFExecutor.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/SPF.java
james/jspf/trunk/src/main/java/org/apache/james/jspf/impl/SPFQuery.java
james/jspf/trunk/src/main/java/org/apache/james/jspf/parser/DefaultTermsFactory.java
james/jspf/trunk/src/main/java/org/apache/james/jspf/parser/RFC4408SPF1Parser.java
james/jspf/trunk/src/main/java/org/apache/james/jspf/parser/TermsFactory.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/NoSPFRecordFoundPolicy.java
james/jspf/trunk/src/main/java/org/apache/james/jspf/policies/ParseRecordPolicy.java
james/jspf/trunk/src/main/java/org/apache/james/jspf/policies/Policy.java
james/jspf/trunk/src/main/java/org/apache/james/jspf/policies/PolicyPostFilter.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/policies/local/FallbackPolicy.java
james/jspf/trunk/src/main/java/org/apache/james/jspf/policies/local/OverridePolicy.java
james/jspf/trunk/src/main/java/org/apache/james/jspf/policies/local/TrustedForwarderPolicy.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/GenericMechanism.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/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/SPF1ParserTest.java
james/jspf/trunk/src/test/java/org/apache/james/jspf/core/IPAddrTest.java
james/jspf/trunk/src/test/java/org/apache/james/jspf/core/MacroExpandTest.java
james/jspf/trunk/src/test/java/org/apache/james/jspf/core/SPFSessionTest.java
Modified: james/jspf/trunk/src/main/java/org/apache/james/jspf/core/Configurable.java
URL: http://svn.apache.org/viewvc/james/jspf/trunk/src/main/java/org/apache/james/jspf/core/Configurable.java?rev=576206&r1=576205&r2=576206&view=diff
==============================================================================
--- james/jspf/trunk/src/main/java/org/apache/james/jspf/core/Configurable.java (original)
+++ james/jspf/trunk/src/main/java/org/apache/james/jspf/core/Configurable.java Sun Sep 16 16:13:53 2007
@@ -20,7 +20,7 @@
package org.apache.james.jspf.core;
-import org.apache.james.jspf.exceptions.PermErrorException;
+import org.apache.james.jspf.core.exceptions.PermErrorException;
/**
*
Modified: 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/core/DNSLookupContinuation.java?rev=576206&r1=576205&r2=576206&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/core/DNSLookupContinuation.java Sun Sep 16 16:13:53 2007
@@ -19,7 +19,6 @@
package org.apache.james.jspf.core;
-import org.apache.james.jspf.dns.DNSRequest;
/**
Copied: james/jspf/trunk/src/main/java/org/apache/james/jspf/core/DNSRequest.java (from r575933, james/jspf/trunk/src/main/java/org/apache/james/jspf/dns/DNSRequest.java)
URL: http://svn.apache.org/viewvc/james/jspf/trunk/src/main/java/org/apache/james/jspf/core/DNSRequest.java?p2=james/jspf/trunk/src/main/java/org/apache/james/jspf/core/DNSRequest.java&p1=james/jspf/trunk/src/main/java/org/apache/james/jspf/dns/DNSRequest.java&r1=575933&r2=576206&rev=576206&view=diff
==============================================================================
--- james/jspf/trunk/src/main/java/org/apache/james/jspf/dns/DNSRequest.java (original)
+++ james/jspf/trunk/src/main/java/org/apache/james/jspf/core/DNSRequest.java Sun Sep 16 16:13:53 2007
@@ -17,9 +17,9 @@
* under the License. *
****************************************************************/
-package org.apache.james.jspf.dns;
+package org.apache.james.jspf.core;
-import org.apache.james.jspf.exceptions.NoneException;
+import org.apache.james.jspf.core.exceptions.NoneException;
import org.xbill.DNS.Name;
import org.xbill.DNS.TextParseException;
Copied: james/jspf/trunk/src/main/java/org/apache/james/jspf/core/DNSResponse.java (from r575933, james/jspf/trunk/src/main/java/org/apache/james/jspf/dns/DNSResponse.java)
URL: http://svn.apache.org/viewvc/james/jspf/trunk/src/main/java/org/apache/james/jspf/core/DNSResponse.java?p2=james/jspf/trunk/src/main/java/org/apache/james/jspf/core/DNSResponse.java&p1=james/jspf/trunk/src/main/java/org/apache/james/jspf/dns/DNSResponse.java&r1=575933&r2=576206&rev=576206&view=diff
==============================================================================
--- james/jspf/trunk/src/main/java/org/apache/james/jspf/dns/DNSResponse.java (original)
+++ james/jspf/trunk/src/main/java/org/apache/james/jspf/core/DNSResponse.java Sun Sep 16 16:13:53 2007
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.jspf.dns;
+package org.apache.james.jspf.core;
import java.util.List;
Copied: james/jspf/trunk/src/main/java/org/apache/james/jspf/core/DNSService.java (from r575933, james/jspf/trunk/src/main/java/org/apache/james/jspf/dns/DNSService.java)
URL: http://svn.apache.org/viewvc/james/jspf/trunk/src/main/java/org/apache/james/jspf/core/DNSService.java?p2=james/jspf/trunk/src/main/java/org/apache/james/jspf/core/DNSService.java&p1=james/jspf/trunk/src/main/java/org/apache/james/jspf/dns/DNSService.java&r1=575933&r2=576206&rev=576206&view=diff
==============================================================================
--- james/jspf/trunk/src/main/java/org/apache/james/jspf/dns/DNSService.java (original)
+++ james/jspf/trunk/src/main/java/org/apache/james/jspf/core/DNSService.java Sun Sep 16 16:13:53 2007
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.jspf.dns;
+package org.apache.james.jspf.core;
import java.util.List;
Copied: james/jspf/trunk/src/main/java/org/apache/james/jspf/core/DNSServiceEnabled.java (from r576205, james/jspf/trunk/src/main/java/org/apache/james/jspf/dns/DNSServiceEnabled.java)
URL: http://svn.apache.org/viewvc/james/jspf/trunk/src/main/java/org/apache/james/jspf/core/DNSServiceEnabled.java?p2=james/jspf/trunk/src/main/java/org/apache/james/jspf/core/DNSServiceEnabled.java&p1=james/jspf/trunk/src/main/java/org/apache/james/jspf/dns/DNSServiceEnabled.java&r1=576205&r2=576206&rev=576206&view=diff
==============================================================================
--- james/jspf/trunk/src/main/java/org/apache/james/jspf/dns/DNSServiceEnabled.java (original)
+++ james/jspf/trunk/src/main/java/org/apache/james/jspf/core/DNSServiceEnabled.java Sun Sep 16 16:13:53 2007
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.jspf.dns;
+package org.apache.james.jspf.core;
/**
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=576206&r1=576205&r2=576206&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 Sun Sep 16 16:13:53 2007
@@ -21,7 +21,7 @@
import java.net.UnknownHostException;
-import org.apache.james.jspf.exceptions.PermErrorException;
+import org.apache.james.jspf.core.exceptions.PermErrorException;
import org.xbill.DNS.Address;
public class IPAddr {
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=576206&r1=576205&r2=576206&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 Sun Sep 16 16:13:53 2007
@@ -26,14 +26,10 @@
*
*/
-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.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.core.exceptions.NeutralException;
+import org.apache.james.jspf.core.exceptions.NoneException;
+import org.apache.james.jspf.core.exceptions.PermErrorException;
+import org.apache.james.jspf.core.exceptions.TempErrorException;
import java.io.UnsupportedEncodingException;
import java.net.URLEncoder;
@@ -90,7 +86,7 @@
SPFCheckerDNSResponseListener {
/**
- * @see org.apache.james.jspf.core.SPFCheckerDNSResponseListener#onDNSResponse(org.apache.james.jspf.dns.DNSResponse, org.apache.james.jspf.core.SPFSession)
+ * @see org.apache.james.jspf.core.SPFCheckerDNSResponseListener#onDNSResponse(org.apache.james.jspf.core.DNSResponse, org.apache.james.jspf.core.SPFSession)
*/
public DNSLookupContinuation onDNSResponse(DNSResponse response, SPFSession session)
throws PermErrorException, NoneException, TempErrorException,
@@ -127,7 +123,7 @@
SPFCheckerDNSResponseListener {
/**
- * @see org.apache.james.jspf.core.SPFCheckerDNSResponseListener#onDNSResponse(org.apache.james.jspf.dns.DNSResponse, org.apache.james.jspf.core.SPFSession)
+ * @see org.apache.james.jspf.core.SPFCheckerDNSResponseListener#onDNSResponse(org.apache.james.jspf.core.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/core/SPF1Utils.java
URL: http://svn.apache.org/viewvc/james/jspf/trunk/src/main/java/org/apache/james/jspf/core/SPF1Utils.java?rev=576206&r1=576205&r2=576206&view=diff
==============================================================================
--- james/jspf/trunk/src/main/java/org/apache/james/jspf/core/SPF1Utils.java (original)
+++ james/jspf/trunk/src/main/java/org/apache/james/jspf/core/SPF1Utils.java Sun Sep 16 16:13:53 2007
@@ -20,7 +20,7 @@
package org.apache.james.jspf.core;
-import org.apache.james.jspf.exceptions.SPFErrorConstants;
+import org.apache.james.jspf.core.exceptions.SPFErrorConstants;
/**
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=576206&r1=576205&r2=576206&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 Sun Sep 16 16:13:53 2007
@@ -19,10 +19,10 @@
package org.apache.james.jspf.core;
-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.core.exceptions.NeutralException;
+import org.apache.james.jspf.core.exceptions.NoneException;
+import org.apache.james.jspf.core.exceptions.PermErrorException;
+import org.apache.james.jspf.core.exceptions.TempErrorException;
/**
* Interface for the SPFChecker service.
Modified: 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/core/SPFCheckerDNSResponseListener.java?rev=576206&r1=576205&r2=576206&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/core/SPFCheckerDNSResponseListener.java Sun Sep 16 16:13:53 2007
@@ -19,11 +19,10 @@
package org.apache.james.jspf.core;
-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;
-import org.apache.james.jspf.exceptions.TempErrorException;
+import org.apache.james.jspf.core.exceptions.NeutralException;
+import org.apache.james.jspf.core.exceptions.NoneException;
+import org.apache.james.jspf.core.exceptions.PermErrorException;
+import org.apache.james.jspf.core.exceptions.TempErrorException;
/**
*
Modified: james/jspf/trunk/src/main/java/org/apache/james/jspf/core/SPFCheckerExceptionCatcher.java
URL: http://svn.apache.org/viewvc/james/jspf/trunk/src/main/java/org/apache/james/jspf/core/SPFCheckerExceptionCatcher.java?rev=576206&r1=576205&r2=576206&view=diff
==============================================================================
--- james/jspf/trunk/src/main/java/org/apache/james/jspf/core/SPFCheckerExceptionCatcher.java (original)
+++ james/jspf/trunk/src/main/java/org/apache/james/jspf/core/SPFCheckerExceptionCatcher.java Sun Sep 16 16:13:53 2007
@@ -19,10 +19,10 @@
package org.apache.james.jspf.core;
-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.core.exceptions.NeutralException;
+import org.apache.james.jspf.core.exceptions.NoneException;
+import org.apache.james.jspf.core.exceptions.PermErrorException;
+import org.apache.james.jspf.core.exceptions.TempErrorException;
/**
*
Modified: james/jspf/trunk/src/main/java/org/apache/james/jspf/core/SPFRecordParser.java
URL: http://svn.apache.org/viewvc/james/jspf/trunk/src/main/java/org/apache/james/jspf/core/SPFRecordParser.java?rev=576206&r1=576205&r2=576206&view=diff
==============================================================================
--- james/jspf/trunk/src/main/java/org/apache/james/jspf/core/SPFRecordParser.java (original)
+++ james/jspf/trunk/src/main/java/org/apache/james/jspf/core/SPFRecordParser.java Sun Sep 16 16:13:53 2007
@@ -19,9 +19,9 @@
package org.apache.james.jspf.core;
-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.core.exceptions.NeutralException;
+import org.apache.james.jspf.core.exceptions.NoneException;
+import org.apache.james.jspf.core.exceptions.PermErrorException;
/**
*
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=576206&r1=576205&r2=576206&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 Sun Sep 16 16:13:53 2007
@@ -20,8 +20,8 @@
package org.apache.james.jspf.core;
-import org.apache.james.jspf.exceptions.NoneException;
-import org.apache.james.jspf.exceptions.PermErrorException;
+import org.apache.james.jspf.core.exceptions.NoneException;
+import org.apache.james.jspf.core.exceptions.PermErrorException;
import java.util.HashMap;
import java.util.Map;
Copied: james/jspf/trunk/src/main/java/org/apache/james/jspf/core/TimeoutException.java (from r575933, james/jspf/trunk/src/main/java/org/apache/james/jspf/dns/TimeoutException.java)
URL: http://svn.apache.org/viewvc/james/jspf/trunk/src/main/java/org/apache/james/jspf/core/TimeoutException.java?p2=james/jspf/trunk/src/main/java/org/apache/james/jspf/core/TimeoutException.java&p1=james/jspf/trunk/src/main/java/org/apache/james/jspf/dns/TimeoutException.java&r1=575933&r2=576206&rev=576206&view=diff
==============================================================================
--- james/jspf/trunk/src/main/java/org/apache/james/jspf/dns/TimeoutException.java (original)
+++ james/jspf/trunk/src/main/java/org/apache/james/jspf/core/TimeoutException.java Sun Sep 16 16:13:53 2007
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.jspf.dns;
+package org.apache.james.jspf.core;
/**
* The exception thrown on lookup timeout
Copied: james/jspf/trunk/src/main/java/org/apache/james/jspf/core/exceptions/NeutralException.java (from r575933, 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/core/exceptions/NeutralException.java?p2=james/jspf/trunk/src/main/java/org/apache/james/jspf/core/exceptions/NeutralException.java&p1=james/jspf/trunk/src/main/java/org/apache/james/jspf/exceptions/NeutralException.java&r1=575933&r2=576206&rev=576206&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/core/exceptions/NeutralException.java Sun Sep 16 16:13:53 2007
@@ -18,7 +18,7 @@
****************************************************************/
-package org.apache.james.jspf.exceptions;
+package org.apache.james.jspf.core.exceptions;
/**
@@ -32,7 +32,7 @@
}
/**
- * @see org.apache.james.jspf.exceptions.SPFResultException#getResult()
+ * @see org.apache.james.jspf.core.exceptions.SPFResultException#getResult()
*/
public String getResult() {
return SPFErrorConstants.NEUTRAL_CONV;
Copied: james/jspf/trunk/src/main/java/org/apache/james/jspf/core/exceptions/NoneException.java (from r575933, 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/core/exceptions/NoneException.java?p2=james/jspf/trunk/src/main/java/org/apache/james/jspf/core/exceptions/NoneException.java&p1=james/jspf/trunk/src/main/java/org/apache/james/jspf/exceptions/NoneException.java&r1=575933&r2=576206&rev=576206&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/core/exceptions/NoneException.java Sun Sep 16 16:13:53 2007
@@ -18,7 +18,7 @@
****************************************************************/
-package org.apache.james.jspf.exceptions;
+package org.apache.james.jspf.core.exceptions;
/**
@@ -32,7 +32,7 @@
}
/**
- * @see org.apache.james.jspf.exceptions.SPFResultException#getResult()
+ * @see org.apache.james.jspf.core.exceptions.SPFResultException#getResult()
*/
public String getResult() {
return SPFErrorConstants.NONE_CONV;
Copied: james/jspf/trunk/src/main/java/org/apache/james/jspf/core/exceptions/PermErrorException.java (from r575933, 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/core/exceptions/PermErrorException.java?p2=james/jspf/trunk/src/main/java/org/apache/james/jspf/core/exceptions/PermErrorException.java&p1=james/jspf/trunk/src/main/java/org/apache/james/jspf/exceptions/PermErrorException.java&r1=575933&r2=576206&rev=576206&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/core/exceptions/PermErrorException.java Sun Sep 16 16:13:53 2007
@@ -18,7 +18,7 @@
****************************************************************/
-package org.apache.james.jspf.exceptions;
+package org.apache.james.jspf.core.exceptions;
/**
@@ -32,7 +32,7 @@
}
/**
- * @see org.apache.james.jspf.exceptions.SPFResultException#getResult()
+ * @see org.apache.james.jspf.core.exceptions.SPFResultException#getResult()
*/
public String getResult() {
return SPFErrorConstants.PERM_ERROR_CONV;
Copied: james/jspf/trunk/src/main/java/org/apache/james/jspf/core/exceptions/SPFErrorConstants.java (from r575933, 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/core/exceptions/SPFErrorConstants.java?p2=james/jspf/trunk/src/main/java/org/apache/james/jspf/core/exceptions/SPFErrorConstants.java&p1=james/jspf/trunk/src/main/java/org/apache/james/jspf/exceptions/SPFErrorConstants.java&r1=575933&r2=576206&rev=576206&view=diff
==============================================================================
--- james/jspf/trunk/src/main/java/org/apache/james/jspf/exceptions/SPFErrorConstants.java (original)
+++ james/jspf/trunk/src/main/java/org/apache/james/jspf/core/exceptions/SPFErrorConstants.java Sun Sep 16 16:13:53 2007
@@ -18,7 +18,7 @@
****************************************************************/
-package org.apache.james.jspf.exceptions;
+package org.apache.james.jspf.core.exceptions;
public interface SPFErrorConstants {
Copied: james/jspf/trunk/src/main/java/org/apache/james/jspf/core/exceptions/SPFResultException.java (from r575933, james/jspf/trunk/src/main/java/org/apache/james/jspf/exceptions/SPFResultException.java)
URL: http://svn.apache.org/viewvc/james/jspf/trunk/src/main/java/org/apache/james/jspf/core/exceptions/SPFResultException.java?p2=james/jspf/trunk/src/main/java/org/apache/james/jspf/core/exceptions/SPFResultException.java&p1=james/jspf/trunk/src/main/java/org/apache/james/jspf/exceptions/SPFResultException.java&r1=575933&r2=576206&rev=576206&view=diff
==============================================================================
--- james/jspf/trunk/src/main/java/org/apache/james/jspf/exceptions/SPFResultException.java (original)
+++ james/jspf/trunk/src/main/java/org/apache/james/jspf/core/exceptions/SPFResultException.java Sun Sep 16 16:13:53 2007
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.jspf.exceptions;
+package org.apache.james.jspf.core.exceptions;
/**
* Root exception for SPF methods
Copied: james/jspf/trunk/src/main/java/org/apache/james/jspf/core/exceptions/TempErrorException.java (from r575933, 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/core/exceptions/TempErrorException.java?p2=james/jspf/trunk/src/main/java/org/apache/james/jspf/core/exceptions/TempErrorException.java&p1=james/jspf/trunk/src/main/java/org/apache/james/jspf/exceptions/TempErrorException.java&r1=575933&r2=576206&rev=576206&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/core/exceptions/TempErrorException.java Sun Sep 16 16:13:53 2007
@@ -18,7 +18,7 @@
****************************************************************/
-package org.apache.james.jspf.exceptions;
+package org.apache.james.jspf.core.exceptions;
/**
@@ -32,7 +32,7 @@
}
/**
- * @see org.apache.james.jspf.exceptions.SPFResultException#getResult()
+ * @see org.apache.james.jspf.core.exceptions.SPFResultException#getResult()
*/
public String getResult() {
return SPFErrorConstants.TEMP_ERROR_CONV;
Copied: james/jspf/trunk/src/main/java/org/apache/james/jspf/executor/DNSAsynchLookupService.java (from r575933, james/jspf/trunk/src/main/java/org/apache/james/jspf/dns/DNSAsynchLookupService.java)
URL: http://svn.apache.org/viewvc/james/jspf/trunk/src/main/java/org/apache/james/jspf/executor/DNSAsynchLookupService.java?p2=james/jspf/trunk/src/main/java/org/apache/james/jspf/executor/DNSAsynchLookupService.java&p1=james/jspf/trunk/src/main/java/org/apache/james/jspf/dns/DNSAsynchLookupService.java&r1=575933&r2=576206&rev=576206&view=diff
==============================================================================
--- james/jspf/trunk/src/main/java/org/apache/james/jspf/dns/DNSAsynchLookupService.java (original)
+++ james/jspf/trunk/src/main/java/org/apache/james/jspf/executor/DNSAsynchLookupService.java Sun Sep 16 16:13:53 2007
@@ -17,7 +17,9 @@
* under the License. *
****************************************************************/
-package org.apache.james.jspf.dns;
+package org.apache.james.jspf.executor;
+
+import org.apache.james.jspf.core.DNSRequest;
Copied: james/jspf/trunk/src/main/java/org/apache/james/jspf/executor/FutureSPFResult.java (from r575933, james/jspf/trunk/src/main/java/org/apache/james/jspf/core/FutureSPFResult.java)
URL: http://svn.apache.org/viewvc/james/jspf/trunk/src/main/java/org/apache/james/jspf/executor/FutureSPFResult.java?p2=james/jspf/trunk/src/main/java/org/apache/james/jspf/executor/FutureSPFResult.java&p1=james/jspf/trunk/src/main/java/org/apache/james/jspf/core/FutureSPFResult.java&r1=575933&r2=576206&rev=576206&view=diff
==============================================================================
--- james/jspf/trunk/src/main/java/org/apache/james/jspf/core/FutureSPFResult.java (original)
+++ james/jspf/trunk/src/main/java/org/apache/james/jspf/executor/FutureSPFResult.java Sun Sep 16 16:13:53 2007
@@ -17,7 +17,9 @@
* under the License. *
****************************************************************/
-package org.apache.james.jspf.core;
+package org.apache.james.jspf.executor;
+
+import org.apache.james.jspf.core.SPFSession;
/**
@@ -59,7 +61,7 @@
}
/**
- * @see org.apache.james.jspf.core.SPFResult#getExplanation()
+ * @see org.apache.james.jspf.executor.SPFResult#getExplanation()
*/
public String getExplanation() {
checkReady();
@@ -67,7 +69,7 @@
}
/**
- * @see org.apache.james.jspf.core.SPFResult#getHeader()
+ * @see org.apache.james.jspf.executor.SPFResult#getHeader()
*/
public String getHeader() {
checkReady();
@@ -75,7 +77,7 @@
}
/**
- * @see org.apache.james.jspf.core.SPFResult#getHeaderName()
+ * @see org.apache.james.jspf.executor.SPFResult#getHeaderName()
*/
public String getHeaderName() {
checkReady();
@@ -83,7 +85,7 @@
}
/**
- * @see org.apache.james.jspf.core.SPFResult#getHeaderText()
+ * @see org.apache.james.jspf.executor.SPFResult#getHeaderText()
*/
public String getHeaderText() {
checkReady();
@@ -91,7 +93,7 @@
}
/**
- * @see org.apache.james.jspf.core.SPFResult#getResult()
+ * @see org.apache.james.jspf.executor.SPFResult#getResult()
*/
public String getResult() {
checkReady();
Copied: james/jspf/trunk/src/main/java/org/apache/james/jspf/executor/IResponse.java (from r575933, james/jspf/trunk/src/main/java/org/apache/james/jspf/dns/IResponse.java)
URL: http://svn.apache.org/viewvc/james/jspf/trunk/src/main/java/org/apache/james/jspf/executor/IResponse.java?p2=james/jspf/trunk/src/main/java/org/apache/james/jspf/executor/IResponse.java&p1=james/jspf/trunk/src/main/java/org/apache/james/jspf/dns/IResponse.java&r1=575933&r2=576206&rev=576206&view=diff
==============================================================================
--- james/jspf/trunk/src/main/java/org/apache/james/jspf/dns/IResponse.java (original)
+++ james/jspf/trunk/src/main/java/org/apache/james/jspf/executor/IResponse.java Sun Sep 16 16:13:53 2007
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.jspf.dns;
+package org.apache.james.jspf.executor;
public interface IResponse {
Copied: james/jspf/trunk/src/main/java/org/apache/james/jspf/executor/IResponseImpl.java (from r575933, james/jspf/trunk/src/main/java/org/apache/james/jspf/dns/IResponseImpl.java)
URL: http://svn.apache.org/viewvc/james/jspf/trunk/src/main/java/org/apache/james/jspf/executor/IResponseImpl.java?p2=james/jspf/trunk/src/main/java/org/apache/james/jspf/executor/IResponseImpl.java&p1=james/jspf/trunk/src/main/java/org/apache/james/jspf/dns/IResponseImpl.java&r1=575933&r2=576206&rev=576206&view=diff
==============================================================================
--- james/jspf/trunk/src/main/java/org/apache/james/jspf/dns/IResponseImpl.java (original)
+++ james/jspf/trunk/src/main/java/org/apache/james/jspf/executor/IResponseImpl.java Sun Sep 16 16:13:53 2007
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.jspf.dns;
+package org.apache.james.jspf.executor;
import java.util.List;
@@ -42,21 +42,21 @@
}
/**
- * @see org.apache.james.jspf.dns.IResponse#getException()
+ * @see org.apache.james.jspf.executor.IResponse#getException()
*/
public Exception getException() {
return exception;
}
/**
- * @see org.apache.james.jspf.dns.IResponse#getId()
+ * @see org.apache.james.jspf.executor.IResponse#getId()
*/
public Object getId() {
return id;
}
/**
- * @see org.apache.james.jspf.dns.IResponse#getValue()
+ * @see org.apache.james.jspf.executor.IResponse#getValue()
*/
public Object getValue() {
return value;
Copied: james/jspf/trunk/src/main/java/org/apache/james/jspf/executor/IResponseQueue.java (from r575933, james/jspf/trunk/src/main/java/org/apache/james/jspf/dns/IResponseQueue.java)
URL: http://svn.apache.org/viewvc/james/jspf/trunk/src/main/java/org/apache/james/jspf/executor/IResponseQueue.java?p2=james/jspf/trunk/src/main/java/org/apache/james/jspf/executor/IResponseQueue.java&p1=james/jspf/trunk/src/main/java/org/apache/james/jspf/dns/IResponseQueue.java&r1=575933&r2=576206&rev=576206&view=diff
==============================================================================
--- james/jspf/trunk/src/main/java/org/apache/james/jspf/dns/IResponseQueue.java (original)
+++ james/jspf/trunk/src/main/java/org/apache/james/jspf/executor/IResponseQueue.java Sun Sep 16 16:13:53 2007
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.jspf.dns;
+package org.apache.james.jspf.executor;
import java.util.List;
Modified: james/jspf/trunk/src/main/java/org/apache/james/jspf/executor/SPFExecutor.java
URL: http://svn.apache.org/viewvc/james/jspf/trunk/src/main/java/org/apache/james/jspf/executor/SPFExecutor.java?rev=576206&r1=576205&r2=576206&view=diff
==============================================================================
--- james/jspf/trunk/src/main/java/org/apache/james/jspf/executor/SPFExecutor.java (original)
+++ james/jspf/trunk/src/main/java/org/apache/james/jspf/executor/SPFExecutor.java Sun Sep 16 16:13:53 2007
@@ -19,7 +19,6 @@
package org.apache.james.jspf.executor;
-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/SPFResult.java (from r575933, james/jspf/trunk/src/main/java/org/apache/james/jspf/core/SPFResult.java)
URL: http://svn.apache.org/viewvc/james/jspf/trunk/src/main/java/org/apache/james/jspf/executor/SPFResult.java?p2=james/jspf/trunk/src/main/java/org/apache/james/jspf/executor/SPFResult.java&p1=james/jspf/trunk/src/main/java/org/apache/james/jspf/core/SPFResult.java&r1=575933&r2=576206&rev=576206&view=diff
==============================================================================
--- james/jspf/trunk/src/main/java/org/apache/james/jspf/core/SPFResult.java (original)
+++ james/jspf/trunk/src/main/java/org/apache/james/jspf/executor/SPFResult.java Sun Sep 16 16:13:53 2007
@@ -18,9 +18,11 @@
****************************************************************/
-package org.apache.james.jspf.core;
+package org.apache.james.jspf.executor;
-import org.apache.james.jspf.exceptions.SPFErrorConstants;
+import org.apache.james.jspf.core.SPF1Utils;
+import org.apache.james.jspf.core.SPFSession;
+import org.apache.james.jspf.core.exceptions.SPFErrorConstants;
/**
Modified: james/jspf/trunk/src/main/java/org/apache/james/jspf/executor/StagedMultipleSPFExecutor.java
URL: http://svn.apache.org/viewvc/james/jspf/trunk/src/main/java/org/apache/james/jspf/executor/StagedMultipleSPFExecutor.java?rev=576206&r1=576205&r2=576206&view=diff
==============================================================================
--- james/jspf/trunk/src/main/java/org/apache/james/jspf/executor/StagedMultipleSPFExecutor.java (original)
+++ james/jspf/trunk/src/main/java/org/apache/james/jspf/executor/StagedMultipleSPFExecutor.java Sun Sep 16 16:13:53 2007
@@ -20,17 +20,13 @@
package org.apache.james.jspf.executor;
import org.apache.james.jspf.core.DNSLookupContinuation;
-import org.apache.james.jspf.core.FutureSPFResult;
+import org.apache.james.jspf.core.DNSResponse;
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.TimeoutException;
-import org.apache.james.jspf.exceptions.SPFResultException;
+import org.apache.james.jspf.core.TimeoutException;
+import org.apache.james.jspf.core.exceptions.SPFResultException;
import java.util.Collections;
import java.util.HashMap;
@@ -51,7 +47,7 @@
private int waitingThreads = 0;
/**
- * @see org.apache.james.jspf.dns.IResponseQueue#insertResponse(org.apache.james.jspf.dns.IResponse)
+ * @see org.apache.james.jspf.executor.IResponseQueue#insertResponse(org.apache.james.jspf.executor.IResponse)
*/
public synchronized void insertResponse(IResponse r) {
addLast(r);
@@ -59,7 +55,7 @@
}
/**
- * @see org.apache.james.jspf.dns.IResponseQueue#removeResponse()
+ * @see org.apache.james.jspf.executor.IResponseQueue#removeResponse()
*/
public synchronized IResponse removeResponse() {
if ( (size() - waitingThreads <= 0) ) {
@@ -112,7 +108,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.executor.SPFExecutor#execute(org.apache.james.jspf.core.SPFSession, org.apache.james.jspf.core.FutureSPFResult)
+ * @see org.apache.james.jspf.executor.SPFExecutor#execute(org.apache.james.jspf.core.SPFSession, org.apache.james.jspf.executor.FutureSPFResult)
*/
public void execute(SPFSession session, FutureSPFResult result) {
execute(session, result, true);
Modified: james/jspf/trunk/src/main/java/org/apache/james/jspf/executor/SynchronousSPFExecutor.java
URL: http://svn.apache.org/viewvc/james/jspf/trunk/src/main/java/org/apache/james/jspf/executor/SynchronousSPFExecutor.java?rev=576206&r1=576205&r2=576206&view=diff
==============================================================================
--- james/jspf/trunk/src/main/java/org/apache/james/jspf/executor/SynchronousSPFExecutor.java (original)
+++ james/jspf/trunk/src/main/java/org/apache/james/jspf/executor/SynchronousSPFExecutor.java Sun Sep 16 16:13:53 2007
@@ -20,15 +20,14 @@
package org.apache.james.jspf.executor;
import org.apache.james.jspf.core.DNSLookupContinuation;
-import org.apache.james.jspf.core.FutureSPFResult;
+import org.apache.james.jspf.core.DNSResponse;
+import org.apache.james.jspf.core.DNSService;
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.TimeoutException;
-import org.apache.james.jspf.exceptions.SPFResultException;
+import org.apache.james.jspf.core.TimeoutException;
+import org.apache.james.jspf.core.exceptions.SPFResultException;
/**
* Synchronous implementation of SPFExecuter. All queries will get executed synchronously
@@ -44,7 +43,7 @@
}
/**
- * @see org.apache.james.jspf.executor.SPFExecutor#execute(org.apache.james.jspf.core.SPFSession, org.apache.james.jspf.core.FutureSPFResult)
+ * @see org.apache.james.jspf.executor.SPFExecutor#execute(org.apache.james.jspf.core.SPFSession, org.apache.james.jspf.executor.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=576206&r1=576205&r2=576206&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 Sun Sep 16 16:13:53 2007
@@ -19,11 +19,11 @@
package org.apache.james.jspf.impl;
-import org.apache.james.jspf.dns.DNSAsynchLookupService;
-import org.apache.james.jspf.dns.DNSRequest;
-import org.apache.james.jspf.dns.IResponse;
-import org.apache.james.jspf.dns.IResponseQueue;
-import org.apache.james.jspf.dns.TimeoutException;
+import org.apache.james.jspf.core.DNSRequest;
+import org.apache.james.jspf.core.TimeoutException;
+import org.apache.james.jspf.executor.DNSAsynchLookupService;
+import org.apache.james.jspf.executor.IResponse;
+import org.apache.james.jspf.executor.IResponseQueue;
import org.xbill.DNS.DClass;
import org.xbill.DNS.ExtendedNonblockingResolver;
import org.xbill.DNS.LookupAsynch;
@@ -116,7 +116,7 @@
}
/**
- * @see org.apache.james.jspf.dns.DNSAsynchLookupService#getRecordsAsynch(org.apache.james.jspf.dns.DNSRequest, java.lang.Object, org.apache.james.jspf.dns.IResponseQueue)
+ * @see org.apache.james.jspf.executor.DNSAsynchLookupService#getRecordsAsynch(org.apache.james.jspf.core.DNSRequest, java.lang.Object, org.apache.james.jspf.executor.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=576206&r1=576205&r2=576206&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 Sun Sep 16 16:13:53 2007
@@ -19,12 +19,12 @@
package org.apache.james.jspf.impl;
-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.TimeoutException;
+import org.apache.james.jspf.core.DNSRequest;
+import org.apache.james.jspf.core.DNSService;
+import org.apache.james.jspf.core.TimeoutException;
+import org.apache.james.jspf.executor.DNSAsynchLookupService;
+import org.apache.james.jspf.executor.IResponseImpl;
+import org.apache.james.jspf.executor.IResponseQueue;
import java.util.LinkedList;
@@ -74,7 +74,7 @@
}
/**
- * @see org.apache.james.jspf.dns.DNSService#getRecordsAsynch(java.lang.String, int, java.lang.Object, org.apache.james.jspf.dns.IResponseQueue)
+ * @see org.apache.james.jspf.core.DNSService#getRecordsAsynch(java.lang.String, int, java.lang.Object, org.apache.james.jspf.executor.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=576206&r1=576205&r2=576206&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 Sun Sep 16 16:13:53 2007
@@ -19,11 +19,11 @@
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.apache.james.jspf.dns.TimeoutException;
+import org.apache.james.jspf.core.TimeoutException;
import org.xbill.DNS.AAAARecord;
import org.xbill.DNS.ARecord;
import org.xbill.DNS.Lookup;
@@ -65,7 +65,7 @@
}
/**
- * @see org.apache.james.jspf.dns.DNSService#setTimeOut(int)
+ * @see org.apache.james.jspf.core.DNSService#setTimeOut(int)
*/
public synchronized void setTimeOut(int timeOut) {
this.timeOut = timeOut;
@@ -111,7 +111,7 @@
}
/**
- * @see org.apache.james.jspf.dns.DNSService#getRecords(org.apache.james.jspf.dns.DNSRequest)
+ * @see org.apache.james.jspf.core.DNSService#getRecords(org.apache.james.jspf.core.DNSRequest)
*/
public List getRecords(DNSRequest request)
throws TimeoutException {
Modified: james/jspf/trunk/src/main/java/org/apache/james/jspf/impl/SPF.java
URL: http://svn.apache.org/viewvc/james/jspf/trunk/src/main/java/org/apache/james/jspf/impl/SPF.java?rev=576206&r1=576205&r2=576206&view=diff
==============================================================================
--- james/jspf/trunk/src/main/java/org/apache/james/jspf/impl/SPF.java (original)
+++ james/jspf/trunk/src/main/java/org/apache/james/jspf/impl/SPF.java Sun Sep 16 16:13:53 2007
@@ -21,7 +21,8 @@
package org.apache.james.jspf.impl;
import org.apache.james.jspf.core.DNSLookupContinuation;
-import org.apache.james.jspf.core.FutureSPFResult;
+import org.apache.james.jspf.core.DNSService;
+import org.apache.james.jspf.core.DNSServiceEnabled;
import org.apache.james.jspf.core.LogEnabled;
import org.apache.james.jspf.core.Logger;
import org.apache.james.jspf.core.MacroExpand;
@@ -33,17 +34,16 @@
import org.apache.james.jspf.core.SPFChecker;
import org.apache.james.jspf.core.SPFCheckerExceptionCatcher;
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.dns.DNSService;
-import org.apache.james.jspf.dns.DNSServiceEnabled;
-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.core.exceptions.NeutralException;
+import org.apache.james.jspf.core.exceptions.NoneException;
+import org.apache.james.jspf.core.exceptions.PermErrorException;
+import org.apache.james.jspf.core.exceptions.SPFErrorConstants;
+import org.apache.james.jspf.core.exceptions.SPFResultException;
+import org.apache.james.jspf.core.exceptions.TempErrorException;
+import org.apache.james.jspf.executor.FutureSPFResult;
import org.apache.james.jspf.executor.SPFExecutor;
+import org.apache.james.jspf.executor.SPFResult;
import org.apache.james.jspf.executor.SynchronousSPFExecutor;
import org.apache.james.jspf.parser.RFC4408SPF1Parser;
import org.apache.james.jspf.parser.DefaultTermsFactory;
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=576206&r1=576205&r2=576206&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 Sun Sep 16 16:13:53 2007
@@ -25,8 +25,8 @@
import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
import org.apache.commons.cli.PosixParser;
-import org.apache.james.jspf.core.SPFResult;
-import org.apache.james.jspf.exceptions.SPFErrorConstants;
+import org.apache.james.jspf.core.exceptions.SPFErrorConstants;
+import org.apache.james.jspf.executor.SPFResult;
import org.apache.log4j.ConsoleAppender;
import org.apache.log4j.Level;
import org.apache.log4j.Logger;
Modified: james/jspf/trunk/src/main/java/org/apache/james/jspf/parser/DefaultTermsFactory.java
URL: http://svn.apache.org/viewvc/james/jspf/trunk/src/main/java/org/apache/james/jspf/parser/DefaultTermsFactory.java?rev=576206&r1=576205&r2=576206&view=diff
==============================================================================
--- james/jspf/trunk/src/main/java/org/apache/james/jspf/parser/DefaultTermsFactory.java (original)
+++ james/jspf/trunk/src/main/java/org/apache/james/jspf/parser/DefaultTermsFactory.java Sun Sep 16 16:13:53 2007
@@ -23,7 +23,7 @@
import org.apache.james.jspf.core.Configuration;
import org.apache.james.jspf.core.LogEnabled;
import org.apache.james.jspf.core.Logger;
-import org.apache.james.jspf.exceptions.PermErrorException;
+import org.apache.james.jspf.core.exceptions.PermErrorException;
import org.apache.james.jspf.wiring.WiringService;
import org.apache.james.jspf.wiring.WiringServiceException;
import org.apache.james.jspf.wiring.WiringServiceTable;
Modified: james/jspf/trunk/src/main/java/org/apache/james/jspf/parser/RFC4408SPF1Parser.java
URL: http://svn.apache.org/viewvc/james/jspf/trunk/src/main/java/org/apache/james/jspf/parser/RFC4408SPF1Parser.java?rev=576206&r1=576205&r2=576206&view=diff
==============================================================================
--- james/jspf/trunk/src/main/java/org/apache/james/jspf/parser/RFC4408SPF1Parser.java (original)
+++ james/jspf/trunk/src/main/java/org/apache/james/jspf/parser/RFC4408SPF1Parser.java Sun Sep 16 16:13:53 2007
@@ -21,16 +21,16 @@
package org.apache.james.jspf.parser;
import org.apache.james.jspf.core.Configuration;
-import org.apache.james.jspf.core.Directive;
import org.apache.james.jspf.core.Logger;
-import org.apache.james.jspf.core.Mechanism;
-import org.apache.james.jspf.core.Modifier;
import org.apache.james.jspf.core.SPF1Constants;
import org.apache.james.jspf.core.SPF1Record;
import org.apache.james.jspf.core.SPFRecordParser;
-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.core.exceptions.NeutralException;
+import org.apache.james.jspf.core.exceptions.NoneException;
+import org.apache.james.jspf.core.exceptions.PermErrorException;
+import org.apache.james.jspf.terms.Directive;
+import org.apache.james.jspf.terms.Mechanism;
+import org.apache.james.jspf.terms.Modifier;
import java.util.ArrayList;
import java.util.Collection;
Modified: james/jspf/trunk/src/main/java/org/apache/james/jspf/parser/TermsFactory.java
URL: http://svn.apache.org/viewvc/james/jspf/trunk/src/main/java/org/apache/james/jspf/parser/TermsFactory.java?rev=576206&r1=576205&r2=576206&view=diff
==============================================================================
--- james/jspf/trunk/src/main/java/org/apache/james/jspf/parser/TermsFactory.java (original)
+++ james/jspf/trunk/src/main/java/org/apache/james/jspf/parser/TermsFactory.java Sun Sep 16 16:13:53 2007
@@ -20,7 +20,7 @@
package org.apache.james.jspf.parser;
import org.apache.james.jspf.core.Configuration;
-import org.apache.james.jspf.exceptions.PermErrorException;
+import org.apache.james.jspf.core.exceptions.PermErrorException;
import java.util.Collection;
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=576206&r1=576205&r2=576206&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 Sun Sep 16 16:13:53 2007
@@ -24,10 +24,10 @@
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;
-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.core.exceptions.NeutralException;
+import org.apache.james.jspf.core.exceptions.NoneException;
+import org.apache.james.jspf.core.exceptions.PermErrorException;
+import org.apache.james.jspf.core.exceptions.TempErrorException;
import org.xbill.DNS.Name;
import org.xbill.DNS.TextParseException;
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=576206&r1=576205&r2=576206&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 Sun Sep 16 16:13:53 2007
@@ -24,10 +24,10 @@
import org.apache.james.jspf.core.SPFSession;
import org.apache.james.jspf.core.SPF1Record;
import org.apache.james.jspf.core.SPFChecker;
-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.core.exceptions.NeutralException;
+import org.apache.james.jspf.core.exceptions.NoneException;
+import org.apache.james.jspf.core.exceptions.PermErrorException;
+import org.apache.james.jspf.core.exceptions.TempErrorException;
/**
* Sets the result to NEUTRAL if no directive is found
Modified: james/jspf/trunk/src/main/java/org/apache/james/jspf/policies/NoSPFRecordFoundPolicy.java
URL: http://svn.apache.org/viewvc/james/jspf/trunk/src/main/java/org/apache/james/jspf/policies/NoSPFRecordFoundPolicy.java?rev=576206&r1=576205&r2=576206&view=diff
==============================================================================
--- james/jspf/trunk/src/main/java/org/apache/james/jspf/policies/NoSPFRecordFoundPolicy.java (original)
+++ james/jspf/trunk/src/main/java/org/apache/james/jspf/policies/NoSPFRecordFoundPolicy.java Sun Sep 16 16:13:53 2007
@@ -20,10 +20,10 @@
package org.apache.james.jspf.policies;
import org.apache.james.jspf.core.SPF1Record;
-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.core.exceptions.NeutralException;
+import org.apache.james.jspf.core.exceptions.NoneException;
+import org.apache.james.jspf.core.exceptions.PermErrorException;
+import org.apache.james.jspf.core.exceptions.TempErrorException;
/**
* Throws a NoneException if no record has been found
Modified: james/jspf/trunk/src/main/java/org/apache/james/jspf/policies/ParseRecordPolicy.java
URL: http://svn.apache.org/viewvc/james/jspf/trunk/src/main/java/org/apache/james/jspf/policies/ParseRecordPolicy.java?rev=576206&r1=576205&r2=576206&view=diff
==============================================================================
--- james/jspf/trunk/src/main/java/org/apache/james/jspf/policies/ParseRecordPolicy.java (original)
+++ james/jspf/trunk/src/main/java/org/apache/james/jspf/policies/ParseRecordPolicy.java Sun Sep 16 16:13:53 2007
@@ -21,9 +21,9 @@
import org.apache.james.jspf.core.SPF1Record;
import org.apache.james.jspf.core.SPFRecordParser;
-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.core.exceptions.NeutralException;
+import org.apache.james.jspf.core.exceptions.NoneException;
+import org.apache.james.jspf.core.exceptions.PermErrorException;
/**
* Parse the record
Modified: james/jspf/trunk/src/main/java/org/apache/james/jspf/policies/Policy.java
URL: http://svn.apache.org/viewvc/james/jspf/trunk/src/main/java/org/apache/james/jspf/policies/Policy.java?rev=576206&r1=576205&r2=576206&view=diff
==============================================================================
--- james/jspf/trunk/src/main/java/org/apache/james/jspf/policies/Policy.java (original)
+++ james/jspf/trunk/src/main/java/org/apache/james/jspf/policies/Policy.java Sun Sep 16 16:13:53 2007
@@ -21,10 +21,10 @@
import org.apache.james.jspf.core.SPF1Record;
-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.core.exceptions.NeutralException;
+import org.apache.james.jspf.core.exceptions.NoneException;
+import org.apache.james.jspf.core.exceptions.PermErrorException;
+import org.apache.james.jspf.core.exceptions.TempErrorException;
/**
* Return an spf record from a given domain.
Modified: james/jspf/trunk/src/main/java/org/apache/james/jspf/policies/PolicyPostFilter.java
URL: http://svn.apache.org/viewvc/james/jspf/trunk/src/main/java/org/apache/james/jspf/policies/PolicyPostFilter.java?rev=576206&r1=576205&r2=576206&view=diff
==============================================================================
--- james/jspf/trunk/src/main/java/org/apache/james/jspf/policies/PolicyPostFilter.java (original)
+++ james/jspf/trunk/src/main/java/org/apache/james/jspf/policies/PolicyPostFilter.java Sun Sep 16 16:13:53 2007
@@ -21,10 +21,10 @@
import org.apache.james.jspf.core.SPF1Record;
-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.core.exceptions.NeutralException;
+import org.apache.james.jspf.core.exceptions.NoneException;
+import org.apache.james.jspf.core.exceptions.PermErrorException;
+import org.apache.james.jspf.core.exceptions.TempErrorException;
/**
* Return an spf record from a given domain.
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=576206&r1=576205&r2=576206&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 Sun Sep 16 16:13:53 2007
@@ -1,19 +1,19 @@
package org.apache.james.jspf.policies;
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.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.dns.DNSRequest;
-import org.apache.james.jspf.dns.DNSResponse;
-import org.apache.james.jspf.dns.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.core.TimeoutException;
+import org.apache.james.jspf.core.exceptions.NeutralException;
+import org.apache.james.jspf.core.exceptions.NoneException;
+import org.apache.james.jspf.core.exceptions.PermErrorException;
+import org.apache.james.jspf.core.exceptions.TempErrorException;
import java.util.Iterator;
import java.util.List;
@@ -26,7 +26,7 @@
private static final class SPFRecordHandlerDNSResponseListener implements SPFCheckerDNSResponseListener {
/**
- * @see org.apache.james.jspf.core.SPFCheckerDNSResponseListener#onDNSResponse(org.apache.james.jspf.dns.DNSResponse, org.apache.james.jspf.core.SPFSession)
+ * @see org.apache.james.jspf.core.SPFCheckerDNSResponseListener#onDNSResponse(org.apache.james.jspf.core.DNSResponse, org.apache.james.jspf.core.SPFSession)
*/
public DNSLookupContinuation onDNSResponse(
DNSResponse response, SPFSession session)
@@ -53,7 +53,7 @@
private static final class SPFRetrieverDNSResponseListener implements SPFCheckerDNSResponseListener {
/**
- * @see org.apache.james.jspf.core.SPFCheckerDNSResponseListener#onDNSResponse(org.apache.james.jspf.dns.DNSResponse, org.apache.james.jspf.core.SPFSession)
+ * @see org.apache.james.jspf.core.SPFCheckerDNSResponseListener#onDNSResponse(org.apache.james.jspf.core.DNSResponse, org.apache.james.jspf.core.SPFSession)
*/
public DNSLookupContinuation onDNSResponse(
DNSResponse response, SPFSession session)
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=576206&r1=576205&r2=576206&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 Sun Sep 16 16:13:53 2007
@@ -1,17 +1,17 @@
package org.apache.james.jspf.policies;
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.SPF1Record;
import org.apache.james.jspf.core.SPF1Utils;
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.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.core.TimeoutException;
+import org.apache.james.jspf.core.exceptions.NeutralException;
+import org.apache.james.jspf.core.exceptions.NoneException;
+import org.apache.james.jspf.core.exceptions.PermErrorException;
+import org.apache.james.jspf.core.exceptions.TempErrorException;
import java.util.List;
@@ -27,7 +27,7 @@
private static final class SPFStrictSPFRecordsDNSResponseListener implements SPFCheckerDNSResponseListener {
/**
- * @see org.apache.james.jspf.core.SPFCheckerDNSResponseListener#onDNSResponse(org.apache.james.jspf.dns.DNSResponse, org.apache.james.jspf.core.SPFSession)
+ * @see org.apache.james.jspf.core.SPFCheckerDNSResponseListener#onDNSResponse(org.apache.james.jspf.core.DNSResponse, org.apache.james.jspf.core.SPFSession)
*/
public DNSLookupContinuation onDNSResponse(
DNSResponse response, SPFSession session)
@@ -58,7 +58,7 @@
private static final class SPFStrictCheckDNSResponseListener implements SPFCheckerDNSResponseListener {
/**
- * @see org.apache.james.jspf.core.SPFCheckerDNSResponseListener#onDNSResponse(org.apache.james.jspf.dns.DNSResponse, org.apache.james.jspf.core.SPFSession)
+ * @see org.apache.james.jspf.core.SPFCheckerDNSResponseListener#onDNSResponse(org.apache.james.jspf.core.DNSResponse, org.apache.james.jspf.core.SPFSession)
*/
public DNSLookupContinuation onDNSResponse(
DNSResponse response, SPFSession session)
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=576206&r1=576205&r2=576206&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 Sun Sep 16 16:13:53 2007
@@ -21,10 +21,10 @@
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.core.exceptions.NeutralException;
+import org.apache.james.jspf.core.exceptions.NoneException;
+import org.apache.james.jspf.core.exceptions.PermErrorException;
+import org.apache.james.jspf.core.exceptions.TempErrorException;
import org.apache.james.jspf.policies.PolicyPostFilter;
/**
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=576206&r1=576205&r2=576206&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 Sun Sep 16 16:13:53 2007
@@ -27,10 +27,10 @@
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;
-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.core.exceptions.NeutralException;
+import org.apache.james.jspf.core.exceptions.NoneException;
+import org.apache.james.jspf.core.exceptions.PermErrorException;
+import org.apache.james.jspf.core.exceptions.TempErrorException;
import org.apache.james.jspf.policies.PolicyPostFilter;
/**
Modified: james/jspf/trunk/src/main/java/org/apache/james/jspf/policies/local/FallbackPolicy.java
URL: http://svn.apache.org/viewvc/james/jspf/trunk/src/main/java/org/apache/james/jspf/policies/local/FallbackPolicy.java?rev=576206&r1=576205&r2=576206&view=diff
==============================================================================
--- james/jspf/trunk/src/main/java/org/apache/james/jspf/policies/local/FallbackPolicy.java (original)
+++ james/jspf/trunk/src/main/java/org/apache/james/jspf/policies/local/FallbackPolicy.java Sun Sep 16 16:13:53 2007
@@ -22,11 +22,11 @@
import org.apache.james.jspf.core.Logger;
import org.apache.james.jspf.core.SPF1Record;
import org.apache.james.jspf.core.SPFRecordParser;
-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.SPFResultException;
-import org.apache.james.jspf.exceptions.TempErrorException;
+import org.apache.james.jspf.core.exceptions.NeutralException;
+import org.apache.james.jspf.core.exceptions.NoneException;
+import org.apache.james.jspf.core.exceptions.PermErrorException;
+import org.apache.james.jspf.core.exceptions.SPFResultException;
+import org.apache.james.jspf.core.exceptions.TempErrorException;
import org.apache.james.jspf.policies.PolicyPostFilter;
import java.util.Collections;
Modified: james/jspf/trunk/src/main/java/org/apache/james/jspf/policies/local/OverridePolicy.java
URL: http://svn.apache.org/viewvc/james/jspf/trunk/src/main/java/org/apache/james/jspf/policies/local/OverridePolicy.java?rev=576206&r1=576205&r2=576206&view=diff
==============================================================================
--- james/jspf/trunk/src/main/java/org/apache/james/jspf/policies/local/OverridePolicy.java (original)
+++ james/jspf/trunk/src/main/java/org/apache/james/jspf/policies/local/OverridePolicy.java Sun Sep 16 16:13:53 2007
@@ -22,10 +22,10 @@
import org.apache.james.jspf.core.Logger;
import org.apache.james.jspf.core.SPF1Record;
import org.apache.james.jspf.core.SPFRecordParser;
-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.core.exceptions.NeutralException;
+import org.apache.james.jspf.core.exceptions.NoneException;
+import org.apache.james.jspf.core.exceptions.PermErrorException;
+import org.apache.james.jspf.core.exceptions.TempErrorException;
import org.apache.james.jspf.policies.Policy;
public class OverridePolicy extends FallbackPolicy implements Policy {
Modified: james/jspf/trunk/src/main/java/org/apache/james/jspf/policies/local/TrustedForwarderPolicy.java
URL: http://svn.apache.org/viewvc/james/jspf/trunk/src/main/java/org/apache/james/jspf/policies/local/TrustedForwarderPolicy.java?rev=576206&r1=576205&r2=576206&view=diff
==============================================================================
--- james/jspf/trunk/src/main/java/org/apache/james/jspf/policies/local/TrustedForwarderPolicy.java (original)
+++ james/jspf/trunk/src/main/java/org/apache/james/jspf/policies/local/TrustedForwarderPolicy.java Sun Sep 16 16:13:53 2007
@@ -19,14 +19,14 @@
package org.apache.james.jspf.policies.local;
-import org.apache.james.jspf.core.Directive;
import org.apache.james.jspf.core.Logger;
import org.apache.james.jspf.core.SPF1Record;
-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.core.exceptions.NeutralException;
+import org.apache.james.jspf.core.exceptions.NoneException;
+import org.apache.james.jspf.core.exceptions.PermErrorException;
+import org.apache.james.jspf.core.exceptions.TempErrorException;
import org.apache.james.jspf.policies.PolicyPostFilter;
+import org.apache.james.jspf.terms.Directive;
import org.apache.james.jspf.terms.IncludeMechanism;
/**
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=576206&r1=576205&r2=576206&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 Sun Sep 16 16:13:53 2007
@@ -22,7 +22,8 @@
import org.apache.james.jspf.core.Configuration;
import org.apache.james.jspf.core.DNSLookupContinuation;
-import org.apache.james.jspf.core.Directive;
+import org.apache.james.jspf.core.DNSRequest;
+import org.apache.james.jspf.core.DNSResponse;
import org.apache.james.jspf.core.IPAddr;
import org.apache.james.jspf.core.Inet6Util;
import org.apache.james.jspf.core.MacroExpand;
@@ -30,13 +31,11 @@
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;
-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.core.TimeoutException;
+import org.apache.james.jspf.core.exceptions.NeutralException;
+import org.apache.james.jspf.core.exceptions.NoneException;
+import org.apache.james.jspf.core.exceptions.PermErrorException;
+import org.apache.james.jspf.core.exceptions.TempErrorException;
import java.util.ArrayList;
import java.util.List;
@@ -251,7 +250,7 @@
}
/**
- * @see org.apache.james.jspf.core.SPFCheckerDNSResponseListener#onDNSResponse(org.apache.james.jspf.dns.DNSResponse, org.apache.james.jspf.core.SPFSession)
+ * @see org.apache.james.jspf.core.SPFCheckerDNSResponseListener#onDNSResponse(org.apache.james.jspf.core.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=576206&r1=576205&r2=576206&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 Sun Sep 16 16:13:53 2007
@@ -23,9 +23,8 @@
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.Mechanism;
import org.apache.james.jspf.core.SPFSession;
-import org.apache.james.jspf.exceptions.PermErrorException;
+import org.apache.james.jspf.core.exceptions.PermErrorException;
/**
* This class represent the all mechanism
Copied: james/jspf/trunk/src/main/java/org/apache/james/jspf/terms/Directive.java (from r575933, 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/terms/Directive.java?p2=james/jspf/trunk/src/main/java/org/apache/james/jspf/terms/Directive.java&p1=james/jspf/trunk/src/main/java/org/apache/james/jspf/core/Directive.java&r1=575933&r2=576206&rev=576206&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/terms/Directive.java Sun Sep 16 16:13:53 2007
@@ -18,12 +18,17 @@
****************************************************************/
-package org.apache.james.jspf.core;
+package org.apache.james.jspf.terms;
-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.core.DNSLookupContinuation;
+import org.apache.james.jspf.core.Logger;
+import org.apache.james.jspf.core.SPF1Constants;
+import org.apache.james.jspf.core.SPFChecker;
+import org.apache.james.jspf.core.SPFSession;
+import org.apache.james.jspf.core.exceptions.NeutralException;
+import org.apache.james.jspf.core.exceptions.NoneException;
+import org.apache.james.jspf.core.exceptions.PermErrorException;
+import org.apache.james.jspf.core.exceptions.TempErrorException;
/**
* A Directive is a mechanism with a resulting qualifier.
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=576206&r1=576205&r2=576206&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 Sun Sep 16 16:13:53 2007
@@ -21,19 +21,18 @@
package org.apache.james.jspf.terms;
import org.apache.james.jspf.core.DNSLookupContinuation;
-import org.apache.james.jspf.core.Directive;
+import org.apache.james.jspf.core.DNSRequest;
+import org.apache.james.jspf.core.DNSResponse;
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;
-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.core.TimeoutException;
+import org.apache.james.jspf.core.exceptions.NeutralException;
+import org.apache.james.jspf.core.exceptions.NoneException;
+import org.apache.james.jspf.core.exceptions.PermErrorException;
+import org.apache.james.jspf.core.exceptions.TempErrorException;
import java.util.List;
@@ -76,7 +75,7 @@
}
/**
- * @see org.apache.james.jspf.core.SPFCheckerDNSResponseListener#onDNSResponse(org.apache.james.jspf.dns.DNSResponse, org.apache.james.jspf.core.SPFSession)
+ * @see org.apache.james.jspf.core.SPFCheckerDNSResponseListener#onDNSResponse(org.apache.james.jspf.core.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=576206&r1=576205&r2=576206&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 Sun Sep 16 16:13:53 2007
@@ -21,6 +21,8 @@
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.MacroExpand;
import org.apache.james.jspf.core.MacroExpandEnabled;
import org.apache.james.jspf.core.SPF1Constants;
@@ -28,13 +30,11 @@
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;
-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.core.TimeoutException;
+import org.apache.james.jspf.core.exceptions.NeutralException;
+import org.apache.james.jspf.core.exceptions.NoneException;
+import org.apache.james.jspf.core.exceptions.PermErrorException;
+import org.apache.james.jspf.core.exceptions.TempErrorException;
import java.util.List;
@@ -145,7 +145,7 @@
*/
/**
- * @see org.apache.james.jspf.core.SPFCheckerDNSResponseListener#onDNSResponse(org.apache.james.jspf.dns.DNSResponse, org.apache.james.jspf.core.SPFSession)
+ * @see org.apache.james.jspf.core.SPFCheckerDNSResponseListener#onDNSResponse(org.apache.james.jspf.core.DNSResponse, org.apache.james.jspf.core.SPFSession)
*/
public DNSLookupContinuation onDNSResponse(DNSResponse lookup, SPFSession spfData) throws PermErrorException, TempErrorException, NeutralException, NoneException {
try {
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org