Return-Path: X-Original-To: apmail-activemq-commits-archive@www.apache.org Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id DAD6F17F8F for ; Tue, 10 Mar 2015 09:46:58 +0000 (UTC) Received: (qmail 49612 invoked by uid 500); 10 Mar 2015 09:46:58 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 49569 invoked by uid 500); 10 Mar 2015 09:46:58 -0000 Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@activemq.apache.org Delivered-To: mailing list commits@activemq.apache.org Received: (qmail 49464 invoked by uid 99); 10 Mar 2015 09:46:58 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 10 Mar 2015 09:46:58 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 90529E17DC; Tue, 10 Mar 2015 09:46:58 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: martyntaylor@apache.org To: commits@activemq.apache.org Date: Tue, 10 Mar 2015 09:46:59 -0000 Message-Id: In-Reply-To: <910e3ff07f5048c1bb85b54560cb873b@git.apache.org> References: <910e3ff07f5048c1bb85b54560cb873b@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [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 Authored: Tue Mar 10 09:46:34 2015 +0000 Committer: Martyn Taylor 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(-) ----------------------------------------------------------------------