You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by kl...@apache.org on 2016/05/20 16:30:19 UTC

[48/49] incubator-geode git commit: Merge remote-tracking branch 'origin/develop' into feature/GEODE-835-test

Merge remote-tracking branch 'origin/develop' into feature/GEODE-835-test


Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/45b42477
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/45b42477
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/45b42477

Branch: refs/heads/feature/GEODE-835-test
Commit: 45b42477805ac9f08deb33fda357e6f6a5fe7b1b
Parents: e388938 b3d9061
Author: Kirk Lund <kl...@apache.org>
Authored: Wed May 18 10:05:44 2016 -0700
Committer: Kirk Lund <kl...@apache.org>
Committed: Wed May 18 10:05:44 2016 -0700

----------------------------------------------------------------------
 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 +-
 .../SharedConfigurationEndToEndDUnitTest.java   |   13 +-
 .../src/test/resources/expected_jars.txt        |    1 +
 geode-core/build.gradle                         |    2 +-
 .../cache/asyncqueue/AsyncEventQueue.java       |    9 +
 .../asyncqueue/AsyncEventQueueFactory.java      |   13 +
 .../internal/AsyncEventQueueFactoryImpl.java    |    8 +-
 .../internal/AsyncEventQueueImpl.java           |    9 +-
 .../client/internal/ClientMetadataService.java  |   31 +-
 .../cache/operations/OperationContext.java      |   10 +-
 .../gemfire/cache/wan/GatewaySender.java        |    2 +
 .../internal/AbstractDistributionConfig.java    |    2 +-
 .../internal/DistributionConfig.java            |   23 +-
 .../distributed/internal/InternalLocator.java   |    1 +
 .../distributed/internal/LocatorStats.java      |   31 -
 .../distributed/internal/ServerLocator.java     |   44 +-
 .../membership/gms/membership/GMSJoinLeave.java |    6 +-
 .../gemfire/internal/AbstractConfig.java        |    2 +-
 .../InsufficientDiskSpaceException.java         |   53 -
 .../internal/cache/BucketRegionQueue.java       |   10 +-
 .../gemfire/internal/cache/EntryEventImpl.java  |    2 +-
 .../gemfire/internal/cache/LocalRegion.java     |   52 +-
 .../gemstone/gemfire/internal/cache/Oplog.java  |    7 +-
 .../internal/cache/RemoteDestroyMessage.java    |    2 +-
 .../internal/cache/versions/VersionTag.java     |   83 +-
 .../cache/wan/AbstractGatewaySender.java        |  100 +-
 .../cache/wan/GatewaySenderAttributes.java      |    7 +
 .../cache/xmlcache/AsyncEventQueueCreation.java |   11 +
 .../internal/cache/xmlcache/CacheXml.java       |    1 +
 .../cache/xmlcache/CacheXmlGenerator.java       |    8 +
 .../internal/cache/xmlcache/CacheXmlParser.java |    7 +
 .../internal/security/GeodeSecurityUtil.java    |   41 +
 .../security/shiro/GeodePermissionResolver.java |   29 +
 .../internal/security/shiro/ShiroPrincipal.java |    2 +-
 .../gemfire/internal/util/BlobHelper.java       |   75 +-
 .../management/internal/ManagementAgent.java    |    7 +-
 .../internal/SystemManagementService.java       |   29 +-
 .../internal/cli/commands/QueueCommands.java    |   18 +-
 .../internal/cli/commands/ShellCommands.java    |    4 +-
 .../functions/AsyncEventQueueFunctionArgs.java  |  134 +
 .../CreateAsyncEventQueueFunction.java          |   54 +-
 .../internal/cli/i18n/CliStrings.java           |    4 +-
 .../security/ResourceOperationContext.java      |   10 +-
 .../controllers/QueueCommandsController.java    |    1 +
 .../com/gemstone/gemfire/pdx/JSONFormatter.java |   66 +-
 .../pdx/internal/json/PdxListHelper.java        |    2 +-
 .../geode.apache.org/schema/cache/cache-1.0.xsd |    1 +
 ...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 +-
 .../internal/ServerLocatorJUnitTest.java        |    0
 ...DistrbutedRegionProfileOffHeapDUnitTest.java |    2 +-
 .../cache/OffHeapEvictionDUnitTest.java         |    2 +-
 .../cache/OffHeapEvictionStatsDUnitTest.java    |    2 +-
 ...nedRegionLocalMaxMemoryOffHeapDUnitTest.java |    2 +-
 ...rtitionedRegionOffHeapEvictionDUnitTest.java |    2 +-
 .../PartitionedRegionSingleHopDUnitTest.java    |    8 +-
 ...ForceInvalidateOffHeapEvictionDUnitTest.java |    2 +-
 .../sockets/UpdatePropagationDUnitTest.java     |  489 +--
 .../sockets/UpdatePropagationPRDUnitTest.java   |    4 +-
 .../versions/AbstractVersionTagTestBase.java    |   92 +
 .../cache/versions/VMVersionTagTest.java        |   32 +
 ...ompressionCacheListenerOffHeapDUnitTest.java |    2 +-
 ...ressionRegionOperationsOffHeapDUnitTest.java |    2 +-
 .../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 -
 .../cli/commands/CliCommandTestBase.java        |   51 +-
 .../ConnectCommandWithHttpAndSSLDUnitTest.java  |  305 --
 .../cli/commands/HelpCommandsJUnitTest.java     |  130 +
 .../cli/commands/QueueCommandsDUnitTest.java    |    2 +
 .../SharedConfigurationCommandsDUnitTest.java   |    8 +-
 .../security/DataCommandsSecurityTest.java      |    4 +-
 .../GeodeSecurityUtilCustomRealmJUnitTest.java  |   18 +-
 .../GeodeSecurityUtilWithIniFileJUnitTest.java  |   15 +-
 .../security/GfshCommandsSecurityTest.java      |   11 +-
 .../ResourceOperationContextJUnitTest.java      |   11 +-
 .../internal/security/ShiroCacheStartRule.java  |    2 +-
 .../internal/security/TestCommand.java          |   16 +-
 .../test/dunit/standalone/DUnitLauncher.java    |   17 +-
 .../com/gemstone/gemfire/test/fake/Fakes.java   |   19 +
 .../sanctionedDataSerializables.txt             |    4 +-
 .../codeAnalysis/sanctionedSerializables.txt    |    2 +-
 .../cli/commands/golden-help-offline.properties | 2997 ++++++++++++++++++
 .../cli/commands/golden-help-online.properties  |  657 ++++
 .../pdx/jsonStrings/jsonListInsideList.txt      |   48 +
 .../src/test/resources/ssl/trusted.keystore     |  Bin 1078 -> 2241 bytes
 .../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    |   11 +
 .../LuceneIndexForPartitionedRegion.java        |   32 +-
 .../cache/lucene/internal/LuceneIndexImpl.java  |   42 +-
 .../lucene/internal/LuceneQueryFactoryImpl.java |    3 +
 .../internal/PartitionedRepositoryManager.java  |    1 +
 .../internal/xml/LuceneIndexCreation.java       |    5 +
 .../LuceneIndexCreationIntegrationTest.java     |  192 ++
 ...ceneIndexCreationOffHeapIntegrationTest.java |   72 +
 ...IndexCreationPersistenceIntegrationTest.java |  141 +
 .../cache/lucene/LuceneIntegrationTest.java     |   63 +
 .../gemfire/cache/lucene/LuceneQueriesBase.java |   69 +-
 .../lucene/LuceneQueriesIntegrationTest.java    |   21 +-
 .../LuceneIndexCreationIntegrationTest.java     |   74 -
 .../LuceneIndexForPartitionedRegionTest.java    |   58 +-
 .../internal/LuceneIndexImplJUnitTest.java      |   78 +
 .../LuceneIndexRecoveryHAIntegrationTest.java   |   14 +-
 .../lucene/internal/LuceneIntegrationTest.java  |   47 -
 .../LuceneQueryFactoryImplJUnitTest.java        |   21 +-
 .../cache/lucene/test/LuceneTestUtilities.java  |   64 +
 .../gemfire/cache/lucene/test/TestObject.java   |   27 +
 .../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 +
 184 files changed, 7966 insertions(+), 2849 deletions(-)
----------------------------------------------------------------------