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 rd...@apache.org on 2007/05/27 18:54:51 UTC
svn commit: r542000 - in /james/server/sandbox/seda-imap-modular: ./
experimental-seda-imap-function/src/main/java/org/apache/james/experimental/imapserver/
experimental-seda-imap-function/src/main/java/org/apache/james/experimental/imapserver/decode/b...
Author: rdonkin
Date: Sun May 27 09:54:49 2007
New Revision: 542000
URL: http://svn.apache.org/viewvc?view=rev&rev=542000
Log:
Merged changes r538285:541995 from trunk.
Added:
james/server/sandbox/seda-imap-modular/imap-api/ (props changed)
- copied from r541995, james/server/trunk/imap-api/
james/server/sandbox/seda-imap-modular/imap-api/LICENSE.txt
- copied unchanged from r541995, james/server/trunk/imap-api/LICENSE.txt
james/server/sandbox/seda-imap-modular/imap-api/NOTICE.txt
- copied unchanged from r541995, james/server/trunk/imap-api/NOTICE.txt
james/server/sandbox/seda-imap-modular/imap-api/build.xml
- copied unchanged from r541995, james/server/trunk/imap-api/build.xml
james/server/sandbox/seda-imap-modular/imap-api/src/
- copied from r541995, james/server/trunk/imap-api/src/
james/server/sandbox/seda-imap-modular/imap-api/src/main/
- copied from r541995, james/server/trunk/imap-api/src/main/
james/server/sandbox/seda-imap-modular/imap-api/src/main/config/
- copied from r541995, james/server/trunk/imap-api/src/main/config/
james/server/sandbox/seda-imap-modular/imap-api/src/main/java/
- copied from r541995, james/server/trunk/imap-api/src/main/java/
james/server/sandbox/seda-imap-modular/imap-api/src/main/java/org/
- copied from r541995, james/server/trunk/imap-api/src/main/java/org/
james/server/sandbox/seda-imap-modular/imap-api/src/main/java/org/apache/
- copied from r541995, james/server/trunk/imap-api/src/main/java/org/apache/
james/server/sandbox/seda-imap-modular/imap-api/src/main/java/org/apache/james/
- copied from r541995, james/server/trunk/imap-api/src/main/java/org/apache/james/
james/server/sandbox/seda-imap-modular/imap-api/src/main/java/org/apache/james/api/
- copied from r541995, james/server/trunk/imap-api/src/main/java/org/apache/james/api/
james/server/sandbox/seda-imap-modular/imap-api/src/main/java/org/apache/james/api/imap/
- copied from r541995, james/server/trunk/imap-api/src/main/java/org/apache/james/api/imap/
james/server/sandbox/seda-imap-modular/imap-api/src/main/java/org/apache/james/api/imap/ImapCommand.java
- copied unchanged from r541995, james/server/trunk/imap-api/src/main/java/org/apache/james/api/imap/ImapCommand.java
james/server/sandbox/seda-imap-modular/imap-api/src/main/java/org/apache/james/api/imap/ImapConstants.java
- copied unchanged from r541995, james/server/trunk/imap-api/src/main/java/org/apache/james/api/imap/ImapConstants.java
james/server/sandbox/seda-imap-modular/imap-api/src/main/java/org/apache/james/api/imap/ImapMessage.java
- copied unchanged from r541995, james/server/trunk/imap-api/src/main/java/org/apache/james/api/imap/ImapMessage.java
james/server/sandbox/seda-imap-modular/imap-api/src/main/java/org/apache/james/api/imap/ImapSessionState.java
- copied unchanged from r541995, james/server/trunk/imap-api/src/main/java/org/apache/james/api/imap/ImapSessionState.java
james/server/sandbox/seda-imap-modular/imap-api/src/main/java/org/apache/james/api/imap/ProtocolException.java
- copied unchanged from r541995, james/server/trunk/imap-api/src/main/java/org/apache/james/api/imap/ProtocolException.java
james/server/sandbox/seda-imap-modular/imap-api/src/main/java/org/apache/james/api/imap/imap4rev1/
- copied from r541995, james/server/trunk/imap-api/src/main/java/org/apache/james/api/imap/imap4rev1/
james/server/sandbox/seda-imap-modular/imap-api/src/main/java/org/apache/james/api/imap/imap4rev1/Imap4Rev1CommandFactory.java
- copied unchanged from r541995, james/server/trunk/imap-api/src/main/java/org/apache/james/api/imap/imap4rev1/Imap4Rev1CommandFactory.java
james/server/sandbox/seda-imap-modular/imap-api/src/main/java/org/apache/james/api/imap/imap4rev1/Imap4Rev1MessageFactory.java
- copied unchanged from r541995, james/server/trunk/imap-api/src/main/java/org/apache/james/api/imap/imap4rev1/Imap4Rev1MessageFactory.java
james/server/sandbox/seda-imap-modular/imap-api/src/main/java/org/apache/james/api/imap/message/
- copied from r541995, james/server/trunk/imap-api/src/main/java/org/apache/james/api/imap/message/
james/server/sandbox/seda-imap-modular/imap-api/src/main/java/org/apache/james/api/imap/message/BodyFetchElement.java
- copied unchanged from r541995, james/server/trunk/imap-api/src/main/java/org/apache/james/api/imap/message/BodyFetchElement.java
james/server/sandbox/seda-imap-modular/imap-api/src/main/java/org/apache/james/api/imap/message/FetchData.java
- copied unchanged from r541995, james/server/trunk/imap-api/src/main/java/org/apache/james/api/imap/message/FetchData.java
james/server/sandbox/seda-imap-modular/imap-api/src/main/java/org/apache/james/api/imap/message/IdRange.java
- copied unchanged from r541995, james/server/trunk/imap-api/src/main/java/org/apache/james/api/imap/message/IdRange.java
james/server/sandbox/seda-imap-modular/imap-api/src/main/java/org/apache/james/api/imap/message/MessageFlags.java
- copied unchanged from r541995, james/server/trunk/imap-api/src/main/java/org/apache/james/api/imap/message/MessageFlags.java
james/server/sandbox/seda-imap-modular/imap-api/src/main/java/org/apache/james/api/imap/message/StatusDataItems.java
- copied unchanged from r541995, james/server/trunk/imap-api/src/main/java/org/apache/james/api/imap/message/StatusDataItems.java
james/server/sandbox/seda-imap-modular/imap-api/src/main/java/org/apache/james/api/imap/message/StoreDirective.java
- copied unchanged from r541995, james/server/trunk/imap-api/src/main/java/org/apache/james/api/imap/message/StoreDirective.java
james/server/sandbox/seda-imap-modular/imap-api/src/main/resources/
- copied from r541995, james/server/trunk/imap-api/src/main/resources/
james/server/sandbox/seda-imap-modular/imap-api/src/test/
- copied from r541995, james/server/trunk/imap-api/src/test/
james/server/sandbox/seda-imap-modular/imap-api/src/test/java/
- copied from r541995, james/server/trunk/imap-api/src/test/java/
james/server/sandbox/seda-imap-modular/imap-api/src/test/resources/
- copied from r541995, james/server/trunk/imap-api/src/test/resources/
Removed:
james/server/sandbox/seda-imap-modular/imapmailbox-library/src/main/java/org/apache/james/imapserver/store/MessageFlags.java
Modified:
james/server/sandbox/seda-imap-modular/MERGER_HISTORY.txt
james/server/sandbox/seda-imap-modular/experimental-seda-imap-function/src/main/java/org/apache/james/experimental/imapserver/ImapResponse.java
james/server/sandbox/seda-imap-modular/experimental-seda-imap-function/src/main/java/org/apache/james/experimental/imapserver/ImapSessionImpl.java
james/server/sandbox/seda-imap-modular/experimental-seda-imap-function/src/main/java/org/apache/james/experimental/imapserver/decode/base/AbstractImapCommandParser.java
james/server/sandbox/seda-imap-modular/experimental-seda-imap-function/src/main/java/org/apache/james/experimental/imapserver/processor/imap4rev1/FetchProcessor.java
james/server/sandbox/seda-imap-modular/experimental-seda-imap-function/src/test/java/org/apache/james/experimental/imapserver/ImapResponseTest.java
james/server/sandbox/seda-imap-modular/imapserver-function/src/main/java/org/apache/james/imapserver/ImapResponse.java
james/server/sandbox/seda-imap-modular/imapserver-function/src/main/java/org/apache/james/imapserver/ImapSessionImpl.java
james/server/sandbox/seda-imap-modular/imapserver-function/src/main/java/org/apache/james/imapserver/commands/CommandParser.java
james/server/sandbox/seda-imap-modular/imapserver-function/src/main/java/org/apache/james/imapserver/commands/FetchCommand.java
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=542000&r1=541999&r2=542000
==============================================================================
--- james/server/sandbox/seda-imap-modular/MERGER_HISTORY.txt (original)
+++ james/server/sandbox/seda-imap-modular/MERGER_HISTORY.txt Sun May 27 09:54:49 2007
@@ -1,3 +1,4 @@
r537560 Branch created
-r537560-537595 Merged changes from trunk
+r537560:537595 Merged changes from trunk
r537595:538285 Merged changes from trunk
+r538285:541995 Merged changes from trunk
Modified: james/server/sandbox/seda-imap-modular/experimental-seda-imap-function/src/main/java/org/apache/james/experimental/imapserver/ImapResponse.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/seda-imap-modular/experimental-seda-imap-function/src/main/java/org/apache/james/experimental/imapserver/ImapResponse.java?view=diff&rev=542000&r1=541999&r2=542000
==============================================================================
--- james/server/sandbox/seda-imap-modular/experimental-seda-imap-function/src/main/java/org/apache/james/experimental/imapserver/ImapResponse.java (original)
+++ james/server/sandbox/seda-imap-modular/experimental-seda-imap-function/src/main/java/org/apache/james/experimental/imapserver/ImapResponse.java Sun May 27 09:54:49 2007
@@ -25,7 +25,7 @@
import org.apache.avalon.framework.logger.Logger;
import org.apache.james.api.imap.ImapCommand;
import org.apache.james.api.imap.ImapConstants;
-import org.apache.james.imapserver.store.MessageFlags;
+import org.apache.james.api.imap.message.MessageFlags;
/**
* Class providing methods to send response messages from the server
Modified: james/server/sandbox/seda-imap-modular/experimental-seda-imap-function/src/main/java/org/apache/james/experimental/imapserver/ImapSessionImpl.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/seda-imap-modular/experimental-seda-imap-function/src/main/java/org/apache/james/experimental/imapserver/ImapSessionImpl.java?view=diff&rev=542000&r1=541999&r2=542000
==============================================================================
--- james/server/sandbox/seda-imap-modular/experimental-seda-imap-function/src/main/java/org/apache/james/experimental/imapserver/ImapSessionImpl.java (original)
+++ james/server/sandbox/seda-imap-modular/experimental-seda-imap-function/src/main/java/org/apache/james/experimental/imapserver/ImapSessionImpl.java Sun May 27 09:54:49 2007
@@ -26,7 +26,7 @@
import org.apache.james.api.imap.ImapConstants;
import org.apache.james.api.imap.ImapSessionState;
import org.apache.james.imapserver.store.MailboxException;
-import org.apache.james.imapserver.store.MessageFlags;
+import org.apache.james.api.imap.message.MessageFlags;
import org.apache.james.mailboxmanager.MailboxManagerException;
import org.apache.james.mailboxmanager.MessageResult;
import org.apache.james.mailboxmanager.mailbox.ImapMailboxSession;
Modified: james/server/sandbox/seda-imap-modular/experimental-seda-imap-function/src/main/java/org/apache/james/experimental/imapserver/decode/base/AbstractImapCommandParser.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/seda-imap-modular/experimental-seda-imap-function/src/main/java/org/apache/james/experimental/imapserver/decode/base/AbstractImapCommandParser.java?view=diff&rev=542000&r1=541999&r2=542000
==============================================================================
--- james/server/sandbox/seda-imap-modular/experimental-seda-imap-function/src/main/java/org/apache/james/experimental/imapserver/decode/base/AbstractImapCommandParser.java (original)
+++ james/server/sandbox/seda-imap-modular/experimental-seda-imap-function/src/main/java/org/apache/james/experimental/imapserver/decode/base/AbstractImapCommandParser.java Sun May 27 09:54:49 2007
@@ -37,7 +37,7 @@
import org.apache.james.experimental.imapserver.decode.ImapCommandParser;
import org.apache.james.experimental.imapserver.decode.ImapRequestLineReader;
import org.apache.james.experimental.imapserver.decode.MessagingImapCommandParser;
-import org.apache.james.imapserver.store.MessageFlags;
+import org.apache.james.api.imap.message.MessageFlags;
/**
* <p>
Modified: james/server/sandbox/seda-imap-modular/experimental-seda-imap-function/src/main/java/org/apache/james/experimental/imapserver/processor/imap4rev1/FetchProcessor.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/seda-imap-modular/experimental-seda-imap-function/src/main/java/org/apache/james/experimental/imapserver/processor/imap4rev1/FetchProcessor.java?view=diff&rev=542000&r1=541999&r2=542000
==============================================================================
--- james/server/sandbox/seda-imap-modular/experimental-seda-imap-function/src/main/java/org/apache/james/experimental/imapserver/processor/imap4rev1/FetchProcessor.java (original)
+++ james/server/sandbox/seda-imap-modular/experimental-seda-imap-function/src/main/java/org/apache/james/experimental/imapserver/processor/imap4rev1/FetchProcessor.java Sun May 27 09:54:49 2007
@@ -48,7 +48,7 @@
import org.apache.james.experimental.imapserver.processor.ImapProcessor;
import org.apache.james.experimental.imapserver.processor.base.AbstractImapRequestProcessor;
import org.apache.james.imapserver.store.MailboxException;
-import org.apache.james.imapserver.store.MessageFlags;
+import org.apache.james.api.imap.message.MessageFlags;
import org.apache.james.imapserver.store.SimpleMessageAttributes;
import org.apache.james.mailboxmanager.GeneralMessageSet;
import org.apache.james.mailboxmanager.MailboxManagerException;
Modified: james/server/sandbox/seda-imap-modular/experimental-seda-imap-function/src/test/java/org/apache/james/experimental/imapserver/ImapResponseTest.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/seda-imap-modular/experimental-seda-imap-function/src/test/java/org/apache/james/experimental/imapserver/ImapResponseTest.java?view=diff&rev=542000&r1=541999&r2=542000
==============================================================================
--- james/server/sandbox/seda-imap-modular/experimental-seda-imap-function/src/test/java/org/apache/james/experimental/imapserver/ImapResponseTest.java (original)
+++ james/server/sandbox/seda-imap-modular/experimental-seda-imap-function/src/test/java/org/apache/james/experimental/imapserver/ImapResponseTest.java Sun May 27 09:54:49 2007
@@ -26,7 +26,7 @@
import org.apache.james.api.imap.ImapConstants;
import org.apache.james.experimental.imapserver.ImapResponse;
import org.apache.james.experimental.imapserver.commands.MockCommand;
-import org.apache.james.imapserver.store.MessageFlags;
+import org.apache.james.api.imap.message.MessageFlags;
public class ImapResponseTest extends TestCase {
Propchange: james/server/sandbox/seda-imap-modular/imap-api/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sun May 27 09:54:49 2007
@@ -0,0 +1,3 @@
+.*
+*.log
+target
Modified: james/server/sandbox/seda-imap-modular/imapserver-function/src/main/java/org/apache/james/imapserver/ImapResponse.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/seda-imap-modular/imapserver-function/src/main/java/org/apache/james/imapserver/ImapResponse.java?view=diff&rev=542000&r1=541999&r2=542000
==============================================================================
--- james/server/sandbox/seda-imap-modular/imapserver-function/src/main/java/org/apache/james/imapserver/ImapResponse.java (original)
+++ james/server/sandbox/seda-imap-modular/imapserver-function/src/main/java/org/apache/james/imapserver/ImapResponse.java Sun May 27 09:54:49 2007
@@ -26,8 +26,8 @@
import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.logger.Logger;
+import org.apache.james.api.imap.message.MessageFlags;
import org.apache.james.imapserver.commands.ImapCommand;
-import org.apache.james.imapserver.store.MessageFlags;
import org.apache.james.util.InternetPrintWriter;
/**
Modified: james/server/sandbox/seda-imap-modular/imapserver-function/src/main/java/org/apache/james/imapserver/ImapSessionImpl.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/seda-imap-modular/imapserver-function/src/main/java/org/apache/james/imapserver/ImapSessionImpl.java?view=diff&rev=542000&r1=541999&r2=542000
==============================================================================
--- james/server/sandbox/seda-imap-modular/imapserver-function/src/main/java/org/apache/james/imapserver/ImapSessionImpl.java (original)
+++ james/server/sandbox/seda-imap-modular/imapserver-function/src/main/java/org/apache/james/imapserver/ImapSessionImpl.java Sun May 27 09:54:49 2007
@@ -23,8 +23,8 @@
import javax.mail.Flags;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
+import org.apache.james.api.imap.message.MessageFlags;
import org.apache.james.imapserver.store.MailboxException;
-import org.apache.james.imapserver.store.MessageFlags;
import org.apache.james.mailboxmanager.MailboxManagerException;
import org.apache.james.mailboxmanager.MessageResult;
import org.apache.james.mailboxmanager.mailbox.ImapMailboxSession;
Modified: james/server/sandbox/seda-imap-modular/imapserver-function/src/main/java/org/apache/james/imapserver/commands/CommandParser.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/seda-imap-modular/imapserver-function/src/main/java/org/apache/james/imapserver/commands/CommandParser.java?view=diff&rev=542000&r1=541999&r2=542000
==============================================================================
--- james/server/sandbox/seda-imap-modular/imapserver-function/src/main/java/org/apache/james/imapserver/commands/CommandParser.java (original)
+++ james/server/sandbox/seda-imap-modular/imapserver-function/src/main/java/org/apache/james/imapserver/commands/CommandParser.java Sun May 27 09:54:49 2007
@@ -27,10 +27,10 @@
import javax.mail.Flags;
+import org.apache.james.api.imap.message.MessageFlags;
import org.apache.james.imapserver.ImapConstants;
import org.apache.james.imapserver.ImapRequestLineReader;
import org.apache.james.imapserver.ProtocolException;
-import org.apache.james.imapserver.store.MessageFlags;
/**
*
Modified: james/server/sandbox/seda-imap-modular/imapserver-function/src/main/java/org/apache/james/imapserver/commands/FetchCommand.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/seda-imap-modular/imapserver-function/src/main/java/org/apache/james/imapserver/commands/FetchCommand.java?view=diff&rev=542000&r1=541999&r2=542000
==============================================================================
--- james/server/sandbox/seda-imap-modular/imapserver-function/src/main/java/org/apache/james/imapserver/commands/FetchCommand.java (original)
+++ james/server/sandbox/seda-imap-modular/imapserver-function/src/main/java/org/apache/james/imapserver/commands/FetchCommand.java Sun May 27 09:54:49 2007
@@ -33,13 +33,13 @@
import javax.mail.MessagingException;
import javax.mail.internet.MimeMessage;
+import org.apache.james.api.imap.message.MessageFlags;
import org.apache.james.core.MimeMessageWrapper;
import org.apache.james.imapserver.ImapRequestLineReader;
import org.apache.james.imapserver.ImapResponse;
import org.apache.james.imapserver.ImapSession;
import org.apache.james.imapserver.ProtocolException;
import org.apache.james.imapserver.store.MailboxException;
-import org.apache.james.imapserver.store.MessageFlags;
import org.apache.james.imapserver.store.SimpleMessageAttributes;
import org.apache.james.mailboxmanager.GeneralMessageSet;
import org.apache.james.mailboxmanager.MailboxManagerException;
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org