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/11 00:30:57 UTC
svn commit: r574390 - in /james/jspf/trunk/src:
main/java/org/apache/james/jspf/ main/java/org/apache/james/jspf/core/
main/java/org/apache/james/jspf/policies/local/
main/java/org/apache/james/jspf/terms/
main/java/org/apache/james/jspf/wiring/ test/j...
Author: bago
Date: Mon Sep 10 15:30:55 2007
New Revision: 574390
URL: http://svn.apache.org/viewvc?rev=574390&view=rev
Log:
Move MacroData to core package (same afferent/efferent dependencies). A single class in a package means too much fragmentation.
Added:
james/jspf/trunk/src/main/java/org/apache/james/jspf/core/MacroExpand.java
- copied, changed from r574277, james/jspf/trunk/src/main/java/org/apache/james/jspf/macro/MacroExpand.java
james/jspf/trunk/src/test/java/org/apache/james/jspf/core/MacroExpandTest.java
- copied, changed from r572835, james/jspf/trunk/src/test/java/org/apache/james/jspf/macro/MacroExpandTest.java
Modified:
james/jspf/trunk/src/main/java/org/apache/james/jspf/SPF.java
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/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/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/wiring/MacroExpandEnabled.java
james/jspf/trunk/src/test/java/org/apache/james/jspf/AbstractYamlTest.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=574390&r1=574389&r2=574390&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 Mon Sep 10 15:30:55 2007
@@ -23,6 +23,7 @@
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.MacroExpand;
import org.apache.james.jspf.core.SPF1Constants;
import org.apache.james.jspf.core.SPF1Record;
import org.apache.james.jspf.core.SPF1Utils;
@@ -40,7 +41,6 @@
import org.apache.james.jspf.exceptions.TempErrorException;
import org.apache.james.jspf.executor.SPFExecutor;
import org.apache.james.jspf.executor.SynchronousSPFExecutor;
-import org.apache.james.jspf.macro.MacroExpand;
import org.apache.james.jspf.parser.RFC4408SPF1Parser;
import org.apache.james.jspf.parser.DefaultTermsFactory;
import org.apache.james.jspf.policies.InitialChecksPolicy;
Copied: james/jspf/trunk/src/main/java/org/apache/james/jspf/core/MacroExpand.java (from r574277, 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/core/MacroExpand.java?p2=james/jspf/trunk/src/main/java/org/apache/james/jspf/core/MacroExpand.java&p1=james/jspf/trunk/src/main/java/org/apache/james/jspf/macro/MacroExpand.java&r1=574277&r2=574390&rev=574390&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/core/MacroExpand.java Mon Sep 10 15:30:55 2007
@@ -18,7 +18,7 @@
****************************************************************/
-package org.apache.james.jspf.macro;
+package org.apache.james.jspf.core;
/**
* This Class is used to convert all macros which can used in SPF-Records to the
@@ -26,13 +26,6 @@
*
*/
-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;
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=574390&r1=574389&r2=574390&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 Mon Sep 10 15:30:55 2007
@@ -21,6 +21,7 @@
import org.apache.james.jspf.core.DNSLookupContinuation;
import org.apache.james.jspf.core.Logger;
+import org.apache.james.jspf.core.MacroExpand;
import org.apache.james.jspf.core.SPF1Constants;
import org.apache.james.jspf.core.SPF1Record;
import org.apache.james.jspf.core.SPF1Utils;
@@ -30,7 +31,6 @@
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.macro.MacroExpand;
import org.apache.james.jspf.policies.PolicyPostFilter;
/**
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=574390&r1=574389&r2=574390&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 Mon Sep 10 15:30:55 2007
@@ -24,6 +24,7 @@
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.MacroExpand;
import org.apache.james.jspf.core.SPFChecker;
import org.apache.james.jspf.core.SPFCheckerDNSResponseListener;
import org.apache.james.jspf.core.SPFSession;
@@ -34,7 +35,6 @@
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.macro.MacroExpand;
import org.apache.james.jspf.util.Inet6Util;
import org.apache.james.jspf.util.SPFTermsRegexps;
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=574390&r1=574389&r2=574390&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 Mon Sep 10 15:30:55 2007
@@ -22,6 +22,7 @@
import org.apache.james.jspf.core.DNSLookupContinuation;
import org.apache.james.jspf.core.Directive;
+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;
@@ -32,7 +33,6 @@
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.macro.MacroExpand;
import org.apache.james.jspf.util.SPFTermsRegexps;
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=574390&r1=574389&r2=574390&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 Mon Sep 10 15:30:55 2007
@@ -21,6 +21,7 @@
package org.apache.james.jspf.terms;
import org.apache.james.jspf.core.DNSLookupContinuation;
+import org.apache.james.jspf.core.MacroExpand;
import org.apache.james.jspf.core.SPF1Constants;
import org.apache.james.jspf.core.SPFChecker;
import org.apache.james.jspf.core.SPFCheckerDNSResponseListener;
@@ -32,7 +33,6 @@
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.macro.MacroExpand;
import org.apache.james.jspf.util.SPFTermsRegexps;
import org.apache.james.jspf.wiring.MacroExpandEnabled;
@@ -201,7 +201,7 @@
}
/**
- * @see org.apache.james.jspf.wiring.MacroExpandEnabled#enableMacroExpand(org.apache.james.jspf.macro.MacroExpand)
+ * @see org.apache.james.jspf.wiring.MacroExpandEnabled#enableMacroExpand(org.apache.james.jspf.core.MacroExpand)
*/
public void enableMacroExpand(MacroExpand macroExpand) {
this.macroExpand = macroExpand;
Modified: james/jspf/trunk/src/main/java/org/apache/james/jspf/terms/GenericMechanism.java
URL: http://svn.apache.org/viewvc/james/jspf/trunk/src/main/java/org/apache/james/jspf/terms/GenericMechanism.java?rev=574390&r1=574389&r2=574390&view=diff
==============================================================================
--- james/jspf/trunk/src/main/java/org/apache/james/jspf/terms/GenericMechanism.java (original)
+++ james/jspf/trunk/src/main/java/org/apache/james/jspf/terms/GenericMechanism.java Mon Sep 10 15:30:55 2007
@@ -23,10 +23,10 @@
import org.apache.james.jspf.core.Configurable;
import org.apache.james.jspf.core.Configuration;
import org.apache.james.jspf.core.Logger;
+import org.apache.james.jspf.core.MacroExpand;
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.macro.MacroExpand;
import org.apache.james.jspf.wiring.LogEnabled;
import org.apache.james.jspf.wiring.MacroExpandEnabled;
@@ -102,7 +102,7 @@
}
/**
- * @see org.apache.james.jspf.wiring.MacroExpandEnabled#enableMacroExpand(org.apache.james.jspf.macro.MacroExpand)
+ * @see org.apache.james.jspf.wiring.MacroExpandEnabled#enableMacroExpand(org.apache.james.jspf.core.MacroExpand)
*/
public void enableMacroExpand(MacroExpand macroExpand) {
this.macroExpand = macroExpand;
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=574390&r1=574389&r2=574390&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 Mon Sep 10 15:30:55 2007
@@ -25,6 +25,7 @@
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.MacroExpand;
import org.apache.james.jspf.core.Mechanism;
import org.apache.james.jspf.core.SPF1Constants;
import org.apache.james.jspf.core.SPFChecker;
@@ -34,7 +35,6 @@
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.macro.MacroExpand;
import org.apache.james.jspf.util.SPFTermsRegexps;
import org.apache.james.jspf.wiring.LogEnabled;
import org.apache.james.jspf.wiring.MacroExpandEnabled;
@@ -249,7 +249,7 @@
}
/**
- * @see org.apache.james.jspf.wiring.MacroExpandEnabled#enableMacroExpand(org.apache.james.jspf.macro.MacroExpand)
+ * @see org.apache.james.jspf.wiring.MacroExpandEnabled#enableMacroExpand(org.apache.james.jspf.core.MacroExpand)
*/
public void enableMacroExpand(MacroExpand macroExpand) {
this.macroExpand = macroExpand;
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=574390&r1=574389&r2=574390&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 Mon Sep 10 15:30:55 2007
@@ -23,6 +23,7 @@
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.MacroExpand;
import org.apache.james.jspf.core.SPFChecker;
import org.apache.james.jspf.core.SPFCheckerDNSResponseListener;
import org.apache.james.jspf.core.SPFSession;
@@ -33,7 +34,6 @@
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.macro.MacroExpand;
import org.apache.james.jspf.util.SPFTermsRegexps;
import java.util.ArrayList;
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=574390&r1=574389&r2=574390&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 Mon Sep 10 15:30:55 2007
@@ -23,6 +23,7 @@
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.MacroExpand;
import org.apache.james.jspf.core.SPFChecker;
import org.apache.james.jspf.core.SPFCheckerDNSResponseListener;
import org.apache.james.jspf.core.SPFSession;
@@ -34,7 +35,6 @@
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.macro.MacroExpand;
import org.apache.james.jspf.util.SPFTermsRegexps;
import org.apache.james.jspf.wiring.DNSServiceEnabled;
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=574390&r1=574389&r2=574390&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 Mon Sep 10 15:30:55 2007
@@ -20,6 +20,7 @@
package org.apache.james.jspf.terms;
import org.apache.james.jspf.core.DNSLookupContinuation;
+import org.apache.james.jspf.core.MacroExpand;
import org.apache.james.jspf.core.SPFChecker;
import org.apache.james.jspf.core.SPFCheckerExceptionCatcher;
import org.apache.james.jspf.core.SPFSession;
@@ -27,7 +28,6 @@
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.macro.MacroExpand;
import org.apache.james.jspf.util.SPFTermsRegexps;
import org.apache.james.jspf.wiring.MacroExpandEnabled;
import org.apache.james.jspf.wiring.SPFCheckEnabled;
@@ -189,7 +189,7 @@
}
/**
- * @see org.apache.james.jspf.wiring.MacroExpandEnabled#enableMacroExpand(org.apache.james.jspf.macro.MacroExpand)
+ * @see org.apache.james.jspf.wiring.MacroExpandEnabled#enableMacroExpand(org.apache.james.jspf.core.MacroExpand)
*/
public void enableMacroExpand(MacroExpand macroExpand) {
this.macroExpand = macroExpand;
Modified: james/jspf/trunk/src/main/java/org/apache/james/jspf/wiring/MacroExpandEnabled.java
URL: http://svn.apache.org/viewvc/james/jspf/trunk/src/main/java/org/apache/james/jspf/wiring/MacroExpandEnabled.java?rev=574390&r1=574389&r2=574390&view=diff
==============================================================================
--- james/jspf/trunk/src/main/java/org/apache/james/jspf/wiring/MacroExpandEnabled.java (original)
+++ james/jspf/trunk/src/main/java/org/apache/james/jspf/wiring/MacroExpandEnabled.java Mon Sep 10 15:30:55 2007
@@ -19,7 +19,7 @@
package org.apache.james.jspf.wiring;
-import org.apache.james.jspf.macro.MacroExpand;
+import org.apache.james.jspf.core.MacroExpand;
/**
* Components that need to log can implement this interface so that
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=574390&r1=574389&r2=574390&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 Mon Sep 10 15:30:55 2007
@@ -20,6 +20,7 @@
package org.apache.james.jspf;
import org.apache.james.jspf.core.Logger;
+import org.apache.james.jspf.core.MacroExpand;
import org.apache.james.jspf.core.SPFRecordParser;
import org.apache.james.jspf.core.SPFResult;
import org.apache.james.jspf.dns.DNSRequest;
@@ -32,7 +33,6 @@
import org.apache.james.jspf.impl.DNSJnioAsynchService;
import org.apache.james.jspf.impl.DNSServiceAsynchSimulator;
import org.apache.james.jspf.impl.DNSServiceXBillImpl;
-import org.apache.james.jspf.macro.MacroExpand;
import org.apache.james.jspf.parser.RFC4408SPF1Parser;
import org.apache.james.jspf.parser.DefaultTermsFactory;
import org.apache.james.jspf.wiring.DNSServiceEnabled;
Copied: james/jspf/trunk/src/test/java/org/apache/james/jspf/core/MacroExpandTest.java (from r572835, james/jspf/trunk/src/test/java/org/apache/james/jspf/macro/MacroExpandTest.java)
URL: http://svn.apache.org/viewvc/james/jspf/trunk/src/test/java/org/apache/james/jspf/core/MacroExpandTest.java?p2=james/jspf/trunk/src/test/java/org/apache/james/jspf/core/MacroExpandTest.java&p1=james/jspf/trunk/src/test/java/org/apache/james/jspf/macro/MacroExpandTest.java&r1=572835&r2=574390&rev=574390&view=diff
==============================================================================
--- james/jspf/trunk/src/test/java/org/apache/james/jspf/macro/MacroExpandTest.java (original)
+++ james/jspf/trunk/src/test/java/org/apache/james/jspf/core/MacroExpandTest.java Mon Sep 10 15:30:55 2007
@@ -17,10 +17,11 @@
* under the License. *
****************************************************************/
-package org.apache.james.jspf.macro;
+package org.apache.james.jspf.core;
import org.apache.james.jspf.ConsoleLogger;
import org.apache.james.jspf.core.MacroData;
+import org.apache.james.jspf.core.MacroExpand;
import org.apache.james.jspf.exceptions.PermErrorException;
import junit.framework.TestCase;
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org