Merging #36 on SPI and TX integration
Project: http://git-wip-us.apache.org/repos/asf/activemq-6/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-6/commit/d7c7d86d Tree: http://git-wip-us.apache.org/repos/asf/activemq-6/tree/d7c7d86d Diff: http://git-wip-us.apache.org/repos/asf/activemq-6/diff/d7c7d86d Branch: refs/heads/master Commit: d7c7d86d55c755b915e3133f2e8e9bb3769fe79e Parents: 6309dd0 e34fd09 Author: Clebert Suconic <[email protected]> Authored: Mon Dec 8 12:25:18 2014 -0500 Committer: Clebert Suconic <[email protected]> Committed: Mon Dec 8 12:25:18 2014 -0500 ---------------------------------------------------------------------- activemq-jms-server/pom.xml | 5 + .../apache/activemq/jms/bridge/JMSBridge.java | 8 - .../activemq/jms/bridge/JMSBridgeControl.java | 8 - .../jms/bridge/impl/JMSBridgeControlImpl.java | 20 -- .../activemq/jms/bridge/impl/JMSBridgeImpl.java | 58 +--- .../apache/activemq/ra/ActiveMQRALogger.java | 4 - .../activemq/ra/ActiveMQRAProperties.java | 33 -- .../org/apache/activemq/ra/ActiveMQRaUtils.java | 34 -- .../activemq/ra/ActiveMQResourceAdapter.java | 64 +--- activemq-service-extensions/pom.xml | 4 + .../service/extensions/ServiceUtils.java | 21 ++ .../transactions/TransactionManagerLocator.java | 27 ++ .../DummyTransactionManagerLocator.java | 94 ++++++ .../TransactionManagerLocatorTest.java | 34 ++ ...sions.transactions.TransactionManagerLocator | 1 + .../activemq-jboss-as-integration/pom.xml | 61 ---- .../integration/jboss/ActiveMQJBossBundle.java | 35 --- .../integration/jboss/ActiveMQJBossLogger.java | 62 ---- .../jboss/security/AS4SecurityActions.java | 130 -------- .../jboss/security/JBossASSecurityManager.java | 313 ------------------- .../jboss/security/SecurityActions.java | 167 ---------- .../tm/JBoss4TransactionManagerLocator.java | 32 -- .../tm/JBoss5TransactionManagerLocator.java | 32 -- pom.xml | 9 +- .../tests/ActiveMQMessageHandlerTest.java | 6 - .../integration/jms/bridge/JMSBridgeTest.java | 2 - .../ra/ActiveMQMessageHandlerTest.java | 6 - .../integration/ra/ActiveMQRATestBase.java | 3 - .../tests/integration/ra/JMSContextTest.java | 2 - .../integration/ra/OutgoingConnectionTest.java | 4 - .../integration/ra/ResourceAdapterTest.java | 17 - .../ra/ActiveMQResourceAdapterConfigTest.java | 12 - .../ra/ConnectionFactoryPropertiesTest.java | 2 - .../tests/unit/ra/ResourceAdapterTest.java | 4 - 34 files changed, 196 insertions(+), 1118 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq-6/blob/d7c7d86d/pom.xml ----------------------------------------------------------------------
