Author: ningjiang
Date: Thu Nov 27 04:45:11 2008
New Revision: 721171
URL: http://svn.apache.org/viewvc?rev=721171&view=rev
Log:
Merged revisions 719855 via svnmerge from
https://svn.apache.org/repos/asf/activemq/camel/trunk
........
r719855 | davsclaus | 2008-11-22 22:23:42 +0800 (Sat, 22 Nov 2008) | 1 line
CAMEL-1109, CAMEL-1120: Upgrade to ActiveMQ and fixed setting
acknowledgementMode on inout mep for JMSProducer when transactedInOut is false
(phew this issue surfaced in ActiveMQ 5.2.0)
........
Modified:
activemq/camel/branches/camel-1.x/ (props changed)
activemq/camel/branches/camel-1.x/components/camel-jms/pom.xml
activemq/camel/branches/camel-1.x/examples/camel-example-spring-jms/src/main/resources/META-INF/spring/camel-server.xml
activemq/camel/branches/camel-1.x/pom.xml
activemq/camel/branches/camel-1.x/tests/camel-itest-spring-2.0/pom.xml
activemq/camel/branches/camel-1.x/tests/camel-itest/pom.xml
activemq/camel/branches/camel-1.x/tests/camel-itest/src/test/resources/activemq.xml
activemq/camel/branches/camel-1.x/tests/camel-itest/src/test/resources/spring-config/server-WsAddressingContext.xml
activemq/camel/branches/camel-1.x/tests/camel-itest/src/test/resources/spring-config/server-applicationContext.xml
Propchange: activemq/camel/branches/camel-1.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov 27 04:45:11 2008
@@ -1 +1 @@
-/activemq/camel/trunk:709850,711200,711206,711219-711220,711523,711531,711756,711784,711859,711874,711962,711971,712064,712119,712148,712662,712692,712925,713013,713107,713136,713273,713290,713292,713295,713314,713475,713625,713932,713944,714032,717965,717989,718242,718273,718312-718515,719163-719184,719334,719339,719524,719662,719848,719851,719864,719978-719979,720207,720435-720437,720806
+/activemq/camel/trunk:709850,711200,711206,711219-711220,711523,711531,711756,711784,711859,711874,711962,711971,712064,712119,712148,712662,712692,712925,713013,713107,713136,713273,713290,713292,713295,713314,713475,713625,713932,713944,714032,717965,717989,718242,718273,718312-718515,719163-719184,719334,719339,719524,719662,719848,719851,719855,719864,719978-719979,720207,720435-720437,720806
Propchange: activemq/camel/branches/camel-1.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: activemq/camel/branches/camel-1.x/components/camel-jms/pom.xml
URL:
http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/components/camel-jms/pom.xml?rev=721171&r1=721170&r2=721171&view=diff
==============================================================================
--- activemq/camel/branches/camel-1.x/components/camel-jms/pom.xml (original)
+++ activemq/camel/branches/camel-1.x/components/camel-jms/pom.xml Thu Nov 27
04:45:11 2008
@@ -94,6 +94,11 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-camel</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.xbean</groupId>
<artifactId>xbean-spring</artifactId>
<exclusions>
Modified:
activemq/camel/branches/camel-1.x/examples/camel-example-spring-jms/src/main/resources/META-INF/spring/camel-server.xml
URL:
http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/examples/camel-example-spring-jms/src/main/resources/META-INF/spring/camel-server.xml?rev=721171&r1=721170&r2=721171&view=diff
==============================================================================
---
activemq/camel/branches/camel-1.x/examples/camel-example-spring-jms/src/main/resources/META-INF/spring/camel-server.xml
(original)
+++
activemq/camel/branches/camel-1.x/examples/camel-example-spring-jms/src/main/resources/META-INF/spring/camel-server.xml
Thu Nov 27 04:45:11 2008
@@ -26,7 +26,7 @@
http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
http://www.springframework.org/schema/context
http://www.springframework.org/schema/context/spring-context-2.5.xsd
http://activemq.apache.org/camel/schema/spring
http://activemq.apache.org/camel/schema/spring/camel-spring.xsd
- http://activemq.apache.org/schema/core
http://activemq.apache.org/schema/core/activemq-core-5.1.0.xsd";>
+ http://activemq.apache.org/schema/core
http://activemq.apache.org/schema/core/activemq-core-5.2.0.xsd";>
<!-- END SNIPPET: e1 -->
<!-- START SNIPPET: e2 -->
Modified: activemq/camel/branches/camel-1.x/pom.xml
URL:
http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/pom.xml?rev=721171&r1=721170&r2=721171&view=diff
==============================================================================
--- activemq/camel/branches/camel-1.x/pom.xml (original)
+++ activemq/camel/branches/camel-1.x/pom.xml Thu Nov 27 04:45:11 2008
@@ -41,7 +41,7 @@
<properties>
<compiler.fork>false</compiler.fork>
<!-- Note that activemq dependency is only used for testing! -->
- <activemq-version>5.1.0</activemq-version>
+ <activemq-version>5.2.0</activemq-version>
<apacheds-version>1.5.4</apacheds-version>
<cxf-version>2.1.3</cxf-version>
<felix-version>1.4.1</felix-version>
@@ -614,6 +614,11 @@
<version>${activemq-version}</version>
</dependency>
<dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-camel</artifactId>
+ <version>${activemq-version}</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.xbean</groupId>
<artifactId>xbean-spring</artifactId>
<version>${xbean-spring-version}</version>
Modified: activemq/camel/branches/camel-1.x/tests/camel-itest-spring-2.0/pom.xml
URL:
http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/tests/camel-itest-spring-2.0/pom.xml?rev=721171&r1=721170&r2=721171&view=diff
==============================================================================
--- activemq/camel/branches/camel-1.x/tests/camel-itest-spring-2.0/pom.xml
(original)
+++ activemq/camel/branches/camel-1.x/tests/camel-itest-spring-2.0/pom.xml Thu
Nov 27 04:45:11 2008
@@ -106,5 +106,10 @@
<artifactId>activemq-core</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-camel</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
Modified: activemq/camel/branches/camel-1.x/tests/camel-itest/pom.xml
URL:
http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/tests/camel-itest/pom.xml?rev=721171&r1=721170&r2=721171&view=diff
==============================================================================
--- activemq/camel/branches/camel-1.x/tests/camel-itest/pom.xml (original)
+++ activemq/camel/branches/camel-1.x/tests/camel-itest/pom.xml Thu Nov 27
04:45:11 2008
@@ -69,6 +69,11 @@
<artifactId>activemq-core</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-camel</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.apache.xbean</groupId>
<artifactId>xbean-spring</artifactId>
Modified:
activemq/camel/branches/camel-1.x/tests/camel-itest/src/test/resources/activemq.xml
URL:
http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/tests/camel-itest/src/test/resources/activemq.xml?rev=721171&r1=721170&r2=721171&view=diff
==============================================================================
---
activemq/camel/branches/camel-1.x/tests/camel-itest/src/test/resources/activemq.xml
(original)
+++
activemq/camel/branches/camel-1.x/tests/camel-itest/src/test/resources/activemq.xml
Thu Nov 27 04:45:11 2008
@@ -20,7 +20,7 @@
xmlns:broker="http://activemq.apache.org/schema/core";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
- http://activemq.apache.org/schema/core
http://activemq.apache.org/schema/core/activemq-core-5.1.0.xsd";>
+ http://activemq.apache.org/schema/core
http://activemq.apache.org/schema/core/activemq-core-5.2.0.xsd";>
<broker:broker id="broker" useJmx="false" persistent="false"
dataDirectory="target/activemq">
<broker:transportConnectors>
Modified:
activemq/camel/branches/camel-1.x/tests/camel-itest/src/test/resources/spring-config/server-WsAddressingContext.xml
URL:
http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/tests/camel-itest/src/test/resources/spring-config/server-WsAddressingContext.xml?rev=721171&r1=721170&r2=721171&view=diff
==============================================================================
---
activemq/camel/branches/camel-1.x/tests/camel-itest/src/test/resources/spring-config/server-WsAddressingContext.xml
(original)
+++
activemq/camel/branches/camel-1.x/tests/camel-itest/src/test/resources/spring-config/server-WsAddressingContext.xml
Thu Nov 27 04:45:11 2008
@@ -5,8 +5,8 @@
http://www.springframework.org/schema/context
http://www.springframework.org/schema/context/spring-context-2.5.xsd
http://cxf.apache.org/core
http://cxf.apache.org/schemas/core.xsd
http://cxf.apache.org/jaxws
http://cxf.apache.org/schemas/jaxws.xsd
- http://activemq.apache.org/schema/core
http://activemq.apache.org/schema/core/activemq-core-5.1.0.xsd
- http://activemq.apache.org/camel/schema/spring
http://activemq.apache.org/camel/schema/spring/camel-spring-1.3.0.xsd
+ http://activemq.apache.org/schema/core
http://activemq.apache.org/schema/core/activemq-core-5.2.0.xsd
+ http://activemq.apache.org/camel/schema/spring
http://activemq.apache.org/camel/schema/spring/camel-spring.xsd
http://cxf.apache.org/transports/camel
http://cxf.apache.org/transports/camel.xsd";>
<import resource="classpath:META-INF/cxf/cxf.xml" />
Modified:
activemq/camel/branches/camel-1.x/tests/camel-itest/src/test/resources/spring-config/server-applicationContext.xml
URL:
http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/tests/camel-itest/src/test/resources/spring-config/server-applicationContext.xml?rev=721171&r1=721170&r2=721171&view=diff
==============================================================================
---
activemq/camel/branches/camel-1.x/tests/camel-itest/src/test/resources/spring-config/server-applicationContext.xml
(original)
+++
activemq/camel/branches/camel-1.x/tests/camel-itest/src/test/resources/spring-config/server-applicationContext.xml
Thu Nov 27 04:45:11 2008
@@ -21,7 +21,7 @@
http://www.springframework.org/schema/context
http://www.springframework.org/schema/context/spring-context-2.5.xsd
http://cxf.apache.org/core
http://cxf.apache.org/schemas/core.xsd
http://cxf.apache.org/jaxws
http://cxf.apache.org/schemas/jaxws.xsd
- http://activemq.apache.org/schema/core
http://activemq.apache.org/schema/core/activemq-core-5.1.0.xsd
+ http://activemq.apache.org/schema/core
http://activemq.apache.org/schema/core/activemq-core-5.2.0.xsd
http://activemq.apache.org/camel/schema/spring
http://activemq.apache.org/camel/schema/spring/camel-spring.xsd
http://cxf.apache.org/transports/camel
http://cxf.apache.org/transports/camel.xsd";>
