Author: norman
Date: Wed Apr 25 08:48:07 2007
New Revision: 532396
URL: http://svn.apache.org/viewvc?view=rev&rev=532396
Log:
Move SPFUtils to util package
Added:
james/jspf/branches/asynch-jspf/src/main/java/org/apache/james/jspf/util/SPF1Utils.java
- copied, changed from r531252,
james/jspf/branches/asynch-jspf/src/main/java/org/apache/james/jspf/SPF1Utils.java
Removed:
james/jspf/branches/asynch-jspf/src/main/java/org/apache/james/jspf/SPF1Utils.java
Modified:
james/jspf/branches/asynch-jspf/src/main/java/org/apache/james/jspf/SPF.java
james/jspf/branches/asynch-jspf/src/main/java/org/apache/james/jspf/SPFResult.java
james/jspf/branches/asynch-jspf/src/main/java/org/apache/james/jspf/exceptions/NeutralException.java
james/jspf/branches/asynch-jspf/src/main/java/org/apache/james/jspf/exceptions/NoneException.java
james/jspf/branches/asynch-jspf/src/main/java/org/apache/james/jspf/exceptions/PermErrorException.java
james/jspf/branches/asynch-jspf/src/main/java/org/apache/james/jspf/exceptions/TempErrorException.java
james/jspf/branches/asynch-jspf/src/main/java/org/apache/james/jspf/impl/SPFQuery.java
james/jspf/branches/asynch-jspf/src/main/java/org/apache/james/jspf/macro/MacroExpand.java
james/jspf/branches/asynch-jspf/src/main/java/org/apache/james/jspf/policies/local/BestGuessPolicy.java
james/jspf/branches/asynch-jspf/src/main/java/org/apache/james/jspf/policies/local/DefaultExplanationPolicy.java
Modified:
james/jspf/branches/asynch-jspf/src/main/java/org/apache/james/jspf/SPF.java
URL:
http://svn.apache.org/viewvc/james/jspf/branches/asynch-jspf/src/main/java/org/apache/james/jspf/SPF.java?view=diff&rev=532396&r1=532395&r2=532396
==============================================================================
---
james/jspf/branches/asynch-jspf/src/main/java/org/apache/james/jspf/SPF.java
(original)
+++
james/jspf/branches/asynch-jspf/src/main/java/org/apache/james/jspf/SPF.java
Wed Apr 25 08:48:07 2007
@@ -52,6 +52,7 @@
import org.apache.james.jspf.policies.local.FallbackPolicy;
import org.apache.james.jspf.policies.local.OverridePolicy;
import org.apache.james.jspf.policies.local.TrustedForwarderPolicy;
+import org.apache.james.jspf.util.SPF1Utils;
import org.apache.james.jspf.wiring.DNSServiceEnabled;
import org.apache.james.jspf.wiring.LogEnabled;
import org.apache.james.jspf.wiring.MacroExpandEnabled;
@@ -104,6 +105,10 @@
}
private static final class SPFRecordChecker implements SPFChecker {
+
+ /**
+ * @see
org.apache.james.jspf.core.SPFChecker#checkSPF(org.apache.james.jspf.core.SPFSession)
+ */
public DNSLookupContinuation checkSPF(SPFSession spfData)
throws PermErrorException, TempErrorException,
NeutralException, NoneException {
@@ -137,6 +142,9 @@
this.policies = policies;
}
+ /**
+ * @see
org.apache.james.jspf.core.SPFChecker#checkSPF(org.apache.james.jspf.core.SPFSession)
+ */
public DNSLookupContinuation checkSPF(SPFSession spfData)
throws PermErrorException, TempErrorException,
NeutralException, NoneException {
@@ -160,6 +168,9 @@
this.policy = policy;
}
+ /**
+ * @see
org.apache.james.jspf.core.SPFChecker#checkSPF(org.apache.james.jspf.core.SPFSession)
+ */
public DNSLookupContinuation checkSPF(SPFSession spfData)
throws PermErrorException, TempErrorException,
NeutralException, NoneException {
@@ -186,6 +197,9 @@
this.policy = policy;
}
+ /**
+ * @see
org.apache.james.jspf.core.SPFChecker#checkSPF(org.apache.james.jspf.core.SPFSession)
+ */
public DNSLookupContinuation checkSPF(SPFSession spfData)
throws PermErrorException, TempErrorException,
NeutralException, NoneException {
Modified:
james/jspf/branches/asynch-jspf/src/main/java/org/apache/james/jspf/SPFResult.java
URL:
http://svn.apache.org/viewvc/james/jspf/branches/asynch-jspf/src/main/java/org/apache/james/jspf/SPFResult.java?view=diff&rev=532396&r1=532395&r2=532396
==============================================================================
---
james/jspf/branches/asynch-jspf/src/main/java/org/apache/james/jspf/SPFResult.java
(original)
+++
james/jspf/branches/asynch-jspf/src/main/java/org/apache/james/jspf/SPFResult.java
Wed Apr 25 08:48:07 2007
@@ -21,6 +21,7 @@
package org.apache.james.jspf;
import org.apache.james.jspf.core.SPFSession;
+import org.apache.james.jspf.util.SPF1Utils;
/**
* This class is used to return the result of an SPF lookup.
Modified:
james/jspf/branches/asynch-jspf/src/main/java/org/apache/james/jspf/exceptions/NeutralException.java
URL:
http://svn.apache.org/viewvc/james/jspf/branches/asynch-jspf/src/main/java/org/apache/james/jspf/exceptions/NeutralException.java?view=diff&rev=532396&r1=532395&r2=532396
==============================================================================
---
james/jspf/branches/asynch-jspf/src/main/java/org/apache/james/jspf/exceptions/NeutralException.java
(original)
+++
james/jspf/branches/asynch-jspf/src/main/java/org/apache/james/jspf/exceptions/NeutralException.java
Wed Apr 25 08:48:07 2007
@@ -20,7 +20,7 @@
package org.apache.james.jspf.exceptions;
-import org.apache.james.jspf.SPF1Utils;
+import org.apache.james.jspf.util.SPF1Utils;
/**
* This exception get thrown if the result should be neutral
Modified:
james/jspf/branches/asynch-jspf/src/main/java/org/apache/james/jspf/exceptions/NoneException.java
URL:
http://svn.apache.org/viewvc/james/jspf/branches/asynch-jspf/src/main/java/org/apache/james/jspf/exceptions/NoneException.java?view=diff&rev=532396&r1=532395&r2=532396
==============================================================================
---
james/jspf/branches/asynch-jspf/src/main/java/org/apache/james/jspf/exceptions/NoneException.java
(original)
+++
james/jspf/branches/asynch-jspf/src/main/java/org/apache/james/jspf/exceptions/NoneException.java
Wed Apr 25 08:48:07 2007
@@ -20,7 +20,7 @@
package org.apache.james.jspf.exceptions;
-import org.apache.james.jspf.SPF1Utils;
+import org.apache.james.jspf.util.SPF1Utils;
/**
* This exception get thrown if the result should be none
Modified:
james/jspf/branches/asynch-jspf/src/main/java/org/apache/james/jspf/exceptions/PermErrorException.java
URL:
http://svn.apache.org/viewvc/james/jspf/branches/asynch-jspf/src/main/java/org/apache/james/jspf/exceptions/PermErrorException.java?view=diff&rev=532396&r1=532395&r2=532396
==============================================================================
---
james/jspf/branches/asynch-jspf/src/main/java/org/apache/james/jspf/exceptions/PermErrorException.java
(original)
+++
james/jspf/branches/asynch-jspf/src/main/java/org/apache/james/jspf/exceptions/PermErrorException.java
Wed Apr 25 08:48:07 2007
@@ -20,7 +20,7 @@
package org.apache.james.jspf.exceptions;
-import org.apache.james.jspf.SPF1Utils;
+import org.apache.james.jspf.util.SPF1Utils;
/**
* This exception get thrown if the result should be PermError
Modified:
james/jspf/branches/asynch-jspf/src/main/java/org/apache/james/jspf/exceptions/TempErrorException.java
URL:
http://svn.apache.org/viewvc/james/jspf/branches/asynch-jspf/src/main/java/org/apache/james/jspf/exceptions/TempErrorException.java?view=diff&rev=532396&r1=532395&r2=532396
==============================================================================
---
james/jspf/branches/asynch-jspf/src/main/java/org/apache/james/jspf/exceptions/TempErrorException.java
(original)
+++
james/jspf/branches/asynch-jspf/src/main/java/org/apache/james/jspf/exceptions/TempErrorException.java
Wed Apr 25 08:48:07 2007
@@ -20,7 +20,7 @@
package org.apache.james.jspf.exceptions;
-import org.apache.james.jspf.SPF1Utils;
+import org.apache.james.jspf.util.SPF1Utils;
/**
* This exception get thrown if the result should be TempError
Modified:
james/jspf/branches/asynch-jspf/src/main/java/org/apache/james/jspf/impl/SPFQuery.java
URL:
http://svn.apache.org/viewvc/james/jspf/branches/asynch-jspf/src/main/java/org/apache/james/jspf/impl/SPFQuery.java?view=diff&rev=532396&r1=532395&r2=532396
==============================================================================
---
james/jspf/branches/asynch-jspf/src/main/java/org/apache/james/jspf/impl/SPFQuery.java
(original)
+++
james/jspf/branches/asynch-jspf/src/main/java/org/apache/james/jspf/impl/SPFQuery.java
Wed Apr 25 08:48:07 2007
@@ -26,8 +26,8 @@
import org.apache.commons.cli.ParseException;
import org.apache.commons.cli.PosixParser;
import org.apache.james.jspf.SPF;
-import org.apache.james.jspf.SPF1Utils;
import org.apache.james.jspf.SPFResult;
+import org.apache.james.jspf.util.SPF1Utils;
import org.apache.log4j.ConsoleAppender;
import org.apache.log4j.Level;
import org.apache.log4j.Logger;
Modified:
james/jspf/branches/asynch-jspf/src/main/java/org/apache/james/jspf/macro/MacroExpand.java
URL:
http://svn.apache.org/viewvc/james/jspf/branches/asynch-jspf/src/main/java/org/apache/james/jspf/macro/MacroExpand.java?view=diff&rev=532396&r1=532395&r2=532396
==============================================================================
---
james/jspf/branches/asynch-jspf/src/main/java/org/apache/james/jspf/macro/MacroExpand.java
(original)
+++
james/jspf/branches/asynch-jspf/src/main/java/org/apache/james/jspf/macro/MacroExpand.java
Wed Apr 25 08:48:07 2007
@@ -26,7 +26,6 @@
*
*/
-import org.apache.james.jspf.SPF1Utils;
import org.apache.james.jspf.core.DNSLookupContinuation;
import org.apache.james.jspf.core.DNSRequest;
import org.apache.james.jspf.core.DNSResponse;
@@ -40,6 +39,7 @@
import org.apache.james.jspf.exceptions.NoneException;
import org.apache.james.jspf.exceptions.PermErrorException;
import org.apache.james.jspf.exceptions.TempErrorException;
+import org.apache.james.jspf.util.SPF1Utils;
import org.apache.james.jspf.util.SPFTermsRegexps;
import java.io.UnsupportedEncodingException;
Modified:
james/jspf/branches/asynch-jspf/src/main/java/org/apache/james/jspf/policies/local/BestGuessPolicy.java
URL:
http://svn.apache.org/viewvc/james/jspf/branches/asynch-jspf/src/main/java/org/apache/james/jspf/policies/local/BestGuessPolicy.java?view=diff&rev=532396&r1=532395&r2=532396
==============================================================================
---
james/jspf/branches/asynch-jspf/src/main/java/org/apache/james/jspf/policies/local/BestGuessPolicy.java
(original)
+++
james/jspf/branches/asynch-jspf/src/main/java/org/apache/james/jspf/policies/local/BestGuessPolicy.java
Wed Apr 25 08:48:07 2007
@@ -19,13 +19,13 @@
package org.apache.james.jspf.policies.local;
-import org.apache.james.jspf.SPF1Utils;
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.policies.PolicyPostFilter;
+import org.apache.james.jspf.util.SPF1Utils;
public class BestGuessPolicy implements PolicyPostFilter {
Modified:
james/jspf/branches/asynch-jspf/src/main/java/org/apache/james/jspf/policies/local/DefaultExplanationPolicy.java
URL:
http://svn.apache.org/viewvc/james/jspf/branches/asynch-jspf/src/main/java/org/apache/james/jspf/policies/local/DefaultExplanationPolicy.java?view=diff&rev=532396&r1=532395&r2=532396
==============================================================================
---
james/jspf/branches/asynch-jspf/src/main/java/org/apache/james/jspf/policies/local/DefaultExplanationPolicy.java
(original)
+++
james/jspf/branches/asynch-jspf/src/main/java/org/apache/james/jspf/policies/local/DefaultExplanationPolicy.java
Wed Apr 25 08:48:07 2007
@@ -19,7 +19,6 @@
package org.apache.james.jspf.policies.local;
-import org.apache.james.jspf.SPF1Utils;
import org.apache.james.jspf.core.DNSLookupContinuation;
import org.apache.james.jspf.core.Logger;
import org.apache.james.jspf.core.SPF1Constants;
@@ -32,6 +31,7 @@
import org.apache.james.jspf.exceptions.TempErrorException;
import org.apache.james.jspf.macro.MacroExpand;
import org.apache.james.jspf.policies.PolicyPostFilter;
+import org.apache.james.jspf.util.SPF1Utils;
/**
* Policy to add a default explanation
Copied:
james/jspf/branches/asynch-jspf/src/main/java/org/apache/james/jspf/util/SPF1Utils.java
(from r531252,
james/jspf/branches/asynch-jspf/src/main/java/org/apache/james/jspf/SPF1Utils.java)
URL:
http://svn.apache.org/viewvc/james/jspf/branches/asynch-jspf/src/main/java/org/apache/james/jspf/util/SPF1Utils.java?view=diff&rev=532396&p1=james/jspf/branches/asynch-jspf/src/main/java/org/apache/james/jspf/SPF1Utils.java&r1=531252&p2=james/jspf/branches/asynch-jspf/src/main/java/org/apache/james/jspf/util/SPF1Utils.java&r2=532396
==============================================================================
---
james/jspf/branches/asynch-jspf/src/main/java/org/apache/james/jspf/SPF1Utils.java
(original)
+++
james/jspf/branches/asynch-jspf/src/main/java/org/apache/james/jspf/util/SPF1Utils.java
Wed Apr 25 08:48:07 2007
@@ -18,7 +18,7 @@
****************************************************************/
-package org.apache.james.jspf;
+package org.apache.james.jspf.util;
import org.apache.james.jspf.core.SPF1Constants;
@@ -55,7 +55,7 @@
* @param result The result which should converted
* @return coverted result
*/
- protected static String resultToName(String result) {
+ public static String resultToName(String result) {
if (result.equals(SPF1Constants.PASS)) {
return PASS_CONV;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
