cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1213859 - in /cxf/branches/2.3.x-fixes: ./ rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSBrokerSetup.java
Date Tue, 13 Dec 2011 18:54:47 GMT
Author: dkulp
Date: Tue Dec 13 18:54:46 2011
New Revision: 1213859

URL: http://svn.apache.org/viewvc?rev=1213859&view=rev
Log:
Merged revisions 1212422 via svnmerge from 
https://svn.us.apache.org/repos/asf/cxf/branches/2.4.x-fixes

................
  r1212422 | ningjiang | 2011-12-09 08:53:24 -0500 (Fri, 09 Dec 2011) | 9 lines
  
  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.3.x-fixes/   (props changed)
    cxf/branches/2.3.x-fixes/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSBrokerSetup.java

Propchange: cxf/branches/2.3.x-fixes/
            ('svn:mergeinfo' removed)

Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.3.x-fixes/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSBrokerSetup.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSBrokerSetup.java?rev=1213859&r1=1213858&r2=1213859&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSBrokerSetup.java
(original)
+++ cxf/branches/2.3.x-fixes/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSBrokerSetup.java
Tue Dec 13 18:54:46 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();



Mime
View raw message