You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by ni...@apache.org on 2011/12/09 14:53:24 UTC
svn commit: r1212422 - in /cxf/branches/2.4.x-fixes: ./
rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSBrokerSetup.java
Author: ningjiang
Date: Fri Dec 9 13:53:24 2011
New Revision: 1212422
URL: http://svn.apache.org/viewvc?rev=1212422&view=rev
Log:
Merged revisions 1212391 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1212391 | ningjiang | 2011-12-09 21:14:44 +0800 (Fri, 09 Dec 2011) | 1 line
Fixed the jms unit test failure when upgrading ActiveMQ to 5.6.x
........
Modified:
cxf/branches/2.4.x-fixes/ (props changed)
cxf/branches/2.4.x-fixes/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSBrokerSetup.java
Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
svn:mergeinfo = /cxf/trunk:1212391
Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.4.x-fixes/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSBrokerSetup.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSBrokerSetup.java?rev=1212422&r1=1212421&r2=1212422&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSBrokerSetup.java (original)
+++ cxf/branches/2.4.x-fixes/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSBrokerSetup.java Fri Dec 9 13:53:24 2011
@@ -82,6 +82,7 @@ public class JMSBrokerSetup {
broker.setTmpDataDirectory(new File("./target"));
broker.setPopulateJMSXUserID(true);
broker.addConnector(brokerUrl);
+ broker.setUseJmx(false);
broker.start();
Thread.sleep(200);
notifyAll();