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 2010/07/05 19:34:23 UTC
svn commit: r960647 - in /james/imap/trunk:
api/src/main/java/org/apache/james/imap/api/
deployment/src/test/java/org/apache/james/imap/functional/
jcr/src/main/java/org/apache/james/imap/jcr/
jcr/src/main/java/org/apache/james/imap/jcr/user/ jpa/src/m...
Author: norman
Date: Mon Jul 5 17:34:22 2010
New Revision: 960647
URL: http://svn.apache.org/viewvc?rev=960647&view=rev
Log:
change users' namespace to #private (IMAP-176). Thx to Tim-Christian Mundt for the patch :)
Added:
james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MailboxConstants.java
- copied, changed from r956027, james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/Constants.java
Removed:
james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/Constants.java
james/imap/trunk/store/src/main/java/org/apache/james/imap/store/StoreConstants.java
Modified:
james/imap/trunk/api/src/main/java/org/apache/james/imap/api/ImapConstants.java
james/imap/trunk/deployment/src/test/java/org/apache/james/imap/functional/AbstractStressTest.java
james/imap/trunk/jcr/src/main/java/org/apache/james/imap/jcr/JCRMailboxManager.java
james/imap/trunk/jcr/src/main/java/org/apache/james/imap/jcr/JCRMailboxSessionMapperFactory.java
james/imap/trunk/jcr/src/main/java/org/apache/james/imap/jcr/user/JCRSubscriptionMapper.java
james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/JPAMailboxSessionMapperFactory.java
james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MailboxManager.java
james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MimeDescriptor.java
james/imap/trunk/memory/src/main/java/org/apache/james/imap/inmemory/InMemoryMailboxSessionMapperFactory.java
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/ListProcessor.java
james/imap/trunk/store/src/main/java/org/apache/james/imap/store/StoreMailboxManager.java
james/imap/trunk/store/src/main/java/org/apache/james/imap/store/StoreMessageManager.java
james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/TorqueMailboxManager.java
james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/UidChangeTracker.java
Modified: james/imap/trunk/api/src/main/java/org/apache/james/imap/api/ImapConstants.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/api/src/main/java/org/apache/james/imap/api/ImapConstants.java?rev=960647&r1=960646&r2=960647&view=diff
==============================================================================
--- james/imap/trunk/api/src/main/java/org/apache/james/imap/api/ImapConstants.java (original)
+++ james/imap/trunk/api/src/main/java/org/apache/james/imap/api/ImapConstants.java Mon Jul 5 17:34:22 2010
@@ -21,17 +21,17 @@ package org.apache.james.imap.api;
public interface ImapConstants {
// Basic response types
- String OK = "OK";
+ public static final String OK = "OK";
- String NO = "NO";
+ public static final String NO = "NO";
- String BAD = "BAD";
+ public static final String BAD = "BAD";
- String BYE = "BYE";
+ public static final String BYE = "BYE";
- String UNTAGGED = "*";
+ public static final String UNTAGGED = "*";
- String SP = " ";
+ public static final String SP = " ";
public static final String NIL = "NIL";
@@ -95,61 +95,59 @@ public interface ImapConstants {
public static final char DQUOTE = '\"';
- String VERSION = "IMAP4rev1";
+ public static final String VERSION = "IMAP4rev1";
- String SUPPORTS_LITERAL_PLUS = "LITERAL+";
+ public static final String SUPPORTS_LITERAL_PLUS = "LITERAL+";
public static final String SUPPORTS_RFC3348 = "CHILDREN";
public static final String SUPPORTS_NAMESPACES = "NAMESPACE";
- String USER_NAMESPACE = "#mail";
+ public static final char HIERARCHY_DELIMITER_CHAR = '.';
- char HIERARCHY_DELIMITER_CHAR = '.';
+ public static final char NAMESPACE_PREFIX_CHAR = '#';
- final char NAMESPACE_PREFIX_CHAR = '#';
+ public static final String HIERARCHY_DELIMITER = String.valueOf(HIERARCHY_DELIMITER_CHAR);
- String HIERARCHY_DELIMITER = String.valueOf(HIERARCHY_DELIMITER_CHAR);
+ public static final String NAMESPACE_PREFIX = String.valueOf(NAMESPACE_PREFIX_CHAR);
- final String NAMESPACE_PREFIX = String.valueOf(NAMESPACE_PREFIX_CHAR);
+ public static final String INBOX_NAME = "INBOX";
- String INBOX_NAME = "INBOX";
+ public static final String MIME_TYPE_TEXT = "TEXT";
- public String MIME_TYPE_TEXT = "TEXT";
+ public static final String MIME_TYPE_MULTIPART = "MULTIPART";
- public String MIME_TYPE_MULTIPART = "MULTIPART";
+ public static final String MIME_SUBTYPE_PLAIN = "PLAIN";
- public String MIME_SUBTYPE_PLAIN = "PLAIN";
+ public static final String MIME_TYPE_MESSAGE = "MESSAGE";
- public String MIME_TYPE_MESSAGE = "MESSAGE";
-
- public String MIME_SUBTYPE_RFC822 = "RFC822";
+ public static final String MIME_SUBTYPE_RFC822 = "RFC822";
// RFC822 CONSTANTS:
// TODO: Consider switching to standard case
- public String RFC822_BCC = "Bcc";
+ public static final String RFC822_BCC = "Bcc";
- public String RFC822_CC = "Cc";
+ public static final String RFC822_CC = "Cc";
- public String RFC822_FROM = "From";
+ public static final String RFC822_FROM = "From";
- public String RFC822_DATE = "Date";
+ public static final String RFC822_DATE = "Date";
- public String RFC822_SUBJECT = "Subject";
+ public static final String RFC822_SUBJECT = "Subject";
- public String RFC822_TO = "To";
+ public static final String RFC822_TO = "To";
- public String RFC822_SENDER = "Sender";
+ public static final String RFC822_SENDER = "Sender";
- public String RFC822_REPLY_TO = "Reply-To";
+ public static final String RFC822_REPLY_TO = "Reply-To";
- public String RFC822_IN_REPLY_TO = "In-Reply-To";
+ public static final String RFC822_IN_REPLY_TO = "In-Reply-To";
- public String RFC822_MESSAGE_ID = "Message-ID";
+ public static final String RFC822_MESSAGE_ID = "Message-ID";
- public String NAME_ATTRIBUTE_HAS_CHILDREN = "\\HasChildren";
+ public static final String NAME_ATTRIBUTE_HAS_CHILDREN = "\\HasChildren";
- public String NAME_ATTRIBUTE_HAS_NO_CHILDREN = "\\HasNoChildren";
+ public static final String NAME_ATTRIBUTE_HAS_NO_CHILDREN = "\\HasNoChildren";
public static final String NAMESPACE_COMMAND_NAME = "NAMESPACE";
Modified: james/imap/trunk/deployment/src/test/java/org/apache/james/imap/functional/AbstractStressTest.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/deployment/src/test/java/org/apache/james/imap/functional/AbstractStressTest.java?rev=960647&r1=960646&r2=960647&view=diff
==============================================================================
--- james/imap/trunk/deployment/src/test/java/org/apache/james/imap/functional/AbstractStressTest.java (original)
+++ james/imap/trunk/deployment/src/test/java/org/apache/james/imap/functional/AbstractStressTest.java Mon Jul 5 17:34:22 2010
@@ -29,6 +29,7 @@ import javax.mail.Flags;
import org.apache.commons.logging.impl.SimpleLog;
import org.apache.james.imap.mailbox.Mailbox;
+import org.apache.james.imap.mailbox.MailboxConstants;
import org.apache.james.imap.mailbox.MailboxException;
import org.apache.james.imap.mailbox.MailboxSession;
import org.apache.james.imap.store.StoreMailboxManager;
@@ -49,7 +50,7 @@ public abstract class AbstractStressTest
MailboxSession session = getMailboxManager().createSystemSession("test", new SimpleLog("Test"));
getMailboxManager().startProcessingRequest(session);
- getMailboxManager().createMailbox(StoreMailboxManager.USER_NAMESPACE_PREFIX +".username.INBOX", session);
+ getMailboxManager().createMailbox(MailboxConstants.USER_NAMESPACE +".username.INBOX", session);
getMailboxManager().endProcessingRequest(session);
getMailboxManager().logout(session, false);
final AtomicBoolean fail = new AtomicBoolean(false);
@@ -68,7 +69,7 @@ public abstract class AbstractStressTest
try {
getMailboxManager().startProcessingRequest(session);
- Mailbox m = getMailboxManager().getMailbox(StoreMailboxManager.USER_NAMESPACE_PREFIX +".username.INBOX", session);
+ Mailbox m = getMailboxManager().getMailbox(MailboxConstants.USER_NAMESPACE +".username.INBOX", session);
System.out.println("Append message with uid=" + m.appendMessage(new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes()), new Date(), session, false, new Flags()));
getMailboxManager().endProcessingRequest(session);
Modified: james/imap/trunk/jcr/src/main/java/org/apache/james/imap/jcr/JCRMailboxManager.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/jcr/src/main/java/org/apache/james/imap/jcr/JCRMailboxManager.java?rev=960647&r1=960646&r2=960647&view=diff
==============================================================================
--- james/imap/trunk/jcr/src/main/java/org/apache/james/imap/jcr/JCRMailboxManager.java (original)
+++ james/imap/trunk/jcr/src/main/java/org/apache/james/imap/jcr/JCRMailboxManager.java Mon Jul 5 17:34:22 2010
@@ -36,9 +36,8 @@ import org.apache.james.imap.store.trans
/**
* JCR implementation of a MailboxManager
*
- *
*/
-public class JCRMailboxManager extends StoreMailboxManager<String> implements JCRImapConstants{
+public class JCRMailboxManager extends StoreMailboxManager<String> implements JCRImapConstants {
private final JCRMailboxSessionMapperFactory mapperFactory;
private final Log logger = LogFactory.getLog(JCRMailboxManager.class);
Modified: james/imap/trunk/jcr/src/main/java/org/apache/james/imap/jcr/JCRMailboxSessionMapperFactory.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/jcr/src/main/java/org/apache/james/imap/jcr/JCRMailboxSessionMapperFactory.java?rev=960647&r1=960646&r2=960647&view=diff
==============================================================================
--- james/imap/trunk/jcr/src/main/java/org/apache/james/imap/jcr/JCRMailboxSessionMapperFactory.java (original)
+++ james/imap/trunk/jcr/src/main/java/org/apache/james/imap/jcr/JCRMailboxSessionMapperFactory.java Mon Jul 5 17:34:22 2010
@@ -24,11 +24,11 @@ import org.apache.james.imap.jcr.mail.JC
import org.apache.james.imap.jcr.mail.JCRMessageMapper;
import org.apache.james.imap.jcr.user.JCRSubscriptionMapper;
+import org.apache.james.imap.mailbox.MailboxConstants;
import org.apache.james.imap.mailbox.MailboxException;
import org.apache.james.imap.mailbox.MailboxSession;
import org.apache.james.imap.mailbox.SubscriptionException;
import org.apache.james.imap.store.MailboxSessionMapperFactory;
-import org.apache.james.imap.store.StoreConstants;
import org.apache.james.imap.store.mail.MailboxMapper;
import org.apache.james.imap.store.mail.MessageMapper;
import org.apache.james.imap.store.user.SubscriptionMapper;
@@ -38,7 +38,7 @@ import org.apache.james.imap.store.user.
*
*
*/
-public class JCRMailboxSessionMapperFactory extends MailboxSessionMapperFactory<String> implements StoreConstants{
+public class JCRMailboxSessionMapperFactory extends MailboxSessionMapperFactory<String> {
private final MailboxSessionJCRRepository repository;
private final Log logger;
@@ -49,7 +49,7 @@ public class JCRMailboxSessionMapperFact
private int messageScaling;
public JCRMailboxSessionMapperFactory(final MailboxSessionJCRRepository repository, final NodeLocker locker) {
- this(repository, locker, DEFAULT_FOLDER_DELIMITER, DEFAULT_SCALING, JCRMessageMapper.MESSAGE_SCALE_DAY);
+ this(repository, locker, MailboxConstants.DEFAULT_DELIMITER, DEFAULT_SCALING, JCRMessageMapper.MESSAGE_SCALE_DAY);
}
public JCRMailboxSessionMapperFactory(final MailboxSessionJCRRepository repository, final NodeLocker locker, final char delimiter, final int scaling, final int messageScaling) {
Modified: james/imap/trunk/jcr/src/main/java/org/apache/james/imap/jcr/user/JCRSubscriptionMapper.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/jcr/src/main/java/org/apache/james/imap/jcr/user/JCRSubscriptionMapper.java?rev=960647&r1=960646&r2=960647&view=diff
==============================================================================
--- james/imap/trunk/jcr/src/main/java/org/apache/james/imap/jcr/user/JCRSubscriptionMapper.java (original)
+++ james/imap/trunk/jcr/src/main/java/org/apache/james/imap/jcr/user/JCRSubscriptionMapper.java Mon Jul 5 17:34:22 2010
@@ -36,13 +36,12 @@ import org.apache.jackrabbit.commons.Jcr
import org.apache.jackrabbit.util.Text;
import org.apache.james.imap.api.display.HumanReadableText;
import org.apache.james.imap.jcr.AbstractJCRScalingMapper;
-import org.apache.james.imap.jcr.JCRImapConstants;
import org.apache.james.imap.jcr.MailboxSessionJCRRepository;
import org.apache.james.imap.jcr.NodeLocker;
import org.apache.james.imap.jcr.user.model.JCRSubscription;
+import org.apache.james.imap.mailbox.MailboxConstants;
import org.apache.james.imap.mailbox.MailboxSession;
import org.apache.james.imap.mailbox.SubscriptionException;
-import org.apache.james.imap.store.StoreConstants;
import org.apache.james.imap.store.user.SubscriptionMapper;
import org.apache.james.imap.store.user.model.Subscription;
@@ -50,7 +49,7 @@ import org.apache.james.imap.store.user.
* JCR implementation of a SubscriptionManager
*
*/
-public class JCRSubscriptionMapper extends AbstractJCRScalingMapper implements SubscriptionMapper, StoreConstants {
+public class JCRSubscriptionMapper extends AbstractJCRScalingMapper implements SubscriptionMapper {
public JCRSubscriptionMapper(final MailboxSessionJCRRepository repos, MailboxSession session, final NodeLocker locker, final int scaling, final Log log) {
super(repos,session, locker, scaling, log);
@@ -176,7 +175,7 @@ public class JCRSubscriptionMapper exten
// its a new subscription
if (sub == null) {
node = JcrUtils.getOrAddNode(getSession().getRootNode(), MAILBOXES_PATH);
- node = JcrUtils.getOrAddNode(node, Text.escapeIllegalJcrChars(StoreConstants.USER_NAMESPACE_PREFIX));
+ node = JcrUtils.getOrAddNode(node, Text.escapeIllegalJcrChars(MailboxConstants.USER_NAMESPACE));
// This is needed to minimize the child nodes a bit
node = createUserPathStructure(node, Text.escapeIllegalJcrChars(username));
Modified: james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/JPAMailboxSessionMapperFactory.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/JPAMailboxSessionMapperFactory.java?rev=960647&r1=960646&r2=960647&view=diff
==============================================================================
--- james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/JPAMailboxSessionMapperFactory.java (original)
+++ james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/JPAMailboxSessionMapperFactory.java Mon Jul 5 17:34:22 2010
@@ -24,9 +24,9 @@ import javax.persistence.EntityManagerFa
import org.apache.james.imap.jpa.mail.JPAMailboxMapper;
import org.apache.james.imap.jpa.mail.JPAMessageMapper;
import org.apache.james.imap.jpa.user.JPASubscriptionMapper;
+import org.apache.james.imap.mailbox.MailboxConstants;
import org.apache.james.imap.mailbox.MailboxSession;
import org.apache.james.imap.store.MailboxSessionMapperFactory;
-import org.apache.james.imap.store.StoreConstants;
import org.apache.james.imap.store.mail.MailboxMapper;
import org.apache.james.imap.store.mail.MessageMapper;
import org.apache.james.imap.store.user.SubscriptionMapper;
@@ -35,13 +35,13 @@ import org.apache.james.imap.store.user.
* JPA implementation of {@link MailboxSessionMapperFactory}
*
*/
-public class JPAMailboxSessionMapperFactory extends MailboxSessionMapperFactory<Long> implements StoreConstants{
+public class JPAMailboxSessionMapperFactory extends MailboxSessionMapperFactory<Long> {
private final EntityManagerFactory entityManagerFactory;
private final char delimiter;
public JPAMailboxSessionMapperFactory(EntityManagerFactory entityManagerFactory) {
- this(entityManagerFactory, DEFAULT_FOLDER_DELIMITER);
+ this(entityManagerFactory, MailboxConstants.DEFAULT_DELIMITER);
}
public JPAMailboxSessionMapperFactory(EntityManagerFactory entityManagerFactory, char delimiter) {
Copied: james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MailboxConstants.java (from r956027, james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/Constants.java)
URL: http://svn.apache.org/viewvc/james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MailboxConstants.java?p2=james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MailboxConstants.java&p1=james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/Constants.java&r1=956027&r2=960647&rev=960647&view=diff
==============================================================================
--- james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/Constants.java (original)
+++ james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MailboxConstants.java Mon Jul 5 17:34:22 2010
@@ -19,10 +19,20 @@
package org.apache.james.imap.mailbox;
-public interface Constants {
+public interface MailboxConstants {
public final long UID_INFINITY = -1;
public final int MSN_INFINITY = -1;
+
+ /**
+ * The namespace used for store user inboxes
+ */
+ public static final String USER_NAMESPACE = "#private";
+
+ /**
+ * The default delimiter used to seperated parent/child folders
+ */
+ public static final char DEFAULT_DELIMITER = '.';
}
Modified: james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MailboxManager.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MailboxManager.java?rev=960647&r1=960646&r2=960647&view=diff
==============================================================================
--- james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MailboxManager.java (original)
+++ james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MailboxManager.java Mon Jul 5 17:34:22 2010
@@ -68,13 +68,6 @@ public interface MailboxManager {
char getDelimiter();
/**
- * Return the prefix for the namespace
- *
- * @return namespacePrefix
- */
- String getUserNameSpacePrefix();
-
- /**
* <p>
* Resolves a path for the given user.
* </p>
Modified: james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MimeDescriptor.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MimeDescriptor.java?rev=960647&r1=960646&r2=960647&view=diff
==============================================================================
--- james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MimeDescriptor.java (original)
+++ james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MimeDescriptor.java Mon Jul 5 17:34:22 2010
@@ -25,8 +25,6 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import org.apache.james.imap.mailbox.MessageResult.Header;
-
public interface MimeDescriptor extends Headers {
/**
Modified: james/imap/trunk/memory/src/main/java/org/apache/james/imap/inmemory/InMemoryMailboxSessionMapperFactory.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/memory/src/main/java/org/apache/james/imap/inmemory/InMemoryMailboxSessionMapperFactory.java?rev=960647&r1=960646&r2=960647&view=diff
==============================================================================
--- james/imap/trunk/memory/src/main/java/org/apache/james/imap/inmemory/InMemoryMailboxSessionMapperFactory.java (original)
+++ james/imap/trunk/memory/src/main/java/org/apache/james/imap/inmemory/InMemoryMailboxSessionMapperFactory.java Mon Jul 5 17:34:22 2010
@@ -21,17 +21,17 @@ package org.apache.james.imap.inmemory;
import org.apache.james.imap.inmemory.mail.InMemoryMailboxMapper;
import org.apache.james.imap.inmemory.mail.InMemoryMessageMapper;
import org.apache.james.imap.inmemory.user.InMemorySubscriptionMapper;
+import org.apache.james.imap.mailbox.MailboxConstants;
import org.apache.james.imap.mailbox.MailboxException;
import org.apache.james.imap.mailbox.MailboxSession;
import org.apache.james.imap.mailbox.SubscriptionException;
import org.apache.james.imap.store.MailboxSessionMapperFactory;
-import org.apache.james.imap.store.StoreConstants;
import org.apache.james.imap.store.mail.MailboxMapper;
import org.apache.james.imap.store.mail.MessageMapper;
import org.apache.james.imap.store.transaction.TransactionalMapper;
import org.apache.james.imap.store.user.SubscriptionMapper;
-public class InMemoryMailboxSessionMapperFactory extends MailboxSessionMapperFactory<Long> implements StoreConstants {
+public class InMemoryMailboxSessionMapperFactory extends MailboxSessionMapperFactory<Long> {
private MailboxMapper<Long> mailboxMapper;
private MessageMapper<Long> messageMapper;
@@ -44,7 +44,7 @@ public class InMemoryMailboxSessionMappe
}
public InMemoryMailboxSessionMapperFactory() {
- this(DEFAULT_FOLDER_DELIMITER);
+ this(MailboxConstants.DEFAULT_DELIMITER);
}
@Override
Modified: james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/ListProcessor.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/ListProcessor.java?rev=960647&r1=960646&r2=960647&view=diff
==============================================================================
--- james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/ListProcessor.java (original)
+++ james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/ListProcessor.java Mon Jul 5 17:34:22 2010
@@ -30,6 +30,7 @@ import org.apache.james.imap.api.message
import org.apache.james.imap.api.message.response.StatusResponseFactory;
import org.apache.james.imap.api.process.ImapProcessor;
import org.apache.james.imap.api.process.ImapSession;
+import org.apache.james.imap.mailbox.MailboxConstants;
import org.apache.james.imap.mailbox.MailboxException;
import org.apache.james.imap.mailbox.MailboxManager;
import org.apache.james.imap.mailbox.MailboxMetaData;
@@ -79,7 +80,7 @@ public class ListProcessor extends Abstr
final List<MailboxMetaData> results;
final String user = ImapSessionUtils.getUserName(session);
- final String personalNamespace = ImapConstants.USER_NAMESPACE
+ final String personalNamespace = MailboxConstants.USER_NAMESPACE
+ ImapConstants.HIERARCHY_DELIMITER_CHAR + user;
if (mailboxPattern.length() == 0) {
Modified: james/imap/trunk/store/src/main/java/org/apache/james/imap/store/StoreMailboxManager.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/store/src/main/java/org/apache/james/imap/store/StoreMailboxManager.java?rev=960647&r1=960646&r2=960647&view=diff
==============================================================================
--- james/imap/trunk/store/src/main/java/org/apache/james/imap/store/StoreMailboxManager.java (original)
+++ james/imap/trunk/store/src/main/java/org/apache/james/imap/store/StoreMailboxManager.java Mon Jul 5 17:34:22 2010
@@ -29,6 +29,7 @@ import java.util.Random;
import org.apache.commons.logging.Log;
import org.apache.james.imap.api.AbstractLogEnabled;
import org.apache.james.imap.mailbox.BadCredentialsException;
+import org.apache.james.imap.mailbox.MailboxConstants;
import org.apache.james.imap.mailbox.MailboxException;
import org.apache.james.imap.mailbox.MailboxExistsException;
import org.apache.james.imap.mailbox.MailboxListener;
@@ -56,7 +57,7 @@ import org.apache.james.imap.store.trans
*
* @param <Id>
*/
-public abstract class StoreMailboxManager<Id> extends AbstractLogEnabled implements MailboxManager, StoreConstants {
+public abstract class StoreMailboxManager<Id> extends AbstractLogEnabled implements MailboxManager {
public static final char SQL_WILDCARD_CHAR = '%';
@@ -73,7 +74,7 @@ public abstract class StoreMailboxManage
private UidConsumer<Id> consumer;
public StoreMailboxManager(MailboxSessionMapperFactory<Id> mailboxSessionMapperFactory, final Authenticator authenticator, final Subscriber subscriber, final UidConsumer<Id> consumer) {
- this(mailboxSessionMapperFactory, authenticator, subscriber, consumer, DEFAULT_FOLDER_DELIMITER);
+ this(mailboxSessionMapperFactory, authenticator, subscriber, consumer, MailboxConstants.DEFAULT_DELIMITER);
}
@@ -381,7 +382,7 @@ public abstract class StoreMailboxManage
if (mailboxPath.length() > 0 && mailboxPath.charAt(0) != delimiter) {
mailboxPath = delimiter + mailboxPath;
}
- final String result = USER_NAMESPACE_PREFIX + delimiter + userName
+ final String result = MailboxConstants.USER_NAMESPACE + delimiter + userName
+ mailboxPath;
return result;
}
@@ -458,14 +459,6 @@ public abstract class StoreMailboxManage
return delimiter;
}
- /*
- * (non-Javadoc)
- * @see org.apache.james.imap.mailbox.MailboxManager#getUserNameSpacePrefix()
- */
- public String getUserNameSpacePrefix() {
- return USER_NAMESPACE_PREFIX;
- }
-
/**
* End processing of Request for session
*/
Modified: james/imap/trunk/store/src/main/java/org/apache/james/imap/store/StoreMessageManager.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/store/src/main/java/org/apache/james/imap/store/StoreMessageManager.java?rev=960647&r1=960646&r2=960647&view=diff
==============================================================================
--- james/imap/trunk/store/src/main/java/org/apache/james/imap/store/StoreMessageManager.java (original)
+++ james/imap/trunk/store/src/main/java/org/apache/james/imap/store/StoreMessageManager.java Mon Jul 5 17:34:22 2010
@@ -72,7 +72,7 @@ import org.apache.james.mime4j.parser.Mi
*
*
*/
-public abstract class StoreMessageManager<Id> implements org.apache.james.imap.mailbox.Mailbox, StoreConstants {
+public abstract class StoreMessageManager<Id> implements org.apache.james.imap.mailbox.Mailbox {
private static final int INITIAL_SIZE_FLAGS = 32;
Modified: james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/TorqueMailboxManager.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/TorqueMailboxManager.java?rev=960647&r1=960646&r2=960647&view=diff
==============================================================================
--- james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/TorqueMailboxManager.java (original)
+++ james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/TorqueMailboxManager.java Mon Jul 5 17:34:22 2010
@@ -60,7 +60,7 @@ import org.apache.torque.util.Criteria;
public class TorqueMailboxManager implements MailboxManager {
- public static final String USER_NAMESPACE_PREFIX = "#mail";
+ public static final String USER_NAMESPACE_PREFIX = "#private";
private static final char SQL_WILDCARD_CHAR = '%';
Modified: james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/UidChangeTracker.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/UidChangeTracker.java?rev=960647&r1=960646&r2=960647&view=diff
==============================================================================
--- james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/UidChangeTracker.java (original)
+++ james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/UidChangeTracker.java Mon Jul 5 17:34:22 2010
@@ -30,13 +30,13 @@ import java.util.TreeSet;
import javax.mail.Flags;
-import org.apache.james.imap.mailbox.Constants;
+import org.apache.james.imap.mailbox.MailboxConstants;
import org.apache.james.imap.mailbox.Mailbox;
import org.apache.james.imap.mailbox.MailboxListener;
import org.apache.james.imap.mailbox.util.MailboxEventDispatcher;
import org.apache.james.imap.mailbox.util.UidRange;
-public class UidChangeTracker implements Constants {
+public class UidChangeTracker implements MailboxConstants {
private final MailboxEventDispatcher eventDispatcher;
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org