svn commit: r1534509 - in /tomee/tomee/trunk: arquillian/arquillian-tomee-tests/arquillian-tomee-jms-tests/src/test/resources/arquillian.xml container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/ActiveMQ5Factory.java pom.xml

[rmannibucau]

Author: rmannibucau
Date: Tue Oct 22 06:32:36 2013
New Revision: 1534509

URL: http://svn.apache.org/r1534509
Log:
TOMEE-1062 AMQ 5.9.0

Modified:
    
tomee/tomee/trunk/arquillian/arquillian-tomee-tests/arquillian-tomee-jms-tests/src/test/resources/arquillian.xml
    
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/ActiveMQ5Factory.java
    tomee/tomee/trunk/pom.xml

Modified: 
tomee/tomee/trunk/arquillian/arquillian-tomee-tests/arquillian-tomee-jms-tests/src/test/resources/arquillian.xml
URL: 
http://svn.apache.org/viewvc/tomee/tomee/trunk/arquillian/arquillian-tomee-tests/arquillian-tomee-jms-tests/src/test/resources/arquillian.xml?rev=1534509&r1=1534508&r2=1534509&view=diff
==============================================================================
--- 
tomee/tomee/trunk/arquillian/arquillian-tomee-tests/arquillian-tomee-jms-tests/src/test/resources/arquillian.xml
 (original)
+++ 
tomee/tomee/trunk/arquillian/arquillian-tomee-tests/arquillian-tomee-jms-tests/src/test/resources/arquillian.xml
 Tue Oct 22 06:32:36 2013
@@ -26,7 +26,7 @@
       <property name="dir">target/apache-tomee-remote</property>
       <property 
name="appWorkingDir">target/arquillian-test-working-dir</property>
       <property name="properties">
-        Default\ JMS\ Resource\ Adapter.BrokerXmlConfig = 
broker:(tcp://localhost:61616)?useJmx=false&amp;broker.persistent=false
+        Default\ JMS\ Resource\ Adapter.BrokerXmlConfig = 
broker:(tcp://localhost:61616)?useJmx=false&amp;persistent=false
         My\ DataSource.JdbcUrl = jdbc:hsqldb:mem:hsqldb
         My\ Unmanaged\ DataSource.JdbcUrl = jdbc:hsqldb:mem:hsqldb
 
@@ -42,7 +42,7 @@
       <property name="dir">target/apache-tomee-remote</property>
       <property 
name="appWorkingDir">target/arquillian-test-working-dir</property>
       <property name="properties">
-        Default\ JMS\ Resource\ Adapter.BrokerXmlConfig = 
broker:(tcp://localhost:61616)?useJmx=false&amp;broker.persistent=false
+        Default\ JMS\ Resource\ Adapter.BrokerXmlConfig = 
broker:(tcp://localhost:61616)?useJmx=false&amp;persistent=false
         My\ DataSource.JdbcUrl = jdbc:hsqldb:mem:hsqldb
         My\ Unmanaged\ DataSource.JdbcUrl = jdbc:hsqldb:mem:hsqldb
 
@@ -58,7 +58,7 @@
       <property name="dir">target/apache-tomee-remote</property>
       <property 
name="appWorkingDir">target/arquillian-test-working-dir</property>
       <property name="properties">
-        Default\ JMS\ Resource\ Adapter.BrokerXmlConfig = 
broker:(tcp://localhost:61616)?useJmx=false&amp;broker.persistent=false
+        Default\ JMS\ Resource\ Adapter.BrokerXmlConfig = 
broker:(tcp://localhost:61616)?useJmx=false&amp;persistent=false
         My\ DataSource.JdbcUrl = jdbc:hsqldb:mem:hsqldb
         My\ Unmanaged\ DataSource.JdbcUrl = jdbc:hsqldb:mem:hsqldb
 
@@ -66,4 +66,4 @@
       </property>
     </configuration>
   </container>
-</arquillian>
\ No newline at end of file
+</arquillian>

Modified: 
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/ActiveMQ5Factory.java
URL: 
http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/ActiveMQ5Factory.java?rev=1534509&r1=1534508&r2=1534509&view=diff
==============================================================================
--- 
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/ActiveMQ5Factory.java
 (original)
+++ 
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/ActiveMQ5Factory.java
 Tue Oct 22 06:32:36 2013
@@ -60,7 +60,7 @@ public class ActiveMQ5Factory implements
             final Properties properties = getLowerCaseProperties();
             final URI uri = URLs.uri(brokerURI.getRawSchemeSpecificPart());
             broker = BrokerFactory.createBroker(uri);
-            brokers.put(brokerURI, broker);
+            brokers.put(brokerURI, ActiveMQ5Factorybroker);
 
             if (!uri.getScheme().toLowerCase().startsWith("xbean")) {
 

Modified: tomee/tomee/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/tomee/tomee/trunk/pom.xml?rev=1534509&r1=1534508&r2=1534509&view=diff
==============================================================================
--- tomee/tomee/trunk/pom.xml (original)
+++ tomee/tomee/trunk/pom.xml Tue Oct 22 06:32:36 2013
@@ -142,7 +142,7 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
     <bval.version>0.5</bval.version>
-    <org.apache.activemq.version>5.8.0</org.apache.activemq.version>
+    <org.apache.activemq.version>5.9.0</org.apache.activemq.version>
     <quartz.version>2.2.0</quartz.version>
     <org.springframework.version>3.1.3.RELEASE</org.springframework.version>
     <junit.version>4.11</junit.version>