Author: norman
Date: Sun May 2 16:57:06 2010
New Revision: 940261
URL: http://svn.apache.org/viewvc?rev=940261&view=rev
Log:
Add composite matcher stuff (JAMES-948)
Added:
james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/And.java
- copied, changed from r910050,
james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/And.java
james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/CompositeMatcher.java
- copied, changed from r940060,
james/mailet/api/trunk/src/main/java/org/apache/mailet/CompositeMatcher.java
james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/CompositeMatcherBase.java
- copied, changed from r910040,
james/mailet/base/trunk/src/main/java/org/apache/mailet/base/CompositeMatcherBase.java
james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/Not.java
- copied, changed from r910050,
james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/Not.java
james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/Or.java
- copied, changed from r910050,
james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/Or.java
james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/Xor.java
- copied, changed from r910050,
james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/Xor.java
james/server/trunk/mailets/src/test/java/org/apache/james/transport/matchers/AndTest.java
- copied unchanged from r910050,
james/mailet/standard/trunk/src/test/java/org/apache/james/transport/matchers/AndTest.java
james/server/trunk/mailets/src/test/java/org/apache/james/transport/matchers/OrTest.java
- copied unchanged from r910050,
james/mailet/standard/trunk/src/test/java/org/apache/james/transport/matchers/OrTest.java
james/server/trunk/mailets/src/test/java/org/apache/james/transport/matchers/XorTest.java
- copied unchanged from r910050,
james/mailet/standard/trunk/src/test/java/org/apache/james/transport/matchers/XorTest.java
Copied:
james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/And.java
(from r910050,
james/mailet/standard/trunk/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?p2=james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/And.java&p1=james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/And.java&r1=910050&r2=940261&rev=940261&view=diff
==============================================================================
---
james/mailet/standard/trunk/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:57:06 2010
@@ -26,7 +26,6 @@ import org.apache.mailet.MailAddress;
import org.apache.mailet.Mail;
import javax.mail.MessagingException;
import org.apache.mailet.Matcher;
-import org.apache.mailet.base.CompositeMatcherBase;
/**
* This matcher performs And conjunction between the two recipients
Copied:
james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/CompositeMatcher.java
(from r940060,
james/mailet/api/trunk/src/main/java/org/apache/mailet/CompositeMatcher.java)
URL:
http://svn.apache.org/viewvc/james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/CompositeMatcher.java?p2=james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/CompositeMatcher.java&p1=james/mailet/api/trunk/src/main/java/org/apache/mailet/CompositeMatcher.java&r1=940060&r2=940261&rev=940261&view=diff
==============================================================================
---
james/mailet/api/trunk/src/main/java/org/apache/mailet/CompositeMatcher.java
(original)
+++
james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/CompositeMatcher.java
Sun May 2 16:57:06 2010
@@ -18,7 +18,7 @@
****************************************************************/
-package org.apache.mailet;
+package org.apache.james.transport.matchers;
import java.util.Iterator;
import org.apache.mailet.Matcher;
Copied:
james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/CompositeMatcherBase.java
(from r910040,
james/mailet/base/trunk/src/main/java/org/apache/mailet/base/CompositeMatcherBase.java)
URL:
http://svn.apache.org/viewvc/james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/CompositeMatcherBase.java?p2=james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/CompositeMatcherBase.java&p1=james/mailet/base/trunk/src/main/java/org/apache/mailet/base/CompositeMatcherBase.java&r1=910040&r2=940261&rev=940261&view=diff
==============================================================================
---
james/mailet/base/trunk/src/main/java/org/apache/mailet/base/CompositeMatcherBase.java
(original)
+++
james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/CompositeMatcherBase.java
Sun May 2 16:57:06 2010
@@ -18,14 +18,14 @@
****************************************************************/
-package org.apache.mailet.base;
+package org.apache.james.transport.matchers;
import java.util.Collection;
import java.util.Iterator;
import java.util.ArrayList;
-import org.apache.mailet.CompositeMatcher;
import org.apache.mailet.Matcher;
+import org.apache.mailet.base.GenericMatcher;
/**
* Abstract base class for CompositeMatchers. This class handles the child
Copied:
james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/Not.java
(from r910050,
james/mailet/standard/trunk/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?p2=james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/Not.java&p1=james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/Not.java&r1=910050&r2=940261&rev=940261&view=diff
==============================================================================
---
james/mailet/standard/trunk/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:57:06 2010
@@ -24,7 +24,6 @@ import java.util.Collection;
import java.util.Iterator;
import org.apache.mailet.Matcher;
import org.apache.mailet.Mail;
-import org.apache.mailet.base.CompositeMatcherBase;
import javax.mail.MessagingException;
Copied:
james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/Or.java
(from r910050,
james/mailet/standard/trunk/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?p2=james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/Or.java&p1=james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/Or.java&r1=910050&r2=940261&rev=940261&view=diff
==============================================================================
---
james/mailet/standard/trunk/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:57:06 2010
@@ -22,7 +22,6 @@ package org.apache.james.transport.match
import org.apache.mailet.MailAddress;
import org.apache.mailet.Mail;
import org.apache.mailet.Matcher;
-import org.apache.mailet.base.CompositeMatcherBase;
import java.util.Collection;
import java.util.Iterator;
Copied:
james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/Xor.java
(from r910050,
james/mailet/standard/trunk/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?p2=james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/Xor.java&p1=james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/Xor.java&r1=910050&r2=940261&rev=940261&view=diff
==============================================================================
---
james/mailet/standard/trunk/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:57:06 2010
@@ -26,7 +26,6 @@ import org.apache.mailet.MailAddress;
import org.apache.mailet.Mail;
import javax.mail.MessagingException;
import org.apache.mailet.Matcher;
-import org.apache.mailet.base.CompositeMatcherBase;
public class Xor extends CompositeMatcherBase {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
