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 2009/03/18 14:20:21 UTC
svn commit: r755590 [3/5] - in /james/protocols/imap/trunk:
api/src/main/java/org/apache/james/imap/api/
api/src/main/java/org/apache/james/imap/api/imap4rev1/
api/src/main/java/org/apache/james/imap/api/message/response/
api/src/main/java/org/apache/j...
Copied: james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/encode/SearchResponseEncoder.java (from r755562, james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/encode/imap4rev1/server/SearchResponseEncoder.java)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/encode/SearchResponseEncoder.java?p2=james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/encode/SearchResponseEncoder.java&p1=james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/encode/imap4rev1/server/SearchResponseEncoder.java&r1=755562&r2=755590&rev=755590&view=diff
==============================================================================
--- james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/encode/imap4rev1/server/SearchResponseEncoder.java (original)
+++ james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/encode/SearchResponseEncoder.java Wed Mar 18 13:20:15 2009
@@ -16,15 +16,13 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.imap.encode.imap4rev1.server;
+package org.apache.james.imap.encode;
import java.io.IOException;
import org.apache.james.imap.api.ImapMessage;
-import org.apache.james.imap.encode.ImapEncoder;
-import org.apache.james.imap.encode.ImapResponseComposer;
import org.apache.james.imap.encode.base.AbstractChainedImapEncoder;
-import org.apache.james.imap.message.response.imap4rev1.server.SearchResponse;
+import org.apache.james.imap.message.response.SearchResponse;
/**
* Encoders IMAP4rev1 <code>SEARCH</code> responses.
Propchange: james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/encode/SearchResponseEncoder.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/encode/StatusResponseEncoder.java (from r755562, james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/encode/imap4rev1/StatusResponseEncoder.java)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/encode/StatusResponseEncoder.java?p2=james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/encode/StatusResponseEncoder.java&p1=james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/encode/imap4rev1/StatusResponseEncoder.java&r1=755562&r2=755590&rev=755590&view=diff
==============================================================================
--- james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/encode/imap4rev1/StatusResponseEncoder.java (original)
+++ james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/encode/StatusResponseEncoder.java Wed Mar 18 13:20:15 2009
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.imap.encode.imap4rev1;
+package org.apache.james.imap.encode;
import java.io.IOException;
import java.util.Collection;
@@ -25,11 +25,9 @@
import org.apache.james.imap.api.ImapCommand;
import org.apache.james.imap.api.ImapMessage;
import org.apache.james.imap.api.display.HumanReadableTextKey;
-import org.apache.james.imap.api.message.response.imap4rev1.StatusResponse;
-import org.apache.james.imap.api.message.response.imap4rev1.StatusResponse.ResponseCode;
-import org.apache.james.imap.api.message.response.imap4rev1.StatusResponse.Type;
-import org.apache.james.imap.encode.ImapEncoder;
-import org.apache.james.imap.encode.ImapResponseComposer;
+import org.apache.james.imap.api.message.response.StatusResponse;
+import org.apache.james.imap.api.message.response.StatusResponse.ResponseCode;
+import org.apache.james.imap.api.message.response.StatusResponse.Type;
import org.apache.james.imap.encode.base.AbstractChainedImapEncoder;
public class StatusResponseEncoder extends AbstractChainedImapEncoder {
Propchange: james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/encode/StatusResponseEncoder.java
------------------------------------------------------------------------------
svn:mergeinfo =
Modified: james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/encode/base/ImapResponseComposerImpl.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/encode/base/ImapResponseComposerImpl.java?rev=755590&r1=755589&r2=755590&view=diff
==============================================================================
--- james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/encode/base/ImapResponseComposerImpl.java (original)
+++ james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/encode/base/ImapResponseComposerImpl.java Wed Mar 18 13:20:15 2009
@@ -31,7 +31,7 @@
import org.apache.james.imap.api.ImapConstants;
import org.apache.james.imap.encode.ImapResponseComposer;
import org.apache.james.imap.encode.ImapResponseWriter;
-import org.apache.james.imap.message.response.imap4rev1.Literal;
+import org.apache.james.imap.message.response.Literal;
/**
* Class providing methods to send response messages from the server to the
Modified: james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/encode/main/DefaultImapEncoderFactory.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/encode/main/DefaultImapEncoderFactory.java?rev=755590&r1=755589&r2=755590&view=diff
==============================================================================
--- james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/encode/main/DefaultImapEncoderFactory.java (original)
+++ james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/encode/main/DefaultImapEncoderFactory.java Wed Mar 18 13:20:15 2009
@@ -19,20 +19,20 @@
package org.apache.james.imap.encode.main;
+import org.apache.james.imap.encode.CapabilityResponseEncoder;
+import org.apache.james.imap.encode.ExistsResponseEncoder;
+import org.apache.james.imap.encode.ExpungeResponseEncoder;
+import org.apache.james.imap.encode.FetchResponseEncoder;
+import org.apache.james.imap.encode.FlagsResponseEncoder;
import org.apache.james.imap.encode.ImapEncoder;
import org.apache.james.imap.encode.ImapEncoderFactory;
+import org.apache.james.imap.encode.LSubResponseEncoder;
+import org.apache.james.imap.encode.ListResponseEncoder;
+import org.apache.james.imap.encode.RecentResponseEncoder;
+import org.apache.james.imap.encode.STATUSResponseEncoder;
+import org.apache.james.imap.encode.SearchResponseEncoder;
+import org.apache.james.imap.encode.StatusResponseEncoder;
import org.apache.james.imap.encode.base.EndImapEncoder;
-import org.apache.james.imap.encode.imap4rev1.ExistsResponseEncoder;
-import org.apache.james.imap.encode.imap4rev1.ExpungeResponseEncoder;
-import org.apache.james.imap.encode.imap4rev1.FetchResponseEncoder;
-import org.apache.james.imap.encode.imap4rev1.FlagsResponseEncoder;
-import org.apache.james.imap.encode.imap4rev1.RecentResponseEncoder;
-import org.apache.james.imap.encode.imap4rev1.StatusResponseEncoder;
-import org.apache.james.imap.encode.imap4rev1.server.CapabilityResponseEncoder;
-import org.apache.james.imap.encode.imap4rev1.server.LSubResponseEncoder;
-import org.apache.james.imap.encode.imap4rev1.server.ListResponseEncoder;
-import org.apache.james.imap.encode.imap4rev1.server.STATUSResponseEncoder;
-import org.apache.james.imap.encode.imap4rev1.server.SearchResponseEncoder;
/**
* TODO: perhaps a POJO would be better
Copied: james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/AbstractImapRequest.java (from r755562, james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/imap4rev1/AbstractImapRequest.java)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/AbstractImapRequest.java?p2=james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/AbstractImapRequest.java&p1=james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/imap4rev1/AbstractImapRequest.java&r1=755562&r2=755590&rev=755590&view=diff
==============================================================================
--- james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/imap4rev1/AbstractImapRequest.java (original)
+++ james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/AbstractImapRequest.java Wed Mar 18 13:20:15 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.imap.message.request.imap4rev1;
+package org.apache.james.imap.message.request;
import org.apache.james.imap.api.AbstractLogEnabled;
import org.apache.james.imap.api.ImapCommand;
Copied: james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/AbstractMailboxSelectionRequest.java (from r755562, james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/imap4rev1/AbstractMailboxSelectionRequest.java)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/AbstractMailboxSelectionRequest.java?p2=james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/AbstractMailboxSelectionRequest.java&p1=james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/imap4rev1/AbstractMailboxSelectionRequest.java&r1=755562&r2=755590&rev=755590&view=diff
==============================================================================
--- james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/imap4rev1/AbstractMailboxSelectionRequest.java (original)
+++ james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/AbstractMailboxSelectionRequest.java Wed Mar 18 13:20:15 2009
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.imap.message.request.imap4rev1;
+package org.apache.james.imap.message.request;
import org.apache.james.imap.api.ImapCommand;
Propchange: james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/AbstractMailboxSelectionRequest.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/AppendRequest.java (from r755562, james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/imap4rev1/AppendRequest.java)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/AppendRequest.java?p2=james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/AppendRequest.java&p1=james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/imap4rev1/AppendRequest.java&r1=755562&r2=755590&rev=755590&view=diff
==============================================================================
--- james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/imap4rev1/AppendRequest.java (original)
+++ james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/AppendRequest.java Wed Mar 18 13:20:15 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.imap.message.request.imap4rev1;
+package org.apache.james.imap.message.request;
import java.util.Date;
Propchange: james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/AppendRequest.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/AuthenticateRequest.java (from r755562, james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/imap4rev1/AuthenticateRequest.java)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/AuthenticateRequest.java?p2=james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/AuthenticateRequest.java&p1=james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/imap4rev1/AuthenticateRequest.java&r1=755562&r2=755590&rev=755590&view=diff
==============================================================================
--- james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/imap4rev1/AuthenticateRequest.java (original)
+++ james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/AuthenticateRequest.java Wed Mar 18 13:20:15 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.imap.message.request.imap4rev1;
+package org.apache.james.imap.message.request;
import org.apache.james.imap.api.ImapCommand;
Propchange: james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/AuthenticateRequest.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/BaseImap4Rev1MessageFactory.java (from r755562, james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/imap4rev1/BaseImap4Rev1MessageFactory.java)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/BaseImap4Rev1MessageFactory.java?p2=james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/BaseImap4Rev1MessageFactory.java&p1=james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/imap4rev1/BaseImap4Rev1MessageFactory.java&r1=755562&r2=755590&rev=755590&view=diff
==============================================================================
--- james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/imap4rev1/BaseImap4Rev1MessageFactory.java (original)
+++ james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/BaseImap4Rev1MessageFactory.java Wed Mar 18 13:20:15 2009
@@ -16,22 +16,22 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.imap.message.request.imap4rev1;
+package org.apache.james.imap.message.request;
import java.util.Date;
import javax.mail.Flags;
+import org.apache.james.imap.api.Imap4Rev1MessageFactory;
import org.apache.james.imap.api.ImapCommand;
import org.apache.james.imap.api.ImapMessage;
import org.apache.james.imap.api.display.HumanReadableTextKey;
-import org.apache.james.imap.api.imap4rev1.Imap4Rev1MessageFactory;
import org.apache.james.imap.api.message.FetchData;
import org.apache.james.imap.api.message.IdRange;
import org.apache.james.imap.api.message.StatusDataItems;
import org.apache.james.imap.api.message.request.SearchKey;
-import org.apache.james.imap.api.message.response.imap4rev1.StatusResponse;
-import org.apache.james.imap.api.message.response.imap4rev1.StatusResponseFactory;
+import org.apache.james.imap.api.message.response.StatusResponse;
+import org.apache.james.imap.api.message.response.StatusResponseFactory;
/**
* Naive, factory creates unpooled instances.
Copied: james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/CapabilityRequest.java (from r755562, james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/imap4rev1/CapabilityRequest.java)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/CapabilityRequest.java?p2=james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/CapabilityRequest.java&p1=james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/imap4rev1/CapabilityRequest.java&r1=755562&r2=755590&rev=755590&view=diff
==============================================================================
--- james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/imap4rev1/CapabilityRequest.java (original)
+++ james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/CapabilityRequest.java Wed Mar 18 13:20:15 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.imap.message.request.imap4rev1;
+package org.apache.james.imap.message.request;
import org.apache.james.imap.api.ImapCommand;
Propchange: james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/CapabilityRequest.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/CheckRequest.java (from r755562, james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/imap4rev1/CheckRequest.java)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/CheckRequest.java?p2=james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/CheckRequest.java&p1=james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/imap4rev1/CheckRequest.java&r1=755562&r2=755590&rev=755590&view=diff
==============================================================================
--- james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/imap4rev1/CheckRequest.java (original)
+++ james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/CheckRequest.java Wed Mar 18 13:20:15 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.imap.message.request.imap4rev1;
+package org.apache.james.imap.message.request;
import org.apache.james.imap.api.ImapCommand;
Propchange: james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/CheckRequest.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/CloseRequest.java (from r755562, james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/imap4rev1/CloseRequest.java)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/CloseRequest.java?p2=james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/CloseRequest.java&p1=james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/imap4rev1/CloseRequest.java&r1=755562&r2=755590&rev=755590&view=diff
==============================================================================
--- james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/imap4rev1/CloseRequest.java (original)
+++ james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/CloseRequest.java Wed Mar 18 13:20:15 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.imap.message.request.imap4rev1;
+package org.apache.james.imap.message.request;
import org.apache.james.imap.api.ImapCommand;
Propchange: james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/CloseRequest.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/CopyRequest.java (from r755562, james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/imap4rev1/CopyRequest.java)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/CopyRequest.java?p2=james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/CopyRequest.java&p1=james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/imap4rev1/CopyRequest.java&r1=755562&r2=755590&rev=755590&view=diff
==============================================================================
--- james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/imap4rev1/CopyRequest.java (original)
+++ james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/CopyRequest.java Wed Mar 18 13:20:15 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.imap.message.request.imap4rev1;
+package org.apache.james.imap.message.request;
import org.apache.james.imap.api.ImapCommand;
import org.apache.james.imap.api.message.IdRange;
Propchange: james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/CopyRequest.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/CreateRequest.java (from r755562, james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/imap4rev1/CreateRequest.java)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/CreateRequest.java?p2=james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/CreateRequest.java&p1=james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/imap4rev1/CreateRequest.java&r1=755562&r2=755590&rev=755590&view=diff
==============================================================================
--- james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/imap4rev1/CreateRequest.java (original)
+++ james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/CreateRequest.java Wed Mar 18 13:20:15 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.imap.message.request.imap4rev1;
+package org.apache.james.imap.message.request;
import org.apache.james.imap.api.ImapCommand;
Propchange: james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/CreateRequest.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/DeleteRequest.java (from r755562, james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/imap4rev1/DeleteRequest.java)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/DeleteRequest.java?p2=james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/DeleteRequest.java&p1=james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/imap4rev1/DeleteRequest.java&r1=755562&r2=755590&rev=755590&view=diff
==============================================================================
--- james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/imap4rev1/DeleteRequest.java (original)
+++ james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/DeleteRequest.java Wed Mar 18 13:20:15 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.imap.message.request.imap4rev1;
+package org.apache.james.imap.message.request;
import org.apache.james.imap.api.ImapCommand;
Propchange: james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/DeleteRequest.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/ExamineRequest.java (from r755562, james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/imap4rev1/ExamineRequest.java)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/ExamineRequest.java?p2=james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/ExamineRequest.java&p1=james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/imap4rev1/ExamineRequest.java&r1=755562&r2=755590&rev=755590&view=diff
==============================================================================
--- james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/imap4rev1/ExamineRequest.java (original)
+++ james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/ExamineRequest.java Wed Mar 18 13:20:15 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.imap.message.request.imap4rev1;
+package org.apache.james.imap.message.request;
import org.apache.james.imap.api.ImapCommand;
Propchange: james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/ExamineRequest.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/ExpungeRequest.java (from r755562, james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/imap4rev1/ExpungeRequest.java)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/ExpungeRequest.java?p2=james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/ExpungeRequest.java&p1=james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/imap4rev1/ExpungeRequest.java&r1=755562&r2=755590&rev=755590&view=diff
==============================================================================
--- james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/imap4rev1/ExpungeRequest.java (original)
+++ james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/ExpungeRequest.java Wed Mar 18 13:20:15 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.imap.message.request.imap4rev1;
+package org.apache.james.imap.message.request;
import org.apache.james.imap.api.ImapCommand;
Propchange: james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/ExpungeRequest.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/FetchRequest.java (from r755562, james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/imap4rev1/FetchRequest.java)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/FetchRequest.java?p2=james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/FetchRequest.java&p1=james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/imap4rev1/FetchRequest.java&r1=755562&r2=755590&rev=755590&view=diff
==============================================================================
--- james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/imap4rev1/FetchRequest.java (original)
+++ james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/FetchRequest.java Wed Mar 18 13:20:15 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.imap.message.request.imap4rev1;
+package org.apache.james.imap.message.request;
import org.apache.james.imap.api.ImapCommand;
import org.apache.james.imap.api.message.FetchData;
Propchange: james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/FetchRequest.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/ListRequest.java (from r755562, james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/imap4rev1/ListRequest.java)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/ListRequest.java?p2=james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/ListRequest.java&p1=james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/imap4rev1/ListRequest.java&r1=755562&r2=755590&rev=755590&view=diff
==============================================================================
--- james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/imap4rev1/ListRequest.java (original)
+++ james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/ListRequest.java Wed Mar 18 13:20:15 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.imap.message.request.imap4rev1;
+package org.apache.james.imap.message.request;
import org.apache.james.imap.api.ImapCommand;
Propchange: james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/ListRequest.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/LoginRequest.java (from r755562, james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/imap4rev1/LoginRequest.java)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/LoginRequest.java?p2=james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/LoginRequest.java&p1=james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/imap4rev1/LoginRequest.java&r1=755562&r2=755590&rev=755590&view=diff
==============================================================================
--- james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/imap4rev1/LoginRequest.java (original)
+++ james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/LoginRequest.java Wed Mar 18 13:20:15 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.imap.message.request.imap4rev1;
+package org.apache.james.imap.message.request;
import org.apache.james.imap.api.ImapCommand;
Propchange: james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/LoginRequest.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/LogoutRequest.java (from r755562, james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/imap4rev1/LogoutRequest.java)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/LogoutRequest.java?p2=james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/LogoutRequest.java&p1=james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/imap4rev1/LogoutRequest.java&r1=755562&r2=755590&rev=755590&view=diff
==============================================================================
--- james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/imap4rev1/LogoutRequest.java (original)
+++ james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/LogoutRequest.java Wed Mar 18 13:20:15 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.imap.message.request.imap4rev1;
+package org.apache.james.imap.message.request;
import org.apache.james.imap.api.ImapCommand;
Propchange: james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/LogoutRequest.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/LsubRequest.java (from r755562, james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/imap4rev1/LsubRequest.java)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/LsubRequest.java?p2=james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/LsubRequest.java&p1=james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/imap4rev1/LsubRequest.java&r1=755562&r2=755590&rev=755590&view=diff
==============================================================================
--- james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/imap4rev1/LsubRequest.java (original)
+++ james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/LsubRequest.java Wed Mar 18 13:20:15 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.imap.message.request.imap4rev1;
+package org.apache.james.imap.message.request;
import org.apache.james.imap.api.ImapCommand;
Propchange: james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/LsubRequest.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/NoopRequest.java (from r755562, james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/imap4rev1/NoopRequest.java)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/NoopRequest.java?p2=james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/NoopRequest.java&p1=james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/imap4rev1/NoopRequest.java&r1=755562&r2=755590&rev=755590&view=diff
==============================================================================
--- james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/imap4rev1/NoopRequest.java (original)
+++ james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/NoopRequest.java Wed Mar 18 13:20:15 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.imap.message.request.imap4rev1;
+package org.apache.james.imap.message.request;
import org.apache.james.imap.api.ImapCommand;
Propchange: james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/NoopRequest.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/RenameRequest.java (from r755562, james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/imap4rev1/RenameRequest.java)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/RenameRequest.java?p2=james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/RenameRequest.java&p1=james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/imap4rev1/RenameRequest.java&r1=755562&r2=755590&rev=755590&view=diff
==============================================================================
--- james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/imap4rev1/RenameRequest.java (original)
+++ james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/RenameRequest.java Wed Mar 18 13:20:15 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.imap.message.request.imap4rev1;
+package org.apache.james.imap.message.request;
import org.apache.james.imap.api.ImapCommand;
Propchange: james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/RenameRequest.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/SearchRequest.java (from r755562, james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/imap4rev1/SearchRequest.java)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/SearchRequest.java?p2=james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/SearchRequest.java&p1=james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/imap4rev1/SearchRequest.java&r1=755562&r2=755590&rev=755590&view=diff
==============================================================================
--- james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/imap4rev1/SearchRequest.java (original)
+++ james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/SearchRequest.java Wed Mar 18 13:20:15 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.imap.message.request.imap4rev1;
+package org.apache.james.imap.message.request;
import org.apache.james.imap.api.ImapCommand;
import org.apache.james.imap.api.message.request.SearchKey;
Propchange: james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/SearchRequest.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/SelectRequest.java (from r755562, james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/imap4rev1/SelectRequest.java)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/SelectRequest.java?p2=james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/SelectRequest.java&p1=james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/imap4rev1/SelectRequest.java&r1=755562&r2=755590&rev=755590&view=diff
==============================================================================
--- james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/imap4rev1/SelectRequest.java (original)
+++ james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/SelectRequest.java Wed Mar 18 13:20:15 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.imap.message.request.imap4rev1;
+package org.apache.james.imap.message.request;
import org.apache.james.imap.api.ImapCommand;
Propchange: james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/SelectRequest.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/StatusRequest.java (from r755562, james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/imap4rev1/StatusRequest.java)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/StatusRequest.java?p2=james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/StatusRequest.java&p1=james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/imap4rev1/StatusRequest.java&r1=755562&r2=755590&rev=755590&view=diff
==============================================================================
--- james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/imap4rev1/StatusRequest.java (original)
+++ james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/StatusRequest.java Wed Mar 18 13:20:15 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.imap.message.request.imap4rev1;
+package org.apache.james.imap.message.request;
import org.apache.james.imap.api.ImapCommand;
import org.apache.james.imap.api.message.StatusDataItems;
Propchange: james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/StatusRequest.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/StoreRequest.java (from r755562, james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/imap4rev1/StoreRequest.java)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/StoreRequest.java?p2=james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/StoreRequest.java&p1=james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/imap4rev1/StoreRequest.java&r1=755562&r2=755590&rev=755590&view=diff
==============================================================================
--- james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/imap4rev1/StoreRequest.java (original)
+++ james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/StoreRequest.java Wed Mar 18 13:20:15 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.imap.message.request.imap4rev1;
+package org.apache.james.imap.message.request;
import javax.mail.Flags;
Propchange: james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/StoreRequest.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/SubscribeRequest.java (from r755562, james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/imap4rev1/SubscribeRequest.java)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/SubscribeRequest.java?p2=james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/SubscribeRequest.java&p1=james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/imap4rev1/SubscribeRequest.java&r1=755562&r2=755590&rev=755590&view=diff
==============================================================================
--- james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/imap4rev1/SubscribeRequest.java (original)
+++ james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/SubscribeRequest.java Wed Mar 18 13:20:15 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.imap.message.request.imap4rev1;
+package org.apache.james.imap.message.request;
import org.apache.james.imap.api.ImapCommand;
Propchange: james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/SubscribeRequest.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/UnsubscribeRequest.java (from r755562, james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/imap4rev1/UnsubscribeRequest.java)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/UnsubscribeRequest.java?p2=james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/UnsubscribeRequest.java&p1=james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/imap4rev1/UnsubscribeRequest.java&r1=755562&r2=755590&rev=755590&view=diff
==============================================================================
--- james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/imap4rev1/UnsubscribeRequest.java (original)
+++ james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/UnsubscribeRequest.java Wed Mar 18 13:20:15 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.imap.message.request.imap4rev1;
+package org.apache.james.imap.message.request;
import org.apache.james.imap.api.ImapCommand;
Propchange: james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/UnsubscribeRequest.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/response/AbstactStatusResponseFactory.java (from r755562, james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/response/imap4rev1/status/AbstactStatusResponseFactory.java)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/response/AbstactStatusResponseFactory.java?p2=james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/response/AbstactStatusResponseFactory.java&p1=james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/response/imap4rev1/status/AbstactStatusResponseFactory.java&r1=755562&r2=755590&rev=755590&view=diff
==============================================================================
--- james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/response/imap4rev1/status/AbstactStatusResponseFactory.java (original)
+++ james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/response/AbstactStatusResponseFactory.java Wed Mar 18 13:20:15 2009
@@ -17,13 +17,13 @@
* under the License. *
****************************************************************/
-package org.apache.james.imap.message.response.imap4rev1.status;
+package org.apache.james.imap.message.response;
import org.apache.james.imap.api.ImapCommand;
import org.apache.james.imap.api.display.HumanReadableTextKey;
-import org.apache.james.imap.api.message.response.imap4rev1.StatusResponse;
-import org.apache.james.imap.api.message.response.imap4rev1.StatusResponseFactory;
-import org.apache.james.imap.api.message.response.imap4rev1.StatusResponse.ResponseCode;
+import org.apache.james.imap.api.message.response.StatusResponse;
+import org.apache.james.imap.api.message.response.StatusResponseFactory;
+import org.apache.james.imap.api.message.response.StatusResponse.ResponseCode;
public abstract class AbstactStatusResponseFactory implements
StatusResponseFactory {
Propchange: james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/response/AbstactStatusResponseFactory.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/response/AbstractListingResponse.java (from r755561, james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/response/imap4rev1/server/AbstractListingResponse.java)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/response/AbstractListingResponse.java?p2=james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/response/AbstractListingResponse.java&p1=james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/response/imap4rev1/server/AbstractListingResponse.java&r1=755561&r2=755590&rev=755590&view=diff
==============================================================================
--- james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/response/imap4rev1/server/AbstractListingResponse.java (original)
+++ james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/response/AbstractListingResponse.java Wed Mar 18 13:20:15 2009
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.imap.message.response.imap4rev1.server;
+package org.apache.james.imap.message.response;
/**
* <code>LIST</code> and <code>LSUB</code> return identical data.
Propchange: james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/response/AbstractListingResponse.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/response/CapabilityResponse.java (from r755562, james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/response/imap4rev1/server/CapabilityResponse.java)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/response/CapabilityResponse.java?p2=james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/response/CapabilityResponse.java&p1=james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/response/imap4rev1/server/CapabilityResponse.java&r1=755562&r2=755590&rev=755590&view=diff
==============================================================================
--- james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/response/imap4rev1/server/CapabilityResponse.java (original)
+++ james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/response/CapabilityResponse.java Wed Mar 18 13:20:15 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.imap.message.response.imap4rev1.server;
+package org.apache.james.imap.message.response;
import java.util.List;
Copied: james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/response/ExistsResponse.java (from r755562, james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/response/imap4rev1/ExistsResponse.java)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/response/ExistsResponse.java?p2=james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/response/ExistsResponse.java&p1=james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/response/imap4rev1/ExistsResponse.java&r1=755562&r2=755590&rev=755590&view=diff
==============================================================================
--- james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/response/imap4rev1/ExistsResponse.java (original)
+++ james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/response/ExistsResponse.java Wed Mar 18 13:20:15 2009
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.imap.message.response.imap4rev1;
+package org.apache.james.imap.message.response;
import org.apache.james.imap.api.message.response.ImapResponseMessage;
Propchange: james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/response/ExistsResponse.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/response/ExpungeResponse.java (from r755562, james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/response/imap4rev1/ExpungeResponse.java)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/response/ExpungeResponse.java?p2=james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/response/ExpungeResponse.java&p1=james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/response/imap4rev1/ExpungeResponse.java&r1=755562&r2=755590&rev=755590&view=diff
==============================================================================
--- james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/response/imap4rev1/ExpungeResponse.java (original)
+++ james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/response/ExpungeResponse.java Wed Mar 18 13:20:15 2009
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.imap.message.response.imap4rev1;
+package org.apache.james.imap.message.response;
import org.apache.james.imap.api.message.response.ImapResponseMessage;
Propchange: james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/response/ExpungeResponse.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/response/FetchResponse.java (from r755562, james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/response/imap4rev1/FetchResponse.java)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/response/FetchResponse.java?p2=james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/response/FetchResponse.java&p1=james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/response/imap4rev1/FetchResponse.java&r1=755562&r2=755590&rev=755590&view=diff
==============================================================================
--- james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/response/imap4rev1/FetchResponse.java (original)
+++ james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/response/FetchResponse.java Wed Mar 18 13:20:15 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.imap.message.response.imap4rev1;
+package org.apache.james.imap.message.response;
import java.io.IOException;
import java.nio.channels.WritableByteChannel;
Propchange: james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/response/FetchResponse.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/response/FlagsResponse.java (from r755562, james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/response/imap4rev1/FlagsResponse.java)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/response/FlagsResponse.java?p2=james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/response/FlagsResponse.java&p1=james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/response/imap4rev1/FlagsResponse.java&r1=755562&r2=755590&rev=755590&view=diff
==============================================================================
--- james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/response/imap4rev1/FlagsResponse.java (original)
+++ james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/response/FlagsResponse.java Wed Mar 18 13:20:15 2009
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.imap.message.response.imap4rev1;
+package org.apache.james.imap.message.response;
import javax.mail.Flags;
Propchange: james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/response/FlagsResponse.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/response/ImmutableStatusResponse.java (from r755562, james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/response/imap4rev1/status/ImmutableStatusResponse.java)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/response/ImmutableStatusResponse.java?p2=james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/response/ImmutableStatusResponse.java&p1=james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/response/imap4rev1/status/ImmutableStatusResponse.java&r1=755562&r2=755590&rev=755590&view=diff
==============================================================================
--- james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/response/imap4rev1/status/ImmutableStatusResponse.java (original)
+++ james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/response/ImmutableStatusResponse.java Wed Mar 18 13:20:15 2009
@@ -17,11 +17,11 @@
* under the License. *
****************************************************************/
-package org.apache.james.imap.message.response.imap4rev1.status;
+package org.apache.james.imap.message.response;
import org.apache.james.imap.api.ImapCommand;
import org.apache.james.imap.api.display.HumanReadableTextKey;
-import org.apache.james.imap.api.message.response.imap4rev1.StatusResponse;
+import org.apache.james.imap.api.message.response.StatusResponse;
/**
* Immutable status response. Suitable for unpooled usage.
Propchange: james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/response/ImmutableStatusResponse.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/response/LSubResponse.java (from r755562, james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/response/imap4rev1/server/LSubResponse.java)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/response/LSubResponse.java?p2=james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/response/LSubResponse.java&p1=james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/response/imap4rev1/server/LSubResponse.java&r1=755562&r2=755590&rev=755590&view=diff
==============================================================================
--- james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/response/imap4rev1/server/LSubResponse.java (original)
+++ james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/response/LSubResponse.java Wed Mar 18 13:20:15 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.imap.message.response.imap4rev1.server;
+package org.apache.james.imap.message.response;
import org.apache.james.imap.api.message.response.ImapResponseMessage;
Propchange: james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/response/LSubResponse.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/response/ListResponse.java (from r755562, james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/response/imap4rev1/server/ListResponse.java)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/response/ListResponse.java?p2=james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/response/ListResponse.java&p1=james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/response/imap4rev1/server/ListResponse.java&r1=755562&r2=755590&rev=755590&view=diff
==============================================================================
--- james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/response/imap4rev1/server/ListResponse.java (original)
+++ james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/response/ListResponse.java Wed Mar 18 13:20:15 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.imap.message.response.imap4rev1.server;
+package org.apache.james.imap.message.response;
import org.apache.james.imap.api.message.response.ImapResponseMessage;
Propchange: james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/response/ListResponse.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/response/Literal.java (from r755561, james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/response/imap4rev1/Literal.java)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/response/Literal.java?p2=james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/response/Literal.java&p1=james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/response/imap4rev1/Literal.java&r1=755561&r2=755590&rev=755590&view=diff
==============================================================================
--- james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/response/imap4rev1/Literal.java (original)
+++ james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/response/Literal.java Wed Mar 18 13:20:15 2009
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.imap.message.response.imap4rev1;
+package org.apache.james.imap.message.response;
import java.io.IOException;
import java.nio.channels.WritableByteChannel;
Propchange: james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/response/Literal.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/response/RecentResponse.java (from r755562, james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/response/imap4rev1/RecentResponse.java)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/response/RecentResponse.java?p2=james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/response/RecentResponse.java&p1=james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/response/imap4rev1/RecentResponse.java&r1=755562&r2=755590&rev=755590&view=diff
==============================================================================
--- james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/response/imap4rev1/RecentResponse.java (original)
+++ james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/response/RecentResponse.java Wed Mar 18 13:20:15 2009
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.imap.message.response.imap4rev1;
+package org.apache.james.imap.message.response;
import org.apache.james.imap.api.message.response.ImapResponseMessage;
Propchange: james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/response/RecentResponse.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/response/STATUSResponse.java (from r755562, james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/response/imap4rev1/server/STATUSResponse.java)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/response/STATUSResponse.java?p2=james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/response/STATUSResponse.java&p1=james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/response/imap4rev1/server/STATUSResponse.java&r1=755562&r2=755590&rev=755590&view=diff
==============================================================================
--- james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/response/imap4rev1/server/STATUSResponse.java (original)
+++ james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/response/STATUSResponse.java Wed Mar 18 13:20:15 2009
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.imap.message.response.imap4rev1.server;
+package org.apache.james.imap.message.response;
import org.apache.james.imap.api.message.response.ImapResponseMessage;
Propchange: james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/response/STATUSResponse.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/response/SearchResponse.java (from r755562, james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/response/imap4rev1/server/SearchResponse.java)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/response/SearchResponse.java?p2=james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/response/SearchResponse.java&p1=james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/response/imap4rev1/server/SearchResponse.java&r1=755562&r2=755590&rev=755590&view=diff
==============================================================================
--- james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/response/imap4rev1/server/SearchResponse.java (original)
+++ james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/response/SearchResponse.java Wed Mar 18 13:20:15 2009
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.imap.message.response.imap4rev1.server;
+package org.apache.james.imap.message.response;
import java.util.Arrays;
Propchange: james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/response/SearchResponse.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/response/UnpooledStatusResponseFactory.java (from r755562, james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/response/imap4rev1/status/UnpooledStatusResponseFactory.java)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/response/UnpooledStatusResponseFactory.java?p2=james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/response/UnpooledStatusResponseFactory.java&p1=james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/response/imap4rev1/status/UnpooledStatusResponseFactory.java&r1=755562&r2=755590&rev=755590&view=diff
==============================================================================
--- james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/response/imap4rev1/status/UnpooledStatusResponseFactory.java (original)
+++ james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/response/UnpooledStatusResponseFactory.java Wed Mar 18 13:20:15 2009
@@ -17,14 +17,14 @@
* under the License. *
****************************************************************/
-package org.apache.james.imap.message.response.imap4rev1.status;
+package org.apache.james.imap.message.response;
import org.apache.james.imap.api.ImapCommand;
import org.apache.james.imap.api.display.HumanReadableTextKey;
-import org.apache.james.imap.api.message.response.imap4rev1.StatusResponse;
-import org.apache.james.imap.api.message.response.imap4rev1.StatusResponseFactory;
-import org.apache.james.imap.api.message.response.imap4rev1.StatusResponse.ResponseCode;
-import org.apache.james.imap.api.message.response.imap4rev1.StatusResponse.Type;
+import org.apache.james.imap.api.message.response.StatusResponse;
+import org.apache.james.imap.api.message.response.StatusResponseFactory;
+import org.apache.james.imap.api.message.response.StatusResponse.ResponseCode;
+import org.apache.james.imap.api.message.response.StatusResponse.Type;
public class UnpooledStatusResponseFactory extends AbstactStatusResponseFactory
implements StatusResponseFactory {
Propchange: james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/response/UnpooledStatusResponseFactory.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: james/protocols/imap/trunk/message/src/test/java/org/apache/james/imap/encode/FetchResponseEncoderEnvelopeTest.java (from r755562, james/protocols/imap/trunk/message/src/test/java/org/apache/james/imap/encode/imap4rev1/FetchResponseEncoderEnvelopeTest.java)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/message/src/test/java/org/apache/james/imap/encode/FetchResponseEncoderEnvelopeTest.java?p2=james/protocols/imap/trunk/message/src/test/java/org/apache/james/imap/encode/FetchResponseEncoderEnvelopeTest.java&p1=james/protocols/imap/trunk/message/src/test/java/org/apache/james/imap/encode/imap4rev1/FetchResponseEncoderEnvelopeTest.java&r1=755562&r2=755590&rev=755590&view=diff
==============================================================================
--- james/protocols/imap/trunk/message/src/test/java/org/apache/james/imap/encode/imap4rev1/FetchResponseEncoderEnvelopeTest.java (original)
+++ james/protocols/imap/trunk/message/src/test/java/org/apache/james/imap/encode/FetchResponseEncoderEnvelopeTest.java Wed Mar 18 13:20:15 2009
@@ -17,15 +17,16 @@
* under the License. *
****************************************************************/
-package org.apache.james.imap.encode.imap4rev1;
+package org.apache.james.imap.encode;
import javax.mail.Flags;
import org.apache.james.imap.api.ImapCommand;
+import org.apache.james.imap.encode.FetchResponseEncoder;
import org.apache.james.imap.encode.ImapEncoder;
import org.apache.james.imap.encode.ImapResponseComposer;
-import org.apache.james.imap.message.response.imap4rev1.FetchResponse;
-import org.apache.james.imap.message.response.imap4rev1.FetchResponse.Envelope.Address;
+import org.apache.james.imap.message.response.FetchResponse;
+import org.apache.james.imap.message.response.FetchResponse.Envelope.Address;
import org.jmock.Expectations;
import org.jmock.Sequence;
import org.jmock.integration.junit3.MockObjectTestCase;
Propchange: james/protocols/imap/trunk/message/src/test/java/org/apache/james/imap/encode/FetchResponseEncoderEnvelopeTest.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: james/protocols/imap/trunk/message/src/test/java/org/apache/james/imap/encode/FetchResponseEncoderTest.java (from r755562, james/protocols/imap/trunk/message/src/test/java/org/apache/james/imap/encode/imap4rev1/FetchResponseEncoderTest.java)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/message/src/test/java/org/apache/james/imap/encode/FetchResponseEncoderTest.java?p2=james/protocols/imap/trunk/message/src/test/java/org/apache/james/imap/encode/FetchResponseEncoderTest.java&p1=james/protocols/imap/trunk/message/src/test/java/org/apache/james/imap/encode/imap4rev1/FetchResponseEncoderTest.java&r1=755562&r2=755590&rev=755590&view=diff
==============================================================================
--- james/protocols/imap/trunk/message/src/test/java/org/apache/james/imap/encode/imap4rev1/FetchResponseEncoderTest.java (original)
+++ james/protocols/imap/trunk/message/src/test/java/org/apache/james/imap/encode/FetchResponseEncoderTest.java Wed Mar 18 13:20:15 2009
@@ -17,15 +17,16 @@
* under the License. *
****************************************************************/
-package org.apache.james.imap.encode.imap4rev1;
+package org.apache.james.imap.encode;
import javax.mail.Flags;
import org.apache.james.imap.api.ImapCommand;
import org.apache.james.imap.api.ImapMessage;
+import org.apache.james.imap.encode.FetchResponseEncoder;
import org.apache.james.imap.encode.ImapEncoder;
import org.apache.james.imap.encode.ImapResponseComposer;
-import org.apache.james.imap.message.response.imap4rev1.FetchResponse;
+import org.apache.james.imap.message.response.FetchResponse;
import org.jmock.Expectations;
import org.jmock.Sequence;
import org.jmock.integration.junit3.MockObjectTestCase;
Propchange: james/protocols/imap/trunk/message/src/test/java/org/apache/james/imap/encode/FetchResponseEncoderTest.java
------------------------------------------------------------------------------
svn:mergeinfo =
Modified: james/protocols/imap/trunk/message/src/test/java/org/apache/james/imap/encode/ImapResponseTest.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/message/src/test/java/org/apache/james/imap/encode/ImapResponseTest.java?rev=755590&r1=755589&r2=755590&view=diff
==============================================================================
--- james/protocols/imap/trunk/message/src/test/java/org/apache/james/imap/encode/ImapResponseTest.java (original)
+++ james/protocols/imap/trunk/message/src/test/java/org/apache/james/imap/encode/ImapResponseTest.java Wed Mar 18 13:20:15 2009
@@ -22,7 +22,6 @@
import javax.mail.Flags;
import org.apache.james.imap.encode.base.ImapResponseComposerImpl;
-import org.apache.james.imap.encode.imap4rev1.legacy.MockImapResponseWriter;
import org.jmock.integration.junit3.MockObjectTestCase;
public class ImapResponseTest extends MockObjectTestCase {
Copied: james/protocols/imap/trunk/message/src/test/java/org/apache/james/imap/encode/LSubResponseEncoderTest.java (from r755562, james/protocols/imap/trunk/message/src/test/java/org/apache/james/imap/encode/imap4rev1/server/LSubResponseEncoderTest.java)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/message/src/test/java/org/apache/james/imap/encode/LSubResponseEncoderTest.java?p2=james/protocols/imap/trunk/message/src/test/java/org/apache/james/imap/encode/LSubResponseEncoderTest.java&p1=james/protocols/imap/trunk/message/src/test/java/org/apache/james/imap/encode/imap4rev1/server/LSubResponseEncoderTest.java&r1=755562&r2=755590&rev=755590&view=diff
==============================================================================
--- james/protocols/imap/trunk/message/src/test/java/org/apache/james/imap/encode/imap4rev1/server/LSubResponseEncoderTest.java (original)
+++ james/protocols/imap/trunk/message/src/test/java/org/apache/james/imap/encode/LSubResponseEncoderTest.java Wed Mar 18 13:20:15 2009
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.imap.encode.imap4rev1.server;
+package org.apache.james.imap.encode;
import java.util.Arrays;
import java.util.List;
@@ -26,8 +26,9 @@
import org.apache.james.imap.api.ImapMessage;
import org.apache.james.imap.encode.ImapEncoder;
import org.apache.james.imap.encode.ImapResponseComposer;
-import org.apache.james.imap.message.response.imap4rev1.server.LSubResponse;
-import org.apache.james.imap.message.response.imap4rev1.server.ListResponse;
+import org.apache.james.imap.encode.LSubResponseEncoder;
+import org.apache.james.imap.message.response.LSubResponse;
+import org.apache.james.imap.message.response.ListResponse;
import org.jmock.Expectations;
import org.jmock.integration.junit3.MockObjectTestCase;
Propchange: james/protocols/imap/trunk/message/src/test/java/org/apache/james/imap/encode/LSubResponseEncoderTest.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: james/protocols/imap/trunk/message/src/test/java/org/apache/james/imap/encode/ListResponseEncoderTest.java (from r755562, james/protocols/imap/trunk/message/src/test/java/org/apache/james/imap/encode/imap4rev1/server/ListResponseEncoderTest.java)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/message/src/test/java/org/apache/james/imap/encode/ListResponseEncoderTest.java?p2=james/protocols/imap/trunk/message/src/test/java/org/apache/james/imap/encode/ListResponseEncoderTest.java&p1=james/protocols/imap/trunk/message/src/test/java/org/apache/james/imap/encode/imap4rev1/server/ListResponseEncoderTest.java&r1=755562&r2=755590&rev=755590&view=diff
==============================================================================
--- james/protocols/imap/trunk/message/src/test/java/org/apache/james/imap/encode/imap4rev1/server/ListResponseEncoderTest.java (original)
+++ james/protocols/imap/trunk/message/src/test/java/org/apache/james/imap/encode/ListResponseEncoderTest.java Wed Mar 18 13:20:15 2009
@@ -17,12 +17,13 @@
* under the License. *
****************************************************************/
-package org.apache.james.imap.encode.imap4rev1.server;
+package org.apache.james.imap.encode;
import org.apache.james.imap.api.ImapMessage;
import org.apache.james.imap.encode.ImapEncoder;
import org.apache.james.imap.encode.ImapResponseComposer;
-import org.apache.james.imap.message.response.imap4rev1.server.SearchResponse;
+import org.apache.james.imap.encode.SearchResponseEncoder;
+import org.apache.james.imap.message.response.SearchResponse;
import org.jmock.Expectations;
import org.jmock.integration.junit3.MockObjectTestCase;
Propchange: james/protocols/imap/trunk/message/src/test/java/org/apache/james/imap/encode/ListResponseEncoderTest.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: james/protocols/imap/trunk/message/src/test/java/org/apache/james/imap/encode/MockImapResponseWriter.java (from r755561, james/protocols/imap/trunk/message/src/test/java/org/apache/james/imap/encode/imap4rev1/legacy/MockImapResponseWriter.java)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/message/src/test/java/org/apache/james/imap/encode/MockImapResponseWriter.java?p2=james/protocols/imap/trunk/message/src/test/java/org/apache/james/imap/encode/MockImapResponseWriter.java&p1=james/protocols/imap/trunk/message/src/test/java/org/apache/james/imap/encode/imap4rev1/legacy/MockImapResponseWriter.java&r1=755561&r2=755590&rev=755590&view=diff
==============================================================================
--- james/protocols/imap/trunk/message/src/test/java/org/apache/james/imap/encode/imap4rev1/legacy/MockImapResponseWriter.java (original)
+++ james/protocols/imap/trunk/message/src/test/java/org/apache/james/imap/encode/MockImapResponseWriter.java Wed Mar 18 13:20:15 2009
@@ -17,14 +17,14 @@
* under the License. *
****************************************************************/
-package org.apache.james.imap.encode.imap4rev1.legacy;
+package org.apache.james.imap.encode;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import org.apache.james.imap.encode.ImapResponseWriter;
-import org.apache.james.imap.message.response.imap4rev1.Literal;
+import org.apache.james.imap.message.response.Literal;
public class MockImapResponseWriter implements ImapResponseWriter {
Propchange: james/protocols/imap/trunk/message/src/test/java/org/apache/james/imap/encode/MockImapResponseWriter.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: james/protocols/imap/trunk/message/src/test/java/org/apache/james/imap/encode/STATUSResponseEncoderTest.java (from r755562, james/protocols/imap/trunk/message/src/test/java/org/apache/james/imap/encode/imap4rev1/server/STATUSResponseEncoderTest.java)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/message/src/test/java/org/apache/james/imap/encode/STATUSResponseEncoderTest.java?p2=james/protocols/imap/trunk/message/src/test/java/org/apache/james/imap/encode/STATUSResponseEncoderTest.java&p1=james/protocols/imap/trunk/message/src/test/java/org/apache/james/imap/encode/imap4rev1/server/STATUSResponseEncoderTest.java&r1=755562&r2=755590&rev=755590&view=diff
==============================================================================
--- james/protocols/imap/trunk/message/src/test/java/org/apache/james/imap/encode/imap4rev1/server/STATUSResponseEncoderTest.java (original)
+++ james/protocols/imap/trunk/message/src/test/java/org/apache/james/imap/encode/STATUSResponseEncoderTest.java Wed Mar 18 13:20:15 2009
@@ -17,12 +17,13 @@
* under the License. *
****************************************************************/
-package org.apache.james.imap.encode.imap4rev1.server;
+package org.apache.james.imap.encode;
import org.apache.james.imap.api.ImapMessage;
import org.apache.james.imap.encode.ImapEncoder;
import org.apache.james.imap.encode.ImapResponseComposer;
-import org.apache.james.imap.message.response.imap4rev1.server.STATUSResponse;
+import org.apache.james.imap.encode.STATUSResponseEncoder;
+import org.apache.james.imap.message.response.STATUSResponse;
import org.jmock.Expectations;
import org.jmock.integration.junit3.MockObjectTestCase;
Propchange: james/protocols/imap/trunk/message/src/test/java/org/apache/james/imap/encode/STATUSResponseEncoderTest.java
------------------------------------------------------------------------------
svn:mergeinfo =
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org