Return-Path: Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: (qmail 2086 invoked from network); 18 Feb 2011 00:50:57 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 18 Feb 2011 00:50:57 -0000 Received: (qmail 44201 invoked by uid 500); 18 Feb 2011 00:50:56 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 44138 invoked by uid 500); 18 Feb 2011 00:50:56 -0000 Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@activemq.apache.org Delivered-To: mailing list commits@activemq.apache.org Received: (qmail 44131 invoked by uid 99); 18 Feb 2011 00:50:56 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 18 Feb 2011 00:50:56 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 18 Feb 2011 00:50:55 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 72BB6238899C; Fri, 18 Feb 2011 00:50:35 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1071848 - in /activemq/trunk: activemq-camel/src/test/java/org/apache/activemq/camel/component/ActiveMQConfigureTest.java pom.xml Date: Fri, 18 Feb 2011 00:50:35 -0000 To: commits@activemq.apache.org From: chirino@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110218005035.72BB6238899C@eris.apache.org> Author: chirino Date: Fri Feb 18 00:50:35 2011 New Revision: 1071848 URL: http://svn.apache.org/viewvc?rev=1071848&view=rev Log: Fixes AMQ-3184 : Upgrade to Camel 2.6.0 Modified: activemq/trunk/activemq-camel/src/test/java/org/apache/activemq/camel/component/ActiveMQConfigureTest.java activemq/trunk/pom.xml Modified: activemq/trunk/activemq-camel/src/test/java/org/apache/activemq/camel/component/ActiveMQConfigureTest.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-camel/src/test/java/org/apache/activemq/camel/component/ActiveMQConfigureTest.java?rev=1071848&r1=1071847&r2=1071848&view=diff ============================================================================== --- activemq/trunk/activemq-camel/src/test/java/org/apache/activemq/camel/component/ActiveMQConfigureTest.java (original) +++ activemq/trunk/activemq-camel/src/test/java/org/apache/activemq/camel/component/ActiveMQConfigureTest.java Fri Feb 18 00:50:35 2011 @@ -35,7 +35,7 @@ public class ActiveMQConfigureTest exten public void testJmsTemplateUsesPoolingConnectionFactory() throws Exception { JmsEndpoint endpoint = resolveMandatoryEndpoint("activemq:test.foo"); - JmsProducer producer = endpoint.createProducer(); + JmsProducer producer = (JmsProducer) endpoint.createProducer(); JmsTemplate template = assertIsInstanceOf(JmsTemplate.class, producer.getInOutTemplate()); assertEquals("pubSubDomain", false, template.isPubSubDomain()); @@ -44,7 +44,7 @@ public class ActiveMQConfigureTest exten public void testJmsTemplateUsesSingleConnectionFactory() throws Exception { JmsEndpoint endpoint = resolveMandatoryEndpoint("activemq:test.foo?useSingleConnection=true"); - JmsProducer producer = endpoint.createProducer(); + JmsProducer producer = (JmsProducer) endpoint.createProducer(); JmsTemplate template = assertIsInstanceOf(JmsTemplate.class, producer.getInOutTemplate()); assertEquals("pubSubDomain", false, template.isPubSubDomain()); @@ -54,7 +54,7 @@ public class ActiveMQConfigureTest exten public void testJmsTemplateDoesNotUsePoolingConnectionFactory() throws Exception { JmsEndpoint endpoint = resolveMandatoryEndpoint("activemq:test.foo?usePooledConnection=false"); - JmsProducer producer = endpoint.createProducer(); + JmsProducer producer = (JmsProducer) endpoint.createProducer(); JmsTemplate template = assertIsInstanceOf(JmsTemplate.class, producer.getInOutTemplate()); assertEquals("pubSubDomain", false, template.isPubSubDomain()); Modified: activemq/trunk/pom.xml URL: http://svn.apache.org/viewvc/activemq/trunk/pom.xml?rev=1071848&r1=1071847&r2=1071848&view=diff ============================================================================== --- activemq/trunk/pom.xml (original) +++ activemq/trunk/pom.xml Fri Feb 18 00:50:35 2011 @@ -45,7 +45,7 @@ 0.2-incubating 1.0-M3-dev 1.2-RC1 - 2.4.0 + 2.6.0 2.0 1.6.1 3.2.1