Merge PR #160

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

Branch: refs/heads/master
Commit: 1ae6f5da3e43816b7e523d79bc09ceb30fd344e7
Parents: 1a8951a 1c50167
Author: Martyn Taylor <[email protected]>
Authored: Mon Mar 9 11:22:31 2015 +0000
Committer: Martyn Taylor <[email protected]>
Committed: Mon Mar 9 11:22:31 2015 +0000

----------------------------------------------------------------------
 distribution/activemq/pom.xml                   |   2 +-
 .../src/main/resources/examples/index.html      |   3 +-
 docs/user-manual/en/examples.md                 |   2 +-
 examples/core/perf/pom.xml                      |   3 -
 examples/core/pom.xml                           |  12 +
 examples/core/vertx-connector/pom.xml           |   6 +-
 examples/jms/README.md                          |   4 +-
 examples/jms/aerogear/pom.xml                   | 199 ++++----
 examples/jms/applet/applet.html                 |  36 --
 examples/jms/applet/pom.xml                     | 144 ------
 examples/jms/applet/readme.html                 |  40 --
 .../activemq/jms/example/AppletExample.java     | 294 -----------
 .../jms/example/HttpStaticFileServer.java       |  81 ---
 .../example/HttpStaticFileServerHandler.java    | 189 -------
 .../HttpStaticFileServerPipelineFactory.java    |  68 ---
 .../activemq/server0/activemq-configuration.xml |  61 ---
 .../activemq/server0/activemq-roles.properties  |  17 -
 .../activemq/server0/activemq-users.properties  |  17 -
 examples/jms/application-layer-failover/pom.xml | 215 ++++----
 .../jms/application-layer-failover/readme.html  |   2 +-
 examples/jms/bridge/pom.xml                     | 217 ++++----
 examples/jms/bridge/readme.html                 |   2 +-
 examples/jms/browser/pom.xml                    | 163 +++---
 examples/jms/browser/readme.html                |   2 +-
 examples/jms/client-kickoff/pom.xml             | 203 ++++----
 examples/jms/client-kickoff/readme.html         |   2 +-
 .../jms/client-side-failoverlistener/pom.xml    | 247 ++++-----
 .../client-side-failoverlistener/readme.html    |   2 +-
 examples/jms/client-side-load-balancing/pom.xml | 287 +++++------
 .../jms/client-side-load-balancing/readme.html  |   2 +-
 .../jms/clustered-durable-subscription/pom.xml  | 237 ++++-----
 .../clustered-durable-subscription/readme.html  |   2 +-
 examples/jms/clustered-grouping/pom.xml         | 313 ++++++------
 examples/jms/clustered-grouping/readme.html     |   2 +-
 examples/jms/clustered-jgroups/pom.xml          | 233 ++++-----
 examples/jms/clustered-queue/pom.xml            | 225 +++++----
 examples/jms/clustered-queue/readme.html        |   2 +-
 examples/jms/clustered-standalone/pom.xml       | 285 +++++------
 examples/jms/clustered-standalone/readme.html   |   2 +-
 examples/jms/clustered-static-discovery/pom.xml | 297 +++++------
 .../jms/clustered-static-discovery/readme.html  |   2 +-
 examples/jms/clustered-static-oneway/pom.xml    | 257 +++++-----
 .../jms/clustered-static-oneway/readme.html     |   2 +-
 examples/jms/clustered-topic/pom.xml            | 253 +++++-----
 examples/jms/clustered-topic/readme.html        |   2 +-
 .../jms/colocated-failover-scale-down/pom.xml   | 237 ++++-----
 .../colocated-failover-scale-down/readme.html   |   2 +-
 examples/jms/colocated-failover/pom.xml         | 237 ++++-----
 examples/jms/colocated-failover/readme.html     |   2 +-
 examples/jms/consumer-rate-limit/pom.xml        | 167 +++---
 examples/jms/consumer-rate-limit/readme.html    |   2 +-
 examples/jms/dead-letter/pom.xml                | 167 +++---
 examples/jms/dead-letter/readme.html            |   2 +-
 examples/jms/delayed-redelivery/pom.xml         | 163 +++---
 examples/jms/delayed-redelivery/readme.html     |   2 +-
 examples/jms/divert/pom.xml                     | 217 ++++----
 examples/jms/divert/readme.html                 |   2 +-
 examples/jms/durable-subscription/pom.xml       | 167 +++---
 examples/jms/durable-subscription/readme.html   |   2 +-
 examples/jms/embedded-simple/pom.xml            | 141 +++---
 examples/jms/embedded-simple/readme.html        |   2 +-
 examples/jms/embedded/pom.xml                   | 143 +++---
 examples/jms/embedded/readme.html               |   2 +-
 examples/jms/expiry/pom.xml                     | 167 +++---
 examples/jms/expiry/readme.html                 |   2 +-
 examples/jms/ha-policy-autobackup/pom.xml       | 237 ++++-----
 examples/jms/http-transport/pom.xml             | 167 +++---
 examples/jms/http-transport/readme.html         |   2 +-
 .../jms/instantiate-connection-factory/pom.xml  | 167 +++---
 .../instantiate-connection-factory/readme.html  |   2 +-
 examples/jms/interceptor/pom.xml                | 167 +++---
 examples/jms/interceptor/readme.html            |   2 +-
 examples/jms/jms-auto-closeable/pom.xml         | 161 +++---
 examples/jms/jms-auto-closeable/readme.html     |   2 +-
 examples/jms/jms-bridge/pom.xml                 | 217 ++++----
 examples/jms/jms-bridge/readme.html             |   2 +-
 examples/jms/jms-completion-listener/pom.xml    | 161 +++---
 .../jms/jms-completion-listener/readme.html     |   2 +-
 examples/jms/jms-context/pom.xml                | 161 +++---
 examples/jms/jms-context/readme.html            |   2 +-
 examples/jms/jms-shared-consumer/pom.xml        | 167 +++---
 examples/jms/jms-shared-consumer/readme.html    |   2 +-
 examples/jms/jmx/pom.xml                        | 197 ++++----
 examples/jms/jmx/readme.html                    |   2 +-
 examples/jms/large-message/pom.xml              | 173 +++----
 examples/jms/large-message/readme.html          |   2 +-
 examples/jms/last-value-queue/pom.xml           | 161 +++---
 examples/jms/last-value-queue/readme.html       |   2 +-
 examples/jms/management-notifications/pom.xml   | 161 +++---
 .../jms/management-notifications/readme.html    |   2 +-
 examples/jms/management/pom.xml                 | 161 +++---
 examples/jms/management/readme.html             |   2 +-
 examples/jms/message-counters/pom.xml           | 197 ++++----
 examples/jms/message-counters/readme.html       |   2 +-
 examples/jms/message-group/pom.xml              | 161 +++---
 examples/jms/message-group/readme.html          |   2 +-
 examples/jms/message-group2/pom.xml             | 161 +++---
 examples/jms/message-group2/readme.html         |   2 +-
 examples/jms/message-priority/pom.xml           | 161 +++---
 examples/jms/message-priority/readme.html       |   2 +-
 examples/jms/multiple-failover-failback/pom.xml | 303 +++++------
 examples/jms/multiple-failover/pom.xml          | 303 +++++------
 examples/jms/no-consumer-buffering/pom.xml      | 161 +++---
 examples/jms/no-consumer-buffering/readme.html  |   2 +-
 examples/jms/non-transaction-failover/pom.xml   | 245 ++++-----
 .../jms/non-transaction-failover/readme.html    |   2 +-
 examples/jms/openwire/pom.xml                   | 175 +++----
 examples/jms/openwire/readme.html               |   2 +-
 examples/jms/paging/pom.xml                     | 161 +++---
 examples/jms/paging/readme.html                 |   2 +-
 examples/jms/perf/pom.xml                       |  10 +-
 examples/jms/perf/readme.html                   |   2 +-
 examples/jms/pom.xml                            | 103 +++-
 examples/jms/pre-acknowledge/pom.xml            | 167 +++---
 examples/jms/pre-acknowledge/readme.html        |   2 +-
 examples/jms/producer-rate-limit/pom.xml        | 161 +++---
 examples/jms/producer-rate-limit/readme.html    |   2 +-
 examples/jms/proton-cpp/pom.xml                 |   5 +-
 examples/jms/proton-cpp/readme.html             |   4 +-
 examples/jms/proton-j/pom.xml                   | 177 +++----
 examples/jms/proton-j/readme.html               |   2 +-
 examples/jms/proton-ruby/pom.xml                | 143 +++---
 examples/jms/proton-ruby/readme.html            |   2 +-
 .../jms/queue-message-redistribution/pom.xml    | 253 +++++-----
 .../queue-message-redistribution/readme.html    |   2 +-
 examples/jms/queue-requestor/pom.xml            | 161 +++---
 examples/jms/queue-requestor/readme.html        |   2 +-
 examples/jms/queue-selector/pom.xml             | 161 +++---
 examples/jms/queue-selector/readme.html         |   2 +-
 examples/jms/queue/pom.xml                      | 163 +++---
 examples/jms/queue/readme.html                  |   2 +-
 examples/jms/reattach-node/pom.xml              | 171 ++++---
 examples/jms/reattach-node/readme.html          |   2 +-
 examples/jms/replicated-failback-static/pom.xml | 245 ++++-----
 .../jms/replicated-failback-static/readme.html  |   2 +-
 examples/jms/replicated-failback/pom.xml        | 245 ++++-----
 examples/jms/replicated-failback/readme.html    |   2 +-
 .../jms/replicated-multiple-failover/pom.xml    | 303 +++++------
 .../replicated-multiple-failover/readme.html    |   2 +-
 .../jms/replicated-transaction-failover/pom.xml | 245 ++++-----
 .../replicated-transaction-failover/readme.html |   2 +-
 examples/jms/request-reply/pom.xml              | 161 +++---
 examples/jms/request-reply/readme.html          |   2 +-
 examples/jms/rest/dup-send/pom.xml              | 150 +++---
 examples/jms/rest/javascript-chat/pom.xml       | 178 +++----
 .../messaging/test/AutoAckTopicTest.java        |   3 +-
 examples/jms/rest/jms-to-rest/pom.xml           | 150 +++---
 .../jms-to-rest/src/main/java/JmsHelper.java    |   6 +-
 examples/jms/rest/pom.xml                       |   2 +-
 examples/jms/rest/push/pom.xml                  | 162 +++---
 .../jms/rest/push/src/main/java/JmsHelper.java  |   6 +-
 examples/jms/scale-down/pom.xml                 | 229 ++++-----
 examples/jms/scale-down/readme.html             |   2 +-
 examples/jms/scheduled-message/pom.xml          | 161 +++---
 examples/jms/scheduled-message/readme.html      |   2 +-
 examples/jms/security/pom.xml                   | 161 +++---
 examples/jms/security/readme.html               |   2 +-
 examples/jms/send-acknowledgements/pom.xml      | 161 +++---
 examples/jms/send-acknowledgements/readme.html  |   2 +-
 examples/jms/spring-integration/pom.xml         | 121 ++---
 examples/jms/spring-integration/readme.html     |   2 +-
 examples/jms/ssl-enabled/pom.xml                | 161 +++---
 examples/jms/ssl-enabled/readme.html            |   2 +-
 examples/jms/static-selector-jms/pom.xml        | 168 ++++---
 examples/jms/static-selector-jms/readme.html    |   2 +-
 examples/jms/static-selector/pom.xml            | 161 +++---
 examples/jms/static-selector/readme.html        |   2 +-
 examples/jms/stomp-websockets/pom.xml           | 187 +++----
 examples/jms/stomp-websockets/readme.html       |   2 +-
 examples/jms/stomp/pom.xml                      | 171 ++++---
 examples/jms/stomp/readme.html                  |   2 +-
 examples/jms/stomp1.1/pom.xml                   | 171 ++++---
 examples/jms/stomp1.1/readme.html               |   2 +-
 examples/jms/stomp1.2/pom.xml                   | 171 ++++---
 examples/jms/stomp1.2/readme.html               |   2 +-
 examples/jms/stop-server-failover/pom.xml       | 253 +++++-----
 examples/jms/stop-server-failover/readme.html   |   2 +-
 examples/jms/symmetric-cluster/pom.xml          | 503 +++++++++----------
 examples/jms/symmetric-cluster/readme.html      |   2 +-
 examples/jms/temp-queue/pom.xml                 | 161 +++---
 examples/jms/temp-queue/readme.html             |   2 +-
 examples/jms/topic-hierarchies/pom.xml          | 161 +++---
 examples/jms/topic-hierarchies/readme.html      |   2 +-
 examples/jms/topic-selector-example1/pom.xml    | 161 +++---
 .../jms/topic-selector-example1/readme.html     |   2 +-
 examples/jms/topic-selector-example2/pom.xml    | 161 +++---
 .../jms/topic-selector-example2/readme.html     |   2 +-
 examples/jms/topic/pom.xml                      | 168 ++++---
 examples/jms/topic/readme.html                  |   2 +-
 examples/jms/transaction-failover/pom.xml       | 245 ++++-----
 examples/jms/transaction-failover/readme.html   |   2 +-
 examples/jms/transactional/pom.xml              | 161 +++---
 examples/jms/transactional/readme.html          |   2 +-
 examples/jms/xa-heuristic/pom.xml               | 197 ++++----
 examples/jms/xa-heuristic/readme.html           |   2 +-
 examples/jms/xa-receive/pom.xml                 | 161 +++---
 examples/jms/xa-receive/readme.html             |   2 +-
 examples/jms/xa-send/pom.xml                    | 161 +++---
 examples/jms/xa-send/readme.html                |   2 +-
 examples/pom.xml                                |   1 +
 examples/soak/normal/pom.xml                    |   5 +-
 examples/soak/pom.xml                           |   2 +-
 pom.xml                                         |   3 +-
 203 files changed, 9361 insertions(+), 9769 deletions(-)
----------------------------------------------------------------------


Reply via email to