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 2010/12/26 12:26:44 UTC
svn commit: r1052877 - in /james/server/trunk: ./
mailetcontainer-api/src/test/ mailetcontainer-api/src/test/java/
mailetcontainer-api/src/test/java/org/
mailetcontainer-api/src/test/java/org/apache/
mailetcontainer-api/src/test/java/org/apache/james/ ...
Author: norman
Date: Sun Dec 26 11:26:43 2010
New Revision: 1052877
URL: http://svn.apache.org/viewvc?rev=1052877&view=rev
Log:
move mock classes to api, thats where they belong too..
Added:
james/server/trunk/mailetcontainer-api/src/test/
james/server/trunk/mailetcontainer-api/src/test/java/
james/server/trunk/mailetcontainer-api/src/test/java/org/
james/server/trunk/mailetcontainer-api/src/test/java/org/apache/
james/server/trunk/mailetcontainer-api/src/test/java/org/apache/james/
james/server/trunk/mailetcontainer-api/src/test/java/org/apache/james/mailetcontainer/
james/server/trunk/mailetcontainer-api/src/test/java/org/apache/james/mailetcontainer/api/
james/server/trunk/mailetcontainer-api/src/test/java/org/apache/james/mailetcontainer/api/mock/
james/server/trunk/mailetcontainer-api/src/test/java/org/apache/james/mailetcontainer/api/mock/MockMailProcessor.java
- copied, changed from r1052807, james/server/trunk/mailetcontainer-library/src/test/java/org/apache/james/mailetcontainer/lib/mock/MockMailProcessor.java
james/server/trunk/mailetcontainer-api/src/test/java/org/apache/james/mailetcontainer/api/mock/MockMailet.java
- copied, changed from r1052807, james/server/trunk/mailetcontainer-library/src/test/java/org/apache/james/mailetcontainer/lib/mock/MockMailet.java
james/server/trunk/mailetcontainer-api/src/test/java/org/apache/james/mailetcontainer/api/mock/MockMailetContext.java
- copied, changed from r1052807, james/server/trunk/mailetcontainer-library/src/test/java/org/apache/james/mailetcontainer/lib/mock/MockMailetContext.java
james/server/trunk/mailetcontainer-api/src/test/java/org/apache/james/mailetcontainer/api/mock/MockMailetLoader.java
- copied, changed from r1052807, james/server/trunk/mailetcontainer-library/src/test/java/org/apache/james/mailetcontainer/lib/mock/MockMailetLoader.java
james/server/trunk/mailetcontainer-api/src/test/java/org/apache/james/mailetcontainer/api/mock/MockMatcher.java
- copied, changed from r1052807, james/server/trunk/mailetcontainer-library/src/test/java/org/apache/james/mailetcontainer/lib/mock/MockMatcher.java
james/server/trunk/mailetcontainer-api/src/test/java/org/apache/james/mailetcontainer/api/mock/MockMatcherLoader.java
- copied, changed from r1052807, james/server/trunk/mailetcontainer-library/src/test/java/org/apache/james/mailetcontainer/lib/mock/MockMatcherLoader.java
Removed:
james/server/trunk/mailetcontainer-library/src/test/java/org/apache/james/mailetcontainer/lib/mock/MockMailProcessor.java
james/server/trunk/mailetcontainer-library/src/test/java/org/apache/james/mailetcontainer/lib/mock/MockMailet.java
james/server/trunk/mailetcontainer-library/src/test/java/org/apache/james/mailetcontainer/lib/mock/MockMailetContext.java
james/server/trunk/mailetcontainer-library/src/test/java/org/apache/james/mailetcontainer/lib/mock/MockMailetLoader.java
james/server/trunk/mailetcontainer-library/src/test/java/org/apache/james/mailetcontainer/lib/mock/MockMatcher.java
james/server/trunk/mailetcontainer-library/src/test/java/org/apache/james/mailetcontainer/lib/mock/MockMatcherLoader.java
Modified:
james/server/trunk/mailetcontainer-camel/pom.xml
james/server/trunk/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/camel/CamelCompositeProcessorTest.java
james/server/trunk/mailetcontainer-library/pom.xml
james/server/trunk/mailetcontainer-library/src/test/java/org/apache/james/mailetcontainer/lib/AbstractStateCompositeProcessorTest.java
james/server/trunk/mailetcontainer-library/src/test/java/org/apache/james/mailetcontainer/lib/AbstractStateMailetProcessorTest.java
james/server/trunk/pom.xml
Copied: james/server/trunk/mailetcontainer-api/src/test/java/org/apache/james/mailetcontainer/api/mock/MockMailProcessor.java (from r1052807, james/server/trunk/mailetcontainer-library/src/test/java/org/apache/james/mailetcontainer/lib/mock/MockMailProcessor.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/mailetcontainer-api/src/test/java/org/apache/james/mailetcontainer/api/mock/MockMailProcessor.java?p2=james/server/trunk/mailetcontainer-api/src/test/java/org/apache/james/mailetcontainer/api/mock/MockMailProcessor.java&p1=james/server/trunk/mailetcontainer-library/src/test/java/org/apache/james/mailetcontainer/lib/mock/MockMailProcessor.java&r1=1052807&r2=1052877&rev=1052877&view=diff
==============================================================================
--- james/server/trunk/mailetcontainer-library/src/test/java/org/apache/james/mailetcontainer/lib/mock/MockMailProcessor.java (original)
+++ james/server/trunk/mailetcontainer-api/src/test/java/org/apache/james/mailetcontainer/api/mock/MockMailProcessor.java Sun Dec 26 11:26:43 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.mailetcontainer.lib.mock;
+package org.apache.james.mailetcontainer.api.mock;
import javax.mail.MessagingException;
Copied: james/server/trunk/mailetcontainer-api/src/test/java/org/apache/james/mailetcontainer/api/mock/MockMailet.java (from r1052807, james/server/trunk/mailetcontainer-library/src/test/java/org/apache/james/mailetcontainer/lib/mock/MockMailet.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/mailetcontainer-api/src/test/java/org/apache/james/mailetcontainer/api/mock/MockMailet.java?p2=james/server/trunk/mailetcontainer-api/src/test/java/org/apache/james/mailetcontainer/api/mock/MockMailet.java&p1=james/server/trunk/mailetcontainer-library/src/test/java/org/apache/james/mailetcontainer/lib/mock/MockMailet.java&r1=1052807&r2=1052877&rev=1052877&view=diff
==============================================================================
--- james/server/trunk/mailetcontainer-library/src/test/java/org/apache/james/mailetcontainer/lib/mock/MockMailet.java (original)
+++ james/server/trunk/mailetcontainer-api/src/test/java/org/apache/james/mailetcontainer/api/mock/MockMailet.java Sun Dec 26 11:26:43 2010
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.mailetcontainer.lib.mock;
+package org.apache.james.mailetcontainer.api.mock;
import javax.mail.MessagingException;
Copied: james/server/trunk/mailetcontainer-api/src/test/java/org/apache/james/mailetcontainer/api/mock/MockMailetContext.java (from r1052807, james/server/trunk/mailetcontainer-library/src/test/java/org/apache/james/mailetcontainer/lib/mock/MockMailetContext.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/mailetcontainer-api/src/test/java/org/apache/james/mailetcontainer/api/mock/MockMailetContext.java?p2=james/server/trunk/mailetcontainer-api/src/test/java/org/apache/james/mailetcontainer/api/mock/MockMailetContext.java&p1=james/server/trunk/mailetcontainer-library/src/test/java/org/apache/james/mailetcontainer/lib/mock/MockMailetContext.java&r1=1052807&r2=1052877&rev=1052877&view=diff
==============================================================================
--- james/server/trunk/mailetcontainer-library/src/test/java/org/apache/james/mailetcontainer/lib/mock/MockMailetContext.java (original)
+++ james/server/trunk/mailetcontainer-api/src/test/java/org/apache/james/mailetcontainer/api/mock/MockMailetContext.java Sun Dec 26 11:26:43 2010
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.mailetcontainer.lib.mock;
+package org.apache.james.mailetcontainer.api.mock;
import java.util.ArrayList;
import java.util.Collection;
Copied: james/server/trunk/mailetcontainer-api/src/test/java/org/apache/james/mailetcontainer/api/mock/MockMailetLoader.java (from r1052807, james/server/trunk/mailetcontainer-library/src/test/java/org/apache/james/mailetcontainer/lib/mock/MockMailetLoader.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/mailetcontainer-api/src/test/java/org/apache/james/mailetcontainer/api/mock/MockMailetLoader.java?p2=james/server/trunk/mailetcontainer-api/src/test/java/org/apache/james/mailetcontainer/api/mock/MockMailetLoader.java&p1=james/server/trunk/mailetcontainer-library/src/test/java/org/apache/james/mailetcontainer/lib/mock/MockMailetLoader.java&r1=1052807&r2=1052877&rev=1052877&view=diff
==============================================================================
--- james/server/trunk/mailetcontainer-library/src/test/java/org/apache/james/mailetcontainer/lib/mock/MockMailetLoader.java (original)
+++ james/server/trunk/mailetcontainer-api/src/test/java/org/apache/james/mailetcontainer/api/mock/MockMailetLoader.java Sun Dec 26 11:26:43 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.mailetcontainer.lib.mock;
+package org.apache.james.mailetcontainer.api.mock;
import javax.mail.MessagingException;
Copied: james/server/trunk/mailetcontainer-api/src/test/java/org/apache/james/mailetcontainer/api/mock/MockMatcher.java (from r1052807, james/server/trunk/mailetcontainer-library/src/test/java/org/apache/james/mailetcontainer/lib/mock/MockMatcher.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/mailetcontainer-api/src/test/java/org/apache/james/mailetcontainer/api/mock/MockMatcher.java?p2=james/server/trunk/mailetcontainer-api/src/test/java/org/apache/james/mailetcontainer/api/mock/MockMatcher.java&p1=james/server/trunk/mailetcontainer-library/src/test/java/org/apache/james/mailetcontainer/lib/mock/MockMatcher.java&r1=1052807&r2=1052877&rev=1052877&view=diff
==============================================================================
--- james/server/trunk/mailetcontainer-library/src/test/java/org/apache/james/mailetcontainer/lib/mock/MockMatcher.java (original)
+++ james/server/trunk/mailetcontainer-api/src/test/java/org/apache/james/mailetcontainer/api/mock/MockMatcher.java Sun Dec 26 11:26:43 2010
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.mailetcontainer.lib.mock;
+package org.apache.james.mailetcontainer.api.mock;
import java.util.ArrayList;
import java.util.Arrays;
Copied: james/server/trunk/mailetcontainer-api/src/test/java/org/apache/james/mailetcontainer/api/mock/MockMatcherLoader.java (from r1052807, james/server/trunk/mailetcontainer-library/src/test/java/org/apache/james/mailetcontainer/lib/mock/MockMatcherLoader.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/mailetcontainer-api/src/test/java/org/apache/james/mailetcontainer/api/mock/MockMatcherLoader.java?p2=james/server/trunk/mailetcontainer-api/src/test/java/org/apache/james/mailetcontainer/api/mock/MockMatcherLoader.java&p1=james/server/trunk/mailetcontainer-library/src/test/java/org/apache/james/mailetcontainer/lib/mock/MockMatcherLoader.java&r1=1052807&r2=1052877&rev=1052877&view=diff
==============================================================================
--- james/server/trunk/mailetcontainer-library/src/test/java/org/apache/james/mailetcontainer/lib/mock/MockMatcherLoader.java (original)
+++ james/server/trunk/mailetcontainer-api/src/test/java/org/apache/james/mailetcontainer/api/mock/MockMatcherLoader.java Sun Dec 26 11:26:43 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.mailetcontainer.lib.mock;
+package org.apache.james.mailetcontainer.api.mock;
import javax.mail.MessagingException;
Modified: james/server/trunk/mailetcontainer-camel/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/mailetcontainer-camel/pom.xml?rev=1052877&r1=1052876&r2=1052877&view=diff
==============================================================================
--- james/server/trunk/mailetcontainer-camel/pom.xml (original)
+++ james/server/trunk/mailetcontainer-camel/pom.xml Sun Dec 26 11:26:43 2010
@@ -85,5 +85,11 @@
<type>test-jar</type>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-mailetcontainer-api</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
Modified: james/server/trunk/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/camel/CamelCompositeProcessorTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/camel/CamelCompositeProcessorTest.java?rev=1052877&r1=1052876&r2=1052877&view=diff
==============================================================================
--- james/server/trunk/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/camel/CamelCompositeProcessorTest.java (original)
+++ james/server/trunk/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/camel/CamelCompositeProcessorTest.java Sun Dec 26 11:26:43 2010
@@ -22,11 +22,11 @@ import org.apache.camel.impl.DefaultCame
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.HierarchicalConfiguration;
import org.apache.commons.logging.impl.SimpleLog;
+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.lib.AbstractStateCompositeProcessorTest;
import org.apache.james.mailetcontainer.lib.AbstractStateCompositeProcessor;
-import org.apache.james.mailetcontainer.lib.mock.MockMailetLoader;
-import org.apache.james.mailetcontainer.lib.mock.MockMailetContext;
-import org.apache.james.mailetcontainer.lib.mock.MockMatcherLoader;
public class CamelCompositeProcessorTest extends AbstractStateCompositeProcessorTest{
Modified: james/server/trunk/mailetcontainer-library/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/mailetcontainer-library/pom.xml?rev=1052877&r1=1052876&r2=1052877&view=diff
==============================================================================
--- james/server/trunk/mailetcontainer-library/pom.xml (original)
+++ james/server/trunk/mailetcontainer-library/pom.xml Sun Dec 26 11:26:43 2010
@@ -106,7 +106,12 @@
<dependency>
<groupId>org.apache.james</groupId>
<artifactId>apache-standard-mailets</artifactId>
- <version>1.0</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-mailetcontainer-api</artifactId>
+ <type>test-jar</type>
<scope>test</scope>
</dependency>
</dependencies>
Modified: james/server/trunk/mailetcontainer-library/src/test/java/org/apache/james/mailetcontainer/lib/AbstractStateCompositeProcessorTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailetcontainer-library/src/test/java/org/apache/james/mailetcontainer/lib/AbstractStateCompositeProcessorTest.java?rev=1052877&r1=1052876&r2=1052877&view=diff
==============================================================================
--- james/server/trunk/mailetcontainer-library/src/test/java/org/apache/james/mailetcontainer/lib/AbstractStateCompositeProcessorTest.java (original)
+++ james/server/trunk/mailetcontainer-library/src/test/java/org/apache/james/mailetcontainer/lib/AbstractStateCompositeProcessorTest.java Sun Dec 26 11:26:43 2010
@@ -32,7 +32,7 @@ import org.apache.commons.configuration.
import org.apache.commons.logging.impl.SimpleLog;
import org.apache.james.core.MailImpl;
import org.apache.james.mailetcontainer.api.MailProcessor;
-import org.apache.james.mailetcontainer.lib.mock.MockMailProcessor;
+import org.apache.james.mailetcontainer.api.mock.MockMailProcessor;
import org.apache.mailet.Mail;
public abstract class AbstractStateCompositeProcessorTest extends TestCase{
Modified: james/server/trunk/mailetcontainer-library/src/test/java/org/apache/james/mailetcontainer/lib/AbstractStateMailetProcessorTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailetcontainer-library/src/test/java/org/apache/james/mailetcontainer/lib/AbstractStateMailetProcessorTest.java?rev=1052877&r1=1052876&r2=1052877&view=diff
==============================================================================
--- james/server/trunk/mailetcontainer-library/src/test/java/org/apache/james/mailetcontainer/lib/AbstractStateMailetProcessorTest.java (original)
+++ james/server/trunk/mailetcontainer-library/src/test/java/org/apache/james/mailetcontainer/lib/AbstractStateMailetProcessorTest.java Sun Dec 26 11:26:43 2010
@@ -26,8 +26,8 @@ import org.apache.commons.configuration.
import org.apache.commons.configuration.DefaultConfigurationBuilder;
import org.apache.commons.configuration.HierarchicalConfiguration;
import org.apache.james.core.MailImpl;
-import org.apache.james.mailetcontainer.lib.mock.MockMailet;
-import org.apache.james.mailetcontainer.lib.mock.MockMatcher;
+import org.apache.james.mailetcontainer.api.mock.MockMailet;
+import org.apache.james.mailetcontainer.api.mock.MockMatcher;
import org.apache.mailet.MailAddress;
import junit.framework.TestCase;
Modified: james/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/pom.xml?rev=1052877&r1=1052876&r2=1052877&view=diff
==============================================================================
--- james/server/trunk/pom.xml (original)
+++ james/server/trunk/pom.xml Sun Dec 26 11:26:43 2010
@@ -445,7 +445,13 @@
<artifactId>james-server-mailetcontainer-api</artifactId>
<version>${project.version}</version>
</dependency>
-
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-mailetcontainer-api</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ <version>${project.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.james</groupId>
<artifactId>james-server-mailetcontainer-library</artifactId>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org