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/17 01:13:58 UTC
svn commit: r576206 [2/2] - in /james/jspf/trunk/src:
main/java/org/apache/james/jspf/core/
main/java/org/apache/james/jspf/core/exceptions/
main/java/org/apache/james/jspf/dns/
main/java/org/apache/james/jspf/exceptions/ main/java/org/apache/james/jsp...
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=576206&r1=576205&r2=576206&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:13:53 2007
@@ -26,9 +26,8 @@
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.core.exceptions.PermErrorException;
/**
* This abstract class represent a gerneric mechanism
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=576206&r1=576205&r2=576206&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:13:53 2007
@@ -25,12 +25,11 @@
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;
-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.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;
/**
* This abstract class represent a gerneric modifier
@@ -45,7 +44,7 @@
/**
* @throws NoneException
* @throws NeutralException
- * @see org.apache.james.jspf.core.Modifier#run(SPFSession)
+ * @see org.apache.james.jspf.terms.Modifier#run(SPFSession)
*
*/
public DNSLookupContinuation checkSPF(SPFSession spfData) throws PermErrorException,
@@ -62,7 +61,7 @@
/**
- * @see org.apache.james.jspf.core.Modifier#enforceSingleInstance()
+ * @see org.apache.james.jspf.terms.Modifier#enforceSingleInstance()
*/
public boolean enforceSingleInstance() {
return true;
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=576206&r1=576205&r2=576206&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 Sun Sep 16 16:13:53 2007
@@ -22,11 +22,10 @@
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.IPAddr;
import org.apache.james.jspf.core.Inet6Util;
import org.apache.james.jspf.core.SPFSession;
-import org.apache.james.jspf.exceptions.PermErrorException;
+import org.apache.james.jspf.core.exceptions.PermErrorException;
/**
* This class represent the ip4 mechanism
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=576206&r1=576205&r2=576206&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:13:53 2007
@@ -23,22 +23,20 @@
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.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;
import org.apache.james.jspf.core.SPFTermsRegexps;
-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.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;
/**
* This class represent the incude mechanism
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=576206&r1=576205&r2=576206&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:13:53 2007
@@ -21,20 +21,19 @@
package org.apache.james.jspf.terms;
import org.apache.james.jspf.core.DNSLookupContinuation;
-import org.apache.james.jspf.core.Directive;
+import org.apache.james.jspf.core.DNSRequest;
+import org.apache.james.jspf.core.DNSResponse;
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;
import org.apache.james.jspf.core.SPFTermsRegexps;
-import org.apache.james.jspf.dns.DNSRequest;
-import org.apache.james.jspf.dns.DNSResponse;
-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.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 java.util.ArrayList;
import java.util.List;
@@ -85,7 +84,7 @@
}
/**
- * @see org.apache.james.jspf.terms.AMechanism#onDNSResponse(org.apache.james.jspf.dns.DNSResponse, org.apache.james.jspf.core.SPFSession)
+ * @see org.apache.james.jspf.terms.AMechanism#onDNSResponse(org.apache.james.jspf.core.DNSResponse, org.apache.james.jspf.core.SPFSession)
*/
public DNSLookupContinuation onDNSResponse(DNSResponse response, SPFSession spfSession)
throws PermErrorException, TempErrorException, NoneException, NeutralException {
Copied: james/jspf/trunk/src/main/java/org/apache/james/jspf/terms/Mechanism.java (from r575933, james/jspf/trunk/src/main/java/org/apache/james/jspf/core/Mechanism.java)
URL: http://svn.apache.org/viewvc/james/jspf/trunk/src/main/java/org/apache/james/jspf/terms/Mechanism.java?p2=james/jspf/trunk/src/main/java/org/apache/james/jspf/terms/Mechanism.java&p1=james/jspf/trunk/src/main/java/org/apache/james/jspf/core/Mechanism.java&r1=575933&r2=576206&rev=576206&view=diff
==============================================================================
--- james/jspf/trunk/src/main/java/org/apache/james/jspf/core/Mechanism.java (original)
+++ james/jspf/trunk/src/main/java/org/apache/james/jspf/terms/Mechanism.java Sun Sep 16 16:13:53 2007
@@ -18,7 +18,9 @@
****************************************************************/
-package org.apache.james.jspf.core;
+package org.apache.james.jspf.terms;
+
+import org.apache.james.jspf.core.SPFChecker;
/**
Copied: james/jspf/trunk/src/main/java/org/apache/james/jspf/terms/Modifier.java (from r575933, james/jspf/trunk/src/main/java/org/apache/james/jspf/core/Modifier.java)
URL: http://svn.apache.org/viewvc/james/jspf/trunk/src/main/java/org/apache/james/jspf/terms/Modifier.java?p2=james/jspf/trunk/src/main/java/org/apache/james/jspf/terms/Modifier.java&p1=james/jspf/trunk/src/main/java/org/apache/james/jspf/core/Modifier.java&r1=575933&r2=576206&rev=576206&view=diff
==============================================================================
--- james/jspf/trunk/src/main/java/org/apache/james/jspf/core/Modifier.java (original)
+++ james/jspf/trunk/src/main/java/org/apache/james/jspf/terms/Modifier.java Sun Sep 16 16:13:53 2007
@@ -18,7 +18,9 @@
****************************************************************/
-package org.apache.james.jspf.core;
+package org.apache.james.jspf.terms;
+
+import org.apache.james.jspf.core.SPFChecker;
/**
* This Interface represent a modifier
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=576206&r1=576205&r2=576206&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:13:53 2007
@@ -21,22 +21,21 @@
package org.apache.james.jspf.terms;
import org.apache.james.jspf.core.DNSLookupContinuation;
-import org.apache.james.jspf.core.Directive;
+import org.apache.james.jspf.core.DNSRequest;
+import org.apache.james.jspf.core.DNSResponse;
+import org.apache.james.jspf.core.DNSService;
+import org.apache.james.jspf.core.DNSServiceEnabled;
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;
import org.apache.james.jspf.core.SPFTermsRegexps;
-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.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 java.util.List;
@@ -112,14 +111,14 @@
}
/**
- * @see org.apache.james.jspf.dns.DNSServiceEnabled#enableDNSService(org.apache.james.jspf.dns.DNSService)
+ * @see org.apache.james.jspf.core.DNSServiceEnabled#enableDNSService(org.apache.james.jspf.core.DNSService)
*/
public void enableDNSService(DNSService service) {
this.dnsService = service;
}
/**
- * @see org.apache.james.jspf.core.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.core.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=576206&r1=576205&r2=576206&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:13:53 2007
@@ -27,10 +27,10 @@
import org.apache.james.jspf.core.SPFCheckerExceptionCatcher;
import org.apache.james.jspf.core.SPFSession;
import org.apache.james.jspf.core.SPFTermsRegexps;
-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.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;
/**
* This class represent the redirect modifier
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=576206&r1=576205&r2=576206&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 Sun Sep 16 16:13:53 2007
@@ -23,10 +23,9 @@
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.Modifier;
import org.apache.james.jspf.core.SPFSession;
import org.apache.james.jspf.core.SPFTermsRegexps;
-import org.apache.james.jspf.exceptions.PermErrorException;
+import org.apache.james.jspf.core.exceptions.PermErrorException;
/**
* This Class represent an Unknown Modifier
@@ -43,14 +42,14 @@
+ SPFTermsRegexps.MACRO_STRING_REGEX + ")";
/**
- * @see org.apache.james.jspf.core.Modifier#run(org.apache.james.jspf.core.SPFSession)
+ * @see org.apache.james.jspf.terms.Modifier#run(org.apache.james.jspf.core.SPFSession)
*/
public DNSLookupContinuation checkSPF(SPFSession spfData) throws PermErrorException {
return null;
}
/**
- * @see org.apache.james.jspf.core.Modifier#enforceSingleInstance()
+ * @see org.apache.james.jspf.terms.Modifier#enforceSingleInstance()
*/
public boolean enforceSingleInstance() {
return false;
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=576206&r1=576205&r2=576206&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:13:53 2007
@@ -19,19 +19,19 @@
package org.apache.james.jspf;
+import org.apache.james.jspf.core.DNSRequest;
+import org.apache.james.jspf.core.DNSService;
+import org.apache.james.jspf.core.DNSServiceEnabled;
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.core.TimeoutException;
import org.apache.james.jspf.dnsserver.DNSTestingServer;
import org.apache.james.jspf.executor.SPFExecutor;
+import org.apache.james.jspf.executor.SPFResult;
import org.apache.james.jspf.executor.StagedMultipleSPFExecutor;
import org.apache.james.jspf.executor.SynchronousSPFExecutor;
import org.apache.james.jspf.impl.DNSJnioAsynchService;
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=576206&r1=576205&r2=576206&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:13:53 2007
@@ -19,10 +19,10 @@
package org.apache.james.jspf;
+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.dns.DNSRequest;
-import org.apache.james.jspf.dns.DNSService;
-import org.apache.james.jspf.dns.TimeoutException;
+import org.apache.james.jspf.core.TimeoutException;
import java.util.List;
Modified: james/jspf/trunk/src/test/java/org/apache/james/jspf/MailZoneAsynchronousYamlTest.java
URL: http://svn.apache.org/viewvc/james/jspf/trunk/src/test/java/org/apache/james/jspf/MailZoneAsynchronousYamlTest.java?rev=576206&r1=576205&r2=576206&view=diff
==============================================================================
--- james/jspf/trunk/src/test/java/org/apache/james/jspf/MailZoneAsynchronousYamlTest.java (original)
+++ james/jspf/trunk/src/test/java/org/apache/james/jspf/MailZoneAsynchronousYamlTest.java Sun Sep 16 16:13:53 2007
@@ -19,7 +19,7 @@
package org.apache.james.jspf;
-import org.apache.james.jspf.dns.DNSService;
+import org.apache.james.jspf.core.DNSService;
import java.io.IOException;
import java.util.Iterator;
Modified: james/jspf/trunk/src/test/java/org/apache/james/jspf/MailZoneYamlTest.java
URL: http://svn.apache.org/viewvc/james/jspf/trunk/src/test/java/org/apache/james/jspf/MailZoneYamlTest.java?rev=576206&r1=576205&r2=576206&view=diff
==============================================================================
--- james/jspf/trunk/src/test/java/org/apache/james/jspf/MailZoneYamlTest.java (original)
+++ james/jspf/trunk/src/test/java/org/apache/james/jspf/MailZoneYamlTest.java Sun Sep 16 16:13:53 2007
@@ -19,7 +19,7 @@
package org.apache.james.jspf;
-import org.apache.james.jspf.dns.DNSService;
+import org.apache.james.jspf.core.DNSService;
import java.io.IOException;
import java.util.Iterator;
Modified: james/jspf/trunk/src/test/java/org/apache/james/jspf/SPF1ParserTest.java
URL: http://svn.apache.org/viewvc/james/jspf/trunk/src/test/java/org/apache/james/jspf/SPF1ParserTest.java?rev=576206&r1=576205&r2=576206&view=diff
==============================================================================
--- james/jspf/trunk/src/test/java/org/apache/james/jspf/SPF1ParserTest.java (original)
+++ james/jspf/trunk/src/test/java/org/apache/james/jspf/SPF1ParserTest.java Sun Sep 16 16:13:53 2007
@@ -21,8 +21,8 @@
package org.apache.james.jspf;
import org.apache.james.jspf.core.SPFRecordParser;
-import org.apache.james.jspf.exceptions.NoneException;
-import org.apache.james.jspf.exceptions.PermErrorException;
+import org.apache.james.jspf.core.exceptions.NoneException;
+import org.apache.james.jspf.core.exceptions.PermErrorException;
import org.apache.james.jspf.parser.RFC4408SPF1Parser;
import org.apache.james.jspf.parser.DefaultTermsFactory;
Modified: james/jspf/trunk/src/test/java/org/apache/james/jspf/core/IPAddrTest.java
URL: http://svn.apache.org/viewvc/james/jspf/trunk/src/test/java/org/apache/james/jspf/core/IPAddrTest.java?rev=576206&r1=576205&r2=576206&view=diff
==============================================================================
--- james/jspf/trunk/src/test/java/org/apache/james/jspf/core/IPAddrTest.java (original)
+++ james/jspf/trunk/src/test/java/org/apache/james/jspf/core/IPAddrTest.java Sun Sep 16 16:13:53 2007
@@ -20,7 +20,7 @@
package org.apache.james.jspf.core;
import org.apache.james.jspf.core.IPAddr;
-import org.apache.james.jspf.exceptions.PermErrorException;
+import org.apache.james.jspf.core.exceptions.PermErrorException;
import junit.framework.TestCase;
Modified: james/jspf/trunk/src/test/java/org/apache/james/jspf/core/MacroExpandTest.java
URL: http://svn.apache.org/viewvc/james/jspf/trunk/src/test/java/org/apache/james/jspf/core/MacroExpandTest.java?rev=576206&r1=576205&r2=576206&view=diff
==============================================================================
--- james/jspf/trunk/src/test/java/org/apache/james/jspf/core/MacroExpandTest.java (original)
+++ james/jspf/trunk/src/test/java/org/apache/james/jspf/core/MacroExpandTest.java Sun Sep 16 16:13:53 2007
@@ -22,7 +22,7 @@
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 org.apache.james.jspf.core.exceptions.PermErrorException;
import junit.framework.TestCase;
Modified: james/jspf/trunk/src/test/java/org/apache/james/jspf/core/SPFSessionTest.java
URL: http://svn.apache.org/viewvc/james/jspf/trunk/src/test/java/org/apache/james/jspf/core/SPFSessionTest.java?rev=576206&r1=576205&r2=576206&view=diff
==============================================================================
--- james/jspf/trunk/src/test/java/org/apache/james/jspf/core/SPFSessionTest.java (original)
+++ james/jspf/trunk/src/test/java/org/apache/james/jspf/core/SPFSessionTest.java Sun Sep 16 16:13:53 2007
@@ -19,8 +19,8 @@
package org.apache.james.jspf.core;
-import org.apache.james.jspf.exceptions.NoneException;
-import org.apache.james.jspf.exceptions.PermErrorException;
+import org.apache.james.jspf.core.exceptions.NoneException;
+import org.apache.james.jspf.core.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