Author: eric
Date: Thu Oct 21 08:00:07 2010
New Revision: 1025872
URL: http://svn.apache.org/viewvc?rev=1025872&view=rev
Log:
Align packages hierarchy for mail service (JAMES-1074)
Added:
james/server/trunk/mail-api/src/main/java/org/apache/james/mailrepository/api/
james/server/trunk/mail-api/src/main/java/org/apache/james/mailrepository/api/MailRepository.java
- copied, changed from r1025861,
james/server/trunk/mail-api/src/main/java/org/apache/james/mailrepository/MailRepository.java
james/server/trunk/mail-api/src/main/java/org/apache/james/mailstore/api/
james/server/trunk/mail-api/src/main/java/org/apache/james/mailstore/api/MailStore.java
- copied, changed from r1025861,
james/server/trunk/mail-api/src/main/java/org/apache/james/mailstore/MailStore.java
james/server/trunk/mail-file/src/main/java/org/apache/james/mailrepository/file/
james/server/trunk/mail-file/src/main/java/org/apache/james/mailrepository/file/FileMailRepository.java
- copied, changed from r1025861,
james/server/trunk/mail-file/src/main/java/org/apache/james/mailrepository/FileMailRepository.java
james/server/trunk/mail-file/src/main/java/org/apache/james/mailrepository/file/MBoxMailRepository.java
- copied, changed from r1025861,
james/server/trunk/mail-file/src/main/java/org/apache/james/mailrepository/MBoxMailRepository.java
james/server/trunk/mail-file/src/main/java/org/apache/james/mailrepository/file/MimeMessageAvalonSource.java
- copied, changed from r1025861,
james/server/trunk/mail-file/src/main/java/org/apache/james/mailrepository/MimeMessageAvalonSource.java
james/server/trunk/mail-jcr/src/main/java/org/apache/james/mailrepository/jcr/
james/server/trunk/mail-jcr/src/main/java/org/apache/james/mailrepository/jcr/JCRMailRepository.java
- copied, changed from r1025861,
james/server/trunk/mail-jcr/src/main/java/org/apache/james/mailrepository/JCRMailRepository.java
james/server/trunk/mail-jdbc/src/main/java/org/apache/james/mailrepository/jdbc/
james/server/trunk/mail-jdbc/src/main/java/org/apache/james/mailrepository/jdbc/JDBCMailRepository.java
- copied, changed from r1025861,
james/server/trunk/mail-jdbc/src/main/java/org/apache/james/mailrepository/JDBCMailRepository.java
james/server/trunk/mail-jdbc/src/main/java/org/apache/james/mailrepository/jdbc/MessageInputStream.java
- copied, changed from r1025861,
james/server/trunk/mail-jdbc/src/main/java/org/apache/james/mailrepository/MessageInputStream.java
james/server/trunk/mail-jdbc/src/main/java/org/apache/james/mailrepository/jdbc/MimeMessageJDBCSource.java
- copied, changed from r1025861,
james/server/trunk/mail-jdbc/src/main/java/org/apache/james/mailrepository/MimeMessageJDBCSource.java
james/server/trunk/mail-jdbc/src/test/java/org/apache/james/mailrepository/jdbc/
james/server/trunk/mail-jdbc/src/test/java/org/apache/james/mailrepository/jdbc/JDBCDBFileMailRepositoryTest.java
- copied, changed from r1025861,
james/server/trunk/mail-jdbc/src/test/java/org/apache/james/mailrepository/JDBCDBFileMailRepositoryTest.java
james/server/trunk/mail-jdbc/src/test/java/org/apache/james/mailrepository/jdbc/JDBCMailRepositoryTest.java
- copied, changed from r1025861,
james/server/trunk/mail-jdbc/src/test/java/org/apache/james/mailrepository/JDBCMailRepositoryTest.java
Removed:
james/server/trunk/mail-api/src/main/java/org/apache/james/mailrepository/MailRepository.java
james/server/trunk/mail-api/src/main/java/org/apache/james/mailstore/MailStore.java
james/server/trunk/mail-file/src/main/java/org/apache/james/mailrepository/FileMailRepository.java
james/server/trunk/mail-file/src/main/java/org/apache/james/mailrepository/MBoxMailRepository.java
james/server/trunk/mail-file/src/main/java/org/apache/james/mailrepository/MimeMessageAvalonSource.java
james/server/trunk/mail-jcr/src/main/java/org/apache/james/mailrepository/JCRMailRepository.java
james/server/trunk/mail-jdbc/src/main/java/org/apache/james/mailrepository/JDBCMailRepository.java
james/server/trunk/mail-jdbc/src/main/java/org/apache/james/mailrepository/MessageInputStream.java
james/server/trunk/mail-jdbc/src/main/java/org/apache/james/mailrepository/MimeMessageJDBCSource.java
james/server/trunk/mail-jdbc/src/test/java/org/apache/james/mailrepository/JDBCDBFileMailRepositoryTest.java
james/server/trunk/mail-jdbc/src/test/java/org/apache/james/mailrepository/JDBCMailRepositoryTest.java
Modified:
james/server/trunk/mail-file/src/test/java/org/apache/james/mailrepository/FileMailRepositoryTest.java
james/server/trunk/mail-file/src/test/java/org/apache/james/mailrepository/MBoxMailRepositoryTest.java
james/server/trunk/mail-library/src/main/java/org/apache/james/mailrepository/AbstractMailRepository.java
james/server/trunk/mail-library/src/main/java/org/apache/james/mailstore/JamesMailStore.java
james/server/trunk/mail-library/src/test/java/org/apache/james/mailrepository/AbstractMailRepositoryTest.java
james/server/trunk/mail-library/src/test/java/org/apache/james/mailstore/MockMailStore.java
james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/FromRepository.java
james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/ToMultiRepository.java
james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/ToRepository.java
james/server/trunk/spring-deployment/src/main/config/james/mailstore.xml
james/server/trunk/user-file/src/main/java/org/apache/james/userrepository/UsersFileRepository.java
Copied:
james/server/trunk/mail-api/src/main/java/org/apache/james/mailrepository/api/MailRepository.java
(from r1025861,
james/server/trunk/mail-api/src/main/java/org/apache/james/mailrepository/MailRepository.java)
URL:
http://svn.apache.org/viewvc/james/server/trunk/mail-api/src/main/java/org/apache/james/mailrepository/api/MailRepository.java?p2=james/server/trunk/mail-api/src/main/java/org/apache/james/mailrepository/api/MailRepository.java&p1=james/server/trunk/mail-api/src/main/java/org/apache/james/mailrepository/MailRepository.java&r1=1025861&r2=1025872&rev=1025872&view=diff
==============================================================================
---
james/server/trunk/mail-api/src/main/java/org/apache/james/mailrepository/MailRepository.java
(original)
+++
james/server/trunk/mail-api/src/main/java/org/apache/james/mailrepository/api/MailRepository.java
Thu Oct 21 08:00:07 2010
@@ -19,7 +19,7 @@
-package org.apache.james.mailrepository;
+package org.apache.james.mailrepository.api;
import org.apache.mailet.Mail;
Copied:
james/server/trunk/mail-api/src/main/java/org/apache/james/mailstore/api/MailStore.java
(from r1025861,
james/server/trunk/mail-api/src/main/java/org/apache/james/mailstore/MailStore.java)
URL:
http://svn.apache.org/viewvc/james/server/trunk/mail-api/src/main/java/org/apache/james/mailstore/api/MailStore.java?p2=james/server/trunk/mail-api/src/main/java/org/apache/james/mailstore/api/MailStore.java&p1=james/server/trunk/mail-api/src/main/java/org/apache/james/mailstore/MailStore.java&r1=1025861&r2=1025872&rev=1025872&view=diff
==============================================================================
---
james/server/trunk/mail-api/src/main/java/org/apache/james/mailstore/MailStore.java
(original)
+++
james/server/trunk/mail-api/src/main/java/org/apache/james/mailstore/api/MailStore.java
Thu Oct 21 08:00:07 2010
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.mailstore;
+package org.apache.james.mailstore.api;
import org.apache.commons.configuration.HierarchicalConfiguration;
Copied:
james/server/trunk/mail-file/src/main/java/org/apache/james/mailrepository/file/FileMailRepository.java
(from r1025861,
james/server/trunk/mail-file/src/main/java/org/apache/james/mailrepository/FileMailRepository.java)
URL:
http://svn.apache.org/viewvc/james/server/trunk/mail-file/src/main/java/org/apache/james/mailrepository/file/FileMailRepository.java?p2=james/server/trunk/mail-file/src/main/java/org/apache/james/mailrepository/file/FileMailRepository.java&p1=james/server/trunk/mail-file/src/main/java/org/apache/james/mailrepository/FileMailRepository.java&r1=1025861&r2=1025872&rev=1025872&view=diff
==============================================================================
---
james/server/trunk/mail-file/src/main/java/org/apache/james/mailrepository/FileMailRepository.java
(original)
+++
james/server/trunk/mail-file/src/main/java/org/apache/james/mailrepository/file/FileMailRepository.java
Thu Oct 21 08:00:07 2010
@@ -19,14 +19,15 @@
-package org.apache.james.mailrepository;
+package org.apache.james.mailrepository.file;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.DefaultConfigurationBuilder;
import org.apache.commons.configuration.HierarchicalConfiguration;
import org.apache.james.core.MimeMessageCopyOnWriteProxy;
import org.apache.james.core.MimeMessageWrapper;
-import org.apache.james.mailstore.MailStore;
+import org.apache.james.mailrepository.AbstractMailRepository;
+import org.apache.james.mailstore.api.MailStore;
import org.apache.james.repository.ObjectRepository;
import org.apache.james.repository.StreamRepository;
import org.apache.mailet.Mail;
@@ -211,7 +212,7 @@ public class FileMailRepository
}
/**
- * @see org.apache.james.mailrepository.MailRepository#retrieve(String)
+ * @see org.apache.james.mailrepository.api.MailRepository#retrieve(String)
*/
public Mail retrieve(String key) throws MessagingException {
if ((DEEP_DEBUG) && (getLogger().isDebugEnabled())) {
@@ -260,7 +261,7 @@ public class FileMailRepository
/**
- * @see org.apache.james.mailrepository.MailRepository#list()
+ * @see org.apache.james.mailrepository.api.MailRepository#list()
*/
public Iterator list() {
// Fix ConcurrentModificationException by cloning
Copied:
james/server/trunk/mail-file/src/main/java/org/apache/james/mailrepository/file/MBoxMailRepository.java
(from r1025861,
james/server/trunk/mail-file/src/main/java/org/apache/james/mailrepository/MBoxMailRepository.java)
URL:
http://svn.apache.org/viewvc/james/server/trunk/mail-file/src/main/java/org/apache/james/mailrepository/file/MBoxMailRepository.java?p2=james/server/trunk/mail-file/src/main/java/org/apache/james/mailrepository/file/MBoxMailRepository.java&p1=james/server/trunk/mail-file/src/main/java/org/apache/james/mailrepository/MBoxMailRepository.java&r1=1025861&r2=1025872&rev=1025872&view=diff
==============================================================================
---
james/server/trunk/mail-file/src/main/java/org/apache/james/mailrepository/MBoxMailRepository.java
(original)
+++
james/server/trunk/mail-file/src/main/java/org/apache/james/mailrepository/file/MBoxMailRepository.java
Thu Oct 21 08:00:07 2010
@@ -45,7 +45,7 @@
*
*/
-package org.apache.james.mailrepository;
+package org.apache.james.mailrepository.file;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.HierarchicalConfiguration;
@@ -53,6 +53,7 @@ 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.mailrepository.api.MailRepository;
import org.apache.mailet.Mail;
import org.apache.oro.text.regex.MalformedPatternException;
import org.apache.oro.text.regex.Perl5Compiler;
@@ -538,7 +539,7 @@ public class MBoxMailRepository implemen
/**
- * @see org.apache.james.mailrepository.MailRepository#store(Mail)
+ * @see org.apache.james.mailrepository.api.MailRepository#store(Mail)
*/
public void store(Mail mc) {
@@ -587,7 +588,7 @@ public class MBoxMailRepository implemen
/**
- * @see org.apache.james.mailrepository.MailRepository#list()
+ * @see org.apache.james.mailrepository.api.MailRepository#list()
*/
public Iterator<String> list() {
loadKeys();
@@ -614,7 +615,7 @@ public class MBoxMailRepository implemen
}
/**
- * @see org.apache.james.mailrepository.MailRepository#retrieve(String)
+ * @see org.apache.james.mailrepository.api.MailRepository#retrieve(String)
*/
public Mail retrieve(String key) {
@@ -642,7 +643,7 @@ public class MBoxMailRepository implemen
}
/**
- * @see org.apache.james.mailrepository.MailRepository#remove(Mail)
+ * @see org.apache.james.mailrepository.api.MailRepository#remove(Mail)
*/
public void remove(Mail mail) {
ArrayList<Mail> remArray = new ArrayList<Mail>();
@@ -708,7 +709,7 @@ public class MBoxMailRepository implemen
/**
- * @see org.apache.james.mailrepository.MailRepository#remove(Collection)
+ * @see
org.apache.james.mailrepository.api.MailRepository#remove(Collection)
*/
public void remove(final Collection<Mail> mails)
{
@@ -791,7 +792,7 @@ public class MBoxMailRepository implemen
}
/**
- * @see org.apache.james.mailrepository.MailRepository#remove(String)
+ * @see org.apache.james.mailrepository.api.MailRepository#remove(String)
*/
public void remove(String key) {
loadKeys();
@@ -809,14 +810,14 @@ public class MBoxMailRepository implemen
}
/**
- * @see org.apache.james.mailrepository.MailRepository#lock(String)
+ * @see org.apache.james.mailrepository.api.MailRepository#lock(String)
*/
public boolean lock(String key) {
return false;
}
/**
- * @see org.apache.james.mailrepository.MailRepository#unlock(String)
+ * @see org.apache.james.mailrepository.api.MailRepository#unlock(String)
*/
public boolean unlock(String key) {
return false;
Copied:
james/server/trunk/mail-file/src/main/java/org/apache/james/mailrepository/file/MimeMessageAvalonSource.java
(from r1025861,
james/server/trunk/mail-file/src/main/java/org/apache/james/mailrepository/MimeMessageAvalonSource.java)
URL:
http://svn.apache.org/viewvc/james/server/trunk/mail-file/src/main/java/org/apache/james/mailrepository/file/MimeMessageAvalonSource.java?p2=james/server/trunk/mail-file/src/main/java/org/apache/james/mailrepository/file/MimeMessageAvalonSource.java&p1=james/server/trunk/mail-file/src/main/java/org/apache/james/mailrepository/MimeMessageAvalonSource.java&r1=1025861&r2=1025872&rev=1025872&view=diff
==============================================================================
---
james/server/trunk/mail-file/src/main/java/org/apache/james/mailrepository/MimeMessageAvalonSource.java
(original)
+++
james/server/trunk/mail-file/src/main/java/org/apache/james/mailrepository/file/MimeMessageAvalonSource.java
Thu Oct 21 08:00:07 2010
@@ -19,7 +19,7 @@
-package org.apache.james.mailrepository;
+package org.apache.james.mailrepository.file;
import org.apache.james.core.MimeMessageSource;
import org.apache.james.repository.StreamRepository;
Modified:
james/server/trunk/mail-file/src/test/java/org/apache/james/mailrepository/FileMailRepositoryTest.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/mail-file/src/test/java/org/apache/james/mailrepository/FileMailRepositoryTest.java?rev=1025872&r1=1025871&r2=1025872&view=diff
==============================================================================
---
james/server/trunk/mail-file/src/test/java/org/apache/james/mailrepository/FileMailRepositoryTest.java
(original)
+++
james/server/trunk/mail-file/src/test/java/org/apache/james/mailrepository/FileMailRepositoryTest.java
Thu Oct 21 08:00:07 2010
@@ -24,6 +24,8 @@ import org.apache.commons.configuration.
import org.apache.commons.logging.impl.SimpleLog;
import org.apache.james.filepair.FilePersistentObjectRepository;
import org.apache.james.filepair.FilePersistentStreamRepository;
+import org.apache.james.mailrepository.api.MailRepository;
+import org.apache.james.mailrepository.file.FileMailRepository;
import org.apache.james.mailstore.MockMailStore;
import org.apache.james.services.MockFileSystem;
Modified:
james/server/trunk/mail-file/src/test/java/org/apache/james/mailrepository/MBoxMailRepositoryTest.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/mail-file/src/test/java/org/apache/james/mailrepository/MBoxMailRepositoryTest.java?rev=1025872&r1=1025871&r2=1025872&view=diff
==============================================================================
---
james/server/trunk/mail-file/src/test/java/org/apache/james/mailrepository/MBoxMailRepositoryTest.java
(original)
+++
james/server/trunk/mail-file/src/test/java/org/apache/james/mailrepository/MBoxMailRepositoryTest.java
Thu Oct 21 08:00:07 2010
@@ -27,6 +27,8 @@ import junit.framework.TestCase;
import org.apache.commons.configuration.DefaultConfigurationBuilder;
import org.apache.commons.logging.impl.SimpleLog;
+import org.apache.james.mailrepository.api.MailRepository;
+import org.apache.james.mailrepository.file.MBoxMailRepository;
import org.apache.james.services.MockFileSystem;
/**
Copied:
james/server/trunk/mail-jcr/src/main/java/org/apache/james/mailrepository/jcr/JCRMailRepository.java
(from r1025861,
james/server/trunk/mail-jcr/src/main/java/org/apache/james/mailrepository/JCRMailRepository.java)
URL:
http://svn.apache.org/viewvc/james/server/trunk/mail-jcr/src/main/java/org/apache/james/mailrepository/jcr/JCRMailRepository.java?p2=james/server/trunk/mail-jcr/src/main/java/org/apache/james/mailrepository/jcr/JCRMailRepository.java&p1=james/server/trunk/mail-jcr/src/main/java/org/apache/james/mailrepository/JCRMailRepository.java&r1=1025861&r2=1025872&rev=1025872&view=diff
==============================================================================
---
james/server/trunk/mail-jcr/src/main/java/org/apache/james/mailrepository/JCRMailRepository.java
(original)
+++
james/server/trunk/mail-jcr/src/main/java/org/apache/james/mailrepository/jcr/JCRMailRepository.java
Thu Oct 21 08:00:07 2010
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.james.mailrepository;
+package org.apache.james.mailrepository.jcr;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -59,6 +59,8 @@ 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.mailrepository.AbstractMailRepository;
+import org.apache.james.mailrepository.api.MailRepository;
import org.apache.mailet.Mail;
import org.apache.mailet.MailAddress;
Copied:
james/server/trunk/mail-jdbc/src/main/java/org/apache/james/mailrepository/jdbc/JDBCMailRepository.java
(from r1025861,
james/server/trunk/mail-jdbc/src/main/java/org/apache/james/mailrepository/JDBCMailRepository.java)
URL:
http://svn.apache.org/viewvc/james/server/trunk/mail-jdbc/src/main/java/org/apache/james/mailrepository/jdbc/JDBCMailRepository.java?p2=james/server/trunk/mail-jdbc/src/main/java/org/apache/james/mailrepository/jdbc/JDBCMailRepository.java&p1=james/server/trunk/mail-jdbc/src/main/java/org/apache/james/mailrepository/JDBCMailRepository.java&r1=1025861&r2=1025872&rev=1025872&view=diff
==============================================================================
---
james/server/trunk/mail-jdbc/src/main/java/org/apache/james/mailrepository/JDBCMailRepository.java
(original)
+++
james/server/trunk/mail-jdbc/src/main/java/org/apache/james/mailrepository/jdbc/JDBCMailRepository.java
Thu Oct 21 08:00:07 2010
@@ -19,7 +19,7 @@
-package org.apache.james.mailrepository;
+package org.apache.james.mailrepository.jdbc;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.DefaultConfigurationBuilder;
@@ -27,6 +27,7 @@ import org.apache.commons.configuration.
import org.apache.james.core.MailImpl;
import org.apache.james.core.MimeMessageCopyOnWriteProxy;
import org.apache.james.core.MimeMessageWrapper;
+import org.apache.james.mailrepository.AbstractMailRepository;
import org.apache.james.repository.StreamRepository;
import org.apache.james.services.FileSystem;
import org.apache.james.util.sql.JDBCUtil;
@@ -655,7 +656,7 @@ public class JDBCMailRepository
/**
- * @see org.apache.james.mailrepository.MailRepository#retrieve(String)
+ * @see org.apache.james.mailrepository.api.MailRepository#retrieve(String)
*/
public Mail retrieve(String key) throws MessagingException {
if (DEEP_DEBUG) {
@@ -828,7 +829,7 @@ public class JDBCMailRepository
}
/**
- * @see org.apache.james.mailrepository.MailRepository#list()
+ * @see org.apache.james.mailrepository.api.MailRepository#list()
*/
public Iterator list() throws MessagingException {
//System.err.println("listing messages");
Copied:
james/server/trunk/mail-jdbc/src/main/java/org/apache/james/mailrepository/jdbc/MessageInputStream.java
(from r1025861,
james/server/trunk/mail-jdbc/src/main/java/org/apache/james/mailrepository/MessageInputStream.java)
URL:
http://svn.apache.org/viewvc/james/server/trunk/mail-jdbc/src/main/java/org/apache/james/mailrepository/jdbc/MessageInputStream.java?p2=james/server/trunk/mail-jdbc/src/main/java/org/apache/james/mailrepository/jdbc/MessageInputStream.java&p1=james/server/trunk/mail-jdbc/src/main/java/org/apache/james/mailrepository/MessageInputStream.java&r1=1025861&r2=1025872&rev=1025872&view=diff
==============================================================================
---
james/server/trunk/mail-jdbc/src/main/java/org/apache/james/mailrepository/MessageInputStream.java
(original)
+++
james/server/trunk/mail-jdbc/src/main/java/org/apache/james/mailrepository/jdbc/MessageInputStream.java
Thu Oct 21 08:00:07 2010
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.mailrepository;
+package org.apache.james.mailrepository.jdbc;
import org.apache.james.core.MimeMessageUtil;
import org.apache.james.repository.StreamRepository;
Copied:
james/server/trunk/mail-jdbc/src/main/java/org/apache/james/mailrepository/jdbc/MimeMessageJDBCSource.java
(from r1025861,
james/server/trunk/mail-jdbc/src/main/java/org/apache/james/mailrepository/MimeMessageJDBCSource.java)
URL:
http://svn.apache.org/viewvc/james/server/trunk/mail-jdbc/src/main/java/org/apache/james/mailrepository/jdbc/MimeMessageJDBCSource.java?p2=james/server/trunk/mail-jdbc/src/main/java/org/apache/james/mailrepository/jdbc/MimeMessageJDBCSource.java&p1=james/server/trunk/mail-jdbc/src/main/java/org/apache/james/mailrepository/MimeMessageJDBCSource.java&r1=1025861&r2=1025872&rev=1025872&view=diff
==============================================================================
---
james/server/trunk/mail-jdbc/src/main/java/org/apache/james/mailrepository/MimeMessageJDBCSource.java
(original)
+++
james/server/trunk/mail-jdbc/src/main/java/org/apache/james/mailrepository/jdbc/MimeMessageJDBCSource.java
Thu Oct 21 08:00:07 2010
@@ -19,7 +19,7 @@
-package org.apache.james.mailrepository;
+package org.apache.james.mailrepository.jdbc;
import org.apache.james.core.MimeMessageSource;
import org.apache.james.repository.StreamRepository;
Copied:
james/server/trunk/mail-jdbc/src/test/java/org/apache/james/mailrepository/jdbc/JDBCDBFileMailRepositoryTest.java
(from r1025861,
james/server/trunk/mail-jdbc/src/test/java/org/apache/james/mailrepository/JDBCDBFileMailRepositoryTest.java)
URL:
http://svn.apache.org/viewvc/james/server/trunk/mail-jdbc/src/test/java/org/apache/james/mailrepository/jdbc/JDBCDBFileMailRepositoryTest.java?p2=james/server/trunk/mail-jdbc/src/test/java/org/apache/james/mailrepository/jdbc/JDBCDBFileMailRepositoryTest.java&p1=james/server/trunk/mail-jdbc/src/test/java/org/apache/james/mailrepository/JDBCDBFileMailRepositoryTest.java&r1=1025861&r2=1025872&rev=1025872&view=diff
==============================================================================
---
james/server/trunk/mail-jdbc/src/test/java/org/apache/james/mailrepository/JDBCDBFileMailRepositoryTest.java
(original)
+++
james/server/trunk/mail-jdbc/src/test/java/org/apache/james/mailrepository/jdbc/JDBCDBFileMailRepositoryTest.java
Thu Oct 21 08:00:07 2010
@@ -18,7 +18,7 @@
****************************************************************/
-package org.apache.james.mailrepository;
+package org.apache.james.mailrepository.jdbc;
public class JDBCDBFileMailRepositoryTest extends JDBCMailRepositoryTest {
Copied:
james/server/trunk/mail-jdbc/src/test/java/org/apache/james/mailrepository/jdbc/JDBCMailRepositoryTest.java
(from r1025861,
james/server/trunk/mail-jdbc/src/test/java/org/apache/james/mailrepository/JDBCMailRepositoryTest.java)
URL:
http://svn.apache.org/viewvc/james/server/trunk/mail-jdbc/src/test/java/org/apache/james/mailrepository/jdbc/JDBCMailRepositoryTest.java?p2=james/server/trunk/mail-jdbc/src/test/java/org/apache/james/mailrepository/jdbc/JDBCMailRepositoryTest.java&p1=james/server/trunk/mail-jdbc/src/test/java/org/apache/james/mailrepository/JDBCMailRepositoryTest.java&r1=1025861&r2=1025872&rev=1025872&view=diff
==============================================================================
---
james/server/trunk/mail-jdbc/src/test/java/org/apache/james/mailrepository/JDBCMailRepositoryTest.java
(original)
+++
james/server/trunk/mail-jdbc/src/test/java/org/apache/james/mailrepository/jdbc/JDBCMailRepositoryTest.java
Thu Oct 21 08:00:07 2010
@@ -18,13 +18,16 @@
****************************************************************/
-package org.apache.james.mailrepository;
+package org.apache.james.mailrepository.jdbc;
import javax.sql.DataSource;
import org.apache.commons.configuration.DefaultConfigurationBuilder;
import org.apache.commons.logging.impl.SimpleLog;
import org.apache.james.filepair.FilePersistentStreamRepository;
+import org.apache.james.mailrepository.AbstractMailRepositoryTest;
+import org.apache.james.mailrepository.api.MailRepository;
+import org.apache.james.mailrepository.jdbc.JDBCMailRepository;
import org.apache.james.mailstore.MockMailStore;
import org.apache.james.services.MockFileSystem;
import org.apache.james.util.TestUtil;
Modified:
james/server/trunk/mail-library/src/main/java/org/apache/james/mailrepository/AbstractMailRepository.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/mail-library/src/main/java/org/apache/james/mailrepository/AbstractMailRepository.java?rev=1025872&r1=1025871&r2=1025872&view=diff
==============================================================================
---
james/server/trunk/mail-library/src/main/java/org/apache/james/mailrepository/AbstractMailRepository.java
(original)
+++
james/server/trunk/mail-library/src/main/java/org/apache/james/mailrepository/AbstractMailRepository.java
Thu Oct 21 08:00:07 2010
@@ -26,7 +26,8 @@ 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.mailstore.MailStore;
+import org.apache.james.mailrepository.api.MailRepository;
+import org.apache.james.mailstore.api.MailStore;
import org.apache.james.util.Lock;
import org.apache.mailet.Mail;
@@ -85,7 +86,7 @@ public abstract class AbstractMailReposi
}
/**
- * @see org.apache.james.mailrepository.MailRepository#unlock(String)
+ * @see org.apache.james.mailrepository.api.MailRepository#unlock(String)
*/
public boolean unlock(String key) {
if (lock.unlock(key)) {
@@ -107,7 +108,7 @@ public abstract class AbstractMailReposi
}
/**
- * @see org.apache.james.mailrepository.MailRepository#lock(String)
+ * @see org.apache.james.mailrepository.api.MailRepository#lock(String)
*/
public boolean lock(String key) {
if (lock.lock(key)) {
@@ -130,7 +131,7 @@ public abstract class AbstractMailReposi
/**
- * @see org.apache.james.mailrepository.MailRepository#store(Mail)
+ * @see org.apache.james.mailrepository.api.MailRepository#store(Mail)
*/
public void store(Mail mc) throws MessagingException {
boolean wasLocked = true;
@@ -177,7 +178,7 @@ public abstract class AbstractMailReposi
/**
- * @see org.apache.james.mailrepository.MailRepository#remove(Mail)
+ * @see org.apache.james.mailrepository.api.MailRepository#remove(Mail)
*/
public void remove(Mail mail) throws MessagingException {
remove(mail.getName());
@@ -185,7 +186,7 @@ public abstract class AbstractMailReposi
/**
- * @see org.apache.james.mailrepository.MailRepository#remove(Collection)
+ * @see
org.apache.james.mailrepository.api.MailRepository#remove(Collection)
*/
public void remove(Collection<Mail> mails) throws MessagingException {
Iterator<Mail>delList = mails.iterator();
@@ -195,7 +196,7 @@ public abstract class AbstractMailReposi
}
/**
- * @see org.apache.james.mailrepository.MailRepository#remove(String)
+ * @see org.apache.james.mailrepository.api.MailRepository#remove(String)
*/
public void remove(String key) throws MessagingException {
if (lock(key)) {
Modified:
james/server/trunk/mail-library/src/main/java/org/apache/james/mailstore/JamesMailStore.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/mail-library/src/main/java/org/apache/james/mailstore/JamesMailStore.java?rev=1025872&r1=1025871&r2=1025872&view=diff
==============================================================================
---
james/server/trunk/mail-library/src/main/java/org/apache/james/mailstore/JamesMailStore.java
(original)
+++
james/server/trunk/mail-library/src/main/java/org/apache/james/mailstore/JamesMailStore.java
Thu Oct 21 08:00:07 2010
@@ -35,7 +35,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.mailstore.MailStore;
+import org.apache.james.mailstore.api.MailStore;
import org.apache.james.services.InstanceFactory;
/**
Modified:
james/server/trunk/mail-library/src/test/java/org/apache/james/mailrepository/AbstractMailRepositoryTest.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/mail-library/src/test/java/org/apache/james/mailrepository/AbstractMailRepositoryTest.java?rev=1025872&r1=1025871&r2=1025872&view=diff
==============================================================================
---
james/server/trunk/mail-library/src/test/java/org/apache/james/mailrepository/AbstractMailRepositoryTest.java
(original)
+++
james/server/trunk/mail-library/src/test/java/org/apache/james/mailrepository/AbstractMailRepositoryTest.java
Thu Oct 21 08:00:07 2010
@@ -23,6 +23,7 @@ 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.mailrepository.api.MailRepository;
import org.apache.mailet.Mail;
import org.apache.mailet.MailAddress;
Modified:
james/server/trunk/mail-library/src/test/java/org/apache/james/mailstore/MockMailStore.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/mail-library/src/test/java/org/apache/james/mailstore/MockMailStore.java?rev=1025872&r1=1025871&r2=1025872&view=diff
==============================================================================
---
james/server/trunk/mail-library/src/test/java/org/apache/james/mailstore/MockMailStore.java
(original)
+++
james/server/trunk/mail-library/src/test/java/org/apache/james/mailstore/MockMailStore.java
Thu Oct 21 08:00:07 2010
@@ -24,7 +24,7 @@ package org.apache.james.mailstore;
import org.apache.commons.configuration.Configuration;
import org.apache.commons.configuration.ConfigurationUtils;
import org.apache.commons.configuration.HierarchicalConfiguration;
-import org.apache.james.mailstore.MailStore;
+import org.apache.james.mailstore.api.MailStore;
import java.util.HashMap;
import java.util.Map;
Modified:
james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/FromRepository.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/FromRepository.java?rev=1025872&r1=1025871&r2=1025872&view=diff
==============================================================================
---
james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/FromRepository.java
(original)
+++
james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/FromRepository.java
Thu Oct 21 08:00:07 2010
@@ -23,8 +23,8 @@ package org.apache.james.transport.maile
import org.apache.commons.configuration.DefaultConfigurationBuilder;
import org.apache.james.lifecycle.LifecycleUtil;
-import org.apache.james.mailrepository.MailRepository;
-import org.apache.james.mailstore.MailStore;
+import org.apache.james.mailrepository.api.MailRepository;
+import org.apache.james.mailstore.api.MailStore;
import org.apache.mailet.base.GenericMailet;
import org.apache.mailet.Mail;
Modified:
james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/ToMultiRepository.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/ToMultiRepository.java?rev=1025872&r1=1025871&r2=1025872&view=diff
==============================================================================
---
james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/ToMultiRepository.java
(original)
+++
james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/ToMultiRepository.java
Thu Oct 21 08:00:07 2010
@@ -23,8 +23,8 @@ package org.apache.james.transport.maile
import org.apache.commons.configuration.DefaultConfigurationBuilder;
import org.apache.james.core.MailImpl;
-import org.apache.james.mailrepository.MailRepository;
-import org.apache.james.mailstore.MailStore;
+import org.apache.james.mailrepository.api.MailRepository;
+import org.apache.james.mailstore.api.MailStore;
import org.apache.mailet.base.GenericMailet;
import org.apache.mailet.Mail;
import org.apache.mailet.MailAddress;
Modified:
james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/ToRepository.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/ToRepository.java?rev=1025872&r1=1025871&r2=1025872&view=diff
==============================================================================
---
james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/ToRepository.java
(original)
+++
james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/ToRepository.java
Thu Oct 21 08:00:07 2010
@@ -24,8 +24,8 @@ package org.apache.james.transport.maile
import javax.annotation.Resource;
import org.apache.commons.configuration.DefaultConfigurationBuilder;
-import org.apache.james.mailrepository.MailRepository;
-import org.apache.james.mailstore.MailStore;
+import org.apache.james.mailrepository.api.MailRepository;
+import org.apache.james.mailstore.api.MailStore;
import org.apache.mailet.base.GenericMailet;
import org.apache.mailet.Mail;
Modified:
james/server/trunk/spring-deployment/src/main/config/james/mailstore.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/spring-deployment/src/main/config/james/mailstore.xml?rev=1025872&r1=1025871&r2=1025872&view=diff
==============================================================================
--- james/server/trunk/spring-deployment/src/main/config/james/mailstore.xml
(original)
+++ james/server/trunk/spring-deployment/src/main/config/james/mailstore.xml
Thu Oct 21 08:00:07 2010
@@ -22,7 +22,7 @@
<repositories>
<!-- File based repositories. These repositories store all message
data -->
<!-- in the file system. -->
- <repository class="org.apache.james.mailrepository.FileMailRepository">
+ <repository
class="org.apache.james.mailrepository.file.FileMailRepository">
<protocols>
<protocol>file</protocol>
</protocols>
@@ -35,7 +35,7 @@
<!-- JDBC based repositories. These repositories store all message
data -->
<!-- in the database. -->
- <repository class="org.apache.james.mailrepository.JDBCMailRepository">
+ <repository
class="org.apache.james.mailrepository.jdbc.JDBCMailRepository">
<protocols>
<protocol>db</protocol>
</protocols>
@@ -55,7 +55,7 @@
</repository>
<!-- These repositories store message delivery and headers in the DB,
and the body to the filesystem -->
- <repository class="org.apache.james.mailrepository.JDBCMailRepository">
+ <repository
class="org.apache.james.mailrepository.jdbc.JDBCMailRepository">
<protocols>
<protocol>dbfile</protocol>
</protocols>
@@ -69,7 +69,7 @@
</repository>
<!-- The mbox repository is designed for MAIL only; SPOOL performance
would be less than ideal-->
- <repository class="org.apache.james.mailrepository.MBoxMailRepository">
+ <repository
class="org.apache.james.mailrepository.file.MBoxMailRepository">
<protocols>
<protocol>mbox</protocol>
</protocols>
@@ -80,7 +80,7 @@
<config FIFO="false"/>
</repository>
- <repository
class="org.apache.james.filepair.FilePersistentObjectRepository">
+ <repository
class="org.apache.james.filepair.file.FilePersistentObjectRepository">
<protocols>
<protocol>file</protocol>
</protocols>
@@ -94,7 +94,7 @@
</models>
</repository>
- <repository
class="org.apache.james.filepair.FilePersistentStreamRepository">
+ <repository
class="org.apache.james.filepair.file.FilePersistentStreamRepository">
<protocols>
<protocol>file</protocol>
</protocols>
@@ -110,7 +110,7 @@
<!-- If you enable this you need to make sure that embedded Jackrabbit
instance is started as well. Check the container configuration -->
<!--
- <repository class="org.apache.james.mailrepository.JCRMailRepository">
+ <repository
class="org.apache.james.mailrepository.jcr.JCRMailRepository">
<protocols>
<protocol>jcr</protocol>
</protocols>
Modified:
james/server/trunk/user-file/src/main/java/org/apache/james/userrepository/UsersFileRepository.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/user-file/src/main/java/org/apache/james/userrepository/UsersFileRepository.java?rev=1025872&r1=1025871&r2=1025872&view=diff
==============================================================================
---
james/server/trunk/user-file/src/main/java/org/apache/james/userrepository/UsersFileRepository.java
(original)
+++
james/server/trunk/user-file/src/main/java/org/apache/james/userrepository/UsersFileRepository.java
Thu Oct 21 08:00:07 2010
@@ -27,7 +27,7 @@ import org.apache.commons.configuration.
import org.apache.james.api.user.User;
import org.apache.james.impl.jamesuser.AbstractUsersRepository;
import org.apache.james.impl.user.DefaultJamesUser;
-import org.apache.james.mailstore.MailStore;
+import org.apache.james.mailstore.api.MailStore;
import org.apache.james.repository.ObjectRepository;
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
