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 no...@apache.org on 2011/06/20 08:27:44 UTC
svn commit: r1137517 - in /james/mailbox/trunk:
jcr/src/main/java/org/apache/james/mailbox/jcr/
memory/src/main/java/org/apache/james/mailbox/inmemory/
memory/src/test/java/org/apache/james/mailbox/inmemory/
tool/src/test/java/org/apache/james/mailbox/...
Author: norman
Date: Mon Jun 20 06:27:44 2011
New Revision: 1137517
URL: http://svn.apache.org/viewvc?rev=1137517&view=rev
Log:
Its now possible to directly use StoreMailboxManager and StoreMessageManager, so we can remove some of its sub-classes. Part of MAILBOX-98
Removed:
james/mailbox/trunk/memory/src/main/java/org/apache/james/mailbox/inmemory/InMemoryMailboxManager.java
Modified:
james/mailbox/trunk/jcr/src/main/java/org/apache/james/mailbox/jcr/JCRMessageManager.java
james/mailbox/trunk/memory/src/test/java/org/apache/james/mailbox/inmemory/InMemoryMailboxManagerTest.java
james/mailbox/trunk/tool/src/test/java/org/apache/james/mailbox/copier/MailboxCopierTest.java
Modified: james/mailbox/trunk/jcr/src/main/java/org/apache/james/mailbox/jcr/JCRMessageManager.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/jcr/src/main/java/org/apache/james/mailbox/jcr/JCRMessageManager.java?rev=1137517&r1=1137516&r2=1137517&view=diff
==============================================================================
--- james/mailbox/trunk/jcr/src/main/java/org/apache/james/mailbox/jcr/JCRMessageManager.java (original)
+++ james/mailbox/trunk/jcr/src/main/java/org/apache/james/mailbox/jcr/JCRMessageManager.java Mon Jun 20 06:27:44 2011
@@ -52,10 +52,6 @@ public class JCRMessageManager extends S
@Override
protected Message<String> createMessage(Date internalDate, int size, int bodyStartOctet, SharedInputStream content, Flags flags, PropertyBuilder propertyBuilder) throws MailboxException{
- int headerEnd = bodyStartOctet -2;
- if (headerEnd < 0) {
- headerEnd = 0;
- }
final Message<String> message = new JCRMessage(getMailboxEntity().getMailboxId(), internalDate,
size, flags, content, bodyStartOctet, propertyBuilder, log);
return message;
Modified: james/mailbox/trunk/memory/src/test/java/org/apache/james/mailbox/inmemory/InMemoryMailboxManagerTest.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/memory/src/test/java/org/apache/james/mailbox/inmemory/InMemoryMailboxManagerTest.java?rev=1137517&r1=1137516&r2=1137517&view=diff
==============================================================================
--- james/mailbox/trunk/memory/src/test/java/org/apache/james/mailbox/inmemory/InMemoryMailboxManagerTest.java (original)
+++ james/mailbox/trunk/memory/src/test/java/org/apache/james/mailbox/inmemory/InMemoryMailboxManagerTest.java Mon Jun 20 06:27:44 2011
@@ -23,6 +23,7 @@ import org.apache.james.mailbox.MailboxE
import org.apache.james.mailbox.MailboxManagerTest;
import org.apache.james.mailbox.MailboxSession;
import org.apache.james.mailbox.store.MockAuthenticator;
+import org.apache.james.mailbox.store.StoreMailboxManager;
import org.junit.After;
import org.junit.Before;
import org.slf4j.LoggerFactory;
@@ -61,7 +62,7 @@ public class InMemoryMailboxManagerTest
protected void createMailboxManager() throws MailboxException {
InMemoryMailboxSessionMapperFactory factory = new InMemoryMailboxSessionMapperFactory();
- InMemoryMailboxManager mailboxManager = new InMemoryMailboxManager(factory, new MockAuthenticator());
+ StoreMailboxManager<Long> mailboxManager = new StoreMailboxManager<Long>(factory, new MockAuthenticator());
mailboxManager.init();
setMailboxManager(mailboxManager);
Modified: james/mailbox/trunk/tool/src/test/java/org/apache/james/mailbox/copier/MailboxCopierTest.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/tool/src/test/java/org/apache/james/mailbox/copier/MailboxCopierTest.java?rev=1137517&r1=1137516&r2=1137517&view=diff
==============================================================================
--- james/mailbox/trunk/tool/src/test/java/org/apache/james/mailbox/copier/MailboxCopierTest.java (original)
+++ james/mailbox/trunk/tool/src/test/java/org/apache/james/mailbox/copier/MailboxCopierTest.java Mon Jun 20 06:27:44 2011
@@ -29,10 +29,10 @@ import org.apache.james.mailbox.MailboxM
import org.apache.james.mailbox.MailboxPath;
import org.apache.james.mailbox.MailboxSession;
import org.apache.james.mailbox.MessageManager;
-import org.apache.james.mailbox.inmemory.InMemoryMailboxManager;
import org.apache.james.mailbox.inmemory.InMemoryMailboxSessionMapperFactory;
import org.apache.james.mailbox.mock.MockMailboxManager;
import org.apache.james.mailbox.store.Authenticator;
+import org.apache.james.mailbox.store.StoreMailboxManager;
import org.junit.Before;
import org.junit.Test;
import org.slf4j.LoggerFactory;
@@ -141,7 +141,7 @@ public class MailboxCopierTest {
*/
private MailboxManager newInMemoryMailboxManager() {
- return new InMemoryMailboxManager(
+ return new StoreMailboxManager<Long>(
new InMemoryMailboxSessionMapperFactory(),
new Authenticator() {
public boolean isAuthentic(String userid, CharSequence passwd) {
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org