Merge remote-tracking branch 'origin/develop' into feature/GEODE-835
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/7e559224 Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/7e559224 Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/7e559224 Branch: refs/heads/feature/GEODE-835 Commit: 7e559224ad24789f288f1ef02c3b6029ceee5547 Parents: 29861e4 8a3c351 Author: Kirk Lund <kl...@pivotal.io> Authored: Fri May 20 09:59:16 2016 -0700 Committer: Kirk Lund <kl...@pivotal.io> Committed: Fri May 20 09:59:16 2016 -0700 ---------------------------------------------------------------------- KEYS | 37 + extensions/geode-modules-assembly/build.gradle | 53 +- .../release/conf/cache-client.xml | 14 +- .../release/conf/cache-server.xml | 6 +- .../release/scripts/cacheserver.bat | 133 - .../release/scripts/cacheserver.sh | 97 - .../release/scripts/gemfire.bat | 41 - .../release/scripts/gemfire.sh | 58 - .../release/scripts/setenv.properties | 1 + .../release/session/bin/cacheserver.bat | 56 - .../release/session/bin/cacheserver.sh | 57 - .../release/session/bin/gemfire.bat | 53 - .../release/session/bin/gemfire.sh | 69 - .../release/session/bin/modify_war | 91 +- .../release/session/bin/setenv.properties | 6 - .../gemfire-cs-tomcat-7/context-fragment.xml | 15 - .../tcserver/gemfire-cs-tomcat-7/modules.env | 1 - .../gemfire-cs-tomcat-8/context-fragment.xml | 15 - .../tcserver/gemfire-cs-tomcat-8/modules.env | 1 - .../gemfire-cs/configuration-prompts.properties | 17 - .../tcserver/gemfire-cs/context-fragment.xml | 13 - .../release/tcserver/gemfire-cs/modules.env | 1 - .../tcserver/gemfire-cs/server-fragment.xml | 12 - .../gemfire-p2p-tomcat-7/context-fragment.xml | 15 - .../tcserver/gemfire-p2p-tomcat-7/modules.env | 1 - .../gemfire-p2p-tomcat-8/context-fragment.xml | 15 - .../tcserver/gemfire-p2p-tomcat-8/modules.env | 1 - .../configuration-prompts.properties | 19 - .../tcserver/gemfire-p2p/context-fragment.xml | 13 - .../release/tcserver/gemfire-p2p/modules.env | 1 - .../tcserver/gemfire-p2p/server-fragment.xml | 14 - .../geode-cs-tomcat-7/context-fragment.xml | 15 + .../geode-cs-tomcat-8/context-fragment.xml | 15 + .../geode-cs/configuration-prompts.properties | 17 + .../tcserver/geode-cs/context-fragment.xml | 13 + .../tcserver/geode-cs/server-fragment.xml | 12 + .../geode-p2p-tomcat-7/context-fragment.xml | 15 + .../geode-p2p-tomcat-8/context-fragment.xml | 15 + .../geode-p2p/configuration-prompts.properties | 19 + .../tcserver/geode-p2p/context-fragment.xml | 13 + .../tcserver/geode-p2p/server-fragment.xml | 14 + extensions/geode-modules-session/build.gradle | 2 +- .../junit/SeparateClassloaderTestRunner.java | 56 - extensions/geode-modules-tomcat7/build.gradle | 6 + .../gemstone/gemfire/modules/util/Banner.java | 20 +- geode-assembly/build.gradle | 10 +- .../LocatorLauncherAssemblyIntegrationTest.java | 5 + .../SharedConfigurationEndToEndDUnitTest.java | 13 +- .../src/test/resources/expected_jars.txt | 1 + geode-core/build.gradle | 2 +- .../gemfire/cache/AttributesFactory.java | 1 + .../gemfire/cache/AttributesMutator.java | 1 + .../gemstone/gemfire/cache/RegionFactory.java | 1 + .../cache/asyncqueue/AsyncEventQueue.java | 9 + .../asyncqueue/AsyncEventQueueFactory.java | 13 + .../internal/AsyncEventQueueFactoryImpl.java | 8 +- .../internal/AsyncEventQueueImpl.java | 9 +- .../cache/client/ClientRegionFactory.java | 1 + .../client/internal/ClientMetadataService.java | 31 +- .../cache/operations/OperationContext.java | 10 +- .../query/internal/index/AbstractIndex.java | 12 +- .../cache/util/BoundedLinkedHashMap.java | 88 - .../gemfire/cache/wan/GatewaySender.java | 2 + .../gemstone/gemfire/distributed/Locator.java | 9 +- .../gemfire/distributed/LocatorLauncher.java | 4 + .../internal/AbstractDistributionConfig.java | 2 +- .../internal/DistributionConfig.java | 23 +- .../distributed/internal/InternalLocator.java | 50 +- .../distributed/internal/LocatorStats.java | 31 - .../distributed/internal/ServerLocator.java | 44 +- .../internal/SharedConfiguration.java | 2 +- .../membership/gms/membership/GMSJoinLeave.java | 23 +- .../gms/messenger/JGroupsMessenger.java | 10 +- .../internal/tcpserver/TcpServer.java | 41 +- .../gemfire/internal/AbstractConfig.java | 2 +- .../InsufficientDiskSpaceException.java | 53 - .../gemfire/internal/cache/AbstractRegion.java | 2 +- .../internal/cache/AbstractRegionEntry.java | 14 +- .../internal/cache/AbstractRegionMap.java | 26 +- .../gemfire/internal/cache/BucketRegion.java | 10 + .../internal/cache/BucketRegionQueue.java | 10 +- .../gemfire/internal/cache/EntryEventImpl.java | 2 +- .../gemfire/internal/cache/LocalRegion.java | 52 +- .../gemstone/gemfire/internal/cache/Oplog.java | 7 +- .../gemfire/internal/cache/RegionEntry.java | 2 - .../internal/cache/RemoteDestroyMessage.java | 2 +- .../PartitionedRegionRebalanceOp.java | 322 +- .../rebalance/BucketOperatorImpl.java | 78 + .../rebalance/BucketOperatorWrapper.java | 235 ++ .../rebalance/PartitionedRegionLoadModel.java | 2 + .../internal/cache/versions/VersionTag.java | 83 +- .../cache/wan/AbstractGatewaySender.java | 100 +- .../cache/wan/GatewaySenderAttributes.java | 7 + .../parallel/ParallelQueueRemovalMessage.java | 1 + .../cache/xmlcache/AsyncEventQueueCreation.java | 11 + .../internal/cache/xmlcache/CacheXml.java | 1 + .../cache/xmlcache/CacheXmlGenerator.java | 8 + .../internal/cache/xmlcache/CacheXmlParser.java | 7 + .../gemfire/internal/logging/LogService.java | 2 +- .../internal/logging/log4j/LogWriterLogger.java | 2 +- .../message/GemFireParameterizedMessage.java | 556 ++++ .../GemFireParameterizedMessageFactory.java | 56 + .../internal/offheap/FreeListManager.java | 292 +- .../offheap/OffHeapRegionEntryHelper.java | 4 +- .../OffHeapStoredObjectAddressStack.java | 5 +- .../gemfire/internal/offheap/SlabImpl.java | 11 +- .../internal/process/ControllableProcess.java | 10 +- .../internal/security/GeodeSecurityUtil.java | 123 +- .../security/shiro/GeodePermissionResolver.java | 29 + .../security/shiro/JMXShiroAuthenticator.java | 13 +- .../internal/security/shiro/ShiroPrincipal.java | 39 + .../gemfire/internal/util/BlobHelper.java | 75 +- .../management/internal/ManagementAgent.java | 7 +- .../internal/SystemManagementService.java | 29 +- .../internal/beans/MemberMBeanBridge.java | 18 +- .../CreateAlterDestroyRegionCommands.java | 5 +- .../internal/cli/commands/DataCommands.java | 1 - .../internal/cli/commands/IndexCommands.java | 32 +- .../cli/commands/LauncherLifecycleCommands.java | 2 +- .../internal/cli/commands/QueueCommands.java | 18 +- .../internal/cli/commands/ShellCommands.java | 4 +- .../functions/AsyncEventQueueFunctionArgs.java | 134 + .../CreateAsyncEventQueueFunction.java | 54 +- .../cli/functions/DataCommandFunction.java | 11 +- .../internal/cli/i18n/CliStrings.java | 4 +- .../internal/cli/remote/CommandProcessor.java | 9 +- .../internal/cli/result/ResultBuilder.java | 3 +- .../cli/shell/GfshExecutionStrategy.java | 230 +- .../security/ResourceOperationContext.java | 10 +- .../controllers/AbstractCommandsController.java | 88 +- .../controllers/QueueCommandsController.java | 2 + .../support/MemberMXBeanAdapter.java | 654 ---- .../web/shell/AbstractHttpOperationInvoker.java | 16 +- .../com/gemstone/gemfire/pdx/JSONFormatter.java | 103 +- .../pdx/internal/json/PdxListHelper.java | 2 +- .../message/GemFireParameterizedMessage.java | 554 ---- .../GemFireParameterizedMessageFactory.java | 54 - .../geode.apache.org/schema/cache/cache-1.0.xsd | 1 + .../membership/gms/messenger/jgroups-mcast.xml | 194 +- .../com/gemstone/gemfire/DeltaTestImpl.java | 10 + ...ventQueueEvictionAndExpirationJUnitTest.java | 346 ++ .../cache30/CacheXmlGeode10DUnitTest.java | 78 + ...tedAckOverflowRegionCCEOffHeapDUnitTest.java | 2 +- ...dAckPersistentRegionCCEOffHeapDUnitTest.java | 2 +- ...DistributedAckRegionCCEOffHeapDUnitTest.java | 2 +- .../DistributedAckRegionOffHeapDUnitTest.java | 2 +- ...stributedNoAckRegionCCEOffHeapDUnitTest.java | 2 +- .../DistributedNoAckRegionOffHeapDUnitTest.java | 2 +- .../GlobalRegionCCEOffHeapDUnitTest.java | 2 +- .../cache30/GlobalRegionOffHeapDUnitTest.java | 2 +- .../OffHeapLRUEvictionControllerDUnitTest.java | 2 +- .../PartitionedRegionOffHeapDUnitTest.java | 2 +- .../gemfire/cache30/ReconnectDUnitTest.java | 57 +- ...tractLocatorLauncherIntegrationTestCase.java | 21 +- .../DistributedLockServiceDUnitTest.java | 46 +- .../distributed/HostedLocatorsDUnitTest.java | 110 + .../gemfire/distributed/LocatorJUnitTest.java | 66 +- ...LocatorLauncherLocalFileIntegrationTest.java | 12 +- .../LocatorLauncherLocalIntegrationTest.java | 26 +- ...ocatorLauncherRemoteFileIntegrationTest.java | 7 +- .../LocatorLauncherRemoteIntegrationTest.java | 31 + ...rRemoteWithCustomLoggingIntegrationTest.java | 5 + .../InternalDistributedSystemJUnitTest.java | 30 +- .../internal/ServerLocatorJUnitTest.java | 0 .../gms/membership/GMSJoinLeaveJUnitTest.java | 2 +- ...DistrbutedRegionProfileOffHeapDUnitTest.java | 2 +- .../cache/OffHeapEvictionDUnitTest.java | 2 +- .../cache/OffHeapEvictionStatsDUnitTest.java | 2 +- ...nedRegionLocalMaxMemoryOffHeapDUnitTest.java | 2 +- ...rtitionedRegionOffHeapEvictionDUnitTest.java | 2 +- .../PartitionedRegionSingleHopDUnitTest.java | 449 +-- .../internal/cache/SingleHopStatsDUnitTest.java | 448 ++- .../control/RebalanceOperationDUnitTest.java | 148 +- ...tentColocatedPartitionedRegionDUnitTest.java | 3 +- .../rebalance/BucketOperatorImplTest.java | 138 + .../rebalance/BucketOperatorWrapperTest.java | 323 ++ ...ForceInvalidateOffHeapEvictionDUnitTest.java | 2 +- .../sockets/HAStartupAndFailoverDUnitTest.java | 38 +- .../sockets/UpdatePropagationDUnitTest.java | 489 +-- .../sockets/UpdatePropagationPRDUnitTest.java | 4 +- .../versions/AbstractVersionTagTestBase.java | 92 + .../cache/versions/VMVersionTagTest.java | 32 + ...ompressionCacheListenerOffHeapDUnitTest.java | 2 +- ...ressionRegionOperationsOffHeapDUnitTest.java | 2 +- .../internal/offheap/FreeListManagerTest.java | 96 +- .../OffHeapRegionEntryHelperJUnitTest.java | 4 +- .../offheap/OutOfOffHeapMemoryDUnitTest.java | 2 +- .../gemfire/internal/util/BlobHelperTest.java | 179 ++ ...bHelperWithThreadContextClassLoaderTest.java | 306 ++ .../gemfire/internal/util/SerializableImpl.java | 37 - .../util/SerializableImplWithValue.java | 56 - .../gemfire/internal/util/Valuable.java | 1 - .../management/LocatorManagementDUnitTest.java | 63 +- .../cli/commands/CliCommandTestBase.java | 51 +- .../ConnectCommandWithHttpAndSSLDUnitTest.java | 305 -- .../commands/HelpCommandsIntegrationTest.java | 140 + .../cli/commands/QueueCommandsDUnitTest.java | 2 + .../SharedConfigurationCommandsDUnitTest.java | 8 +- .../SharedConfigurationDUnitTest.java | 2 +- .../SharedConfigurationTestUtils.java | 2 +- .../SharedConfigurationUsingDirDUnitTest.java | 3 +- .../security/CliCommandsSecurityTest.java | 24 +- .../security/DataCommandsSecurityTest.java | 4 +- .../GeodeSecurityUtilCustomRealmJUnitTest.java | 18 +- .../GeodeSecurityUtilWithIniFileJUnitTest.java | 15 +- .../security/GfshCommandsSecurityTest.java | 42 +- .../security/MemberMBeanSecurityJUnitTest.java | 2 +- .../ResourceOperationContextJUnitTest.java | 11 +- .../internal/security/ShiroCacheStartRule.java | 2 +- .../internal/security/TestCommand.java | 23 +- .../WanCommandsControllerJUnitTest.java | 7 +- .../gemfire/pdx/JSONFormatterJUnitTest.java | 208 ++ .../pdx/JSONPdxClientServerDUnitTest.java | 10 +- .../pdx/PdxFormatterPutGetJUnitTest.java | 208 -- .../gemfire/pdx/TestObjectForJSONFormatter.java | 1000 ++++++ .../gemfire/pdx/TestObjectForPdxFormatter.java | 1003 ------ .../test/dunit/standalone/DUnitLauncher.java | 19 +- .../test/dunit/standalone/ProcessManager.java | 45 +- .../com/gemstone/gemfire/test/fake/Fakes.java | 19 + .../gemfire/test/golden/log4j2-test.xml | 18 - .../gemfire/codeAnalysis/excludedClasses.txt | 2 + .../sanctionedDataSerializables.txt | 4 +- .../codeAnalysis/sanctionedSerializables.txt | 6 +- .../cli/commands/golden-help-offline.properties | 3003 ++++++++++++++++++ .../cli/commands/golden-help-online.properties | 657 ++++ .../internal/security/cacheServer.json | 42 + .../pdx/jsonStrings/jsonListInsideList.txt | 48 + .../src/test/resources/ssl/trusted.keystore | Bin 1078 -> 2241 bytes .../cache/PRDeltaPropagationDUnitTest.java | 173 +- .../cache/ha/HADispatcherDUnitTest.java | 608 ++-- .../gemfire/test/junit/rules/DiskDirRule.java | 54 + .../test/junit/runner/SuiteBlockRunner.java | 46 + .../gemfire/test/junit/runner/SuiteRunner.java | 53 + .../CategoryWithParameterizedRunner.java | 44 + .../CategoryWithParameterizedRunnerFactory.java | 42 + .../junit/runners/ExposedGetAnnotations.java | 23 + .../test/junit/rules/DiskDirRuleTest.java | 49 + ...egoryWithParameterizedRunnerFactoryTest.java | 162 + .../gemfire/cache/lucene/LuceneIndex.java | 7 + .../gemfire/cache/lucene/LuceneService.java | 4 +- .../lucene/internal/LuceneEventListener.java | 2 + .../LuceneIndexForPartitionedRegion.java | 70 +- .../LuceneIndexForReplicatedRegion.java | 1 + .../cache/lucene/internal/LuceneIndexImpl.java | 59 +- .../lucene/internal/LuceneQueryFactoryImpl.java | 3 + .../internal/PartitionedRepositoryManager.java | 1 + .../internal/xml/LuceneIndexCreation.java | 5 + .../LuceneIndexCreationIntegrationTest.java | 192 ++ ...ceneIndexCreationOffHeapIntegrationTest.java | 72 + ...IndexCreationPersistenceIntegrationTest.java | 136 + .../cache/lucene/LuceneIntegrationTest.java | 63 + .../gemfire/cache/lucene/LuceneQueriesBase.java | 44 +- .../lucene/LuceneQueriesIntegrationTest.java | 61 +- .../cache/lucene/LuceneQueriesPRBase.java | 2 + .../lucene/LuceneQueriesPeerPRDUnitTest.java | 1 + .../LuceneQueriesPeerPROverflowDUnitTest.java | 2 + .../LuceneIndexForPartitionedRegionTest.java | 138 +- .../internal/LuceneIndexImplJUnitTest.java | 78 + .../LuceneIndexRecoveryHAIntegrationTest.java | 14 +- .../LuceneQueryFactoryImplJUnitTest.java | 21 +- .../LuceneQueryImplIntegrationTest.java | 14 +- .../cache/lucene/test/LuceneTestUtilities.java | 96 + .../gemfire/cache/lucene/test/TestObject.java | 52 + .../gemfire/cache/lucene/test/package-info.java | 23 + .../cache/wan/Simple2CacheServerDUnitTest.java | 47 +- .../ClusterConfigurationDUnitTest.java | 10 +- geode-web/build.gradle | 11 + .../cli/commands/CommandOverHttpDUnitTest.java | 58 + .../ConnectCommandWithHttpAndSSLDUnitTest.java | 305 ++ .../GfshCommandsOverHttpSecurityTest.java | 29 + gradle/dependency-versions.properties | 1 + gradle/ide.gradle | 15 +- gradle/rat.gradle | 1 + gradle/test.gradle | 8 + 274 files changed, 12764 insertions(+), 6987 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7e559224/geode-assembly/build.gradle ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7e559224/geode-core/build.gradle ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7e559224/gradle/dependency-versions.properties ----------------------------------------------------------------------
