Index: torque/src/main/java/org/apache/james/mailboxmanager/torque/UidChangeTracker.java =================================================================== --- torque/src/main/java/org/apache/james/mailboxmanager/torque/UidChangeTracker.java (Revision 960168) +++ torque/src/main/java/org/apache/james/mailboxmanager/torque/UidChangeTracker.java (Arbeitskopie) @@ -30,13 +30,13 @@ 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; Index: torque/src/main/java/org/apache/james/mailboxmanager/torque/TorqueMailboxManager.java =================================================================== --- torque/src/main/java/org/apache/james/mailboxmanager/torque/TorqueMailboxManager.java (Revision 960168) +++ torque/src/main/java/org/apache/james/mailboxmanager/torque/TorqueMailboxManager.java (Arbeitskopie) @@ -60,7 +60,7 @@ 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 = '%'; Index: store/src/main/java/org/apache/james/imap/store/StoreMessageManager.java =================================================================== --- store/src/main/java/org/apache/james/imap/store/StoreMessageManager.java (Revision 960168) +++ store/src/main/java/org/apache/james/imap/store/StoreMessageManager.java (Arbeitskopie) @@ -72,7 +72,7 @@ * * */ -public abstract class StoreMessageManager implements org.apache.james.imap.mailbox.Mailbox, StoreConstants { +public abstract class StoreMessageManager implements org.apache.james.imap.mailbox.Mailbox { private static final int INITIAL_SIZE_FLAGS = 32; Index: store/src/main/java/org/apache/james/imap/store/StoreMailboxManager.java =================================================================== --- store/src/main/java/org/apache/james/imap/store/StoreMailboxManager.java (Revision 960168) +++ store/src/main/java/org/apache/james/imap/store/StoreMailboxManager.java (Arbeitskopie) @@ -29,6 +29,7 @@ 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 @@ * * @param */ -public abstract class StoreMailboxManager extends AbstractLogEnabled implements MailboxManager, StoreConstants { +public abstract class StoreMailboxManager extends AbstractLogEnabled implements MailboxManager { public static final char SQL_WILDCARD_CHAR = '%'; @@ -73,7 +74,7 @@ private UidConsumer consumer; public StoreMailboxManager(MailboxSessionMapperFactory mailboxSessionMapperFactory, final Authenticator authenticator, final Subscriber subscriber, final UidConsumer consumer) { - this(mailboxSessionMapperFactory, authenticator, subscriber, consumer, DEFAULT_FOLDER_DELIMITER); + this(mailboxSessionMapperFactory, authenticator, subscriber, consumer, MailboxConstants.DEFAULT_DELIMITER); } @@ -381,7 +382,7 @@ 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 @@ 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 */ Index: store/src/main/java/org/apache/james/imap/store/StoreConstants.java =================================================================== --- store/src/main/java/org/apache/james/imap/store/StoreConstants.java (Revision 960168) +++ store/src/main/java/org/apache/james/imap/store/StoreConstants.java (Arbeitskopie) @@ -1,38 +0,0 @@ -/**************************************************************** - * Licensed to the Apache Software Foundation (ASF) under one * - * or more contributor license agreements. See the NOTICE file * - * distributed with this work for additional information * - * regarding copyright ownership. The ASF licenses this file * - * to you under the Apache License, Version 2.0 (the * - * "License"); you may not use this file except in compliance * - * with the License. You may obtain a copy of the License at * - * * - * http://www.apache.org/licenses/LICENSE-2.0 * - * * - * Unless required by applicable law or agreed to in writing, * - * software distributed under the License is distributed on an * - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * - * KIND, either express or implied. See the License for the * - * specific language governing permissions and limitations * - * under the License. * - ****************************************************************/ -package org.apache.james.imap.store; - -/** - * Constants which are used in the Store module - * - * - */ -public interface StoreConstants { - - /** - * The default delimiter used to seperated parent/child folders - */ - public static final char DEFAULT_FOLDER_DELIMITER = '.'; - - /** - * Prefix which mark the user namespace - */ - public static final String USER_NAMESPACE_PREFIX = "#mail"; - -} Index: processor/src/main/java/org/apache/james/imap/processor/ListProcessor.java =================================================================== --- processor/src/main/java/org/apache/james/imap/processor/ListProcessor.java (Revision 960168) +++ processor/src/main/java/org/apache/james/imap/processor/ListProcessor.java (Arbeitskopie) @@ -30,6 +30,7 @@ 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 @@ final List 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) { Index: memory/src/main/java/org/apache/james/imap/inmemory/InMemoryMailboxSessionMapperFactory.java =================================================================== --- memory/src/main/java/org/apache/james/imap/inmemory/InMemoryMailboxSessionMapperFactory.java (Revision 960168) +++ memory/src/main/java/org/apache/james/imap/inmemory/InMemoryMailboxSessionMapperFactory.java (Arbeitskopie) @@ -21,17 +21,17 @@ 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 implements StoreConstants { +public class InMemoryMailboxSessionMapperFactory extends MailboxSessionMapperFactory { private MailboxMapper mailboxMapper; private MessageMapper messageMapper; @@ -44,7 +44,7 @@ } public InMemoryMailboxSessionMapperFactory() { - this(DEFAULT_FOLDER_DELIMITER); + this(MailboxConstants.DEFAULT_DELIMITER); } @Override Index: mailbox/src/main/java/org/apache/james/imap/mailbox/MailboxManager.java =================================================================== --- mailbox/src/main/java/org/apache/james/imap/mailbox/MailboxManager.java (Revision 960168) +++ mailbox/src/main/java/org/apache/james/imap/mailbox/MailboxManager.java (Arbeitskopie) @@ -68,13 +68,6 @@ char getDelimiter(); /** - * Return the prefix for the namespace - * - * @return namespacePrefix - */ - String getUserNameSpacePrefix(); - - /** *

* Resolves a path for the given user. *

Index: mailbox/src/main/java/org/apache/james/imap/mailbox/MailboxConstants.java =================================================================== --- mailbox/src/main/java/org/apache/james/imap/mailbox/MailboxConstants.java (Revision 960168) +++ mailbox/src/main/java/org/apache/james/imap/mailbox/MailboxConstants.java (Arbeitskopie) @@ -19,10 +19,17 @@ package org.apache.james.imap.mailbox; -public interface Constants { +public interface MailboxConstants { public final long UID_INFINITY = -1; public final int MSN_INFINITY = -1; + public static final String USER_NAMESPACE = "#private"; + + /** + * The default delimiter used to seperated parent/child folders + */ + public static final char DEFAULT_DELIMITER = '.'; + } Index: mailbox/src/main/java/org/apache/james/imap/mailbox/Constants.java =================================================================== --- mailbox/src/main/java/org/apache/james/imap/mailbox/Constants.java (Revision 960168) +++ mailbox/src/main/java/org/apache/james/imap/mailbox/Constants.java (Arbeitskopie) @@ -1,28 +0,0 @@ -/**************************************************************** - * Licensed to the Apache Software Foundation (ASF) under one * - * or more contributor license agreements. See the NOTICE file * - * distributed with this work for additional information * - * regarding copyright ownership. The ASF licenses this file * - * to you under the Apache License, Version 2.0 (the * - * "License"); you may not use this file except in compliance * - * with the License. You may obtain a copy of the License at * - * * - * http://www.apache.org/licenses/LICENSE-2.0 * - * * - * Unless required by applicable law or agreed to in writing, * - * software distributed under the License is distributed on an * - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * - * KIND, either express or implied. See the License for the * - * specific language governing permissions and limitations * - * under the License. * - ****************************************************************/ - -package org.apache.james.imap.mailbox; - -public interface Constants { - - public final long UID_INFINITY = -1; - - public final int MSN_INFINITY = -1; - -} Index: jpa/src/main/java/org/apache/james/imap/jpa/JPAMailboxSessionMapperFactory.java =================================================================== --- jpa/src/main/java/org/apache/james/imap/jpa/JPAMailboxSessionMapperFactory.java (Revision 960168) +++ jpa/src/main/java/org/apache/james/imap/jpa/JPAMailboxSessionMapperFactory.java (Arbeitskopie) @@ -24,9 +24,9 @@ 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 @@ * JPA implementation of {@link MailboxSessionMapperFactory} * */ -public class JPAMailboxSessionMapperFactory extends MailboxSessionMapperFactory implements StoreConstants{ +public class JPAMailboxSessionMapperFactory extends MailboxSessionMapperFactory { 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) { Index: jcr/src/main/java/org/apache/james/imap/jcr/user/JCRSubscriptionMapper.java =================================================================== --- jcr/src/main/java/org/apache/james/imap/jcr/user/JCRSubscriptionMapper.java (Revision 960168) +++ jcr/src/main/java/org/apache/james/imap/jcr/user/JCRSubscriptionMapper.java (Arbeitskopie) @@ -36,13 +36,12 @@ 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 @@ * 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 @@ // 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)); Index: jcr/src/main/java/org/apache/james/imap/jcr/JCRMailboxSessionMapperFactory.java =================================================================== --- jcr/src/main/java/org/apache/james/imap/jcr/JCRMailboxSessionMapperFactory.java (Revision 960168) +++ jcr/src/main/java/org/apache/james/imap/jcr/JCRMailboxSessionMapperFactory.java (Arbeitskopie) @@ -24,11 +24,11 @@ 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 @@ * * */ -public class JCRMailboxSessionMapperFactory extends MailboxSessionMapperFactory implements StoreConstants{ +public class JCRMailboxSessionMapperFactory extends MailboxSessionMapperFactory { private final MailboxSessionJCRRepository repository; private final Log logger; @@ -47,7 +47,7 @@ private final int DEFAULT_SCALING = 2; public JCRMailboxSessionMapperFactory(final MailboxSessionJCRRepository repository, final NodeLocker locker) { - this(repository, locker, DEFAULT_FOLDER_DELIMITER); + this(repository, locker, MailboxConstants.DEFAULT_DELIMITER); } public JCRMailboxSessionMapperFactory(final MailboxSessionJCRRepository repository, final NodeLocker locker, final char delimiter) { Index: jcr/src/main/java/org/apache/james/imap/jcr/JCRMailboxManager.java =================================================================== --- jcr/src/main/java/org/apache/james/imap/jcr/JCRMailboxManager.java (Revision 960168) +++ jcr/src/main/java/org/apache/james/imap/jcr/JCRMailboxManager.java (Arbeitskopie) @@ -36,9 +36,8 @@ /** * JCR implementation of a MailboxManager * - * */ -public class JCRMailboxManager extends StoreMailboxManager implements JCRImapConstants{ +public class JCRMailboxManager extends StoreMailboxManager implements JCRImapConstants { private final JCRMailboxSessionMapperFactory mapperFactory; private final Log logger = LogFactory.getLog(JCRMailboxManager.class); Index: deployment/src/test/java/org/apache/james/imap/functional/AbstractStressTest.java =================================================================== --- deployment/src/test/java/org/apache/james/imap/functional/AbstractStressTest.java (Revision 960168) +++ deployment/src/test/java/org/apache/james/imap/functional/AbstractStressTest.java (Arbeitskopie) @@ -29,6 +29,7 @@ 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 @@ 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 @@ 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); Index: api/src/main/java/org/apache/james/imap/api/ImapConstants.java =================================================================== --- api/src/main/java/org/apache/james/imap/api/ImapConstants.java (Revision 960168) +++ api/src/main/java/org/apache/james/imap/api/ImapConstants.java (Arbeitskopie) @@ -21,17 +21,17 @@ 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 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 static final String MIME_SUBTYPE_RFC822 = "RFC822"; - public 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";