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:45:15 UTC
svn commit: r1141038 - in /james/server/trunk: mailetcontainer-api/
mailetcontainer-camel/
mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/lib/
mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/lib/jmx/
mailetcon...
Author: norman
Date: Wed Jun 29 10:45:14 2011
New Revision: 1141038
URL: http://svn.apache.org/viewvc?rev=1141038&view=rev
Log:
First step to merge mailetcontainer-camel and mailetcontainer-library. See JAMES-1284
Added:
james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/lib/
james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/lib/AbstractStateCompositeProcessor.java
- copied unchanged from r1141037, james/server/trunk/mailetcontainer-library/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
- copied unchanged from r1141037, james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/lib/AbstractStateMailetProcessor.java
james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/lib/JamesMailSpooler.java
- copied unchanged from r1141037, james/server/trunk/mailetcontainer-library/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
- copied unchanged from r1141037, james/server/trunk/mailetcontainer-library/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
- copied unchanged from r1141037, james/server/trunk/mailetcontainer-library/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
- copied unchanged from r1141037, james/server/trunk/mailetcontainer-library/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
- copied unchanged from r1141037, james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/lib/ProcessorUtil.java
james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/lib/jmx/
- copied from r1141037, james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/lib/jmx/
james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/lib/matchers/
- copied from r1141037, james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/lib/matchers/
james/server/trunk/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/lib/
james/server/trunk/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/lib/AbstractStateCompositeProcessorTest.java
- copied unchanged from r1141037, james/server/trunk/mailetcontainer-library/src/test/java/org/apache/james/mailetcontainer/lib/AbstractStateCompositeProcessorTest.java
james/server/trunk/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/lib/AbstractStateMailetProcessorTest.java
- copied unchanged from r1141037, james/server/trunk/mailetcontainer-library/src/test/java/org/apache/james/mailetcontainer/lib/AbstractStateMailetProcessorTest.java
james/server/trunk/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/lib/MailetConfigImplTest.java
- copied unchanged from r1141037, james/server/trunk/mailetcontainer-library/src/test/java/org/apache/james/mailetcontainer/lib/MailetConfigImplTest.java
james/server/trunk/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/lib/matchers/
- copied from r1141037, james/server/trunk/mailetcontainer-library/src/test/java/org/apache/james/mailetcontainer/lib/matchers/
Removed:
james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/lib/
james/server/trunk/mailetcontainer-library/src/test/java/org/apache/james/mailetcontainer/lib/
Modified:
james/server/trunk/mailetcontainer-api/.classpath
james/server/trunk/mailetcontainer-camel/pom.xml
Modified: james/server/trunk/mailetcontainer-api/.classpath
URL: http://svn.apache.org/viewvc/james/server/trunk/mailetcontainer-api/.classpath?rev=1141038&r1=1141037&r2=1141038&view=diff
==============================================================================
--- james/server/trunk/mailetcontainer-api/.classpath (original)
+++ james/server/trunk/mailetcontainer-api/.classpath Wed Jun 29 10:45:14 2011
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="src/main/java"/>
- <classpathentry kind="src" path="src/test/java"/>
+ <classpathentry kind="src" output="target/classes" path="src/main/java"/>
+ <classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
<classpathentry kind="output" path="target/classes"/>
Modified: james/server/trunk/mailetcontainer-camel/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/mailetcontainer-camel/pom.xml?rev=1141038&r1=1141037&r2=1141038&view=diff
==============================================================================
--- james/server/trunk/mailetcontainer-camel/pom.xml (original)
+++ james/server/trunk/mailetcontainer-camel/pom.xml Wed Jun 29 10:45:14 2011
@@ -30,8 +30,16 @@
<dependencies>
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>james-server-mailetcontainer-library</artifactId>
- </dependency>
+ <artifactId>james-server-mailetcontainer-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-queue-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-util</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.james</groupId>
<artifactId>james-server-dnsservice-api</artifactId>
@@ -85,10 +93,15 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.apache.james</groupId>
- <artifactId>james-server-mailetcontainer-library</artifactId>
- <type>test-jar</type>
+ <artifactId>apache-mailet-base</artifactId>
+ <classifier>tests</classifier>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>apache-standard-mailets</artifactId>
<scope>test</scope>
</dependency>
<dependency>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org