james-server-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e...@apache.org
Subject svn commit: r995755 - in /james/imap/trunk: ./ deployment/ jcr/ jpa/ maildir/ memory/ message/src/main/java/org/apache/james/imap/main/ message/src/test/java/org/apache/james/imap/main/ parent/ protocol-tester/ protocol-tester/src/main/java/org/apache/...
Date Fri, 10 Sep 2010 11:28:00 GMT
Author: eric
Date: Fri Sep 10 11:28:00 2010
New Revision: 995755

URL: http://svn.apache.org/viewvc?rev=995755&view=rev
Log:
Move test infra to protocol-tester (IMAP-204)

Added:
    james/imap/trunk/message/src/main/java/org/apache/james/imap/main/
      - copied from r995697, james/imap/trunk/seda/src/main/java/org/apache/james/imap/main/
    james/imap/trunk/message/src/test/java/org/apache/james/imap/main/
      - copied from r995697, james/imap/trunk/seda/src/test/java/org/apache/james/imap/main/
    james/imap/trunk/protocol-tester/src/main/java/org/apache/james/imap/
      - copied from r995697, james/imap/trunk/seda/src/test/java/org/apache/james/imap/
    james/imap/trunk/protocol-tester/src/main/java/org/apache/james/imap/functional/AbstractStressTest.java
      - copied unchanged from r995697, james/imap/trunk/deployment/src/test/java/org/apache/james/imap/functional/AbstractStressTest.java
    james/imap/trunk/protocol-tester/src/main/java/org/apache/james/imap/functional/ImapHostSystem.java
      - copied unchanged from r995697, james/imap/trunk/deployment/src/test/java/org/apache/james/imap/functional/ImapHostSystem.java
    james/imap/trunk/protocol-tester/src/main/java/org/apache/james/imap/functional/InMemoryUserManager.java
      - copied unchanged from r995697, james/imap/trunk/deployment/src/test/java/org/apache/james/imap/functional/InMemoryUserManager.java
    james/imap/trunk/protocol-tester/src/main/java/org/apache/james/imap/functional/SilentLog.java
      - copied unchanged from r995697, james/imap/trunk/deployment/src/test/java/org/apache/james/imap/functional/SilentLog.java
    james/imap/trunk/protocol-tester/src/main/java/org/apache/james/imap/functional/User.java
      - copied unchanged from r995697, james/imap/trunk/deployment/src/test/java/org/apache/james/imap/functional/User.java
    james/imap/trunk/protocol-tester/src/main/java/org/apache/james/imap/functional/VerboseConsoleLog.java
      - copied unchanged from r995697, james/imap/trunk/deployment/src/test/java/org/apache/james/imap/functional/VerboseConsoleLog.java
    james/imap/trunk/protocol-tester/src/main/resources/log4j.properties
      - copied unchanged from r995697, james/imap/trunk/deployment/src/test/resources/log4j.properties
    james/imap/trunk/protocol-tester/src/main/resources/org/
      - copied from r995697, james/imap/trunk/seda/src/test/resources/org/
Removed:
    james/imap/trunk/deployment/
    james/imap/trunk/protocol-tester/src/main/java/org/apache/james/imap/main/
    james/imap/trunk/seda/
Modified:
    james/imap/trunk/jcr/pom.xml
    james/imap/trunk/jpa/pom.xml
    james/imap/trunk/maildir/pom.xml
    james/imap/trunk/memory/pom.xml
    james/imap/trunk/parent/pom.xml
    james/imap/trunk/pom.xml
    james/imap/trunk/protocol-tester/pom.xml
    james/imap/trunk/torque/pom.xml

Modified: james/imap/trunk/jcr/pom.xml
URL: http://svn.apache.org/viewvc/james/imap/trunk/jcr/pom.xml?rev=995755&r1=995754&r2=995755&view=diff
==============================================================================
--- james/imap/trunk/jcr/pom.xml (original)
+++ james/imap/trunk/jcr/pom.xml Fri Sep 10 11:28:00 2010
@@ -40,26 +40,12 @@
     </dependency>
     <dependency>
       <groupId>org.apache.james</groupId>
-      <artifactId>apache-james-imap-deployment</artifactId>
-	  <type>test-jar</type>
-      <scope>test</scope>
-      <version>${pom.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.james</groupId>
       <artifactId>apache-james-imap-processor</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.james</groupId>
-      <artifactId>apache-james-imap-seda</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.james</groupId>
-      <artifactId>apache-james-imap-seda</artifactId>
-      <type>test-jar</type>
-      <scope>test</scope>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-log4j12</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.james</groupId>

Modified: james/imap/trunk/jpa/pom.xml
URL: http://svn.apache.org/viewvc/james/imap/trunk/jpa/pom.xml?rev=995755&r1=995754&r2=995755&view=diff
==============================================================================
--- james/imap/trunk/jpa/pom.xml (original)
+++ james/imap/trunk/jpa/pom.xml Fri Sep 10 11:28:00 2010
@@ -49,13 +49,6 @@
     
     <dependency>
       <groupId>org.apache.james</groupId>
-      <artifactId>apache-james-imap-deployment</artifactId>
-	  <type>test-jar</type>
-      <scope>test</scope>
-      <version>${pom.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.james</groupId>
       <artifactId>apache-james-imap-message</artifactId>
       <scope>test</scope>
     </dependency>
@@ -66,20 +59,14 @@
     </dependency>
     <dependency>
       <groupId>org.apache.james</groupId>
-      <artifactId>apache-james-imap-seda</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.james</groupId>
-      <artifactId>apache-james-imap-seda</artifactId>
-	  <type>test-jar</type>
+      <artifactId>apache-james-imap-protocol-tester</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.james</groupId>
-      <artifactId>apache-james-imap-protocol-tester</artifactId>
+      <groupId>com.h2database</groupId>
+      <artifactId>h2</artifactId>
       <scope>test</scope>
-    </dependency>
+    </dependency> 
 
     <dependency>
       <groupId>commons-io</groupId>

Modified: james/imap/trunk/maildir/pom.xml
URL: http://svn.apache.org/viewvc/james/imap/trunk/maildir/pom.xml?rev=995755&r1=995754&r2=995755&view=diff
==============================================================================
--- james/imap/trunk/maildir/pom.xml (original)
+++ james/imap/trunk/maildir/pom.xml Fri Sep 10 11:28:00 2010
@@ -84,29 +84,12 @@
       <artifactId>apache-james-imap-processor</artifactId>
       <scope>test</scope>
     </dependency>    
-    <dependency>
-      <groupId>org.apache.james</groupId>
-      <artifactId>apache-james-imap-seda</artifactId>
-      <scope>test</scope>
-    </dependency>
-  <dependency>
-      <groupId>org.apache.james</groupId>
-      <artifactId>apache-james-imap-seda</artifactId>
-      <type>test-jar</type>
-      <scope>test</scope>
-    </dependency>
 	<dependency>
       <groupId>org.apache.james</groupId>
       <artifactId>apache-james-imap-protocol-tester</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.james</groupId>
-      <artifactId>apache-james-imap-deployment</artifactId>
-      <version>${pom.version}</version>
-      <type>test-jar</type>
-    </dependency>
-    <dependency>
       <groupId>commons-io</groupId>
       <artifactId>commons-io</artifactId>
     </dependency>

Modified: james/imap/trunk/memory/pom.xml
URL: http://svn.apache.org/viewvc/james/imap/trunk/memory/pom.xml?rev=995755&r1=995754&r2=995755&view=diff
==============================================================================
--- james/imap/trunk/memory/pom.xml (original)
+++ james/imap/trunk/memory/pom.xml Fri Sep 10 11:28:00 2010
@@ -45,29 +45,6 @@
 
     <dependency>
       <groupId>org.apache.james</groupId>
-      <artifactId>apache-james-imap-deployment</artifactId>
-	  <type>test-jar</type>
-      <scope>test</scope>
-      <version>${pom.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.james</groupId>
-      <artifactId>apache-james-imap-processor</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.james</groupId>
-      <artifactId>apache-james-imap-seda</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.james</groupId>
-      <artifactId>apache-james-imap-seda</artifactId>
-	  <type>test-jar</type>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.james</groupId>
       <artifactId>apache-james-imap-protocol-tester</artifactId>
       <scope>test</scope>
     </dependency>

Modified: james/imap/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/james/imap/trunk/parent/pom.xml?rev=995755&r1=995754&r2=995755&view=diff
==============================================================================
--- james/imap/trunk/parent/pom.xml (original)
+++ james/imap/trunk/parent/pom.xml Fri Sep 10 11:28:00 2010
@@ -215,11 +215,6 @@
       </dependency>
       <dependency>
         <groupId>org.apache.james</groupId>
-        <artifactId>apache-james-imap-seda</artifactId>
-        <version>${pom.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.james</groupId>
         <artifactId>apache-james-mailbox-jpa</artifactId>
         <version>${pom.version}</version>
       </dependency>
@@ -235,13 +230,6 @@
       </dependency>
       <dependency>
         <groupId>org.apache.james</groupId>
-        <artifactId>apache-james-imap-seda</artifactId>
-        <version>${pom.version}</version>
-        <type>test-jar</type>
-        <scope>test</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.james</groupId>
         <artifactId>apache-james-imap-api</artifactId>
         <version>${pom.version}</version>
       </dependency>
@@ -267,13 +255,6 @@
       </dependency>
       <dependency>
         <groupId>org.apache.james</groupId>
-        <artifactId>apache-james-imap-deployment</artifactId>
-        <version>${pom.version}</version>
-        <type>test-jar</type>
-        <scope>test</scope>
-      </dependency>   
-      <dependency>
-        <groupId>org.apache.james</groupId>
         <artifactId>apache-james-mailbox-maildir</artifactId>
         <version>${pom.version}</version>
       </dependency>

Modified: james/imap/trunk/pom.xml
URL: http://svn.apache.org/viewvc/james/imap/trunk/pom.xml?rev=995755&r1=995754&r2=995755&view=diff
==============================================================================
--- james/imap/trunk/pom.xml (original)
+++ james/imap/trunk/pom.xml Fri Sep 10 11:28:00 2010
@@ -45,8 +45,6 @@
     <module>jpa</module>
     <module>jcr</module>
     <module>memory</module>
-    <module>seda</module>
-    <module>deployment</module>
     <module>parent</module>
     <module>torque</module>
     <module>maildir</module>

Modified: james/imap/trunk/protocol-tester/pom.xml
URL: http://svn.apache.org/viewvc/james/imap/trunk/protocol-tester/pom.xml?rev=995755&r1=995754&r2=995755&view=diff
==============================================================================
--- james/imap/trunk/protocol-tester/pom.xml (original)
+++ james/imap/trunk/protocol-tester/pom.xml Fri Sep 10 11:28:00 2010
@@ -30,9 +30,72 @@
   <name>Apache JAMES Protocol Tester</name>
   <dependencies>
     <dependency>
+      <groupId>org.apache.james</groupId>
+      <artifactId>apache-james-imap-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.james</groupId>
+      <artifactId>apache-james-imap-message</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.james</groupId>
+      <artifactId>apache-james-mailbox-store</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.james</groupId>
+      <artifactId>apache-james-imap-processor</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>commons-configuration</groupId>
+      <artifactId>commons-configuration</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>commons-io</groupId>
+      <artifactId>commons-io</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.h2database</groupId>
+      <artifactId>h2</artifactId>
+    </dependency> 
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-log4j12</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.derby</groupId>
+      <artifactId>derby</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>commons-lang</groupId>
+      <artifactId>commons-lang</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>${javax.mail.groupId}</groupId>
+      <artifactId>${javax.mail.artifactId}</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+    </dependency>
+    <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <scope>compile</scope>
     </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit-dep</artifactId>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.jmock</groupId>
+      <artifactId>jmock</artifactId>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.jmock</groupId>
+      <artifactId>jmock-junit4</artifactId>
+      <scope>compile</scope>
+    </dependency>
   </dependencies>
 </project>

Modified: james/imap/trunk/torque/pom.xml
URL: http://svn.apache.org/viewvc/james/imap/trunk/torque/pom.xml?rev=995755&r1=995754&r2=995755&view=diff
==============================================================================
--- james/imap/trunk/torque/pom.xml (original)
+++ james/imap/trunk/torque/pom.xml Fri Sep 10 11:28:00 2010
@@ -80,20 +80,16 @@
       <artifactId>junit</artifactId>
       <scope>test</scope>
     </dependency>
-    
     <dependency>
-      <groupId>org.apache.james</groupId>
-      <artifactId>apache-james-mailbox-store</artifactId>
-      <type>test-jar</type>
+      <groupId>org.apache.derby</groupId>
+      <artifactId>derby</artifactId>
       <scope>test</scope>
     </dependency>
-
     <dependency>
       <groupId>org.apache.james</groupId>
-      <artifactId>apache-james-imap-deployment</artifactId>
-	  <type>test-jar</type>
+      <artifactId>apache-james-mailbox-store</artifactId>
+      <type>test-jar</type>
       <scope>test</scope>
-      <version>${pom.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.james</groupId>
@@ -102,20 +98,8 @@
     </dependency>
     <dependency>
       <groupId>org.apache.james</groupId>
-      <artifactId>apache-james-imap-seda</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.james</groupId>
-      <artifactId>apache-james-imap-seda</artifactId>
-	  <type>test-jar</type>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.james</groupId>
       <artifactId>apache-james-imap-protocol-tester</artifactId>
       <scope>test</scope>
     </dependency>
-
   </dependencies>
 </project>



---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org


Mime
View raw message