svn commit: r1087741 - in /camel/trunk: parent/pom.xml tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsPollEnrichTest.java

[davsclaus]

Author: davsclaus
Date: Fri Apr  1 15:14:16 2011
New Revision: 1087741

URL: http://svn.apache.org/viewvc?rev=1087741&view=rev
Log:
Upgraded to AMQ 5.5.0

Modified:
    camel/trunk/parent/pom.xml
    
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsPollEnrichTest.java

Modified: camel/trunk/parent/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1087741&r1=1087740&r2=1087741&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Fri Apr  1 15:14:16 2011
@@ -35,7 +35,7 @@
   <properties>
     <compiler.fork>false</compiler.fork>
     <!-- Note that activemq dependency is only used for testing! -->
-    <activemq-version>5.4.2</activemq-version>
+    <activemq-version>5.5.0</activemq-version>
     <apacheds-version>1.5.7</apacheds-version>
     <aries-blueprint-version>0.3</aries-blueprint-version>
     <axiom-version>1.2.8</axiom-version>

Modified: 
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsPollEnrichTest.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsPollEnrichTest.java?rev=1087741&r1=1087740&r2=1087741&view=diff
==============================================================================
--- 
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsPollEnrichTest.java
 (original)
+++ 
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsPollEnrichTest.java
 Fri Apr  1 15:14:16 2011
@@ -53,10 +53,12 @@ public class JmsPollEnrichTest extends C
 
     @Override
     protected Context createJndiContext() throws Exception {
+        deleteDirectory("activemq-data");
+
         JndiContext answer = new JndiContext();
 
-        // add ActiveMQ with embedded broker
-        ActiveMQComponent amq = 
ActiveMQComponent.activeMQComponent("vm://localhost?broker.persistent=false");
+        // add ActiveMQ with embedded broker which must be persistent
+        ActiveMQComponent amq = 
ActiveMQComponent.activeMQComponent("vm://localhost?broker.persistent=true&broker.useJmx=false");
         amq.setCamelContext(context);
         answer.bind("jms", amq);
         return answer;