Merge remote-tracking branch 'origin/develop' into develop
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/3068fb69 Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/3068fb69 Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/3068fb69 Branch: refs/heads/feature/GEODE-1874 Commit: 3068fb6946795f9f9790d0fb29d7c5f8068f99ac Parents: 40c1917 de62159 Author: Dan Smith <upthewatersp...@apache.org> Authored: Fri Oct 14 16:21:32 2016 -0700 Committer: Dan Smith <upthewatersp...@apache.org> Committed: Fri Oct 14 16:21:32 2016 -0700 ---------------------------------------------------------------------- .gitignore | 3 + .../internal/web/RestSecurityDUnitTest.java | 180 --- .../web/RestSecurityEndpointsDUnitTest.java | 422 ------- .../web/RestSecurityIntegrationTest.java | 497 +++++++++ .../client/internal/ExecuteFunctionOp.java | 4 +- .../ExecuteRegionFunctionSingleHopOp.java | 2 - .../internal/index/CompactMapRangeIndex.java | 9 +- .../internal/InternalDistributedSystem.java | 68 +- .../membership/InternalDistributedMember.java | 7 +- .../cache/AbstractBucketRegionQueue.java | 34 +- .../geode/internal/cache/BucketRegionQueue.java | 59 +- .../geode/internal/cache/GemFireCacheImpl.java | 6 +- .../cache/execute/ServerFunctionExecutor.java | 5 +- .../execute/ServerRegionFunctionExecutor.java | 3 +- .../util/SynchronizedResultCollector.java | 57 + .../internal/cache/tier/sockets/HandShake.java | 8 +- .../parallel/ParallelGatewaySenderQueue.java | 35 +- .../wan/serial/SerialGatewaySenderQueue.java | 26 +- .../security/IntegratedSecurityService.java | 29 +- .../internal/security/SecurityService.java | 7 +- .../geode/security/ResourcePermission.java | 4 +- .../AutoConnectionSourceImplJUnitTest.java | 27 + .../MapRangeIndexMaintenanceJUnitTest.java | 617 ++++++++++- .../cache/execute/FunctionServiceBase.java | 1 + .../ha/BlockingHARegionQueueJUnitTest.java | 182 ++- .../internal/cache/ha/Bug48571DUnitTest.java | 13 +- .../cache/ha/HARegionQueueJUnitTest.java | 252 ++--- .../tier/sockets/HAInterestPart2DUnitTest.java | 3 +- .../ParallelGatewaySenderQueueJUnitTest.java | 134 ++- .../management/ClientHealthStatsDUnitTest.java | 2 + .../cli/commands/QueueCommandsDUnitTest.java | 1 + .../SharedConfigurationUsingDirDUnitTest.java | 1 + .../security/AccessControlMBeanJUnitTest.java | 7 +- ...CacheServerMBeanAuthenticationJUnitTest.java | 7 +- .../CacheServerMBeanAuthorizationJUnitTest.java | 13 +- .../CacheServerMBeanShiroJUnitTest.java | 30 +- .../security/CacheServerStartupRule.java | 74 ++ .../security/CliCommandsSecurityTest.java | 9 +- .../security/DataCommandsSecurityTest.java | 11 +- .../DiskStoreMXBeanSecurityJUnitTest.java | 9 +- .../GatewayReceiverMBeanSecurityTest.java | 9 +- .../GatewaySenderMBeanSecurityTest.java | 9 +- .../security/GfshCommandsPostProcessorTest.java | 30 +- .../security/GfshCommandsSecurityTest.java | 48 +- .../security/GfshShellConnectionRule.java | 5 +- .../security/JMXConnectionConfiguration.java | 33 - .../security/JavaRmiServerNameTest.java | 28 +- .../JsonAuthorizationCacheStartRule.java | 86 -- .../LockServiceMBeanAuthorizationJUnitTest.java | 11 +- .../security/MBeanSecurityJUnitTest.java | 10 +- .../security/MBeanServerConnectionRule.java | 130 --- .../ManagerMBeanAuthorizationJUnitTest.java | 9 +- .../security/MemberMBeanSecurityJUnitTest.java | 13 +- .../security/ResourcePermissionTest.java | 25 +- .../internal/security/ShiroCacheStartRule.java | 64 -- .../security/AbstractSecureServerDUnitTest.java | 104 +- ...lusterConfigWithEmbededLocatorDUnitTest.java | 67 ++ .../ClusterConfigWithoutSecurityDUnitTest.java | 100 ++ .../security/IntegratedClientAuthDUnitTest.java | 19 +- .../NoShowValue1PostProcessorDUnitTest.java | 8 +- .../security/PDXPostProcessorDUnitTest.java | 18 +- .../geode/security/PostProcessorDUnitTest.java | 10 +- .../SecurityClusterConfigDUnitTest.java | 134 +-- .../SecurityWithoutClusterConfigDUnitTest.java | 100 +- .../security/StartServerAuthorizationTest.java | 72 +- .../dunit/rules/ConnectionConfiguration.java | 34 + .../rules/LocatorServerConfigurationRule.java | 141 --- .../dunit/rules/LocatorServerStartupRule.java | 133 +++ .../geode/test/dunit/rules/LocatorStarter.java | 74 ++ .../dunit/rules/MBeanServerConnectionRule.java | 132 +++ .../geode/test/dunit/rules/ServerStarter.java | 99 ++ .../geode/security/CQClientAuthDunitTest.java | 6 +- .../security/CQPDXPostProcessorDUnitTest.java | 19 +- .../security/CQPostProcessorDunitTest.java | 10 +- geode-junit/build.gradle | 5 +- .../test/junit/rules/TemporaryFileRule.java | 111 ++ .../test/junit/rules/TemporaryFileRuleTest.java | 130 +++ .../LuceneClusterConfigurationDUnitTest.java | 47 +- geode-pulse/build.gradle | 6 +- .../src/main/webapp/WEB-INF/spring-security.xml | 6 +- .../tools/pulse/testbed/driver/PulseUITest.java | 13 +- .../pulse/tests/DataBrowserResultLoader.java | 2 + .../tools/pulse/tests/PulseAbstractTest.java | 1048 ------------------ .../geode/tools/pulse/tests/PulseAuthTest.java | 33 - .../tools/pulse/tests/PulseAutomatedTest.java | 784 ------------- .../geode/tools/pulse/tests/PulseBaseTest.java | 693 ------------ .../tools/pulse/tests/PulseNoAuthTest.java | 33 - .../tools/pulse/tests/ui/PulseAbstractTest.java | 985 ++++++++++++++++ .../pulse/tests/ui/PulseAnonymousUserTest.java | 149 +++ .../tools/pulse/tests/ui/PulseAuthTest.java | 34 + .../pulse/tests/ui/PulseAutomatedTest.java | 768 +++++++++++++ .../tools/pulse/tests/ui/PulseBaseTest.java | 697 ++++++++++++ .../tools/pulse/tests/ui/PulseNoAuthTest.java | 34 + ...oncurrentParallelGatewaySenderDUnitTest.java | 1 + .../ConcurrentWANPropagation_1_DUnitTest.java | 37 +- .../ParallelWANPropagationDUnitTest.java | 1 - .../web/controllers/AbstractBaseController.java | 32 +- .../web/controllers/BaseControllerAdvice.java | 43 +- .../web/controllers/CommonCrudController.java | 55 +- .../controllers/FunctionAccessController.java | 56 +- .../web/controllers/PdxBasedCrudController.java | 53 +- .../web/controllers/QueryAccessController.java | 73 +- .../web/security/GeodeAuthentication.java | 37 - .../security/GeodeAuthenticationProvider.java | 21 +- .../internal/web/security/GeodeAuthority.java | 47 - .../web/security/RestSecurityService.java | 56 + gradle/dependency-versions.properties | 1 + 107 files changed, 5931 insertions(+), 4808 deletions(-) ----------------------------------------------------------------------