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 er...@apache.org on 2010/10/21 10:21:01 UTC
svn commit: r1025880 - in /james/server/trunk:
core-function/src/main/java/org/apache/james/
core-function/src/main/java/org/apache/james/transport/
mailets/src/main/java/org/apache/james/transport/mailets/
queue-activemq/src/main/java/org/apache/james...
Author: eric
Date: Thu Oct 21 08:21:00 2010
New Revision: 1025880
URL: http://svn.apache.org/viewvc?rev=1025880&view=rev
Log:
Align packages hierarchy for queue service (JAMES-1074)
Added:
james/server/trunk/queue-api/src/main/java/org/apache/james/queue/api/
james/server/trunk/queue-api/src/main/java/org/apache/james/queue/api/MailQueue.java
- copied, changed from r1025861, james/server/trunk/queue-api/src/main/java/org/apache/james/queue/MailQueue.java
james/server/trunk/queue-api/src/main/java/org/apache/james/queue/api/MailQueueFactory.java
- copied, changed from r1025861, james/server/trunk/queue-api/src/main/java/org/apache/james/queue/MailQueueFactory.java
james/server/trunk/queue-api/src/test/java/org/apache/james/queue/api/
james/server/trunk/queue-api/src/test/java/org/apache/james/queue/api/MockMailQueue.java
- copied, changed from r1025861, james/server/trunk/queue-api/src/test/java/org/apache/james/queue/MockMailQueue.java
james/server/trunk/queue-api/src/test/java/org/apache/james/queue/api/MockMailQueueFactory.java
- copied, changed from r1025861, james/server/trunk/queue-api/src/test/java/org/apache/james/queue/MockMailQueueFactory.java
Removed:
james/server/trunk/queue-api/src/main/java/org/apache/james/queue/MailQueue.java
james/server/trunk/queue-api/src/main/java/org/apache/james/queue/MailQueueFactory.java
james/server/trunk/queue-api/src/test/java/org/apache/james/queue/MockMailQueue.java
james/server/trunk/queue-api/src/test/java/org/apache/james/queue/MockMailQueueFactory.java
Modified:
james/server/trunk/core-function/src/main/java/org/apache/james/JamesMailServer.java
james/server/trunk/core-function/src/main/java/org/apache/james/transport/JamesSpoolManager.java
james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/RemoteDelivery.java
james/server/trunk/queue-activemq/src/main/java/org/apache/james/queue/activemq/ActiveMQMailQueue.java
james/server/trunk/queue-activemq/src/main/java/org/apache/james/queue/activemq/ActiveMQMailQueueFactory.java
james/server/trunk/queue-activemq/src/main/java/org/apache/james/queue/activemq/ActiveMQMailQueueItem.java
james/server/trunk/queue-jms/src/main/java/org/apache/james/queue/jms/JMSMailQueue.java
james/server/trunk/queue-jms/src/main/java/org/apache/james/queue/jms/JMSMailQueueFactory.java
james/server/trunk/queue-jms/src/main/java/org/apache/james/queue/jms/JMSMailQueueItem.java
Modified: james/server/trunk/core-function/src/main/java/org/apache/james/JamesMailServer.java
URL: http://svn.apache.org/viewvc/james/server/trunk/core-function/src/main/java/org/apache/james/JamesMailServer.java?rev=1025880&r1=1025879&r2=1025880&view=diff
==============================================================================
--- james/server/trunk/core-function/src/main/java/org/apache/james/JamesMailServer.java (original)
+++ james/server/trunk/core-function/src/main/java/org/apache/james/JamesMailServer.java Thu Oct 21 08:21:00 2010
@@ -38,8 +38,8 @@ import org.apache.james.domainlist.api.M
import org.apache.james.lifecycle.Configurable;
import org.apache.james.lifecycle.LifecycleUtil;
import org.apache.james.lifecycle.LogEnabled;
-import org.apache.james.queue.MailQueue;
-import org.apache.james.queue.MailQueueFactory;
+import org.apache.james.queue.api.MailQueue;
+import org.apache.james.queue.api.MailQueueFactory;
import org.apache.james.services.MailServer;
import org.apache.mailet.Mail;
import org.apache.mailet.MailAddress;
Modified: james/server/trunk/core-function/src/main/java/org/apache/james/transport/JamesSpoolManager.java
URL: http://svn.apache.org/viewvc/james/server/trunk/core-function/src/main/java/org/apache/james/transport/JamesSpoolManager.java?rev=1025880&r1=1025879&r2=1025880&view=diff
==============================================================================
--- james/server/trunk/core-function/src/main/java/org/apache/james/transport/JamesSpoolManager.java (original)
+++ james/server/trunk/core-function/src/main/java/org/apache/james/transport/JamesSpoolManager.java Thu Oct 21 08:21:00 2010
@@ -40,9 +40,9 @@ import org.apache.james.lifecycle.LogEna
import org.apache.james.mailetcontainer.api.MailProcessor;
import org.apache.james.mailetcontainer.api.MailProcessorList;
import org.apache.james.mailetcontainer.api.MailetContainer;
-import org.apache.james.queue.MailQueue;
-import org.apache.james.queue.MailQueueFactory;
-import org.apache.james.queue.MailQueue.MailQueueItem;
+import org.apache.james.queue.api.MailQueue;
+import org.apache.james.queue.api.MailQueueFactory;
+import org.apache.james.queue.api.MailQueue.MailQueueItem;
import org.apache.james.services.SpoolManager;
import org.apache.mailet.Mail;
import org.apache.mailet.Mailet;
Modified: james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/RemoteDelivery.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/RemoteDelivery.java?rev=1025880&r1=1025879&r2=1025880&view=diff
==============================================================================
--- james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/RemoteDelivery.java (original)
+++ james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/RemoteDelivery.java Thu Oct 21 08:21:00 2010
@@ -24,10 +24,10 @@ package org.apache.james.transport.maile
import org.apache.james.dnsservice.api.DNSService;
import org.apache.james.dnsservice.api.TemporaryResolutionException;
import org.apache.james.lifecycle.LifecycleUtil;
-import org.apache.james.queue.MailQueue;
-import org.apache.james.queue.MailQueueFactory;
-import org.apache.james.queue.MailQueue.MailQueueException;
-import org.apache.james.queue.MailQueue.MailQueueItem;
+import org.apache.james.queue.api.MailQueue;
+import org.apache.james.queue.api.MailQueueFactory;
+import org.apache.james.queue.api.MailQueue.MailQueueException;
+import org.apache.james.queue.api.MailQueue.MailQueueItem;
import org.apache.james.services.MailServer;
import org.apache.james.util.TimeConverter;
import org.apache.mailet.base.GenericMailet;
Modified: james/server/trunk/queue-activemq/src/main/java/org/apache/james/queue/activemq/ActiveMQMailQueue.java
URL: http://svn.apache.org/viewvc/james/server/trunk/queue-activemq/src/main/java/org/apache/james/queue/activemq/ActiveMQMailQueue.java?rev=1025880&r1=1025879&r2=1025880&view=diff
==============================================================================
--- james/server/trunk/queue-activemq/src/main/java/org/apache/james/queue/activemq/ActiveMQMailQueue.java (original)
+++ james/server/trunk/queue-activemq/src/main/java/org/apache/james/queue/activemq/ActiveMQMailQueue.java Thu Oct 21 08:21:00 2010
@@ -42,7 +42,7 @@ import org.apache.commons.logging.Log;
import org.apache.james.core.MimeMessageCopyOnWriteProxy;
import org.apache.james.core.MimeMessageInputStream;
import org.apache.james.core.MimeMessageInputStreamSource;
-import org.apache.james.queue.MailQueue;
+import org.apache.james.queue.api.MailQueue;
import org.apache.james.queue.jms.JMSMailQueue;
import org.apache.mailet.Mail;
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=1025880&r1=1025879&r2=1025880&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 Oct 21 08:21:00 2010
@@ -22,8 +22,8 @@ import javax.jms.BytesMessage;
import javax.jms.Message;
import org.apache.activemq.BlobMessage;
-import org.apache.james.queue.MailQueue;
-import org.apache.james.queue.MailQueueFactory;
+import org.apache.james.queue.api.MailQueue;
+import org.apache.james.queue.api.MailQueueFactory;
import org.apache.james.queue.jms.JMSMailQueueFactory;
Modified: james/server/trunk/queue-activemq/src/main/java/org/apache/james/queue/activemq/ActiveMQMailQueueItem.java
URL: http://svn.apache.org/viewvc/james/server/trunk/queue-activemq/src/main/java/org/apache/james/queue/activemq/ActiveMQMailQueueItem.java?rev=1025880&r1=1025879&r2=1025880&view=diff
==============================================================================
--- james/server/trunk/queue-activemq/src/main/java/org/apache/james/queue/activemq/ActiveMQMailQueueItem.java (original)
+++ james/server/trunk/queue-activemq/src/main/java/org/apache/james/queue/activemq/ActiveMQMailQueueItem.java Thu Oct 21 08:21:00 2010
@@ -29,8 +29,8 @@ import javax.jms.Session;
import org.apache.activemq.command.ActiveMQBlobMessage;
import org.apache.commons.logging.Log;
-import org.apache.james.queue.MailQueue.MailQueueException;
-import org.apache.james.queue.MailQueue.MailQueueItem;
+import org.apache.james.queue.api.MailQueue.MailQueueException;
+import org.apache.james.queue.api.MailQueue.MailQueueItem;
import org.apache.james.queue.jms.JMSMailQueueItem;
import org.apache.mailet.Mail;
Copied: james/server/trunk/queue-api/src/main/java/org/apache/james/queue/api/MailQueue.java (from r1025861, james/server/trunk/queue-api/src/main/java/org/apache/james/queue/MailQueue.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/queue-api/src/main/java/org/apache/james/queue/api/MailQueue.java?p2=james/server/trunk/queue-api/src/main/java/org/apache/james/queue/api/MailQueue.java&p1=james/server/trunk/queue-api/src/main/java/org/apache/james/queue/MailQueue.java&r1=1025861&r2=1025880&rev=1025880&view=diff
==============================================================================
--- james/server/trunk/queue-api/src/main/java/org/apache/james/queue/MailQueue.java (original)
+++ james/server/trunk/queue-api/src/main/java/org/apache/james/queue/api/MailQueue.java Thu Oct 21 08:21:00 2010
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.queue;
+package org.apache.james.queue.api;
import java.util.concurrent.TimeUnit;
Copied: james/server/trunk/queue-api/src/main/java/org/apache/james/queue/api/MailQueueFactory.java (from r1025861, james/server/trunk/queue-api/src/main/java/org/apache/james/queue/MailQueueFactory.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/queue-api/src/main/java/org/apache/james/queue/api/MailQueueFactory.java?p2=james/server/trunk/queue-api/src/main/java/org/apache/james/queue/api/MailQueueFactory.java&p1=james/server/trunk/queue-api/src/main/java/org/apache/james/queue/MailQueueFactory.java&r1=1025861&r2=1025880&rev=1025880&view=diff
==============================================================================
--- james/server/trunk/queue-api/src/main/java/org/apache/james/queue/MailQueueFactory.java (original)
+++ james/server/trunk/queue-api/src/main/java/org/apache/james/queue/api/MailQueueFactory.java Thu Oct 21 08:21:00 2010
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.queue;
+package org.apache.james.queue.api;
/**
* Factory for {@link MailQueue}
Copied: james/server/trunk/queue-api/src/test/java/org/apache/james/queue/api/MockMailQueue.java (from r1025861, james/server/trunk/queue-api/src/test/java/org/apache/james/queue/MockMailQueue.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/queue-api/src/test/java/org/apache/james/queue/api/MockMailQueue.java?p2=james/server/trunk/queue-api/src/test/java/org/apache/james/queue/api/MockMailQueue.java&p1=james/server/trunk/queue-api/src/test/java/org/apache/james/queue/MockMailQueue.java&r1=1025861&r2=1025880&rev=1025880&view=diff
==============================================================================
--- james/server/trunk/queue-api/src/test/java/org/apache/james/queue/MockMailQueue.java (original)
+++ james/server/trunk/queue-api/src/test/java/org/apache/james/queue/api/MockMailQueue.java Thu Oct 21 08:21:00 2010
@@ -18,14 +18,15 @@
****************************************************************/
-package org.apache.james.queue;
+package org.apache.james.queue.api;
import java.util.concurrent.Executors;
import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
-import org.apache.james.queue.MailQueue.MailQueueException;
+import org.apache.james.queue.api.MailQueue;
+import org.apache.james.queue.api.MailQueue.MailQueueException;
import org.apache.mailet.Mail;
public class MockMailQueue implements MailQueue{
Copied: james/server/trunk/queue-api/src/test/java/org/apache/james/queue/api/MockMailQueueFactory.java (from r1025861, james/server/trunk/queue-api/src/test/java/org/apache/james/queue/MockMailQueueFactory.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/queue-api/src/test/java/org/apache/james/queue/api/MockMailQueueFactory.java?p2=james/server/trunk/queue-api/src/test/java/org/apache/james/queue/api/MockMailQueueFactory.java&p1=james/server/trunk/queue-api/src/test/java/org/apache/james/queue/MockMailQueueFactory.java&r1=1025861&r2=1025880&rev=1025880&view=diff
==============================================================================
--- james/server/trunk/queue-api/src/test/java/org/apache/james/queue/MockMailQueueFactory.java (original)
+++ james/server/trunk/queue-api/src/test/java/org/apache/james/queue/api/MockMailQueueFactory.java Thu Oct 21 08:21:00 2010
@@ -18,11 +18,14 @@
****************************************************************/
-package org.apache.james.queue;
+package org.apache.james.queue.api;
import java.util.HashMap;
import java.util.Map;
+import org.apache.james.queue.api.MailQueue;
+import org.apache.james.queue.api.MailQueueFactory;
+
public class MockMailQueueFactory implements MailQueueFactory{
private final Map<String, MailQueue> queues = new HashMap<String, MailQueue>();
Modified: james/server/trunk/queue-jms/src/main/java/org/apache/james/queue/jms/JMSMailQueue.java
URL: http://svn.apache.org/viewvc/james/server/trunk/queue-jms/src/main/java/org/apache/james/queue/jms/JMSMailQueue.java?rev=1025880&r1=1025879&r2=1025880&view=diff
==============================================================================
--- james/server/trunk/queue-jms/src/main/java/org/apache/james/queue/jms/JMSMailQueue.java (original)
+++ james/server/trunk/queue-jms/src/main/java/org/apache/james/queue/jms/JMSMailQueue.java Thu Oct 21 08:21:00 2010
@@ -46,7 +46,7 @@ import org.apache.commons.logging.Log;
import org.apache.james.core.MailImpl;
import org.apache.james.core.MimeMessageCopyOnWriteProxy;
import org.apache.james.core.MimeMessageInputStreamSource;
-import org.apache.james.queue.MailQueue;
+import org.apache.james.queue.api.MailQueue;
import org.apache.mailet.Mail;
import org.apache.mailet.MailAddress;
@@ -111,7 +111,7 @@ public class JMSMailQueue implements Mai
*
* Many JMS implementations support better solutions for this, so this should get overridden by these implementations
*
- * @see org.apache.james.queue.MailQueue#deQueue(org.apache.james.queue.MailQueue.DequeueOperation)
+ * @see org.apache.james.queue.api.MailQueue#deQueue(org.apache.james.queue.api.api.MailQueue.DequeueOperation)
*/
public MailQueueItem deQueue() throws MailQueueException {
Connection connection = null;
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=1025880&r1=1025879&r2=1025880&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 Oct 21 08:21:00 2010
@@ -26,8 +26,8 @@ import javax.jms.ConnectionFactory;
import org.apache.commons.logging.Log;
import org.apache.james.lifecycle.LogEnabled;
-import org.apache.james.queue.MailQueue;
-import org.apache.james.queue.MailQueueFactory;
+import org.apache.james.queue.api.MailQueue;
+import org.apache.james.queue.api.MailQueueFactory;
/**
* {@link MailQueueFactory} implementation which use JMS
Modified: james/server/trunk/queue-jms/src/main/java/org/apache/james/queue/jms/JMSMailQueueItem.java
URL: http://svn.apache.org/viewvc/james/server/trunk/queue-jms/src/main/java/org/apache/james/queue/jms/JMSMailQueueItem.java?rev=1025880&r1=1025879&r2=1025880&view=diff
==============================================================================
--- james/server/trunk/queue-jms/src/main/java/org/apache/james/queue/jms/JMSMailQueueItem.java (original)
+++ james/server/trunk/queue-jms/src/main/java/org/apache/james/queue/jms/JMSMailQueueItem.java Thu Oct 21 08:21:00 2010
@@ -24,8 +24,8 @@ import javax.jms.JMSException;
import javax.jms.MessageConsumer;
import javax.jms.Session;
-import org.apache.james.queue.MailQueue.MailQueueException;
-import org.apache.james.queue.MailQueue.MailQueueItem;
+import org.apache.james.queue.api.MailQueue.MailQueueException;
+import org.apache.james.queue.api.MailQueue.MailQueueItem;
import org.apache.mailet.Mail;
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org