Author: norman
Date: Sun May 2 16:59:48 2010
New Revision: 940262
URL: http://svn.apache.org/viewvc?rev=940262&view=rev
Log:
Just rename class to be more in line with james naming
Added:
james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/GenericCompositeMatcher.java
- copied, changed from r940261,
james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/CompositeMatcherBase.java
Removed:
james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/CompositeMatcherBase.java
Modified:
james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/And.java
james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/Not.java
james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/Or.java
james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/Xor.java
Modified:
james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/And.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/And.java?rev=940262&r1=940261&r2=940262&view=diff
==============================================================================
---
james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/And.java
(original)
+++
james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/And.java
Sun May 2 16:59:48 2010
@@ -31,7 +31,7 @@ import org.apache.mailet.Matcher;
* This matcher performs And conjunction between the two recipients
*
*/
-public class And extends CompositeMatcherBase {
+public class And extends GenericCompositeMatcher {
/**
* This is the And CompositeMatcher - consider it to be an intersection of
Copied:
james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/GenericCompositeMatcher.java
(from r940261,
james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/CompositeMatcherBase.java)
URL:
http://svn.apache.org/viewvc/james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/GenericCompositeMatcher.java?p2=james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/GenericCompositeMatcher.java&p1=james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/CompositeMatcherBase.java&r1=940261&r2=940262&rev=940262&view=diff
==============================================================================
---
james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/CompositeMatcherBase.java
(original)
+++
james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/GenericCompositeMatcher.java
Sun May 2 16:59:48 2010
@@ -31,7 +31,7 @@ import org.apache.mailet.base.GenericMat
* Abstract base class for CompositeMatchers. This class handles the child
* collection of Matchers associated with the CompositeMatcher.
*/
-public abstract class CompositeMatcherBase extends GenericMatcher implements
CompositeMatcher {
+public abstract class GenericCompositeMatcher extends GenericMatcher
implements CompositeMatcher {
/**
* This lets the SpoolManager configuration code build up the composition
* (which might be composed of other composites).
Modified:
james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/Not.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/Not.java?rev=940262&r1=940261&r2=940262&view=diff
==============================================================================
---
james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/Not.java
(original)
+++
james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/Not.java
Sun May 2 16:59:48 2010
@@ -27,7 +27,7 @@ import org.apache.mailet.Mail;
import javax.mail.MessagingException;
-public class Not extends CompositeMatcherBase {
+public class Not extends GenericCompositeMatcher {
/**
* This is the Not CompositeMatcher - consider what wasn't in the result
set
Modified:
james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/Or.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/Or.java?rev=940262&r1=940261&r2=940262&view=diff
==============================================================================
---
james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/Or.java
(original)
+++
james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/Or.java
Sun May 2 16:59:48 2010
@@ -28,7 +28,7 @@ import java.util.Iterator;
import java.util.ArrayList;
import javax.mail.MessagingException;
-public class Or extends CompositeMatcherBase {
+public class Or extends GenericCompositeMatcher {
/**
* This is the Or CompositeMatcher - consider it to be a union of the
Modified:
james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/Xor.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/Xor.java?rev=940262&r1=940261&r2=940262&view=diff
==============================================================================
---
james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/Xor.java
(original)
+++
james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/Xor.java
Sun May 2 16:59:48 2010
@@ -27,7 +27,7 @@ import org.apache.mailet.Mail;
import javax.mail.MessagingException;
import org.apache.mailet.Matcher;
-public class Xor extends CompositeMatcherBase {
+public class Xor extends GenericCompositeMatcher {
/**
* This is the Xor CompositeMatcher - consider it to be the inequality
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]