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/21 19:17:25 UTC
[50/50] [abbrv] incubator-geode git commit: Merge branch 'develop'
into feature/GEODE-17-2
Merge branch 'develop' into feature/GEODE-17-2
# Conflicts:
# geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/CreateAlterDestroyRegionCommandsDUnitTest.java
# geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DiskStoreCommandsDUnitTest.java
# geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/GemfireDataCommandsDUnitTest.java
# geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/IndexCommandsDUnitTest.java
# geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListAndDescribeRegionDUnitTest.java
# geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsDUnitTest.java
# geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsExportLogsPart3DUnitTest.java
# geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShellCommandsDUnitTest.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/def78f18
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/def78f18
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/def78f18
Branch: refs/heads/feature/GEODE-17-2
Commit: def78f1882b2a3b065e0d6aa06deeb8a81ec91d8
Parents: 7b73595 ff914bd
Author: Jinmei Liao <ji...@pivotal.io>
Authored: Thu Apr 21 10:15:17 2016 -0700
Committer: Jinmei Liao <ji...@pivotal.io>
Committed: Thu Apr 21 10:15:17 2016 -0700
----------------------------------------------------------------------
.../SessionReplicationIntegrationJUnitTest.java | 10 +-
.../client/internal/CloseConnectionOp.java | 26 +-
.../distributed/internal/InternalLocator.java | 18 +-
.../internal/WanLocatorDiscoverer.java | 4 +
.../internal/tcpserver/TcpServer.java | 4 +-
.../gemfire/internal/AvailablePort.java | 6 +-
.../tier/sockets/command/CloseConnection.java | 17 +-
.../internal/cli/commands/ShellCommands.java | 2 +-
.../cli/functions/ShutDownFunction.java | 52 +-
.../com/gemstone/gemfire/TXExpiryJUnitTest.java | 6 +-
.../gemfire/cache/ConnectionPoolDUnitTest.java | 3 +
.../pooling/ConnectionManagerJUnitTest.java | 8 +-
.../management/MemoryThresholdsDUnitTest.java | 4 +
.../MemoryThresholdsOffHeapDUnitTest.java | 9 +-
.../management/ResourceManagerDUnitTest.java | 16 +-
.../gemfire/cache/query/QueryTestUtils.java | 238 +--
.../cache/query/QueryTestUtilsJUnitTest.java | 1 +
.../query/dunit/CompactRangeIndexDUnitTest.java | 1 +
.../cache/query/dunit/HashIndexDUnitTest.java | 1 +
.../dunit/QueryDataInconsistencyDUnitTest.java | 12 +-
.../QueryUsingFunctionContextDUnitTest.java | 11 +-
.../query/dunit/QueryUsingPoolDUnitTest.java | 3 +
.../cache/query/dunit/RemoteQueryDUnitTest.java | 3 +
.../QueryREUpdateInProgressJUnitTest.java | 3 +-
.../index/CompactRangeIndexJUnitTest.java | 1 +
...pdateWithInplaceObjectModFalseDUnitTest.java | 9 +-
...itializeIndexEntryDestroyQueryDUnitTest.java | 14 +-
.../partitioned/PRQueryCacheCloseDUnitTest.java | 29 +-
.../gemfire/cache30/Bug44418JUnitTest.java | 10 +-
.../gemfire/cache30/CacheLogRollDUnitTest.java | 13 +-
.../cache30/ClientMembershipDUnitTest.java | 4 +
...iskDistributedNoAckAsyncRegionDUnitTest.java | 4 -
.../DiskDistributedNoAckRegionTestCase.java | 7 +-
...tributedAckPersistentRegionCCEDUnitTest.java | 80 +-
.../DistributedAckRegionCCEDUnitTest.java | 70 +-
.../cache30/DistributedAckRegionDUnitTest.java | 2 -
.../DistributedNoAckRegionCCEDUnitTest.java | 76 +-
.../DistributedNoAckRegionDUnitTest.java | 3 +-
.../gemfire/cache30/MultiVMRegionTestCase.java | 18 +-
.../cache30/PartitionedRegionDUnitTest.java | 6 +-
.../cache30/RegionReliabilityTestCase.java | 4 +
.../gemfire/cache30/RegionTestCase.java | 11 +-
.../gemfire/cache30/TXDistributedDUnitTest.java | 5 +-
.../gemfire/distributed/LocatorDUnitTest.java | 11 +-
.../LocatorLauncherRemoteJUnitTest.java | 13 +-
.../ServerLauncherRemoteJUnitTest.java | 11 +-
.../internal/LocatorLoadSnapshotJUnitTest.java | 2 +
.../GemFireDeadlockDetectorDUnitTest.java | 12 +-
.../gemfire/disttx/DistTXExpiryJUnitTest.java | 1 -
...hreadPoolExecutorWithKeepAliveJUnitTest.java | 9 +-
.../cache/FixedPRSinglehopDUnitTest.java | 4 +
.../internal/cache/GIIDeltaDUnitTest.java | 9 +-
.../cache/NetSearchMessagingDUnitTest.java | 12 +-
.../gemfire/internal/cache/OplogJUnitTest.java | 13 +-
.../PartitionedRegionCreationDUnitTest.java | 17 +-
...rtitionedRegionDelayedRecoveryDUnitTest.java | 13 +-
.../PartitionedRegionSingleHopDUnitTest.java | 5 +
.../internal/cache/SingleHopStatsDUnitTest.java | 9 +-
...ributedRegionFunctionExecutionDUnitTest.java | 11 +-
...onFunctionExecutionNoSingleHopDUnitTest.java | 7 +-
.../PRFunctionExecutionTimeOutDUnitTest.java | 17 +-
.../internal/cache/ha/Bug48571DUnitTest.java | 6 +-
.../cache/ha/HARegionQueueDUnitTest.java | 14 +-
...tentColocatedPartitionedRegionDUnitTest.java | 16 +-
.../PersistentPartitionedRegionDUnitTest.java | 15 +-
...tentPartitionedRegionOldConfigDUnitTest.java | 6 +-
.../fixed/FixedPartitioningDUnitTest.java | 12 +-
.../DestroyEntryPropagationDUnitTest.java | 14 +-
.../sockets/HAStartupAndFailoverDUnitTest.java | 21 +-
.../sockets/ReliableMessagingDUnitTest.java | 12 +-
.../sockets/UpdatePropagationDUnitTest.java | 17 +-
.../asyncqueue/AsyncEventListenerDUnitTest.java | 3 +
.../AsyncEventListenerOffHeapDUnitTest.java | 4 +-
.../management/DLockManagementDUnitTest.java | 22 +-
...ersalMembershipListenerAdapterDUnitTest.java | 5 +-
.../cli/commands/CliCommandTestBase.java | 14 +-
...eateAlterDestroyRegionCommandsDUnitTest.java | 19 +-
.../commands/DiskStoreCommandsDUnitTest.java | 1 +
.../commands/GemfireDataCommandsDUnitTest.java | 2 +
.../cli/commands/IndexCommandsDUnitTest.java | 11 +-
.../ListAndDescribeRegionDUnitTest.java | 2 +
.../MiscellaneousCommandsDUnitTest.java | 3 +-
...laneousCommandsExportLogsPart3DUnitTest.java | 2 +
.../cli/commands/ShellCommandsDUnitTest.java | 47 +-
.../SharedConfigurationUsingDirDUnitTest.java | 2 +
.../GemcachedDevelopmentJUnitTest.java | 2 +
.../pdx/DistributedSystemIdDUnitTest.java | 13 +-
.../gemfire/redis/RedisDistDUnitTest.java | 4 +
.../security/ClientAuthenticationDUnitTest.java | 2 +
.../security/P2PAuthenticationDUnitTest.java | 3 +
.../cache/query/cq/dunit/CqPerfDUnitTest.java | 5 +-
.../cq/dunit/CqPerfUsingPoolDUnitTest.java | 9 +-
.../cache/query/cq/dunit/CqQueryDUnitTest.java | 2 +-
.../cq/dunit/CqQueryUsingPoolDUnitTest.java | 22 +-
.../query/cq/dunit/PrCqUsingPoolDUnitTest.java | 18 +-
.../query/dunit/QueryMonitorDUnitTest.java | 8 +-
.../sockets/DurableClientSimpleDUnitTest.java | 203 +-
.../tier/sockets/DurableClientTestCase.java | 1 -
.../cli/commands/ClientCommandsDUnitTest.java | 7 +-
.../security/ClientAuthzObjectModDUnitTest.java | 4 +-
.../ClientPostAuthorizationDUnitTest.java | 9 +-
.../cache/lucene/LuceneServiceProvider.java | 9 +-
.../LuceneIndexForPartitionedRegion.java | 117 +-
.../LuceneIndexForPartitionedRegionTest.java | 348 ++++
.../LuceneIndexRecoveryHAJUnitTest.java | 5 +-
.../internal/LuceneServiceImplJUnitTest.java | 68 +-
geode-spark-connector/doc/10_demos.md | 12 +-
geode-spark-connector/doc/1_building.md | 18 +-
geode-spark-connector/doc/2_quick.md | 26 +-
geode-spark-connector/doc/3_connecting.md | 38 +-
geode-spark-connector/doc/4_loading.md | 30 +-
geode-spark-connector/doc/5_rdd_join.md | 26 +-
geode-spark-connector/doc/6_save_rdd.md | 20 +-
geode-spark-connector/doc/7_save_dstream.md | 10 +-
geode-spark-connector/doc/8_oql.md | 8 +-
geode-spark-connector/doc/9_java_api.md | 36 +-
.../connector/internal/RegionMetadata.java | 93 -
.../gemfirefunctions/QueryFunction.java | 99 -
.../RetrieveRegionFunction.java | 208 --
.../RetrieveRegionMetadataFunction.java | 118 --
.../StructStreamingResultSender.java | 219 --
.../gemfire/spark/connector/Employee.java | 54 -
.../spark/connector/JavaApiIntegrationTest.java | 424 ----
.../gemfire/spark/connector/Portfolio.java | 109 -
.../gemfire/spark/connector/Position.java | 73 -
.../src/it/resources/test-regions.xml | 49 -
.../src/it/resources/test-retrieve-regions.xml | 57 -
.../spark/connector/BasicIntegrationTest.scala | 598 ------
.../RDDJoinRegionIntegrationTest.scala | 300 ---
.../RetrieveRegionIntegrationTest.scala | 253 ---
.../gemfire/spark/connector/package.scala | 29 -
.../connector/testkit/GemFireCluster.scala | 47 -
.../spark/connector/testkit/GemFireRunner.scala | 148 --
.../spark/connector/testkit/IOUtils.scala | 94 -
.../spark/streaming/ManualClockHelper.scala | 28 -
.../spark/streaming/TestInputDStream.scala | 44 -
.../javaapi/GemFireJavaDStreamFunctions.java | 86 -
.../GemFireJavaPairDStreamFunctions.java | 77 -
.../javaapi/GemFireJavaPairRDDFunctions.java | 238 ---
.../javaapi/GemFireJavaRDDFunctions.java | 178 --
.../javaapi/GemFireJavaSQLContextFunctions.java | 49 -
.../GemFireJavaSparkContextFunctions.java | 87 -
.../connector/javaapi/GemFireJavaUtil.java | 122 --
.../spark/connector/GemFireConnection.scala | 67 -
.../spark/connector/GemFireConnectionConf.scala | 73 -
.../connector/GemFireConnectionManager.scala | 31 -
.../connector/GemFireFunctionDeployer.scala | 81 -
.../connector/GemFireKryoRegistrator.scala | 29 -
.../connector/GemFirePairRDDFunctions.scala | 140 --
.../spark/connector/GemFireRDDFunctions.scala | 120 --
.../connector/GemFireSQLContextFunctions.scala | 42 -
.../GemFireSparkContextFunctions.scala | 39 -
.../internal/DefaultGemFireConnection.scala | 164 --
.../DefaultGemFireConnectionManager.scala | 77 -
.../connector/internal/LocatorHelper.scala | 135 --
.../StructStreamingResultCollector.scala | 152 --
.../connector/internal/oql/QueryParser.scala | 58 -
.../spark/connector/internal/oql/QueryRDD.scala | 83 -
.../internal/oql/QueryResultCollector.scala | 69 -
.../connector/internal/oql/RDDConverter.scala | 40 -
.../connector/internal/oql/RowBuilder.scala | 38 -
.../connector/internal/oql/SchemaBuilder.scala | 73 -
.../internal/oql/UndefinedSerializer.scala | 46 -
.../connector/internal/rdd/GemFireJoinRDD.scala | 67 -
.../internal/rdd/GemFireOuterJoinRDD.scala | 69 -
.../internal/rdd/GemFireRDDPartition.scala | 36 -
.../internal/rdd/GemFireRDDPartitioner.scala | 59 -
.../rdd/GemFireRDDPartitionerImpl.scala | 89 -
.../internal/rdd/GemFireRDDWriter.scala | 82 -
.../internal/rdd/GemFireRegionRDD.scala | 138 --
.../javaapi/GemFireJavaRegionRDD.scala | 26 -
.../spark/connector/javaapi/JavaAPIHelper.scala | 53 -
.../gemfire/spark/connector/package.scala | 69 -
.../streaming/GemFireDStreamFunctions.scala | 89 -
.../spark/connector/streaming/package.scala | 32 -
.../gemfire/spark/connector/JavaAPITest.java | 163 --
.../connector/GemFireFunctionDeployerTest.scala | 58 -
.../DefaultGemFireConnectionManagerTest.scala | 82 -
...tStreamingResultSenderAndCollectorTest.scala | 254 ---
.../internal/oql/QueryParserTest.scala | 83 -
.../connector/ConnectorImplicitsTest.scala | 50 -
.../connector/GemFireConnectionConfTest.scala | 100 -
.../connector/GemFireDStreamFunctionsTest.scala | 79 -
.../connector/GemFireRDDFunctionsTest.scala | 139 --
.../spark/connector/LocatorHelperTest.scala | 168 --
.../rdd/GemFireRDDPartitionerTest.scala | 190 --
.../connector/rdd/GemFireRegionRDDTest.scala | 117 --
.../basic-demos/src/main/java/demo/Emp.java | 95 -
.../src/main/java/demo/OQLJavaDemo.java | 59 -
.../src/main/java/demo/PairRDDSaveJavaDemo.java | 86 -
.../src/main/java/demo/RDDSaveJavaDemo.java | 85 -
.../src/main/java/demo/RegionToRDDJavaDemo.java | 57 -
.../src/main/scala/demo/NetworkWordCount.scala | 75 -
.../connector/internal/RegionMetadata.java | 93 +
.../internal/geodefunctions/QueryFunction.java | 99 +
.../geodefunctions/RetrieveRegionFunction.java | 208 ++
.../RetrieveRegionMetadataFunction.java | 118 ++
.../StructStreamingResultSender.java | 219 ++
.../pivotal/geode/spark/connector/Employee.java | 54 +
.../spark/connector/JavaApiIntegrationTest.java | 424 ++++
.../geode/spark/connector/Portfolio.java | 109 +
.../pivotal/geode/spark/connector/Position.java | 73 +
.../src/it/resources/test-regions.xml | 49 +
.../src/it/resources/test-retrieve-regions.xml | 57 +
.../spark/connector/BasicIntegrationTest.scala | 598 ++++++
.../RDDJoinRegionIntegrationTest.scala | 300 +++
.../RetrieveRegionIntegrationTest.scala | 253 +++
.../pivotal/geode/spark/connector/package.scala | 29 +
.../spark/connector/testkit/GeodeCluster.scala | 47 +
.../spark/connector/testkit/GeodeRunner.scala | 148 ++
.../geode/spark/connector/testkit/IOUtils.scala | 94 +
.../spark/streaming/ManualClockHelper.scala | 28 +
.../spark/streaming/TestInputDStream.scala | 44 +
.../javaapi/GeodeJavaDStreamFunctions.java | 86 +
.../javaapi/GeodeJavaPairDStreamFunctions.java | 77 +
.../javaapi/GeodeJavaPairRDDFunctions.java | 238 +++
.../javaapi/GeodeJavaRDDFunctions.java | 178 ++
.../javaapi/GeodeJavaSQLContextFunctions.java | 49 +
.../javaapi/GeodeJavaSparkContextFunctions.java | 87 +
.../spark/connector/javaapi/GeodeJavaUtil.java | 122 ++
.../geode/spark/connector/GeodeConnection.scala | 67 +
.../spark/connector/GeodeConnectionConf.scala | 73 +
.../connector/GeodeConnectionManager.scala | 31 +
.../spark/connector/GeodeFunctionDeployer.scala | 81 +
.../spark/connector/GeodeKryoRegistrator.scala | 29 +
.../spark/connector/GeodePairRDDFunctions.scala | 140 ++
.../spark/connector/GeodeRDDFunctions.scala | 120 ++
.../connector/GeodeSQLContextFunctions.scala | 42 +
.../connector/GeodeSparkContextFunctions.scala | 39 +
.../internal/DefaultGeodeConnection.scala | 164 ++
.../DefaultGeodeConnectionManager.scala | 77 +
.../connector/internal/LocatorHelper.scala | 135 ++
.../StructStreamingResultCollector.scala | 152 ++
.../connector/internal/oql/QueryParser.scala | 58 +
.../spark/connector/internal/oql/QueryRDD.scala | 83 +
.../internal/oql/QueryResultCollector.scala | 69 +
.../connector/internal/oql/RDDConverter.scala | 40 +
.../connector/internal/oql/RowBuilder.scala | 38 +
.../connector/internal/oql/SchemaBuilder.scala | 73 +
.../internal/oql/UndefinedSerializer.scala | 46 +
.../connector/internal/rdd/GeodeJoinRDD.scala | 67 +
.../internal/rdd/GeodeOuterJoinRDD.scala | 69 +
.../internal/rdd/GeodeRDDPartition.scala | 36 +
.../internal/rdd/GeodeRDDPartitioner.scala | 59 +
.../internal/rdd/GeodeRDDPartitionerImpl.scala | 89 +
.../connector/internal/rdd/GeodeRDDWriter.scala | 82 +
.../connector/internal/rdd/GeodeRegionRDD.scala | 138 ++
.../connector/javaapi/GeodeJavaRegionRDD.scala | 26 +
.../spark/connector/javaapi/JavaAPIHelper.scala | 53 +
.../pivotal/geode/spark/connector/package.scala | 69 +
.../streaming/GeodeDStreamFunctions.scala | 89 +
.../spark/connector/streaming/package.scala | 32 +
.../geode/spark/connector/JavaAPITest.java | 163 ++
.../connector/GeodeFunctionDeployerTest.scala | 58 +
.../DefaultGeodeConnectionManagerTest.scala | 82 +
...tStreamingResultSenderAndCollectorTest.scala | 254 +++
.../internal/oql/QueryParserTest.scala | 83 +
.../connector/ConnectorImplicitsTest.scala | 50 +
.../connector/GeodeConnectionConfTest.scala | 100 +
.../connector/GeodeDStreamFunctionsTest.scala | 79 +
.../spark/connector/GeodeRDDFunctionsTest.scala | 139 ++
.../spark/connector/LocatorHelperTest.scala | 168 ++
.../connector/rdd/GeodeRDDPartitionerTest.scala | 190 ++
.../connector/rdd/GeodeRegionRDDTest.scala | 117 ++
.../basic-demos/src/main/java/demo/Emp.java | 95 +
.../src/main/java/demo/OQLJavaDemo.java | 59 +
.../src/main/java/demo/PairRDDSaveJavaDemo.java | 86 +
.../src/main/java/demo/RDDSaveJavaDemo.java | 85 +
.../src/main/java/demo/RegionToRDDJavaDemo.java | 57 +
.../src/main/scala/demo/NetworkWordCount.scala | 75 +
.../project/Dependencies.scala | 8 +-
.../project/GemFireSparkBuild.scala | 76 -
.../project/GeodeSparkBuild.scala | 76 +
geode-spark-connector/project/Settings.scala | 4 +-
.../client/internal/GatewaySenderBatchOp.java | 9 +-
.../internal/locator/wan/LocatorDiscovery.java | 16 +-
.../locator/wan/WanLocatorDiscovererImpl.java | 19 +-
.../cache/CacheXml70GatewayDUnitTest.java | 22 +-
.../cache/CacheXml80GatewayDUnitTest.java | 4 +-
.../cache/wan/CacheClientNotifierDUnitTest.java | 6 +-
.../gemfire/internal/cache/wan/WANTestBase.java | 1866 +++---------------
...oncurrentParallelGatewaySenderDUnitTest.java | 38 +-
...allelGatewaySenderOperation_1_DUnitTest.java | 27 +-
...allelGatewaySenderOperation_2_DUnitTest.java | 168 +-
.../ConcurrentWANPropogation_1_DUnitTest.java | 16 +-
.../ConcurrentWANPropogation_2_DUnitTest.java | 39 +-
.../cache/wan/disttx/DistTXWANDUnitTest.java | 10 +-
.../CommonParallelGatewaySenderDUnitTest.java | 8 +-
...wWANConcurrencyCheckForDestroyDUnitTest.java | 18 +-
.../cache/wan/misc/PDXNewWanDUnitTest.java | 31 +-
...dRegion_ParallelWANPersistenceDUnitTest.java | 19 +-
...dRegion_ParallelWANPropogationDUnitTest.java | 51 +-
...downAllPersistentGatewaySenderDUnitTest.java | 4 +-
.../cache/wan/misc/WANSSLDUnitTest.java | 6 +-
.../wan/misc/WanAutoDiscoveryDUnitTest.java | 42 +-
.../cache/wan/misc/WanValidationsDUnitTest.java | 27 +-
.../ParallelWANPropogationOffHeapDUnitTest.java | 3 +-
.../SerialWANPropogationOffHeapDUnitTest.java | 3 +-
...ation_PartitionedRegionOffHeapDUnitTest.java | 3 +-
...arallelGatewaySenderOperationsDUnitTest.java | 16 +-
...llelGatewaySenderQueueOverflowDUnitTest.java | 24 +-
.../ParallelWANConflationDUnitTest.java | 20 +-
...ersistenceEnabledGatewaySenderDUnitTest.java | 35 +-
...lelWANPropagationConcurrentOpsDUnitTest.java | 6 +-
.../ParallelWANPropagationDUnitTest.java | 51 +-
...ParallelWANPropagationLoopBackDUnitTest.java | 21 +-
.../wan/parallel/ParallelWANStatsDUnitTest.java | 23 +-
...tewaySenderDistributedDeadlockDUnitTest.java | 12 +-
...rialGatewaySenderEventListenerDUnitTest.java | 16 +-
.../SerialGatewaySenderOperationsDUnitTest.java | 25 +-
.../SerialGatewaySenderQueueDUnitTest.java | 6 +-
...ersistenceEnabledGatewaySenderDUnitTest.java | 14 +-
.../SerialWANPropagationLoopBackDUnitTest.java | 28 +-
.../serial/SerialWANPropogationDUnitTest.java | 119 +-
...NPropogation_PartitionedRegionDUnitTest.java | 24 +-
.../SerialWANPropogationsFeatureDUnitTest.java | 19 +-
.../wan/serial/SerialWANStatsDUnitTest.java | 49 +-
.../management/WANManagementDUnitTest.java | 6 +-
.../pulse/TestRemoteClusterDUnitTest.java | 2 +-
319 files changed, 10555 insertions(+), 11307 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/def78f18/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/ShellCommands.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/def78f18/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/CliCommandTestBase.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/def78f18/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/CreateAlterDestroyRegionCommandsDUnitTest.java
----------------------------------------------------------------------
diff --cc geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/CreateAlterDestroyRegionCommandsDUnitTest.java
index e19eec2,92ed262..28a85d0
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/CreateAlterDestroyRegionCommandsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/CreateAlterDestroyRegionCommandsDUnitTest.java
@@@ -63,19 -67,10 +67,11 @@@ import com.gemstone.gemfire.management.
import com.gemstone.gemfire.test.dunit.Host;
import com.gemstone.gemfire.test.dunit.SerializableCallable;
import com.gemstone.gemfire.test.dunit.VM;
- import com.gemstone.gemfire.test.junit.Retry;
import com.gemstone.gemfire.test.junit.categories.DistributedTest;
import com.gemstone.gemfire.test.junit.categories.FlakyTest;
- import com.gemstone.gemfire.test.junit.rules.RetryRule;
- import org.junit.Ignore;
- import org.junit.Rule;
- import org.junit.Test;
- import org.junit.experimental.categories.Category;
- import org.junit.runner.RunWith;
- import org.junit.runners.Parameterized;
- @Category({ DistributedTest.class, FlakyTest.class }) // GEODE-973
+ @Category(DistributedTest.class)
+@RunWith(Parameterized.class)
public class CreateAlterDestroyRegionCommandsDUnitTest extends CliCommandTestBase {
private static final long serialVersionUID = 1L;
@@@ -95,13 -90,6 +91,10 @@@
final List<String> filesToBeDeleted = new CopyOnWriteArrayList<String>();
- @Rule
- public RetryRule retryRule = new RetryRule();
-
+ public CreateAlterDestroyRegionCommandsDUnitTest(boolean useHttpOnConnect){
+ super(useHttpOnConnect);
+ }
+
/**
* Asserts that the "compressor" option for the "create region" command succeeds for a recognized compressor.
*/
@@@ -367,10 -355,10 +360,10 @@@
};
}
+ @Category(FlakyTest.class) // GEODE-973: random ports, BindException, java.rmi.server.ExportException: Port already in use
@Test
- @Retry(2) // GEODE-973: getRandomAvailablePort
public void testCreateRegion46391() throws IOException {
- createDefaultSetup(null); // GEODE-973: getRandomAvailablePort
+ setUpJmxManagerOnVm0ThenConnect(null); // GEODE-973: getRandomAvailablePort
String command = CliStrings.CREATE_REGION + " --" + CliStrings.CREATE_REGION__REGION + "=" + this.region46391 + " --" + CliStrings.CREATE_REGION__REGIONSHORTCUT + "=REPLICATE";
getLogWriter().info("testCreateRegion46391 create region command=" + command);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/def78f18/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DiskStoreCommandsDUnitTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/def78f18/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/GemfireDataCommandsDUnitTest.java
----------------------------------------------------------------------
diff --cc geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/GemfireDataCommandsDUnitTest.java
index a76454e,6858f78..2966072
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/GemfireDataCommandsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/GemfireDataCommandsDUnitTest.java
@@@ -78,10 -81,7 +78,11 @@@ import com.gemstone.gemfire.test.dunit.
import com.gemstone.gemfire.test.dunit.VM;
import com.gemstone.gemfire.test.dunit.WaitCriterion;
import com.gemstone.gemfire.test.junit.categories.DistributedTest;
+ import com.gemstone.gemfire.test.junit.categories.FlakyTest;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
/**
* Dunit class for testing gemfire data commands : get, put, remove, select, rebalance
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/def78f18/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/IndexCommandsDUnitTest.java
----------------------------------------------------------------------
diff --cc geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/IndexCommandsDUnitTest.java
index fc2fe7b,12c5249..256f2ee
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/IndexCommandsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/IndexCommandsDUnitTest.java
@@@ -51,12 -54,8 +51,12 @@@ import com.gemstone.gemfire.test.dunit.
import com.gemstone.gemfire.test.dunit.WaitCriterion;
import com.gemstone.gemfire.test.junit.categories.DistributedTest;
import com.gemstone.gemfire.test.junit.categories.FlakyTest;
+import org.junit.experimental.categories.Category;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
- @Category({ DistributedTest.class, FlakyTest.class }) // see GEODE-689, GEODE-1048
+ @Category(DistributedTest.class)
+@RunWith(Parameterized.class)
public class IndexCommandsDUnitTest extends CliCommandTestBase {
private static final long serialVersionUID = 1L;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/def78f18/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListAndDescribeRegionDUnitTest.java
----------------------------------------------------------------------
diff --cc geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListAndDescribeRegionDUnitTest.java
index 591a323,ff84036..a422fc7
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListAndDescribeRegionDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListAndDescribeRegionDUnitTest.java
@@@ -43,13 -46,9 +43,14 @@@ import com.gemstone.gemfire.test.dunit.
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
import com.gemstone.gemfire.test.dunit.VM;
import com.gemstone.gemfire.test.junit.categories.DistributedTest;
+ import com.gemstone.gemfire.test.junit.categories.FlakyTest;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
@Category(DistributedTest.class)
+@RunWith(Parameterized.class)
public class ListAndDescribeRegionDUnitTest extends CliCommandTestBase {
private static final String REGION1 = "region1";
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/def78f18/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsDUnitTest.java
----------------------------------------------------------------------
diff --cc geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsDUnitTest.java
index cdf4348,848c1ba..ec0f020
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsDUnitTest.java
@@@ -61,8 -60,7 +61,8 @@@ import org.junit.runners.Parameterized
/**
* Dunit class for testing gemfire function commands : GC, Shutdown
*/
- @Category({ DistributedTest.class, FlakyTest.class }) // see GEODE-1034
+ @Category(DistributedTest.class)
+@RunWith(Parameterized.class)
public class MiscellaneousCommandsDUnitTest extends CliCommandTestBase {
private static final long serialVersionUID = 1L;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/def78f18/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsExportLogsPart3DUnitTest.java
----------------------------------------------------------------------
diff --cc geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsExportLogsPart3DUnitTest.java
index 51b1008,626dbe1..967dfb1
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsExportLogsPart3DUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsExportLogsPart3DUnitTest.java
@@@ -38,10 -41,7 +38,11 @@@ import com.gemstone.gemfire.test.dunit.
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
import com.gemstone.gemfire.test.dunit.VM;
import com.gemstone.gemfire.test.junit.categories.DistributedTest;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+ import com.gemstone.gemfire.test.junit.categories.FlakyTest;
/**
* Dunit class for testing gemfire function commands : export logs
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/def78f18/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShellCommandsDUnitTest.java
----------------------------------------------------------------------
diff --cc geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShellCommandsDUnitTest.java
index 313e4db,86f6dc8..d4fe871
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShellCommandsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShellCommandsDUnitTest.java
@@@ -35,13 -38,9 +35,14 @@@ import com.gemstone.gemfire.management.
import com.gemstone.gemfire.management.internal.cli.shell.Gfsh;
import com.gemstone.gemfire.management.internal.cli.util.CommandStringBuilder;
import com.gemstone.gemfire.test.junit.categories.DistributedTest;
+ import com.gemstone.gemfire.test.junit.categories.FlakyTest;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
@Category(DistributedTest.class)
+@RunWith(Parameterized.class)
public class ShellCommandsDUnitTest extends CliCommandTestBase {
private static final long serialVersionUID = 1L;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/def78f18/geode-cq/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ClientCommandsDUnitTest.java
----------------------------------------------------------------------