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 ba...@apache.org on 2008/09/16 00:11:39 UTC

svn commit: r695661 - in /james/protocols/imap/trunk: deployment/src/test/java/org/apache/james/mailboxmanager/impl/ mailbox/src/main/java/org/apache/james/mailboxmanager/impl/ mailbox/src/main/java/org/apache/james/mailboxmanager/util/ message/src/mai...

Author: bago
Date: Mon Sep 15 15:11:38 2008
New Revision: 695661

URL: http://svn.apache.org/viewvc?rev=695661&view=rev
Log:
Remove cyclic dependencies between packages (IMAP-55)
- Merged imap.message.request into a single package (in base there is an imap4rev1 class!).
- Moved mailboxmanager  UidChangeTracker from .util to .impl.

Added:
    james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/impl/UidChangeTracker.java   (contents, props changed)
      - copied, changed from r695655, james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/util/UidChangeTracker.java
    james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/imap4rev1/AbstractImapRequest.java   (contents, props changed)
      - copied, changed from r695655, james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/base/AbstractImapRequest.java
    james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/imap4rev1/BaseImap4Rev1MessageFactory.java   (contents, props changed)
      - copied, changed from r695655, james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/base/BaseImap4Rev1MessageFactory.java
Removed:
    james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/util/UidChangeTracker.java
Modified:
    james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/mailboxmanager/impl/UidChangeTrackerTest.java
    james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/imap4rev1/AbstractMailboxSelectionRequest.java
    james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/imap4rev1/AppendRequest.java
    james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/imap4rev1/AuthenticateRequest.java
    james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/imap4rev1/CapabilityRequest.java
    james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/imap4rev1/CheckRequest.java
    james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/imap4rev1/CloseRequest.java
    james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/imap4rev1/CopyRequest.java
    james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/imap4rev1/CreateRequest.java
    james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/imap4rev1/DeleteRequest.java
    james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/imap4rev1/ExpungeRequest.java
    james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/imap4rev1/FetchRequest.java
    james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/imap4rev1/ListRequest.java
    james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/imap4rev1/LoginRequest.java
    james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/imap4rev1/LogoutRequest.java
    james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/imap4rev1/LsubRequest.java
    james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/imap4rev1/NoopRequest.java
    james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/imap4rev1/RenameRequest.java
    james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/imap4rev1/SearchRequest.java
    james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/imap4rev1/StatusRequest.java
    james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/imap4rev1/StoreRequest.java
    james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/imap4rev1/SubscribeRequest.java
    james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/imap4rev1/UnsubscribeRequest.java
    james/protocols/imap/trunk/seda/src/main/java/org/apache/james/experimental/imapserver/DefaultImapDecoderFactory.java
    james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/TorqueMailbox.java

Modified: james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/mailboxmanager/impl/UidChangeTrackerTest.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/mailboxmanager/impl/UidChangeTrackerTest.java?rev=695661&r1=695660&r2=695661&view=diff
==============================================================================
--- james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/mailboxmanager/impl/UidChangeTrackerTest.java (original)
+++ james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/mailboxmanager/impl/UidChangeTrackerTest.java Mon Sep 15 15:11:38 2008
@@ -25,8 +25,6 @@
 
 import junit.framework.TestCase;
 
-import org.apache.james.mailboxmanager.MessageResult;
-import org.apache.james.mailboxmanager.util.UidChangeTracker;
 import org.apache.james.mailboxmanager.util.UidRange;
 
 public class UidChangeTrackerTest extends TestCase {
@@ -52,7 +50,6 @@
     
     public void testFound() throws Exception {
         MessageResultImpl[] results;
-        MessageResult result;
         
         results=new MessageResultImpl[1];
         
@@ -84,7 +81,6 @@
     public void testShouldNotIssueFlagsUpdateEventWhenFlagsNotIncluded() throws Exception {
         MessageResultImpl[] results = new MessageResultImpl[1];
         
-        MessageResult result;
         results[0]=new MessageResultImpl(1000l,new Flags(Flags.Flag.FLAGGED));
         tracker.found(new UidRange(1000,1000),Arrays.asList(results));
         assertCollectorSizes(0,0,0);

Copied: james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/impl/UidChangeTracker.java (from r695655, james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/util/UidChangeTracker.java)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/impl/UidChangeTracker.java?p2=james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/impl/UidChangeTracker.java&p1=james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/util/UidChangeTracker.java&r1=695655&r2=695661&rev=695661&view=diff
==============================================================================
--- james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/util/UidChangeTracker.java (original)
+++ james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/impl/UidChangeTracker.java Mon Sep 15 15:11:38 2008
@@ -17,7 +17,7 @@
  * under the License.                                           *
  ****************************************************************/
 
-package org.apache.james.mailboxmanager.util;
+package org.apache.james.mailboxmanager.impl;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -35,9 +35,8 @@
 import org.apache.james.mailboxmanager.MailboxListener;
 import org.apache.james.mailboxmanager.MailboxManagerException;
 import org.apache.james.mailboxmanager.MessageResult;
-import org.apache.james.mailboxmanager.impl.MailboxEventDispatcher;
-import org.apache.james.mailboxmanager.impl.MessageFlags;
 import org.apache.james.mailboxmanager.mailbox.Mailbox;
+import org.apache.james.mailboxmanager.util.UidRange;
 
 public class UidChangeTracker implements Constants {
     

Propchange: james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/impl/UidChangeTracker.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/impl/UidChangeTracker.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Copied: james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/imap4rev1/AbstractImapRequest.java (from r695655, james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/base/AbstractImapRequest.java)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/imap4rev1/AbstractImapRequest.java?p2=james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/imap4rev1/AbstractImapRequest.java&p1=james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/base/AbstractImapRequest.java&r1=695655&r2=695661&rev=695661&view=diff
==============================================================================
--- james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/base/AbstractImapRequest.java (original)
+++ james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/imap4rev1/AbstractImapRequest.java Mon Sep 15 15:11:38 2008
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations      *
  * under the License.                                           *
  ****************************************************************/
-package org.apache.james.imap.message.request.base;
+package org.apache.james.imap.message.request.imap4rev1;
 
 import org.apache.james.api.imap.AbstractLogEnabled;
 import org.apache.james.api.imap.ImapCommand;

Propchange: james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/imap4rev1/AbstractImapRequest.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Modified: 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/imap4rev1/AbstractMailboxSelectionRequest.java?rev=695661&r1=695660&r2=695661&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/imap4rev1/AbstractMailboxSelectionRequest.java Mon Sep 15 15:11:38 2008
@@ -20,7 +20,6 @@
 package org.apache.james.imap.message.request.imap4rev1;
 
 import org.apache.james.api.imap.ImapCommand;
-import org.apache.james.imap.message.request.base.AbstractImapRequest;
 
 public abstract class AbstractMailboxSelectionRequest extends
         AbstractImapRequest {

Modified: 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/imap4rev1/AppendRequest.java?rev=695661&r1=695660&r2=695661&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/imap4rev1/AppendRequest.java Mon Sep 15 15:11:38 2008
@@ -24,7 +24,6 @@
 import javax.mail.internet.MimeMessage;
 
 import org.apache.james.api.imap.ImapCommand;
-import org.apache.james.imap.message.request.base.AbstractImapRequest;
 
 public class AppendRequest extends AbstractImapRequest {
     private final String mailboxName;

Modified: 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/imap4rev1/AuthenticateRequest.java?rev=695661&r1=695660&r2=695661&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/imap4rev1/AuthenticateRequest.java Mon Sep 15 15:11:38 2008
@@ -19,7 +19,6 @@
 package org.apache.james.imap.message.request.imap4rev1;
 
 import org.apache.james.api.imap.ImapCommand;
-import org.apache.james.imap.message.request.base.AbstractImapRequest;
 
 public class AuthenticateRequest extends AbstractImapRequest {
 

Copied: james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/imap4rev1/BaseImap4Rev1MessageFactory.java (from r695655, james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/base/BaseImap4Rev1MessageFactory.java)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/imap4rev1/BaseImap4Rev1MessageFactory.java?p2=james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/imap4rev1/BaseImap4Rev1MessageFactory.java&p1=james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/base/BaseImap4Rev1MessageFactory.java&r1=695655&r2=695661&rev=695661&view=diff
==============================================================================
--- james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/base/BaseImap4Rev1MessageFactory.java (original)
+++ james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/imap4rev1/BaseImap4Rev1MessageFactory.java Mon Sep 15 15:11:38 2008
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations      *
  * under the License.                                           *
  ****************************************************************/ 
-package org.apache.james.imap.message.request.base;
+package org.apache.james.imap.message.request.imap4rev1;
 
 import java.util.Date;
 
@@ -33,29 +33,6 @@
 import org.apache.james.api.imap.message.request.SearchKey;
 import org.apache.james.api.imap.message.response.imap4rev1.StatusResponse;
 import org.apache.james.api.imap.message.response.imap4rev1.StatusResponseFactory;
-import org.apache.james.imap.message.request.imap4rev1.AppendRequest;
-import org.apache.james.imap.message.request.imap4rev1.AuthenticateRequest;
-import org.apache.james.imap.message.request.imap4rev1.CapabilityRequest;
-import org.apache.james.imap.message.request.imap4rev1.CheckRequest;
-import org.apache.james.imap.message.request.imap4rev1.CloseRequest;
-import org.apache.james.imap.message.request.imap4rev1.CopyRequest;
-import org.apache.james.imap.message.request.imap4rev1.CreateRequest;
-import org.apache.james.imap.message.request.imap4rev1.DeleteRequest;
-import org.apache.james.imap.message.request.imap4rev1.ExamineRequest;
-import org.apache.james.imap.message.request.imap4rev1.ExpungeRequest;
-import org.apache.james.imap.message.request.imap4rev1.FetchRequest;
-import org.apache.james.imap.message.request.imap4rev1.ListRequest;
-import org.apache.james.imap.message.request.imap4rev1.LoginRequest;
-import org.apache.james.imap.message.request.imap4rev1.LogoutRequest;
-import org.apache.james.imap.message.request.imap4rev1.LsubRequest;
-import org.apache.james.imap.message.request.imap4rev1.NoopRequest;
-import org.apache.james.imap.message.request.imap4rev1.RenameRequest;
-import org.apache.james.imap.message.request.imap4rev1.SearchRequest;
-import org.apache.james.imap.message.request.imap4rev1.SelectRequest;
-import org.apache.james.imap.message.request.imap4rev1.StatusRequest;
-import org.apache.james.imap.message.request.imap4rev1.StoreRequest;
-import org.apache.james.imap.message.request.imap4rev1.SubscribeRequest;
-import org.apache.james.imap.message.request.imap4rev1.UnsubscribeRequest;
 
 /**
  * Naive, factory creates unpooled instances.

Propchange: james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/imap4rev1/BaseImap4Rev1MessageFactory.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Modified: 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/imap4rev1/CapabilityRequest.java?rev=695661&r1=695660&r2=695661&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/imap4rev1/CapabilityRequest.java Mon Sep 15 15:11:38 2008
@@ -19,7 +19,6 @@
 package org.apache.james.imap.message.request.imap4rev1;
 
 import org.apache.james.api.imap.ImapCommand;
-import org.apache.james.imap.message.request.base.AbstractImapRequest;
 
 public class CapabilityRequest extends AbstractImapRequest {
 

Modified: 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/imap4rev1/CheckRequest.java?rev=695661&r1=695660&r2=695661&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/imap4rev1/CheckRequest.java Mon Sep 15 15:11:38 2008
@@ -19,7 +19,6 @@
 package org.apache.james.imap.message.request.imap4rev1;
 
 import org.apache.james.api.imap.ImapCommand;
-import org.apache.james.imap.message.request.base.AbstractImapRequest;
 
 public class CheckRequest extends AbstractImapRequest {
 

Modified: 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/imap4rev1/CloseRequest.java?rev=695661&r1=695660&r2=695661&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/imap4rev1/CloseRequest.java Mon Sep 15 15:11:38 2008
@@ -19,7 +19,6 @@
 package org.apache.james.imap.message.request.imap4rev1;
 
 import org.apache.james.api.imap.ImapCommand;
-import org.apache.james.imap.message.request.base.AbstractImapRequest;
 
 public class CloseRequest extends AbstractImapRequest {
 

Modified: 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/imap4rev1/CopyRequest.java?rev=695661&r1=695660&r2=695661&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/imap4rev1/CopyRequest.java Mon Sep 15 15:11:38 2008
@@ -20,7 +20,6 @@
 
 import org.apache.james.api.imap.ImapCommand;
 import org.apache.james.api.imap.message.IdRange;
-import org.apache.james.imap.message.request.base.AbstractImapRequest;
 
 public class CopyRequest extends AbstractImapRequest {
 

Modified: 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/imap4rev1/CreateRequest.java?rev=695661&r1=695660&r2=695661&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/imap4rev1/CreateRequest.java Mon Sep 15 15:11:38 2008
@@ -19,7 +19,6 @@
 package org.apache.james.imap.message.request.imap4rev1;
 
 import org.apache.james.api.imap.ImapCommand;
-import org.apache.james.imap.message.request.base.AbstractImapRequest;
 
 public class CreateRequest extends AbstractImapRequest {
     private final String mailboxName;

Modified: 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/imap4rev1/DeleteRequest.java?rev=695661&r1=695660&r2=695661&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/imap4rev1/DeleteRequest.java Mon Sep 15 15:11:38 2008
@@ -19,7 +19,6 @@
 package org.apache.james.imap.message.request.imap4rev1;
 
 import org.apache.james.api.imap.ImapCommand;
-import org.apache.james.imap.message.request.base.AbstractImapRequest;
 
 public class DeleteRequest extends AbstractImapRequest {
     private final String mailboxName;

Modified: 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/imap4rev1/ExpungeRequest.java?rev=695661&r1=695660&r2=695661&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/imap4rev1/ExpungeRequest.java Mon Sep 15 15:11:38 2008
@@ -19,7 +19,6 @@
 package org.apache.james.imap.message.request.imap4rev1;
 
 import org.apache.james.api.imap.ImapCommand;
-import org.apache.james.imap.message.request.base.AbstractImapRequest;
 
 public class ExpungeRequest extends AbstractImapRequest {
 

Modified: 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/imap4rev1/FetchRequest.java?rev=695661&r1=695660&r2=695661&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/imap4rev1/FetchRequest.java Mon Sep 15 15:11:38 2008
@@ -21,7 +21,6 @@
 import org.apache.james.api.imap.ImapCommand;
 import org.apache.james.api.imap.message.FetchData;
 import org.apache.james.api.imap.message.IdRange;
-import org.apache.james.imap.message.request.base.AbstractImapRequest;
 
 public class FetchRequest extends AbstractImapRequest {
     private final boolean useUids;

Modified: 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/imap4rev1/ListRequest.java?rev=695661&r1=695660&r2=695661&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/imap4rev1/ListRequest.java Mon Sep 15 15:11:38 2008
@@ -19,7 +19,6 @@
 package org.apache.james.imap.message.request.imap4rev1;
 
 import org.apache.james.api.imap.ImapCommand;
-import org.apache.james.imap.message.request.base.AbstractImapRequest;
 
 public class ListRequest extends AbstractImapRequest {
     private final String baseReferenceName;

Modified: 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/imap4rev1/LoginRequest.java?rev=695661&r1=695660&r2=695661&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/imap4rev1/LoginRequest.java Mon Sep 15 15:11:38 2008
@@ -19,7 +19,6 @@
 package org.apache.james.imap.message.request.imap4rev1;
 
 import org.apache.james.api.imap.ImapCommand;
-import org.apache.james.imap.message.request.base.AbstractImapRequest;
 
 public class LoginRequest extends AbstractImapRequest {
     private final String userid;

Modified: 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/imap4rev1/LogoutRequest.java?rev=695661&r1=695660&r2=695661&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/imap4rev1/LogoutRequest.java Mon Sep 15 15:11:38 2008
@@ -19,7 +19,6 @@
 package org.apache.james.imap.message.request.imap4rev1;
 
 import org.apache.james.api.imap.ImapCommand;
-import org.apache.james.imap.message.request.base.AbstractImapRequest;
 
 public class LogoutRequest extends AbstractImapRequest {
 

Modified: 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/imap4rev1/LsubRequest.java?rev=695661&r1=695660&r2=695661&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/imap4rev1/LsubRequest.java Mon Sep 15 15:11:38 2008
@@ -19,7 +19,6 @@
 package org.apache.james.imap.message.request.imap4rev1;
 
 import org.apache.james.api.imap.ImapCommand;
-import org.apache.james.imap.message.request.base.AbstractImapRequest;
 
 public class LsubRequest extends AbstractImapRequest {
     private final String baseReferenceName;

Modified: 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/imap4rev1/NoopRequest.java?rev=695661&r1=695660&r2=695661&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/imap4rev1/NoopRequest.java Mon Sep 15 15:11:38 2008
@@ -19,7 +19,6 @@
 package org.apache.james.imap.message.request.imap4rev1;
 
 import org.apache.james.api.imap.ImapCommand;
-import org.apache.james.imap.message.request.base.AbstractImapRequest;
 
 public class NoopRequest extends AbstractImapRequest {
 

Modified: 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/imap4rev1/RenameRequest.java?rev=695661&r1=695660&r2=695661&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/imap4rev1/RenameRequest.java Mon Sep 15 15:11:38 2008
@@ -19,7 +19,6 @@
 package org.apache.james.imap.message.request.imap4rev1;
 
 import org.apache.james.api.imap.ImapCommand;
-import org.apache.james.imap.message.request.base.AbstractImapRequest;
 
 public class RenameRequest extends AbstractImapRequest {
     private final String existingName;

Modified: 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/imap4rev1/SearchRequest.java?rev=695661&r1=695660&r2=695661&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/imap4rev1/SearchRequest.java Mon Sep 15 15:11:38 2008
@@ -21,7 +21,6 @@
 
 import org.apache.james.api.imap.ImapCommand;
 import org.apache.james.api.imap.message.request.SearchKey;
-import org.apache.james.imap.message.request.base.AbstractImapRequest;
 
 public class SearchRequest extends AbstractImapRequest {
 

Modified: 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/imap4rev1/StatusRequest.java?rev=695661&r1=695660&r2=695661&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/imap4rev1/StatusRequest.java Mon Sep 15 15:11:38 2008
@@ -20,7 +20,6 @@
 
 import org.apache.james.api.imap.ImapCommand;
 import org.apache.james.api.imap.message.StatusDataItems;
-import org.apache.james.imap.message.request.base.AbstractImapRequest;
 
 public class StatusRequest extends AbstractImapRequest {
     private final String mailboxName;

Modified: 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/imap4rev1/StoreRequest.java?rev=695661&r1=695660&r2=695661&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/imap4rev1/StoreRequest.java Mon Sep 15 15:11:38 2008
@@ -22,7 +22,6 @@
 
 import org.apache.james.api.imap.ImapCommand;
 import org.apache.james.api.imap.message.IdRange;
-import org.apache.james.imap.message.request.base.AbstractImapRequest;
 
 public class StoreRequest extends AbstractImapRequest {
     

Modified: 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/imap4rev1/SubscribeRequest.java?rev=695661&r1=695660&r2=695661&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/imap4rev1/SubscribeRequest.java Mon Sep 15 15:11:38 2008
@@ -19,7 +19,6 @@
 package org.apache.james.imap.message.request.imap4rev1;
 
 import org.apache.james.api.imap.ImapCommand;
-import org.apache.james.imap.message.request.base.AbstractImapRequest;
 
 public class SubscribeRequest extends AbstractImapRequest {
     private final String mailboxName;

Modified: 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/imap4rev1/UnsubscribeRequest.java?rev=695661&r1=695660&r2=695661&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/imap4rev1/UnsubscribeRequest.java Mon Sep 15 15:11:38 2008
@@ -19,7 +19,6 @@
 package org.apache.james.imap.message.request.imap4rev1;
 
 import org.apache.james.api.imap.ImapCommand;
-import org.apache.james.imap.message.request.base.AbstractImapRequest;
 
 public class UnsubscribeRequest extends AbstractImapRequest {
     private final String mailboxName;

Modified: james/protocols/imap/trunk/seda/src/main/java/org/apache/james/experimental/imapserver/DefaultImapDecoderFactory.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/seda/src/main/java/org/apache/james/experimental/imapserver/DefaultImapDecoderFactory.java?rev=695661&r1=695660&r2=695661&view=diff
==============================================================================
--- james/protocols/imap/trunk/seda/src/main/java/org/apache/james/experimental/imapserver/DefaultImapDecoderFactory.java (original)
+++ james/protocols/imap/trunk/seda/src/main/java/org/apache/james/experimental/imapserver/DefaultImapDecoderFactory.java Mon Sep 15 15:11:38 2008
@@ -22,7 +22,7 @@
 import org.apache.james.api.imap.imap4rev1.Imap4Rev1CommandFactory;
 import org.apache.james.api.imap.imap4rev1.Imap4Rev1MessageFactory;
 import org.apache.james.imap.command.imap4rev1.StandardImap4Rev1CommandFactory;
-import org.apache.james.imap.message.request.base.BaseImap4Rev1MessageFactory;
+import org.apache.james.imap.message.request.imap4rev1.BaseImap4Rev1MessageFactory;
 import org.apache.james.imap.message.response.imap4rev1.status.UnpooledStatusResponseFactory;
 import org.apache.james.imapserver.codec.decode.ImapCommandParserFactory;
 import org.apache.james.imapserver.codec.decode.ImapDecoder;

Modified: james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/TorqueMailbox.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/TorqueMailbox.java?rev=695661&r1=695660&r2=695661&view=diff
==============================================================================
--- james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/TorqueMailbox.java (original)
+++ james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/TorqueMailbox.java Mon Sep 15 15:11:38 2008
@@ -48,6 +48,7 @@
 import org.apache.james.mailboxmanager.SearchQuery.Criterion;
 import org.apache.james.mailboxmanager.SearchQuery.NumericRange;
 import org.apache.james.mailboxmanager.impl.FetchGroupImpl;
+import org.apache.james.mailboxmanager.impl.UidChangeTracker;
 import org.apache.james.mailboxmanager.mailbox.Mailbox;
 import org.apache.james.mailboxmanager.torque.om.MailboxRow;
 import org.apache.james.mailboxmanager.torque.om.MailboxRowPeer;
@@ -57,7 +58,6 @@
 import org.apache.james.mailboxmanager.torque.om.MessageHeader;
 import org.apache.james.mailboxmanager.torque.om.MessageRow;
 import org.apache.james.mailboxmanager.torque.om.MessageRowPeer;
-import org.apache.james.mailboxmanager.util.UidChangeTracker;
 import org.apache.james.mailboxmanager.util.UidRange;
 import org.apache.torque.NoRowsException;
 import org.apache.torque.TooManyRowsException;



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