Merge PR #107
Project: http://git-wip-us.apache.org/repos/asf/activemq-6/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-6/commit/cb24f377 Tree: http://git-wip-us.apache.org/repos/asf/activemq-6/tree/cb24f377 Diff: http://git-wip-us.apache.org/repos/asf/activemq-6/diff/cb24f377 Branch: refs/heads/master Commit: cb24f3779e2f5b53dde61ce482aede8f4fe23fad Parents: 0d65983 fab1734 Author: Martyn Taylor <[email protected]> Authored: Mon Feb 23 13:06:12 2015 +0000 Committer: Martyn Taylor <[email protected]> Committed: Mon Feb 23 13:06:12 2015 +0000 ---------------------------------------------------------------------- .../resources/InvalidConfigurationTest0.xml | 26 +-- .../resources/InvalidConfigurationTest1.xml | 26 +-- .../resources/InvalidConfigurationTest2.xml | 26 +-- .../resources/InvalidConfigurationTest3.xml | 26 +-- .../resources/InvalidConfigurationTest4.xml | 26 +-- .../resources/InvalidConfigurationTest5.xml | 26 +-- .../resources/divertRoutingNameNotRequired.xml | 169 +++++++++---------- docs/user-manual/en/configuring-transports.md | 99 +++++------ docs/user-manual/en/interoperability.md | 59 ++----- docs/user-manual/en/using-server.md | 35 +--- .../hornetq-configuration-messaging-lab.xml | 8 +- .../activemq/server0/activemq-configuration.xml | 2 +- examples/jms/http-transport/readme.html | 11 +- examples/jms/proton-cpp/readme.html | 5 +- examples/jms/proton-j/readme.html | 5 +- examples/jms/proton-ruby/readme.html | 6 +- .../src/main/resources/activemq-client.xml | 4 +- .../src/main/resources/activemq-client.xml | 4 +- .../push/src/main/resources/activemq-client.xml | 4 +- examples/jms/ssl-enabled/readme.html | 18 +- examples/jms/stomp-websockets/readme.html | 5 +- .../config/server-start-stop-backup-config1.xml | 61 +++---- tests/config/server-start-stop-live-config1.xml | 67 ++++---- 23 files changed, 233 insertions(+), 485 deletions(-) ----------------------------------------------------------------------
