camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject [2/2] git commit: Merge branch 'camel-jmx' of https://github.com/cristianonicolai/camel
Date Fri, 05 Sep 2014 07:02:28 GMT
Merge branch 'camel-jmx' of https://github.com/cristianonicolai/camel

Conflicts:
	components/camel-sjms/src/test/java/org/apache/camel/component/sjms/jms/SessionPoolTest.java
	components/camel-sjms/src/test/java/org/apache/camel/component/sjms/support/JmsTestSupport.java


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/fd02839e
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/fd02839e
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/fd02839e

Branch: refs/heads/master
Commit: fd02839e54fe97b15468f1982244361db24863de
Parents: c3d69ce 1f3b626
Author: Claus Ibsen <davsclaus@apache.org>
Authored: Fri Sep 5 08:58:06 2014 +0200
Committer: Claus Ibsen <davsclaus@apache.org>
Committed: Fri Sep 5 08:58:06 2014 +0200

----------------------------------------------------------------------
 .../org/apache/camel/component/sjms/support/JmsTestSupport.java     | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/fd02839e/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/support/JmsTestSupport.java
----------------------------------------------------------------------
diff --cc components/camel-sjms/src/test/java/org/apache/camel/component/sjms/support/JmsTestSupport.java
index 7919e28,b4cdf3c..a04fb07
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/support/JmsTestSupport.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/support/JmsTestSupport.java
@@@ -59,8 -59,7 +59,9 @@@ public class JmsTestSupport extends Cam
          broker = new BrokerService();
          final int port = AvailablePortFinder.getNextAvailable(33333);
          brokerUri = "tcp://localhost:" + port;
 +        //Disable the JMX by default
 +        broker.setUseJmx(false);
+         broker.getManagementContext().setConnectorPort(AvailablePortFinder.getNextAvailable(port
+ 1));
          configureBroker(broker);
          startBroker();
      }


Mime
View raw message