Author: norman
Date: Tue Sep 14 10:51:40 2010
New Revision: 996831
URL: http://svn.apache.org/viewvc?rev=996831&view=rev
Log:
Add maildir support to james server and move mailbox adapter classes to extra
module (JAMES-1045)
Added:
james/server/trunk/mailbox-adapter/
james/server/trunk/mailbox-adapter/LICENSE.txt
james/server/trunk/mailbox-adapter/NOTICE.txt
james/server/trunk/mailbox-adapter/pom.xml
james/server/trunk/mailbox-adapter/src/
james/server/trunk/mailbox-adapter/src/main/
james/server/trunk/mailbox-adapter/src/main/java/
james/server/trunk/mailbox-adapter/src/main/java/org/
james/server/trunk/mailbox-adapter/src/main/java/org/apache/
james/server/trunk/mailbox-adapter/src/main/java/org/apache/james/
james/server/trunk/mailbox-adapter/src/main/java/org/apache/james/adapter/
james/server/trunk/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/
james/server/trunk/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/maildir/
james/server/trunk/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/maildir/MaildirMailboxSessionMapperFactoryUtil.java
james/server/trunk/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/store/
james/server/trunk/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/store/UserRepositoryAuthenticator.java
- copied, changed from r996421,
james/server/trunk/imapserver/src/main/java/org/apache/james/imapserver/UserRepositoryAuthenticator.java
james/server/trunk/mailbox-adapter/src/main/java/org/apache/james/mailbox/
james/server/trunk/spoolmanager/src/main/java/org/apache/james/MailQueue.java
Removed:
james/server/trunk/imapserver/src/main/java/org/apache/james/imapserver/UserRepositoryAuthenticator.java
Modified:
james/server/trunk/imapserver/pom.xml
james/server/trunk/pom.xml
james/server/trunk/pop3server/pom.xml
james/server/trunk/spring-deployment/pom.xml
james/server/trunk/spring-deployment/src/main/config/james/spring-beans.xml
Modified: james/server/trunk/imapserver/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/imapserver/pom.xml?rev=996831&r1=996830&r2=996831&view=diff
==============================================================================
--- james/server/trunk/imapserver/pom.xml (original)
+++ james/server/trunk/imapserver/pom.xml Tue Sep 14 10:51:40 2010
@@ -57,10 +57,6 @@
<artifactId>apache-james-mailbox-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>apache-james-mailbox-store</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.james.protocols</groupId>
<artifactId>protocols-impl</artifactId>
</dependency>
Added: james/server/trunk/mailbox-adapter/LICENSE.txt
URL:
http://svn.apache.org/viewvc/james/server/trunk/mailbox-adapter/LICENSE.txt?rev=996831&view=auto
==============================================================================
--- james/server/trunk/mailbox-adapter/LICENSE.txt (added)
+++ james/server/trunk/mailbox-adapter/LICENSE.txt Tue Sep 14 10:51:40 2010
@@ -0,0 +1,218 @@
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+
+
+
+ THIS PRODUCT ALSO INCLUDES THIRD PARTY SOFTWARE REDISTRIBUTED UNDER THE
+ FOLLOWING LICENSES:
+
+
+
+ Concurrent, Public Domain (see lib/concurrent.LICENSE)
+
+ BouncyCastle, MIT License (see lib/BouncyCastle.LICENSE)
+ http://www.bouncycastle.org/licence.html
+
+ DnsJava, BSD License (see lib/dnsjava.LICENSE)
+ http://www.dnsjava.org/README
+
+ JavaBeans Activation Framework, CDDL License
+ http://glassfish.dev.java.net/public/CDDLv1.0.html
+
+ JavaMail, CDDL License
+ http://glassfish.dev.java.net/public/CDDLv1.0.html
+
+ QDox, ASL 1.1 License (see tools/lib/qdox.LICENSE)
+ http://qdox.codehaus.org/license.html
+
+ MX4J, ASL 1.1 License (see phoenix-bin/bin/lib/mx4j.LICENSE)
+
+ Spice, ASL 1.1 License (see phoenix-bin/bin/lib/spice.LICENSE)
+ http://spice.codehaus.org/license.html
+
+ Wrapper, MIT License (see phoenix-bin/bin/Wrapper.LICENSE)
+ http://wrapper.tanukisoftware.org/doc/english/license.html
+
+ ISO-Relax, MIT License (see phoenix-bin/tools/lib/isorelax.LICENSE)
+
+ MSV, BSD License (see phoenix-bin/tools/lib/msv.LICENSE)
+
+ RelaxNG-Datatype, BSD License (see
phoenix-bin/tools/lib/relaxngDatatype.LICENSE)
+
+ XSDLib, BSD License (see phoenix-bin/tools/lib/xsdlib.LICENSE)
+
\ No newline at end of file
Added: james/server/trunk/mailbox-adapter/NOTICE.txt
URL:
http://svn.apache.org/viewvc/james/server/trunk/mailbox-adapter/NOTICE.txt?rev=996831&view=auto
==============================================================================
--- james/server/trunk/mailbox-adapter/NOTICE.txt (added)
+++ james/server/trunk/mailbox-adapter/NOTICE.txt Tue Sep 14 10:51:40 2010
@@ -0,0 +1,11 @@
+
+=========================================================================
+== NOTICE file for use with the Apache License, Version 2.0, ==
+=========================================================================
+
+Apache JAMES
+Copyright 2007 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
\ No newline at end of file
Added: james/server/trunk/mailbox-adapter/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/mailbox-adapter/pom.xml?rev=996831&view=auto
==============================================================================
--- james/server/trunk/mailbox-adapter/pom.xml (added)
+++ james/server/trunk/mailbox-adapter/pom.xml Tue Sep 14 10:51:40 2010
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="ISO-8859-15"?>
+<!--
+ 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.
+-->
+<project>
+ <parent>
+ <artifactId>james-server</artifactId>
+ <groupId>org.apache.james</groupId>
+ <version>3.0-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-mailbox-adapter</artifactId>
+ <name>Apache JAMES Server Mailbox Adapter</name>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-user-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-core-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>apache-james-mailbox-store</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>apache-james-mailbox-maildir</artifactId>
+ </dependency>
+
+ </dependencies>
+</project>
Added:
james/server/trunk/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/maildir/MaildirMailboxSessionMapperFactoryUtil.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/maildir/MaildirMailboxSessionMapperFactoryUtil.java?rev=996831&view=auto
==============================================================================
---
james/server/trunk/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/maildir/MaildirMailboxSessionMapperFactoryUtil.java
(added)
+++
james/server/trunk/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/maildir/MaildirMailboxSessionMapperFactoryUtil.java
Tue Sep 14 10:51:40 2010
@@ -0,0 +1,55 @@
+/****************************************************************
+ * 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.adapter.mailbox.maildir;
+
+import java.io.FileNotFoundException;
+
+import org.apache.james.mailbox.maildir.MaildirMailboxSessionMapperFactory;
+import org.apache.james.services.FileSystem;
+import org.apache.james.services.MailServer;
+
+/**
+ * Utility to instance a {...@link MaildirMailboxSessionMapperFactory} object
+ *
+ *
+ */
+public class MaildirMailboxSessionMapperFactoryUtil{
+
+
+ /**
+ * Return a {...@link MaildirMailboxSessionMapperFactory} instance
+ *
+ * @param fs
+ * @param mailServer
+ * @param rootURL
+ * @return factory
+ * @throws FileNotFoundException
+ */
+ public static MaildirMailboxSessionMapperFactory create(FileSystem fs,
MailServer mailServer, String rootURL) throws FileNotFoundException {
+ StringBuffer root = new StringBuffer();
+ root.append(fs.getFile(rootURL).getAbsolutePath());
+ if (mailServer.supportVirtualHosting()) {
+ root.append("/%domain/%user/");
+ } else {
+ root.append("/%user/");
+ }
+
+ return new MaildirMailboxSessionMapperFactory(root.toString());
+ }
+}
Copied:
james/server/trunk/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/store/UserRepositoryAuthenticator.java
(from r996421,
james/server/trunk/imapserver/src/main/java/org/apache/james/imapserver/UserRepositoryAuthenticator.java)
URL:
http://svn.apache.org/viewvc/james/server/trunk/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/store/UserRepositoryAuthenticator.java?p2=james/server/trunk/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/store/UserRepositoryAuthenticator.java&p1=james/server/trunk/imapserver/src/main/java/org/apache/james/imapserver/UserRepositoryAuthenticator.java&r1=996421&r2=996831&rev=996831&view=diff
==============================================================================
---
james/server/trunk/imapserver/src/main/java/org/apache/james/imapserver/UserRepositoryAuthenticator.java
(original)
+++
james/server/trunk/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/store/UserRepositoryAuthenticator.java
Tue Sep 14 10:51:40 2010
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.imapserver;
+package org.apache.james.adapter.mailbox.store;
import javax.annotation.Resource;
Modified: james/server/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/pom.xml?rev=996831&r1=996830&r2=996831&view=diff
==============================================================================
--- james/server/trunk/pom.xml (original)
+++ james/server/trunk/pom.xml Tue Sep 14 10:51:40 2010
@@ -54,6 +54,8 @@
<module>netty-socket</module>
<module>spring-common</module>
<module>dnsserver</module>
+ <module>mailbox-adapter</module>
+
</modules>
<ciManagement>
<system>hudson</system>
@@ -293,6 +295,11 @@
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
+ <artifactId>james-server-mailbox-adapter</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
<artifactId>james-server-common-util</artifactId>
<version>${project.version}</version>
</dependency>
@@ -458,7 +465,11 @@
<artifactId>james-server-remotemanager</artifactId>
<version>${project.version}</version>
</dependency>
-
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>apache-james-mailbox-maildir</artifactId>
+ <version>${imap.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.james</groupId>
<artifactId>apache-james-mailbox-jpa</artifactId>
Modified: james/server/trunk/pop3server/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/pop3server/pom.xml?rev=996831&r1=996830&r2=996831&view=diff
==============================================================================
--- james/server/trunk/pop3server/pom.xml (original)
+++ james/server/trunk/pop3server/pom.xml Tue Sep 14 10:51:40 2010
@@ -61,10 +61,6 @@
<artifactId>apache-james-mailbox-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>apache-james-mailbox-store</artifactId>
- </dependency>
- <dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</dependency>
Added:
james/server/trunk/spoolmanager/src/main/java/org/apache/james/MailQueue.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/spoolmanager/src/main/java/org/apache/james/MailQueue.java?rev=996831&view=auto
==============================================================================
---
james/server/trunk/spoolmanager/src/main/java/org/apache/james/MailQueue.java
(added)
+++
james/server/trunk/spoolmanager/src/main/java/org/apache/james/MailQueue.java
Tue Sep 14 10:51:40 2010
@@ -0,0 +1,74 @@
+package org.apache.james;
+
+import java.io.IOException;
+
+import javax.management.MBeanServerConnection;
+import javax.management.MBeanServerInvocationHandler;
+import javax.management.MalformedObjectNameException;
+import javax.management.ObjectName;
+import javax.management.remote.JMXConnector;
+import javax.management.remote.JMXConnectorFactory;
+import javax.management.remote.JMXServiceURL;
+
+import org.apache.activemq.broker.jmx.QueueViewMBean;
+import org.apache.james.transport.camel.JamesCamelConstants;
+
+public class MailQueue {
+ private JMXServiceURL url;
+ public void init() throws Exception{
+ this.url = new JMXServiceURL(
+ "service:jmx:rmi:///jndi/rmi://localhost:2011/jmxrmi");
+ }
+
+ protected QueueViewMBean getQueue() throws IOException,
MalformedObjectNameException, NullPointerException {
+ JMXConnector connector = JMXConnectorFactory.connect(url, null);
+ connector.connect();
+MBeanServerConnection connection = connector.getMBeanServerConnection();
+
+ QueueViewMBean queue = (QueueViewMBean)
MBeanServerInvocationHandler.newProxyInstance(connection, new
ObjectName("outgoing"),QueueViewMBean.class, true);
+ return queue;
+ }
+
+ public void purge() throws MailQueueException{
+ try {
+ getQueue().purge();
+ } catch (Exception e) {
+ throw new MailQueueException("Unable to purge queue
content",e);
+ }
+ }
+
+ public long getSize() throws MailQueueException{
+ try {
+ return getQueue().getQueueSize();
+ } catch (Exception e) {
+ throw new MailQueueException("Unable to get queue
size",e);
+ }
+ }
+
+ public void remove(String... names) throws MailQueueException {
+ try {
+ QueueViewMBean bean = getQueue();
+ StringBuffer sb = new StringBuffer();
+
+ for (int i = 0 ; i < names.length; i++) {
+ sb.append(JamesCamelConstants.JAMES_MAIL_NAME);
+ sb.append("=");
+ sb.append(names[i]);
+ if (i +1 < names.length) {
+ sb.append(" OR ");
+ }
+ }
+ bean.removeMatchingMessages(sb.toString());
+ } catch (Exception e) {
+ throw new MailQueueException("Unable to remove messages
with names " + names + " from queue", e);
+ }
+ }
+
+ public class MailQueueException extends Exception {
+
+ public MailQueueException(String string, Exception e) {
+ super(string, e);
+ }
+
+ }
+}
Modified: james/server/trunk/spring-deployment/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/spring-deployment/pom.xml?rev=996831&r1=996830&r2=996831&view=diff
==============================================================================
--- james/server/trunk/spring-deployment/pom.xml (original)
+++ james/server/trunk/spring-deployment/pom.xml Tue Sep 14 10:51:40 2010
@@ -405,6 +405,11 @@
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
+ <artifactId>james-server-mailbox-adapter</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
<artifactId>james-server-dnsserver</artifactId>
<scope>runtime</scope>
</dependency>
Modified:
james/server/trunk/spring-deployment/src/main/config/james/spring-beans.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/spring-deployment/src/main/config/james/spring-beans.xml?rev=996831&r1=996830&r2=996831&view=diff
==============================================================================
--- james/server/trunk/spring-deployment/src/main/config/james/spring-beans.xml
(original)
+++ james/server/trunk/spring-deployment/src/main/config/james/spring-beans.xml
Tue Sep 14 10:51:40 2010
@@ -313,7 +313,10 @@
<bean id="imapEncoder" factory-bean="imapEncoderFactory"
factory-method="buildImapEncoder"/>
- <bean id="authenticator"
class="org.apache.james.imapserver.UserRepositoryAuthenticator"/>
+
+
+
+ <bean id="authenticator"
class="org.apache.james.adapter.mailbox.store.UserRepositoryAuthenticator"/>
<!-- JPA implementation of IMAP Storage-->
@@ -330,6 +333,24 @@
<constructor-arg index="2" value="${openjpa.streaming}"/>
</bean>
+ <!-- Maildir implementation of IMAP Storage -->
+ <!-- WARNING: Maildir does only work on UNIX like operation systems -->
+ <!--
+ <bean id="sessionMapperFactory"
class="org.apache.james.adapter.mailbox.maildir.MaildirMailboxSessionMapperFactoryUtil"
factory-method="create">
+ <constructor-arg index="0" ref="filesystem"/>
+ <constructor-arg index="1" ref="James"/>
+ <constructor-arg index="2" value="file://var/mail/maildir/"/>
+ </bean>
+ <bean id ="subscriptionManager"
class="org.apache.james.mailbox.maildir.MaildirSubscriptionManager">
+ <constructor-arg index="0" ref="sessionMapperFactory"/>
+ </bean>
+
+ <bean id="mailboxmanager"
class="org.apache.james.mailbox.maildir.MaildirMailboxManager">
+ <constructor-arg index="0" ref="sessionMapperFactory"/>
+ <constructor-arg index="1" ref="authenticator"/>
+ </bean>
+ -->
+
<!-- JCR implementation of IMAP Storage-->
<!--
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
