activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From andytay...@apache.org
Subject [5/5] activemq-6 git commit: merge #158 - Fixing ServiceLocator and Logger errors
Date Mon, 09 Mar 2015 09:25:12 GMT
merge #158 - Fixing ServiceLocator and Logger errors


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

Branch: refs/heads/master
Commit: 10bb4568c3de38ad202afb2a2270afc513250739
Parents: 3c99562 440ae2e
Author: Andy Taylor <andy.tayls67@gmail.com>
Authored: Mon Mar 9 09:24:10 2015 +0000
Committer: Andy Taylor <andy.tayls67@gmail.com>
Committed: Mon Mar 9 09:24:10 2015 +0000

----------------------------------------------------------------------
 activemq-commons/pom.xml                        |   5 +
 .../activemq/utils/AssertionLoggerHandler.java  | 145 ++++
 .../activemq-amqp-protocol/pom.xml              |  14 +
 activemq-protocols/activemq-proton-plug/pom.xml |  16 +
 .../WrongRoleFileConfigurationParserTest.java   |   2 +-
 .../tests/logging/AssertionLoggerHandler.java   | 159 -----
 .../src/test/resources/logging.properties       |   2 +-
 activemq-service-extensions/pom.xml             |  16 +
 activemq-web/pom.xml                            |  16 +
 .../src/main/assembly/source-assembly.xml       |  11 +-
 tests/config/logging.properties                 |   2 +-
 tests/config/logging.properties.trace           |   2 +-
 tests/extra-tests/pom.xml                       |   7 +
 .../activemq/tests/extras/jms/xa/XATest.java    | 192 +++--
 ...sions.transactions.TransactionManagerLocator |   1 +
 tests/integration-tests/pom.xml                 |  10 +
 .../tests/integration/client/PagingTest.java    |   2 +-
 .../server/AddressFullLoggingTest.java          |   2 +-
 .../integration/server/FileLockTimeoutTest.java |   2 +-
 .../integration/server/SimpleStartStopTest.java |   2 +-
 .../largemessage/LargeMessageTestBase.java      | 705 -------------------
 .../DummyTransactionManagerLocator.java         |  94 +++
 .../TransactionManagerLocatorTest.java          |  35 +
 ...sions.transactions.TransactionManagerLocator |   2 +-
 tests/joram-tests/pom.xml                       |   9 +
 tests/performance-tests/pom.xml                 |   9 +
 tests/soak-tests/pom.xml                        |   9 +
 tests/stress-tests/pom.xml                      |   9 +
 tests/timing-tests/pom.xml                      |   9 +
 tests/unit-tests/pom.xml                        |   9 +
 30 files changed, 520 insertions(+), 978 deletions(-)
----------------------------------------------------------------------



Mime
View raw message