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/25 22:27:56 UTC
[34/34] incubator-geode git commit: Merge remote-tracking branch
'origin/develop' into feature/GEODE-835
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/c9aac5a3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/c9aac5a3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/c9aac5a3
Branch: refs/heads/feature/GEODE-835
Commit: c9aac5a335ffc0c41e80f26b1cf194765613118d
Parents: 7115ab7 6c626b7
Author: Kirk Lund <kl...@pivotal.io>
Authored: Wed May 25 15:12:38 2016 -0700
Committer: Kirk Lund <kl...@pivotal.io>
Committed: Wed May 25 15:12:38 2016 -0700
----------------------------------------------------------------------
extensions/geode-modules-assembly/build.gradle | 5 +-
.../geode-modules-session-internal/build.gradle | 25 +
.../internal/common/AbstractSessionCache.java | 102 +++
.../session/internal/common/CacheProperty.java | 65 ++
.../common/ClientServerSessionCache.java | 186 +++++
.../internal/common/PeerToPeerSessionCache.java | 184 +++++
.../session/internal/common/SessionCache.java | 68 ++
.../common/SessionExpirationCacheListener.java | 53 ++
.../session/internal/filter/Constants.java | 30 +
.../internal/filter/DummySessionManager.java | 132 ++++
.../internal/filter/GemfireHttpSession.java | 526 +++++++++++++
.../filter/GemfireSessionException.java | 41 +
.../internal/filter/GemfireSessionManager.java | 511 +++++++++++++
.../internal/filter/ListenerEventType.java | 75 ++
.../session/internal/filter/SessionManager.java | 110 +++
.../AbstractDeltaSessionAttributes.java | 107 +++
.../attributes/AbstractSessionAttributes.java | 188 +++++
.../internal/filter/attributes/DeltaEvent.java | 119 +++
.../DeltaQueuedSessionAttributes.java | 94 +++
.../attributes/DeltaSessionAttributes.java | 75 ++
.../attributes/ImmediateSessionAttributes.java | 68 ++
.../attributes/QueuedSessionAttributes.java | 65 ++
.../filter/attributes/SessionAttributes.java | 120 +++
.../filter/util/NamedThreadFactory.java | 68 ++
.../filter/util/ThreadLocalSession.java | 39 +
.../internal/filter/util/TypeAwareMap.java | 50 ++
.../session/internal/jmx/SessionStatistics.java | 78 ++
.../internal/jmx/SessionStatisticsMXBean.java | 30 +
extensions/geode-modules-session/build.gradle | 18 +-
.../internal/common/AbstractSessionCache.java | 102 ---
.../session/internal/common/CacheProperty.java | 65 --
.../common/ClientServerSessionCache.java | 186 -----
.../internal/common/PeerToPeerSessionCache.java | 184 -----
.../session/internal/common/SessionCache.java | 68 --
.../common/SessionExpirationCacheListener.java | 53 --
.../session/internal/filter/Constants.java | 30 -
.../internal/filter/DummySessionManager.java | 132 ----
.../internal/filter/GemfireHttpSession.java | 526 -------------
.../filter/GemfireSessionException.java | 41 -
.../internal/filter/GemfireSessionManager.java | 511 -------------
.../internal/filter/ListenerEventType.java | 75 --
.../session/internal/filter/SessionManager.java | 110 ---
.../AbstractDeltaSessionAttributes.java | 107 ---
.../attributes/AbstractSessionAttributes.java | 188 -----
.../internal/filter/attributes/DeltaEvent.java | 119 ---
.../DeltaQueuedSessionAttributes.java | 94 ---
.../attributes/DeltaSessionAttributes.java | 75 --
.../attributes/ImmediateSessionAttributes.java | 68 --
.../attributes/QueuedSessionAttributes.java | 65 --
.../filter/attributes/SessionAttributes.java | 120 ---
.../filter/util/NamedThreadFactory.java | 68 --
.../filter/util/ThreadLocalSession.java | 39 -
.../internal/filter/util/TypeAwareMap.java | 50 --
.../session/internal/jmx/SessionStatistics.java | 78 --
.../internal/jmx/SessionStatisticsMXBean.java | 30 -
geode-assembly/build.gradle | 2 +
...stAPIOnRegionFunctionExecutionDUnitTest.java | 77 +-
.../web/controllers/RestAPITestBase.java | 17 +-
.../RestAPIsAndInterOpsDUnitTest.java | 467 ++++++------
...tAPIsOnGroupsFunctionExecutionDUnitTest.java | 6 +-
...APIsOnMembersFunctionExecutionDUnitTest.java | 19 +-
.../controllers/RestAPIsWithSSLDUnitTest.java | 510 +++++--------
.../gemfire/cache/AttributesFactory.java | 4 +-
.../cache/operations/OperationContext.java | 5 +-
.../internal/InternalDistributedSystem.java | 11 +-
.../gms/mgr/GMSMembershipManager.java | 2 +-
.../internal/cache/AbstractRegionMap.java | 50 +-
.../gemfire/internal/cache/CacheServerImpl.java | 2 -
.../internal/cache/ControllerAdvisor.java | 17 -
.../gemfire/internal/cache/EntriesSet.java | 10 -
.../gemfire/internal/cache/EntryEventImpl.java | 13 +-
.../internal/cache/GemFireCacheImpl.java | 63 +-
.../gemfire/internal/cache/GridAdvisor.java | 5 -
.../gemfire/internal/cache/LocalDataSet.java | 14 +-
.../gemfire/internal/cache/LocalRegion.java | 21 +-
.../internal/cache/PartitionedRegion.java | 2 +-
.../internal/cache/TXRemoteCommitMessage.java | 12 +-
.../gemfire/internal/cache/TXState.java | 16 +-
.../internal/cache/extension/Extension.java | 15 +-
.../cache/extension/SimpleExtensionPoint.java | 7 +
.../cache/tier/sockets/AcceptorImpl.java | 11 -
.../cache/tier/sockets/ServerConnection.java | 4 -
.../sockets/command/GatewayReceiverCommand.java | 6 +-
.../cache/tier/sockets/command/Put.java | 2 +-
.../cache/tier/sockets/command/Put61.java | 3 +-
.../cache/tier/sockets/command/Put65.java | 3 +-
.../internal/cache/xmlcache/CacheCreation.java | 2 +
.../internal/cache/xmlcache/RegionCreation.java | 4 +-
.../internal/offheap/OffHeapStoredObject.java | 11 +-
.../sequencelog/SequenceLoggerImpl.java | 21 +-
.../internal/cli/commands/IndexCommands.java | 163 ++--
...CommandOptionHasMultipleValuesException.java | 6 +-
.../CliCommandOptionMissingException.java | 4 +
.../CliCommandOptionNotApplicableException.java | 4 +
.../CliCommandOptionValueMissingException.java | 4 +
.../cli/exceptions/ExceptionGenerator.java | 22 +-
.../cli/exceptions/ExceptionHandler.java | 77 +-
.../ExportSharedConfigurationFunction.java | 9 +-
.../internal/configuration/utils/ZipUtils.java | 1 -
.../security/ResourceOperationContext.java | 17 +-
.../internal/AutoConnectionSourceDUnitTest.java | 351 ++++-----
.../AutoConnectionSourceImplJUnitTest.java | 5 -
.../internal/LocatorLoadBalancingDUnitTest.java | 471 ++++++------
.../cache/client/internal/LocatorTestBase.java | 421 ++++++-----
.../query/dunit/QueryUsingPoolDUnitTest.java | 747 +++++--------------
.../gemfire/cache30/CacheXml81DUnitTest.java | 7 +
.../DistributedAckRegionCCEDUnitTest.java | 2 +-
.../gemfire/internal/Bug49856JUnitTest.java | 8 +-
.../internal/cache/Bug47667DUnitTest.java | 42 +-
.../internal/cache/GemFireCacheImplTest.java | 7 +-
.../internal/cache/LocalDataSetTest.java | 66 ++
.../SimpleExtensionPointJUnitTest.java | 35 +
.../extension/mock/AbstractMockExtension.java | 7 +
.../mock/CreateMockCacheExtensionFunction.java | 1 +
.../mock/CreateMockRegionExtensionFunction.java | 5 +-
.../tier/sockets/AcceptorImplJUnitTest.java | 10 +-
.../offheap/MemoryBlockNodeJUnitTest.java | 14 +-
.../offheap/OffHeapStoredObjectJUnitTest.java | 22 +-
.../gemfire/management/ManagementTestBase.java | 133 ++--
.../cli/commands/CliCommandTestBase.java | 48 +-
.../configuration/ZipUtilsJUnitTest.java | 2 -
.../security/CliCommandsSecurityTest.java | 2 +-
.../GeodeSecurityUtilWithIniFileJUnitTest.java | 2 +-
.../security/GfshCommandsSecurityTest.java | 8 +-
.../security/MemberMBeanSecurityJUnitTest.java | 2 +-
.../internal/security/MultiUserDUnitTest.java | 142 ++++
.../ResourceOperationContextJUnitTest.java | 13 +-
.../internal/security/TestCommand.java | 1 +
.../cache/internal/JUnit4CacheTestCase.java | 43 +-
.../codeAnalysis/sanctionedSerializables.txt | 2 +-
.../CacheServerManagementDUnitTest.java | 260 +++----
.../lucene/internal/LuceneServiceImpl.java | 24 +-
.../lucene/internal/StringQueryProvider.java | 7 +-
.../repository/IndexRepositoryImpl.java | 8 +
.../HeterogeneousLuceneSerializer.java | 7 +
.../serializer/PdxLuceneSerializer.java | 10 +
.../serializer/ReflectionLuceneSerializer.java | 11 +
.../internal/xml/LuceneIndexCreation.java | 20 +-
.../lucene/internal/xml/LuceneXmlParser.java | 3 -
...IndexCreationPersistenceIntegrationTest.java | 3 -
.../cache/lucene/LuceneIntegrationTest.java | 1 +
.../lucene/LuceneQueriesIntegrationTest.java | 119 ++-
...LuceneQueriesPersistenceIntegrationTest.java | 117 +++
.../LuceneIndexRecoveryHAIntegrationTest.java | 79 --
.../internal/StringQueryProviderJUnitTest.java | 8 +-
.../distributed/LuceneFunctionJUnitTest.java | 11 +-
.../serializer/PdxFieldMapperJUnitTest.java | 20 +
.../ReflectionFieldMapperJUnitTest.java | 16 +
.../cache/lucene/test/LuceneTestUtilities.java | 2 +-
.../gemfire/internal/cache/wan/WANTestBase.java | 4 +-
.../ConcurrentWANPropogation_2_DUnitTest.java | 12 +-
...arallelGatewaySenderOperationsDUnitTest.java | 11 +-
.../serial/SerialWANPropogationDUnitTest.java | 6 +-
.../SerialWANPropogationsFeatureDUnitTest.java | 12 +-
.../ClusterConfigurationDUnitTest.java | 2 +
geode-web/build.gradle | 8 +-
settings.gradle | 1 +
157 files changed, 5604 insertions(+), 5954 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c9aac5a3/geode-assembly/build.gradle
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c9aac5a3/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/exceptions/ExceptionGenerator.java
----------------------------------------------------------------------
diff --cc geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/exceptions/ExceptionGenerator.java
index 2b329f1,1868c11..e7f98c5
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/exceptions/ExceptionGenerator.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/exceptions/ExceptionGenerator.java
@@@ -16,9 -16,15 +16,11 @@@
*/
package com.gemstone.gemfire.management.internal.cli.exceptions;
-import joptsimple.MissingRequiredOptionException;
-import joptsimple.MultipleArgumentsForOptionException;
import joptsimple.OptionException;
-import joptsimple.OptionMissingRequiredArgumentException;
-import joptsimple.UnrecognizedOptionException;
+ import com.gemstone.gemfire.management.internal.cli.parser.CommandTarget;
import com.gemstone.gemfire.management.internal.cli.parser.Option;
+ import com.gemstone.gemfire.management.internal.cli.parser.OptionSet;
/**
* Converts joptsimple exceptions into corresponding exceptions for cli
@@@ -27,21 -31,21 +29,21 @@@
*/
public class ExceptionGenerator {
- public static CliCommandOptionException generate(Option option, OptionException e) {
- if (e.getClass().getSimpleName().contains("MissingRequiredOptionException")) {
- return new CliCommandOptionMissingException(e);
+ public static CliCommandOptionException generate(Option option, OptionException cause) {
- if (MissingRequiredOptionException.class.isInstance(cause)) {
++ if (cause.getClass().getSimpleName().contains("MissingRequiredOptionException")) {
+ return new CliCommandOptionMissingException(option, cause);
- } else if (e.getClass().getSimpleName().contains("OptionMissingRequiredArgumentException")) {
- return new CliCommandOptionValueMissingException(e);
- } else if (OptionMissingRequiredArgumentException.class.isInstance(cause)) {
++ } else if (cause.getClass().getSimpleName().contains("OptionMissingRequiredArgumentException")) {
+ return new CliCommandOptionValueMissingException(option, cause);
- } else if (e.getClass().getSimpleName().contains("UnrecognizedOptionException")) {
- return new CliCommandOptionNotApplicableException(e);
- } else if (UnrecognizedOptionException.class.isInstance(cause)) {
++ } else if (cause.getClass().getSimpleName().contains("UnrecognizedOptionException")) {
+ return new CliCommandOptionNotApplicableException(option, cause);
- } else if (e.getClass().getSimpleName().contains("MultipleArgumentsForOptionException")) {
- return new CliCommandOptionHasMultipleValuesException(e);
- } else if (MultipleArgumentsForOptionException.class.isInstance(cause)) {
++ } else if (cause.getClass().getSimpleName().contains("MultipleArgumentsForOptionException")) {
+ return new CliCommandOptionHasMultipleValuesException(option, cause);
} else {
- return new CliCommandOptionException(e);
- return null;
++ return new CliCommandOptionException(cause);
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c9aac5a3/settings.gradle
----------------------------------------------------------------------