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/03/10 10:46:59 UTC
[2/2] activemq-6 git commit: Merge PR #167
Merge PR #167
Project: http://git-wip-us.apache.org/repos/asf/activemq-6/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-6/commit/7edb462e
Tree: http://git-wip-us.apache.org/repos/asf/activemq-6/tree/7edb462e
Diff: http://git-wip-us.apache.org/repos/asf/activemq-6/diff/7edb462e
Branch: refs/heads/master
Commit: 7edb462e7a6fed28356721ec3e59493a05e7df51
Parents: 1fe6734 0f6d35b
Author: Martyn Taylor <mt...@redhat.com>
Authored: Tue Mar 10 09:46:34 2015 +0000
Committer: Martyn Taylor <mt...@redhat.com>
Committed: Tue Mar 10 09:46:34 2015 +0000
----------------------------------------------------------------------
.../activemq/logs/ActiveMQUtilBundle.java | 52 +++++++
.../activemq/logs/ActiveMQUtilLogger.java | 54 +++++++
.../activemq/logs/AssertionLoggerHandler.java | 145 +++++++++++++++++++
.../activemq/utils/ActiveMQUtilBundle.java | 52 -------
.../activemq/utils/ActiveMQUtilLogger.java | 54 -------
.../activemq/utils/AssertionLoggerHandler.java | 145 -------------------
.../activemq/utils/PasswordMaskingUtil.java | 1 +
.../apache/activemq/utils/TypedProperties.java | 1 +
.../org/apache/activemq/utils/UTF8Util.java | 2 +
.../apache/activemq/utils/UUIDGenerator.java | 1 +
.../WrongRoleFileConfigurationParserTest.java | 2 +-
.../src/test/resources/logging.properties | 2 +-
tests/config/logging.properties | 2 +-
tests/config/logging.properties.trace | 2 +-
.../tests/integration/client/PagingTest.java | 2 +-
.../server/AddressFullLoggingTest.java | 2 +-
.../integration/server/FileLockTimeoutTest.java | 2 +-
.../integration/server/SimpleStartStopTest.java | 2 +-
18 files changed, 264 insertions(+), 259 deletions(-)
----------------------------------------------------------------------