You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ma...@apache.org on 2015/09/11 16:06:08 UTC
[8/8] activemq-artemis git commit: Merge PR #166
Merge PR #166
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/243a9417
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/243a9417
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/243a9417
Branch: refs/heads/master
Commit: 243a94176d94bad87e5c0c89600dc980ee22ba29
Parents: 7316609 6cbde62
Author: Martyn Taylor <mt...@redhat.com>
Authored: Fri Sep 11 15:05:19 2015 +0100
Committer: Martyn Taylor <mt...@redhat.com>
Committed: Fri Sep 11 15:05:19 2015 +0100
----------------------------------------------------------------------
README.md | 6 +
.../core/client/impl/ServerLocatorImpl.java | 71 ++++----
artemis-protocols/artemis-proton-plug/pom.xml | 4 +-
.../org/proton/plug/test/AbstractJMSTest.java | 34 +---
.../java/org/proton/plug/test/ProtonTest.java | 29 ++--
docs/user-manual/en/persistence.md | 28 +---
examples/protocols/amqp/pom.xml | 4 +-
examples/protocols/amqp/proton-j/pom.xml | 108 ------------
examples/protocols/amqp/proton-j/readme.html | 95 -----------
.../artemis/jms/example/ProtonJExample.java | 64 -------
.../activemq/server0/artemis-roles.properties | 17 --
.../activemq/server0/artemis-users.properties | 17 --
.../main/resources/activemq/server0/broker.xml | 68 --------
examples/protocols/amqp/queue/pom.xml | 108 ++++++++++++
examples/protocols/amqp/queue/readme.html | 46 +++++
.../artemis/jms/example/ProtonJExample.java | 67 ++++++++
pom.xml | 67 ++++----
tests/activemq5-unit-tests/pom.xml | 8 -
.../activemq/conversions/AmqpAndMqttTest.java | 119 -------------
tests/integration-tests/pom.xml | 4 +-
.../jms/cluster/MultipleThreadsOpeningTest.java | 33 ++--
.../tests/integration/proton/ProtonTest.java | 167 ++-----------------
22 files changed, 372 insertions(+), 792 deletions(-)
----------------------------------------------------------------------