Author: norman
Date: Thu Jan 6 15:49:32 2011
New Revision: 1055918
URL: http://svn.apache.org/viewvc?rev=1055918&view=rev
Log:
move abstract queue classes to queue-library
Added:
james/server/trunk/queue-library/
james/server/trunk/queue-library/LICENSE.txt
james/server/trunk/queue-library/NOTICE.txt
james/server/trunk/queue-library/pom.xml
james/server/trunk/queue-library/src/
james/server/trunk/queue-library/src/main/
james/server/trunk/queue-library/src/main/java/
james/server/trunk/queue-library/src/main/java/org/
james/server/trunk/queue-library/src/main/java/org/apache/
james/server/trunk/queue-library/src/main/java/org/apache/james/
james/server/trunk/queue-library/src/main/java/org/apache/james/queue/
james/server/trunk/queue-library/src/main/java/org/apache/james/queue/library/
james/server/trunk/queue-library/src/main/java/org/apache/james/queue/library/AbstractMailQueueFactory.java
james/server/trunk/queue-library/src/main/java/org/apache/james/queue/library/MailQueueManagement.java
- copied, changed from r1052807,
james/server/trunk/queue-jms/src/main/java/org/apache/james/queue/jms/JMSMailQueueManagement.java
Removed:
james/server/trunk/queue-jms/src/main/java/org/apache/james/queue/jms/JMSMailQueueManagement.java
Modified:
james/server/trunk/pom.xml
james/server/trunk/queue-activemq/src/main/java/org/apache/james/queue/activemq/ActiveMQMailQueueFactory.java
james/server/trunk/queue-api/src/main/java/org/apache/james/queue/api/MailQueueManagementMBean.java
james/server/trunk/queue-jms/pom.xml
james/server/trunk/queue-jms/src/main/java/org/apache/james/queue/jms/JMSMailQueueFactory.java
Modified: james/server/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/pom.xml?rev=1055918&r1=1055917&r2=1055918&view=diff
==============================================================================
--- james/server/trunk/pom.xml (original)
+++ james/server/trunk/pom.xml Thu Jan 6 15:49:32 2011
@@ -63,6 +63,7 @@
<module>repository-file</module>
<module>smtpserver</module>
<module>queue-api</module>
+ <module>queue-library</module>
<module>queue-jms</module>
<module>queue-activemq</module>
<module>user-api</module>
@@ -298,6 +299,12 @@
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
+ <artifactId>james-server-queue-library</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.james</groupId>
<artifactId>james-server-queue-api</artifactId>
<version>${project.version}</version>
</dependency>
Modified:
james/server/trunk/queue-activemq/src/main/java/org/apache/james/queue/activemq/ActiveMQMailQueueFactory.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/queue-activemq/src/main/java/org/apache/james/queue/activemq/ActiveMQMailQueueFactory.java?rev=1055918&r1=1055917&r2=1055918&view=diff
==============================================================================
---
james/server/trunk/queue-activemq/src/main/java/org/apache/james/queue/activemq/ActiveMQMailQueueFactory.java
(original)
+++
james/server/trunk/queue-activemq/src/main/java/org/apache/james/queue/activemq/ActiveMQMailQueueFactory.java
Thu Jan 6 15:49:32 2011
@@ -41,7 +41,7 @@ public class ActiveMQMailQueueFactory ex
@Override
- protected MailQueue createMailQueue(String name, boolean useJMX) {
+ protected MailQueue createMailQueue(String name) {
return new ActiveMQMailQueue(connectionFactory, name, useBlob, log);
}
}
Modified:
james/server/trunk/queue-api/src/main/java/org/apache/james/queue/api/MailQueueManagementMBean.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/queue-api/src/main/java/org/apache/james/queue/api/MailQueueManagementMBean.java?rev=1055918&r1=1055917&r2=1055918&view=diff
==============================================================================
---
james/server/trunk/queue-api/src/main/java/org/apache/james/queue/api/MailQueueManagementMBean.java
(original)
+++
james/server/trunk/queue-api/src/main/java/org/apache/james/queue/api/MailQueueManagementMBean.java
Thu Jan 6 15:49:32 2011
@@ -26,41 +26,41 @@ public interface MailQueueManagementMBea
*
* @return size the size or -1 if it could not get calculated
*/
- public long getSize();
+ public long getSize() throws Exception;
/**
* Flush queue to make every Mail ready to consume.
*
* @return count the count of all flushed mails or -1 if the flush was not
possible
*/
- public long flush();
+ public long flush() throws Exception;
/**
* Clear the queue
*
* @return count the count of all removed mails or -1 if clear was not
possible
*/
- public long clear();
+ public long clear() throws Exception;
/**
* Remove mail with name from the queue
*
* @return count the count of all removed mails or -1 if clear was not
possible
*/
- public long removeWithName(String name);
+ public long removeWithName(String name) throws Exception;
/**
* Remove mail with specific sender from the queue
*
* @return count the count of all removed mails or -1 if clear was not
possible
*/
- public long removeWithSender(String address);
+ public long removeWithSender(String address) throws Exception;
/**
* Remove mail with specific recipient from the queue
*
* @return count the count of all removed mails or -1 if clear was not
possible
*/
- public long removeWithRecipient(String address);
+ public long removeWithRecipient(String address) throws Exception;
}
Modified: james/server/trunk/queue-jms/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/queue-jms/pom.xml?rev=1055918&r1=1055917&r2=1055918&view=diff
==============================================================================
--- james/server/trunk/queue-jms/pom.xml (original)
+++ james/server/trunk/queue-jms/pom.xml Thu Jan 6 15:49:32 2011
@@ -28,13 +28,14 @@
<artifactId>james-server-queue-jms</artifactId>
<name>Apache James Server JMS Mail Queue</name>
<dependencies>
+
<dependency>
<groupId>org.apache.james</groupId>
<artifactId>james-server-queue-api</artifactId>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.apache.james</groupId>
- <artifactId>james-server-lifecycle-api</artifactId>
+ <artifactId>james-server-queue-library</artifactId>
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
Modified:
james/server/trunk/queue-jms/src/main/java/org/apache/james/queue/jms/JMSMailQueueFactory.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/queue-jms/src/main/java/org/apache/james/queue/jms/JMSMailQueueFactory.java?rev=1055918&r1=1055917&r2=1055918&view=diff
==============================================================================
---
james/server/trunk/queue-jms/src/main/java/org/apache/james/queue/jms/JMSMailQueueFactory.java
(original)
+++
james/server/trunk/queue-jms/src/main/java/org/apache/james/queue/jms/JMSMailQueueFactory.java
Thu Jan 6 15:49:32 2011
@@ -18,136 +18,35 @@
****************************************************************/
package org.apache.james.queue.jms;
-import java.lang.management.ManagementFactory;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
import javax.annotation.Resource;
import javax.jms.ConnectionFactory;
-import javax.management.MBeanServer;
-import javax.management.ObjectName;
-import org.apache.commons.logging.Log;
-import org.apache.james.lifecycle.api.LifecycleUtil;
-import org.apache.james.lifecycle.api.LogEnabled;
import org.apache.james.queue.api.MailQueue;
import org.apache.james.queue.api.MailQueueFactory;
-import org.apache.james.queue.api.MailQueueManagementMBean;
-import org.apache.james.queue.api.ManageableMailQueue;
+import org.apache.james.queue.library.AbstractMailQueueFactory;
/**
* {...@link MailQueueFactory} implementation which use JMS
*
*
*/
-public class JMSMailQueueFactory implements MailQueueFactory, LogEnabled{
-
-
+public class JMSMailQueueFactory extends AbstractMailQueueFactory{
- protected final Map<String, MailQueue> queues = new HashMap<String,
MailQueue>();
protected ConnectionFactory connectionFactory;
- protected Log log;
- private boolean useJMX = true;
- private MBeanServer mbeanServer;
- private List<String> mbeans = new ArrayList<String>();
-
- public void setUseJMX(boolean useJMX) {
- this.useJMX = useJMX;
- }
-
- @PostConstruct
- public void init() {
- mbeanServer = ManagementFactory.getPlatformMBeanServer();
- }
- @PreDestroy
- public void destroy() {
- for (int i = 0; i < mbeans.size(); i++) {
- unregisterMBean(mbeans.get(i));
- }
-
- Iterator<MailQueue> it = queues.values().iterator();
- while(it.hasNext()) {
- LifecycleUtil.dispose(it.next());
- }
-
- }
+
@Resource(name="jmsConnectionFactory")
public void setConnectionFactory(ConnectionFactory connectionFactory) {
this.connectionFactory = connectionFactory;
}
-
- /*
- *
- * (non-Javadoc)
- * @see
org.apache.james.queue.activemq.MailQueueFactory#getQueue(java.lang.String)
- */
- public synchronized final MailQueue getQueue(String name) {
- MailQueue queue = queues.get(name);
- if (queue == null) {
- queue = createMailQueue(name, useJMX);
- if (useJMX) {
- registerMBean(name, queue);
-
- }
- queues.put(name, queue);
- }
-
- return queue;
- }
- /**
- * Create a {...@link MailQueue} for the given name
- *
- * @param name
- * @return queue
- */
- protected MailQueue createMailQueue(String name, boolean useJMX) {
- return new JMSMailQueue(connectionFactory, name, log);
- }
-
- protected synchronized void registerMBean(String queuename, MailQueue
queue) {
-
- String mbeanName = "org.apache.james:type=component,name=queue,queue="
+ queuename;
- try {
- MailQueueManagementMBean mbean = null;
- if (queue instanceof ManageableMailQueue) {
- mbean = new JMSMailQueueManagement((ManageableMailQueue)queue);
- } else if (queue instanceof MailQueueManagementMBean) {
- mbean = (MailQueueManagementMBean) queue;
- }
- if (mbean != null) {
- mbeanServer.registerMBean(mbean, new ObjectName(mbeanName));
- mbeans.add(mbeanName);
- }
- } catch (Exception e) {
- throw new RuntimeException("Unable to register mbean" , e);
- }
-
- }
-
- protected synchronized void unregisterMBean(String mbeanName){
- try {
- mbeanServer.unregisterMBean(new ObjectName(mbeanName));
- mbeans.remove(mbeanName);
- } catch (Exception e) {
- throw new RuntimeException("Unable to unregister mbean" , e);
- }
-
- }
-
/*
* (non-Javadoc)
- * @see
org.apache.james.lifecycle.LogEnabled#setLog(org.apache.commons.logging.Log)
+ * @see
org.apache.james.queue.library.AbstractMailQueueFactory#createMailQueue(java.lang.String)
*/
- public void setLog(Log log) {
- this.log = log;
+ protected MailQueue createMailQueue(String name) {
+ return new JMSMailQueue(connectionFactory, name, log);
}
}
\ No newline at end of file
Added: james/server/trunk/queue-library/LICENSE.txt
URL:
http://svn.apache.org/viewvc/james/server/trunk/queue-library/LICENSE.txt?rev=1055918&view=auto
==============================================================================
--- james/server/trunk/queue-library/LICENSE.txt (added)
+++ james/server/trunk/queue-library/LICENSE.txt Thu Jan 6 15:49:32 2011
@@ -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/queue-library/NOTICE.txt
URL:
http://svn.apache.org/viewvc/james/server/trunk/queue-library/NOTICE.txt?rev=1055918&view=auto
==============================================================================
--- james/server/trunk/queue-library/NOTICE.txt (added)
+++ james/server/trunk/queue-library/NOTICE.txt Thu Jan 6 15:49:32 2011
@@ -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/queue-library/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/queue-library/pom.xml?rev=1055918&view=auto
==============================================================================
--- james/server/trunk/queue-library/pom.xml (added)
+++ james/server/trunk/queue-library/pom.xml Thu Jan 6 15:49:32 2011
@@ -0,0 +1,76 @@
+<?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 xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+ <parent>
+ <artifactId>james-server</artifactId>
+ <groupId>org.apache.james</groupId>
+ <version>3.0-M3-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-queue-library</artifactId>
+ <name>Apache James Server Queue Library</name>
+
+ <properties>
+ <!-- OSGI stuff -->
+ <james.osgi.export>
+ org.apache.james.*
+ </james.osgi.export>
+ <james.osgi.import>
+ *
+ </james.osgi.import>
+ </properties>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+ <manifest>
+
<addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+ </manifest>
+ </archive>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>jar</goal>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-queue-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-lifecycle-api</artifactId>
+ </dependency>
+ </dependencies>
+</project>
Added:
james/server/trunk/queue-library/src/main/java/org/apache/james/queue/library/AbstractMailQueueFactory.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/queue-library/src/main/java/org/apache/james/queue/library/AbstractMailQueueFactory.java?rev=1055918&view=auto
==============================================================================
---
james/server/trunk/queue-library/src/main/java/org/apache/james/queue/library/AbstractMailQueueFactory.java
(added)
+++
james/server/trunk/queue-library/src/main/java/org/apache/james/queue/library/AbstractMailQueueFactory.java
Thu Jan 6 15:49:32 2011
@@ -0,0 +1,144 @@
+/****************************************************************
+ * 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.queue.library;
+
+import java.lang.management.ManagementFactory;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.PostConstruct;
+import javax.annotation.PreDestroy;
+import javax.management.MBeanServer;
+import javax.management.ObjectName;
+
+import org.apache.commons.logging.Log;
+import org.apache.james.lifecycle.api.LifecycleUtil;
+import org.apache.james.lifecycle.api.LogEnabled;
+import org.apache.james.queue.api.MailQueue;
+import org.apache.james.queue.api.MailQueueFactory;
+import org.apache.james.queue.api.MailQueueManagementMBean;
+import org.apache.james.queue.api.ManageableMailQueue;
+import org.apache.james.queue.library.MailQueueManagement;
+
+/**
+ * {...@link MailQueueFactory} abstract base class which take care of register
the {...@link MailQueue} implementations via JMX (if possible)
+ *
+ *
+ */
+public abstract class AbstractMailQueueFactory implements MailQueueFactory,
LogEnabled{
+
+
+
+ protected final Map<String, MailQueue> queues = new HashMap<String,
MailQueue>();
+ protected Log log;
+ private boolean useJMX = true;
+ private MBeanServer mbeanServer;
+ private List<String> mbeans = new ArrayList<String>();
+
+ public void setUseJMX(boolean useJMX) {
+ this.useJMX = useJMX;
+ }
+
+ @PostConstruct
+ public void init() {
+ mbeanServer = ManagementFactory.getPlatformMBeanServer();
+ }
+
+ @PreDestroy
+ public void destroy() {
+ for (int i = 0; i < mbeans.size(); i++) {
+ unregisterMBean(mbeans.get(i));
+ }
+
+ Iterator<MailQueue> it = queues.values().iterator();
+ while(it.hasNext()) {
+ LifecycleUtil.dispose(it.next());
+ }
+
+ }
+
+ /*
+ *
+ * (non-Javadoc)
+ * @see
org.apache.james.queue.activemq.MailQueueFactory#getQueue(java.lang.String)
+ */
+ public synchronized final MailQueue getQueue(String name) {
+ MailQueue queue = queues.get(name);
+ if (queue == null) {
+ queue = createMailQueue(name);
+ if (useJMX) {
+ registerMBean(name, queue);
+
+ }
+ queues.put(name, queue);
+ }
+
+ return queue;
+ }
+
+
+ /**
+ * Create a {...@link MailQueue} for the given name
+ *
+ * @param name
+ * @return queue
+ */
+ protected abstract MailQueue createMailQueue(String name);
+
+ protected synchronized void registerMBean(String queuename, MailQueue
queue) {
+
+ String mbeanName = "org.apache.james:type=component,name=queue,queue="
+ queuename;
+ try {
+ MailQueueManagementMBean mbean = null;
+ if (queue instanceof ManageableMailQueue) {
+ mbean = new MailQueueManagement((ManageableMailQueue)queue);
+ } else if (queue instanceof MailQueueManagementMBean) {
+ mbean = (MailQueueManagementMBean) queue;
+ }
+ if (mbean != null) {
+ mbeanServer.registerMBean(mbean, new ObjectName(mbeanName));
+ mbeans.add(mbeanName);
+ }
+ } catch (Exception e) {
+ throw new RuntimeException("Unable to register mbean" , e);
+ }
+
+ }
+
+ protected synchronized void unregisterMBean(String mbeanName){
+ try {
+ mbeanServer.unregisterMBean(new ObjectName(mbeanName));
+ mbeans.remove(mbeanName);
+ } catch (Exception e) {
+ throw new RuntimeException("Unable to unregister mbean" , e);
+ }
+
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see
org.apache.james.lifecycle.LogEnabled#setLog(org.apache.commons.logging.Log)
+ */
+ public void setLog(Log log) {
+ this.log = log;
+ }
+}
\ No newline at end of file
Copied:
james/server/trunk/queue-library/src/main/java/org/apache/james/queue/library/MailQueueManagement.java
(from r1052807,
james/server/trunk/queue-jms/src/main/java/org/apache/james/queue/jms/JMSMailQueueManagement.java)
URL:
http://svn.apache.org/viewvc/james/server/trunk/queue-library/src/main/java/org/apache/james/queue/library/MailQueueManagement.java?p2=james/server/trunk/queue-library/src/main/java/org/apache/james/queue/library/MailQueueManagement.java&p1=james/server/trunk/queue-jms/src/main/java/org/apache/james/queue/jms/JMSMailQueueManagement.java&r1=1052807&r2=1055918&rev=1055918&view=diff
==============================================================================
---
james/server/trunk/queue-jms/src/main/java/org/apache/james/queue/jms/JMSMailQueueManagement.java
(original)
+++
james/server/trunk/queue-library/src/main/java/org/apache/james/queue/library/MailQueueManagement.java
Thu Jan 6 15:49:32 2011
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.queue.jms;
+package org.apache.james.queue.library;
import javax.management.NotCompliantMBeanException;
import javax.management.StandardMBean;
@@ -32,10 +32,10 @@ import org.apache.james.queue.api.Manage
*
*
*/
-public class JMSMailQueueManagement extends StandardMBean implements
MailQueueManagementMBean{
+public class MailQueueManagement extends StandardMBean implements
MailQueueManagementMBean{
private final ManageableMailQueue queue;
- public JMSMailQueueManagement(ManageableMailQueue queue) throws
NotCompliantMBeanException {
+ public MailQueueManagement(ManageableMailQueue queue) throws
NotCompliantMBeanException {
super(MailQueueManagementMBean.class);
this.queue = queue;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
