You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2009/10/14 08:59:36 UTC
svn commit: r825034 - in /camel/trunk:
components/camel-jms/src/test/java/org/apache/camel/component/jms/
components/camel-jms/src/test/resources/org/apache/camel/component/jms/
components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/...
Author: davsclaus
Date: Wed Oct 14 06:59:36 2009
New Revision: 825034
URL: http://svn.apache.org/viewvc?rev=825034&view=rev
Log:
CAMEL-2066: Upgraded to ActiveMQ 5.3.0
Modified:
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/TransactedJmsRouteTest.java
camel/trunk/components/camel-jms/src/test/resources/org/apache/camel/component/jms/activemq.xml
camel/trunk/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/activemq.xml
camel/trunk/parent/pom.xml
Modified: camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/TransactedJmsRouteTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/TransactedJmsRouteTest.java?rev=825034&r1=825033&r2=825034&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/TransactedJmsRouteTest.java (original)
+++ camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/TransactedJmsRouteTest.java Wed Oct 14 06:59:36 2009
@@ -224,7 +224,8 @@
* This test seems to be fail every other run.
*/
@Ignore
- public void disabledtestSenarioF() throws Exception {
+ @Test
+ public void testSenarioF() throws Exception {
String expected = "testSenarioF" + ": " + System.currentTimeMillis();
mockEndpointA.expectedMessageCount(0);
mockEndpointB.expectedMinimumMessageCount(2);
@@ -260,7 +261,8 @@
}
@Ignore
- public void disabledtestSenarioC() throws Exception {
+ @Test
+ public void testSenarioC() throws Exception {
String expected = "testSenarioD" + ": " + System.currentTimeMillis();
mockEndpointA.expectedMessageCount(0);
// Should only get 1 message the incoming transaction does not rollback.
@@ -277,7 +279,8 @@
}
@Ignore
- public void disabledtestSenarioD() throws Exception {
+ @Test
+ public void testSenarioD() throws Exception {
String expected = "testSenarioD" + ": " + System.currentTimeMillis();
mockEndpointA.expectedMessageCount(1);
sendBody("activemq:queue:d", expected);
@@ -292,7 +295,8 @@
}
@Ignore
- public void disabledtestSenarioE() throws Exception {
+ @Test
+ public void testSenarioE() throws Exception {
String expected = "testSenarioE" + ": " + System.currentTimeMillis();
mockEndpointA.expectedMessageCount(0);
mockEndpointB.expectedMessageCount(1);
Modified: camel/trunk/components/camel-jms/src/test/resources/org/apache/camel/component/jms/activemq.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/resources/org/apache/camel/component/jms/activemq.xml?rev=825034&r1=825033&r2=825034&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/test/resources/org/apache/camel/component/jms/activemq.xml (original)
+++ camel/trunk/components/camel-jms/src/test/resources/org/apache/camel/component/jms/activemq.xml Wed Oct 14 06:59:36 2009
@@ -16,12 +16,18 @@
limitations under the License.
-->
<!-- START SNIPPET: xbean -->
-<beans>
+<beans
+ xmlns="http://www.springframework.org/schema/beans"
+ 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.3.0.xsd">
+
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
- <broker useJmx="false" xmlns="http://activemq.org/config/1.0" persistent="false" brokerName="localhost">
-
- </broker>
+ <broker:broker useJmx="false" persistent="false" brokerName="localhost">
+
+ </broker:broker>
</beans>
<!-- END SNIPPET: xbean -->
Modified: camel/trunk/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/activemq.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/activemq.xml?rev=825034&r1=825033&r2=825034&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/activemq.xml (original)
+++ camel/trunk/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/activemq.xml Wed Oct 14 06:59:36 2009
@@ -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.2.0.xsd">
+ http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core-5.3.0.xsd">
<broker:broker id="broker" useJmx="false" persistent="false" dataDirectory="target/activemq">
<broker:transportConnectors>
Modified: camel/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=825034&r1=825033&r2=825034&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Wed Oct 14 06:59:36 2009
@@ -36,7 +36,7 @@
<properties>
<compiler.fork>false</compiler.fork>
<!-- Note that activemq dependency is only used for testing! -->
- <activemq-version>5.2.0</activemq-version>
+ <activemq-version>5.3.0</activemq-version>
<apacheds-version>1.5.4</apacheds-version>
<axiom-version>1.2.8</axiom-version>
<cxf-version>2.2.3</cxf-version>