merge #17 Fixing tests after package and classes renames
Project: http://git-wip-us.apache.org/repos/asf/activemq-6/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-6/commit/2fbd5d73 Tree: http://git-wip-us.apache.org/repos/asf/activemq-6/tree/2fbd5d73 Diff: http://git-wip-us.apache.org/repos/asf/activemq-6/diff/2fbd5d73 Branch: refs/heads/master Commit: 2fbd5d7356e7dc9ce3913915ce34d346fd1d6582 Parents: 3d749a4 cd31652 Author: Andy Taylor <[email protected]> Authored: Wed Nov 19 07:48:19 2014 +0000 Committer: Andy Taylor <[email protected]> Committed: Wed Nov 19 07:48:19 2014 +0000 ---------------------------------------------------------------------- .../core/impl/ActiveMQSessionContext.java | 2 +- .../main/resources/activemq-version.properties | 1 - activemq-rest/pom.xml | 6 ++--- .../src/test/resources/activemq-rest.xml | 3 +++ .../src/test/resources/hornetq-rest.xml | 3 --- .../WrongRoleFileConfigurationParserTest.java | 4 +-- .../config/clustered/activemq-users.xml | 2 +- .../config/non-clustered/activemq-users.xml | 2 +- .../config/replicated/activemq-users.xml | 2 +- .../config/shared-store/activemq-users.xml | 2 +- docs/eap-manual/en/clusters.xml | 16 ++++++------ docs/quickstart-guide/zh/examples.xml | 2 +- docs/user-manual/zh/clusters.xml | 26 ++++++++++---------- docs/user-manual/zh/configuration-index.xml | 2 +- docs/user-manual/zh/configuring-transports.xml | 10 ++++---- docs/user-manual/zh/connection-ttl.xml | 2 +- docs/user-manual/zh/core-bridges.xml | 12 ++++----- docs/user-manual/zh/diverts.xml | 2 +- docs/user-manual/zh/duplicate-detection.xml | 8 +++--- docs/user-manual/zh/filter-expressions.xml | 2 +- docs/user-manual/zh/ha.xml | 6 ++--- docs/user-manual/zh/intercepting-operations.xml | 2 +- docs/user-manual/zh/management.xml | 12 ++++----- docs/user-manual/zh/message-expiry.xml | 2 +- docs/user-manual/zh/message-grouping.xml | 2 +- docs/user-manual/zh/paging.xml | 4 +-- docs/user-manual/zh/perf-tuning.xml | 10 ++++---- docs/user-manual/zh/persistence.xml | 4 +-- docs/user-manual/zh/queue-attributes.xml | 4 +-- docs/user-manual/zh/security.xml | 8 +++--- docs/user-manual/zh/send-guarantees.xml | 2 +- docs/user-manual/zh/thread-pooling.xml | 4 +-- docs/user-manual/zh/transaction-config.xml | 2 +- docs/user-manual/zh/undelivered-messages.xml | 2 +- docs/user-manual/zh/using-jms.xml | 2 +- docs/user-manual/zh/using-server.xml | 16 ++++++------ docs/user-manual/zh/wildcard-routing.xml | 2 +- .../resources/restricted-security-client.policy | 2 +- tests/jms-tests/pom.xml | 11 +++++---- .../test/resources/activemq-configuration.xml | 2 +- .../src/test/resources/activemq-jms.xml | 2 +- .../src/test/resources/activemq-queues.xml | 16 ++++++++++++ .../src/test/resources/activemq-users.xml | 2 +- .../src/test/resources/hornetq-queues.xml | 16 ------------ .../tests/unit/jms/misc/ManifestTest.java | 2 -- .../ra/ActiveMQResourceAdapterConfigTest.java | 4 +-- 46 files changed, 124 insertions(+), 126 deletions(-) ----------------------------------------------------------------------
