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 no...@apache.org on 2011/06/29 12:56:02 UTC
svn commit: r1141041 - in /james/server/trunk/mailetcontainer-camel/src:
main/java/org/apache/james/mailetcontainer/camel/
main/java/org/apache/james/mailetcontainer/impl/
main/java/org/apache/james/mailetcontainer/impl/camel/
main/java/org/apache/jame...
Author: norman
Date: Wed Jun 29 10:56:00 2011
New Revision: 1141041
URL: http://svn.apache.org/viewvc?rev=1141041&view=rev
Log:
Third step to merge mailetcontainer-camel and mailetcontainer-library, which includes package rename and moving of classes. See JAMES-1284
Added:
james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/
james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/JamesMailSpooler.java
- copied, changed from r1141038, james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/lib/JamesMailSpooler.java
james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/JamesMailetContext.java
- copied, changed from r1141037, james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/camel/JamesMailetContext.java
james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/MailetConfigImpl.java
- copied, changed from r1141038, james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/lib/MailetConfigImpl.java
james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/MatcherConfigImpl.java
- copied, changed from r1141038, james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/lib/MatcherConfigImpl.java
james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/MatcherMailetPair.java
- copied, changed from r1141038, james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/lib/MatcherMailetPair.java
james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/ProcessorUtil.java
- copied, changed from r1141038, james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/lib/ProcessorUtil.java
james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/
- copied from r1141037, james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/camel/
james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/jmx/
- copied from r1141038, james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/lib/jmx/
james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/
- copied from r1141038, james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/lib/matchers/
james/server/trunk/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/
james/server/trunk/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/MailetConfigImplTest.java
- copied, changed from r1141038, james/server/trunk/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/lib/MailetConfigImplTest.java
james/server/trunk/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/camel/
- copied from r1141037, james/server/trunk/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/camel/
james/server/trunk/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/matchers/
- copied from r1141038, james/server/trunk/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/lib/matchers/
Removed:
james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/camel/
james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/CamelMailetContext.java
james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/JamesMailetContext.java
james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/lib/JamesMailSpooler.java
james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/lib/MailetConfigImpl.java
james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/lib/MatcherConfigImpl.java
james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/lib/MatcherMailetPair.java
james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/lib/ProcessorUtil.java
james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/lib/jmx/
james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/lib/matchers/
james/server/trunk/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/camel/
james/server/trunk/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/lib/MailetConfigImplTest.java
james/server/trunk/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/lib/matchers/
Modified:
james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/CamelCompositeProcessor.java
james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/CamelMailetProcessor.java
james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/CamelProcessor.java
james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/DisposeProcessor.java
james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/MailStateEquals.java
james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/MailStateNotEquals.java
james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/MatcherMatch.java
james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/MatcherSplitter.java
james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/jmx/JMXStateCompositeProcessorListener.java
james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/jmx/JMXStateMailetProcessorListener.java
james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/jmx/MailProcessorManagement.java
james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/jmx/MailetManagement.java
james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/jmx/MatcherManagement.java
james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/And.java
james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/CompositeMatcher.java
james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/GenericCompositeMatcher.java
james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/Not.java
james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/Or.java
james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/Xor.java
james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/lib/AbstractStateCompositeProcessor.java
james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/lib/AbstractStateMailetProcessor.java
james/server/trunk/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/camel/CamelCompositeProcessorTest.java
james/server/trunk/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/camel/CamelMailetProcessorTest.java
james/server/trunk/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/matchers/AndTest.java
james/server/trunk/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/matchers/OrTest.java
james/server/trunk/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/matchers/XorTest.java
Copied: james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/JamesMailSpooler.java (from r1141038, james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/lib/JamesMailSpooler.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/JamesMailSpooler.java?p2=james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/JamesMailSpooler.java&p1=james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/lib/JamesMailSpooler.java&r1=1141038&r2=1141041&rev=1141041&view=diff
==============================================================================
--- james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/lib/JamesMailSpooler.java (original)
+++ james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/JamesMailSpooler.java Wed Jun 29 10:56:00 2011
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.mailetcontainer.lib;
+package org.apache.james.mailetcontainer.impl;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.atomic.AtomicBoolean;
Copied: james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/JamesMailetContext.java (from r1141037, james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/camel/JamesMailetContext.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/JamesMailetContext.java?p2=james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/JamesMailetContext.java&p1=james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/camel/JamesMailetContext.java&r1=1141037&r2=1141041&rev=1141041&view=diff
==============================================================================
--- james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/camel/JamesMailetContext.java (original)
+++ james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/JamesMailetContext.java Wed Jun 29 10:56:00 2011
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.mailetcontainer.camel;
+package org.apache.james.mailetcontainer.impl;
import java.util.ArrayList;
import java.util.Collection;
@@ -44,6 +44,7 @@ import org.apache.commons.configuration.
import org.apache.james.core.MailImpl;
import org.apache.james.dnsservice.api.DNSService;
import org.apache.james.dnsservice.api.TemporaryResolutionException;
+import org.apache.james.dnsservice.library.MXHostAddressIterator;
import org.apache.james.domainlist.api.DomainList;
import org.apache.james.domainlist.api.DomainListException;
import org.apache.james.lifecycle.api.Configurable;
@@ -300,6 +301,7 @@ public abstract class JamesMailetContext
return 4;
}
+
/**
* Performs DNS lookups as needed to find servers which should or might
* support SMTP. Returns an Iterator over HostAddress, a specialized
@@ -315,8 +317,15 @@ public abstract class JamesMailetContext
* - the domain for which to find mail servers
* @return an Iterator over HostAddress instances, sorted by priority
*/
- public abstract Iterator<HostAddress> getSMTPHostAddresses(String domainName);
-
+ public Iterator<HostAddress> getSMTPHostAddresses(String domainName) {
+ try {
+ return new MXHostAddressIterator(dns.findMXRecords(domainName).iterator(), dns, false, log);
+ } catch (TemporaryResolutionException e) {
+ // TODO: We only do this to not break backward compatiblity. Should
+ // fixed later
+ return Collections.unmodifiableCollection(new ArrayList<HostAddress>(0)).iterator();
+ }
+ }
/*
* (non-Javadoc)
*
Copied: james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/MailetConfigImpl.java (from r1141038, james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/lib/MailetConfigImpl.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/MailetConfigImpl.java?p2=james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/MailetConfigImpl.java&p1=james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/lib/MailetConfigImpl.java&r1=1141038&r2=1141041&rev=1141041&view=diff
==============================================================================
--- james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/lib/MailetConfigImpl.java (original)
+++ james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/MailetConfigImpl.java Wed Jun 29 10:56:00 2011
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.mailetcontainer.lib;
+package org.apache.james.mailetcontainer.impl;
import org.apache.commons.configuration.Configuration;
import org.apache.commons.configuration.DefaultConfigurationBuilder;
Copied: james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/MatcherConfigImpl.java (from r1141038, james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/lib/MatcherConfigImpl.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/MatcherConfigImpl.java?p2=james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/MatcherConfigImpl.java&p1=james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/lib/MatcherConfigImpl.java&r1=1141038&r2=1141041&rev=1141041&view=diff
==============================================================================
--- james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/lib/MatcherConfigImpl.java (original)
+++ james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/MatcherConfigImpl.java Wed Jun 29 10:56:00 2011
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.mailetcontainer.lib;
+package org.apache.james.mailetcontainer.impl;
import org.apache.mailet.MailetContext;
import org.apache.mailet.MatcherConfig;
Copied: james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/MatcherMailetPair.java (from r1141038, james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/lib/MatcherMailetPair.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/MatcherMailetPair.java?p2=james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/MatcherMailetPair.java&p1=james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/lib/MatcherMailetPair.java&r1=1141038&r2=1141041&rev=1141041&view=diff
==============================================================================
--- james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/lib/MatcherMailetPair.java (original)
+++ james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/MatcherMailetPair.java Wed Jun 29 10:56:00 2011
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.mailetcontainer.lib;
+package org.apache.james.mailetcontainer.impl;
import org.apache.mailet.Mailet;
import org.apache.mailet.Matcher;
Copied: james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/ProcessorUtil.java (from r1141038, james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/lib/ProcessorUtil.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/ProcessorUtil.java?p2=james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/ProcessorUtil.java&p1=james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/lib/ProcessorUtil.java&r1=1141038&r2=1141041&rev=1141041&view=diff
==============================================================================
--- james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/lib/ProcessorUtil.java (original)
+++ james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/ProcessorUtil.java Wed Jun 29 10:56:00 2011
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.mailetcontainer.lib;
+package org.apache.james.mailetcontainer.impl;
import java.io.PrintWriter;
import java.io.StringWriter;
Modified: james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/CamelCompositeProcessor.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/CamelCompositeProcessor.java?rev=1141041&r1=1141037&r2=1141041&view=diff
==============================================================================
--- james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/CamelCompositeProcessor.java (original)
+++ james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/CamelCompositeProcessor.java Wed Jun 29 10:56:00 2011
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.mailetcontainer.camel;
+package org.apache.james.mailetcontainer.impl.camel;
import javax.annotation.PostConstruct;
import javax.annotation.Resource;
Modified: james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/CamelMailetProcessor.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/CamelMailetProcessor.java?rev=1141041&r1=1141037&r2=1141041&view=diff
==============================================================================
--- james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/CamelMailetProcessor.java (original)
+++ james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/CamelMailetProcessor.java Wed Jun 29 10:56:00 2011
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.mailetcontainer.camel;
+package org.apache.james.mailetcontainer.impl.camel;
import java.util.List;
@@ -32,9 +32,9 @@ import org.apache.camel.ProducerTemplate
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.model.RouteDefinition;
import org.apache.camel.processor.aggregate.UseLatestAggregationStrategy;
+import org.apache.james.mailetcontainer.impl.MailetConfigImpl;
+import org.apache.james.mailetcontainer.impl.MatcherMailetPair;
import org.apache.james.mailetcontainer.lib.AbstractStateMailetProcessor;
-import org.apache.james.mailetcontainer.lib.MailetConfigImpl;
-import org.apache.james.mailetcontainer.lib.MatcherMailetPair;
import org.apache.mailet.Mail;
import org.apache.mailet.Mailet;
import org.apache.mailet.MailetConfig;
Modified: james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/CamelProcessor.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/CamelProcessor.java?rev=1141041&r1=1141037&r2=1141041&view=diff
==============================================================================
--- james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/CamelProcessor.java (original)
+++ james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/CamelProcessor.java Wed Jun 29 10:56:00 2011
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.mailetcontainer.camel;
+package org.apache.james.mailetcontainer.impl.camel;
import java.util.List;
import java.util.Locale;
@@ -25,9 +25,9 @@ import javax.mail.MessagingException;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
+import org.apache.james.mailetcontainer.impl.MailetConfigImpl;
+import org.apache.james.mailetcontainer.impl.ProcessorUtil;
import org.apache.james.mailetcontainer.lib.AbstractStateMailetProcessor.MailetProcessorListener;
-import org.apache.james.mailetcontainer.lib.MailetConfigImpl;
-import org.apache.james.mailetcontainer.lib.ProcessorUtil;
import org.apache.mailet.Mail;
import org.apache.mailet.Mailet;
import org.apache.mailet.MailetConfig;
Modified: james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/DisposeProcessor.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/DisposeProcessor.java?rev=1141041&r1=1141037&r2=1141041&view=diff
==============================================================================
--- james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/DisposeProcessor.java (original)
+++ james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/DisposeProcessor.java Wed Jun 29 10:56:00 2011
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.mailetcontainer.camel;
+package org.apache.james.mailetcontainer.impl.camel;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
Modified: james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/MailStateEquals.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/MailStateEquals.java?rev=1141041&r1=1141037&r2=1141041&view=diff
==============================================================================
--- james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/MailStateEquals.java (original)
+++ james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/MailStateEquals.java Wed Jun 29 10:56:00 2011
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.mailetcontainer.camel;
+package org.apache.james.mailetcontainer.impl.camel;
import org.apache.camel.Exchange;
import org.apache.camel.Predicate;
Modified: james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/MailStateNotEquals.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/MailStateNotEquals.java?rev=1141041&r1=1141037&r2=1141041&view=diff
==============================================================================
--- james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/MailStateNotEquals.java (original)
+++ james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/MailStateNotEquals.java Wed Jun 29 10:56:00 2011
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.mailetcontainer.camel;
+package org.apache.james.mailetcontainer.impl.camel;
import org.apache.camel.Exchange;
import org.apache.camel.Predicate;
Modified: james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/MatcherMatch.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/MatcherMatch.java?rev=1141041&r1=1141037&r2=1141041&view=diff
==============================================================================
--- james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/MatcherMatch.java (original)
+++ james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/MatcherMatch.java Wed Jun 29 10:56:00 2011
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.mailetcontainer.camel;
+package org.apache.james.mailetcontainer.impl.camel;
import org.apache.camel.Exchange;
import org.apache.camel.Predicate;
Modified: james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/MatcherSplitter.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/MatcherSplitter.java?rev=1141041&r1=1141037&r2=1141041&view=diff
==============================================================================
--- james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/MatcherSplitter.java (original)
+++ james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/MatcherSplitter.java Wed Jun 29 10:56:00 2011
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.mailetcontainer.camel;
+package org.apache.james.mailetcontainer.impl.camel;
import java.util.ArrayList;
import java.util.Collection;
@@ -32,8 +32,8 @@ import org.apache.camel.Handler;
import org.apache.camel.InOnly;
import org.apache.camel.Property;
import org.apache.james.core.MailImpl;
+import org.apache.james.mailetcontainer.impl.ProcessorUtil;
import org.apache.james.mailetcontainer.lib.AbstractStateMailetProcessor.MailetProcessorListener;
-import org.apache.james.mailetcontainer.lib.ProcessorUtil;
import org.apache.mailet.Mail;
import org.apache.mailet.MailAddress;
import org.apache.mailet.Matcher;
Modified: james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/jmx/JMXStateCompositeProcessorListener.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/jmx/JMXStateCompositeProcessorListener.java?rev=1141041&r1=1141038&r2=1141041&view=diff
==============================================================================
--- james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/jmx/JMXStateCompositeProcessorListener.java (original)
+++ james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/jmx/JMXStateCompositeProcessorListener.java Wed Jun 29 10:56:00 2011
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.mailetcontainer.lib.jmx;
+package org.apache.james.mailetcontainer.impl.jmx;
import java.lang.management.ManagementFactory;
import java.util.ArrayList;
Modified: james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/jmx/JMXStateMailetProcessorListener.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/jmx/JMXStateMailetProcessorListener.java?rev=1141041&r1=1141038&r2=1141041&view=diff
==============================================================================
--- james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/jmx/JMXStateMailetProcessorListener.java (original)
+++ james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/jmx/JMXStateMailetProcessorListener.java Wed Jun 29 10:56:00 2011
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.mailetcontainer.lib.jmx;
+package org.apache.james.mailetcontainer.impl.jmx;
import java.lang.management.ManagementFactory;
import java.util.ArrayList;
@@ -33,9 +33,9 @@ import javax.management.MalformedObjectN
import javax.management.ObjectName;
import org.apache.james.lifecycle.api.Disposable;
+import org.apache.james.mailetcontainer.impl.matchers.CompositeMatcher;
import org.apache.james.mailetcontainer.lib.AbstractStateMailetProcessor;
import org.apache.james.mailetcontainer.lib.AbstractStateMailetProcessor.MailetProcessorListener;
-import org.apache.james.mailetcontainer.lib.matchers.CompositeMatcher;
import org.apache.mailet.MailAddress;
import org.apache.mailet.Mailet;
import org.apache.mailet.Matcher;
Modified: james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/jmx/MailProcessorManagement.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/jmx/MailProcessorManagement.java?rev=1141041&r1=1141038&r2=1141041&view=diff
==============================================================================
--- james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/jmx/MailProcessorManagement.java (original)
+++ james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/jmx/MailProcessorManagement.java Wed Jun 29 10:56:00 2011
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.mailetcontainer.lib.jmx;
+package org.apache.james.mailetcontainer.impl.jmx;
import java.util.concurrent.atomic.AtomicLong;
Modified: james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/jmx/MailetManagement.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/jmx/MailetManagement.java?rev=1141041&r1=1141038&r2=1141041&view=diff
==============================================================================
--- james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/jmx/MailetManagement.java (original)
+++ james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/jmx/MailetManagement.java Wed Jun 29 10:56:00 2011
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.mailetcontainer.lib.jmx;
+package org.apache.james.mailetcontainer.impl.jmx;
import java.util.ArrayList;
import java.util.Iterator;
Modified: james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/jmx/MatcherManagement.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/jmx/MatcherManagement.java?rev=1141041&r1=1141038&r2=1141041&view=diff
==============================================================================
--- james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/jmx/MatcherManagement.java (original)
+++ james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/jmx/MatcherManagement.java Wed Jun 29 10:56:00 2011
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.mailetcontainer.lib.jmx;
+package org.apache.james.mailetcontainer.impl.jmx;
import java.util.concurrent.atomic.AtomicLong;
Modified: james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/And.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/And.java?rev=1141041&r1=1141038&r2=1141041&view=diff
==============================================================================
--- james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/And.java (original)
+++ james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/And.java Wed Jun 29 10:56:00 2011
@@ -1,4 +1,4 @@
-package org.apache.james.mailetcontainer.lib.matchers;
+package org.apache.james.mailetcontainer.impl.matchers;
/****************************************************************
* Licensed to the Apache Software Foundation (ASF) under one *
Modified: james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/CompositeMatcher.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/CompositeMatcher.java?rev=1141041&r1=1141038&r2=1141041&view=diff
==============================================================================
--- james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/CompositeMatcher.java (original)
+++ james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/CompositeMatcher.java Wed Jun 29 10:56:00 2011
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.mailetcontainer.lib.matchers;
+package org.apache.james.mailetcontainer.impl.matchers;
import java.util.Iterator;
import org.apache.mailet.Matcher;
Modified: james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/GenericCompositeMatcher.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/GenericCompositeMatcher.java?rev=1141041&r1=1141038&r2=1141041&view=diff
==============================================================================
--- james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/GenericCompositeMatcher.java (original)
+++ james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/GenericCompositeMatcher.java Wed Jun 29 10:56:00 2011
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.mailetcontainer.lib.matchers;
+package org.apache.james.mailetcontainer.impl.matchers;
import java.util.Collection;
import java.util.Iterator;
Modified: james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/Not.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/Not.java?rev=1141041&r1=1141038&r2=1141041&view=diff
==============================================================================
--- james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/Not.java (original)
+++ james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/Not.java Wed Jun 29 10:56:00 2011
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.mailetcontainer.lib.matchers;
+package org.apache.james.mailetcontainer.impl.matchers;
import java.util.ArrayList;
import java.util.Collection;
Modified: james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/Or.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/Or.java?rev=1141041&r1=1141038&r2=1141041&view=diff
==============================================================================
--- james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/Or.java (original)
+++ james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/Or.java Wed Jun 29 10:56:00 2011
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.mailetcontainer.lib.matchers;
+package org.apache.james.mailetcontainer.impl.matchers;
import org.apache.mailet.MailAddress;
import org.apache.mailet.Mail;
Modified: james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/Xor.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/Xor.java?rev=1141041&r1=1141038&r2=1141041&view=diff
==============================================================================
--- james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/Xor.java (original)
+++ james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/Xor.java Wed Jun 29 10:56:00 2011
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.mailetcontainer.lib.matchers;
+package org.apache.james.mailetcontainer.impl.matchers;
import java.util.Collection;
import java.util.Iterator;
Modified: james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/lib/AbstractStateCompositeProcessor.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/lib/AbstractStateCompositeProcessor.java?rev=1141041&r1=1141040&r2=1141041&view=diff
==============================================================================
--- james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/lib/AbstractStateCompositeProcessor.java (original)
+++ james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/lib/AbstractStateCompositeProcessor.java Wed Jun 29 10:56:00 2011
@@ -35,7 +35,7 @@ import org.apache.james.lifecycle.api.Co
import org.apache.james.lifecycle.api.LifecycleUtil;
import org.apache.james.lifecycle.api.LogEnabled;
import org.apache.james.mailetcontainer.api.MailProcessor;
-import org.apache.james.mailetcontainer.lib.jmx.JMXStateCompositeProcessorListener;
+import org.apache.james.mailetcontainer.impl.jmx.JMXStateCompositeProcessorListener;
import org.apache.mailet.Mail;
import org.slf4j.Logger;
Modified: james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/lib/AbstractStateMailetProcessor.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/lib/AbstractStateMailetProcessor.java?rev=1141041&r1=1141040&r2=1141041&view=diff
==============================================================================
--- james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/lib/AbstractStateMailetProcessor.java (original)
+++ james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/lib/AbstractStateMailetProcessor.java Wed Jun 29 10:56:00 2011
@@ -38,8 +38,11 @@ import org.apache.james.lifecycle.api.Lo
import org.apache.james.mailetcontainer.api.MailProcessor;
import org.apache.james.mailetcontainer.api.MailetLoader;
import org.apache.james.mailetcontainer.api.MatcherLoader;
-import org.apache.james.mailetcontainer.lib.jmx.JMXStateMailetProcessorListener;
-import org.apache.james.mailetcontainer.lib.matchers.CompositeMatcher;
+import org.apache.james.mailetcontainer.impl.MailetConfigImpl;
+import org.apache.james.mailetcontainer.impl.MatcherConfigImpl;
+import org.apache.james.mailetcontainer.impl.MatcherMailetPair;
+import org.apache.james.mailetcontainer.impl.jmx.JMXStateMailetProcessorListener;
+import org.apache.james.mailetcontainer.impl.matchers.CompositeMatcher;
import org.apache.mailet.Mail;
import org.apache.mailet.MailAddress;
import org.apache.mailet.Mailet;
Copied: james/server/trunk/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/MailetConfigImplTest.java (from r1141038, james/server/trunk/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/lib/MailetConfigImplTest.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/MailetConfigImplTest.java?p2=james/server/trunk/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/MailetConfigImplTest.java&p1=james/server/trunk/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/lib/MailetConfigImplTest.java&r1=1141038&r2=1141041&rev=1141041&view=diff
==============================================================================
--- james/server/trunk/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/lib/MailetConfigImplTest.java (original)
+++ james/server/trunk/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/MailetConfigImplTest.java Wed Jun 29 10:56:00 2011
@@ -17,12 +17,13 @@
* under the License. *
****************************************************************/
-package org.apache.james.mailetcontainer.lib;
+package org.apache.james.mailetcontainer.impl;
import java.io.ByteArrayInputStream;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.DefaultConfigurationBuilder;
+import org.apache.james.mailetcontainer.impl.MailetConfigImpl;
import junit.framework.TestCase;
Modified: james/server/trunk/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/camel/CamelCompositeProcessorTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/camel/CamelCompositeProcessorTest.java?rev=1141041&r1=1141037&r2=1141041&view=diff
==============================================================================
--- james/server/trunk/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/camel/CamelCompositeProcessorTest.java (original)
+++ james/server/trunk/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/camel/CamelCompositeProcessorTest.java Wed Jun 29 10:56:00 2011
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.mailetcontainer.camel;
+package org.apache.james.mailetcontainer.impl.camel;
import org.apache.camel.impl.DefaultCamelContext;
import org.apache.commons.configuration.ConfigurationException;
@@ -24,6 +24,7 @@ import org.apache.commons.configuration.
import org.apache.james.mailetcontainer.api.mock.MockMailetContext;
import org.apache.james.mailetcontainer.api.mock.MockMailetLoader;
import org.apache.james.mailetcontainer.api.mock.MockMatcherLoader;
+import org.apache.james.mailetcontainer.impl.camel.CamelCompositeProcessor;
import org.apache.james.mailetcontainer.lib.AbstractStateCompositeProcessorTest;
import org.apache.james.mailetcontainer.lib.AbstractStateCompositeProcessor;
import org.slf4j.LoggerFactory;
Modified: james/server/trunk/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/camel/CamelMailetProcessorTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/camel/CamelMailetProcessorTest.java?rev=1141041&r1=1141037&r2=1141041&view=diff
==============================================================================
--- james/server/trunk/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/camel/CamelMailetProcessorTest.java (original)
+++ james/server/trunk/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/camel/CamelMailetProcessorTest.java Wed Jun 29 10:56:00 2011
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.mailetcontainer.camel;
+package org.apache.james.mailetcontainer.impl.camel;
import org.apache.camel.impl.DefaultCamelContext;
import org.apache.commons.configuration.ConfigurationException;
@@ -25,6 +25,7 @@ import org.apache.commons.configuration.
import org.apache.james.mailetcontainer.api.mock.MockMailetContext;
import org.apache.james.mailetcontainer.api.mock.MockMailetLoader;
import org.apache.james.mailetcontainer.api.mock.MockMatcherLoader;
+import org.apache.james.mailetcontainer.impl.camel.CamelMailetProcessor;
import org.apache.james.mailetcontainer.lib.AbstractStateMailetProcessor;
import org.apache.james.mailetcontainer.lib.AbstractStateMailetProcessorTest;
import org.slf4j.Logger;
Modified: james/server/trunk/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/matchers/AndTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/matchers/AndTest.java?rev=1141041&r1=1141038&r2=1141041&view=diff
==============================================================================
--- james/server/trunk/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/matchers/AndTest.java (original)
+++ james/server/trunk/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/matchers/AndTest.java Wed Jun 29 10:56:00 2011
@@ -17,10 +17,10 @@
* under the License. *
****************************************************************/
-package org.apache.james.mailetcontainer.lib.matchers;
+package org.apache.james.mailetcontainer.impl.matchers;
-import org.apache.james.mailetcontainer.lib.matchers.And;
-import org.apache.james.mailetcontainer.lib.matchers.CompositeMatcher;
+import org.apache.james.mailetcontainer.impl.matchers.And;
+import org.apache.james.mailetcontainer.impl.matchers.CompositeMatcher;
import org.apache.james.transport.matchers.All;
import org.apache.james.transport.matchers.RecipientIs;
import org.apache.mailet.MailAddress;
Modified: james/server/trunk/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/matchers/OrTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/matchers/OrTest.java?rev=1141041&r1=1141038&r2=1141041&view=diff
==============================================================================
--- james/server/trunk/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/matchers/OrTest.java (original)
+++ james/server/trunk/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/matchers/OrTest.java Wed Jun 29 10:56:00 2011
@@ -17,10 +17,10 @@
* under the License. *
****************************************************************/
-package org.apache.james.mailetcontainer.lib.matchers;
+package org.apache.james.mailetcontainer.impl.matchers;
-import org.apache.james.mailetcontainer.lib.matchers.CompositeMatcher;
-import org.apache.james.mailetcontainer.lib.matchers.Or;
+import org.apache.james.mailetcontainer.impl.matchers.CompositeMatcher;
+import org.apache.james.mailetcontainer.impl.matchers.Or;
import org.apache.james.transport.matchers.RecipientIs;
import org.apache.mailet.MailAddress;
import org.apache.mailet.Matcher;
Modified: james/server/trunk/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/matchers/XorTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/matchers/XorTest.java?rev=1141041&r1=1141038&r2=1141041&view=diff
==============================================================================
--- james/server/trunk/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/matchers/XorTest.java (original)
+++ james/server/trunk/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/matchers/XorTest.java Wed Jun 29 10:56:00 2011
@@ -17,10 +17,10 @@
* under the License. *
****************************************************************/
-package org.apache.james.mailetcontainer.lib.matchers;
+package org.apache.james.mailetcontainer.impl.matchers;
-import org.apache.james.mailetcontainer.lib.matchers.CompositeMatcher;
-import org.apache.james.mailetcontainer.lib.matchers.Xor;
+import org.apache.james.mailetcontainer.impl.matchers.CompositeMatcher;
+import org.apache.james.mailetcontainer.impl.matchers.Xor;
import org.apache.james.transport.matchers.All;
import org.apache.james.transport.matchers.RecipientIs;
import org.apache.mailet.MailAddress;
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org