Author: rdonkin
Date: Wed May 30 10:30:56 2007
New Revision: 542885
URL: http://svn.apache.org/viewvc?view=rev&rev=542885
Log:
Merged changes r541995:542862 from trunk.
Added:
james/server/sandbox/seda-imap-modular/imap-api/pom.xml
- copied unchanged from r542862, james/server/trunk/imap-api/pom.xml
james/server/sandbox/seda-imap-modular/imapmailbox-library/pom.xml
- copied unchanged from r542862,
james/server/trunk/imapmailbox-library/pom.xml
james/server/sandbox/seda-imap-modular/torque-mailboxmanager-function/
(props changed)
- copied from r542862, james/server/trunk/torque-mailboxmanager-function/
james/server/sandbox/seda-imap-modular/torque-mailboxmanager-function/LICENSE.txt
- copied unchanged from r542862,
james/server/trunk/torque-mailboxmanager-function/LICENSE.txt
james/server/sandbox/seda-imap-modular/torque-mailboxmanager-function/NOTICE.txt
- copied unchanged from r542862,
james/server/trunk/torque-mailboxmanager-function/NOTICE.txt
james/server/sandbox/seda-imap-modular/torque-mailboxmanager-function/build.xml
- copied unchanged from r542862,
james/server/trunk/torque-mailboxmanager-function/build.xml
james/server/sandbox/seda-imap-modular/torque-mailboxmanager-function/pom.xml
- copied unchanged from r542862,
james/server/trunk/torque-mailboxmanager-function/pom.xml
james/server/sandbox/seda-imap-modular/torque-mailboxmanager-function/src/
- copied from r542862,
james/server/trunk/torque-mailboxmanager-function/src/
james/server/sandbox/seda-imap-modular/torque-mailboxmanager-function/src/main/
- copied from r542862,
james/server/trunk/torque-mailboxmanager-function/src/main/
james/server/sandbox/seda-imap-modular/torque-mailboxmanager-function/src/main/config/
- copied from r542862,
james/server/trunk/torque-mailboxmanager-function/src/main/config/
james/server/sandbox/seda-imap-modular/torque-mailboxmanager-function/src/main/java/
- copied from r542862,
james/server/trunk/torque-mailboxmanager-function/src/main/java/
james/server/sandbox/seda-imap-modular/torque-mailboxmanager-function/src/main/java/org/
- copied from r542862,
james/server/trunk/torque-mailboxmanager-function/src/main/java/org/
james/server/sandbox/seda-imap-modular/torque-mailboxmanager-function/src/main/java/org/apache/
- copied from r542862,
james/server/trunk/torque-mailboxmanager-function/src/main/java/org/apache/
james/server/sandbox/seda-imap-modular/torque-mailboxmanager-function/src/main/java/org/apache/james/
- copied from r542862,
james/server/trunk/torque-mailboxmanager-function/src/main/java/org/apache/james/
james/server/sandbox/seda-imap-modular/torque-mailboxmanager-function/src/main/java/org/apache/james/mailboxmanager/
- copied from r542862,
james/server/trunk/torque-mailboxmanager-function/src/main/java/org/apache/james/mailboxmanager/
james/server/sandbox/seda-imap-modular/torque-mailboxmanager-function/src/main/java/org/apache/james/mailboxmanager/torque/
- copied from r542862,
james/server/trunk/torque-mailboxmanager-function/src/main/java/org/apache/james/mailboxmanager/torque/
james/server/sandbox/seda-imap-modular/torque-mailboxmanager-function/src/main/java/org/apache/james/mailboxmanager/torque/TorqueMailbox.java
- copied unchanged from r542862,
james/server/trunk/torque-mailboxmanager-function/src/main/java/org/apache/james/mailboxmanager/torque/TorqueMailbox.java
james/server/sandbox/seda-imap-modular/torque-mailboxmanager-function/src/main/java/org/apache/james/mailboxmanager/torque/TorqueMailboxManager.java
- copied unchanged from r542862,
james/server/trunk/torque-mailboxmanager-function/src/main/java/org/apache/james/mailboxmanager/torque/TorqueMailboxManager.java
james/server/sandbox/seda-imap-modular/torque-mailboxmanager-function/src/main/java/org/apache/james/mailboxmanager/torque/TorqueMailboxManagerFactory.java
- copied unchanged from r542862,
james/server/trunk/torque-mailboxmanager-function/src/main/java/org/apache/james/mailboxmanager/torque/TorqueMailboxManagerFactory.java
james/server/sandbox/seda-imap-modular/torque-mailboxmanager-function/src/main/java/org/apache/james/mailboxmanager/torque/TorqueMimeMessage.java
- copied unchanged from r542862,
james/server/trunk/torque-mailboxmanager-function/src/main/java/org/apache/james/mailboxmanager/torque/TorqueMimeMessage.java
james/server/sandbox/seda-imap-modular/torque-mailboxmanager-function/src/main/java/org/apache/james/mailboxmanager/torque/om/
- copied from r542862,
james/server/trunk/torque-mailboxmanager-function/src/main/java/org/apache/james/mailboxmanager/torque/om/
james/server/sandbox/seda-imap-modular/torque-mailboxmanager-function/src/main/java/org/apache/james/mailboxmanager/torque/om/BaseMailboxRow.java
- copied unchanged from r542862,
james/server/trunk/torque-mailboxmanager-function/src/main/java/org/apache/james/mailboxmanager/torque/om/BaseMailboxRow.java
james/server/sandbox/seda-imap-modular/torque-mailboxmanager-function/src/main/java/org/apache/james/mailboxmanager/torque/om/BaseMailboxRowPeer.java
- copied unchanged from r542862,
james/server/trunk/torque-mailboxmanager-function/src/main/java/org/apache/james/mailboxmanager/torque/om/BaseMailboxRowPeer.java
james/server/sandbox/seda-imap-modular/torque-mailboxmanager-function/src/main/java/org/apache/james/mailboxmanager/torque/om/BaseMessageBody.java
- copied unchanged from r542862,
james/server/trunk/torque-mailboxmanager-function/src/main/java/org/apache/james/mailboxmanager/torque/om/BaseMessageBody.java
james/server/sandbox/seda-imap-modular/torque-mailboxmanager-function/src/main/java/org/apache/james/mailboxmanager/torque/om/BaseMessageBodyPeer.java
- copied unchanged from r542862,
james/server/trunk/torque-mailboxmanager-function/src/main/java/org/apache/james/mailboxmanager/torque/om/BaseMessageBodyPeer.java
james/server/sandbox/seda-imap-modular/torque-mailboxmanager-function/src/main/java/org/apache/james/mailboxmanager/torque/om/BaseMessageFlags.java
- copied unchanged from r542862,
james/server/trunk/torque-mailboxmanager-function/src/main/java/org/apache/james/mailboxmanager/torque/om/BaseMessageFlags.java
james/server/sandbox/seda-imap-modular/torque-mailboxmanager-function/src/main/java/org/apache/james/mailboxmanager/torque/om/BaseMessageFlagsPeer.java
- copied unchanged from r542862,
james/server/trunk/torque-mailboxmanager-function/src/main/java/org/apache/james/mailboxmanager/torque/om/BaseMessageFlagsPeer.java
james/server/sandbox/seda-imap-modular/torque-mailboxmanager-function/src/main/java/org/apache/james/mailboxmanager/torque/om/BaseMessageHeader.java
- copied unchanged from r542862,
james/server/trunk/torque-mailboxmanager-function/src/main/java/org/apache/james/mailboxmanager/torque/om/BaseMessageHeader.java
james/server/sandbox/seda-imap-modular/torque-mailboxmanager-function/src/main/java/org/apache/james/mailboxmanager/torque/om/BaseMessageHeaderPeer.java
- copied unchanged from r542862,
james/server/trunk/torque-mailboxmanager-function/src/main/java/org/apache/james/mailboxmanager/torque/om/BaseMessageHeaderPeer.java
james/server/sandbox/seda-imap-modular/torque-mailboxmanager-function/src/main/java/org/apache/james/mailboxmanager/torque/om/BaseMessageRow.java
- copied unchanged from r542862,
james/server/trunk/torque-mailboxmanager-function/src/main/java/org/apache/james/mailboxmanager/torque/om/BaseMessageRow.java
james/server/sandbox/seda-imap-modular/torque-mailboxmanager-function/src/main/java/org/apache/james/mailboxmanager/torque/om/BaseMessageRowPeer.java
- copied unchanged from r542862,
james/server/trunk/torque-mailboxmanager-function/src/main/java/org/apache/james/mailboxmanager/torque/om/BaseMessageRowPeer.java
james/server/sandbox/seda-imap-modular/torque-mailboxmanager-function/src/main/java/org/apache/james/mailboxmanager/torque/om/MailboxRow.java
- copied unchanged from r542862,
james/server/trunk/torque-mailboxmanager-function/src/main/java/org/apache/james/mailboxmanager/torque/om/MailboxRow.java
james/server/sandbox/seda-imap-modular/torque-mailboxmanager-function/src/main/java/org/apache/james/mailboxmanager/torque/om/MailboxRowPeer.java
- copied unchanged from r542862,
james/server/trunk/torque-mailboxmanager-function/src/main/java/org/apache/james/mailboxmanager/torque/om/MailboxRowPeer.java
james/server/sandbox/seda-imap-modular/torque-mailboxmanager-function/src/main/java/org/apache/james/mailboxmanager/torque/om/MessageBody.java
- copied unchanged from r542862,
james/server/trunk/torque-mailboxmanager-function/src/main/java/org/apache/james/mailboxmanager/torque/om/MessageBody.java
james/server/sandbox/seda-imap-modular/torque-mailboxmanager-function/src/main/java/org/apache/james/mailboxmanager/torque/om/MessageBodyPeer.java
- copied unchanged from r542862,
james/server/trunk/torque-mailboxmanager-function/src/main/java/org/apache/james/mailboxmanager/torque/om/MessageBodyPeer.java
james/server/sandbox/seda-imap-modular/torque-mailboxmanager-function/src/main/java/org/apache/james/mailboxmanager/torque/om/MessageFlags.java
- copied unchanged from r542862,
james/server/trunk/torque-mailboxmanager-function/src/main/java/org/apache/james/mailboxmanager/torque/om/MessageFlags.java
james/server/sandbox/seda-imap-modular/torque-mailboxmanager-function/src/main/java/org/apache/james/mailboxmanager/torque/om/MessageFlagsPeer.java
- copied unchanged from r542862,
james/server/trunk/torque-mailboxmanager-function/src/main/java/org/apache/james/mailboxmanager/torque/om/MessageFlagsPeer.java
james/server/sandbox/seda-imap-modular/torque-mailboxmanager-function/src/main/java/org/apache/james/mailboxmanager/torque/om/MessageHeader.java
- copied unchanged from r542862,
james/server/trunk/torque-mailboxmanager-function/src/main/java/org/apache/james/mailboxmanager/torque/om/MessageHeader.java
james/server/sandbox/seda-imap-modular/torque-mailboxmanager-function/src/main/java/org/apache/james/mailboxmanager/torque/om/MessageHeaderPeer.java
- copied unchanged from r542862,
james/server/trunk/torque-mailboxmanager-function/src/main/java/org/apache/james/mailboxmanager/torque/om/MessageHeaderPeer.java
james/server/sandbox/seda-imap-modular/torque-mailboxmanager-function/src/main/java/org/apache/james/mailboxmanager/torque/om/MessageRow.java
- copied unchanged from r542862,
james/server/trunk/torque-mailboxmanager-function/src/main/java/org/apache/james/mailboxmanager/torque/om/MessageRow.java
james/server/sandbox/seda-imap-modular/torque-mailboxmanager-function/src/main/java/org/apache/james/mailboxmanager/torque/om/MessageRowPeer.java
- copied unchanged from r542862,
james/server/trunk/torque-mailboxmanager-function/src/main/java/org/apache/james/mailboxmanager/torque/om/MessageRowPeer.java
james/server/sandbox/seda-imap-modular/torque-mailboxmanager-function/src/main/java/org/apache/james/mailboxmanager/torque/om/map/
- copied from r542862,
james/server/trunk/torque-mailboxmanager-function/src/main/java/org/apache/james/mailboxmanager/torque/om/map/
james/server/sandbox/seda-imap-modular/torque-mailboxmanager-function/src/main/java/org/apache/james/mailboxmanager/torque/om/map/MailboxMapBuilder.java
- copied unchanged from r542862,
james/server/trunk/torque-mailboxmanager-function/src/main/java/org/apache/james/mailboxmanager/torque/om/map/MailboxMapBuilder.java
james/server/sandbox/seda-imap-modular/torque-mailboxmanager-function/src/main/java/org/apache/james/mailboxmanager/torque/om/map/MailboxRowMapBuilder.java
- copied unchanged from r542862,
james/server/trunk/torque-mailboxmanager-function/src/main/java/org/apache/james/mailboxmanager/torque/om/map/MailboxRowMapBuilder.java
james/server/sandbox/seda-imap-modular/torque-mailboxmanager-function/src/main/java/org/apache/james/mailboxmanager/torque/om/map/MessageBodyMapBuilder.java
- copied unchanged from r542862,
james/server/trunk/torque-mailboxmanager-function/src/main/java/org/apache/james/mailboxmanager/torque/om/map/MessageBodyMapBuilder.java
james/server/sandbox/seda-imap-modular/torque-mailboxmanager-function/src/main/java/org/apache/james/mailboxmanager/torque/om/map/MessageFlagsMapBuilder.java
- copied unchanged from r542862,
james/server/trunk/torque-mailboxmanager-function/src/main/java/org/apache/james/mailboxmanager/torque/om/map/MessageFlagsMapBuilder.java
james/server/sandbox/seda-imap-modular/torque-mailboxmanager-function/src/main/java/org/apache/james/mailboxmanager/torque/om/map/MessageHeaderMapBuilder.java
- copied unchanged from r542862,
james/server/trunk/torque-mailboxmanager-function/src/main/java/org/apache/james/mailboxmanager/torque/om/map/MessageHeaderMapBuilder.java
james/server/sandbox/seda-imap-modular/torque-mailboxmanager-function/src/main/java/org/apache/james/mailboxmanager/torque/om/map/MessageMapBuilder.java
- copied unchanged from r542862,
james/server/trunk/torque-mailboxmanager-function/src/main/java/org/apache/james/mailboxmanager/torque/om/map/MessageMapBuilder.java
james/server/sandbox/seda-imap-modular/torque-mailboxmanager-function/src/main/java/org/apache/james/mailboxmanager/torque/om/map/MessageRowMapBuilder.java
- copied unchanged from r542862,
james/server/trunk/torque-mailboxmanager-function/src/main/java/org/apache/james/mailboxmanager/torque/om/map/MessageRowMapBuilder.java
james/server/sandbox/seda-imap-modular/torque-mailboxmanager-function/src/main/resources/
- copied from r542862,
james/server/trunk/torque-mailboxmanager-function/src/main/resources/
james/server/sandbox/seda-imap-modular/torque-mailboxmanager-function/src/test/
- copied from r542862,
james/server/trunk/torque-mailboxmanager-function/src/test/
james/server/sandbox/seda-imap-modular/torque-mailboxmanager-function/src/test/java/
- copied from r542862,
james/server/trunk/torque-mailboxmanager-function/src/test/java/
james/server/sandbox/seda-imap-modular/torque-mailboxmanager-function/src/test/resources/
- copied from r542862,
james/server/trunk/torque-mailboxmanager-function/src/test/resources/
Removed:
james/server/sandbox/seda-imap-modular/core-library/src/main/java/org/apache/james/mailboxmanager/torque/
Modified:
james/server/sandbox/seda-imap-modular/MERGER_HISTORY.txt
james/server/sandbox/seda-imap-modular/build-tools/base-build.xml
james/server/sandbox/seda-imap-modular/core-library/pom.xml
james/server/sandbox/seda-imap-modular/imapserver-function/pom.xml
james/server/sandbox/seda-imap-modular/phoenix-deployment/pom.xml
james/server/sandbox/seda-imap-modular/pom.xml
Modified: james/server/sandbox/seda-imap-modular/MERGER_HISTORY.txt
URL:
http://svn.apache.org/viewvc/james/server/sandbox/seda-imap-modular/MERGER_HISTORY.txt?view=diff&rev=542885&r1=542884&r2=542885
==============================================================================
--- james/server/sandbox/seda-imap-modular/MERGER_HISTORY.txt (original)
+++ james/server/sandbox/seda-imap-modular/MERGER_HISTORY.txt Wed May 30
10:30:56 2007
@@ -2,3 +2,4 @@
r537560:537595 Merged changes from trunk
r537595:538285 Merged changes from trunk
r538285:541995 Merged changes from trunk
+r541995:542862 Merged changes from trunk
Modified: james/server/sandbox/seda-imap-modular/build-tools/base-build.xml
URL:
http://svn.apache.org/viewvc/james/server/sandbox/seda-imap-modular/build-tools/base-build.xml?view=diff&rev=542885&r1=542884&r2=542885
==============================================================================
--- james/server/sandbox/seda-imap-modular/build-tools/base-build.xml (original)
+++ james/server/sandbox/seda-imap-modular/build-tools/base-build.xml Wed May
30 10:30:56 2007
@@ -197,7 +197,8 @@
<include name="${commons-configuration.jar}"/>
<include name="${jsieve.jar}"/>
<include name="${mailet.jar}"/>
- <include name="${commons-digester.jar}"/>
+ <include name="${commons-digester.jar}"/>
+ <include name="${concurrent.jar}"/>
</fileset>
</path>
<path id='classpath.base.test'>
Modified: james/server/sandbox/seda-imap-modular/core-library/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/sandbox/seda-imap-modular/core-library/pom.xml?view=diff&rev=542885&r1=542884&r2=542885
==============================================================================
--- james/server/sandbox/seda-imap-modular/core-library/pom.xml (original)
+++ james/server/sandbox/seda-imap-modular/core-library/pom.xml Wed May 30
10:30:56 2007
@@ -345,25 +345,5 @@
<artifactId>mx4j-jmx</artifactId>
<version>1.1.1</version>
</dependency>
- <dependency>
- <groupId>torque</groupId>
- <artifactId>torque</artifactId>
- <version>3.3-RC1</version>
- <exclusions>
- <exclusion>
- <artifactId>jndi</artifactId>
- <groupId>jndi</groupId>
- </exclusion>
- <exclusion>
- <artifactId>avalon-framework</artifactId>
- <groupId>avalon-framework</groupId>
- </exclusion>
- <exclusion>
- <artifactId>jdbc-stdext</artifactId>
- <groupId>javax.sql</groupId>
- </exclusion>
- </exclusions>
- </dependency>
-
</dependencies>
</project>
Modified: james/server/sandbox/seda-imap-modular/imapserver-function/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/sandbox/seda-imap-modular/imapserver-function/pom.xml?view=diff&rev=542885&r1=542884&r2=542885
==============================================================================
--- james/server/sandbox/seda-imap-modular/imapserver-function/pom.xml
(original)
+++ james/server/sandbox/seda-imap-modular/imapserver-function/pom.xml Wed May
30 10:30:56 2007
@@ -26,6 +26,16 @@
<artifactId>james-server-core-library</artifactId>
<version>3.0-SNAPSHOT</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-imapmailbox-library</artifactId>
+ <version>3.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-imap-api</artifactId>
+ <version>3.0-SNAPSHOT</version>
+ </dependency>
<dependency>
<groupId>junit</groupId>
Modified: james/server/sandbox/seda-imap-modular/phoenix-deployment/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/sandbox/seda-imap-modular/phoenix-deployment/pom.xml?view=diff&rev=542885&r1=542884&r2=542885
==============================================================================
--- james/server/sandbox/seda-imap-modular/phoenix-deployment/pom.xml (original)
+++ james/server/sandbox/seda-imap-modular/phoenix-deployment/pom.xml Wed May
30 10:30:56 2007
@@ -78,6 +78,13 @@
<artifactId>james-server-remotemanager-function</artifactId>
<version>3.0-SNAPSHOT</version>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-torque-mailboxmanager-function</artifactId>
+ <version>3.0-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>junit</groupId>
Modified: james/server/sandbox/seda-imap-modular/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/sandbox/seda-imap-modular/pom.xml?view=diff&rev=542885&r1=542884&r2=542885
==============================================================================
--- james/server/sandbox/seda-imap-modular/pom.xml (original)
+++ james/server/sandbox/seda-imap-modular/pom.xml Wed May 30 10:30:56 2007
@@ -17,12 +17,15 @@
<module>core-library</module>
<module>smtpserver-function</module>
<module>pop3server-function</module>
- <module>imapserver-function</module>
<module>nntpserver-function</module>
<module>spoolmanager-function</module>
<module>remotemanager-function</module>
<module>fetchmail-function</module>
<module>phoenix-deployment</module>
+ <module>imap-api</module>
+ <module>imapmailbox-library</module>
+ <module>torque-mailboxmanager-function</module>
+ <module>imapserver-function</module>
</modules>
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/james/server/trunk</connection>
Propchange:
james/server/sandbox/seda-imap-modular/torque-mailboxmanager-function/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed May 30 10:30:56 2007
@@ -0,0 +1,3 @@
+.*
+*.log
+target
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
