Merge branch 'develop' into feature/GEODE-2860
Project: http://git-wip-us.apache.org/repos/asf/geode/repo Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/b7b02bfc Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/b7b02bfc Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/b7b02bfc Branch: refs/heads/feature/GEODE-2860 Commit: b7b02bfcd8863995734cf6cd33781a98e19a3703 Parents: 0e215d4 987f203 Author: Darrel Schneider <[email protected]> Authored: Wed Jul 12 11:48:12 2017 -0700 Committer: Darrel Schneider <[email protected]> Committed: Wed Jul 12 11:48:12 2017 -0700 ---------------------------------------------------------------------- extensions/geode-modules-assembly/build.gradle | 29 +- .../release/session/bin/modify_war | 1 + .../geode-modules-session-internal/build.gradle | 4 +- extensions/geode-modules-session/build.gradle | 2 + extensions/geode-modules-tomcat7/build.gradle | 2 + extensions/geode-modules-tomcat8/build.gradle | 2 + extensions/geode-modules/build.gradle | 2 + geode-assembly/build.gradle | 1 + .../geode/session/tests/CargoTestBase.java | 29 +- .../geode/session/tests/ContainerInstall.java | 418 ++++++++----- .../geode/session/tests/ContainerManager.java | 334 ++++------- .../tests/GenericAppServerContainer.java | 150 +++++ .../session/tests/GenericAppServerInstall.java | 226 ++----- .../session/tests/Jetty9ClientServerTest.java | 6 +- .../apache/geode/session/tests/Jetty9Test.java | 5 +- .../geode/session/tests/ServerContainer.java | 380 ++++++++++++ .../session/tests/Tomcat6ClientServerTest.java | 4 +- .../apache/geode/session/tests/Tomcat6Test.java | 2 +- .../session/tests/Tomcat7ClientServerTest.java | 6 +- .../apache/geode/session/tests/Tomcat7Test.java | 2 +- .../session/tests/Tomcat8ClientServerTest.java | 4 +- .../apache/geode/session/tests/Tomcat8Test.java | 2 +- .../session/tests/TomcatClientServerTest.java | 17 +- .../geode/session/tests/TomcatContainer.java | 154 +++++ .../geode/session/tests/TomcatInstall.java | 344 ++++------- .../src/test/resources/expected_jars.txt | 3 +- .../source/subnavs/geode-subnav.erb | 3 + geode-core/build.gradle | 3 + .../admin/internal/DistributionLocatorImpl.java | 6 +- .../internal/AutoConnectionSourceImpl.java | 171 ++++-- .../client/internal/ConnectionFactoryImpl.java | 2 +- .../geode/cache/client/internal/PoolImpl.java | 15 +- .../internal/AbstractDistributionConfig.java | 8 +- .../internal/InternalDistributedSystem.java | 6 +- .../membership/InternalDistributedMember.java | 4 +- .../internal/membership/gms/GMSUtil.java | 11 +- .../membership/gms/locator/GMSLocator.java | 13 +- .../membership/gms/membership/GMSJoinLeave.java | 15 +- .../membership/gms/membership/HostAddress.java | 118 ++++ .../internal/tcpserver/TcpClient.java | 26 +- .../java/org/apache/geode/internal/Version.java | 2 +- .../admin/remote/DistributionLocatorId.java | 45 +- .../admin/remote/RemoteTransportConfig.java | 5 +- .../cache/AbstractOplogDiskRegionEntry.java | 8 +- .../internal/cache/AbstractRegionEntry.java | 9 +- .../geode/internal/cache/AbstractRegionMap.java | 13 +- .../cache/ClusterConfigurationLoader.java | 2 +- .../apache/geode/internal/cache/DiskEntry.java | 8 +- .../internal/cache/DiskStoreFactoryImpl.java | 18 +- .../apache/geode/internal/cache/EventID.java | 31 +- .../internal/cache/InitialImageOperation.java | 6 +- .../internal/cache/NonLocalRegionEntry.java | 6 +- .../org/apache/geode/internal/cache/Oplog.java | 5 +- .../geode/internal/cache/PoolFactoryImpl.java | 28 +- .../geode/internal/cache/ProxyRegionMap.java | 6 +- .../geode/internal/cache/RegionEntry.java | 6 +- .../internal/cache/ValidatingDiskRegion.java | 4 +- .../internal/cache/tier/sockets/HandShake.java | 8 +- .../geode/internal/net/SocketCreator.java | 2 +- .../internal/JmxManagerLocatorRequest.java | 5 +- .../cli/commands/LauncherLifecycleCommands.java | 1 + .../internal/AutoConnectionSourceDUnitTest.java | 12 +- .../AutoConnectionSourceImplJUnitTest.java | 126 +++- .../internal/DistributionConfigJUnitTest.java | 4 +- .../internal/StartupMessageDataJUnitTest.java | 4 +- .../gms/membership/GMSJoinLeaveJUnitTest.java | 1 + .../cache/ClientServerTransactionDUnitTest.java | 13 +- .../cache/DiskStoreFactoryJUnitTest.java | 20 + .../cache/ha/EventIdOptimizationJUnitTest.java | 36 +- .../PersistentPartitionedRegionDUnitTest.java | 5 +- .../PersistentPartitionedRegionTestBase.java | 10 +- .../RollingUpgrade2DUnitTest.java | 6 +- .../rollingupgrade/RollingUpgradeDUnitTest.java | 6 +- .../sockets/ClientServerMiscBCDUnitTest.java | 138 ----- .../tier/sockets/ClientServerMiscDUnitTest.java | 112 +++- .../internal/jta/ClientServerJTADUnitTest.java | 20 +- .../cache/internal/JUnit4CacheTestCase.java | 2 +- .../test/dunit/standalone/ProcessManager.java | 37 +- .../test/dunit/standalone/VersionManager.java | 2 + .../geode/codeAnalysis/excludedClasses.txt | 3 +- .../sanctionedDataSerializables.txt | 34 +- geode-cq/build.gradle | 1 + .../sockets/ClientServerMiscBCDUnitTest.java | 350 +++++++++++ .../gfsh/command-pages/destroy.html.md.erb | 48 ++ .../gfsh/quick_ref_commands_by_area.html.md.erb | 1 + .../registry/OperationsHandlerRegistry.java | 1 - .../protobuf/EncodingTypeTranslator.java | 1 - .../protocol/protobuf/ProtobufOpsProcessor.java | 41 +- .../protobuf/ProtobufSerializationService.java | 3 + .../protobuf/ProtobufStreamProcessor.java | 22 +- .../protocol/protobuf/ProtobufUtilities.java | 45 -- .../GetRegionNamesRequestOperationHandler.java | 34 ++ .../GetRegionsRequestOperationHandler.java | 48 -- .../operations/GetRequestOperationHandler.java | 72 +-- .../operations/PutRequestOperationHandler.java | 62 +- .../RemoveRequestOperationHandler.java | 65 ++ .../serializer/ProtobufProtocolSerializer.java | 2 +- .../utilities/ProtobufRequestUtilities.java | 76 +++ .../utilities/ProtobufResponseUtilities.java | 126 ++++ .../protobuf/utilities/ProtobufUtilities.java | 135 +++++ .../geode/serialization/codec/IntCodec.java | 1 - .../src/main/proto/clientProtocol.proto | 12 +- geode-protobuf/src/main/proto/region_API.proto | 14 +- .../geode/protocol/IntegrationJUnitTest.java | 16 +- .../org/apache/geode/protocol/MessageUtil.java | 86 +-- .../RoundTripCacheConnectionJUnitTest.java | 206 +++++-- .../OperationsHandlerRegistryJUnitTest.java | 8 +- ...eToSerializationTypeTranslatorJUnitTest.java | 6 +- .../protobuf/ProtobufOpsProcessorJUnitTest.java | 16 +- ...onNamesRequestOperationHandlerJUnitTest.java | 109 ++++ ...tRegionRequestOperationHandlerJUnitTest.java | 109 ---- .../GetRequestOperationHandlerJUnitTest.java | 76 ++- .../PutRequestOperationHandlerJUnitTest.java | 68 ++- .../RemoveRequestOperationHandlerJUnitTest.java | 142 +++++ .../ProtobufProtocolSerializerJUnitTest.java | 2 +- .../codec/BinaryFormatJUnitTest.java | 6 +- .../org/apache/geode/protocol/default.keystore | Bin 0 -> 1115 bytes .../internal/locator/wan/LocatorDiscovery.java | 10 +- .../wan/LocatorMembershipListenerImpl.java | 8 +- .../cache/wan/AbstractRemoteGatewaySender.java | 4 +- .../cache/wan/WANRollingUpgradeDUnitTest.java | 596 ++++++++++++++++++- ...oncurrentParallelGatewaySenderDUnitTest.java | 6 +- ...tewayLegacyAuthenticationRegressionTest.java | 423 +++++++++++++ .../wan/misc/WanAutoDiscoveryDUnitTest.java | 7 +- .../wan/parallel/BatchRemovalThreadHelper.java | 22 + gradle/dependency-versions.properties | 1 + 126 files changed, 4695 insertions(+), 1731 deletions(-) ----------------------------------------------------------------------
