merge #173 - Fix CatX dep and OpenWire issue
Project: http://git-wip-us.apache.org/repos/asf/activemq-6/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-6/commit/87520f76 Tree: http://git-wip-us.apache.org/repos/asf/activemq-6/tree/87520f76 Diff: http://git-wip-us.apache.org/repos/asf/activemq-6/diff/87520f76 Branch: refs/heads/master Commit: 87520f760e03460380904f9eadfd60c8aef738aa Parents: 670f584 e065d25 Author: Andy Taylor <[email protected]> Authored: Thu Mar 12 11:06:33 2015 +0000 Committer: Andy Taylor <[email protected]> Committed: Thu Mar 12 11:06:33 2015 +0000 ---------------------------------------------------------------------- activemq-bootstrap/pom.xml | 2 + activemq-commons/pom.xml | 2 + activemq-core-client/pom.xml | 2 + .../client/ActiveMQClientMessageBundle.java | 105 +-- activemq-jms-client/pom.xml | 2 + .../jms/client/ActiveMQJMSClientBundle.java | 23 +- activemq-jms-server/pom.xml | 2 + .../jms/server/ActiveMQJMSServerBundle.java | 10 +- activemq-journal/pom.xml | 2 + .../activemq/journal/ActiveMQJournalBundle.java | 7 +- .../activemq-amqp-protocol/pom.xml | 2 + .../activemq-openwire-protocol/pom.xml | 2 + .../protocol/openwire/OpenWireConnection.java | 25 +- .../openwire/OpenWireProtocolManager.java | 2 +- .../core/protocol/openwire/OpenWireUtil.java | 20 + .../core/protocol/openwire/amq/AMQProducer.java | 6 +- .../core/protocol/openwire/amq/AMQSession.java | 2 +- activemq-protocols/activemq-proton-plug/pom.xml | 2 + .../ActiveMQAMQPProtocolMessageBundle.java | 16 +- .../activemq-stomp-protocol/pom.xml | 2 + .../ActiveMQStompProtocolMessageBundle.java | 40 +- activemq-ra/pom.xml | 2 + .../apache/activemq/ra/ActiveMQRABundle.java | 19 +- activemq-rest/pom.xml | 3 + activemq-server/pom.xml | 2 + .../core/server/ActiveMQMessageBundle.java | 80 +- activemq-service-extensions/pom.xml | 2 + activemq-tools/pom.xml | 2 + .../activemq-aerogear-integration/pom.xml | 2 + .../aerogear/ActiveMQAeroGearBundle.java | 6 +- integration/activemq-spring-integration/pom.xml | 2 + integration/activemq-vertx-integration/pom.xml | 10 +- pom.xml | 14 +- tests/extra-tests/pom.xml | 2 + .../extras/jms/xa/JMSXDeliveryCountTest.java | 814 +++++++++++++++++++ tests/integration-tests/pom.xml | 2 + .../openwire/SimpleOpenWireTest.java | 33 + tests/jms-tests/pom.xml | 8 +- .../jms/tests/ActiveMQServerTestCase.java | 17 - .../tests/message/JMSXDeliveryCountTest.java | 789 ------------------ tests/soak-tests/pom.xml | 7 - tests/unit-tests/pom.xml | 10 +- 42 files changed, 1086 insertions(+), 1016 deletions(-) ----------------------------------------------------------------------
