You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2014/12/16 18:19:08 UTC

[5/5] activemq-6 git commit: Merging #46 on TM Fixes

Merging #46 on TM Fixes


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

Branch: refs/heads/master
Commit: b1d6c0b4492639b64c03baeb422a3765f7943fff
Parents: 64cc435 fe1ae2b
Author: Clebert Suconic <cl...@apache.org>
Authored: Tue Dec 16 12:18:10 2014 -0500
Committer: Clebert Suconic <cl...@apache.org>
Committed: Tue Dec 16 12:18:10 2014 -0500

----------------------------------------------------------------------
 .../jms/bridge/ActiveMQJMSBridgeLogger.java     |  4 ++
 .../activemq/jms/bridge/impl/JMSBridgeImpl.java | 52 +++++++++-----
 .../ActiveMQServiceExtensionLogger.java         | 54 +++++++++++++++
 .../service/extensions/ServiceUtils.java        | 12 +++-
 .../bridge/TransactionManagerLocatorImpl.java   |  4 +-
 .../tests/integration/ra/JMSContextTest.java    |  2 +
 .../integration/ra/OutgoingConnectionTest.java  |  1 -
 .../jms/bridge/impl/JMSBridgeImplTest.java      | 72 ++++++++++++++++++++
 8 files changed, 180 insertions(+), 21 deletions(-)
----------------------------------------------------------------------