Author: rdonkin
Date: Wed May 14 12:24:16 2008
New Revision: 656374
URL: http://svn.apache.org/viewvc?rev=656374&view=rev
Log:
Consolidate two small packages into one
Added:
james/server/trunk/core-library/src/main/java/org/apache/james/mailboxmanager/util/UidChangeTracker.java
- copied, changed from r656339,
james/server/trunk/core-library/src/main/java/org/apache/james/mailboxmanager/tracking/UidChangeTracker.java
james/server/trunk/core-library/src/main/java/org/apache/james/mailboxmanager/util/UidRange.java
- copied, changed from r656339,
james/server/trunk/core-library/src/main/java/org/apache/james/mailboxmanager/tracking/UidRange.java
james/server/trunk/core-library/src/main/java/org/apache/james/mailboxmanager/util/UidToMsnConverter.java
- copied, changed from r656339,
james/server/trunk/core-library/src/main/java/org/apache/james/mailboxmanager/tracking/UidToMsnConverter.java
Removed:
james/server/trunk/core-library/src/main/java/org/apache/james/mailboxmanager/tracking/UidChangeTracker.java
james/server/trunk/core-library/src/main/java/org/apache/james/mailboxmanager/tracking/UidRange.java
james/server/trunk/core-library/src/main/java/org/apache/james/mailboxmanager/tracking/UidToMsnConverter.java
Modified:
james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/base/SelectedMailboxSessionImpl.java
james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/SelectedMailboxSession.java
james/server/trunk/phoenix-deployment/src/test/org/apache/james/mailboxmanager/impl/UidChangeTrackerTestCase.java
james/server/trunk/torque-mailboxmanager-function/src/main/java/org/apache/james/mailboxmanager/torque/TorqueMailbox.java
Copied:
james/server/trunk/core-library/src/main/java/org/apache/james/mailboxmanager/util/UidChangeTracker.java
(from r656339,
james/server/trunk/core-library/src/main/java/org/apache/james/mailboxmanager/tracking/UidChangeTracker.java)
URL:
http://svn.apache.org/viewvc/james/server/trunk/core-library/src/main/java/org/apache/james/mailboxmanager/util/UidChangeTracker.java?p2=james/server/trunk/core-library/src/main/java/org/apache/james/mailboxmanager/util/UidChangeTracker.java&p1=james/server/trunk/core-library/src/main/java/org/apache/james/mailboxmanager/tracking/UidChangeTracker.java&r1=656339&r2=656374&rev=656374&view=diff
==============================================================================
---
james/server/trunk/core-library/src/main/java/org/apache/james/mailboxmanager/tracking/UidChangeTracker.java
(original)
+++
james/server/trunk/core-library/src/main/java/org/apache/james/mailboxmanager/util/UidChangeTracker.java
Wed May 14 12:24:16 2008
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.mailboxmanager.tracking;
+package org.apache.james.mailboxmanager.util;
import java.util.ArrayList;
import java.util.Collection;
Copied:
james/server/trunk/core-library/src/main/java/org/apache/james/mailboxmanager/util/UidRange.java
(from r656339,
james/server/trunk/core-library/src/main/java/org/apache/james/mailboxmanager/tracking/UidRange.java)
URL:
http://svn.apache.org/viewvc/james/server/trunk/core-library/src/main/java/org/apache/james/mailboxmanager/util/UidRange.java?p2=james/server/trunk/core-library/src/main/java/org/apache/james/mailboxmanager/util/UidRange.java&p1=james/server/trunk/core-library/src/main/java/org/apache/james/mailboxmanager/tracking/UidRange.java&r1=656339&r2=656374&rev=656374&view=diff
==============================================================================
---
james/server/trunk/core-library/src/main/java/org/apache/james/mailboxmanager/tracking/UidRange.java
(original)
+++
james/server/trunk/core-library/src/main/java/org/apache/james/mailboxmanager/util/UidRange.java
Wed May 14 12:24:16 2008
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.mailboxmanager.tracking;
+package org.apache.james.mailboxmanager.util;
public class UidRange implements Comparable {
Copied:
james/server/trunk/core-library/src/main/java/org/apache/james/mailboxmanager/util/UidToMsnConverter.java
(from r656339,
james/server/trunk/core-library/src/main/java/org/apache/james/mailboxmanager/tracking/UidToMsnConverter.java)
URL:
http://svn.apache.org/viewvc/james/server/trunk/core-library/src/main/java/org/apache/james/mailboxmanager/util/UidToMsnConverter.java?p2=james/server/trunk/core-library/src/main/java/org/apache/james/mailboxmanager/util/UidToMsnConverter.java&p1=james/server/trunk/core-library/src/main/java/org/apache/james/mailboxmanager/tracking/UidToMsnConverter.java&r1=656339&r2=656374&rev=656374&view=diff
==============================================================================
---
james/server/trunk/core-library/src/main/java/org/apache/james/mailboxmanager/tracking/UidToMsnConverter.java
(original)
+++
james/server/trunk/core-library/src/main/java/org/apache/james/mailboxmanager/util/UidToMsnConverter.java
Wed May 14 12:24:16 2008
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.mailboxmanager.tracking;
+package org.apache.james.mailboxmanager.util;
import java.util.ArrayList;
import java.util.Collection;
Modified:
james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/base/SelectedMailboxSessionImpl.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/base/SelectedMailboxSessionImpl.java?rev=656374&r1=656373&r2=656374&view=diff
==============================================================================
---
james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/base/SelectedMailboxSessionImpl.java
(original)
+++
james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/base/SelectedMailboxSessionImpl.java
Wed May 14 12:24:16 2008
@@ -42,8 +42,8 @@
import org.apache.james.mailboxmanager.impl.FetchGroupImpl;
import org.apache.james.mailboxmanager.impl.GeneralMessageSetImpl;
import org.apache.james.mailboxmanager.mailbox.Mailbox;
-import org.apache.james.mailboxmanager.tracking.UidToMsnConverter;
import org.apache.james.mailboxmanager.util.MailboxEventAnalyser;
+import org.apache.james.mailboxmanager.util.UidToMsnConverter;
//TODO: deal with deleted or renamed mailboxes
public class SelectedMailboxSessionImpl extends AbstractLogEnabled implements
SelectedImapMailbox {
Modified:
james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/SelectedMailboxSession.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/SelectedMailboxSession.java?rev=656374&r1=656373&r2=656374&view=diff
==============================================================================
---
james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/SelectedMailboxSession.java
(original)
+++
james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/SelectedMailboxSession.java
Wed May 14 12:24:16 2008
@@ -32,8 +32,8 @@
import org.apache.james.mailboxmanager.impl.FetchGroupImpl;
import org.apache.james.mailboxmanager.impl.GeneralMessageSetImpl;
import org.apache.james.mailboxmanager.mailbox.Mailbox;
-import org.apache.james.mailboxmanager.tracking.UidToMsnConverter;
import org.apache.james.mailboxmanager.util.MailboxEventAnalyser;
+import org.apache.james.mailboxmanager.util.UidToMsnConverter;
//TODO: manage mailbox deletion
public class SelectedMailboxSession extends AbstractLogEnabled {
Modified:
james/server/trunk/phoenix-deployment/src/test/org/apache/james/mailboxmanager/impl/UidChangeTrackerTestCase.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/phoenix-deployment/src/test/org/apache/james/mailboxmanager/impl/UidChangeTrackerTestCase.java?rev=656374&r1=656373&r2=656374&view=diff
==============================================================================
---
james/server/trunk/phoenix-deployment/src/test/org/apache/james/mailboxmanager/impl/UidChangeTrackerTestCase.java
(original)
+++
james/server/trunk/phoenix-deployment/src/test/org/apache/james/mailboxmanager/impl/UidChangeTrackerTestCase.java
Wed May 14 12:24:16 2008
@@ -26,8 +26,8 @@
import junit.framework.TestCase;
import org.apache.james.mailboxmanager.MessageResult;
-import org.apache.james.mailboxmanager.tracking.UidChangeTracker;
-import org.apache.james.mailboxmanager.tracking.UidRange;
+import org.apache.james.mailboxmanager.util.UidChangeTracker;
+import org.apache.james.mailboxmanager.util.UidRange;
public class UidChangeTrackerTestCase extends TestCase {
Modified:
james/server/trunk/torque-mailboxmanager-function/src/main/java/org/apache/james/mailboxmanager/torque/TorqueMailbox.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/torque-mailboxmanager-function/src/main/java/org/apache/james/mailboxmanager/torque/TorqueMailbox.java?rev=656374&r1=656373&r2=656374&view=diff
==============================================================================
---
james/server/trunk/torque-mailboxmanager-function/src/main/java/org/apache/james/mailboxmanager/torque/TorqueMailbox.java
(original)
+++
james/server/trunk/torque-mailboxmanager-function/src/main/java/org/apache/james/mailboxmanager/torque/TorqueMailbox.java
Wed May 14 12:24:16 2008
@@ -60,8 +60,8 @@
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.tracking.UidChangeTracker;
-import org.apache.james.mailboxmanager.tracking.UidRange;
+import org.apache.james.mailboxmanager.util.UidChangeTracker;
+import org.apache.james.mailboxmanager.util.UidRange;
import org.apache.torque.NoRowsException;
import org.apache.torque.TooManyRowsException;
import org.apache.torque.TorqueException;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
