Merge branch 'develop' into feature/GEODE-3109
Project: http://git-wip-us.apache.org/repos/asf/geode/repo Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/12f90ee8 Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/12f90ee8 Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/12f90ee8 Branch: refs/heads/feature/GEODE-3109 Commit: 12f90ee88e13cac3e688afea835f9670a05edd24 Parents: 7b664a0 03503ce Author: Dick Cavender <dcaven...@pivotal.io> Authored: Mon Jul 10 10:51:22 2017 -0700 Committer: Jens Deppe <jde...@pivotal.io> Committed: Mon Jul 10 10:51:22 2017 -0700 ---------------------------------------------------------------------- .gitignore | 2 +- extensions/geode-modules-assembly/build.gradle | 3 + .../release/session/bin/modify_war | 5 +- .../session/internal/common/CacheProperty.java | 3 +- .../internal/filter/GemfireHttpSession.java | 4 + .../internal/filter/GemfireSessionManager.java | 8 +- .../DeltaQueuedSessionAttributes.java | 4 + .../attributes/DeltaSessionAttributes.java | 4 + .../attributes/ImmediateSessionAttributes.java | 64 --- .../attributes/QueuedSessionAttributes.java | 61 --- .../session/filter/SessionCachingFilter.java | 42 +- .../catalina/Tomcat8DeltaSessionManager.java | 4 +- .../gatewaydelta/GatewayDeltaCreateEvent.java | 8 - .../gatewaydelta/GatewayDeltaDestroyEvent.java | 8 - .../DeltaSessionDestroyAttributeEvent.java | 8 - .../geode/modules/session/CommandServlet.java | 1 + extensions/session-testing-war/build.gradle | 27 ++ .../geode/modules/session/CommandServlet.java | 94 ++++ .../geode/modules/session/QueryCommand.java | 34 ++ .../src/main/webapp/WEB-INF/web.xml | 43 ++ geode-assembly/build.gradle | 26 +- .../cli/commands/StatusLocatorRealGfshTest.java | 22 +- .../geode/session/tests/CargoTestBase.java | 302 ++++++++++++ .../org/apache/geode/session/tests/Client.java | 286 +++++++++++ .../geode/session/tests/ContainerInstall.java | 410 ++++++++++++++++ .../geode/session/tests/ContainerManager.java | 358 ++++++++++++++ .../tests/GenericAppServerClientServerTest.java | 44 ++ .../session/tests/GenericAppServerInstall.java | 247 ++++++++++ .../session/tests/Jetty9ClientServerTest.java | 42 ++ .../apache/geode/session/tests/Jetty9Test.java | 41 ++ .../session/tests/Tomcat6ClientServerTest.java | 42 ++ .../apache/geode/session/tests/Tomcat6Test.java | 41 ++ .../session/tests/Tomcat7ClientServerTest.java | 42 ++ .../apache/geode/session/tests/Tomcat7Test.java | 41 ++ .../session/tests/Tomcat8ClientServerTest.java | 42 ++ .../apache/geode/session/tests/Tomcat8Test.java | 41 ++ .../session/tests/TomcatClientServerTest.java | 83 ++++ .../geode/session/tests/TomcatInstall.java | 399 ++++++++++++++++ .../test/dunit/rules/gfsh/GfshExecution.java | 50 ++ .../geode/test/dunit/rules/gfsh/GfshRule.java | 75 +-- .../geode/test/dunit/rules/gfsh/GfshScript.java | 48 +- .../test/dunit/rules/gfsh/ProcessLogger.java | 90 ++++ .../test/dunit/rules/gfsh/StreamGobbler.java | 38 ++ .../src/test/resources/expected_jars.txt | 4 +- .../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 +- .../geode/cache/execute/FunctionContext.java | 4 + .../internal/AbstractDistributionConfig.java | 8 +- .../internal/InternalDistributedSystem.java | 10 +- .../membership/InternalDistributedMember.java | 160 ++++--- .../internal/membership/NetView.java | 4 + .../internal/membership/gms/GMSUtil.java | 26 +- .../membership/gms/interfaces/Locator.java | 5 + .../gms/locator/FindCoordinatorResponse.java | 2 +- .../membership/gms/locator/GMSLocator.java | 65 ++- .../membership/gms/membership/GMSJoinLeave.java | 107 +++-- .../membership/gms/membership/HostAddress.java | 118 +++++ .../membership/gms/messenger/GMSEncrypt.java | 14 +- .../gms/messenger/JGroupsMessenger.java | 2 +- .../internal/tcpserver/TcpClient.java | 26 +- .../org/apache/geode/internal/SystemAdmin.java | 167 ++++--- .../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 | 17 +- .../cache/ClusterConfigurationLoader.java | 9 +- .../apache/geode/internal/cache/DiskEntry.java | 8 +- .../geode/internal/cache/DistributedRegion.java | 6 +- .../apache/geode/internal/cache/EventID.java | 91 +++- .../geode/internal/cache/GemFireCacheImpl.java | 47 +- .../internal/cache/InitialImageOperation.java | 6 +- .../geode/internal/cache/LocalRegion.java | 2 +- .../cache/MemberFunctionStreamingMessage.java | 7 +- .../internal/cache/NonLocalRegionEntry.java | 6 +- .../org/apache/geode/internal/cache/Oplog.java | 5 +- .../geode/internal/cache/PartitionedRegion.java | 17 +- .../cache/PartitionedRegionDataStore.java | 2 +- .../geode/internal/cache/PoolFactoryImpl.java | 28 +- .../geode/internal/cache/ProxyRegionMap.java | 6 +- .../geode/internal/cache/RegionEntry.java | 6 +- .../cache/TXSynchronizationRunnable.java | 15 +- .../internal/cache/ValidatingDiskRegion.java | 4 +- .../cache/execute/FunctionContextImpl.java | 20 +- .../cache/execute/MemberFunctionExecutor.java | 7 +- .../execute/MultiRegionFunctionContextImpl.java | 8 +- .../execute/MultiRegionFunctionExecutor.java | 5 +- .../execute/RegionFunctionContextImpl.java | 10 +- .../internal/cache/ha/ThreadIdentifier.java | 18 +- .../partitioned/EndBucketCreationMessage.java | 5 + .../geode/internal/cache/tier/Acceptor.java | 4 + .../cache/tier/sockets/AcceptorImpl.java | 332 +++++++------ .../cache/tier/sockets/ClientHealthMonitor.java | 7 +- .../sockets/ClientProtocolMessageHandler.java | 35 ++ .../tier/sockets/ClientProxyMembershipID.java | 17 +- .../cache/tier/sockets/CommBufferPool.java | 36 ++ .../GenericProtocolServerConnection.java | 86 ++++ .../internal/cache/tier/sockets/HandShake.java | 8 +- .../tier/sockets/LegacyServerConnection.java | 88 ++++ .../cache/tier/sockets/ServerConnection.java | 79 ++- .../tier/sockets/ServerConnectionFactory.java | 84 ++++ .../sockets/ServiceLoadingFailureException.java | 35 ++ .../tier/sockets/command/ExecuteFunction.java | 12 +- .../tier/sockets/command/ExecuteFunction65.java | 12 +- .../tier/sockets/command/ExecuteFunction66.java | 12 +- .../command/TXSynchronizationCommand.java | 3 +- .../internal/cache/tx/ClientTXStateStub.java | 10 +- .../geode/internal/i18n/LocalizedStrings.java | 3 - .../geode/internal/net/SocketCreator.java | 72 ++- .../security/IntegratedSecurityService.java | 40 +- .../security/LegacySecurityService.java | 15 +- .../internal/security/SecurityService.java | 48 +- .../security/SecurityServiceFactory.java | 10 +- .../geode/internal/util/PasswordUtil.java | 75 +-- .../geode/management/CacheServerMXBean.java | 122 ++--- .../geode/management/DiskStoreMXBean.java | 68 +-- .../management/DistributedSystemMXBean.java | 174 +++---- .../geode/management/GatewayReceiverMXBean.java | 75 +-- .../geode/management/GatewaySenderMXBean.java | 88 ++-- .../geode/management/LockServiceMXBean.java | 20 +- .../apache/geode/management/MemberMXBean.java | 263 +++++----- .../internal/JmxManagerLocatorRequest.java | 5 +- .../internal/beans/DistributedSystemMBean.java | 21 +- .../management/internal/beans/MemberMBean.java | 7 +- .../internal/beans/MemberMBeanBridge.java | 4 +- .../geode/management/internal/cli/Launcher.java | 19 +- .../internal/cli/commands/ClientCommands.java | 90 ++-- .../CreateAlterDestroyRegionCommands.java | 43 +- .../internal/cli/commands/DataCommands.java | 64 ++- .../internal/cli/commands/DeployCommands.java | 34 +- .../cli/commands/DiskStoreCommands.java | 222 ++++----- .../cli/commands/DurableClientCommands.java | 90 ++-- .../internal/cli/commands/FunctionCommands.java | 136 ++---- .../internal/cli/commands/GfshCommand.java | 20 +- .../internal/cli/commands/IndexCommands.java | 138 +++--- .../cli/commands/LauncherLifecycleCommands.java | 1 + .../cli/commands/MiscellaneousCommands.java | 258 +++++----- .../internal/cli/commands/PDXCommands.java | 39 +- .../internal/cli/commands/QueueCommands.java | 55 +-- .../internal/cli/commands/RegionCommands.java | 76 ++- .../internal/cli/commands/ShellCommands.java | 67 ++- .../internal/cli/commands/WanCommands.java | 219 +++++---- .../commands/lifecycle/StartPulseCommand.java | 18 +- .../cli/functions/ContinuousQueryFunction.java | 148 ++++++ .../cli/functions/ContunuousQueryFunction.java | 150 ------ .../cli/functions/ExportLogsFunction.java | 2 +- .../cli/functions/RegionFunctionArgs.java | 26 +- .../ShowMissingDiskStoresFunction.java | 6 +- .../cli/functions/SizeExportLogsFunction.java | 2 +- .../cli/functions/UserFunctionExecution.java | 42 +- .../internal/cli/i18n/CliStrings.java | 55 +-- .../internal/cli/remote/CommandProcessor.java | 17 +- .../internal/cli/util/CommandStringBuilder.java | 31 +- .../internal/security/MBeanServerWrapper.java | 38 +- .../internal/AutoConnectionSourceDUnitTest.java | 12 +- .../AutoConnectionSourceImplJUnitTest.java | 126 ++++- .../dunit/QueryIndexUsingXMLDUnitTest.java | 30 +- .../geode/cache/util/PasswordUtilJUnitTest.java | 42 -- .../geode/distributed/LocatorDUnitTest.java | 298 ++++++++---- .../LocatorUDPSecurityDUnitTest.java | 8 + .../internal/DistributionConfigJUnitTest.java | 4 +- .../internal/StartupMessageDataJUnitTest.java | 4 +- .../gms/membership/GMSJoinLeaveJUnitTest.java | 44 +- .../gms/membership/GMSJoinLeaveTestHelper.java | 16 +- .../gms/messenger/GMSEncryptJUnitTest.java | 1 - .../geode/internal/DeployedJarJUnitTest.java | 10 +- .../cache/ClientServerTransactionDUnitTest.java | 13 +- .../cache/execute/FunctionServiceBase.java | 14 + ...unctionServiceMultipleOnMemberDUnitTest.java | 4 +- .../FunctionServiceSingleOnMemberDUnitTest.java | 12 +- .../cache/ha/EventIdOptimizationJUnitTest.java | 36 +- .../cache/ha/ThreadIdentifierJUnitTest.java | 28 ++ .../PersistentPartitionedRegionDUnitTest.java | 5 +- .../PersistentPartitionedRegionTestBase.java | 10 +- .../RollingUpgrade2DUnitTest.java | 88 +++- .../tier/sockets/AcceptorImplJUnitTest.java | 16 +- .../sockets/ClientServerMiscBCDUnitTest.java | 135 ------ .../tier/sockets/ClientServerMiscDUnitTest.java | 112 +++-- .../sockets/ServerConnectionFactoryTest.java | 115 +++++ .../tier/sockets/ServerConnectionTest.java | 7 +- .../internal/jta/ClientServerJTADUnitTest.java | 181 +++++++ .../OffHeapLRURecoveryRegressionTest.java | 10 +- .../internal/util/PasswordUtilJUnitTest.java | 41 ++ .../MemberMBeanAttributesDUnitTest.java | 35 +- .../bean/stats/MemberLevelStatsJUnitTest.java | 8 +- .../CreateAlterDestroyRegionCommandsTest.java | 17 +- .../ExportLogsFunctionIntegrationTest.java | 9 +- .../ShowMissingDiskStoresFunctionJUnitTest.java | 49 +- .../functions/SizeExportLogsFunctionTest.java | 12 +- .../cli/util/LogExporterIntegrationTest.java | 6 +- .../ClusterConfigDeployJarDUnitTest.java | 11 +- .../ClusterConfigDistributionDUnitTest.java | 5 +- .../ClusterConfigImportDUnitTest.java | 9 +- .../ClusterConfigStartMemberDUnitTest.java | 4 +- .../ClusterConfigWithSecurityDUnitTest.java | 32 +- ...CacheServerMBeanAuthenticationJUnitTest.java | 20 +- .../CacheServerMBeanAuthorizationJUnitTest.java | 42 +- ...eServerMBeanWithShiroIniIntegrationTest.java | 15 +- .../security/CliCommandsSecurityTest.java | 34 +- .../security/DataCommandsSecurityTest.java | 13 +- .../security/DeployCommandsSecurityTest.java | 28 +- .../DiskStoreMXBeanSecurityJUnitTest.java | 98 ++-- .../DistributedSystemMXBeanSecurityTest.java | 77 +++ .../GatewayReceiverMBeanSecurityTest.java | 42 +- .../GatewaySenderMBeanSecurityTest.java | 68 +-- .../security/GfshCommandsPostProcessorTest.java | 28 +- .../security/GfshCommandsSecurityTest.java | 76 +-- .../LockServiceMBeanAuthorizationJUnitTest.java | 73 ++- .../security/MBeanSecurityJUnitTest.java | 30 +- .../ManagerMBeanAuthorizationJUnitTest.java | 30 +- .../security/MemberMBeanSecurityJUnitTest.java | 51 +- .../internal/security/MultiUserDUnitTest.java | 102 ++-- .../security/ResourcePermissionTest.java | 13 +- .../internal/security/TestCommand.java | 160 ++++--- .../cache/internal/JUnit3CacheTestCase.java | 2 +- .../cache/internal/JUnit4CacheTestCase.java | 2 +- .../dunit/rules/LocatorServerStartupRule.java | 19 +- .../test/dunit/rules/MemberStarterRule.java | 18 +- .../test/dunit/rules/ServerStarterRule.java | 31 +- .../geode/test/dunit/standalone/ChildVM.java | 4 +- .../test/dunit/standalone/ProcessManager.java | 37 +- .../geode/codeAnalysis/excludedClasses.txt | 3 +- .../sanctionedDataSerializables.txt | 34 +- .../codeAnalysis/sanctionedSerializables.txt | 5 +- geode-cq/build.gradle | 1 + .../sockets/ClientServerMiscBCDUnitTest.java | 350 ++++++++++++++ .../cli/commands/ClientCommandsDUnitTest.java | 478 ++++++++++--------- .../set_join_redundancy_recovery.html.md.erb | 35 +- .../put_multiple_values_for_keys.html.md.erb | 1 + .../gfsh/command-pages/destroy.html.md.erb | 48 ++ .../gfsh/quick_ref_commands_by_area.html.md.erb | 1 + .../geode/test/junit/rules/DiskDirRule.java | 60 --- .../geode/test/junit/rules/DiskDirRuleTest.java | 47 -- .../internal/cli/LuceneIndexCommands.java | 58 ++- .../lucene/internal/cli/LuceneIndexInfo.java | 10 - .../functions/LuceneCreateIndexFunction.java | 14 +- .../lucene/LuceneClientSecurityDUnitTest.java | 28 +- .../lucene/LuceneCommandsSecurityDUnitTest.java | 128 +++-- ...IndexCreationPersistenceIntegrationTest.java | 41 +- ...LuceneQueriesPersistenceIntegrationTest.java | 29 +- .../RawLuceneRepositoryManagerJUnitTest.java | 28 +- .../DumpDirectoryFilesIntegrationTest.java | 27 +- .../filesystem/FileSystemJUnitTest.java | 23 +- geode-old-versions/build.gradle | 1 + geode-protobuf/build.gradle | 62 +++ .../InvalidProtocolMessageException.java | 28 ++ .../protocol/operations/OperationHandler.java | 33 ++ .../registry/OperationsHandlerRegistry.java | 52 ++ ...rationHandlerAlreadyRegisteredException.java | 25 + .../OperationHandlerNotRegisteredException.java | 24 + .../protobuf/EncodingTypeTranslator.java | 90 ++++ .../protocol/protobuf/ProtobufOpsProcessor.java | 46 ++ .../protobuf/ProtobufSerializationService.java | 54 +++ .../protobuf/ProtobufStreamProcessor.java | 90 ++++ .../GetRegionNamesRequestOperationHandler.java | 34 ++ .../operations/GetRequestOperationHandler.java | 68 +++ .../operations/PutRequestOperationHandler.java | 72 +++ .../serializer/ProtobufProtocolSerializer.java | 41 ++ .../utilities/ProtobufRequestUtilities.java | 62 +++ .../utilities/ProtobufResponseUtilities.java | 116 +++++ .../protobuf/utilities/ProtobufUtilities.java | 135 ++++++ .../protocol/serializer/ProtocolSerializer.java | 32 ++ .../serialization/SerializationService.java | 32 ++ .../geode/serialization/SerializationType.java | 39 ++ .../apache/geode/serialization/TypeCodec.java | 33 ++ .../geode/serialization/codec/BinaryCodec.java | 35 ++ .../geode/serialization/codec/BooleanCodec.java | 37 ++ .../geode/serialization/codec/ByteCodec.java | 37 ++ .../geode/serialization/codec/DoubleCodec.java | 37 ++ .../geode/serialization/codec/FloatCodec.java | 37 ++ .../geode/serialization/codec/IntCodec.java | 37 ++ .../geode/serialization/codec/JSONCodec.java | 37 ++ .../geode/serialization/codec/LongCodec.java | 37 ++ .../geode/serialization/codec/ShortCodec.java | 37 ++ .../geode/serialization/codec/StringCodec.java | 39 ++ .../UnsupportedEncodingTypeException.java | 24 + .../registry/SerializationCodecRegistry.java | 61 +++ .../CodecAlreadyRegisteredForTypeException.java | 25 + .../CodecNotRegisteredForTypeException.java | 24 + geode-protobuf/src/main/proto/basicTypes.proto | 60 +++ .../src/main/proto/clientProtocol.proto | 95 ++++ geode-protobuf/src/main/proto/region_API.proto | 106 ++++ geode-protobuf/src/main/proto/server_API.proto | 37 ++ ...he.tier.sockets.ClientProtocolMessageHandler | 1 + ...e.geode.protocol.operations.OperationHandler | 1 + ...geode.protocol.serializer.ProtocolSerializer | 1 + .../org.apache.geode.serialization.TypeCodec | 10 + .../geode/protocol/IntegrationJUnitTest.java | 116 +++++ .../org/apache/geode/protocol/MessageUtil.java | 69 +++ .../org/apache/geode/protocol/OpsHandler.java | 21 + .../RoundTripCacheConnectionJUnitTest.java | 209 ++++++++ .../OperationsHandlerRegistryJUnitTest.java | 92 ++++ ...eToSerializationTypeTranslatorJUnitTest.java | 71 +++ .../protobuf/ProtobufOpsProcessorJUnitTest.java | 59 +++ ...onNamesRequestOperationHandlerJUnitTest.java | 109 +++++ .../GetRequestOperationHandlerJUnitTest.java | 139 ++++++ .../PutRequestOperationHandlerJUnitTest.java | 145 ++++++ .../ProtobufProtocolSerializerJUnitTest.java | 81 ++++ .../ProtobufSerializationServiceJUnitTest.java | 111 +++++ .../codec/BinaryFormatJUnitTest.java | 62 +++ .../registry/CodecRegistryJUnitTest.java | 107 +++++ .../internal/locator/wan/LocatorDiscovery.java | 10 +- .../wan/LocatorMembershipListenerImpl.java | 8 +- .../cache/wan/AbstractRemoteGatewaySender.java | 4 +- ...oncurrentParallelGatewaySenderDUnitTest.java | 22 +- ...tewayLegacyAuthenticationRegressionTest.java | 423 ++++++++++++++++ .../wan/misc/WanAutoDiscoveryDUnitTest.java | 7 +- .../GfshCommandsOverHttpSecurityTest.java | 4 +- gradle/dependency-versions.properties | 4 + gradle/rat.gradle | 10 +- gradle/test.gradle | 10 + settings.gradle | 5 +- 317 files changed, 12631 insertions(+), 4091 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/geode/blob/12f90ee8/extensions/geode-modules-assembly/build.gradle ----------------------------------------------------------------------
