Author: bago
Date: Sun Sep 16 16:20:11 2007
New Revision: 576208
URL: http://svn.apache.org/viewvc?rev=576208&view=rev
Log:
Renamed Configurable to ConfigurationEnabled to follow the "Enabled" naming we
already use for every other service.
Added:
james/jspf/trunk/src/main/java/org/apache/james/jspf/core/ConfigurationEnabled.java
- copied, changed from r576206,
james/jspf/trunk/src/main/java/org/apache/james/jspf/core/Configurable.java
Removed:
james/jspf/trunk/src/main/java/org/apache/james/jspf/core/Configurable.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/RFC4408SPF1Parser.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/IncludeMechanism.java
james/jspf/trunk/src/main/java/org/apache/james/jspf/terms/UnknownModifier.java
Copied:
james/jspf/trunk/src/main/java/org/apache/james/jspf/core/ConfigurationEnabled.java
(from r576206,
james/jspf/trunk/src/main/java/org/apache/james/jspf/core/Configurable.java)
URL:
http://svn.apache.org/viewvc/james/jspf/trunk/src/main/java/org/apache/james/jspf/core/ConfigurationEnabled.java?p2=james/jspf/trunk/src/main/java/org/apache/james/jspf/core/ConfigurationEnabled.java&p1=james/jspf/trunk/src/main/java/org/apache/james/jspf/core/Configurable.java&r1=576206&r2=576208&rev=576208&view=diff
==============================================================================
--- james/jspf/trunk/src/main/java/org/apache/james/jspf/core/Configurable.java
(original)
+++
james/jspf/trunk/src/main/java/org/apache/james/jspf/core/ConfigurationEnabled.java
Sun Sep 16 16:20:11 2007
@@ -25,7 +25,7 @@
/**
*
*/
-public interface Configurable {
+public interface ConfigurationEnabled {
/**
* Configuration
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=576208&r1=576207&r2=576208&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:20:11 2007
@@ -19,7 +19,7 @@
package org.apache.james.jspf.parser;
-import org.apache.james.jspf.core.Configurable;
+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;
@@ -142,11 +142,11 @@
"Unexpected error adding dependencies to term: " +
e.getMessage());
}
- if (term instanceof Configurable) {
+ if (term instanceof ConfigurationEnabled) {
if (subres == null || subres.groupCount() == 0) {
- ((Configurable) term).config(null);
+ ((ConfigurationEnabled) term).config(null);
} else {
- ((Configurable) term).config(subres);
+ ((ConfigurationEnabled) term).config(subres);
}
}
return term;
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=576208&r1=576207&r2=576208&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:20:11 2007
@@ -61,7 +61,7 @@
* regex.
*
* With this informations it creates a new instance of the term and, if the
term
- * is Configurable it calls the config() method passing to it only the specific
+ * is ConfigurationEnabled it calls the config() method passing to it only the
specific
* subset of the MatchResult (using the MatchResultSubset).
*
* TODO doubts about the specification - redirect or exp with no domain-spec
are
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=576208&r1=576207&r2=576208&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:20:11 2007
@@ -20,7 +20,7 @@
package org.apache.james.jspf.terms;
-import org.apache.james.jspf.core.Configurable;
+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;
@@ -30,7 +30,7 @@
* This class represent the all mechanism
*
*/
-public class AllMechanism implements Mechanism, Configurable {
+public class AllMechanism implements Mechanism, ConfigurationEnabled {
public static final String REGEX = "[aA][lL][lL]";
@@ -42,7 +42,7 @@
}
/**
- * @see org.apache.james.jspf.core.Configurable#config(Configuration)
+ * @see
org.apache.james.jspf.core.ConfigurationEnabled#config(Configuration)
*/
public void config(Configuration params) throws PermErrorException {
// no checks needed
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=576208&r1=576207&r2=576208&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:20:11 2007
@@ -20,7 +20,7 @@
package org.apache.james.jspf.terms;
-import org.apache.james.jspf.core.Configurable;
+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;
@@ -33,7 +33,7 @@
* This abstract class represent a gerneric mechanism
*
*/
-public abstract class GenericMechanism implements Mechanism, Configurable,
LogEnabled, MacroExpandEnabled {
+public abstract class GenericMechanism implements Mechanism,
ConfigurationEnabled, LogEnabled, MacroExpandEnabled {
/**
* ABNF: ip4-cidr-length = "/" 1*DIGIT
@@ -76,7 +76,7 @@
}
/**
- * @see org.apache.james.jspf.core.Configurable#config(Configuration)
+ * @see
org.apache.james.jspf.core.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=576208&r1=576207&r2=576208&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:20:11 2007
@@ -20,7 +20,7 @@
package org.apache.james.jspf.terms;
-import org.apache.james.jspf.core.Configurable;
+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;
@@ -35,7 +35,7 @@
* This abstract class represent a gerneric modifier
*
*/
-public abstract class GenericModifier implements Modifier, Configurable,
LogEnabled {
+public abstract class GenericModifier implements Modifier,
ConfigurationEnabled, LogEnabled {
private String host;
@@ -68,7 +68,7 @@
}
/**
- * @see org.apache.james.jspf.core.Configurable#config(Configuration)
+ * @see
org.apache.james.jspf.core.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/IncludeMechanism.java
URL:
http://svn.apache.org/viewvc/james/jspf/trunk/src/main/java/org/apache/james/jspf/terms/IncludeMechanism.java?rev=576208&r1=576207&r2=576208&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:20:11 2007
@@ -20,7 +20,7 @@
package org.apache.james.jspf.terms;
-import org.apache.james.jspf.core.Configurable;
+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;
@@ -42,7 +42,7 @@
* This class represent the incude mechanism
*
*/
-public class IncludeMechanism implements Mechanism, Configurable, LogEnabled,
SPFCheckEnabled, MacroExpandEnabled {
+public class IncludeMechanism implements Mechanism, ConfigurationEnabled,
LogEnabled, SPFCheckEnabled, MacroExpandEnabled {
private final class ExceptionCatcher implements SPFCheckerExceptionCatcher
{
private SPFChecker spfChecker;
@@ -209,7 +209,7 @@
}
/**
- * @see org.apache.james.jspf.core.Configurable#config(Configuration)
+ * @see
org.apache.james.jspf.core.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=576208&r1=576207&r2=576208&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:20:11 2007
@@ -20,7 +20,7 @@
package org.apache.james.jspf.terms;
-import org.apache.james.jspf.core.Configurable;
+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;
@@ -31,7 +31,7 @@
* This Class represent an Unknown Modifier
*
*/
-public class UnknownModifier implements Modifier, Configurable {
+public class UnknownModifier implements Modifier, ConfigurationEnabled {
/**
* ABNF: name = ALPHA *( ALPHA / DIGIT / "-" / "_" / "." ) ABNF:
@@ -56,7 +56,7 @@
}
/**
- * @see org.apache.james.jspf.core.Configurable#config(Configuration)
+ * @see
org.apache.james.jspf.core.ConfigurationEnabled#config(Configuration)
*/
public synchronized void config(Configuration params) throws
PermErrorException {
if (params.groupCount() >= 2 && params.group(1) != null) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
