activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gtu...@apache.org
Subject svn commit: r810644 - in /activemq/trunk: activemq-camel/src/main/java/org/apache/activemq/camel/CamelDestination.java activemq-camel/src/test/java/org/apache/activemq/camel/CamelJmsTest.java pom.xml
Date Wed, 02 Sep 2009 18:18:09 GMT
Author: gtully
Date: Wed Sep  2 18:18:08 2009
New Revision: 810644

URL: http://svn.apache.org/viewvc?rev=810644&view=rev
Log:
update to camel 2.0.0 and spring 2.5.6 to match camel, https://issues.apache.org/activemq/browse/AMQ-2370

Modified:
    activemq/trunk/activemq-camel/src/main/java/org/apache/activemq/camel/CamelDestination.java
    activemq/trunk/activemq-camel/src/test/java/org/apache/activemq/camel/CamelJmsTest.java
    activemq/trunk/pom.xml

Modified: activemq/trunk/activemq-camel/src/main/java/org/apache/activemq/camel/CamelDestination.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-camel/src/main/java/org/apache/activemq/camel/CamelDestination.java?rev=810644&r1=810643&r2=810644&view=diff
==============================================================================
--- activemq/trunk/activemq-camel/src/main/java/org/apache/activemq/camel/CamelDestination.java
(original)
+++ activemq/trunk/activemq-camel/src/main/java/org/apache/activemq/camel/CamelDestination.java
Wed Sep  2 18:18:08 2009
@@ -31,6 +31,7 @@
 import org.apache.camel.CamelContextAware;
 import org.apache.camel.Endpoint;
 import org.apache.camel.component.jms.JmsBinding;
+import org.apache.camel.component.jms.JmsEndpoint;
 
 /**
  * @version $Revision: $
@@ -39,7 +40,9 @@
     private String uri;
     private Endpoint endpoint;
     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() {
     }

Modified: activemq/trunk/activemq-camel/src/test/java/org/apache/activemq/camel/CamelJmsTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-camel/src/test/java/org/apache/activemq/camel/CamelJmsTest.java?rev=810644&r1=810643&r2=810644&view=diff
==============================================================================
--- activemq/trunk/activemq-camel/src/test/java/org/apache/activemq/camel/CamelJmsTest.java
(original)
+++ activemq/trunk/activemq-camel/src/test/java/org/apache/activemq/camel/CamelJmsTest.java
Wed Sep  2 18:18:08 2009
@@ -73,8 +73,9 @@
         // lets create a message
         Destination destination = getMandatoryBean(Destination.class, "consumeFrom");
         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.start();
         Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);

Modified: activemq/trunk/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/pom.xml?rev=810644&r1=810643&r2=810644&view=diff
==============================================================================
--- activemq/trunk/pom.xml (original)
+++ activemq/trunk/pom.xml Wed Sep  2 18:18:08 2009
@@ -36,14 +36,14 @@
     <projectName>Apache ActiveMQ</projectName>
     <!-- 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>
-    <spring-version>2.5.5</spring-version>
+    <spring-version>2.5.6</spring-version>
     <activesoap-version>1.3</activesoap-version>
     <annogen-version>0.1.0</annogen-version>
     <ant-version>1.6.2</ant-version>
     <aopalliance-version>1.0</aopalliance-version>
     <axion-version>1.0-M3-dev</axion-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>
     <commons-beanutils-version>1.6.1</commons-beanutils-version>
     <commons-collections-version>3.2.1</commons-collections-version>



Mime
View raw message