Author: rdonkin
Date: Mon Jun 11 14:37:35 2007
New Revision: 546296
URL: http://svn.apache.org/viewvc?view=rev&rev=546296
Log:
Merged changes r542862:546290 from trunk.
Added:
james/server/sandbox/seda-imap-modular/imap-api/src/main/java/org/apache/james/api/imap/process/
- copied from r546290,
james/server/trunk/imap-api/src/main/java/org/apache/james/api/imap/process/
james/server/sandbox/seda-imap-modular/imap-api/src/main/java/org/apache/james/api/imap/process/ImapProcessor.java
- copied unchanged from r546290,
james/server/trunk/imap-api/src/main/java/org/apache/james/api/imap/process/ImapProcessor.java
james/server/sandbox/seda-imap-modular/imap-api/src/main/java/org/apache/james/api/imap/process/ImapSession.java
- copied unchanged from r546290,
james/server/trunk/imap-api/src/main/java/org/apache/james/api/imap/process/ImapSession.java
james/server/sandbox/seda-imap-modular/imap-api/src/main/java/org/apache/james/api/imap/process/SelectedImapMailbox.java
- copied unchanged from r546290,
james/server/trunk/imap-api/src/main/java/org/apache/james/api/imap/process/SelectedImapMailbox.java
james/server/sandbox/seda-imap-modular/imap-api/src/main/java/org/apache/james/api/imap/request/
- copied from r546290,
james/server/trunk/imap-api/src/main/java/org/apache/james/api/imap/request/
james/server/sandbox/seda-imap-modular/imap-api/src/main/java/org/apache/james/api/imap/request/ImapRequest.java
- copied unchanged from r546290,
james/server/trunk/imap-api/src/main/java/org/apache/james/api/imap/request/ImapRequest.java
james/server/sandbox/seda-imap-modular/imap-api/src/main/java/org/apache/james/api/imap/response/
- copied from r546290,
james/server/trunk/imap-api/src/main/java/org/apache/james/api/imap/response/
james/server/sandbox/seda-imap-modular/imap-api/src/main/java/org/apache/james/api/imap/response/ImapResponseMessage.java
- copied unchanged from r546290,
james/server/trunk/imap-api/src/main/java/org/apache/james/api/imap/response/ImapResponseMessage.java
james/server/sandbox/seda-imap-modular/imap-api/src/main/java/org/apache/james/services/
- copied from r546290,
james/server/trunk/imap-api/src/main/java/org/apache/james/services/
james/server/sandbox/seda-imap-modular/imap-api/src/main/java/org/apache/james/services/User.java
- copied unchanged from r546290,
james/server/trunk/imap-api/src/main/java/org/apache/james/services/User.java
james/server/sandbox/seda-imap-modular/mordred-library/ (props changed)
- copied from r546290, james/server/trunk/mordred-library/
james/server/sandbox/seda-imap-modular/mordred-library/LICENSE.txt
- copied unchanged from r546290,
james/server/trunk/mordred-library/LICENSE.txt
james/server/sandbox/seda-imap-modular/mordred-library/NOTICE.txt
- copied unchanged from r546290,
james/server/trunk/mordred-library/NOTICE.txt
james/server/sandbox/seda-imap-modular/mordred-library/build.xml
- copied unchanged from r546290,
james/server/trunk/mordred-library/build.xml
james/server/sandbox/seda-imap-modular/mordred-library/pom.xml
- copied unchanged from r546290,
james/server/trunk/mordred-library/pom.xml
james/server/sandbox/seda-imap-modular/mordred-library/src/
- copied from r546290, james/server/trunk/mordred-library/src/
james/server/sandbox/seda-imap-modular/mordred-library/src/main/
- copied from r546290, james/server/trunk/mordred-library/src/main/
james/server/sandbox/seda-imap-modular/mordred-library/src/main/config/
- copied from r546290, james/server/trunk/mordred-library/src/main/config/
james/server/sandbox/seda-imap-modular/mordred-library/src/main/java/
- copied from r546290, james/server/trunk/mordred-library/src/main/java/
james/server/sandbox/seda-imap-modular/mordred-library/src/main/java/org/
- copied from r546290,
james/server/trunk/mordred-library/src/main/java/org/
james/server/sandbox/seda-imap-modular/mordred-library/src/main/java/org/apache/
- copied from r546290,
james/server/trunk/mordred-library/src/main/java/org/apache/
james/server/sandbox/seda-imap-modular/mordred-library/src/main/java/org/apache/james/
- copied from r546290,
james/server/trunk/mordred-library/src/main/java/org/apache/james/
james/server/sandbox/seda-imap-modular/mordred-library/src/main/java/org/apache/james/util/
- copied from r546290,
james/server/trunk/mordred-library/src/main/java/org/apache/james/util/
james/server/sandbox/seda-imap-modular/mordred-library/src/main/java/org/apache/james/util/mordred/
- copied from r546290,
james/server/trunk/mordred-library/src/main/java/org/apache/james/util/mordred/
james/server/sandbox/seda-imap-modular/mordred-library/src/main/java/org/apache/james/util/mordred/JdbcDataSource.java
- copied unchanged from r546290,
james/server/trunk/mordred-library/src/main/java/org/apache/james/util/mordred/JdbcDataSource.java
james/server/sandbox/seda-imap-modular/mordred-library/src/main/java/org/apache/james/util/mordred/PoolConnEntry.java
- copied unchanged from r546290,
james/server/trunk/mordred-library/src/main/java/org/apache/james/util/mordred/PoolConnEntry.java
james/server/sandbox/seda-imap-modular/mordred-library/src/main/resources/
- copied from r546290,
james/server/trunk/mordred-library/src/main/resources/
james/server/sandbox/seda-imap-modular/mordred-library/src/test/
- copied from r546290, james/server/trunk/mordred-library/src/test/
james/server/sandbox/seda-imap-modular/mordred-library/src/test/java/
- copied from r546290, james/server/trunk/mordred-library/src/test/java/
james/server/sandbox/seda-imap-modular/mordred-library/src/test/resources/
- copied from r546290,
james/server/trunk/mordred-library/src/test/resources/
Removed:
james/server/sandbox/seda-imap-modular/core-library/src/main/java/org/apache/james/services/User.java
james/server/sandbox/seda-imap-modular/core-library/src/main/java/org/apache/james/util/mordred/
Modified:
james/server/sandbox/seda-imap-modular/MERGER_HISTORY.txt
james/server/sandbox/seda-imap-modular/STATUS
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=546296&r1=546295&r2=546296
==============================================================================
--- james/server/sandbox/seda-imap-modular/MERGER_HISTORY.txt (original)
+++ james/server/sandbox/seda-imap-modular/MERGER_HISTORY.txt Mon Jun 11
14:37:35 2007
@@ -3,3 +3,4 @@
r537595:538285 Merged changes from trunk
r538285:541995 Merged changes from trunk
r541995:542862 Merged changes from trunk
+r542862:546290 Merged changes from trunk
Modified: james/server/sandbox/seda-imap-modular/STATUS
URL:
http://svn.apache.org/viewvc/james/server/sandbox/seda-imap-modular/STATUS?view=diff&rev=546296&r1=546295&r2=546296
==============================================================================
--- james/server/sandbox/seda-imap-modular/STATUS (original)
+++ james/server/sandbox/seda-imap-modular/STATUS Mon Jun 11 14:37:35 2007
@@ -6,8 +6,8 @@
* http://svn.apache.org/repos/asf/james/server/trunk/STATUS
Releases:
- Stable: 2.3.0
- Maintenance: 2.3.1
+ Stable: 2.3.1
+ Maintenance: 2.3.1?
Will contain defect fixes tracked in JIRA
Next-Minor: probably 2.4.0
Based on v2.3 branch, will contain selected backports from trunk.
@@ -75,8 +75,8 @@
Refactor service location function to JNDI is 10%
complete
spring-integration
- Goal: run James Server using Spring Framework instead of Phoenix/Avalon
- Status: completed prototype
+ Goal: create a spring-deployment module, run James Server using Spring
Framework
+ Status: completed prototype, currently in iteration
Owner: berndf
mailbox-namespaces
@@ -103,4 +103,4 @@
Goal: Indruduce async IO Handling and fastfail api
Status: Dead / Experiment completed.
IO Handling POC was complete, fastfail api still incomplete.
- Owner: norman, bago
\ No newline at end of file
+ Owner: norman, bago
Propchange: james/server/sandbox/seda-imap-modular/mordred-library/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Jun 11 14:37:35 2007
@@ -0,0 +1,3 @@
+.*
+*.log
+target
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=546296&r1=546295&r2=546296
==============================================================================
--- james/server/sandbox/seda-imap-modular/pom.xml (original)
+++ james/server/sandbox/seda-imap-modular/pom.xml Mon Jun 11 14:37:35 2007
@@ -15,6 +15,7 @@
<packaging>pom</packaging>
<modules>
<module>core-library</module>
+ <module>mordred-library</module>
<module>smtpserver-function</module>
<module>pop3server-function</module>
<module>nntpserver-function</module>
@@ -171,4 +172,4 @@
<url>scp://people.apache.org/www/james.apache.org/server/trunk/</url>
</site>
</distributionManagement>
-</project>
\ No newline at end of file
+</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
