Author: bago
Date: Tue Sep 4 16:33:43 2007
New Revision: 572839
URL: http://svn.apache.org/viewvc?rev=572839&view=rev
Log:
Big class-shake to try removing a cyclic dependencies hell, Part 2 (JSPF-54)
Every cycle has been removed. I'm not very satisfied with the resulting
structure, but having no cycle will help the next steps.
Added:
james/jspf/trunk/src/main/java/org/apache/james/jspf/core/DNSLookupContinuation.java
- copied, changed from r572835,
james/jspf/trunk/src/main/java/org/apache/james/jspf/dns/DNSLookupContinuation.java
james/jspf/trunk/src/main/java/org/apache/james/jspf/core/SPFCheckerDNSResponseListener.java
- copied, changed from r572835,
james/jspf/trunk/src/main/java/org/apache/james/jspf/dns/SPFCheckerDNSResponseListener.java
Removed:
james/jspf/trunk/src/main/java/org/apache/james/jspf/dns/DNSLookupContinuation.java
james/jspf/trunk/src/main/java/org/apache/james/jspf/dns/SPFCheckerDNSResponseListener.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/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/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/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
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=572839&r1=572838&r2=572839&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:33:43 2007
@@ -20,7 +20,7 @@
package org.apache.james.jspf;
-import org.apache.james.jspf.dns.DNSLookupContinuation;
+import org.apache.james.jspf.core.DNSLookupContinuation;
import org.apache.james.jspf.core.FutureSPFResult;
import org.apache.james.jspf.core.Logger;
import org.apache.james.jspf.core.SPF1Constants;
Copied:
james/jspf/trunk/src/main/java/org/apache/james/jspf/core/DNSLookupContinuation.java
(from r572835,
james/jspf/trunk/src/main/java/org/apache/james/jspf/dns/DNSLookupContinuation.java)
URL:
http://svn.apache.org/viewvc/james/jspf/trunk/src/main/java/org/apache/james/jspf/core/DNSLookupContinuation.java?p2=james/jspf/trunk/src/main/java/org/apache/james/jspf/core/DNSLookupContinuation.java&p1=james/jspf/trunk/src/main/java/org/apache/james/jspf/dns/DNSLookupContinuation.java&r1=572835&r2=572839&rev=572839&view=diff
==============================================================================
---
james/jspf/trunk/src/main/java/org/apache/james/jspf/dns/DNSLookupContinuation.java
(original)
+++
james/jspf/trunk/src/main/java/org/apache/james/jspf/core/DNSLookupContinuation.java
Tue Sep 4 16:33:43 2007
@@ -17,10 +17,9 @@
* under the License. *
****************************************************************/
-package org.apache.james.jspf.dns;
+package org.apache.james.jspf.core;
import org.apache.james.jspf.dns.DNSRequest;
-import org.apache.james.jspf.dns.SPFCheckerDNSResponseListener;
/**
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=572839&r1=572838&r2=572839&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:33:43 2007
@@ -20,7 +20,6 @@
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;
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=572839&r1=572838&r2=572839&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:33:43 2007
@@ -19,7 +19,6 @@
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/SPFCheckerDNSResponseListener.java
(from r572835,
james/jspf/trunk/src/main/java/org/apache/james/jspf/dns/SPFCheckerDNSResponseListener.java)
URL:
http://svn.apache.org/viewvc/james/jspf/trunk/src/main/java/org/apache/james/jspf/core/SPFCheckerDNSResponseListener.java?p2=james/jspf/trunk/src/main/java/org/apache/james/jspf/core/SPFCheckerDNSResponseListener.java&p1=james/jspf/trunk/src/main/java/org/apache/james/jspf/dns/SPFCheckerDNSResponseListener.java&r1=572835&r2=572839&rev=572839&view=diff
==============================================================================
---
james/jspf/trunk/src/main/java/org/apache/james/jspf/dns/SPFCheckerDNSResponseListener.java
(original)
+++
james/jspf/trunk/src/main/java/org/apache/james/jspf/core/SPFCheckerDNSResponseListener.java
Tue Sep 4 16:33:43 2007
@@ -17,10 +17,9 @@
* under the License. *
****************************************************************/
-package org.apache.james.jspf.dns;
+package org.apache.james.jspf.core;
-import org.apache.james.jspf.dns.DNSLookupContinuation;
-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/executor/StagedMultipleSPFExecutor.java
URL:
http://svn.apache.org/viewvc/james/jspf/trunk/src/main/java/org/apache/james/jspf/executor/StagedMultipleSPFExecutor.java?rev=572839&r1=572838&r2=572839&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
Tue Sep 4 16:33:43 2007
@@ -19,7 +19,7 @@
package org.apache.james.jspf.executor;
-import org.apache.james.jspf.dns.DNSLookupContinuation;
+import org.apache.james.jspf.core.DNSLookupContinuation;
import org.apache.james.jspf.core.FutureSPFResult;
import org.apache.james.jspf.core.Logger;
import org.apache.james.jspf.core.SPFChecker;
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=572839&r1=572838&r2=572839&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
Tue Sep 4 16:33:43 2007
@@ -19,7 +19,7 @@
package org.apache.james.jspf.executor;
-import org.apache.james.jspf.dns.DNSLookupContinuation;
+import org.apache.james.jspf.core.DNSLookupContinuation;
import org.apache.james.jspf.core.FutureSPFResult;
import org.apache.james.jspf.core.Logger;
import org.apache.james.jspf.core.SPFChecker;
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=572839&r1=572838&r2=572839&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:33:43 2007
@@ -26,16 +26,16 @@
*
*/
-import org.apache.james.jspf.dns.DNSLookupContinuation;
+import org.apache.james.jspf.core.DNSLookupContinuation;
import org.apache.james.jspf.core.IPAddr;
import org.apache.james.jspf.core.Logger;
import org.apache.james.jspf.core.MacroData;
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.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;
@@ -98,7 +98,7 @@
SPFCheckerDNSResponseListener {
/**
- * @see
org.apache.james.jspf.dns.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.dns.DNSResponse,
org.apache.james.jspf.core.SPFSession)
*/
public DNSLookupContinuation onDNSResponse(DNSResponse response,
SPFSession session)
throws PermErrorException, NoneException, TempErrorException,
@@ -135,7 +135,7 @@
SPFCheckerDNSResponseListener {
/**
- * @see
org.apache.james.jspf.dns.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.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=572839&r1=572838&r2=572839&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:33:43 2007
@@ -19,7 +19,7 @@
package org.apache.james.jspf.policies;
-import org.apache.james.jspf.dns.DNSLookupContinuation;
+import org.apache.james.jspf.core.DNSLookupContinuation;
import org.apache.james.jspf.core.SPF1Record;
import org.apache.james.jspf.core.SPF1Utils;
import org.apache.james.jspf.core.SPFChecker;
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=572839&r1=572838&r2=572839&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:33:43 2007
@@ -19,7 +19,7 @@
package org.apache.james.jspf.policies;
-import org.apache.james.jspf.dns.DNSLookupContinuation;
+import org.apache.james.jspf.core.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=572839&r1=572838&r2=572839&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:33:43 2007
@@ -1,15 +1,15 @@
package org.apache.james.jspf.policies;
-import org.apache.james.jspf.dns.DNSLookupContinuation;
+import org.apache.james.jspf.core.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.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;
@@ -27,7 +27,7 @@
private static final class SPFRecordHandlerDNSResponseListener implements
SPFCheckerDNSResponseListener {
/**
- * @see
org.apache.james.jspf.dns.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.dns.DNSResponse,
org.apache.james.jspf.core.SPFSession)
*/
public DNSLookupContinuation onDNSResponse(
DNSResponse response, SPFSession session)
@@ -54,7 +54,7 @@
private static final class SPFRetrieverDNSResponseListener implements
SPFCheckerDNSResponseListener {
/**
- * @see
org.apache.james.jspf.dns.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.dns.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=572839&r1=572838&r2=572839&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:33:43 2007
@@ -1,13 +1,13 @@
package org.apache.james.jspf.policies;
-import org.apache.james.jspf.dns.DNSLookupContinuation;
+import org.apache.james.jspf.core.DNSLookupContinuation;
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.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;
@@ -28,7 +28,7 @@
private static final class SPFStrictSPFRecordsDNSResponseListener
implements SPFCheckerDNSResponseListener {
/**
- * @see
org.apache.james.jspf.dns.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.dns.DNSResponse,
org.apache.james.jspf.core.SPFSession)
*/
public DNSLookupContinuation onDNSResponse(
DNSResponse response, SPFSession session)
@@ -59,7 +59,7 @@
private static final class SPFStrictCheckDNSResponseListener implements
SPFCheckerDNSResponseListener {
/**
- * @see
org.apache.james.jspf.dns.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.dns.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/DefaultExplanationPolicy.java
URL:
http://svn.apache.org/viewvc/james/jspf/trunk/src/main/java/org/apache/james/jspf/policies/local/DefaultExplanationPolicy.java?rev=572839&r1=572838&r2=572839&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:33:43 2007
@@ -19,7 +19,7 @@
package org.apache.james.jspf.policies.local;
-import org.apache.james.jspf.dns.DNSLookupContinuation;
+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.SPF1Record;
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=572839&r1=572838&r2=572839&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:33:43 2007
@@ -21,15 +21,15 @@
package org.apache.james.jspf.terms;
import org.apache.james.jspf.core.Configuration;
-import org.apache.james.jspf.dns.DNSLookupContinuation;
+import org.apache.james.jspf.core.DNSLookupContinuation;
import org.apache.james.jspf.core.Directive;
import org.apache.james.jspf.core.IPAddr;
import org.apache.james.jspf.core.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.dns.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.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=572839&r1=572838&r2=572839&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:33:43 2007
@@ -22,7 +22,7 @@
import org.apache.james.jspf.core.Configurable;
import org.apache.james.jspf.core.Configuration;
-import org.apache.james.jspf.dns.DNSLookupContinuation;
+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;
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=572839&r1=572838&r2=572839&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:33:43 2007
@@ -20,14 +20,14 @@
package org.apache.james.jspf.terms;
-import org.apache.james.jspf.dns.DNSLookupContinuation;
+import org.apache.james.jspf.core.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.dns.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.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=572839&r1=572838&r2=572839&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:33:43 2007
@@ -20,14 +20,14 @@
package org.apache.james.jspf.terms;
-import org.apache.james.jspf.dns.DNSLookupContinuation;
+import org.apache.james.jspf.core.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.dns.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.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=572839&r1=572838&r2=572839&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:33:43 2007
@@ -22,7 +22,7 @@
import org.apache.james.jspf.core.Configurable;
import org.apache.james.jspf.core.Configuration;
-import org.apache.james.jspf.dns.DNSLookupContinuation;
+import org.apache.james.jspf.core.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=572839&r1=572838&r2=572839&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:33:43 2007
@@ -21,7 +21,7 @@
package org.apache.james.jspf.terms;
import org.apache.james.jspf.core.Configuration;
-import org.apache.james.jspf.dns.DNSLookupContinuation;
+import org.apache.james.jspf.core.DNSLookupContinuation;
import org.apache.james.jspf.core.Directive;
import org.apache.james.jspf.core.IPAddr;
import org.apache.james.jspf.core.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=572839&r1=572838&r2=572839&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:33:43 2007
@@ -22,7 +22,7 @@
import org.apache.james.jspf.core.Configurable;
import org.apache.james.jspf.core.Configuration;
-import org.apache.james.jspf.dns.DNSLookupContinuation;
+import org.apache.james.jspf.core.DNSLookupContinuation;
import org.apache.james.jspf.core.Directive;
import org.apache.james.jspf.core.Logger;
import org.apache.james.jspf.core.Mechanism;
@@ -30,7 +30,6 @@
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=572839&r1=572838&r2=572839&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:33:43 2007
@@ -20,15 +20,15 @@
package org.apache.james.jspf.terms;
-import org.apache.james.jspf.dns.DNSLookupContinuation;
+import org.apache.james.jspf.core.DNSLookupContinuation;
import org.apache.james.jspf.core.Directive;
import org.apache.james.jspf.core.IPAddr;
import org.apache.james.jspf.core.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;
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=572839&r1=572838&r2=572839&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:33:43 2007
@@ -20,15 +20,15 @@
package org.apache.james.jspf.terms;
-import org.apache.james.jspf.dns.DNSLookupContinuation;
+import org.apache.james.jspf.core.DNSLookupContinuation;
import org.apache.james.jspf.core.Directive;
import org.apache.james.jspf.core.IPAddr;
import org.apache.james.jspf.core.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;
@@ -118,7 +118,7 @@
}
/**
- * @see
org.apache.james.jspf.dns.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.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=572839&r1=572838&r2=572839&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:33:43 2007
@@ -19,7 +19,7 @@
package org.apache.james.jspf.terms;
-import org.apache.james.jspf.dns.DNSLookupContinuation;
+import org.apache.james.jspf.core.DNSLookupContinuation;
import org.apache.james.jspf.core.SPFChecker;
import org.apache.james.jspf.core.SPFCheckerExceptionCatcher;
import org.apache.james.jspf.core.SPFSession;
Modified:
james/jspf/trunk/src/main/java/org/apache/james/jspf/terms/UnknownModifier.java
URL:
http://svn.apache.org/viewvc/james/jspf/trunk/src/main/java/org/apache/james/jspf/terms/UnknownModifier.java?rev=572839&r1=572838&r2=572839&view=diff
==============================================================================
---
james/jspf/trunk/src/main/java/org/apache/james/jspf/terms/UnknownModifier.java
(original)
+++
james/jspf/trunk/src/main/java/org/apache/james/jspf/terms/UnknownModifier.java
Tue Sep 4 16:33:43 2007
@@ -22,7 +22,7 @@
import org.apache.james.jspf.core.Configurable;
import org.apache.james.jspf.core.Configuration;
-import org.apache.james.jspf.dns.DNSLookupContinuation;
+import org.apache.james.jspf.core.DNSLookupContinuation;
import org.apache.james.jspf.core.Modifier;
import org.apache.james.jspf.core.SPFSession;
import org.apache.james.jspf.exceptions.PermErrorException;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
