Author: norman
Date: Tue Mar 9 18:09:23 2010
New Revision: 921026
URL: http://svn.apache.org/viewvc?rev=921026&view=rev
Log:
Upgrade CAMEL to 2.3-SNAPSHOT because we need the fix for the bug CAMEL-2529.
Rename some classes to better reflect their usage (JAMES-977)
Added:
james/server/trunk/spoolmanager/src/main/java/org/apache/james/transport/camel/JMSSelectorPollingComponent.java
- copied, changed from r920026,
james/server/trunk/spoolmanager/src/main/java/org/apache/james/transport/camel/ActiveMQPollingComponent.java
james/server/trunk/spoolmanager/src/main/java/org/apache/james/transport/camel/JMSSelectorPollingConsumer.java
- copied, changed from r920026,
james/server/trunk/spoolmanager/src/main/java/org/apache/james/transport/camel/ActiveMQPollingConsumer.java
james/server/trunk/spoolmanager/src/main/java/org/apache/james/transport/camel/JMSSelectorPollingEndpoint.java
- copied, changed from r920026,
james/server/trunk/spoolmanager/src/main/java/org/apache/james/transport/camel/ActiveMQPollingEndpoint.java
Removed:
james/server/trunk/spoolmanager/src/main/java/org/apache/james/transport/camel/ActiveMQPollingComponent.java
james/server/trunk/spoolmanager/src/main/java/org/apache/james/transport/camel/ActiveMQPollingConsumer.java
james/server/trunk/spoolmanager/src/main/java/org/apache/james/transport/camel/ActiveMQPollingEndpoint.java
james/server/trunk/spoolmanager/src/main/java/org/apache/james/transport/camel/RemoteDeliveryRecipientList.java
Modified:
james/server/trunk/core-library/src/main/java/org/apache/james/Constants.java
james/server/trunk/pom.xml
james/server/trunk/spoolmanager/src/main/java/org/apache/james/transport/camel/JamesCamelConstants.java
Modified:
james/server/trunk/core-library/src/main/java/org/apache/james/Constants.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/core-library/src/main/java/org/apache/james/Constants.java?rev=921026&r1=921025&r2=921026&view=diff
==============================================================================
---
james/server/trunk/core-library/src/main/java/org/apache/james/Constants.java
(original)
+++
james/server/trunk/core-library/src/main/java/org/apache/james/Constants.java
Tue Mar 9 18:09:23 2010
@@ -33,11 +33,11 @@ public class Constants {
/**
* The version of James.
*/
- public static final String SOFTWARE_VERSION = "@@VERSION@@";
+ public static final String SOFTWARE_VERSION = "3.0-M1";
/**
* The name of the software (i.e. James).
*/
- public static final String SOFTWARE_NAME = "@@NAME@@";
+ public static final String SOFTWARE_NAME = "Apache-James Mail Server";
}
Modified: james/server/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/pom.xml?rev=921026&r1=921025&r2=921026&view=diff
==============================================================================
--- james/server/trunk/pom.xml (original)
+++ james/server/trunk/pom.xml Tue Mar 9 18:09:23 2010
@@ -988,12 +988,12 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-core</artifactId>
- <version>2.1.0</version>
+ <version>2.3-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-spring</artifactId>
- <version>2.1.0</version>
+ <version>2.3-SNAPSHOT</version>
<scope>runtime</scope>
<exclusions>
<exclusion>
@@ -1006,7 +1006,7 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-jms</artifactId>
- <version>2.1.0</version>
+ <version>2.3-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
<dependency>
Copied:
james/server/trunk/spoolmanager/src/main/java/org/apache/james/transport/camel/JMSSelectorPollingComponent.java
(from r920026,
james/server/trunk/spoolmanager/src/main/java/org/apache/james/transport/camel/ActiveMQPollingComponent.java)
URL:
http://svn.apache.org/viewvc/james/server/trunk/spoolmanager/src/main/java/org/apache/james/transport/camel/JMSSelectorPollingComponent.java?p2=james/server/trunk/spoolmanager/src/main/java/org/apache/james/transport/camel/JMSSelectorPollingComponent.java&p1=james/server/trunk/spoolmanager/src/main/java/org/apache/james/transport/camel/ActiveMQPollingComponent.java&r1=920026&r2=921026&rev=921026&view=diff
==============================================================================
---
james/server/trunk/spoolmanager/src/main/java/org/apache/james/transport/camel/ActiveMQPollingComponent.java
(original)
+++
james/server/trunk/spoolmanager/src/main/java/org/apache/james/transport/camel/JMSSelectorPollingComponent.java
Tue Mar 9 18:09:23 2010
@@ -25,14 +25,14 @@ import org.apache.camel.Endpoint;
import org.apache.camel.impl.DefaultComponent;
/**
- *
+ * Component which polls a JMS queue with a selector
*/
-public class ActiveMQPollingComponent extends DefaultComponent{
+public class JMSSelectorPollingComponent extends DefaultComponent{
@Override
protected Endpoint createEndpoint(String uri, String arg1, Map<String,
Object> arg2) throws Exception {
- return new ActiveMQPollingEndpoint(uri, this);
+ return new JMSSelectorPollingEndpoint(uri, this);
}
}
Copied:
james/server/trunk/spoolmanager/src/main/java/org/apache/james/transport/camel/JMSSelectorPollingConsumer.java
(from r920026,
james/server/trunk/spoolmanager/src/main/java/org/apache/james/transport/camel/ActiveMQPollingConsumer.java)
URL:
http://svn.apache.org/viewvc/james/server/trunk/spoolmanager/src/main/java/org/apache/james/transport/camel/JMSSelectorPollingConsumer.java?p2=james/server/trunk/spoolmanager/src/main/java/org/apache/james/transport/camel/JMSSelectorPollingConsumer.java&p1=james/server/trunk/spoolmanager/src/main/java/org/apache/james/transport/camel/ActiveMQPollingConsumer.java&r1=920026&r2=921026&rev=921026&view=diff
==============================================================================
---
james/server/trunk/spoolmanager/src/main/java/org/apache/james/transport/camel/ActiveMQPollingConsumer.java
(original)
+++
james/server/trunk/spoolmanager/src/main/java/org/apache/james/transport/camel/JMSSelectorPollingConsumer.java
Tue Mar 9 18:09:23 2010
@@ -26,23 +26,30 @@ import org.apache.camel.impl.DefaultEndp
import org.apache.camel.impl.ScheduledPollConsumer;
/**
- * Consumer which polls an activemq endpoint with a selector which only
selects messages with JAMES_NEXT_DELIVERY header
+ * Consumer which polls a JMS Endpoint with a selector which only selects
messages with JAMES_NEXT_DELIVERY header
* value is smaller then the current time in milliseconds.
*
+ * This implementation should work on every JMS Queue
+ *
*
*
*
*/
-public class ActiveMQPollingConsumer extends ScheduledPollConsumer{
+public class JMSSelectorPollingConsumer extends ScheduledPollConsumer{
private ConsumerTemplate consumerTemplate;
private String uri;
- public ActiveMQPollingConsumer(DefaultEndpoint endpoint, Processor
processor, ConsumerTemplate consumerTemplate) {
+ public JMSSelectorPollingConsumer(DefaultEndpoint endpoint, Processor
processor, ConsumerTemplate consumerTemplate) {
super(endpoint, processor);
this.consumerTemplate = consumerTemplate;
}
+ /**
+ * Set the EndpointUri to poll on
+ *
+ * @param uri
+ */
public void setEndpointUri(String uri) {
this.uri = uri;
}
@@ -53,10 +60,11 @@ public class ActiveMQPollingConsumer ext
StringBuffer consumerUri = new StringBuffer();
consumerUri.append(uri);
consumerUri.append("?");
-
+ consumerUri.append("transacted=true");
+ consumerUri.append("&");
consumerUri.append("selector=");
consumerUri.append(JamesCamelConstants.JAMES_NEXT_DELIVERY);
- consumerUri.append("<");
+ consumerUri.append(" < ");
consumerUri.append(System.currentTimeMillis());
// process every exchange which is ready. If no exchange is left break
the loop
Copied:
james/server/trunk/spoolmanager/src/main/java/org/apache/james/transport/camel/JMSSelectorPollingEndpoint.java
(from r920026,
james/server/trunk/spoolmanager/src/main/java/org/apache/james/transport/camel/ActiveMQPollingEndpoint.java)
URL:
http://svn.apache.org/viewvc/james/server/trunk/spoolmanager/src/main/java/org/apache/james/transport/camel/JMSSelectorPollingEndpoint.java?p2=james/server/trunk/spoolmanager/src/main/java/org/apache/james/transport/camel/JMSSelectorPollingEndpoint.java&p1=james/server/trunk/spoolmanager/src/main/java/org/apache/james/transport/camel/ActiveMQPollingEndpoint.java&r1=920026&r2=921026&rev=921026&view=diff
==============================================================================
---
james/server/trunk/spoolmanager/src/main/java/org/apache/james/transport/camel/ActiveMQPollingEndpoint.java
(original)
+++
james/server/trunk/spoolmanager/src/main/java/org/apache/james/transport/camel/JMSSelectorPollingEndpoint.java
Tue Mar 9 18:09:23 2010
@@ -19,20 +19,26 @@
package org.apache.james.transport.camel;
-import java.util.Map;
-
import org.apache.camel.Component;
import org.apache.camel.Consumer;
import org.apache.camel.Processor;
import org.apache.camel.Producer;
import org.apache.camel.impl.ScheduledPollEndpoint;
-public class ActiveMQPollingEndpoint extends ScheduledPollEndpoint{
+/**
+ * Endpoint which provide a polling consumer which polls on a JMS Queue
+ *
+ *
+ */
+public class JMSSelectorPollingEndpoint extends ScheduledPollEndpoint{
- public ActiveMQPollingEndpoint(String uri, Component component) {
+ public JMSSelectorPollingEndpoint(String uri, Component component) {
super(uri,component);
}
+ /**
+ * No Producer implemented
+ */
public Producer createProducer() throws Exception {
return null;
}
@@ -50,7 +56,7 @@ public class ActiveMQPollingEndpoint ext
* @see
org.apache.camel.Endpoint#createConsumer(org.apache.camel.Processor)
*/
public Consumer createConsumer(Processor processor) throws Exception {
- ActiveMQPollingConsumer consumer = new
ActiveMQPollingConsumer(this,processor,getCamelContext().createConsumerTemplate());
+ JMSSelectorPollingConsumer consumer = new
JMSSelectorPollingConsumer(this,processor,getCamelContext().createConsumerTemplate());
configureConsumer(consumer);
return consumer;
}
Modified:
james/server/trunk/spoolmanager/src/main/java/org/apache/james/transport/camel/JamesCamelConstants.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/spoolmanager/src/main/java/org/apache/james/transport/camel/JamesCamelConstants.java?rev=921026&r1=921025&r2=921026&view=diff
==============================================================================
---
james/server/trunk/spoolmanager/src/main/java/org/apache/james/transport/camel/JamesCamelConstants.java
(original)
+++
james/server/trunk/spoolmanager/src/main/java/org/apache/james/transport/camel/JamesCamelConstants.java
Tue Mar 9 18:09:23 2010
@@ -28,7 +28,7 @@ public interface JamesCamelConstants {
/**
* Header which holds the next delivery time in milliseconds as long value
*/
- public final static String JAMES_NEXT_DELIVERY = "JAMES_NEXT_DELIVERY";
+ public final static String JAMES_NEXT_DELIVERY = "next";
/**
* Property which should be set to true if the mail should get sent again
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
