Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

update to camel 2.0.0 and spring 2.5.6 to match camel, https://issues.apache.org/activemq/browse/AMQ-2370 

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@810644 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Gary Tully 2009-09-02 18:18:08 +00:00
parent 04d27a7d2d
commit 26eb49f259
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
activemq-camel/src/main/java/org/apache/activemq/camel/CamelDestination.java
View File

@ -31,6 +31,7 @@ import org.apache.camel.CamelContext;
import org.apache.camel.CamelContextAware; import org.apache.camel.CamelContextAware;
import org.apache.camel.Endpoint; import org.apache.camel.Endpoint;
import org.apache.camel.component.jms.JmsBinding; import org.apache.camel.component.jms.JmsBinding;
import org.apache.camel.component.jms.JmsEndpoint;
/** /**
* @version $Revision: $ * @version $Revision: $
@ -39,7 +40,9 @@ public class CamelDestination implements CustomDestination, CamelContextAware {
private String uri; private String uri;
private Endpoint endpoint; private Endpoint endpoint;
private CamelContext camelContext; private CamelContext camelContext;
private JmsBinding binding = new JmsBinding(); // add in dummy endpoint pending camel release with
// https://issues.apache.org/activemq/browse/CAMEL-1982
private JmsBinding binding = new JmsBinding(new JmsEndpoint());
public CamelDestination() { public CamelDestination() {
} }

5
activemq-camel/src/test/java/org/apache/activemq/camel/CamelJmsTest.java
View File

@ -73,8 +73,9 @@ public class CamelJmsTest extends SpringTestSupport {
// lets create a message // lets create a message
Destination destination = getMandatoryBean(Destination.class, "consumeFrom"); Destination destination = getMandatoryBean(Destination.class, "consumeFrom");
ConnectionFactory factory = getMandatoryBean(ConnectionFactory.class, "connectionFactory"); ConnectionFactory factory = getMandatoryBean(ConnectionFactory.class, "connectionFactory");
DefaultProducerTemplate template = getMandatoryBean(DefaultProducerTemplate.class, "camelTemplate"); ProducerTemplate template = getMandatoryBean(ProducerTemplate.class, "camelTemplate");
assertNotNull("template is valid", template);
Connection connection = factory.createConnection(); Connection connection = factory.createConnection();
connection.start(); connection.start();
Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE); Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);

4
pom.xml
View File

@ -36,14 +36,14 @@
<projectName>Apache ActiveMQ</projectName> <projectName>Apache ActiveMQ</projectName>
<!-- base url for site deployment. See distribution management for full url. Override this in settings.xml for staging --> <!-- base url for site deployment. See distribution management for full url. Override this in settings.xml for staging -->
<staging.siteURL>scp://people.apache.org/x1/www/activemq.apache.org</staging.siteURL> <staging.siteURL>scp://people.apache.org/x1/www/activemq.apache.org</staging.siteURL>
<spring-version>2.5.5</spring-version> <spring-version>2.5.6</spring-version>
<activesoap-version>1.3</activesoap-version> <activesoap-version>1.3</activesoap-version>
<annogen-version>0.1.0</annogen-version> <annogen-version>0.1.0</annogen-version>
<ant-version>1.6.2</ant-version> <ant-version>1.6.2</ant-version>
<aopalliance-version>1.0</aopalliance-version> <aopalliance-version>1.0</aopalliance-version>
<axion-version>1.0-M3-dev</axion-version> <axion-version>1.0-M3-dev</axion-version>
<axis-version>1.2-RC1</axis-version> <axis-version>1.2-RC1</axis-version>
<camel-version>2.0-M3</camel-version> <camel-version>2.0.0</camel-version>
<cglib-version>2.0</cglib-version> <cglib-version>2.0</cglib-version>
<commons-beanutils-version>1.6.1</commons-beanutils-version> <commons-beanutils-version>1.6.1</commons-beanutils-version>
<commons-collections-version>3.2.1</commons-collections-version> <commons-collections-version>3.2.1</commons-collections-version>