james-server-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From b...@apache.org
Subject svn commit: r576205 - in /james/jspf/trunk/src: main/java/org/apache/james/jspf/ main/java/org/apache/james/jspf/core/ main/java/org/apache/james/jspf/dns/ main/java/org/apache/james/jspf/impl/ main/java/org/apache/james/jspf/parser/ main/java/org/apac...
Date Sun, 16 Sep 2007 23:07:24 GMT
Author: bago
Date: Sun Sep 16 16:07:22 2007
New Revision: 576205

URL: http://svn.apache.org/viewvc?rev=576205&view=rev
Log:
Moved SPF to the impl package (single class package does not make sense. Most people will
anyway use DefaultSPF from the impl package).
Moved "Enabling interfaces" from _wiring_ to the same package of the service interface.

Added:
    james/jspf/trunk/src/main/java/org/apache/james/jspf/core/LogEnabled.java
      - copied, changed from r575933, james/jspf/trunk/src/main/java/org/apache/james/jspf/wiring/LogEnabled.java
    james/jspf/trunk/src/main/java/org/apache/james/jspf/core/MacroExpandEnabled.java
      - copied, changed from r575933, james/jspf/trunk/src/main/java/org/apache/james/jspf/wiring/MacroExpandEnabled.java
    james/jspf/trunk/src/main/java/org/apache/james/jspf/core/SPFCheckEnabled.java
      - copied, changed from r575933, james/jspf/trunk/src/main/java/org/apache/james/jspf/wiring/SPFCheckEnabled.java
    james/jspf/trunk/src/main/java/org/apache/james/jspf/dns/DNSServiceEnabled.java
      - copied, changed from r575933, james/jspf/trunk/src/main/java/org/apache/james/jspf/wiring/DNSServiceEnabled.java
    james/jspf/trunk/src/main/java/org/apache/james/jspf/impl/SPF.java
      - copied, changed from r575933, james/jspf/trunk/src/main/java/org/apache/james/jspf/SPF.java
Removed:
    james/jspf/trunk/src/main/java/org/apache/james/jspf/SPF.java
    james/jspf/trunk/src/main/java/org/apache/james/jspf/wiring/DNSServiceEnabled.java
    james/jspf/trunk/src/main/java/org/apache/james/jspf/wiring/LogEnabled.java
    james/jspf/trunk/src/main/java/org/apache/james/jspf/wiring/MacroExpandEnabled.java
    james/jspf/trunk/src/main/java/org/apache/james/jspf/wiring/SPFCheckEnabled.java
Modified:
    james/jspf/trunk/src/main/java/org/apache/james/jspf/impl/DefaultSPF.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/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/IncludeMechanism.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/test/java/org/apache/james/jspf/AbstractYamlTest.java

Copied: james/jspf/trunk/src/main/java/org/apache/james/jspf/core/LogEnabled.java (from r575933,
james/jspf/trunk/src/main/java/org/apache/james/jspf/wiring/LogEnabled.java)
URL: http://svn.apache.org/viewvc/james/jspf/trunk/src/main/java/org/apache/james/jspf/core/LogEnabled.java?p2=james/jspf/trunk/src/main/java/org/apache/james/jspf/core/LogEnabled.java&p1=james/jspf/trunk/src/main/java/org/apache/james/jspf/wiring/LogEnabled.java&r1=575933&r2=576205&rev=576205&view=diff
==============================================================================
--- james/jspf/trunk/src/main/java/org/apache/james/jspf/wiring/LogEnabled.java (original)
+++ james/jspf/trunk/src/main/java/org/apache/james/jspf/core/LogEnabled.java Sun Sep 16 16:07:22
2007
@@ -17,9 +17,8 @@
  * under the License.                                           *
  ****************************************************************/
 
-package org.apache.james.jspf.wiring;
+package org.apache.james.jspf.core;
 
-import org.apache.james.jspf.core.Logger;
 
 /**
  * Components that need to log can implement this interface to be provided

Copied: james/jspf/trunk/src/main/java/org/apache/james/jspf/core/MacroExpandEnabled.java
(from r575933, 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/core/MacroExpandEnabled.java?p2=james/jspf/trunk/src/main/java/org/apache/james/jspf/core/MacroExpandEnabled.java&p1=james/jspf/trunk/src/main/java/org/apache/james/jspf/wiring/MacroExpandEnabled.java&r1=575933&r2=576205&rev=576205&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/core/MacroExpandEnabled.java Sun
Sep 16 16:07:22 2007
@@ -17,9 +17,8 @@
  * under the License.                                           *
  ****************************************************************/
 
-package org.apache.james.jspf.wiring;
+package org.apache.james.jspf.core;
 
-import org.apache.james.jspf.core.MacroExpand;
 
 /**
  * Components that need to log can implement this interface so that

Copied: james/jspf/trunk/src/main/java/org/apache/james/jspf/core/SPFCheckEnabled.java (from
r575933, james/jspf/trunk/src/main/java/org/apache/james/jspf/wiring/SPFCheckEnabled.java)
URL: http://svn.apache.org/viewvc/james/jspf/trunk/src/main/java/org/apache/james/jspf/core/SPFCheckEnabled.java?p2=james/jspf/trunk/src/main/java/org/apache/james/jspf/core/SPFCheckEnabled.java&p1=james/jspf/trunk/src/main/java/org/apache/james/jspf/wiring/SPFCheckEnabled.java&r1=575933&r2=576205&rev=576205&view=diff
==============================================================================
--- james/jspf/trunk/src/main/java/org/apache/james/jspf/wiring/SPFCheckEnabled.java (original)
+++ james/jspf/trunk/src/main/java/org/apache/james/jspf/core/SPFCheckEnabled.java Sun Sep
16 16:07:22 2007
@@ -17,9 +17,8 @@
  * under the License.                                           *
  ****************************************************************/
 
-package org.apache.james.jspf.wiring;
+package org.apache.james.jspf.core;
 
-import org.apache.james.jspf.core.SPFChecker;
 
 /**
  * Components that need to log can implement this interface so that

Copied: james/jspf/trunk/src/main/java/org/apache/james/jspf/dns/DNSServiceEnabled.java (from
r575933, james/jspf/trunk/src/main/java/org/apache/james/jspf/wiring/DNSServiceEnabled.java)
URL: http://svn.apache.org/viewvc/james/jspf/trunk/src/main/java/org/apache/james/jspf/dns/DNSServiceEnabled.java?p2=james/jspf/trunk/src/main/java/org/apache/james/jspf/dns/DNSServiceEnabled.java&p1=james/jspf/trunk/src/main/java/org/apache/james/jspf/wiring/DNSServiceEnabled.java&r1=575933&r2=576205&rev=576205&view=diff
==============================================================================
--- james/jspf/trunk/src/main/java/org/apache/james/jspf/wiring/DNSServiceEnabled.java (original)
+++ james/jspf/trunk/src/main/java/org/apache/james/jspf/dns/DNSServiceEnabled.java Sun Sep
16 16:07:22 2007
@@ -17,9 +17,8 @@
  * under the License.                                           *
  ****************************************************************/
 
-package org.apache.james.jspf.wiring;
+package org.apache.james.jspf.dns;
 
-import org.apache.james.jspf.dns.DNSService;
 
 /**
  * Components that need to log can implement this interface so that

Modified: james/jspf/trunk/src/main/java/org/apache/james/jspf/impl/DefaultSPF.java
URL: http://svn.apache.org/viewvc/james/jspf/trunk/src/main/java/org/apache/james/jspf/impl/DefaultSPF.java?rev=576205&r1=576204&r2=576205&view=diff
==============================================================================
--- james/jspf/trunk/src/main/java/org/apache/james/jspf/impl/DefaultSPF.java (original)
+++ james/jspf/trunk/src/main/java/org/apache/james/jspf/impl/DefaultSPF.java Sun Sep 16 16:07:22
2007
@@ -19,7 +19,6 @@
 
 package org.apache.james.jspf.impl;
 
-import org.apache.james.jspf.SPF;
 import org.apache.james.jspf.core.Logger;
 
 public class DefaultSPF extends SPF {

Copied: james/jspf/trunk/src/main/java/org/apache/james/jspf/impl/SPF.java (from r575933,
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/impl/SPF.java?p2=james/jspf/trunk/src/main/java/org/apache/james/jspf/impl/SPF.java&p1=james/jspf/trunk/src/main/java/org/apache/james/jspf/SPF.java&r1=575933&r2=576205&rev=576205&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/impl/SPF.java Sun Sep 16 16:07:22
2007
@@ -18,21 +18,25 @@
  ****************************************************************/
 
 
-package org.apache.james.jspf;
+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.LogEnabled;
 import org.apache.james.jspf.core.Logger;
 import org.apache.james.jspf.core.MacroExpand;
+import org.apache.james.jspf.core.MacroExpandEnabled;
 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.SPFCheckEnabled;
 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;
@@ -56,10 +60,6 @@
 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.wiring.DNSServiceEnabled;
-import org.apache.james.jspf.wiring.LogEnabled;
-import org.apache.james.jspf.wiring.MacroExpandEnabled;
-import org.apache.james.jspf.wiring.SPFCheckEnabled;
 import org.apache.james.jspf.wiring.WiringServiceTable;
 
 import java.util.Iterator;
@@ -70,11 +70,12 @@
  */
 public class SPF implements SPFChecker {
 
-    private final class SPFCheckerExceptionCatcherImplementation implements
+    private final static class SPFCheckerExceptionCatcherImplementation implements
             SPFCheckerExceptionCatcher {
         private SPFChecker resultHandler;
+        private Logger log;
 
-        public SPFCheckerExceptionCatcherImplementation(SPFChecker resultHandler) {
+        public SPFCheckerExceptionCatcherImplementation(SPFChecker resultHandler, Logger
log) {
             this.resultHandler = resultHandler;
         }
 
@@ -105,6 +106,7 @@
             session.setCurrentResultExpanded(result);
             
         }
+
     }
 
     private static final class SPFRecordChecker implements SPFChecker {
@@ -323,7 +325,7 @@
         
         spfData.pushChecker(resultHandler);
         spfData.pushChecker(this);
-        spfData.pushExceptionCatcher(new SPFCheckerExceptionCatcherImplementation(resultHandler));
+        spfData.pushExceptionCatcher(new SPFCheckerExceptionCatcherImplementation(resultHandler,
log));
         
         FutureSPFResult ret = new FutureSPFResult();
         

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=576205&r1=576204&r2=576205&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:07:22
2007
@@ -25,7 +25,6 @@
 import org.apache.commons.cli.Options;
 import org.apache.commons.cli.ParseException;
 import org.apache.commons.cli.PosixParser;
-import org.apache.james.jspf.SPF;
 import org.apache.james.jspf.core.SPFResult;
 import org.apache.james.jspf.exceptions.SPFErrorConstants;
 import org.apache.log4j.ConsoleAppender;

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=576205&r1=576204&r2=576205&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:07:22 2007
@@ -21,9 +21,9 @@
 
 import org.apache.james.jspf.core.Configurable;
 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.wiring.LogEnabled;
 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/terms/ExpModifier.java
URL: http://svn.apache.org/viewvc/james/jspf/trunk/src/main/java/org/apache/james/jspf/terms/ExpModifier.java?rev=576205&r1=576204&r2=576205&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:07:22 2007
@@ -22,6 +22,7 @@
 
 import org.apache.james.jspf.core.DNSLookupContinuation;
 import org.apache.james.jspf.core.MacroExpand;
+import org.apache.james.jspf.core.MacroExpandEnabled;
 import org.apache.james.jspf.core.SPF1Constants;
 import org.apache.james.jspf.core.SPFChecker;
 import org.apache.james.jspf.core.SPFCheckerDNSResponseListener;
@@ -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.wiring.MacroExpandEnabled;
 
 import java.util.List;
 
@@ -201,7 +201,7 @@
     }
 
     /**
-     * @see org.apache.james.jspf.wiring.MacroExpandEnabled#enableMacroExpand(org.apache.james.jspf.core.MacroExpand)
+     * @see org.apache.james.jspf.core.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=576205&r1=576204&r2=576205&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 Sun Sep
16 16:07:22 2007
@@ -22,13 +22,13 @@
 
 import org.apache.james.jspf.core.Configurable;
 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.core.MacroExpand;
+import org.apache.james.jspf.core.MacroExpandEnabled;
 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.wiring.LogEnabled;
-import org.apache.james.jspf.wiring.MacroExpandEnabled;
 
 /**
  * This abstract class represent a gerneric mechanism
@@ -95,14 +95,14 @@
     }
 
     /**
-     * @see org.apache.james.jspf.wiring.LogEnabled#enableLogging(org.apache.james.jspf.core.Logger)
+     * @see org.apache.james.jspf.core.LogEnabled#enableLogging(org.apache.james.jspf.core.Logger)
      */
     public void enableLogging(Logger logger) {
         this.log = logger;
     }
 
     /**
-     * @see org.apache.james.jspf.wiring.MacroExpandEnabled#enableMacroExpand(org.apache.james.jspf.core.MacroExpand)
+     * @see org.apache.james.jspf.core.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/GenericModifier.java
URL: http://svn.apache.org/viewvc/james/jspf/trunk/src/main/java/org/apache/james/jspf/terms/GenericModifier.java?rev=576205&r1=576204&r2=576205&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 Sun Sep
16 16:07:22 2007
@@ -23,6 +23,7 @@
 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.LogEnabled;
 import org.apache.james.jspf.core.Logger;
 import org.apache.james.jspf.core.Modifier;
 import org.apache.james.jspf.core.SPFSession;
@@ -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.wiring.LogEnabled;
 
 /**
  * This abstract class represent a gerneric modifier
@@ -86,7 +86,7 @@
     
 
     /**
-     * @see org.apache.james.jspf.wiring.LogEnabled#enableLogging(org.apache.james.jspf.core.Logger)
+     * @see org.apache.james.jspf.core.LogEnabled#enableLogging(org.apache.james.jspf.core.Logger)
      */
     public void enableLogging(Logger logger) {
         this.log = logger;

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=576205&r1=576204&r2=576205&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 Sun Sep
16 16:07:22 2007
@@ -24,10 +24,13 @@
 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.LogEnabled;
 import org.apache.james.jspf.core.Logger;
 import org.apache.james.jspf.core.MacroExpand;
+import org.apache.james.jspf.core.MacroExpandEnabled;
 import org.apache.james.jspf.core.Mechanism;
 import org.apache.james.jspf.core.SPF1Constants;
+import org.apache.james.jspf.core.SPFCheckEnabled;
 import org.apache.james.jspf.core.SPFChecker;
 import org.apache.james.jspf.core.SPFCheckerExceptionCatcher;
 import org.apache.james.jspf.core.SPFSession;
@@ -36,9 +39,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.wiring.LogEnabled;
-import org.apache.james.jspf.wiring.MacroExpandEnabled;
-import org.apache.james.jspf.wiring.SPFCheckEnabled;
 
 /**
  * This class represent the incude mechanism
@@ -228,7 +228,7 @@
     }
 
     /**
-     * @see org.apache.james.jspf.wiring.LogEnabled#enableLogging(org.apache.james.jspf.core.Logger)
+     * @see org.apache.james.jspf.core.LogEnabled#enableLogging(org.apache.james.jspf.core.Logger)
      */
     public void enableLogging(Logger logger) {
         this.log = logger;
@@ -242,14 +242,14 @@
     }
 
     /**
-     * @see org.apache.james.jspf.wiring.SPFCheckEnabled#enableSPFChecking(org.apache.james.jspf.core.SPFChecker)
+     * @see org.apache.james.jspf.core.SPFCheckEnabled#enableSPFChecking(org.apache.james.jspf.core.SPFChecker)
      */
     public void enableSPFChecking(SPFChecker checker) {
         this.spfChecker = checker;
     }
 
     /**
-     * @see org.apache.james.jspf.wiring.MacroExpandEnabled#enableMacroExpand(org.apache.james.jspf.core.MacroExpand)
+     * @see org.apache.james.jspf.core.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/PTRMechanism.java
URL: http://svn.apache.org/viewvc/james/jspf/trunk/src/main/java/org/apache/james/jspf/terms/PTRMechanism.java?rev=576205&r1=576204&r2=576205&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:07:22 2007
@@ -31,12 +31,12 @@
 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.DNSServiceEnabled;
 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.wiring.DNSServiceEnabled;
 
 import java.util.List;
 
@@ -112,7 +112,7 @@
     }
 
     /**
-     * @see org.apache.james.jspf.wiring.DNSServiceEnabled#enableDNSService(org.apache.james.jspf.dns.DNSService)
+     * @see org.apache.james.jspf.dns.DNSServiceEnabled#enableDNSService(org.apache.james.jspf.dns.DNSService)
      */
     public void enableDNSService(DNSService service) {
         this.dnsService = service;

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=576205&r1=576204&r2=576205&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 Sun Sep
16 16:07:22 2007
@@ -21,6 +21,8 @@
 
 import org.apache.james.jspf.core.DNSLookupContinuation;
 import org.apache.james.jspf.core.MacroExpand;
+import org.apache.james.jspf.core.MacroExpandEnabled;
+import org.apache.james.jspf.core.SPFCheckEnabled;
 import org.apache.james.jspf.core.SPFChecker;
 import org.apache.james.jspf.core.SPFCheckerExceptionCatcher;
 import org.apache.james.jspf.core.SPFSession;
@@ -29,8 +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.wiring.MacroExpandEnabled;
-import org.apache.james.jspf.wiring.SPFCheckEnabled;
 
 /**
  * This class represent the redirect modifier
@@ -182,14 +182,14 @@
     }
 
     /**
-     * @see org.apache.james.jspf.wiring.SPFCheckEnabled#enableSPFChecking(org.apache.james.jspf.core.SPFChecker)
+     * @see org.apache.james.jspf.core.SPFCheckEnabled#enableSPFChecking(org.apache.james.jspf.core.SPFChecker)
      */
     public void enableSPFChecking(SPFChecker checker) {
         this.spfChecker = checker;
     }
 
     /**
-     * @see org.apache.james.jspf.wiring.MacroExpandEnabled#enableMacroExpand(org.apache.james.jspf.core.MacroExpand)
+     * @see org.apache.james.jspf.core.MacroExpandEnabled#enableMacroExpand(org.apache.james.jspf.core.MacroExpand)
      */
     public void enableMacroExpand(MacroExpand macroExpand) {
         this.macroExpand = macroExpand;

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=576205&r1=576204&r2=576205&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:07:22 2007
@@ -19,12 +19,16 @@
 
 package org.apache.james.jspf;
 
+import org.apache.james.jspf.core.LogEnabled;
 import org.apache.james.jspf.core.Logger;
 import org.apache.james.jspf.core.MacroExpand;
+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.SPFResult;
 import org.apache.james.jspf.dns.DNSRequest;
 import org.apache.james.jspf.dns.DNSService;
+import org.apache.james.jspf.dns.DNSServiceEnabled;
 import org.apache.james.jspf.dns.TimeoutException;
 import org.apache.james.jspf.dnsserver.DNSTestingServer;
 import org.apache.james.jspf.executor.SPFExecutor;
@@ -33,12 +37,9 @@
 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.impl.SPF;
 import org.apache.james.jspf.parser.RFC4408SPF1Parser;
 import org.apache.james.jspf.parser.DefaultTermsFactory;
-import org.apache.james.jspf.wiring.DNSServiceEnabled;
-import org.apache.james.jspf.wiring.LogEnabled;
-import org.apache.james.jspf.wiring.MacroExpandEnabled;
-import org.apache.james.jspf.wiring.SPFCheckEnabled;
 import org.apache.james.jspf.wiring.WiringService;
 import org.apache.james.jspf.wiring.WiringServiceException;
 import org.jvyaml.Constructor;



---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org


Mime
View raw message