You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by ji...@apache.org on 2016/04/29 21:24:00 UTC
[50/50] [abbrv] incubator-geode git commit: Merge branch
'feature/GEODE-17-2' into develop
Merge branch 'feature/GEODE-17-2' 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/72be65ff
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/72be65ff
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/72be65ff
Branch: refs/heads/develop
Commit: 72be65fffe0378ce203ba8d45ed63f17610c2403
Parents: b2f8e59 53760ec
Author: Jinmei Liao <ji...@pivotal.io>
Authored: Fri Apr 29 12:21:45 2016 -0700
Committer: Jinmei Liao <ji...@pivotal.io>
Committed: Fri Apr 29 12:21:45 2016 -0700
----------------------------------------------------------------------
geode-assembly/build.gradle | 1 +
.../LauncherLifecycleCommandsDUnitTest.java | 3 +
.../SharedConfigurationEndToEndDUnitTest.java | 1 -
.../src/test/resources/expected_jars.txt | 1 +
geode-core/build.gradle | 4 +-
.../cache/operations/OperationContext.java | 556 ++++------
.../internal/AbstractDistributionConfig.java | 48 +-
.../distributed/internal/ConfigAttribute.java | 1 -
.../internal/ConfigAttributeChecker.java | 1 -
.../internal/ConfigAttributeDesc.java | 3 -
.../internal/ConfigAttributeGetter.java | 3 -
.../internal/ConfigAttributeSetter.java | 3 -
.../internal/DistributionConfig.java | 7 +
.../internal/DistributionConfigImpl.java | 38 +-
.../gemfire/internal/AbstractConfig.java | 28 +-
.../internal/security/AuthorizeRequest.java | 5 -
.../internal/security/GeodeSecurityUtil.java | 167 +++
.../security/shiro/CustomAuthRealm.java | 176 +++
.../security/shiro/JMXShiroAuthenticator.java | 69 ++
.../management/AsyncEventQueueMXBean.java | 5 +
.../gemfire/management/CacheServerMXBean.java | 12 +-
.../gemfire/management/DiskStoreMXBean.java | 9 +
.../DistributedLockServiceMXBean.java | 8 +-
.../management/DistributedRegionMXBean.java | 5 +
.../management/DistributedSystemMXBean.java | 30 +-
.../management/GatewayReceiverMXBean.java | 8 +-
.../gemfire/management/GatewaySenderMXBean.java | 12 +-
.../gemfire/management/LocatorMXBean.java | 5 +
.../gemfire/management/LockServiceMXBean.java | 10 +-
.../gemfire/management/ManagerMXBean.java | 12 +-
.../gemfire/management/MemberMXBean.java | 15 +-
.../gemfire/management/RegionMXBean.java | 4 +
.../management/internal/ManagementAgent.java | 126 ++-
.../internal/SystemManagementService.java | 36 +-
.../internal/beans/GatewaySenderMBean.java | 8 +-
.../internal/beans/MemberMBeanBridge.java | 17 +-
.../management/internal/cli/CommandManager.java | 3 -
.../internal/cli/commands/ClientCommands.java | 50 +-
.../internal/cli/commands/ConfigCommands.java | 44 +-
.../CreateAlterDestroyRegionCommands.java | 42 +-
.../internal/cli/commands/DataCommands.java | 36 +-
.../internal/cli/commands/DeployCommands.java | 21 +-
.../cli/commands/DiskStoreCommands.java | 64 +-
.../cli/commands/DurableClientCommands.java | 45 +-
...ExportImportSharedConfigurationCommands.java | 23 +-
.../internal/cli/commands/FunctionCommands.java | 33 +-
.../internal/cli/commands/GfshHelpCommands.java | 13 +-
.../internal/cli/commands/IndexCommands.java | 39 +-
.../cli/commands/LauncherLifecycleCommands.java | 81 +-
.../internal/cli/commands/MemberCommands.java | 27 +-
.../cli/commands/MiscellaneousCommands.java | 99 +-
.../internal/cli/commands/PDXCommands.java | 33 +-
.../internal/cli/commands/QueueCommands.java | 25 +-
.../internal/cli/commands/RegionCommands.java | 17 +-
.../internal/cli/commands/ShellCommands.java | 106 +-
.../internal/cli/commands/StatusCommands.java | 24 +-
.../internal/cli/commands/WanCommands.java | 336 +++---
.../internal/cli/remote/CommandProcessor.java | 24 +-
.../internal/cli/result/ErrorResultData.java | 10 +-
.../internal/cli/result/ResultBuilder.java | 7 +-
.../internal/cli/shell/JmxOperationInvoker.java | 70 +-
.../internal/security/AccessControl.java | 51 -
.../internal/security/AccessControlContext.java | 37 -
.../internal/security/AccessControlMBean.java | 41 +
.../internal/security/AccessControlMXBean.java | 6 +-
.../internal/security/CLIOperationContext.java | 138 ---
.../internal/security/JMXOperationContext.java | 177 ---
.../internal/security/JSONAuthorization.java | 308 ------
.../internal/security/MBeanServerWrapper.java | 168 ++-
.../security/ManagementInterceptor.java | 271 -----
.../management/internal/security/Resource.java | 26 -
.../internal/security/ResourceConstants.java | 91 +-
.../internal/security/ResourceOperation.java | 13 +-
.../security/ResourceOperationContext.java | 252 ++---
.../controllers/AbstractCommandsController.java | 82 +-
.../controllers/ConfigCommandsController.java | 20 +-
.../web/controllers/DataCommandsController.java | 26 +-
.../DiskStoreCommandsController.java | 14 +-
.../controllers/FunctionCommandsController.java | 9 +-
.../MiscellaneousCommandsController.java | 8 +-
.../web/controllers/WanCommandsController.java | 2 +-
.../EnvironmentVariablesHandlerInterceptor.java | 92 --
.../support/LoginHandlerInterceptor.java | 122 ++
.../web/http/support/SimpleHttpRequester.java | 105 +-
.../web/shell/AbstractHttpOperationInvoker.java | 28 +-
.../web/shell/RestHttpOperationInvoker.java | 26 +-
.../web/shell/SimpleHttpOperationInvoker.java | 11 +-
.../gemfire/security/AccessControl.java | 16 +-
.../gemfire/security/Authenticator.java | 18 +-
.../internal/DistributionConfigJUnitTest.java | 74 +-
.../gemfire/internal/ConfigSourceJUnitTest.java | 8 +-
.../extension/mock/MockExtensionCommands.java | 23 +-
.../internal/cli/CommandManagerJUnitTest.java | 45 +-
.../internal/cli/GfshParserJUnitTest.java | 45 +-
.../management/internal/cli/HeadlessGfsh.java | 2 +-
.../cli/commands/CliCommandTestBase.java | 134 ++-
.../cli/commands/ConfigCommandsDUnitTest.java | 26 +-
...eateAlterDestroyRegionCommandsDUnitTest.java | 34 +-
.../cli/commands/DeployCommandsDUnitTest.java | 14 +-
.../commands/DiskStoreCommandsDUnitTest.java | 30 +-
.../commands/DiskStoreCommandsJUnitTest.java | 1 +
.../cli/commands/FunctionCommandsDUnitTest.java | 40 +-
.../commands/GemfireDataCommandsDUnitTest.java | 28 +-
...WithCacheLoaderDuringCacheMissDUnitTest.java | 15 +-
.../cli/commands/IndexCommandsDUnitTest.java | 21 +-
...stAndDescribeDiskStoreCommandsDUnitTest.java | 14 +-
.../ListAndDescribeRegionDUnitTest.java | 13 +-
.../cli/commands/ListIndexCommandDUnitTest.java | 14 +-
.../MiscellaneousCommandsDUnitTest.java | 40 +-
...laneousCommandsExportLogsPart1DUnitTest.java | 15 +-
...laneousCommandsExportLogsPart2DUnitTest.java | 16 +-
...laneousCommandsExportLogsPart3DUnitTest.java | 24 +-
...laneousCommandsExportLogsPart4DUnitTest.java | 15 +-
.../cli/commands/QueueCommandsDUnitTest.java | 16 +-
.../SharedConfigurationCommandsDUnitTest.java | 16 +-
.../cli/commands/ShellCommandsDUnitTest.java | 12 +-
.../cli/commands/ShowMetricsDUnitTest.java | 16 +-
.../cli/commands/ShowStackTraceDUnitTest.java | 14 +-
.../cli/commands/UserCommandsDUnitTest.java | 16 +-
.../shell/GfshExecutionStrategyJUnitTest.java | 36 +-
.../cli/shell/GfshHistoryJUnitTest.java | 2 -
.../security/AccessControlMBeanJUnitTest.java | 58 +
...rDistributedSystemMXBeanIntegrationTest.java | 50 -
...horizeOperationForMBeansIntegrationTest.java | 323 ------
...erationForRegionCommandsIntegrationTest.java | 136 ---
...CacheServerMBeanAuthenticationJUnitTest.java | 58 +
.../CacheServerMBeanAuthorizationJUnitTest.java | 90 ++
.../CacheServerMBeanShiroJUnitTest.java | 93 ++
.../security/CliCommandsSecurityTest.java | 83 ++
.../security/DataCommandsSecurityTest.java | 83 ++
.../DiskStoreMXBeanSecurityJUnitTest.java | 83 ++
.../GatewayReceiverMBeanSecurityTest.java | 90 ++
.../GatewaySenderMBeanSecurityTest.java | 105 ++
.../GeodeSecurityUtilCustomRealmJUnitTest.java | 52 +
.../GeodeSecurityUtilWithIniFileJUnitTest.java | 147 +++
.../security/GfshCommandsSecurityTest.java | 165 +++
.../security/GfshShellConnectionRule.java | 109 ++
.../security/JMXConnectionConfiguration.java | 33 +
.../internal/security/JSONAuthorization.java | 204 ++++
...JSONAuthorizationDetailsIntegrationTest.java | 163 ---
.../JsonAuthorizationCacheStartRule.java | 83 ++
.../LockServiceMBeanAuthorizationJUnitTest.java | 90 ++
.../security/MBeanSecurityJUnitTest.java | 117 ++
.../security/MBeanServerConnectionRule.java | 130 +++
.../ManagerMBeanAuthorizationJUnitTest.java | 78 ++
.../security/MemberMBeanSecurityJUnitTest.java | 110 ++
...tionCodesForDataCommandsIntegrationTest.java | 101 --
...tionCodesForDistributedSystemMXBeanTest.java | 76 --
.../ResourceOperationContextJUnitTest.java | 88 ++
.../internal/security/ShiroCacheStartRule.java | 63 ++
.../internal/security/TestCommand.java | 227 ++++
.../ReadOpFileAccessControllerJUnitTest.java | 19 +-
.../security/ClientAuthorizationDUnitTest.java | 7 +-
.../security/ClientAuthorizationTestCase.java | 20 +-
.../DeltaClientPostAuthorizationDUnitTest.java | 21 +-
.../security/templates/XmlAuthorization.java | 2 +-
.../com/gemstone/gemfire/test/dunit/VM.java | 62 +-
.../gemstone/gemfire/util/test/TestUtil.java | 8 +-
.../gemfire/codeAnalysis/excludedClasses.txt | 28 +-
.../codeAnalysis/sanctionedSerializables.txt | 2 +
.../management/internal/security/auth1.json | 28 +-
.../management/internal/security/auth3.json | 55 +-
.../internal/security/cacheServer.json | 188 ++++
.../management/internal/security/shiro-ini.json | 87 ++
.../internal/security/testInheritRole.json | 40 -
.../security/testSimpleUserAndRole.json | 14 -
.../testUserAndRoleRegionServerGroup.json | 16 -
.../internal/security/testUserMultipleRole.json | 20 -
geode-core/src/test/resources/shiro.ini | 40 +
.../cli/commands/ClientCommandsDUnitTest.java | 53 +-
.../DurableClientCommandsDUnitTest.java | 2 +-
.../junit/rules/DescribedExternalResource.java | 63 ++
.../LuceneFunctionReadPathDUnitTest.java | 17 +-
geode-pulse/build.gradle | 1 +
.../tools/pulse/internal/PulseAppListener.java | 68 +-
.../internal/controllers/PulseController.java | 28 +-
.../tools/pulse/internal/data/Cluster.java | 14 +-
.../pulse/internal/data/JMXDataUpdater.java | 217 ++--
.../pulse/internal/data/PulseConstants.java | 14 +
.../tools/pulse/internal/data/Repository.java | 54 +-
.../pulse/internal/log/PulseLogWriter.java | 4 -
.../security/GemFireAuthentication.java | 91 ++
.../security/GemFireAuthenticationProvider.java | 80 ++
.../pulse/internal/security/LogoutHandler.java | 55 +
geode-pulse/src/main/resources/pulse.properties | 12 +-
.../src/main/webapp/WEB-INF/spring-security.xml | 59 +-
.../controllers/PulseControllerJUnitTest.java | 56 +-
.../tools/pulse/testbed/driver/PulseUITest.java | 2 +-
.../pulse/tests/DataBrowserResultLoader.java | 14 +-
.../tools/pulse/tests/PulseAbstractTest.java | 1047 ++++++++++++++++++
.../tools/pulse/tests/PulseAuthTest.java | 33 +
.../tools/pulse/tests/PulseAutomatedTest.java | 17 +-
.../tools/pulse/tests/PulseBaseTest.java | 4 +-
.../tools/pulse/tests/PulseNoAuthTest.java | 33 +
.../gemfire/tools/pulse/tests/PulseTest.java | 1039 -----------------
.../gemfire/tools/pulse/tests/Region.java | 2 +-
.../gemfire/tools/pulse/tests/Server.java | 156 ++-
geode-pulse/src/test/resources/pulse-auth.json | 21 +
.../wan/wancommand/WANCommandTestBase.java | 104 +-
...anCommandCreateGatewayReceiverDUnitTest.java | 174 +--
.../WanCommandCreateGatewaySenderDUnitTest.java | 192 ++--
...WanCommandGatewayReceiverStartDUnitTest.java | 120 +-
.../WanCommandGatewayReceiverStopDUnitTest.java | 120 +-
.../WanCommandGatewaySenderStartDUnitTest.java | 177 ++-
.../WanCommandGatewaySenderStopDUnitTest.java | 158 +--
.../wan/wancommand/WanCommandListDUnitTest.java | 135 ++-
.../WanCommandPauseResumeDUnitTest.java | 370 +++----
.../wancommand/WanCommandStatusDUnitTest.java | 174 +--
.../src/main/webapp/WEB-INF/gemfire-servlet.xml | 2 +-
...entVariablesHandlerInterceptorJUnitTest.java | 267 -----
.../LoginHandlerInterceptorJUnitTest.java | 274 +++++
gradle/dependency-versions.properties | 1 +
212 files changed, 8790 insertions(+), 6365 deletions(-)
----------------------------------------------------------------------