Author: eric
Date: Tue Sep 21 16:22:03 2010
New Revision: 999484
URL: http://svn.apache.org/viewvc?rev=999484&view=rev
Log:
Normalize 2.3 mail store classes to mailrepository package, could be renamed or
merge to mailbox package after (IMAP-1048)
Added:
james/imap/trunk/mailbox/src/main/java/org/apache/james/mailrepository/
james/imap/trunk/mailbox/src/main/java/org/apache/james/mailrepository/MailRepository.java
- copied, changed from r999465,
james/imap/trunk/mailbox/src/main/java/org/apache/james/services/MailRepository.java
james/imap/trunk/mailbox/src/main/java/org/apache/james/mailrepository/MailStore.java
- copied, changed from r999481,
james/imap/trunk/mailbox/src/main/java/org/apache/james/services/store/MailStore.java
james/imap/trunk/store/src/main/java/org/apache/james/mailrepository/AbstractMailStore.java
- copied, changed from r999481,
james/imap/trunk/store/src/main/java/org/apache/james/container/spring/AbstractMailStore.java
Removed:
james/imap/trunk/mailbox/src/main/java/org/apache/james/services/MailRepository.java
james/imap/trunk/store/src/main/java/org/apache/james/container/
Modified:
james/imap/trunk/file/src/main/java/org/apache/james/mailrepository/FileMailRepository.java
james/imap/trunk/file/src/main/java/org/apache/james/mailrepository/MBoxMailRepository.java
james/imap/trunk/file/src/test/java/org/apache/james/mailrepository/FileMailRepositoryTest.java
james/imap/trunk/file/src/test/java/org/apache/james/mailrepository/MBoxMailRepositoryTest.java
james/imap/trunk/jcr/src/main/java/org/apache/james/mailrepository/JCRMailRepository.java
james/imap/trunk/jdbc/src/main/java/org/apache/james/mailrepository/JDBCMailRepository.java
james/imap/trunk/jdbc/src/test/java/org/apache/james/mailrepository/JDBCMailRepositoryTest.java
james/imap/trunk/store/src/main/java/org/apache/james/mailrepository/AbstractMailRepository.java
james/imap/trunk/store/src/test/java/org/apache/james/mailrepository/AbstractMailRepositoryTest.java
Modified:
james/imap/trunk/file/src/main/java/org/apache/james/mailrepository/FileMailRepository.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/file/src/main/java/org/apache/james/mailrepository/FileMailRepository.java?rev=999484&r1=999483&r2=999484&view=diff
==============================================================================
---
james/imap/trunk/file/src/main/java/org/apache/james/mailrepository/FileMailRepository.java
(original)
+++
james/imap/trunk/file/src/main/java/org/apache/james/mailrepository/FileMailRepository.java
Tue Sep 21 16:22:03 2010
@@ -28,7 +28,6 @@ import org.apache.james.core.MimeMessage
import org.apache.james.core.MimeMessageWrapper;
import org.apache.james.repository.ObjectRepository;
import org.apache.james.repository.StreamRepository;
-import org.apache.james.services.store.MailStore;
import org.apache.mailet.Mail;
import javax.annotation.PostConstruct;
@@ -211,7 +210,7 @@ public class FileMailRepository
}
/**
- * @see org.apache.james.services.MailRepository#retrieve(String)
+ * @see org.apache.james.mailrepository.MailRepository#retrieve(String)
*/
public Mail retrieve(String key) throws MessagingException {
if ((DEEP_DEBUG) && (getLogger().isDebugEnabled())) {
@@ -260,7 +259,7 @@ public class FileMailRepository
/**
- * @see org.apache.james.services.MailRepository#list()
+ * @see org.apache.james.mailrepository.MailRepository#list()
*/
public Iterator list() {
// Fix ConcurrentModificationException by cloning
Modified:
james/imap/trunk/file/src/main/java/org/apache/james/mailrepository/MBoxMailRepository.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/file/src/main/java/org/apache/james/mailrepository/MBoxMailRepository.java?rev=999484&r1=999483&r2=999484&view=diff
==============================================================================
---
james/imap/trunk/file/src/main/java/org/apache/james/mailrepository/MBoxMailRepository.java
(original)
+++
james/imap/trunk/file/src/main/java/org/apache/james/mailrepository/MBoxMailRepository.java
Tue Sep 21 16:22:03 2010
@@ -53,7 +53,6 @@ import org.apache.commons.logging.Log;
import org.apache.james.core.MailImpl;
import org.apache.james.lifecycle.Configurable;
import org.apache.james.lifecycle.LogEnabled;
-import org.apache.james.services.MailRepository;
import org.apache.mailet.Mail;
import org.apache.oro.text.regex.MalformedPatternException;
import org.apache.oro.text.regex.Perl5Compiler;
@@ -539,7 +538,7 @@ public class MBoxMailRepository implemen
/**
- * @see org.apache.james.services.MailRepository#store(Mail)
+ * @see org.apache.james.mailrepository.MailRepository#store(Mail)
*/
public void store(Mail mc) {
@@ -588,7 +587,7 @@ public class MBoxMailRepository implemen
/**
- * @see org.apache.james.services.MailRepository#list()
+ * @see org.apache.james.mailrepository.MailRepository#list()
*/
public Iterator<String> list() {
loadKeys();
@@ -615,7 +614,7 @@ public class MBoxMailRepository implemen
}
/**
- * @see org.apache.james.services.MailRepository#retrieve(String)
+ * @see org.apache.james.mailrepository.MailRepository#retrieve(String)
*/
public Mail retrieve(String key) {
@@ -643,7 +642,7 @@ public class MBoxMailRepository implemen
}
/**
- * @see org.apache.james.services.MailRepository#remove(Mail)
+ * @see org.apache.james.mailrepository.MailRepository#remove(Mail)
*/
public void remove(Mail mail) {
ArrayList<Mail> remArray = new ArrayList<Mail>();
@@ -709,7 +708,7 @@ public class MBoxMailRepository implemen
/**
- * @see org.apache.james.services.MailRepository#remove(Collection)
+ * @see org.apache.james.mailrepository.MailRepository#remove(Collection)
*/
public void remove(final Collection<Mail> mails)
{
@@ -792,7 +791,7 @@ public class MBoxMailRepository implemen
}
/**
- * @see org.apache.james.services.MailRepository#remove(String)
+ * @see org.apache.james.mailrepository.MailRepository#remove(String)
*/
public void remove(String key) {
loadKeys();
@@ -810,14 +809,14 @@ public class MBoxMailRepository implemen
}
/**
- * @see org.apache.james.services.MailRepository#lock(String)
+ * @see org.apache.james.mailrepository.MailRepository#lock(String)
*/
public boolean lock(String key) {
return false;
}
/**
- * @see org.apache.james.services.MailRepository#unlock(String)
+ * @see org.apache.james.mailrepository.MailRepository#unlock(String)
*/
public boolean unlock(String key) {
return false;
Modified:
james/imap/trunk/file/src/test/java/org/apache/james/mailrepository/FileMailRepositoryTest.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/file/src/test/java/org/apache/james/mailrepository/FileMailRepositoryTest.java?rev=999484&r1=999483&r2=999484&view=diff
==============================================================================
---
james/imap/trunk/file/src/test/java/org/apache/james/mailrepository/FileMailRepositoryTest.java
(original)
+++
james/imap/trunk/file/src/test/java/org/apache/james/mailrepository/FileMailRepositoryTest.java
Tue Sep 21 16:22:03 2010
@@ -24,7 +24,6 @@ import org.apache.commons.configuration.
import org.apache.commons.logging.impl.SimpleLog;
import org.apache.james.filepair.File_Persistent_Object_Repository;
import org.apache.james.filepair.File_Persistent_Stream_Repository;
-import org.apache.james.services.MailRepository;
import org.apache.james.test.mock.avalon.MockStore;
import org.apache.james.test.mock.james.MockFileSystem;
Modified:
james/imap/trunk/file/src/test/java/org/apache/james/mailrepository/MBoxMailRepositoryTest.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/file/src/test/java/org/apache/james/mailrepository/MBoxMailRepositoryTest.java?rev=999484&r1=999483&r2=999484&view=diff
==============================================================================
---
james/imap/trunk/file/src/test/java/org/apache/james/mailrepository/MBoxMailRepositoryTest.java
(original)
+++
james/imap/trunk/file/src/test/java/org/apache/james/mailrepository/MBoxMailRepositoryTest.java
Tue Sep 21 16:22:03 2010
@@ -27,7 +27,6 @@ import junit.framework.TestCase;
import org.apache.commons.configuration.DefaultConfigurationBuilder;
import org.apache.commons.logging.impl.SimpleLog;
-import org.apache.james.services.MailRepository;
import org.apache.james.test.mock.james.MockFileSystem;
/**
Modified:
james/imap/trunk/jcr/src/main/java/org/apache/james/mailrepository/JCRMailRepository.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/jcr/src/main/java/org/apache/james/mailrepository/JCRMailRepository.java?rev=999484&r1=999483&r2=999484&view=diff
==============================================================================
---
james/imap/trunk/jcr/src/main/java/org/apache/james/mailrepository/JCRMailRepository.java
(original)
+++
james/imap/trunk/jcr/src/main/java/org/apache/james/mailrepository/JCRMailRepository.java
Tue Sep 21 16:22:03 2010
@@ -59,7 +59,6 @@ import org.apache.jackrabbit.commons.cnd
import org.apache.jackrabbit.util.ISO9075;
import org.apache.jackrabbit.util.Text;
import org.apache.james.core.MailImpl;
-import org.apache.james.services.MailRepository;
import org.apache.mailet.Mail;
import org.apache.mailet.MailAddress;
Modified:
james/imap/trunk/jdbc/src/main/java/org/apache/james/mailrepository/JDBCMailRepository.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/jdbc/src/main/java/org/apache/james/mailrepository/JDBCMailRepository.java?rev=999484&r1=999483&r2=999484&view=diff
==============================================================================
---
james/imap/trunk/jdbc/src/main/java/org/apache/james/mailrepository/JDBCMailRepository.java
(original)
+++
james/imap/trunk/jdbc/src/main/java/org/apache/james/mailrepository/JDBCMailRepository.java
Tue Sep 21 16:22:03 2010
@@ -661,7 +661,7 @@ public class JDBCMailRepository
/**
- * @see org.apache.james.services.MailRepository#retrieve(String)
+ * @see org.apache.james.mailrepository.MailRepository#retrieve(String)
*/
public Mail retrieve(String key) throws MessagingException {
if (DEEP_DEBUG) {
@@ -834,7 +834,7 @@ public class JDBCMailRepository
}
/**
- * @see org.apache.james.services.MailRepository#list()
+ * @see org.apache.james.mailrepository.MailRepository#list()
*/
public Iterator list() throws MessagingException {
//System.err.println("listing messages");
Modified:
james/imap/trunk/jdbc/src/test/java/org/apache/james/mailrepository/JDBCMailRepositoryTest.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/jdbc/src/test/java/org/apache/james/mailrepository/JDBCMailRepositoryTest.java?rev=999484&r1=999483&r2=999484&view=diff
==============================================================================
---
james/imap/trunk/jdbc/src/test/java/org/apache/james/mailrepository/JDBCMailRepositoryTest.java
(original)
+++
james/imap/trunk/jdbc/src/test/java/org/apache/james/mailrepository/JDBCMailRepositoryTest.java
Tue Sep 21 16:22:03 2010
@@ -24,7 +24,6 @@ import org.apache.commons.configuration.
import org.apache.commons.logging.impl.SimpleLog;
import org.apache.james.filepair.File_Persistent_Stream_Repository;
import org.apache.james.services.DataSourceSelector;
-import org.apache.james.services.MailRepository;
import org.apache.james.test.mock.avalon.MockStore;
import org.apache.james.test.mock.james.MockFileSystem;
import org.apache.james.test.util.Util;
Copied:
james/imap/trunk/mailbox/src/main/java/org/apache/james/mailrepository/MailRepository.java
(from r999465,
james/imap/trunk/mailbox/src/main/java/org/apache/james/services/MailRepository.java)
URL:
http://svn.apache.org/viewvc/james/imap/trunk/mailbox/src/main/java/org/apache/james/mailrepository/MailRepository.java?p2=james/imap/trunk/mailbox/src/main/java/org/apache/james/mailrepository/MailRepository.java&p1=james/imap/trunk/mailbox/src/main/java/org/apache/james/services/MailRepository.java&r1=999465&r2=999484&rev=999484&view=diff
==============================================================================
---
james/imap/trunk/mailbox/src/main/java/org/apache/james/services/MailRepository.java
(original)
+++
james/imap/trunk/mailbox/src/main/java/org/apache/james/mailrepository/MailRepository.java
Tue Sep 21 16:22:03 2010
@@ -19,7 +19,7 @@
-package org.apache.james.services;
+package org.apache.james.mailrepository;
import org.apache.mailet.Mail;
Copied:
james/imap/trunk/mailbox/src/main/java/org/apache/james/mailrepository/MailStore.java
(from r999481,
james/imap/trunk/mailbox/src/main/java/org/apache/james/services/store/MailStore.java)
URL:
http://svn.apache.org/viewvc/james/imap/trunk/mailbox/src/main/java/org/apache/james/mailrepository/MailStore.java?p2=james/imap/trunk/mailbox/src/main/java/org/apache/james/mailrepository/MailStore.java&p1=james/imap/trunk/mailbox/src/main/java/org/apache/james/services/store/MailStore.java&r1=999481&r2=999484&rev=999484&view=diff
==============================================================================
---
james/imap/trunk/mailbox/src/main/java/org/apache/james/services/store/MailStore.java
(original)
+++
james/imap/trunk/mailbox/src/main/java/org/apache/james/mailrepository/MailStore.java
Tue Sep 21 16:22:03 2010
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.services.store;
+package org.apache.james.mailrepository;
import org.apache.commons.configuration.HierarchicalConfiguration;
Modified:
james/imap/trunk/store/src/main/java/org/apache/james/mailrepository/AbstractMailRepository.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/store/src/main/java/org/apache/james/mailrepository/AbstractMailRepository.java?rev=999484&r1=999483&r2=999484&view=diff
==============================================================================
---
james/imap/trunk/store/src/main/java/org/apache/james/mailrepository/AbstractMailRepository.java
(original)
+++
james/imap/trunk/store/src/main/java/org/apache/james/mailrepository/AbstractMailRepository.java
Tue Sep 21 16:22:03 2010
@@ -26,8 +26,6 @@ import org.apache.commons.configuration.
import org.apache.commons.logging.Log;
import org.apache.james.lifecycle.Configurable;
import org.apache.james.lifecycle.LogEnabled;
-import org.apache.james.services.MailRepository;
-import org.apache.james.services.store.MailStore;
import org.apache.james.util.Lock;
import org.apache.mailet.Mail;
@@ -86,7 +84,7 @@ public abstract class AbstractMailReposi
}
/**
- * @see org.apache.james.services.MailRepository#unlock(String)
+ * @see org.apache.james.mailrepository.MailRepository#unlock(String)
*/
public boolean unlock(String key) {
if (lock.unlock(key)) {
@@ -108,7 +106,7 @@ public abstract class AbstractMailReposi
}
/**
- * @see org.apache.james.services.MailRepository#lock(String)
+ * @see org.apache.james.mailrepository.MailRepository#lock(String)
*/
public boolean lock(String key) {
if (lock.lock(key)) {
@@ -131,7 +129,7 @@ public abstract class AbstractMailReposi
/**
- * @see org.apache.james.services.MailRepository#store(Mail)
+ * @see org.apache.james.mailrepository.MailRepository#store(Mail)
*/
public void store(Mail mc) throws MessagingException {
boolean wasLocked = true;
@@ -178,7 +176,7 @@ public abstract class AbstractMailReposi
/**
- * @see org.apache.james.services.MailRepository#remove(Mail)
+ * @see org.apache.james.mailrepository.MailRepository#remove(Mail)
*/
public void remove(Mail mail) throws MessagingException {
remove(mail.getName());
@@ -186,7 +184,7 @@ public abstract class AbstractMailReposi
/**
- * @see org.apache.james.services.MailRepository#remove(Collection)
+ * @see org.apache.james.mailrepository.MailRepository#remove(Collection)
*/
public void remove(Collection<Mail> mails) throws MessagingException {
Iterator<Mail>delList = mails.iterator();
@@ -196,7 +194,7 @@ public abstract class AbstractMailReposi
}
/**
- * @see org.apache.james.services.MailRepository#remove(String)
+ * @see org.apache.james.mailrepository.MailRepository#remove(String)
*/
public void remove(String key) throws MessagingException {
if (lock(key)) {
Copied:
james/imap/trunk/store/src/main/java/org/apache/james/mailrepository/AbstractMailStore.java
(from r999481,
james/imap/trunk/store/src/main/java/org/apache/james/container/spring/AbstractMailStore.java)
URL:
http://svn.apache.org/viewvc/james/imap/trunk/store/src/main/java/org/apache/james/mailrepository/AbstractMailStore.java?p2=james/imap/trunk/store/src/main/java/org/apache/james/mailrepository/AbstractMailStore.java&p1=james/imap/trunk/store/src/main/java/org/apache/james/container/spring/AbstractMailStore.java&r1=999481&r2=999484&rev=999484&view=diff
==============================================================================
---
james/imap/trunk/store/src/main/java/org/apache/james/container/spring/AbstractMailStore.java
(original)
+++
james/imap/trunk/store/src/main/java/org/apache/james/mailrepository/AbstractMailStore.java
Tue Sep 21 16:22:03 2010
@@ -19,7 +19,7 @@
-package org.apache.james.container.spring;
+package org.apache.james.mailrepository;
import java.util.HashMap;
import java.util.List;
@@ -34,7 +34,7 @@ import org.apache.commons.configuration.
import org.apache.commons.logging.Log;
import org.apache.james.lifecycle.Configurable;
import org.apache.james.lifecycle.LogEnabled;
-import org.apache.james.services.store.MailStore;
+import org.apache.james.mailrepository.MailStore;
/**
* Provides a registry of mail repositories. A mail repository is uniquely
Modified:
james/imap/trunk/store/src/test/java/org/apache/james/mailrepository/AbstractMailRepositoryTest.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/store/src/test/java/org/apache/james/mailrepository/AbstractMailRepositoryTest.java?rev=999484&r1=999483&r2=999484&view=diff
==============================================================================
---
james/imap/trunk/store/src/test/java/org/apache/james/mailrepository/AbstractMailRepositoryTest.java
(original)
+++
james/imap/trunk/store/src/test/java/org/apache/james/mailrepository/AbstractMailRepositoryTest.java
Tue Sep 21 16:22:03 2010
@@ -23,7 +23,6 @@ import org.apache.james.core.MailImpl;
import org.apache.james.core.MimeMessageCopyOnWriteProxy;
import org.apache.james.core.MimeMessageInputStreamSource;
import org.apache.james.lifecycle.LifecycleUtil;
-import org.apache.james.services.MailRepository;
import org.apache.mailet.Mail;
import org.apache.mailet.MailAddress;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
