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:29:49 UTC
svn commit: r576209 - in
/james/jspf/trunk/src/main/java/org/apache/james/jspf: core/ parser/ terms/
Author: bago
Date: Sun Sep 16 16:29:48 2007
New Revision: 576209
URL: http://svn.apache.org/viewvc?rev=576209&view=rev
Log:
Move Configuration/ConfigurationEnabled to the terms package (only user of the 2 interfaces)
Added:
james/jspf/trunk/src/main/java/org/apache/james/jspf/terms/Configuration.java
- copied, changed from r575933, james/jspf/trunk/src/main/java/org/apache/james/jspf/core/Configuration.java
james/jspf/trunk/src/main/java/org/apache/james/jspf/terms/ConfigurationEnabled.java
- copied, changed from r576208, james/jspf/trunk/src/main/java/org/apache/james/jspf/core/ConfigurationEnabled.java
Removed:
james/jspf/trunk/src/main/java/org/apache/james/jspf/core/Configuration.java
james/jspf/trunk/src/main/java/org/apache/james/jspf/core/ConfigurationEnabled.java
Modified:
james/jspf/trunk/src/main/java/org/apache/james/jspf/parser/DefaultTermsFactory.java
james/jspf/trunk/src/main/java/org/apache/james/jspf/parser/MatcherBasedConfiguration.java
james/jspf/trunk/src/main/java/org/apache/james/jspf/parser/RFC4408SPF1Parser.java
james/jspf/trunk/src/main/java/org/apache/james/jspf/parser/TermsFactory.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/AllMechanism.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/IP4Mechanism.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/UnknownModifier.java
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=576209&r1=576208&r2=576209&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:29:48 2007
@@ -19,11 +19,11 @@
package org.apache.james.jspf.parser;
-import org.apache.james.jspf.core.ConfigurationEnabled;
-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.exceptions.PermErrorException;
+import org.apache.james.jspf.terms.Configuration;
+import org.apache.james.jspf.terms.ConfigurationEnabled;
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/parser/MatcherBasedConfiguration.java
URL: http://svn.apache.org/viewvc/james/jspf/trunk/src/main/java/org/apache/james/jspf/parser/MatcherBasedConfiguration.java?rev=576209&r1=576208&r2=576209&view=diff
==============================================================================
--- james/jspf/trunk/src/main/java/org/apache/james/jspf/parser/MatcherBasedConfiguration.java (original)
+++ james/jspf/trunk/src/main/java/org/apache/james/jspf/parser/MatcherBasedConfiguration.java Sun Sep 16 16:29:48 2007
@@ -19,7 +19,7 @@
package org.apache.james.jspf.parser;
-import org.apache.james.jspf.core.Configuration;
+import org.apache.james.jspf.terms.Configuration;
import java.util.regex.Matcher;
@@ -52,14 +52,14 @@
}
/**
- * @see org.apache.james.jspf.core.Configuration#group(int)
+ * @see org.apache.james.jspf.terms.Configuration#group(int)
*/
public String group(int arg0) {
return wrapped.group(arg0 + start);
}
/**
- * @see org.apache.james.jspf.core.Configuration#groupCount()
+ * @see org.apache.james.jspf.terms.Configuration#groupCount()
*/
public int groupCount() {
return count;
Modified: james/jspf/trunk/src/main/java/org/apache/james/jspf/parser/RFC4408SPF1Parser.java
URL: http://svn.apache.org/viewvc/james/jspf/trunk/src/main/java/org/apache/james/jspf/parser/RFC4408SPF1Parser.java?rev=576209&r1=576208&r2=576209&view=diff
==============================================================================
--- james/jspf/trunk/src/main/java/org/apache/james/jspf/parser/RFC4408SPF1Parser.java (original)
+++ james/jspf/trunk/src/main/java/org/apache/james/jspf/parser/RFC4408SPF1Parser.java Sun Sep 16 16:29:48 2007
@@ -20,7 +20,6 @@
package org.apache.james.jspf.parser;
-import org.apache.james.jspf.core.Configuration;
import org.apache.james.jspf.core.Logger;
import org.apache.james.jspf.core.SPF1Constants;
import org.apache.james.jspf.core.SPF1Record;
@@ -28,6 +27,7 @@
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.terms.Configuration;
import org.apache.james.jspf.terms.Directive;
import org.apache.james.jspf.terms.Mechanism;
import org.apache.james.jspf.terms.Modifier;
Modified: james/jspf/trunk/src/main/java/org/apache/james/jspf/parser/TermsFactory.java
URL: http://svn.apache.org/viewvc/james/jspf/trunk/src/main/java/org/apache/james/jspf/parser/TermsFactory.java?rev=576209&r1=576208&r2=576209&view=diff
==============================================================================
--- james/jspf/trunk/src/main/java/org/apache/james/jspf/parser/TermsFactory.java (original)
+++ james/jspf/trunk/src/main/java/org/apache/james/jspf/parser/TermsFactory.java Sun Sep 16 16:29:48 2007
@@ -19,8 +19,8 @@
package org.apache.james.jspf.parser;
-import org.apache.james.jspf.core.Configuration;
import org.apache.james.jspf.core.exceptions.PermErrorException;
+import org.apache.james.jspf.terms.Configuration;
import java.util.Collection;
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=576209&r1=576208&r2=576209&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:29:48 2007
@@ -20,7 +20,6 @@
package org.apache.james.jspf.terms;
-import org.apache.james.jspf.core.Configuration;
import org.apache.james.jspf.core.DNSLookupContinuation;
import org.apache.james.jspf.core.DNSRequest;
import org.apache.james.jspf.core.DNSResponse;
Modified: james/jspf/trunk/src/main/java/org/apache/james/jspf/terms/AllMechanism.java
URL: http://svn.apache.org/viewvc/james/jspf/trunk/src/main/java/org/apache/james/jspf/terms/AllMechanism.java?rev=576209&r1=576208&r2=576209&view=diff
==============================================================================
--- james/jspf/trunk/src/main/java/org/apache/james/jspf/terms/AllMechanism.java (original)
+++ james/jspf/trunk/src/main/java/org/apache/james/jspf/terms/AllMechanism.java Sun Sep 16 16:29:48 2007
@@ -20,8 +20,6 @@
package org.apache.james.jspf.terms;
-import org.apache.james.jspf.core.ConfigurationEnabled;
-import org.apache.james.jspf.core.Configuration;
import org.apache.james.jspf.core.DNSLookupContinuation;
import org.apache.james.jspf.core.SPFSession;
import org.apache.james.jspf.core.exceptions.PermErrorException;
@@ -42,7 +40,7 @@
}
/**
- * @see org.apache.james.jspf.core.ConfigurationEnabled#config(Configuration)
+ * @see org.apache.james.jspf.terms.ConfigurationEnabled#config(Configuration)
*/
public void config(Configuration params) throws PermErrorException {
// no checks needed
Copied: james/jspf/trunk/src/main/java/org/apache/james/jspf/terms/Configuration.java (from r575933, james/jspf/trunk/src/main/java/org/apache/james/jspf/core/Configuration.java)
URL: http://svn.apache.org/viewvc/james/jspf/trunk/src/main/java/org/apache/james/jspf/terms/Configuration.java?p2=james/jspf/trunk/src/main/java/org/apache/james/jspf/terms/Configuration.java&p1=james/jspf/trunk/src/main/java/org/apache/james/jspf/core/Configuration.java&r1=575933&r2=576209&rev=576209&view=diff
==============================================================================
--- james/jspf/trunk/src/main/java/org/apache/james/jspf/core/Configuration.java (original)
+++ james/jspf/trunk/src/main/java/org/apache/james/jspf/terms/Configuration.java Sun Sep 16 16:29:48 2007
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.jspf.core;
+package org.apache.james.jspf.terms;
public interface Configuration {
Copied: james/jspf/trunk/src/main/java/org/apache/james/jspf/terms/ConfigurationEnabled.java (from r576208, james/jspf/trunk/src/main/java/org/apache/james/jspf/core/ConfigurationEnabled.java)
URL: http://svn.apache.org/viewvc/james/jspf/trunk/src/main/java/org/apache/james/jspf/terms/ConfigurationEnabled.java?p2=james/jspf/trunk/src/main/java/org/apache/james/jspf/terms/ConfigurationEnabled.java&p1=james/jspf/trunk/src/main/java/org/apache/james/jspf/core/ConfigurationEnabled.java&r1=576208&r2=576209&rev=576209&view=diff
==============================================================================
--- james/jspf/trunk/src/main/java/org/apache/james/jspf/core/ConfigurationEnabled.java (original)
+++ james/jspf/trunk/src/main/java/org/apache/james/jspf/terms/ConfigurationEnabled.java Sun Sep 16 16:29:48 2007
@@ -18,7 +18,7 @@
****************************************************************/
-package org.apache.james.jspf.core;
+package org.apache.james.jspf.terms;
import org.apache.james.jspf.core.exceptions.PermErrorException;
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=576209&r1=576208&r2=576209&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:29:48 2007
@@ -20,8 +20,6 @@
package org.apache.james.jspf.terms;
-import org.apache.james.jspf.core.ConfigurationEnabled;
-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;
@@ -76,7 +74,7 @@
}
/**
- * @see org.apache.james.jspf.core.ConfigurationEnabled#config(Configuration)
+ * @see org.apache.james.jspf.terms.ConfigurationEnabled#config(Configuration)
*/
public synchronized void config(Configuration params) throws PermErrorException {
if (params.groupCount() >= 1 && params.group(1) != null) {
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=576209&r1=576208&r2=576209&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:29:48 2007
@@ -20,8 +20,6 @@
package org.apache.james.jspf.terms;
-import org.apache.james.jspf.core.ConfigurationEnabled;
-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;
@@ -68,7 +66,7 @@
}
/**
- * @see org.apache.james.jspf.core.ConfigurationEnabled#config(Configuration)
+ * @see org.apache.james.jspf.terms.ConfigurationEnabled#config(Configuration)
*/
public synchronized void config(Configuration params) throws PermErrorException {
if (params.groupCount() > 0) {
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=576209&r1=576208&r2=576209&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:29:48 2007
@@ -20,7 +20,6 @@
package org.apache.james.jspf.terms;
-import org.apache.james.jspf.core.Configuration;
import org.apache.james.jspf.core.DNSLookupContinuation;
import org.apache.james.jspf.core.IPAddr;
import org.apache.james.jspf.core.Inet6Util;
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=576209&r1=576208&r2=576209&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:29:48 2007
@@ -20,8 +20,6 @@
package org.apache.james.jspf.terms;
-import org.apache.james.jspf.core.ConfigurationEnabled;
-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;
@@ -209,7 +207,7 @@
}
/**
- * @see org.apache.james.jspf.core.ConfigurationEnabled#config(Configuration)
+ * @see org.apache.james.jspf.terms.ConfigurationEnabled#config(Configuration)
*/
public synchronized void config(Configuration params) throws PermErrorException {
if (params.groupCount() == 0) {
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=576209&r1=576208&r2=576209&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:29:48 2007
@@ -20,8 +20,6 @@
package org.apache.james.jspf.terms;
-import org.apache.james.jspf.core.ConfigurationEnabled;
-import org.apache.james.jspf.core.Configuration;
import org.apache.james.jspf.core.DNSLookupContinuation;
import org.apache.james.jspf.core.SPFSession;
import org.apache.james.jspf.core.SPFTermsRegexps;
@@ -56,7 +54,7 @@
}
/**
- * @see org.apache.james.jspf.core.ConfigurationEnabled#config(Configuration)
+ * @see org.apache.james.jspf.terms.ConfigurationEnabled#config(Configuration)
*/
public synchronized void config(Configuration params) throws PermErrorException {
if (params.groupCount() >= 2 && params.group(1) != null) {
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org