You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by je...@apache.org on 2017/06/19 15:23:57 UTC
[24/24] geode git commit: Merge branch 'develop' into
feature/GEODE-3071
Merge branch 'develop' into feature/GEODE-3071
Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/dba7dcd3
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/dba7dcd3
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/dba7dcd3
Branch: refs/heads/feature/GEODE-3071
Commit: dba7dcd3042ae7cf9776822bb4e69f47291fc296
Parents: 07e8986 78f08e8
Author: Jens Deppe <jd...@pivotal.io>
Authored: Mon Jun 19 08:23:24 2017 -0700
Committer: Jens Deppe <jd...@pivotal.io>
Committed: Mon Jun 19 08:23:24 2017 -0700
----------------------------------------------------------------------
.../cli/commands/StatusLocatorRealGfshTest.java | 50 +++
...erConfigurationServiceEndToEndDUnitTest.java | 8 +-
.../geode/test/dunit/rules/gfsh/GfshRule.java | 116 ++++++
.../geode/test/dunit/rules/gfsh/GfshScript.java | 124 ++++++
.../source/subnavs/geode-subnav.erb | 8 +-
geode-core/build.gradle | 4 -
.../internal/InternalDistributedSystem.java | 62 +--
.../apache/geode/internal/cache/EventID.java | 2 +-
.../geode/internal/cache/GemFireCacheImpl.java | 2 -
.../geode/internal/jta/GlobalTransaction.java | 4 +
.../geode/internal/jta/TransactionImpl.java | 3 +
.../internal/jta/TransactionManagerImpl.java | 15 +
.../geode/internal/jta/UserTransactionImpl.java | 4 +
.../org/apache/geode/internal/jta/XidImpl.java | 4 +
.../internal/security/CallbackInstantiator.java | 28 ++
.../security/CustomSecurityService.java | 346 ----------------
.../security/DisabledSecurityService.java | 221 -----------
.../security/EnabledSecurityService.java | 393 -------------------
.../security/IntegratedSecurityService.java | 374 ++++++++++++++++++
.../security/LegacySecurityService.java | 186 +--------
.../internal/security/SecurityService.java | 99 +++--
.../security/SecurityServiceFactory.java | 188 +++------
.../internal/security/SecurityServiceType.java | 28 --
.../security/shiro/ConfigInitializer.java | 43 --
.../security/shiro/CustomAuthRealm.java | 19 +-
.../security/shiro/RealmInitializer.java | 54 ---
.../security/shiro/SecurityManagerProvider.java | 83 ++++
.../internal/cli/commands/ConfigCommands.java | 17 +-
.../CreateAlterDestroyRegionCommands.java | 24 +-
.../internal/cli/commands/DataCommands.java | 4 +-
.../internal/cli/commands/DeployCommands.java | 57 +--
.../cli/commands/DiskStoreCommands.java | 12 +-
.../cli/commands/DurableClientCommands.java | 22 +-
.../cli/commands/ExportLogsCommand.java | 4 +-
.../internal/cli/commands/FunctionCommands.java | 20 +-
.../internal/cli/commands/IndexCommands.java | 14 +-
.../cli/commands/LauncherLifecycleCommands.java | 4 +-
.../internal/cli/commands/MemberCommands.java | 4 +-
.../cli/commands/MiscellaneousCommands.java | 34 +-
.../internal/cli/commands/QueueCommands.java | 2 +-
.../internal/cli/commands/RegionCommands.java | 6 +-
.../internal/cli/commands/WanCommands.java | 116 +++---
.../internal/cli/functions/DeployFunction.java | 3 -
.../cli/functions/UndeployFunction.java | 9 +-
.../internal/cli/i18n/CliStrings.java | 99 +----
.../controllers/ConfigCommandsController.java | 24 +-
.../web/controllers/DataCommandsController.java | 4 +-
.../controllers/DeployCommandsController.java | 26 +-
.../DiskStoreCommandsController.java | 22 +-
.../DurableClientCommandsController.java | 50 +--
.../web/controllers/ExportLogController.java | 10 +-
.../controllers/FunctionCommandsController.java | 32 +-
.../controllers/IndexCommandsController.java | 36 +-
.../controllers/MemberCommandsController.java | 6 +-
.../MiscellaneousCommandsController.java | 36 +-
.../controllers/QueueCommandsController.java | 6 +-
.../controllers/RegionCommandsController.java | 20 +-
.../web/controllers/WanCommandsController.java | 143 +++----
.../internal/index/HashIndexSetJUnitTest.java | 2 +-
.../membership/MembershipJUnitTest.java | 3 -
.../messenger/JGroupsMessengerJUnitTest.java | 6 +-
.../gms/mgr/GMSMembershipManagerJUnitTest.java | 8 +-
.../DeposePrimaryBucketMessageTest.java | 1 -
.../partitioned/FetchEntryMessageTest.java | 1 -
.../FetchPartitionDetailsMessageTest.java | 1 -
.../partitioned/MoveBucketMessageTest.java | 1 -
.../partitioned/RemoveBucketMessageTest.java | 1 -
.../sockets/ClientServerMiscBCDUnitTest.java | 42 ++
.../tier/sockets/ClientServerMiscDUnitTest.java | 4 +-
.../tier/sockets/command/ContainsKey66Test.java | 2 +-
.../tier/sockets/command/CreateRegionTest.java | 2 +-
.../tier/sockets/command/Destroy65Test.java | 2 +-
.../tier/sockets/command/DestroyRegionTest.java | 2 +-
.../cache/tier/sockets/command/DestroyTest.java | 2 +-
.../sockets/command/ExecuteFunction65Test.java | 2 +-
.../sockets/command/ExecuteFunction66Test.java | 2 +-
.../sockets/command/ExecuteFunctionTest.java | 2 +-
.../cache/tier/sockets/command/Get70Test.java | 2 +-
.../tier/sockets/command/GetAll651Test.java | 2 +-
.../tier/sockets/command/GetAll70Test.java | 2 +-
.../cache/tier/sockets/command/GetAllTest.java | 2 +-
.../sockets/command/GetAllWithCallbackTest.java | 2 +-
.../tier/sockets/command/InvalidateTest.java | 2 +-
.../cache/tier/sockets/command/KeySetTest.java | 2 +-
.../cache/tier/sockets/command/Put61Test.java | 30 +-
.../cache/tier/sockets/command/Put65Test.java | 28 +-
.../cache/tier/sockets/command/PutTest.java | 34 +-
.../sockets/command/RegisterInterest61Test.java | 2 +-
.../command/RegisterInterestList61Test.java | 2 +-
.../command/RegisterInterestList66Test.java | 2 +-
.../command/RegisterInterestListTest.java | 2 +-
.../sockets/command/RegisterInterestTest.java | 2 +-
.../tier/sockets/command/RemoveAllTest.java | 2 +-
.../cache/tier/sockets/command/RequestTest.java | 2 +-
.../sockets/command/UnregisterInterestTest.java | 2 +-
.../cache/wan/serial/DestroyMessageTest.java | 1 -
.../xmlcache/DefaultEntityResolver2Test.java | 1 -
.../logging/log4j/FastLoggerJUnitTest.java | 3 +-
.../security/DisabledSecurityServiceTest.java | 164 --------
.../security/EnabledSecurityServiceTest.java | 184 ---------
.../internal/security/FakePostProcessor.java | 103 -----
.../internal/security/FakeSecurityManager.java | 103 -----
...ntegratedSecurityServiceConstructorTest.java | 93 +++++
.../security/IntegratedSecurityServiceTest.java | 166 ++++++++
.../security/LegacySecurityServiceTest.java | 58 +++
...urityServiceFactoryShiroIntegrationTest.java | 38 +-
.../security/SecurityServiceFactoryTest.java | 314 ++++++---------
.../internal/security/SecurityServiceTest.java | 21 +-
.../shiro/ConfigInitializerIntegrationTest.java | 91 -----
.../internal/statistics/StatisticsImplTest.java | 61 +--
.../geode/internal/tcp/ConnectionJUnitTest.java | 2 +-
.../internal/CompositeBuilderViaFromTest.java | 1 -
.../internal/CompositeBuilderViaProxyTest.java | 1 -
.../beans/DistributedSystemBridgeJUnitTest.java | 2 +-
.../cli/GfshParserAutoCompletionTest.java | 6 +-
.../cli/commands/ConfigCommandsDUnitTest.java | 4 +-
...eateAlterDestroyRegionCommandsDUnitTest.java | 26 +-
.../cli/commands/DeployCommandsDUnitTest.java | 36 +-
.../commands/DiskStoreCommandsDUnitTest.java | 16 +-
.../commands/GemfireDataCommandsDUnitTest.java | 60 ++-
.../cli/commands/IndexCommandsDUnitTest.java | 16 +-
.../ListAndDescribeRegionDUnitTest.java | 8 +-
.../cli/commands/MemberCommandsDUnitTest.java | 2 +-
.../MiscellaneousCommandsDUnitTest.java | 17 +-
.../cli/commands/QueueCommandsDUnitTest.java | 6 +-
.../cli/commands/ShowMetricsDUnitTest.java | 6 +-
.../cli/commands/ShowStackTraceDUnitTest.java | 8 +-
.../cli/shell/GfshMultilineCommandTest.java | 7 +-
.../ClusterConfigDistributionDUnitTest.java | 2 +-
...tyServiceWithCustomRealmIntegrationTest.java | 2 +-
...urityServiceWithShiroIniIntegrationTest.java | 2 +-
.../WanCommandsControllerJUnitTest.java | 14 +-
.../executor/AbstractScanExecutorTest.java | 1 -
.../CacheFactoryWithSecurityObjectTest.java | 68 +++-
...SecurityManagerLifecycleDistributedTest.java | 4 +-
.../transactions/JTA_transactions.html.md.erb | 22 +-
geode-docs/rest_apps/setup_config.html.md.erb | 269 ++++++++-----
.../tools_modules/gfsh/tour_of_gfsh.html.md.erb | 86 ++--
.../lucene/internal/LuceneIndexFactorySpy.java | 3 +-
.../PartitionedRepositoryManagerJUnitTest.java | 2 +-
.../LuceneClusterConfigurationDUnitTest.java | 4 +-
.../LuceneQueryFunctionJUnitTest.java | 12 +-
.../TopEntriesFunctionCollectorJUnitTest.java | 4 +-
.../cache/lucene/test/IndexRepositorySpy.java | 2 +-
geode-pulse/build.gradle | 3 -
.../apache/geode/tools/pulse/tests/Server.java | 19 +-
.../tools/pulse/tests/rules/ServerRule.java | 6 +-
...mandCreateDestroyGatewaySenderDUnitTest.java | 56 +--
...anCommandCreateGatewayReceiverDUnitTest.java | 57 ++-
...WanCommandGatewayReceiverStartDUnitTest.java | 39 +-
.../WanCommandGatewayReceiverStopDUnitTest.java | 39 +-
.../WanCommandGatewaySenderStartDUnitTest.java | 40 +-
.../WanCommandGatewaySenderStopDUnitTest.java | 34 +-
.../wan/wancommand/WanCommandListDUnitTest.java | 32 +-
.../WanCommandPauseResumeDUnitTest.java | 68 ++--
.../wancommand/WanCommandStatusDUnitTest.java | 56 ++-
.../ClusterConfigurationDUnitTest.java | 10 +-
...nfigurationIndexWithFromClauseDUnitTest.java | 4 +-
gradle/dependency-versions.properties | 4 +-
gradle/test.gradle | 7 +-
160 files changed, 2604 insertions(+), 3534 deletions(-)
----------------------------------------------------------------------