Author: norman
Date: Mon Dec 27 16:52:11 2010
New Revision: 1053106
URL: http://svn.apache.org/viewvc?rev=1053106&view=rev
Log:
remove MBean stuff from copier and change the interface to take src and dst
MailboxManager's as parameter
Removed:
james/mailbox/trunk/copier/src/main/java/org/apache/james/mailbox/copier/MailboxCopierManagement.java
james/mailbox/trunk/copier/src/main/java/org/apache/james/mailbox/copier/MailboxCopierManagementMBean.java
Modified:
james/mailbox/trunk/copier/src/main/java/org/apache/james/mailbox/copier/MailboxCopier.java
james/mailbox/trunk/copier/src/main/java/org/apache/james/mailbox/copier/MailboxCopierImpl.java
james/mailbox/trunk/copier/src/test/java/org/apache/james/mailbox/copier/MailboxCopierTest.java
james/mailbox/trunk/pom.xml
Modified:
james/mailbox/trunk/copier/src/main/java/org/apache/james/mailbox/copier/MailboxCopier.java
URL:
http://svn.apache.org/viewvc/james/mailbox/trunk/copier/src/main/java/org/apache/james/mailbox/copier/MailboxCopier.java?rev=1053106&r1=1053105&r2=1053106&view=diff
==============================================================================
---
james/mailbox/trunk/copier/src/main/java/org/apache/james/mailbox/copier/MailboxCopier.java
(original)
+++
james/mailbox/trunk/copier/src/main/java/org/apache/james/mailbox/copier/MailboxCopier.java
Mon Dec 27 16:52:11 2010
@@ -18,6 +18,8 @@
****************************************************************/
package org.apache.james.mailbox.copier;
+import org.apache.james.mailbox.MailboxManager;
+
/**
* Interface that exposes a method aimed to copy all mailboxes from a source
* mailbox manager to a destination mailbox manager.
@@ -30,9 +32,11 @@ public interface MailboxCopier {
* implementation is responsible to read all mailboxes form the injected
* srcMailboxManager and to copy all its contents to the dstMailboxManager.
*
+ * @param src
+ * @param dest
* @return true if copy is completely successful, false if copy fails at
any
* step.
*/
- boolean copyMailboxes();
+ boolean copyMailboxes(MailboxManager src, MailboxManager dest);
}
Modified:
james/mailbox/trunk/copier/src/main/java/org/apache/james/mailbox/copier/MailboxCopierImpl.java
URL:
http://svn.apache.org/viewvc/james/mailbox/trunk/copier/src/main/java/org/apache/james/mailbox/copier/MailboxCopierImpl.java?rev=1053106&r1=1053105&r2=1053106&view=diff
==============================================================================
---
james/mailbox/trunk/copier/src/main/java/org/apache/james/mailbox/copier/MailboxCopierImpl.java
(original)
+++
james/mailbox/trunk/copier/src/main/java/org/apache/james/mailbox/copier/MailboxCopierImpl.java
Mon Dec 27 16:52:11 2010
@@ -48,24 +48,12 @@ public class MailboxCopierImpl implement
*/
private Log log = LogFactory.getLog("org.apache.james.mailbox.copier");
- /**
- * The source MailboxManager from which all mailboxes will be read and
- * copied to the destination MailboxManager.
- */
- private MailboxManager srcMailboxManager;
-
- /**
- * The destination MailboxManager to which all mailboxes read from the
- * source MailboxManager and copied to the destination MailboxManager.
- */
- private MailboxManager dstMailboxManager;
/*
* (non-Javadoc)
- *
- * @see org.apache.james.mailbox.copier.MailboxCopier#copyMailboxes()
+ * @see
org.apache.james.mailbox.copier.MailboxCopier#copyMailboxes(org.apache.james.mailbox.MailboxManager,
org.apache.james.mailbox.MailboxManager)
*/
- public boolean copyMailboxes() {
+ public boolean copyMailboxes(MailboxManager srcMailboxManager,
MailboxManager dstMailboxManager) {
MailboxSession srcMailboxSession;
MailboxSession dstMailboxSession;
@@ -152,28 +140,4 @@ public class MailboxCopierImpl implement
}
- /**
- * Setter to inject the srcMailboxManager.
- *
- * All mailboxes from the srcMailboxManager will be copied to the
- * dstMailboxManager upon copyMaillboxes method call.
- *
- * @param srcMailboxManager
- */
- public void setSrcMailboxManager(MailboxManager srcMailboxManager) {
- this.srcMailboxManager = srcMailboxManager;
- }
-
- /**
- * Setter to inject the dstMailboxManager.
- *
- * All mailboxes from the srcMailboxManager will be copied to the
- * dstMailboxManager upon copyMaillboxes method call.
- *
- * @param dstMailboxManager
- */
- public void setDstMailboxManager(MailboxManager dstMailboxManager) {
- this.dstMailboxManager = dstMailboxManager;
- }
-
}
Modified:
james/mailbox/trunk/copier/src/test/java/org/apache/james/mailbox/copier/MailboxCopierTest.java
URL:
http://svn.apache.org/viewvc/james/mailbox/trunk/copier/src/test/java/org/apache/james/mailbox/copier/MailboxCopierTest.java?rev=1053106&r1=1053105&r2=1053106&view=diff
==============================================================================
---
james/mailbox/trunk/copier/src/test/java/org/apache/james/mailbox/copier/MailboxCopierTest.java
(original)
+++
james/mailbox/trunk/copier/src/test/java/org/apache/james/mailbox/copier/MailboxCopierTest.java
Mon Dec 27 16:52:11 2010
@@ -93,9 +93,6 @@ public class MailboxCopierTest {
srcMemMailboxManager = newInMemoryMailboxManager();
dstMemMailboxManager = newInMemoryMailboxManager();
- mailboxCopier.setSrcMailboxManager(srcMemMailboxManager);
- mailboxCopier.setDstMailboxManager(dstMemMailboxManager);
-
}
/**
@@ -116,7 +113,7 @@ public class MailboxCopierTest {
assertMailboxManagerSize(srcMemMailboxManager);
- mailboxCopier.copyMailboxes();
+ mailboxCopier.copyMailboxes(srcMemMailboxManager,
dstMemMailboxManager);
assertMailboxManagerSize(dstMemMailboxManager);
Modified: james/mailbox/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/james/mailbox/trunk/pom.xml?rev=1053106&r1=1053105&r2=1053106&view=diff
==============================================================================
--- james/mailbox/trunk/pom.xml (original)
+++ james/mailbox/trunk/pom.xml Mon Dec 27 16:52:11 2010
@@ -21,7 +21,7 @@
<parent>
<artifactId>james-server-root</artifactId>
<groupId>org.apache.james</groupId>
- <version>1.6-SNAPSHOT</version>
+ <version>1.5</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.james</groupId>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
