You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@james.apache.org by rc...@apache.org on 2021/06/17 03:16:07 UTC
[james-project] 05/05: JAMES-3589 Rename mailetcontainer-camel
maven module
This is an automated email from the ASF dual-hosted git repository.
rcordier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit faf6b5da2c98ed1e7ce4094a615e46fb42a9fa20
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Wed Jun 2 16:30:22 2021 +0700
JAMES-3589 Rename mailetcontainer-camel maven module
---
pom.xml | 2 +-
server/apps/spring-app/pom.xml | 2 +-
server/container/guice/jmx/pom.xml | 2 +-
server/container/guice/mailet/pom.xml | 2 +-
server/mailet/{mailetcontainer-camel => mailetcontainer-impl}/pom.xml | 4 ++--
.../james/mailetcontainer/AutomaticallySentMailDetectorImpl.java | 0
.../org/apache/james/mailetcontainer/impl/CompositeProcessorImpl.java | 0
.../java/org/apache/james/mailetcontainer/impl/JamesMailSpooler.java | 0
.../org/apache/james/mailetcontainer/impl/JamesMailetContext.java | 0
.../java/org/apache/james/mailetcontainer/impl/LocalResources.java | 0
.../java/org/apache/james/mailetcontainer/impl/MailetConfigImpl.java | 0
.../org/apache/james/mailetcontainer/impl/MailetProcessorImpl.java | 0
.../java/org/apache/james/mailetcontainer/impl/MatcherConfigImpl.java | 0
.../java/org/apache/james/mailetcontainer/impl/MatcherMailetPair.java | 0
.../java/org/apache/james/mailetcontainer/impl/MatcherSplitter.java | 0
.../java/org/apache/james/mailetcontainer/impl/ProcessorImpl.java | 0
.../java/org/apache/james/mailetcontainer/impl/ProcessorUtil.java | 0
.../mailetcontainer/impl/jmx/JMXStateCompositeProcessorListener.java | 0
.../mailetcontainer/impl/jmx/JMXStateMailetProcessorListener.java | 0
.../james/mailetcontainer/impl/jmx/MailProcessorManagement.java | 0
.../org/apache/james/mailetcontainer/impl/jmx/MailetManagement.java | 0
.../org/apache/james/mailetcontainer/impl/jmx/MatcherManagement.java | 0
.../main/java/org/apache/james/mailetcontainer/impl/matchers/And.java | 0
.../apache/james/mailetcontainer/impl/matchers/CompositeMatcher.java | 0
.../james/mailetcontainer/impl/matchers/GenericCompositeMatcher.java | 0
.../main/java/org/apache/james/mailetcontainer/impl/matchers/Not.java | 0
.../main/java/org/apache/james/mailetcontainer/impl/matchers/Or.java | 0
.../main/java/org/apache/james/mailetcontainer/impl/matchers/Xor.java | 0
.../james/mailetcontainer/lib/AbstractStateCompositeProcessor.java | 0
.../james/mailetcontainer/lib/AbstractStateMailetProcessor.java | 0
.../src/main/resources/META-INF/spring/mailetcontainer-context.xml | 0
.../src/reporting-site/site.xml | 0
.../james/mailetcontainer/AutomaticallySentMailDetectorImplTest.java | 0
.../apache/james/mailetcontainer/impl/CompositeProcessorImplTest.java | 0
.../org/apache/james/mailetcontainer/impl/JamesMailetContextTest.java | 1 -
.../org/apache/james/mailetcontainer/impl/MailetConfigImplTest.java | 0
.../apache/james/mailetcontainer/impl/MailetProcessorImplTest.java | 0
.../java/org/apache/james/mailetcontainer/impl/matchers/AndTest.java | 0
.../java/org/apache/james/mailetcontainer/impl/matchers/NotTest.java | 0
.../java/org/apache/james/mailetcontainer/impl/matchers/OrTest.java | 0
.../java/org/apache/james/mailetcontainer/impl/matchers/XorTest.java | 0
.../mailetcontainer/lib/AbstractStateCompositeProcessorTest.java | 0
.../james/mailetcontainer/lib/AbstractStateMailetProcessorTest.java | 2 --
server/pom.xml | 2 +-
44 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/pom.xml b/pom.xml
index 59082b3..0d71ced 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1596,7 +1596,7 @@
</dependency>
<dependency>
<groupId>${james.groupId}</groupId>
- <artifactId>james-server-mailetcontainer-camel</artifactId>
+ <artifactId>james-server-mailetcontainer-impl</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
diff --git a/server/apps/spring-app/pom.xml b/server/apps/spring-app/pom.xml
index 1fd573f..53e0100 100644
--- a/server/apps/spring-app/pom.xml
+++ b/server/apps/spring-app/pom.xml
@@ -306,7 +306,7 @@
</dependency>
<dependency>
<groupId>${james.groupId}</groupId>
- <artifactId>james-server-mailetcontainer-camel</artifactId>
+ <artifactId>james-server-mailetcontainer-impl</artifactId>
<scope>runtime</scope>
<exclusions>
<exclusion>
diff --git a/server/container/guice/jmx/pom.xml b/server/container/guice/jmx/pom.xml
index 4a4660f..b46ef2c 100644
--- a/server/container/guice/jmx/pom.xml
+++ b/server/container/guice/jmx/pom.xml
@@ -66,7 +66,7 @@
</dependency>
<dependency>
<groupId>${james.groupId}</groupId>
- <artifactId>james-server-mailetcontainer-camel</artifactId>
+ <artifactId>james-server-mailetcontainer-impl</artifactId>
</dependency>
<dependency>
<groupId>${james.groupId}</groupId>
diff --git a/server/container/guice/mailet/pom.xml b/server/container/guice/mailet/pom.xml
index d290fea..2dfd047 100644
--- a/server/container/guice/mailet/pom.xml
+++ b/server/container/guice/mailet/pom.xml
@@ -69,7 +69,7 @@
</dependency>
<dependency>
<groupId>${james.groupId}</groupId>
- <artifactId>james-server-mailetcontainer-camel</artifactId>
+ <artifactId>james-server-mailetcontainer-impl</artifactId>
</dependency>
<dependency>
<groupId>${james.groupId}</groupId>
diff --git a/server/mailet/mailetcontainer-camel/pom.xml b/server/mailet/mailetcontainer-impl/pom.xml
similarity index 97%
rename from server/mailet/mailetcontainer-camel/pom.xml
rename to server/mailet/mailetcontainer-impl/pom.xml
index 611e78b..ade7db3 100644
--- a/server/mailet/mailetcontainer-camel/pom.xml
+++ b/server/mailet/mailetcontainer-impl/pom.xml
@@ -27,10 +27,10 @@
<relativePath>../../pom.xml</relativePath>
</parent>
- <artifactId>james-server-mailetcontainer-camel</artifactId>
+ <artifactId>james-server-mailetcontainer-impl</artifactId>
<packaging>jar</packaging>
- <name>Apache James :: Server :: Mailetcontainer Camel</name>
+ <name>Apache James :: Server :: Mailetcontainer Impl</name>
<dependencies>
<dependency>
diff --git a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/AutomaticallySentMailDetectorImpl.java b/server/mailet/mailetcontainer-impl/src/main/java/org/apache/james/mailetcontainer/AutomaticallySentMailDetectorImpl.java
similarity index 100%
rename from server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/AutomaticallySentMailDetectorImpl.java
rename to server/mailet/mailetcontainer-impl/src/main/java/org/apache/james/mailetcontainer/AutomaticallySentMailDetectorImpl.java
diff --git a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/CompositeProcessorImpl.java b/server/mailet/mailetcontainer-impl/src/main/java/org/apache/james/mailetcontainer/impl/CompositeProcessorImpl.java
similarity index 100%
rename from server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/CompositeProcessorImpl.java
rename to server/mailet/mailetcontainer-impl/src/main/java/org/apache/james/mailetcontainer/impl/CompositeProcessorImpl.java
diff --git a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/JamesMailSpooler.java b/server/mailet/mailetcontainer-impl/src/main/java/org/apache/james/mailetcontainer/impl/JamesMailSpooler.java
similarity index 100%
rename from server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/JamesMailSpooler.java
rename to server/mailet/mailetcontainer-impl/src/main/java/org/apache/james/mailetcontainer/impl/JamesMailSpooler.java
diff --git a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/JamesMailetContext.java b/server/mailet/mailetcontainer-impl/src/main/java/org/apache/james/mailetcontainer/impl/JamesMailetContext.java
similarity index 100%
rename from server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/JamesMailetContext.java
rename to server/mailet/mailetcontainer-impl/src/main/java/org/apache/james/mailetcontainer/impl/JamesMailetContext.java
diff --git a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/LocalResources.java b/server/mailet/mailetcontainer-impl/src/main/java/org/apache/james/mailetcontainer/impl/LocalResources.java
similarity index 100%
rename from server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/LocalResources.java
rename to server/mailet/mailetcontainer-impl/src/main/java/org/apache/james/mailetcontainer/impl/LocalResources.java
diff --git a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/MailetConfigImpl.java b/server/mailet/mailetcontainer-impl/src/main/java/org/apache/james/mailetcontainer/impl/MailetConfigImpl.java
similarity index 100%
rename from server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/MailetConfigImpl.java
rename to server/mailet/mailetcontainer-impl/src/main/java/org/apache/james/mailetcontainer/impl/MailetConfigImpl.java
diff --git a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/MailetProcessorImpl.java b/server/mailet/mailetcontainer-impl/src/main/java/org/apache/james/mailetcontainer/impl/MailetProcessorImpl.java
similarity index 100%
rename from server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/MailetProcessorImpl.java
rename to server/mailet/mailetcontainer-impl/src/main/java/org/apache/james/mailetcontainer/impl/MailetProcessorImpl.java
diff --git a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/MatcherConfigImpl.java b/server/mailet/mailetcontainer-impl/src/main/java/org/apache/james/mailetcontainer/impl/MatcherConfigImpl.java
similarity index 100%
rename from server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/MatcherConfigImpl.java
rename to server/mailet/mailetcontainer-impl/src/main/java/org/apache/james/mailetcontainer/impl/MatcherConfigImpl.java
diff --git a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/MatcherMailetPair.java b/server/mailet/mailetcontainer-impl/src/main/java/org/apache/james/mailetcontainer/impl/MatcherMailetPair.java
similarity index 100%
rename from server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/MatcherMailetPair.java
rename to server/mailet/mailetcontainer-impl/src/main/java/org/apache/james/mailetcontainer/impl/MatcherMailetPair.java
diff --git a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/MatcherSplitter.java b/server/mailet/mailetcontainer-impl/src/main/java/org/apache/james/mailetcontainer/impl/MatcherSplitter.java
similarity index 100%
rename from server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/MatcherSplitter.java
rename to server/mailet/mailetcontainer-impl/src/main/java/org/apache/james/mailetcontainer/impl/MatcherSplitter.java
diff --git a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/ProcessorImpl.java b/server/mailet/mailetcontainer-impl/src/main/java/org/apache/james/mailetcontainer/impl/ProcessorImpl.java
similarity index 100%
rename from server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/ProcessorImpl.java
rename to server/mailet/mailetcontainer-impl/src/main/java/org/apache/james/mailetcontainer/impl/ProcessorImpl.java
diff --git a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/ProcessorUtil.java b/server/mailet/mailetcontainer-impl/src/main/java/org/apache/james/mailetcontainer/impl/ProcessorUtil.java
similarity index 100%
rename from server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/ProcessorUtil.java
rename to server/mailet/mailetcontainer-impl/src/main/java/org/apache/james/mailetcontainer/impl/ProcessorUtil.java
diff --git a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/jmx/JMXStateCompositeProcessorListener.java b/server/mailet/mailetcontainer-impl/src/main/java/org/apache/james/mailetcontainer/impl/jmx/JMXStateCompositeProcessorListener.java
similarity index 100%
rename from server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/jmx/JMXStateCompositeProcessorListener.java
rename to server/mailet/mailetcontainer-impl/src/main/java/org/apache/james/mailetcontainer/impl/jmx/JMXStateCompositeProcessorListener.java
diff --git a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/jmx/JMXStateMailetProcessorListener.java b/server/mailet/mailetcontainer-impl/src/main/java/org/apache/james/mailetcontainer/impl/jmx/JMXStateMailetProcessorListener.java
similarity index 100%
rename from server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/jmx/JMXStateMailetProcessorListener.java
rename to server/mailet/mailetcontainer-impl/src/main/java/org/apache/james/mailetcontainer/impl/jmx/JMXStateMailetProcessorListener.java
diff --git a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/jmx/MailProcessorManagement.java b/server/mailet/mailetcontainer-impl/src/main/java/org/apache/james/mailetcontainer/impl/jmx/MailProcessorManagement.java
similarity index 100%
rename from server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/jmx/MailProcessorManagement.java
rename to server/mailet/mailetcontainer-impl/src/main/java/org/apache/james/mailetcontainer/impl/jmx/MailProcessorManagement.java
diff --git a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/jmx/MailetManagement.java b/server/mailet/mailetcontainer-impl/src/main/java/org/apache/james/mailetcontainer/impl/jmx/MailetManagement.java
similarity index 100%
rename from server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/jmx/MailetManagement.java
rename to server/mailet/mailetcontainer-impl/src/main/java/org/apache/james/mailetcontainer/impl/jmx/MailetManagement.java
diff --git a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/jmx/MatcherManagement.java b/server/mailet/mailetcontainer-impl/src/main/java/org/apache/james/mailetcontainer/impl/jmx/MatcherManagement.java
similarity index 100%
rename from server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/jmx/MatcherManagement.java
rename to server/mailet/mailetcontainer-impl/src/main/java/org/apache/james/mailetcontainer/impl/jmx/MatcherManagement.java
diff --git a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/And.java b/server/mailet/mailetcontainer-impl/src/main/java/org/apache/james/mailetcontainer/impl/matchers/And.java
similarity index 100%
rename from server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/And.java
rename to server/mailet/mailetcontainer-impl/src/main/java/org/apache/james/mailetcontainer/impl/matchers/And.java
diff --git a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/CompositeMatcher.java b/server/mailet/mailetcontainer-impl/src/main/java/org/apache/james/mailetcontainer/impl/matchers/CompositeMatcher.java
similarity index 100%
rename from server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/CompositeMatcher.java
rename to server/mailet/mailetcontainer-impl/src/main/java/org/apache/james/mailetcontainer/impl/matchers/CompositeMatcher.java
diff --git a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/GenericCompositeMatcher.java b/server/mailet/mailetcontainer-impl/src/main/java/org/apache/james/mailetcontainer/impl/matchers/GenericCompositeMatcher.java
similarity index 100%
rename from server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/GenericCompositeMatcher.java
rename to server/mailet/mailetcontainer-impl/src/main/java/org/apache/james/mailetcontainer/impl/matchers/GenericCompositeMatcher.java
diff --git a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/Not.java b/server/mailet/mailetcontainer-impl/src/main/java/org/apache/james/mailetcontainer/impl/matchers/Not.java
similarity index 100%
rename from server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/Not.java
rename to server/mailet/mailetcontainer-impl/src/main/java/org/apache/james/mailetcontainer/impl/matchers/Not.java
diff --git a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/Or.java b/server/mailet/mailetcontainer-impl/src/main/java/org/apache/james/mailetcontainer/impl/matchers/Or.java
similarity index 100%
rename from server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/Or.java
rename to server/mailet/mailetcontainer-impl/src/main/java/org/apache/james/mailetcontainer/impl/matchers/Or.java
diff --git a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/Xor.java b/server/mailet/mailetcontainer-impl/src/main/java/org/apache/james/mailetcontainer/impl/matchers/Xor.java
similarity index 100%
rename from server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/Xor.java
rename to server/mailet/mailetcontainer-impl/src/main/java/org/apache/james/mailetcontainer/impl/matchers/Xor.java
diff --git a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/lib/AbstractStateCompositeProcessor.java b/server/mailet/mailetcontainer-impl/src/main/java/org/apache/james/mailetcontainer/lib/AbstractStateCompositeProcessor.java
similarity index 100%
rename from server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/lib/AbstractStateCompositeProcessor.java
rename to server/mailet/mailetcontainer-impl/src/main/java/org/apache/james/mailetcontainer/lib/AbstractStateCompositeProcessor.java
diff --git a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/lib/AbstractStateMailetProcessor.java b/server/mailet/mailetcontainer-impl/src/main/java/org/apache/james/mailetcontainer/lib/AbstractStateMailetProcessor.java
similarity index 100%
rename from server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/lib/AbstractStateMailetProcessor.java
rename to server/mailet/mailetcontainer-impl/src/main/java/org/apache/james/mailetcontainer/lib/AbstractStateMailetProcessor.java
diff --git a/server/mailet/mailetcontainer-camel/src/main/resources/META-INF/spring/mailetcontainer-context.xml b/server/mailet/mailetcontainer-impl/src/main/resources/META-INF/spring/mailetcontainer-context.xml
similarity index 100%
rename from server/mailet/mailetcontainer-camel/src/main/resources/META-INF/spring/mailetcontainer-context.xml
rename to server/mailet/mailetcontainer-impl/src/main/resources/META-INF/spring/mailetcontainer-context.xml
diff --git a/server/mailet/mailetcontainer-camel/src/reporting-site/site.xml b/server/mailet/mailetcontainer-impl/src/reporting-site/site.xml
similarity index 100%
rename from server/mailet/mailetcontainer-camel/src/reporting-site/site.xml
rename to server/mailet/mailetcontainer-impl/src/reporting-site/site.xml
diff --git a/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/AutomaticallySentMailDetectorImplTest.java b/server/mailet/mailetcontainer-impl/src/test/java/org/apache/james/mailetcontainer/AutomaticallySentMailDetectorImplTest.java
similarity index 100%
rename from server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/AutomaticallySentMailDetectorImplTest.java
rename to server/mailet/mailetcontainer-impl/src/test/java/org/apache/james/mailetcontainer/AutomaticallySentMailDetectorImplTest.java
diff --git a/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/CompositeProcessorImplTest.java b/server/mailet/mailetcontainer-impl/src/test/java/org/apache/james/mailetcontainer/impl/CompositeProcessorImplTest.java
similarity index 100%
rename from server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/CompositeProcessorImplTest.java
rename to server/mailet/mailetcontainer-impl/src/test/java/org/apache/james/mailetcontainer/impl/CompositeProcessorImplTest.java
diff --git a/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/JamesMailetContextTest.java b/server/mailet/mailetcontainer-impl/src/test/java/org/apache/james/mailetcontainer/impl/JamesMailetContextTest.java
similarity index 99%
rename from server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/JamesMailetContextTest.java
rename to server/mailet/mailetcontainer-impl/src/test/java/org/apache/james/mailetcontainer/impl/JamesMailetContextTest.java
index 92d7bfa..6a0336b 100644
--- a/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/JamesMailetContextTest.java
+++ b/server/mailet/mailetcontainer-impl/src/test/java/org/apache/james/mailetcontainer/impl/JamesMailetContextTest.java
@@ -31,7 +31,6 @@ import static org.mockito.Mockito.verifyNoMoreInteractions;
import static org.mockito.Mockito.verifyZeroInteractions;
import static org.mockito.Mockito.when;
-import java.nio.charset.StandardCharsets;
import java.util.concurrent.TimeUnit;
import javax.mail.internet.MimeMessage;
diff --git a/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/MailetConfigImplTest.java b/server/mailet/mailetcontainer-impl/src/test/java/org/apache/james/mailetcontainer/impl/MailetConfigImplTest.java
similarity index 100%
rename from server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/MailetConfigImplTest.java
rename to server/mailet/mailetcontainer-impl/src/test/java/org/apache/james/mailetcontainer/impl/MailetConfigImplTest.java
diff --git a/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/MailetProcessorImplTest.java b/server/mailet/mailetcontainer-impl/src/test/java/org/apache/james/mailetcontainer/impl/MailetProcessorImplTest.java
similarity index 100%
rename from server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/MailetProcessorImplTest.java
rename to server/mailet/mailetcontainer-impl/src/test/java/org/apache/james/mailetcontainer/impl/MailetProcessorImplTest.java
diff --git a/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/matchers/AndTest.java b/server/mailet/mailetcontainer-impl/src/test/java/org/apache/james/mailetcontainer/impl/matchers/AndTest.java
similarity index 100%
rename from server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/matchers/AndTest.java
rename to server/mailet/mailetcontainer-impl/src/test/java/org/apache/james/mailetcontainer/impl/matchers/AndTest.java
diff --git a/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/matchers/NotTest.java b/server/mailet/mailetcontainer-impl/src/test/java/org/apache/james/mailetcontainer/impl/matchers/NotTest.java
similarity index 100%
rename from server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/matchers/NotTest.java
rename to server/mailet/mailetcontainer-impl/src/test/java/org/apache/james/mailetcontainer/impl/matchers/NotTest.java
diff --git a/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/matchers/OrTest.java b/server/mailet/mailetcontainer-impl/src/test/java/org/apache/james/mailetcontainer/impl/matchers/OrTest.java
similarity index 100%
rename from server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/matchers/OrTest.java
rename to server/mailet/mailetcontainer-impl/src/test/java/org/apache/james/mailetcontainer/impl/matchers/OrTest.java
diff --git a/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/matchers/XorTest.java b/server/mailet/mailetcontainer-impl/src/test/java/org/apache/james/mailetcontainer/impl/matchers/XorTest.java
similarity index 100%
rename from server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/matchers/XorTest.java
rename to server/mailet/mailetcontainer-impl/src/test/java/org/apache/james/mailetcontainer/impl/matchers/XorTest.java
diff --git a/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/lib/AbstractStateCompositeProcessorTest.java b/server/mailet/mailetcontainer-impl/src/test/java/org/apache/james/mailetcontainer/lib/AbstractStateCompositeProcessorTest.java
similarity index 100%
rename from server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/lib/AbstractStateCompositeProcessorTest.java
rename to server/mailet/mailetcontainer-impl/src/test/java/org/apache/james/mailetcontainer/lib/AbstractStateCompositeProcessorTest.java
diff --git a/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/lib/AbstractStateMailetProcessorTest.java b/server/mailet/mailetcontainer-impl/src/test/java/org/apache/james/mailetcontainer/lib/AbstractStateMailetProcessorTest.java
similarity index 99%
rename from server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/lib/AbstractStateMailetProcessorTest.java
rename to server/mailet/mailetcontainer-impl/src/test/java/org/apache/james/mailetcontainer/lib/AbstractStateMailetProcessorTest.java
index 0e8f4b0..c38bf02 100644
--- a/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/lib/AbstractStateMailetProcessorTest.java
+++ b/server/mailet/mailetcontainer-impl/src/test/java/org/apache/james/mailetcontainer/lib/AbstractStateMailetProcessorTest.java
@@ -22,12 +22,10 @@ import static java.nio.charset.StandardCharsets.UTF_8;
import static org.assertj.core.api.Assertions.assertThat;
import java.io.ByteArrayInputStream;
-import java.nio.charset.StandardCharsets;
import java.util.Collection;
import java.util.concurrent.CountDownLatch;
import javax.mail.MessagingException;
-import javax.mail.internet.AddressException;
import org.apache.commons.configuration2.HierarchicalConfiguration;
import org.apache.commons.configuration2.ex.ConfigurationException;
diff --git a/server/pom.xml b/server/pom.xml
index 59cb81e..644ddb5 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -80,7 +80,7 @@
<module>mailet/dkim</module>
<module>mailet/integration-testing</module>
<module>mailet/mailetcontainer-api</module>
- <module>mailet/mailetcontainer-camel</module>
+ <module>mailet/mailetcontainer-impl</module>
<module>mailet/mailets</module>
<module>mailet/mock-smtp-server</module>
<module>mailet/remote-delivery-integration-testing</module>
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org