From commits-return-29846-archive-asf-public=cust-asf.ponee.io@geode.apache.org Thu Dec 6 20:01:12 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id 2D7FE180674 for ; Thu, 6 Dec 2018 20:01:12 +0100 (CET) Received: (qmail 58877 invoked by uid 500); 6 Dec 2018 19:01:11 -0000 Mailing-List: contact commits-help@geode.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@geode.apache.org Delivered-To: mailing list commits@geode.apache.org Received: (qmail 58868 invoked by uid 99); 6 Dec 2018 19:01:11 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 06 Dec 2018 19:01:11 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id B383F82F16; Thu, 6 Dec 2018 19:01:10 +0000 (UTC) Date: Thu, 06 Dec 2018 19:01:07 +0000 To: "commits@geode.apache.org" Subject: [geode] branch feature/GEODE-6149 updated (7046ba4 -> 1c333bb) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <154412286613.16789.16738159547219135827@gitbox.apache.org> From: zhouxj@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: geode X-Git-Refname: refs/heads/feature/GEODE-6149 X-Git-Reftype: branch X-Git-Oldrev: 7046ba497df9724fe0cdfa1997db50e0b50ddf58 X-Git-Newrev: 1c333bb2163759a3f2b4adaa40a74dab78ec3dee X-Git-NotificationType: ref_changed X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated This is an automated email from the ASF dual-hosted git repository. zhouxj pushed a change to branch feature/GEODE-6149 in repository https://gitbox.apache.org/repos/asf/geode.git. discard 7046ba4 GEODE-6149: when client's cache is closing, its GetClientPRMetaDataOp could end up with NPE add 2c3fd5b GEODE-6143: Removing PowerMock from BackupFileCopierIntegrationTest (#2955) add a53c28a GEODE-6122: Make log4j core optional (#2944) add d0bffea GEODE-6129: Make dependencies explicit in geode-wan (#2940) add c3c7600 GEODE-5971: Refactor ShowDeadlockCommand to return ResultModel and ex… (#2943) add dfaf11c GEODE-6151: use same term for JDBC mapping (#2957) add 1c333bb GEODE-6149: when client's cache is closing, its GetClientPRMetaDataOp could end up with NPE This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (7046ba4) \ N -- N -- N refs/heads/feature/GEODE-6149 (1c333bb) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: .../GfshStartLocatorLogAcceptanceTest.java | 2 +- .../org/apache/geode/annotations/TestingOnly.java | 2 +- .../cli/CreateMappingCommandDUnitTest.java | 2 +- .../cli/DescribeMappingCommandDUnitTest.java | 2 +- .../internal/cli/ListMappingCommandDUnitTest.java | 2 +- .../jdbc/internal/JdbcConnectorServiceImpl.java | 4 +- .../jdbc/internal/cli/CreateMappingCommand.java | 6 +- .../jdbc/internal/cli/DescribeMappingCommand.java | 6 +- .../jdbc/internal/cli/DestroyMappingCommand.java | 5 +- .../jdbc/internal/cli/DestroyMappingFunction.java | 4 +- .../jdbc/internal/cli/ListMappingCommand.java | 9 +- .../internal/cli/CreateMappingCommandTest.java | 2 +- .../cli/DestroyMappingCommandFunctionTest.java | 6 +- .../jdbc/internal/cli/ListMappingCommandTest.java | 2 +- .../LoggingWithReconnectDistributedTest.java | 2 +- .../cli/commands/ShowDeadlockDUnitTest.java | 134 +----------------- .../backup/BackupFileCopierIntegrationTest.java | 25 ++-- .../logging/BannerLoggingIntegrationTest.java | 3 +- .../logging/ConfigurationInfoIntegrationTest.java | 7 - .../logging/ConfigurationIntegrationTest.java | 10 +- .../logging/FileSystemCanaryIntegrationTest.java | 46 +++--- .../LoggingWithLocatorLauncherIntegrationTest.java | 2 +- .../LoggingWithServerLauncherIntegrationTest.java | 2 +- ...StartupConfigurationLoggingIntegrationTest.java | 3 +- ...gurationWithLogLevelChangesIntegrationTest.java | 28 ++-- ...edSystemWithLogLevelChangesIntegrationTest.java | 22 +-- .../logging/log4j/FastLoggerIntegrationTest.java | 10 +- ...FastLoggerWithDefaultConfigIntegrationTest.java | 4 +- ...gServiceWithCustomLogConfigIntegrationTest.java | 4 +- .../apache/geode/codeAnalysis/excludedClasses.txt | 6 +- .../admin/internal/AdminDistributedSystemImpl.java | 4 +- .../apache/geode/internal/VersionDescription.java | 4 +- .../internal/cache/backup/BackupFileCopier.java | 12 +- .../geode/internal/{ => logging}/Banner.java | 89 +++++++----- .../geode/internal/logging/Configuration.java | 137 ++++++------------ .../geode/internal/logging/ConfigurationInfo.java | 36 +---- ...gFileDetails.java => LogLevelUpdateOccurs.java} | 24 ++-- ...onfigListener.java => LogLevelUpdateScope.java} | 11 +- .../geode/internal/logging/LogWriterLevel.java | 4 +- .../geode/internal/logging/LoggingSession.java | 3 +- .../geode/internal/logging/NullProviderAgent.java | 13 -- .../geode/internal/logging/ProviderAgent.java | 44 +++++- .../internal/logging/ProviderAgentLoader.java | 157 +++++++++++++++++++++ .../geode/internal/logging/log4j/Log4jAgent.java | 20 ++- .../internal/cli/commands/ShowDeadlockCommand.java | 70 ++++++--- .../internal/cli/result/model/FileResultModel.java | 3 +- .../geode/management/internal/cli/shell/Gfsh.java | 6 +- .../java/org/apache/geode/internal/BannerTest.java | 3 +- .../geode/internal/logging/ConfigurationTest.java | 73 ---------- .../geode/internal/logging/LoggingSessionTest.java | 2 +- .../internal/logging/NullProviderAgentTest.java | 25 ++-- .../internal/logging/ProviderAgentLoaderTest.java | 131 +++++++++++++++++ .../internal/util/ArgumentRedactorJUnitTest.java | 4 +- .../commands/ShowDeadlockDistributedTestBase.java | 52 +++++-- .../internal/logging/TestLogWriterFactory.java | 3 +- geode-wan/build.gradle | 39 ++++- geode-wan/src/test/resources/expected-pom.xml | 8 ++ ...est.java => ShowDeadlockOverHttpDUnitTest.java} | 14 +- 58 files changed, 763 insertions(+), 590 deletions(-) copy geode-junit/src/test/java/org/apache/geode/test/util/ResourceUtilsIntegrationTest.java => geode-core/src/integrationTest/java/org/apache/geode/internal/logging/FileSystemCanaryIntegrationTest.java (53%) rename geode-core/src/main/java/org/apache/geode/internal/{ => logging}/Banner.java (80%) copy geode-core/src/main/java/org/apache/geode/internal/logging/{LogFileDetails.java => LogLevelUpdateOccurs.java} (66%) copy geode-core/src/main/java/org/apache/geode/internal/logging/{LogConfigListener.java => LogLevelUpdateScope.java} (76%) create mode 100644 geode-core/src/main/java/org/apache/geode/internal/logging/ProviderAgentLoader.java copy geode-dunit/src/integrationTest/java/org/apache/geode/test/dunit/examples/BeforeClassExampleTest.java => geode-core/src/test/java/org/apache/geode/internal/logging/NullProviderAgentTest.java (64%) create mode 100644 geode-core/src/test/java/org/apache/geode/internal/logging/ProviderAgentLoaderTest.java copy geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/ShowDeadlockDUnitTest.java => geode-dunit/src/main/java/org/apache/geode/management/internal/cli/commands/ShowDeadlockDistributedTestBase.java (81%) copy geode-web/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/{ChangeLogLevelCommandOverHttpDistributedTest.java => ShowDeadlockOverHttpDUnitTest.java} (77%)