Author: bago
Date: Sun Sep 16 16:16:04 2007
New Revision: 576207
URL: http://svn.apache.org/viewvc?rev=576207&view=rev
Log:
Move TimeoutException to the exceptions package
Added:
james/jspf/trunk/src/main/java/org/apache/james/jspf/core/exceptions/TimeoutException.java
- copied, changed from r576206,
james/jspf/trunk/src/main/java/org/apache/james/jspf/core/TimeoutException.java
Removed:
james/jspf/trunk/src/main/java/org/apache/james/jspf/core/TimeoutException.java
Modified:
james/jspf/trunk/src/main/java/org/apache/james/jspf/core/DNSResponse.java
james/jspf/trunk/src/main/java/org/apache/james/jspf/core/DNSService.java
james/jspf/trunk/src/main/java/org/apache/james/jspf/core/MacroExpand.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/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/terms/AMechanism.java
james/jspf/trunk/src/main/java/org/apache/james/jspf/terms/ExistsMechanism.java
james/jspf/trunk/src/main/java/org/apache/james/jspf/terms/ExpModifier.java
james/jspf/trunk/src/main/java/org/apache/james/jspf/terms/MXMechanism.java
james/jspf/trunk/src/main/java/org/apache/james/jspf/terms/PTRMechanism.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
Modified:
james/jspf/trunk/src/main/java/org/apache/james/jspf/core/DNSResponse.java
URL:
http://svn.apache.org/viewvc/james/jspf/trunk/src/main/java/org/apache/james/jspf/core/DNSResponse.java?rev=576207&r1=576206&r2=576207&view=diff
==============================================================================
--- james/jspf/trunk/src/main/java/org/apache/james/jspf/core/DNSResponse.java
(original)
+++ james/jspf/trunk/src/main/java/org/apache/james/jspf/core/DNSResponse.java
Sun Sep 16 16:16:04 2007
@@ -20,6 +20,8 @@
package org.apache.james.jspf.core;
+import org.apache.james.jspf.core.exceptions.TimeoutException;
+
import java.util.List;
/**
Modified:
james/jspf/trunk/src/main/java/org/apache/james/jspf/core/DNSService.java
URL:
http://svn.apache.org/viewvc/james/jspf/trunk/src/main/java/org/apache/james/jspf/core/DNSService.java?rev=576207&r1=576206&r2=576207&view=diff
==============================================================================
--- james/jspf/trunk/src/main/java/org/apache/james/jspf/core/DNSService.java
(original)
+++ james/jspf/trunk/src/main/java/org/apache/james/jspf/core/DNSService.java
Sun Sep 16 16:16:04 2007
@@ -19,6 +19,8 @@
package org.apache.james.jspf.core;
+import org.apache.james.jspf.core.exceptions.TimeoutException;
+
import java.util.List;
/**
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=576207&r1=576206&r2=576207&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:16:04 2007
@@ -30,6 +30,7 @@
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.core.exceptions.TimeoutException;
import java.io.UnsupportedEncodingException;
import java.net.URLEncoder;
Copied:
james/jspf/trunk/src/main/java/org/apache/james/jspf/core/exceptions/TimeoutException.java
(from r576206,
james/jspf/trunk/src/main/java/org/apache/james/jspf/core/TimeoutException.java)
URL:
http://svn.apache.org/viewvc/james/jspf/trunk/src/main/java/org/apache/james/jspf/core/exceptions/TimeoutException.java?p2=james/jspf/trunk/src/main/java/org/apache/james/jspf/core/exceptions/TimeoutException.java&p1=james/jspf/trunk/src/main/java/org/apache/james/jspf/core/TimeoutException.java&r1=576206&r2=576207&rev=576207&view=diff
==============================================================================
---
james/jspf/trunk/src/main/java/org/apache/james/jspf/core/TimeoutException.java
(original)
+++
james/jspf/trunk/src/main/java/org/apache/james/jspf/core/exceptions/TimeoutException.java
Sun Sep 16 16:16:04 2007
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.jspf.core;
+package org.apache.james.jspf.core.exceptions;
/**
* The exception thrown on lookup timeout
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=576207&r1=576206&r2=576207&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:16:04 2007
@@ -25,8 +25,8 @@
import org.apache.james.jspf.core.SPFChecker;
import org.apache.james.jspf.core.SPFCheckerExceptionCatcher;
import org.apache.james.jspf.core.SPFSession;
-import org.apache.james.jspf.core.TimeoutException;
import org.apache.james.jspf.core.exceptions.SPFResultException;
+import org.apache.james.jspf.core.exceptions.TimeoutException;
import java.util.Collections;
import java.util.HashMap;
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=576207&r1=576206&r2=576207&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:16:04 2007
@@ -26,8 +26,8 @@
import org.apache.james.jspf.core.SPFChecker;
import org.apache.james.jspf.core.SPFCheckerExceptionCatcher;
import org.apache.james.jspf.core.SPFSession;
-import org.apache.james.jspf.core.TimeoutException;
import org.apache.james.jspf.core.exceptions.SPFResultException;
+import org.apache.james.jspf.core.exceptions.TimeoutException;
/**
* Synchronous implementation of SPFExecuter. All queries will get executed
synchronously
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=576207&r1=576206&r2=576207&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:16:04 2007
@@ -20,7 +20,7 @@
package org.apache.james.jspf.impl;
import org.apache.james.jspf.core.DNSRequest;
-import org.apache.james.jspf.core.TimeoutException;
+import org.apache.james.jspf.core.exceptions.TimeoutException;
import org.apache.james.jspf.executor.DNSAsynchLookupService;
import org.apache.james.jspf.executor.IResponse;
import org.apache.james.jspf.executor.IResponseQueue;
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=576207&r1=576206&r2=576207&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:16:04 2007
@@ -21,7 +21,7 @@
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.core.exceptions.TimeoutException;
import org.apache.james.jspf.executor.DNSAsynchLookupService;
import org.apache.james.jspf.executor.IResponseImpl;
import org.apache.james.jspf.executor.IResponseQueue;
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=576207&r1=576206&r2=576207&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:16:04 2007
@@ -23,7 +23,7 @@
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.core.TimeoutException;
+import org.apache.james.jspf.core.exceptions.TimeoutException;
import org.xbill.DNS.AAAARecord;
import org.xbill.DNS.ARecord;
import org.xbill.DNS.Lookup;
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=576207&r1=576206&r2=576207&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:16:04 2007
@@ -9,11 +9,11 @@
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.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 org.apache.james.jspf.core.exceptions.TimeoutException;
import java.util.Iterator;
import java.util.List;
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=576207&r1=576206&r2=576207&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:16:04 2007
@@ -7,11 +7,11 @@
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.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 org.apache.james.jspf.core.exceptions.TimeoutException;
import java.util.List;
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=576207&r1=576206&r2=576207&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:16:04 2007
@@ -31,11 +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.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 org.apache.james.jspf.core.exceptions.TimeoutException;
import java.util.ArrayList;
import java.util.List;
Modified:
james/jspf/trunk/src/main/java/org/apache/james/jspf/terms/ExistsMechanism.java
URL:
http://svn.apache.org/viewvc/james/jspf/trunk/src/main/java/org/apache/james/jspf/terms/ExistsMechanism.java?rev=576207&r1=576206&r2=576207&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:16:04 2007
@@ -28,11 +28,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.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 org.apache.james.jspf.core.exceptions.TimeoutException;
import java.util.List;
Modified:
james/jspf/trunk/src/main/java/org/apache/james/jspf/terms/ExpModifier.java
URL:
http://svn.apache.org/viewvc/james/jspf/trunk/src/main/java/org/apache/james/jspf/terms/ExpModifier.java?rev=576207&r1=576206&r2=576207&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:16:04 2007
@@ -30,11 +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.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 org.apache.james.jspf.core.exceptions.TimeoutException;
import java.util.List;
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=576207&r1=576206&r2=576207&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
Sun Sep 16 16:16:04 2007
@@ -29,11 +29,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.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 org.apache.james.jspf.core.exceptions.TimeoutException;
import java.util.ArrayList;
import java.util.List;
Modified:
james/jspf/trunk/src/main/java/org/apache/james/jspf/terms/PTRMechanism.java
URL:
http://svn.apache.org/viewvc/james/jspf/trunk/src/main/java/org/apache/james/jspf/terms/PTRMechanism.java?rev=576207&r1=576206&r2=576207&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
Sun Sep 16 16:16:04 2007
@@ -31,11 +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.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 org.apache.james.jspf.core.exceptions.TimeoutException;
import java.util.List;
Modified:
james/jspf/trunk/src/test/java/org/apache/james/jspf/AbstractYamlTest.java
URL:
http://svn.apache.org/viewvc/james/jspf/trunk/src/test/java/org/apache/james/jspf/AbstractYamlTest.java?rev=576207&r1=576206&r2=576207&view=diff
==============================================================================
--- james/jspf/trunk/src/test/java/org/apache/james/jspf/AbstractYamlTest.java
(original)
+++ james/jspf/trunk/src/test/java/org/apache/james/jspf/AbstractYamlTest.java
Sun Sep 16 16:16:04 2007
@@ -28,7 +28,7 @@
import org.apache.james.jspf.core.MacroExpandEnabled;
import org.apache.james.jspf.core.SPFCheckEnabled;
import org.apache.james.jspf.core.SPFRecordParser;
-import org.apache.james.jspf.core.TimeoutException;
+import org.apache.james.jspf.core.exceptions.TimeoutException;
import org.apache.james.jspf.dnsserver.DNSTestingServer;
import org.apache.james.jspf.executor.SPFExecutor;
import org.apache.james.jspf.executor.SPFResult;
Modified:
james/jspf/trunk/src/test/java/org/apache/james/jspf/LoggingDNSService.java
URL:
http://svn.apache.org/viewvc/james/jspf/trunk/src/test/java/org/apache/james/jspf/LoggingDNSService.java?rev=576207&r1=576206&r2=576207&view=diff
==============================================================================
--- james/jspf/trunk/src/test/java/org/apache/james/jspf/LoggingDNSService.java
(original)
+++ james/jspf/trunk/src/test/java/org/apache/james/jspf/LoggingDNSService.java
Sun Sep 16 16:16:04 2007
@@ -22,7 +22,7 @@
import org.apache.james.jspf.core.DNSRequest;
import org.apache.james.jspf.core.DNSService;
import org.apache.james.jspf.core.Logger;
-import org.apache.james.jspf.core.TimeoutException;
+import org.apache.james.jspf.core.exceptions.TimeoutException;
import java.util.List;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]