geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From upthewatersp...@apache.org
Subject [22/38] incubator-geode git commit: GEODE-819: Move dunit to com.gemstone.gemfire.test.dunit
Date Tue, 26 Jan 2016 19:38:45 GMT
GEODE-819: Move dunit to com.gemstone.gemfire.test.dunit

* Move classes from dunit to com.gemstone.gemfire.test.dunit
* Reoranize imports on classes in com.gemstone.gemfire.test.dunit


Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/d89038db
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/d89038db
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/d89038db

Branch: refs/heads/wan_cq_donation
Commit: d89038db8c94f480ab099e69bc4d3ce036d64463
Parents: 861b6ee
Author: Kirk Lund <klund@pivotal.io>
Authored: Mon Jan 25 10:43:01 2016 -0800
Committer: Kirk Lund <klund@pivotal.io>
Committed: Mon Jan 25 10:43:01 2016 -0800

----------------------------------------------------------------------
 .../com/gemstone/gemfire/TXExpiryJUnitTest.java |    5 +-
 .../cache/CacheRegionClearStatsDUnitTest.java   |    7 +-
 .../cache/ClientServerTimeSyncDUnitTest.java    |    7 +-
 .../cache/ConnectionPoolAndLoaderDUnitTest.java |    9 +-
 .../ClientServerRegisterInterestsDUnitTest.java |   13 +-
 .../internal/AutoConnectionSourceDUnitTest.java |   11 +-
 .../CacheServerSSLConnectionDUnitTest.java      |    7 +-
 .../internal/LocatorLoadBalancingDUnitTest.java |    9 +-
 .../cache/client/internal/LocatorTestBase.java  |   11 +-
 .../internal/SSLNoClientAuthDUnitTest.java      |    7 +-
 .../pooling/ConnectionManagerJUnitTest.java     |    5 +-
 .../management/MemoryThresholdsDUnitTest.java   |   13 +-
 .../MemoryThresholdsOffHeapDUnitTest.java       |   13 +-
 .../management/ResourceManagerDUnitTest.java    |    9 +-
 .../mapInterface/PutAllGlobalLockJUnitTest.java |    3 +-
 .../PartitionRegionHelperDUnitTest.java         |   11 +-
 .../gemfire/cache/query/QueryTestUtils.java     |    5 +-
 .../query/cq/dunit/CqQueryTestListener.java     |    5 +-
 .../query/dunit/CompactRangeIndexDUnitTest.java |   11 +-
 .../cache/query/dunit/CqTimeTestListener.java   |    5 +-
 .../cache/query/dunit/GroupByDUnitImpl.java     |    7 +-
 .../dunit/GroupByPartitionedQueryDUnitTest.java |    7 +-
 .../query/dunit/GroupByQueryDUnitTest.java      |    7 +-
 .../cache/query/dunit/HashIndexDUnitTest.java   |    9 +-
 .../cache/query/dunit/HelperTestCase.java       |    9 +-
 .../dunit/NonDistinctOrderByDUnitImpl.java      |    7 +-
 .../NonDistinctOrderByPartitionedDUnitTest.java |    7 +-
 .../query/dunit/PdxStringQueryDUnitTest.java    |   13 +-
 .../dunit/QueryDataInconsistencyDUnitTest.java  |   11 +-
 .../dunit/QueryIndexUsingXMLDUnitTest.java      |   13 +-
 .../QueryParamsAuthorizationDUnitTest.java      |    7 +-
 .../QueryUsingFunctionContextDUnitTest.java     |    7 +-
 .../query/dunit/QueryUsingPoolDUnitTest.java    |    7 +-
 .../cache/query/dunit/RemoteQueryDUnitTest.java |   34 +-
 ...esourceManagerWithQueryMonitorDUnitTest.java |   11 +-
 .../query/dunit/SelectStarQueryDUnitTest.java   |    7 +-
 .../IndexCreationDeadLockJUnitTest.java         |    3 +-
 .../IndexMaintenanceAsynchJUnitTest.java        |    5 +-
 .../functional/LikePredicateJUnitTest.java      |    3 +-
 .../internal/ExecutionContextJUnitTest.java     |    3 +-
 .../index/AsynchIndexMaintenanceJUnitTest.java  |    5 +-
 ...rrentIndexInitOnOverflowRegionDUnitTest.java |    9 +-
 ...ndexOperationsOnOverflowRegionDUnitTest.java |    9 +-
 ...pdateWithInplaceObjectModFalseDUnitTest.java |    9 +-
 ...ConcurrentIndexUpdateWithoutWLDUnitTest.java |    9 +-
 .../index/CopyOnReadIndexDUnitTest.java         |   11 +-
 .../index/IndexCreationInternalsJUnitTest.java  |    3 +-
 .../index/IndexMaintainceJUnitTest.java         |    3 +-
 .../IndexTrackingQueryObserverDUnitTest.java    |    9 +-
 ...itializeIndexEntryDestroyQueryDUnitTest.java |    9 +-
 .../index/MultiIndexCreationDUnitTest.java      |   11 +-
 .../index/PutAllWithIndexPerfDUnitTest.java     |    5 +-
 .../PRBasicIndexCreationDUnitTest.java          |   11 +-
 .../PRBasicIndexCreationDeadlockDUnitTest.java  |   11 +-
 .../PRBasicMultiIndexCreationDUnitTest.java     |    9 +-
 .../partitioned/PRBasicQueryDUnitTest.java      |    5 +-
 .../PRBasicRemoveIndexDUnitTest.java            |    5 +-
 .../PRColocatedEquiJoinDUnitTest.java           |    5 +-
 .../partitioned/PRInvalidQueryDUnitTest.java    |    5 +-
 .../partitioned/PRQueryCacheCloseDUnitTest.java |    9 +-
 .../PRQueryCacheClosedJUnitTest.java            |    3 +-
 .../query/partitioned/PRQueryDUnitHelper.java   |    3 +-
 .../query/partitioned/PRQueryDUnitTest.java     |    7 +-
 .../query/partitioned/PRQueryPerfDUnitTest.java |    5 +-
 .../PRQueryRegionCloseDUnitTest.java            |    9 +-
 .../PRQueryRegionDestroyedDUnitTest.java        |    9 +-
 .../PRQueryRegionDestroyedJUnitTest.java        |    3 +-
 .../PRQueryRemoteNodeExceptionDUnitTest.java    |   11 +-
 .../snapshot/ParallelSnapshotDUnitTest.java     |    7 +-
 .../snapshot/SnapshotByteArrayDUnitTest.java    |    5 +-
 .../cache/snapshot/SnapshotDUnitTest.java       |    5 +-
 .../snapshot/SnapshotPerformanceDUnitTest.java  |    5 +-
 .../gemfire/cache30/Bug34387DUnitTest.java      |   19 +-
 .../gemfire/cache30/Bug34948DUnitTest.java      |   26 +-
 .../gemfire/cache30/Bug35214DUnitTest.java      |   19 +-
 .../gemfire/cache30/Bug38013DUnitTest.java      |   25 +-
 .../gemfire/cache30/Bug38741DUnitTest.java      |    7 +-
 .../gemfire/cache30/CacheCloseDUnitTest.java    |   16 +-
 .../gemfire/cache30/CacheLoaderTestCase.java    |   14 +-
 .../gemfire/cache30/CacheMapTxnDUnitTest.java   |   26 +-
 ...cheRegionsReliablityStatsCheckDUnitTest.java |    7 +-
 .../cache30/CacheSerializableRunnable.java      |   10 +-
 .../cache30/CacheStatisticsDUnitTest.java       |   13 +-
 .../gemstone/gemfire/cache30/CacheTestCase.java |    7 +-
 .../gemfire/cache30/CacheXml30DUnitTest.java    |    3 +-
 .../gemfire/cache30/CacheXml41DUnitTest.java    |    4 +
 .../gemfire/cache30/CacheXml45DUnitTest.java    |    7 +-
 .../gemfire/cache30/CacheXml51DUnitTest.java    |    5 +-
 .../gemfire/cache30/CacheXml57DUnitTest.java    |    6 +
 .../gemfire/cache30/CacheXml60DUnitTest.java    |    4 +
 .../gemfire/cache30/CacheXml61DUnitTest.java    |    5 +-
 .../gemfire/cache30/CacheXml81DUnitTest.java    |    2 +-
 .../cache30/CachedAllEventsDUnitTest.java       |   16 +-
 .../gemfire/cache30/CallbackArgDUnitTest.java   |   29 +-
 .../cache30/CertifiableTestCacheListener.java   |    5 +-
 .../cache30/ClearMultiVmCallBkDUnitTest.java    |   27 +-
 .../gemfire/cache30/ClearMultiVmDUnitTest.java  |   33 +-
 .../cache30/ClientMembershipDUnitTest.java      |   11 +-
 .../ClientRegisterInterestDUnitTest.java        |    7 +-
 .../cache30/ClientServerCCEDUnitTest.java       |    9 +-
 .../gemfire/cache30/ClientServerTestCase.java   |    3 +-
 .../ConcurrentLeaveDuringGIIDUnitTest.java      |   11 +-
 .../gemfire/cache30/DiskRegionDUnitTest.java    |   45 +-
 .../gemfire/cache30/DiskRegionTestImpl.java     |   19 +-
 .../cache30/DistAckMapMethodsDUnitTest.java     |   37 +-
 ...tedAckOverflowRegionCCEOffHeapDUnitTest.java |    3 +-
 ...tributedAckPersistentRegionCCEDUnitTest.java |   15 +-
 ...dAckPersistentRegionCCEOffHeapDUnitTest.java |    3 +-
 .../DistributedAckRegionCCEDUnitTest.java       |   15 +-
 ...DistributedAckRegionCCEOffHeapDUnitTest.java |    3 +-
 ...istributedAckRegionCompressionDUnitTest.java |    3 +-
 .../cache30/DistributedAckRegionDUnitTest.java  |   34 +-
 .../DistributedAckRegionOffHeapDUnitTest.java   |    3 +-
 .../DistributedMulticastRegionDUnitTest.java    |   11 +-
 .../DistributedNoAckRegionCCEDUnitTest.java     |   11 +-
 ...stributedNoAckRegionCCEOffHeapDUnitTest.java |    3 +-
 .../DistributedNoAckRegionDUnitTest.java        |   17 +-
 .../DistributedNoAckRegionOffHeapDUnitTest.java |    3 +-
 .../gemfire/cache30/DynamicRegionDUnitTest.java |   21 +-
 .../gemfire/cache30/GlobalLockingDUnitTest.java |   15 +-
 .../cache30/GlobalRegionCCEDUnitTest.java       |    7 +-
 .../GlobalRegionCCEOffHeapDUnitTest.java        |    3 +-
 .../gemfire/cache30/GlobalRegionDUnitTest.java  |   25 +-
 .../cache30/GlobalRegionOffHeapDUnitTest.java   |    3 +-
 .../cache30/LRUEvictionControllerDUnitTest.java |    5 +-
 .../gemfire/cache30/LocalRegionDUnitTest.java   |   17 +-
 .../gemfire/cache30/MultiVMRegionTestCase.java  |   17 +-
 .../OffHeapLRUEvictionControllerDUnitTest.java  |    3 +-
 .../PRBucketSynchronizationDUnitTest.java       |    7 +-
 .../cache30/PartitionedRegionDUnitTest.java     |   22 +-
 ...tionedRegionMembershipListenerDUnitTest.java |    3 +-
 .../PartitionedRegionOffHeapDUnitTest.java      |    3 +-
 .../cache30/PreloadedRegionTestCase.java        |   14 +-
 .../gemfire/cache30/ProxyDUnitTest.java         |   34 +-
 .../cache30/PutAllCallBkRemoteVMDUnitTest.java  |   23 +-
 .../cache30/PutAllCallBkSingleVMDUnitTest.java  |   28 +-
 .../gemfire/cache30/PutAllMultiVmDUnitTest.java |   25 +-
 .../gemfire/cache30/QueueMsgDUnitTest.java      |   28 +-
 .../cache30/RRSynchronizationDUnitTest.java     |    7 +-
 .../gemfire/cache30/ReconnectDUnitTest.java     |   13 +-
 .../cache30/RegionExpirationDUnitTest.java      |   14 +-
 .../RegionMembershipListenerDUnitTest.java      |   28 +-
 .../RegionReliabilityListenerDUnitTest.java     |   26 +-
 .../cache30/RegionReliabilityTestCase.java      |   64 +-
 .../gemfire/cache30/RegionTestCase.java         |    9 +-
 .../cache30/RemoveAllMultiVmDUnitTest.java      |   22 +-
 .../gemfire/cache30/RequiredRolesDUnitTest.java |   28 +-
 .../cache30/RolePerformanceDUnitTest.java       |   15 +-
 .../gemfire/cache30/SearchAndLoadDUnitTest.java |   22 +-
 .../gemfire/cache30/SlowRecDUnitTest.java       |   35 +-
 .../gemfire/cache30/TXDistributedDUnitTest.java |   11 +-
 .../gemfire/cache30/TXOrderDUnitTest.java       |   41 +-
 .../cache30/TXRestrictionsDUnitTest.java        |   14 +-
 .../gemfire/cache30/TestCacheCallback.java      |    5 +-
 .../distributed/DistributedMemberDUnitTest.java |   26 +-
 .../distributed/DistributedSystemDUnitTest.java |    7 +-
 .../distributed/HostedLocatorsDUnitTest.java    |    9 +-
 .../gemfire/distributed/LocatorDUnitTest.java   |   13 +-
 .../gemfire/distributed/LocatorJUnitTest.java   |    5 +-
 .../gemfire/distributed/RoleDUnitTest.java      |   16 +-
 .../distributed/SystemAdminDUnitTest.java       |    5 +-
 .../distributed/internal/Bug40751DUnitTest.java |    9 +-
 .../ConsoleDistributionManagerDUnitTest.java    |    9 +-
 .../internal/DistributionAdvisorDUnitTest.java  |   13 +-
 .../internal/DistributionManagerDUnitTest.java  |    9 +-
 .../internal/ProductUseLogDUnitTest.java        |   11 +-
 .../GemFireDeadlockDetectorDUnitTest.java       |   11 +-
 .../internal/locks/CollaborationJUnitTest.java  |    5 +-
 .../membership/gms/MembershipManagerHelper.java |    5 +-
 .../StreamingOperationManyDUnitTest.java        |   20 +-
 .../StreamingOperationOneDUnitTest.java         |   23 +-
 .../TcpServerBackwardCompatDUnitTest.java       |    7 +-
 .../gemfire/disttx/CacheMapDistTXDUnitTest.java |    5 +-
 .../gemfire/disttx/DistTXDebugDUnitTest.java    |    9 +-
 .../disttx/DistTXPersistentDebugDUnitTest.java  |    2 +-
 .../disttx/DistributedTransactionDUnitTest.java |    7 +-
 .../ClassNotFoundExceptionDUnitTest.java        |    9 +-
 .../gemfire/internal/JSSESocketJUnitTest.java   |    3 +-
 .../gemfire/internal/JarDeployerDUnitTest.java  |    7 +-
 .../internal/PdxDeleteFieldDUnitTest.java       |    7 +-
 .../gemfire/internal/PdxRenameDUnitTest.java    |    7 +-
 .../gemfire/internal/SocketCloserJUnitTest.java |    5 +-
 .../gemfire/internal/cache/BackupDUnitTest.java |   13 +-
 .../internal/cache/Bug33359DUnitTest.java       |    8 +-
 .../internal/cache/Bug33726DUnitTest.java       |    8 +-
 .../internal/cache/Bug37241DUnitTest.java       |    8 +-
 .../internal/cache/Bug37377DUnitTest.java       |   11 +-
 .../internal/cache/Bug39079DUnitTest.java       |    7 +-
 .../internal/cache/Bug40299DUnitTest.java       |   11 +-
 .../internal/cache/Bug40632DUnitTest.java       |    9 +-
 .../internal/cache/Bug41091DUnitTest.java       |    7 +-
 .../internal/cache/Bug41733DUnitTest.java       |   15 +-
 .../internal/cache/Bug41957DUnitTest.java       |   29 +-
 .../internal/cache/Bug42055DUnitTest.java       |    9 +-
 .../internal/cache/Bug45164DUnitTest.java       |    7 +-
 .../internal/cache/Bug45934DUnitTest.java       |    7 +-
 .../internal/cache/Bug47667DUnitTest.java       |    7 +-
 .../internal/cache/CacheAdvisorDUnitTest.java   |   30 +-
 .../internal/cache/ClearDAckDUnitTest.java      |   11 +-
 .../internal/cache/ClearGlobalDUnitTest.java    |    6 +-
 .../cache/ClientServerGetAllDUnitTest.java      |   33 +-
 ...ServerInvalidAndDestroyedEntryDUnitTest.java |   11 +-
 .../ClientServerTransactionCCEDUnitTest.java    |    5 +-
 .../cache/ClientServerTransactionDUnitTest.java |   11 +-
 .../ConcurrentDestroySubRegionDUnitTest.java    |    9 +-
 .../cache/ConcurrentMapOpsDUnitTest.java        |   11 +-
 .../ConcurrentRegionOperationsJUnitTest.java    |    3 +-
 ...rentRollingAndRegionOperationsJUnitTest.java |    3 +-
 .../cache/ConnectDisconnectDUnitTest.java       |   13 +-
 .../internal/cache/DeltaFaultInDUnitTest.java   |    9 +-
 .../cache/DeltaPropagationDUnitTest.java        |    9 +-
 .../cache/DeltaPropagationStatsDUnitTest.java   |    7 +-
 .../internal/cache/DeltaSizingDUnitTest.java    |    9 +-
 .../cache/DiskRegByteArrayDUnitTest.java        |   15 +-
 .../cache/DiskRegionClearJUnitTest.java         |    3 +-
 .../internal/cache/DiskRegionJUnitTest.java     |    5 +-
 ...DistrbutedRegionProfileOffHeapDUnitTest.java |    5 +-
 .../cache/DistributedCacheTestCase.java         |   23 +-
 .../internal/cache/EventTrackerDUnitTest.java   |    7 +-
 .../internal/cache/EvictionStatsDUnitTest.java  |    7 +-
 .../internal/cache/EvictionTestBase.java        |   11 +-
 .../cache/FixedPRSinglehopDUnitTest.java        |    9 +-
 .../internal/cache/GIIDeltaDUnitTest.java       |   13 +-
 .../internal/cache/GIIFlowControlDUnitTest.java |    9 +-
 .../internal/cache/GridAdvisorDUnitTest.java    |   25 +-
 .../internal/cache/HABug36773DUnitTest.java     |    7 +-
 .../HAOverflowMemObjectSizerDUnitTest.java      |    7 +-
 .../cache/IncrementalBackupDUnitTest.java       |   11 +-
 .../cache/InterruptClientServerDUnitTest.java   |    9 +-
 .../internal/cache/InterruptsDUnitTest.java     |    9 +-
 .../internal/cache/IteratorDUnitTest.java       |    7 +-
 .../internal/cache/MapClearGIIDUnitTest.java    |   14 +-
 .../internal/cache/MapInterface2JUnitTest.java  |    3 +-
 .../cache/NetSearchMessagingDUnitTest.java      |   11 +-
 .../cache/OffHeapEvictionDUnitTest.java         |    7 +-
 .../cache/OffHeapEvictionStatsDUnitTest.java    |    3 +-
 .../gemfire/internal/cache/OplogJUnitTest.java  |    5 +-
 .../cache/P2PDeltaPropagationDUnitTest.java     |    7 +-
 .../internal/cache/PRBadToDataDUnitTest.java    |    9 +-
 .../cache/PartitionListenerDUnitTest.java       |    9 +-
 .../cache/PartitionedRegionAPIDUnitTest.java    |    7 +-
 .../PartitionedRegionAsSubRegionDUnitTest.java  |    5 +-
 ...gionBucketCreationDistributionDUnitTest.java |   22 +-
 .../PartitionedRegionCacheCloseDUnitTest.java   |    9 +-
 ...rtitionedRegionCacheXMLExampleDUnitTest.java |    5 +-
 .../PartitionedRegionCreationDUnitTest.java     |   11 +-
 .../cache/PartitionedRegionDUnitTestCase.java   |    5 +-
 ...rtitionedRegionDelayedRecoveryDUnitTest.java |    9 +-
 .../PartitionedRegionDestroyDUnitTest.java      |   11 +-
 .../PartitionedRegionEntryCountDUnitTest.java   |    9 +-
 .../PartitionedRegionEvictionDUnitTest.java     |   11 +-
 .../cache/PartitionedRegionHADUnitTest.java     |   13 +-
 ...onedRegionHAFailureAndRecoveryDUnitTest.java |   22 +-
 .../PartitionedRegionInvalidateDUnitTest.java   |    7 +-
 ...artitionedRegionLocalMaxMemoryDUnitTest.java |    7 +-
 ...nedRegionLocalMaxMemoryOffHeapDUnitTest.java |    3 +-
 .../PartitionedRegionMultipleDUnitTest.java     |    8 +-
 ...rtitionedRegionOffHeapEvictionDUnitTest.java |    3 +-
 .../cache/PartitionedRegionPRIDDUnitTest.java   |    9 +-
 .../cache/PartitionedRegionQueryDUnitTest.java  |    9 +-
 ...artitionedRegionRedundancyZoneDUnitTest.java |    9 +-
 ...tionedRegionSerializableObjectJUnitTest.java |    2 +-
 .../PartitionedRegionSingleHopDUnitTest.java    |    9 +-
 ...RegionSingleHopWithServerGroupDUnitTest.java |    9 +-
 .../cache/PartitionedRegionSizeDUnitTest.java   |   13 +-
 .../cache/PartitionedRegionStatsDUnitTest.java  |    7 +-
 .../PartitionedRegionTestUtilsDUnitTest.java    |    5 +-
 .../PartitionedRegionWithSameNameDUnitTest.java |   14 +-
 .../internal/cache/PutAllDAckDUnitTest.java     |   16 +-
 .../internal/cache/PutAllGlobalDUnitTest.java   |   25 +-
 .../cache/RemoteTransactionDUnitTest.java       |   13 +-
 .../internal/cache/RemoveAllDAckDUnitTest.java  |   12 +-
 .../internal/cache/RemoveDAckDUnitTest.java     |   10 +-
 .../internal/cache/RemoveGlobalDUnitTest.java   |   23 +-
 .../cache/SimpleDiskRegionJUnitTest.java        |    3 +-
 .../internal/cache/SingleHopStatsDUnitTest.java |    7 +-
 .../internal/cache/SizingFlagDUnitTest.java     |    9 +-
 .../internal/cache/SystemFailureDUnitTest.java  |    7 +-
 .../cache/TXReservationMgrJUnitTest.java        |    3 +-
 .../cache/TransactionsWithDeltaDUnitTest.java   |    7 +-
 .../control/RebalanceOperationDUnitTest.java    |   11 +-
 ...egionOverflowAsyncRollingOpLogJUnitTest.java |    5 +-
 ...RegionOverflowSyncRollingOpLogJUnitTest.java |    5 +-
 ...ltiThreadedOplogPerJUnitPerformanceTest.java |    3 +-
 .../cache/execute/Bug51193DUnitTest.java        |    7 +-
 .../ClientServerFunctionExecutionDUnitTest.java |    5 +-
 .../execute/ColocationFailoverDUnitTest.java    |    9 +-
 ...ributedRegionFunctionExecutionDUnitTest.java |    9 +-
 .../FunctionExecution_ExceptionDUnitTest.java   |    9 +-
 .../execute/FunctionServiceStatsDUnitTest.java  |   11 +-
 .../cache/execute/LocalDataSetDUnitTest.java    |   11 +-
 .../execute/LocalDataSetIndexingDUnitTest.java  |    5 +-
 .../LocalFunctionExecutionDUnitTest.java        |    9 +-
 .../MemberFunctionExecutionDUnitTest.java       |    9 +-
 .../MultiRegionFunctionExecutionDUnitTest.java  |    7 +-
 .../OnGroupsFunctionExecutionDUnitTest.java     |    9 +-
 ...tServerRegionFunctionExecutionDUnitTest.java |    7 +-
 ...egionFunctionExecutionFailoverDUnitTest.java |   11 +-
 ...onFunctionExecutionNoSingleHopDUnitTest.java |    5 +-
 ...onExecutionSelectorNoSingleHopDUnitTest.java |    5 +-
 ...gionFunctionExecutionSingleHopDUnitTest.java |    5 +-
 .../cache/execute/PRClientServerTestBase.java   |   11 +-
 .../cache/execute/PRColocationDUnitTest.java    |   12 +-
 .../execute/PRCustomPartitioningDUnitTest.java  |    7 +-
 .../execute/PRFunctionExecutionDUnitTest.java   |   13 +-
 .../PRFunctionExecutionTimeOutDUnitTest.java    |    7 +-
 ...ctionExecutionWithResultSenderDUnitTest.java |    7 +-
 .../execute/PRPerformanceTestDUnitTest.java     |    7 +-
 .../cache/execute/PRTransactionDUnitTest.java   |    3 +-
 .../execute/SingleHopGetAllPutAllDUnitTest.java |    3 +-
 .../functions/DistributedRegionFunction.java    |    5 +-
 .../internal/cache/functions/TestFunction.java  |    5 +-
 .../ha/BlockingHARQAddOperationJUnitTest.java   |    3 +-
 .../cache/ha/BlockingHARegionJUnitTest.java     |    5 +-
 .../cache/ha/Bug36853EventsExpiryDUnitTest.java |    5 +-
 .../internal/cache/ha/Bug48571DUnitTest.java    |    7 +-
 .../internal/cache/ha/Bug48879DUnitTest.java    |    7 +-
 .../cache/ha/EventIdOptimizationDUnitTest.java  |    7 +-
 .../internal/cache/ha/FailoverDUnitTest.java    |    7 +-
 .../internal/cache/ha/HABugInPutDUnitTest.java  |    7 +-
 .../internal/cache/ha/HAClearDUnitTest.java     |    7 +-
 .../cache/ha/HAConflationDUnitTest.java         |    7 +-
 .../internal/cache/ha/HADuplicateDUnitTest.java |    7 +-
 .../cache/ha/HAEventIdPropagationDUnitTest.java |    7 +-
 .../internal/cache/ha/HAExpiryDUnitTest.java    |    9 +-
 .../internal/cache/ha/HAGIIBugDUnitTest.java    |   11 +-
 .../internal/cache/ha/HAGIIDUnitTest.java       |    9 +-
 .../cache/ha/HARQAddOperationJUnitTest.java     |    3 +-
 .../cache/ha/HARQueueNewImplDUnitTest.java      |    7 +-
 .../internal/cache/ha/HARegionDUnitTest.java    |    7 +-
 .../cache/ha/HARegionQueueDUnitTest.java        |    7 +-
 .../cache/ha/HARegionQueueJUnitTest.java        |    3 +-
 .../cache/ha/HASlowReceiverDUnitTest.java       |    6 +-
 .../ha/OperationsPropagationDUnitTest.java      |    7 +-
 .../internal/cache/ha/PutAllDUnitTest.java      |    7 +-
 .../internal/cache/ha/StatsBugDUnitTest.java    |    7 +-
 .../cache/locks/TXLockServiceDUnitTest.java     |   29 +-
 .../cache/partitioned/Bug39356DUnitTest.java    |    9 +-
 .../cache/partitioned/Bug43684DUnitTest.java    |    7 +-
 .../cache/partitioned/Bug47388DUnitTest.java    |    7 +-
 .../cache/partitioned/Bug51400DUnitTest.java    |    9 +-
 .../partitioned/ElidedPutAllDUnitTest.java      |    7 +-
 .../partitioned/PartitionResolverDUnitTest.java |    7 +-
 .../PartitionedRegionLoaderWriterDUnitTest.java |    4 +-
 ...rtitionedRegionMetaDataCleanupDUnitTest.java |    9 +-
 .../partitioned/PersistPRKRFDUnitTest.java      |    9 +-
 ...tentColocatedPartitionedRegionDUnitTest.java |   11 +-
 .../PersistentPartitionedRegionDUnitTest.java   |   15 +-
 .../PersistentPartitionedRegionTestBase.java    |    9 +-
 ...rtitionedRegionWithTransactionDUnitTest.java |    9 +-
 .../cache/partitioned/ShutdownAllDUnitTest.java |   15 +-
 ...treamingPartitionOperationManyDUnitTest.java |   29 +-
 ...StreamingPartitionOperationOneDUnitTest.java |   34 +-
 .../fixed/FixedPartitioningDUnitTest.java       |    7 +-
 .../fixed/FixedPartitioningTestBase.java        |    9 +-
 ...ngWithColocationAndPersistenceDUnitTest.java |    5 +-
 .../PersistentRVVRecoveryDUnitTest.java         |   11 +-
 .../PersistentRecoveryOrderDUnitTest.java       |   11 +-
 ...rsistentRecoveryOrderOldConfigDUnitTest.java |    7 +-
 .../PersistentReplicatedTestBase.java           |    7 +-
 .../internal/cache/tier/Bug40396DUnitTest.java  |    9 +-
 ...mpatibilityHigherVersionClientDUnitTest.java |    7 +-
 .../cache/tier/sockets/Bug36269DUnitTest.java   |    7 +-
 .../cache/tier/sockets/Bug36457DUnitTest.java   |    7 +-
 .../cache/tier/sockets/Bug36805DUnitTest.java   |    7 +-
 .../cache/tier/sockets/Bug36829DUnitTest.java   |    7 +-
 .../cache/tier/sockets/Bug36995DUnitTest.java   |    7 +-
 .../cache/tier/sockets/Bug37210DUnitTest.java   |    7 +-
 .../cache/tier/sockets/Bug37805DUnitTest.java   |    7 +-
 .../CacheServerMaxConnectionsJUnitTest.java     |    5 +-
 .../cache/tier/sockets/CacheServerTestUtil.java |    3 +-
 .../CacheServerTransactionsDUnitTest.java       |    7 +-
 .../tier/sockets/ClearPropagationDUnitTest.java |    7 +-
 .../tier/sockets/ClientConflationDUnitTest.java |    7 +-
 .../sockets/ClientHealthMonitorJUnitTest.java   |    5 +-
 .../sockets/ClientInterestNotifyDUnitTest.java  |    7 +-
 .../tier/sockets/ClientServerMiscDUnitTest.java |   11 +-
 .../cache/tier/sockets/ConflationDUnitTest.java |    7 +-
 .../tier/sockets/ConnectionProxyJUnitTest.java  |    5 +-
 .../DataSerializerPropogationDUnitTest.java     |    7 +-
 .../DestroyEntryPropagationDUnitTest.java       |    7 +-
 .../sockets/DurableClientBug39997DUnitTest.java |    7 +-
 .../DurableClientQueueSizeDUnitTest.java        |    7 +-
 .../DurableClientReconnectAutoDUnitTest.java    |    5 +-
 .../DurableClientReconnectDUnitTest.java        |    7 +-
 .../sockets/DurableClientStatsDUnitTest.java    |    7 +-
 .../sockets/DurableRegistrationDUnitTest.java   |    7 +-
 .../sockets/DurableResponseMatrixDUnitTest.java |    7 +-
 .../sockets/EventIDVerificationDUnitTest.java   |    7 +-
 .../EventIDVerificationInP2PDUnitTest.java      |    7 +-
 .../ForceInvalidateEvictionDUnitTest.java       |    7 +-
 ...ForceInvalidateOffHeapEvictionDUnitTest.java |    3 +-
 .../cache/tier/sockets/HABug36738DUnitTest.java |    7 +-
 .../tier/sockets/HAInterestPart1DUnitTest.java  |    2 +-
 .../tier/sockets/HAInterestPart2DUnitTest.java  |    5 +-
 .../cache/tier/sockets/HAInterestTestCase.java  |    7 +-
 .../sockets/HAStartupAndFailoverDUnitTest.java  |    7 +-
 .../InstantiatorPropagationDUnitTest.java       |    7 +-
 .../tier/sockets/InterestListDUnitTest.java     |    9 +-
 .../sockets/InterestListEndpointDUnitTest.java  |    9 +-
 .../sockets/InterestListFailoverDUnitTest.java  |    7 +-
 .../sockets/InterestListRecoveryDUnitTest.java  |    6 +-
 .../sockets/InterestRegrListenerDUnitTest.java  |    7 +-
 .../sockets/InterestResultPolicyDUnitTest.java  |    7 +-
 .../sockets/NewRegionAttributesDUnitTest.java   |    7 +-
 .../sockets/RedundancyLevelPart1DUnitTest.java  |    4 +-
 .../sockets/RedundancyLevelPart2DUnitTest.java  |    4 +-
 .../sockets/RedundancyLevelPart3DUnitTest.java  |    5 +-
 .../tier/sockets/RedundancyLevelTestBase.java   |    7 +-
 .../tier/sockets/RegionCloseDUnitTest.java      |    7 +-
 ...erInterestBeforeRegionCreationDUnitTest.java |    7 +-
 .../sockets/RegisterInterestKeysDUnitTest.java  |    7 +-
 .../sockets/ReliableMessagingDUnitTest.java     |    7 +-
 .../sockets/UnregisterInterestDUnitTest.java    |    7 +-
 .../sockets/UpdatePropagationDUnitTest.java     |    7 +-
 .../VerifyEventIDGenerationInP2PDUnitTest.java  |    7 +-
 ...UpdatesFromNonInterestEndPointDUnitTest.java |    7 +-
 .../versions/RegionVersionVectorJUnitTest.java  |    3 +-
 .../cache/wan/AsyncEventQueueTestBase.java      |    7 +-
 .../AsyncEventQueueStatsDUnitTest.java          |    3 +-
 .../ConcurrentAsyncEventQueueDUnitTest.java     |    3 +-
 .../CompressionCacheConfigDUnitTest.java        |    7 +-
 .../CompressionCacheListenerDUnitTest.java      |    9 +-
 ...ompressionCacheListenerOffHeapDUnitTest.java |    3 +-
 .../CompressionRegionConfigDUnitTest.java       |   11 +-
 .../CompressionRegionFactoryDUnitTest.java      |    9 +-
 .../CompressionRegionOperationsDUnitTest.java   |    9 +-
 ...ressionRegionOperationsOffHeapDUnitTest.java |    3 +-
 .../compression/CompressionStatsDUnitTest.java  |    9 +-
 .../internal/jta/dunit/CommitThread.java        |   28 +-
 .../internal/jta/dunit/ExceptionsDUnitTest.java |   42 +-
 .../jta/dunit/IdleTimeOutDUnitTest.java         |   44 +-
 .../jta/dunit/LoginTimeOutDUnitTest.java        |   11 +-
 .../jta/dunit/MaxPoolSizeDUnitTest.java         |   43 +-
 .../internal/jta/dunit/RollbackThread.java      |   28 +-
 .../jta/dunit/TransactionTimeOutDUnitTest.java  |   26 +-
 .../dunit/TxnManagerMultiThreadDUnitTest.java   |   51 +-
 .../internal/jta/dunit/TxnTimeOutDUnitTest.java |   31 +-
 .../DistributedSystemLogFileJUnitTest.java      |    5 +-
 .../logging/LocatorLogFileJUnitTest.java        |    5 +-
 .../logging/MergeLogFilesJUnitTest.java         |    3 +-
 .../internal/offheap/OffHeapRegionBase.java     |    5 +-
 .../offheap/OutOfOffHeapMemoryDUnitTest.java    |    5 +-
 .../process/LocalProcessLauncherDUnitTest.java  |    7 +-
 .../statistics/StatisticsDUnitTest.java         |    9 +-
 .../statistics/ValueMonitorJUnitTest.java       |    4 +-
 .../management/CacheManagementDUnitTest.java    |    8 +-
 .../management/ClientHealthStatsDUnitTest.java  |   13 +-
 .../management/CompositeTypeTestDUnitTest.java  |    5 +-
 .../management/DLockManagementDUnitTest.java    |    5 +-
 .../management/DiskManagementDUnitTest.java     |    9 +-
 .../management/DistributedSystemDUnitTest.java  |    9 +-
 .../management/LocatorManagementDUnitTest.java  |    7 +-
 .../gemstone/gemfire/management/MBeanUtil.java  |    5 +-
 .../gemfire/management/ManagementTestBase.java  |   13 +-
 .../MemberMBeanAttributesDUnitTest.java         |    5 +-
 .../management/OffHeapManagementDUnitTest.java  |    9 +-
 .../gemfire/management/QueryDataDUnitTest.java  |    8 +-
 .../management/RegionManagementDUnitTest.java   |    5 +-
 ...ersalMembershipListenerAdapterDUnitTest.java |    7 +-
 .../stats/DistributedSystemStatsDUnitTest.java  |    5 +-
 .../internal/cli/CliUtilDUnitTest.java          |   11 +-
 .../cli/commands/CliCommandTestBase.java        |    7 +-
 .../cli/commands/ConfigCommandsDUnitTest.java   |   11 +-
 ...eateAlterDestroyRegionCommandsDUnitTest.java |   10 +-
 .../cli/commands/DeployCommandsDUnitTest.java   |    8 +-
 .../commands/DiskStoreCommandsDUnitTest.java    |   11 +-
 .../cli/commands/FunctionCommandsDUnitTest.java |   10 +-
 .../commands/GemfireDataCommandsDUnitTest.java  |   11 +-
 ...WithCacheLoaderDuringCacheMissDUnitTest.java |    8 +-
 .../cli/commands/IndexCommandsDUnitTest.java    |   10 +-
 ...stAndDescribeDiskStoreCommandsDUnitTest.java |    6 +-
 .../ListAndDescribeRegionDUnitTest.java         |    6 +-
 .../cli/commands/ListIndexCommandDUnitTest.java |    6 +-
 .../cli/commands/MemberCommandsDUnitTest.java   |    6 +-
 .../MiscellaneousCommandsDUnitTest.java         |    9 +-
 ...laneousCommandsExportLogsPart1DUnitTest.java |    6 +-
 ...laneousCommandsExportLogsPart2DUnitTest.java |    6 +-
 ...laneousCommandsExportLogsPart3DUnitTest.java |    6 +-
 ...laneousCommandsExportLogsPart4DUnitTest.java |    6 +-
 .../cli/commands/QueueCommandsDUnitTest.java    |    8 +-
 .../SharedConfigurationCommandsDUnitTest.java   |   11 +-
 .../cli/commands/ShowDeadlockDUnitTest.java     |    8 +-
 .../cli/commands/ShowMetricsDUnitTest.java      |    8 +-
 .../cli/commands/ShowStackTraceDUnitTest.java   |    6 +-
 .../cli/commands/UserCommandsDUnitTest.java     |    5 +-
 .../SharedConfigurationDUnitTest.java           |   11 +-
 .../internal/pulse/TestClientIdsDUnitTest.java  |   13 +-
 .../internal/pulse/TestFunctionsDUnitTest.java  |    4 +-
 .../internal/pulse/TestHeapDUnitTest.java       |    3 +-
 .../pulse/TestSubscriptionsDUnitTest.java       |   10 +-
 .../ClientsWithVersioningRetryDUnitTest.java    |    9 +-
 .../pdx/DistributedSystemIdDUnitTest.java       |    9 +-
 .../pdx/JSONPdxClientServerDUnitTest.java       |    8 +-
 .../pdx/PDXAsyncEventQueueDUnitTest.java        |    7 +-
 .../gemfire/pdx/PdxClientServerDUnitTest.java   |    9 +-
 .../pdx/PdxDeserializationDUnitTest.java        |    9 +-
 .../gemfire/pdx/PdxSerializableDUnitTest.java   |    9 +-
 .../gemfire/pdx/PdxTypeExportDUnitTest.java     |    5 +-
 .../gemfire/pdx/VersionClassLoader.java         |   16 +-
 .../gemfire/redis/RedisDistDUnitTest.java       |   11 +-
 .../web/controllers/RestAPITestBase.java        |    7 +-
 .../security/ClientAuthenticationDUnitTest.java |    6 +-
 .../security/ClientAuthorizationDUnitTest.java  |    6 +-
 .../security/ClientAuthorizationTestBase.java   |    4 +-
 .../security/ClientMultiUserAuthzDUnitTest.java |    3 +-
 .../DeltaClientAuthorizationDUnitTest.java      |    3 +-
 .../DeltaClientPostAuthorizationDUnitTest.java  |    5 +-
 .../security/P2PAuthenticationDUnitTest.java    |    7 +-
 .../gemfire/security/SecurityTestUtil.java      |    3 +-
 .../gemfire/test/dunit/AsyncInvocation.java     |  215 +++
 .../gemstone/gemfire/test/dunit/DUnitEnv.java   |   79 +
 .../gemfire/test/dunit/DistributedTestCase.java | 1432 +++++++++++++++++
 .../com/gemstone/gemfire/test/dunit/Host.java   |  212 +++
 .../gemfire/test/dunit/RMIException.java        |  170 +++
 .../gemfire/test/dunit/RepeatableRunnable.java  |   29 +
 .../test/dunit/SerializableCallable.java        |   70 +
 .../test/dunit/SerializableRunnable.java        |   92 ++
 .../com/gemstone/gemfire/test/dunit/VM.java     | 1345 ++++++++++++++++
 .../test/dunit/standalone/DUnitLauncher.java    |    9 +-
 .../dunit/standalone/StandAloneDUnitEnv.java    |    3 +-
 .../test/dunit/tests/BasicDUnitTest.java        |   10 +-
 .../gemfire/test/dunit/tests/VMDUnitTest.java   |    9 +-
 .../src/test/java/dunit/AsyncInvocation.java    |  217 ---
 gemfire-core/src/test/java/dunit/DUnitEnv.java  |   80 -
 .../test/java/dunit/DistributedTestCase.java    | 1438 ------------------
 gemfire-core/src/test/java/dunit/Host.java      |  210 ---
 .../src/test/java/dunit/RMIException.java       |  170 ---
 .../src/test/java/dunit/RepeatableRunnable.java |   29 -
 .../test/java/dunit/SerializableCallable.java   |   70 -
 .../test/java/dunit/SerializableRunnable.java   |   92 --
 gemfire-core/src/test/java/dunit/VM.java        | 1347 ----------------
 .../LuceneFunctionReadPathDUnitTest.java        |    7 +-
 533 files changed, 6275 insertions(+), 6085 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d89038db/gemfire-core/src/test/java/com/gemstone/gemfire/TXExpiryJUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/TXExpiryJUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/TXExpiryJUnitTest.java
index 3664ad5..674f0c9 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/TXExpiryJUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/TXExpiryJUnitTest.java
@@ -51,11 +51,10 @@ import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
 import com.gemstone.gemfire.internal.cache.LocalRegion;
 import com.gemstone.gemfire.internal.cache.TXManagerImpl;
 import com.gemstone.gemfire.internal.cache.TXStateProxy;
+import com.gemstone.gemfire.test.dunit.DistributedTestCase;
+import com.gemstone.gemfire.test.dunit.DistributedTestCase.WaitCriterion;
 import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
 
-import dunit.DistributedTestCase;
-import dunit.DistributedTestCase.WaitCriterion;
-
 /**
  * Tests transaction expiration functionality
  *

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d89038db/gemfire-core/src/test/java/com/gemstone/gemfire/cache/CacheRegionClearStatsDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/CacheRegionClearStatsDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/CacheRegionClearStatsDUnitTest.java
index aeab59e..3502021 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/CacheRegionClearStatsDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/CacheRegionClearStatsDUnitTest.java
@@ -25,10 +25,9 @@ import com.gemstone.gemfire.distributed.DistributedSystem;
 import com.gemstone.gemfire.distributed.internal.DistributionConfig;
 import com.gemstone.gemfire.internal.AvailablePort;
 import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
-
-import dunit.DistributedTestCase;
-import dunit.Host;
-import dunit.VM;
+import com.gemstone.gemfire.test.dunit.DistributedTestCase;
+import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.VM;
 /**
  * verifies the count of clear operation
  *  

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d89038db/gemfire-core/src/test/java/com/gemstone/gemfire/cache/ClientServerTimeSyncDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/ClientServerTimeSyncDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/ClientServerTimeSyncDUnitTest.java
index 604e405..2606a8f 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/ClientServerTimeSyncDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/ClientServerTimeSyncDUnitTest.java
@@ -29,10 +29,9 @@ import com.gemstone.gemfire.cache30.CacheTestCase;
 import com.gemstone.gemfire.distributed.internal.DSClock;
 import com.gemstone.gemfire.internal.AvailablePortHelper;
 import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
-
-import dunit.Host;
-import dunit.SerializableCallable;
-import dunit.VM;
+import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.SerializableCallable;
+import com.gemstone.gemfire.test.dunit.VM;
 
 public class ClientServerTimeSyncDUnitTest extends CacheTestCase {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d89038db/gemfire-core/src/test/java/com/gemstone/gemfire/cache/ConnectionPoolAndLoaderDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/ConnectionPoolAndLoaderDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/ConnectionPoolAndLoaderDUnitTest.java
index 67a847c..677ab14 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/ConnectionPoolAndLoaderDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/ConnectionPoolAndLoaderDUnitTest.java
@@ -27,11 +27,10 @@ import com.gemstone.gemfire.cache.server.CacheServer;
 import com.gemstone.gemfire.cache.util.CacheWriterAdapter;
 import com.gemstone.gemfire.cache30.CacheTestCase;
 import com.gemstone.gemfire.internal.AvailablePort;
-
-import dunit.Host;
-import dunit.SerializableCallable;
-import dunit.SerializableRunnable;
-import dunit.VM;
+import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.SerializableCallable;
+import com.gemstone.gemfire.test.dunit.SerializableRunnable;
+import com.gemstone.gemfire.test.dunit.VM;
 
 /**
  * This tests cases where we have both 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d89038db/gemfire-core/src/test/java/com/gemstone/gemfire/cache/client/ClientServerRegisterInterestsDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/client/ClientServerRegisterInterestsDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/client/ClientServerRegisterInterestsDUnitTest.java
index 1d0d6ba..89c4e58 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/client/ClientServerRegisterInterestsDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/client/ClientServerRegisterInterestsDUnitTest.java
@@ -33,19 +33,18 @@ import com.gemstone.gemfire.cache.server.CacheServer;
 import com.gemstone.gemfire.cache.server.ClientSubscriptionConfig;
 import com.gemstone.gemfire.cache.util.CacheListenerAdapter;
 import com.gemstone.gemfire.internal.AvailablePortHelper;
-
-import dunit.DistributedTestCase;
-import dunit.Host;
-import dunit.SerializableCallable;
-import dunit.SerializableRunnable;
-import dunit.VM;
+import com.gemstone.gemfire.test.dunit.DistributedTestCase;
+import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.SerializableCallable;
+import com.gemstone.gemfire.test.dunit.SerializableRunnable;
+import com.gemstone.gemfire.test.dunit.VM;
 
 /**
  * The ClientServerRegisterInterestsDUnitTest class is a test suite of test cases testing the interaction between a
  * client and a server in a Register Interests scenario.
  *
  * @author John Blum
- * @see dunit.DistributedTestCase
+ * @see com.gemstone.gemfire.test.dunit.DistributedTestCase
  * @since 8.0
  */
 public class ClientServerRegisterInterestsDUnitTest extends DistributedTestCase {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d89038db/gemfire-core/src/test/java/com/gemstone/gemfire/cache/client/internal/AutoConnectionSourceDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/client/internal/AutoConnectionSourceDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/client/internal/AutoConnectionSourceDUnitTest.java
index 3a61945..e8d4915 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/client/internal/AutoConnectionSourceDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/client/internal/AutoConnectionSourceDUnitTest.java
@@ -36,11 +36,10 @@ import com.gemstone.gemfire.internal.AvailablePortHelper;
 import com.gemstone.gemfire.management.membership.ClientMembership;
 import com.gemstone.gemfire.management.membership.ClientMembershipEvent;
 import com.gemstone.gemfire.management.membership.ClientMembershipListenerAdapter;
-
-import dunit.Host;
-import dunit.SerializableCallable;
-import dunit.SerializableRunnable;
-import dunit.VM;
+import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.SerializableCallable;
+import com.gemstone.gemfire.test.dunit.SerializableRunnable;
+import com.gemstone.gemfire.test.dunit.VM;
 
 /**
  * Tests cases that are particular for the auto connection source
@@ -394,7 +393,7 @@ public class AutoConnectionSourceDUnitTest extends LocatorTestBase {
         System.err.println("Attempt: " + (i++));
         putInVM(vm, regionName, key, value);
         break;
-      } catch (NoAvailableLocatorsException | dunit.RMIException e) {
+      } catch (NoAvailableLocatorsException | com.gemstone.gemfire.test.dunit.RMIException e) {
         if( !(e instanceof NoAvailableLocatorsException)
             && !(e.getCause() instanceof NoAvailableServersException)) {
           throw e;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d89038db/gemfire-core/src/test/java/com/gemstone/gemfire/cache/client/internal/CacheServerSSLConnectionDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/client/internal/CacheServerSSLConnectionDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/client/internal/CacheServerSSLConnectionDUnitTest.java
index 3705c7c..3150edd 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/client/internal/CacheServerSSLConnectionDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/client/internal/CacheServerSSLConnectionDUnitTest.java
@@ -33,12 +33,11 @@ import com.gemstone.gemfire.cache.server.CacheServer;
 import com.gemstone.gemfire.distributed.internal.DistributionConfig;
 import com.gemstone.gemfire.internal.AvailablePortHelper;
 import com.gemstone.gemfire.security.AuthenticationRequiredException;
+import com.gemstone.gemfire.test.dunit.DistributedTestCase;
+import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.VM;
 import com.gemstone.gemfire.util.test.TestUtil;
 
-import dunit.DistributedTestCase;
-import dunit.Host;
-import dunit.VM;
-
 /**
  * Tests cacheserver ssl support added. See https://svn.gemstone.com/trac/gemfire/ticket/48995 for details
  * @author tushark

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d89038db/gemfire-core/src/test/java/com/gemstone/gemfire/cache/client/internal/LocatorLoadBalancingDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/client/internal/LocatorLoadBalancingDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/client/internal/LocatorLoadBalancingDUnitTest.java
index 7a0ddaf..2d1b75f 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/client/internal/LocatorLoadBalancingDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/client/internal/LocatorLoadBalancingDUnitTest.java
@@ -47,11 +47,10 @@ import com.gemstone.gemfire.internal.cache.CacheServerImpl;
 import com.gemstone.gemfire.internal.cache.PoolFactoryImpl;
 import com.gemstone.gemfire.internal.logging.InternalLogWriter;
 import com.gemstone.gemfire.internal.logging.LocalLogWriter;
-
-import dunit.DistributedTestCase;
-import dunit.Host;
-import dunit.SerializableRunnable;
-import dunit.VM;
+import com.gemstone.gemfire.test.dunit.DistributedTestCase;
+import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.SerializableRunnable;
+import com.gemstone.gemfire.test.dunit.VM;
 
 /**
  * @author dsmith

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d89038db/gemfire-core/src/test/java/com/gemstone/gemfire/cache/client/internal/LocatorTestBase.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/client/internal/LocatorTestBase.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/client/internal/LocatorTestBase.java
index 530b61a..72f1a5c 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/client/internal/LocatorTestBase.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/client/internal/LocatorTestBase.java
@@ -42,12 +42,11 @@ import com.gemstone.gemfire.distributed.Locator;
 import com.gemstone.gemfire.distributed.internal.DistributionConfig;
 import com.gemstone.gemfire.internal.AvailablePortHelper;
 import com.gemstone.gemfire.internal.cache.PoolFactoryImpl;
-
-import dunit.DistributedTestCase;
-import dunit.Host;
-import dunit.SerializableCallable;
-import dunit.SerializableRunnable;
-import dunit.VM;
+import com.gemstone.gemfire.test.dunit.DistributedTestCase;
+import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.SerializableCallable;
+import com.gemstone.gemfire.test.dunit.SerializableRunnable;
+import com.gemstone.gemfire.test.dunit.VM;
 
 /**
  * @author dsmith

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d89038db/gemfire-core/src/test/java/com/gemstone/gemfire/cache/client/internal/SSLNoClientAuthDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/client/internal/SSLNoClientAuthDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/client/internal/SSLNoClientAuthDUnitTest.java
index 5ca5573..1c79129 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/client/internal/SSLNoClientAuthDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/client/internal/SSLNoClientAuthDUnitTest.java
@@ -33,12 +33,11 @@ import com.gemstone.gemfire.cache.server.CacheServer;
 import com.gemstone.gemfire.distributed.internal.DistributionConfig;
 import com.gemstone.gemfire.internal.AvailablePortHelper;
 import com.gemstone.gemfire.security.AuthenticationRequiredException;
+import com.gemstone.gemfire.test.dunit.DistributedTestCase;
+import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.VM;
 import com.gemstone.gemfire.util.test.TestUtil;
 
-import dunit.DistributedTestCase;
-import dunit.Host;
-import dunit.VM;
-
 /**
  * Test for GEODE-396
  */

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d89038db/gemfire-core/src/test/java/com/gemstone/gemfire/cache/client/internal/pooling/ConnectionManagerJUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/client/internal/pooling/ConnectionManagerJUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/client/internal/pooling/ConnectionManagerJUnitTest.java
index eb93bbc..a398975 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/client/internal/pooling/ConnectionManagerJUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/client/internal/pooling/ConnectionManagerJUnitTest.java
@@ -59,11 +59,10 @@ import com.gemstone.gemfire.internal.cache.PoolStats;
 import com.gemstone.gemfire.internal.cache.tier.sockets.ServerQueueStatus;
 import com.gemstone.gemfire.internal.logging.InternalLogWriter;
 import com.gemstone.gemfire.internal.logging.LocalLogWriter;
+import com.gemstone.gemfire.test.dunit.DistributedTestCase;
+import com.gemstone.gemfire.test.dunit.DistributedTestCase.WaitCriterion;
 import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
 
-import dunit.DistributedTestCase;
-import dunit.DistributedTestCase.WaitCriterion;
-
 /**
  * @author dsmith
  *

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d89038db/gemfire-core/src/test/java/com/gemstone/gemfire/cache/management/MemoryThresholdsDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/management/MemoryThresholdsDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/management/MemoryThresholdsDUnitTest.java
index 2f8f7c0..9f84325 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/management/MemoryThresholdsDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/management/MemoryThresholdsDUnitTest.java
@@ -79,13 +79,12 @@ import com.gemstone.gemfire.internal.cache.control.ResourceAdvisor;
 import com.gemstone.gemfire.internal.cache.control.ResourceListener;
 import com.gemstone.gemfire.internal.cache.control.TestMemoryThresholdListener;
 import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
-
-import dunit.AsyncInvocation;
-import dunit.DistributedTestCase;
-import dunit.Host;
-import dunit.SerializableCallable;
-import dunit.SerializableRunnable;
-import dunit.VM;
+import com.gemstone.gemfire.test.dunit.AsyncInvocation;
+import com.gemstone.gemfire.test.dunit.DistributedTestCase;
+import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.SerializableCallable;
+import com.gemstone.gemfire.test.dunit.SerializableRunnable;
+import com.gemstone.gemfire.test.dunit.VM;
 
 /**
  * Tests the Heap Memory thresholds of {@link ResourceManager}

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d89038db/gemfire-core/src/test/java/com/gemstone/gemfire/cache/management/MemoryThresholdsOffHeapDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/management/MemoryThresholdsOffHeapDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/management/MemoryThresholdsOffHeapDUnitTest.java
index 0552641..afe551b 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/management/MemoryThresholdsOffHeapDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/management/MemoryThresholdsOffHeapDUnitTest.java
@@ -68,13 +68,12 @@ import com.gemstone.gemfire.internal.cache.control.ResourceListener;
 import com.gemstone.gemfire.internal.cache.control.TestMemoryThresholdListener;
 import com.gemstone.gemfire.internal.cache.partitioned.RegionAdvisor;
 import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
-
-import dunit.AsyncInvocation;
-import dunit.DistributedTestCase;
-import dunit.Host;
-import dunit.SerializableCallable;
-import dunit.SerializableRunnable;
-import dunit.VM;
+import com.gemstone.gemfire.test.dunit.AsyncInvocation;
+import com.gemstone.gemfire.test.dunit.DistributedTestCase;
+import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.SerializableCallable;
+import com.gemstone.gemfire.test.dunit.SerializableRunnable;
+import com.gemstone.gemfire.test.dunit.VM;
 
 /**
  * Tests the Off-Heap Memory thresholds of {@link ResourceManager}

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d89038db/gemfire-core/src/test/java/com/gemstone/gemfire/cache/management/ResourceManagerDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/management/ResourceManagerDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/management/ResourceManagerDUnitTest.java
index cf29981..19f0612 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/management/ResourceManagerDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/management/ResourceManagerDUnitTest.java
@@ -61,11 +61,10 @@ import com.gemstone.gemfire.internal.cache.partitioned.RemoveBucketMessage;
 import com.gemstone.gemfire.internal.cache.partitioned.RemoveBucketMessage.RemoveBucketResponse;
 import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
 import com.gemstone.gemfire.internal.logging.LogService;
-
-import dunit.Host;
-import dunit.SerializableCallable;
-import dunit.SerializableRunnable;
-import dunit.VM;
+import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.SerializableCallable;
+import com.gemstone.gemfire.test.dunit.SerializableRunnable;
+import com.gemstone.gemfire.test.dunit.VM;
 
 /**
  * Tests com.gemstone.gemfire.cache.control.ResourceManager.

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d89038db/gemfire-core/src/test/java/com/gemstone/gemfire/cache/mapInterface/PutAllGlobalLockJUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/mapInterface/PutAllGlobalLockJUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/mapInterface/PutAllGlobalLockJUnitTest.java
index dc0116d..48f1c56 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/mapInterface/PutAllGlobalLockJUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/mapInterface/PutAllGlobalLockJUnitTest.java
@@ -36,10 +36,9 @@ import com.gemstone.gemfire.cache.RegionAttributes;
 import com.gemstone.gemfire.cache.Scope;
 import com.gemstone.gemfire.cache.util.CacheListenerAdapter;
 import com.gemstone.gemfire.distributed.DistributedSystem;
+import com.gemstone.gemfire.test.dunit.DistributedTestCase;
 import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
 
-import dunit.DistributedTestCase;
-
 @Category(IntegrationTest.class)
 public class PutAllGlobalLockJUnitTest {
     

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d89038db/gemfire-core/src/test/java/com/gemstone/gemfire/cache/partition/PartitionRegionHelperDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/partition/PartitionRegionHelperDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/partition/PartitionRegionHelperDUnitTest.java
index 4be3fe4..f70e7a2 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/partition/PartitionRegionHelperDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/partition/PartitionRegionHelperDUnitTest.java
@@ -45,14 +45,13 @@ import com.gemstone.gemfire.internal.cache.PartitionedRegion;
 import com.gemstone.gemfire.internal.cache.PartitionedRegionHelper;
 import com.gemstone.gemfire.internal.cache.partitioned.fixed.FixedPartitioningTestBase;
 import com.gemstone.gemfire.internal.cache.partitioned.fixed.FixedPartitioningTestBase.Months_Accessor;
+import com.gemstone.gemfire.test.dunit.AsyncInvocation;
+import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.SerializableCallable;
+import com.gemstone.gemfire.test.dunit.SerializableRunnable;
+import com.gemstone.gemfire.test.dunit.VM;
 import com.gemstone.gemfire.internal.cache.partitioned.fixed.QuarterPartitionResolver;
 
-import dunit.AsyncInvocation;
-import dunit.Host;
-import dunit.SerializableCallable;
-import dunit.SerializableRunnable;
-import dunit.VM;
-
 public class PartitionRegionHelperDUnitTest extends CacheTestCase {
 
   public PartitionRegionHelperDUnitTest(String name) {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d89038db/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/QueryTestUtils.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/QueryTestUtils.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/QueryTestUtils.java
index 57f2204..5ce23a4 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/QueryTestUtils.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/QueryTestUtils.java
@@ -43,9 +43,8 @@ import com.gemstone.gemfire.cache.query.data.Portfolio;
 import com.gemstone.gemfire.cache.query.types.CollectionType;
 import com.gemstone.gemfire.cache.query.types.ObjectType;
 import com.gemstone.gemfire.cache30.CacheSerializableRunnable;
-
-import dunit.SerializableRunnable;
-import dunit.VM;
+import com.gemstone.gemfire.test.dunit.SerializableRunnable;
+import com.gemstone.gemfire.test.dunit.VM;
 
 /**
  * Utility class for testing supported queries

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d89038db/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryTestListener.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryTestListener.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryTestListener.java
index c230f38..8c43e47 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryTestListener.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryTestListener.java
@@ -30,9 +30,8 @@ import com.gemstone.gemfire.cache.client.Pool;
 import com.gemstone.gemfire.cache.query.CqEvent;
 import com.gemstone.gemfire.cache.query.CqStatusListener;
 import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
-
-import dunit.DistributedTestCase;
-import dunit.DistributedTestCase.WaitCriterion;
+import com.gemstone.gemfire.test.dunit.DistributedTestCase;
+import com.gemstone.gemfire.test.dunit.DistributedTestCase.WaitCriterion;
 
 /**
  * @author rmadduri

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d89038db/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/CompactRangeIndexDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/CompactRangeIndexDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/CompactRangeIndexDUnitTest.java
index 9cdf2fe..f579e58 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/CompactRangeIndexDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/CompactRangeIndexDUnitTest.java
@@ -25,12 +25,11 @@ import com.gemstone.gemfire.cache.query.internal.index.IndexManager;
 import com.gemstone.gemfire.cache.query.internal.index.IndexManager.TestHook;
 import com.gemstone.gemfire.cache30.CacheSerializableRunnable;
 import com.gemstone.gemfire.cache30.CacheSerializableRunnable.CacheSerializableRunnableException;
-
-import dunit.AsyncInvocation;
-import dunit.DistributedTestCase;
-import dunit.Host;
-import dunit.SerializableRunnable;
-import dunit.VM;
+import com.gemstone.gemfire.test.dunit.AsyncInvocation;
+import com.gemstone.gemfire.test.dunit.DistributedTestCase;
+import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.SerializableRunnable;
+import com.gemstone.gemfire.test.dunit.VM;
 
 public class CompactRangeIndexDUnitTest extends DistributedTestCase{
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d89038db/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/CqTimeTestListener.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/CqTimeTestListener.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/CqTimeTestListener.java
index 7c530f1..5f3d45d 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/CqTimeTestListener.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/CqTimeTestListener.java
@@ -25,9 +25,8 @@ import com.gemstone.gemfire.cache.Operation;
 import com.gemstone.gemfire.cache.query.CqEvent;
 import com.gemstone.gemfire.cache.query.CqListener;
 import com.gemstone.gemfire.cache.query.data.Portfolio;
-
-import dunit.DistributedTestCase;
-import dunit.DistributedTestCase.WaitCriterion;
+import com.gemstone.gemfire.test.dunit.DistributedTestCase;
+import com.gemstone.gemfire.test.dunit.DistributedTestCase.WaitCriterion;
 
 /**
  * @author anil.

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d89038db/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/GroupByDUnitImpl.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/GroupByDUnitImpl.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/GroupByDUnitImpl.java
index 774917f..25d8c80 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/GroupByDUnitImpl.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/GroupByDUnitImpl.java
@@ -26,10 +26,9 @@ import com.gemstone.gemfire.cache.query.functional.GroupByTestImpl;
 import com.gemstone.gemfire.cache.query.functional.GroupByTestInterface;
 import com.gemstone.gemfire.cache.query.functional.NonDistinctOrderByTestImplementation;
 import com.gemstone.gemfire.cache30.CacheTestCase;
-
-import dunit.Host;
-import dunit.SerializableRunnable;
-import dunit.VM;
+import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.SerializableRunnable;
+import com.gemstone.gemfire.test.dunit.VM;
 
 /**
  * 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d89038db/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/GroupByPartitionedQueryDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/GroupByPartitionedQueryDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/GroupByPartitionedQueryDUnitTest.java
index b1252d0..c1f1cec 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/GroupByPartitionedQueryDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/GroupByPartitionedQueryDUnitTest.java
@@ -29,12 +29,11 @@ import com.gemstone.gemfire.cache.query.IndexNameConflictException;
 import com.gemstone.gemfire.cache.query.IndexType;
 import com.gemstone.gemfire.cache.query.RegionNotFoundException;
 import com.gemstone.gemfire.cache.query.functional.GroupByTestImpl;
+import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.SerializableRunnable;
+import com.gemstone.gemfire.test.dunit.VM;
 import com.gemstone.gemfire.test.junit.categories.DistributedTest;
 
-import dunit.Host;
-import dunit.SerializableRunnable;
-import dunit.VM;
-
 /**
  * 
  * @author ashahid

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d89038db/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/GroupByQueryDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/GroupByQueryDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/GroupByQueryDUnitTest.java
index 5c56652..095142a 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/GroupByQueryDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/GroupByQueryDUnitTest.java
@@ -37,12 +37,11 @@ import com.gemstone.gemfire.cache.query.Struct;
 import com.gemstone.gemfire.cache.query.TypeMismatchException;
 import com.gemstone.gemfire.cache.query.data.Portfolio;
 import com.gemstone.gemfire.cache30.CacheTestCase;
+import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.SerializableRunnable;
+import com.gemstone.gemfire.test.dunit.VM;
 import com.gemstone.gemfire.test.junit.categories.DistributedTest;
 
-import dunit.Host;
-import dunit.SerializableRunnable;
-import dunit.VM;
-
 /**
  * 
  * @author ashahid

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d89038db/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/HashIndexDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/HashIndexDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/HashIndexDUnitTest.java
index eea8726..afd2119 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/HashIndexDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/HashIndexDUnitTest.java
@@ -21,11 +21,10 @@ import java.util.Properties;
 import com.gemstone.gemfire.cache.CacheException;
 import com.gemstone.gemfire.cache.query.QueryTestUtils;
 import com.gemstone.gemfire.cache30.CacheSerializableRunnable;
-
-import dunit.DistributedTestCase;
-import dunit.Host;
-import dunit.SerializableRunnable;
-import dunit.VM;
+import com.gemstone.gemfire.test.dunit.DistributedTestCase;
+import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.SerializableRunnable;
+import com.gemstone.gemfire.test.dunit.VM;
 
 public class HashIndexDUnitTest extends DistributedTestCase{
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d89038db/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/HelperTestCase.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/HelperTestCase.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/HelperTestCase.java
index 24661a0..08a4882 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/HelperTestCase.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/HelperTestCase.java
@@ -45,11 +45,10 @@ import com.gemstone.gemfire.cache30.CacheSerializableRunnable;
 import com.gemstone.gemfire.cache30.CacheTestCase;
 import com.gemstone.gemfire.distributed.internal.DistributionConfig;
 import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
-
-import dunit.AsyncInvocation;
-import dunit.SerializableCallable;
-import dunit.SerializableRunnable;
-import dunit.VM;
+import com.gemstone.gemfire.test.dunit.AsyncInvocation;
+import com.gemstone.gemfire.test.dunit.SerializableCallable;
+import com.gemstone.gemfire.test.dunit.SerializableRunnable;
+import com.gemstone.gemfire.test.dunit.VM;
 
 public class HelperTestCase extends CacheTestCase {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d89038db/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/NonDistinctOrderByDUnitImpl.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/NonDistinctOrderByDUnitImpl.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/NonDistinctOrderByDUnitImpl.java
index 53e323b..05f3ba1 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/NonDistinctOrderByDUnitImpl.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/NonDistinctOrderByDUnitImpl.java
@@ -24,10 +24,9 @@ import com.gemstone.gemfire.cache.query.IndexType;
 import com.gemstone.gemfire.cache.query.RegionNotFoundException;
 import com.gemstone.gemfire.cache.query.functional.NonDistinctOrderByTestImplementation;
 import com.gemstone.gemfire.cache30.CacheTestCase;
-
-import dunit.Host;
-import dunit.SerializableRunnable;
-import dunit.VM;
+import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.SerializableRunnable;
+import com.gemstone.gemfire.test.dunit.VM;
 
 public abstract class NonDistinctOrderByDUnitImpl extends CacheTestCase {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d89038db/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/NonDistinctOrderByPartitionedDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/NonDistinctOrderByPartitionedDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/NonDistinctOrderByPartitionedDUnitTest.java
index 207bfb7..a87df2e 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/NonDistinctOrderByPartitionedDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/NonDistinctOrderByPartitionedDUnitTest.java
@@ -30,12 +30,11 @@ import com.gemstone.gemfire.cache.query.IndexType;
 import com.gemstone.gemfire.cache.query.RegionNotFoundException;
 import com.gemstone.gemfire.cache.query.functional.NonDistinctOrderByTestImplementation;
 import com.gemstone.gemfire.cache30.CacheTestCase;
+import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.SerializableRunnable;
+import com.gemstone.gemfire.test.dunit.VM;
 import com.gemstone.gemfire.test.junit.categories.DistributedTest;
 
-import dunit.Host;
-import dunit.SerializableRunnable;
-import dunit.VM;
-
 /**
  * 
  * @author ashahid

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d89038db/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/PdxStringQueryDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/PdxStringQueryDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/PdxStringQueryDUnitTest.java
index b354ce6..52a3763 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/PdxStringQueryDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/PdxStringQueryDUnitTest.java
@@ -60,13 +60,12 @@ import com.gemstone.gemfire.cache30.CacheTestCase;
 import com.gemstone.gemfire.internal.AvailablePortHelper;
 import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
 import com.gemstone.gemfire.internal.cache.persistence.query.CloseableIterator;
-import com.gemstone.gemfire.pdx.internal.PdxString;
-
-import dunit.DistributedTestCase;
-import dunit.Host;
-import dunit.SerializableCallable;
-import dunit.SerializableRunnable;
-import dunit.VM;
+import com.gemstone.gemfire.pdx.internal.PdxString;
+import com.gemstone.gemfire.test.dunit.DistributedTestCase;
+import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.SerializableCallable;
+import com.gemstone.gemfire.test.dunit.SerializableRunnable;
+import com.gemstone.gemfire.test.dunit.VM;
 
 public class PdxStringQueryDUnitTest extends CacheTestCase{
   private static int bridgeServerPort;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d89038db/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryDataInconsistencyDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryDataInconsistencyDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryDataInconsistencyDUnitTest.java
index 2366c4a..5833883 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryDataInconsistencyDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryDataInconsistencyDUnitTest.java
@@ -40,12 +40,11 @@ import com.gemstone.gemfire.cache.query.partitioned.PRQueryDUnitHelper;
 import com.gemstone.gemfire.cache30.CacheSerializableRunnable;
 import com.gemstone.gemfire.cache30.CacheTestCase;
 import com.gemstone.gemfire.internal.cache.execute.PRClientServerTestBase;
-
-import dunit.AsyncInvocation;
-import dunit.DistributedTestCase;
-import dunit.Host;
-import dunit.SerializableRunnable;
-import dunit.VM;
+import com.gemstone.gemfire.test.dunit.AsyncInvocation;
+import com.gemstone.gemfire.test.dunit.DistributedTestCase;
+import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.SerializableRunnable;
+import com.gemstone.gemfire.test.dunit.VM;
 
 /**
  * This tests the data inconsistency during update on an index and querying the

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d89038db/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryIndexUsingXMLDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryIndexUsingXMLDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryIndexUsingXMLDUnitTest.java
index 35f84a7..1ebe01d 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryIndexUsingXMLDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryIndexUsingXMLDUnitTest.java
@@ -61,15 +61,14 @@ import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
 import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
 import com.gemstone.gemfire.internal.cache.LocalRegion;
 import com.gemstone.gemfire.internal.cache.PartitionedRegion;
+import com.gemstone.gemfire.test.dunit.AsyncInvocation;
+import com.gemstone.gemfire.test.dunit.DistributedTestCase;
+import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.SerializableRunnable;
+import com.gemstone.gemfire.test.dunit.VM;
+import com.gemstone.gemfire.test.dunit.DistributedTestCase.WaitCriterion;
 import com.gemstone.gemfire.util.test.TestUtil;
 
-import dunit.AsyncInvocation;
-import dunit.DistributedTestCase;
-import dunit.Host;
-import dunit.SerializableRunnable;
-import dunit.VM;
-import dunit.DistributedTestCase.WaitCriterion;
-
 public class QueryIndexUsingXMLDUnitTest extends CacheTestCase {
 
   static private final String WAIT_PROPERTY = "QueryIndexBuckets.maxWaitTime";

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d89038db/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryParamsAuthorizationDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryParamsAuthorizationDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryParamsAuthorizationDUnitTest.java
index f9b7366..8030f09 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryParamsAuthorizationDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryParamsAuthorizationDUnitTest.java
@@ -31,10 +31,9 @@ import com.gemstone.gemfire.cache.query.data.Portfolio;
 import com.gemstone.gemfire.cache.server.CacheServer;
 import com.gemstone.gemfire.cache30.CacheTestCase;
 import com.gemstone.gemfire.internal.AvailablePortHelper;
-
-import dunit.Host;
-import dunit.SerializableCallable;
-import dunit.VM;
+import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.SerializableCallable;
+import com.gemstone.gemfire.test.dunit.VM;
 
 /**
  * Test for accessing query bind parameters from authorization callbacks

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d89038db/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryUsingFunctionContextDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryUsingFunctionContextDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryUsingFunctionContextDUnitTest.java
index 03e7ac9..27619c0 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryUsingFunctionContextDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryUsingFunctionContextDUnitTest.java
@@ -55,10 +55,9 @@ import com.gemstone.gemfire.cache30.CacheTestCase;
 import com.gemstone.gemfire.internal.cache.LocalDataSet;
 import com.gemstone.gemfire.internal.cache.PartitionedRegion;
 import com.gemstone.gemfire.internal.cache.execute.PRClientServerTestBase;
-
-import dunit.Host;
-import dunit.SerializableRunnable;
-import dunit.VM;
+import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.SerializableRunnable;
+import com.gemstone.gemfire.test.dunit.VM;
 
 /**
  * This tests the querying using a RegionFunctionContext which provides a filter

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d89038db/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryUsingPoolDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryUsingPoolDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryUsingPoolDUnitTest.java
index 37f203b..35f71fe 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryUsingPoolDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryUsingPoolDUnitTest.java
@@ -49,10 +49,9 @@ import com.gemstone.gemfire.distributed.DistributedSystem;
 import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
 import com.gemstone.gemfire.internal.AvailablePort;
 import com.gemstone.gemfire.internal.cache.tier.sockets.CacheClientNotifier;
-
-import dunit.Host;
-import dunit.SerializableRunnable;
-import dunit.VM;
+import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.SerializableRunnable;
+import com.gemstone.gemfire.test.dunit.VM;
 
 /**
  * Tests remote (client/server) query execution.

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d89038db/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/RemoteQueryDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/RemoteQueryDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/RemoteQueryDUnitTest.java
index 4b8a280..dfbe69e 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/RemoteQueryDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/RemoteQueryDUnitTest.java
@@ -16,27 +16,35 @@
  */
 package com.gemstone.gemfire.cache.query.dunit;
 
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+import java.util.Comparator;
+import java.util.Properties;
+
 import com.gemstone.gemfire.DataSerializable;
 import com.gemstone.gemfire.DataSerializer;
-import com.gemstone.gemfire.cache.*;
+import com.gemstone.gemfire.cache.AttributesFactory;
+import com.gemstone.gemfire.cache.Cache;
+import com.gemstone.gemfire.cache.CacheException;
+import com.gemstone.gemfire.cache.Region;
+import com.gemstone.gemfire.cache.Scope;
 import com.gemstone.gemfire.cache.client.PoolManager;
-import com.gemstone.gemfire.cache.query.*;
-import com.gemstone.gemfire.cache.query.internal.*;
+import com.gemstone.gemfire.cache.query.QueryInvocationTargetException;
+import com.gemstone.gemfire.cache.query.SelectResults;
+import com.gemstone.gemfire.cache.query.Struct;
+import com.gemstone.gemfire.cache.query.internal.QueryObserverAdapter;
+import com.gemstone.gemfire.cache.query.internal.QueryObserverHolder;
+import com.gemstone.gemfire.cache.query.internal.ResultsBag;
 import com.gemstone.gemfire.cache.server.CacheServer;
-import com.gemstone.gemfire.cache30.ClientServerTestCase;
 import com.gemstone.gemfire.cache30.CacheSerializableRunnable;
 import com.gemstone.gemfire.cache30.CacheTestCase;
+import com.gemstone.gemfire.cache30.ClientServerTestCase;
 import com.gemstone.gemfire.distributed.DistributedSystem;
 import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
-import com.gemstone.gemfire.internal.AvailablePort;
-
-import dunit.*;
-
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-import java.util.Comparator;
-import java.util.Properties;
+import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.SerializableRunnable;
+import com.gemstone.gemfire.test.dunit.VM;
 
 import cacheRunner.Portfolio;
 import cacheRunner.Position;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d89038db/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/ResourceManagerWithQueryMonitorDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/ResourceManagerWithQueryMonitorDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/ResourceManagerWithQueryMonitorDUnitTest.java
index 19271c1..372111c 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/ResourceManagerWithQueryMonitorDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/ResourceManagerWithQueryMonitorDUnitTest.java
@@ -65,12 +65,11 @@ import com.gemstone.gemfire.internal.cache.control.MemoryEvent;
 import com.gemstone.gemfire.internal.cache.control.ResourceListener;
 import com.gemstone.gemfire.internal.cache.control.TestMemoryThresholdListener;
 import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
-
-import dunit.AsyncInvocation;
-import dunit.DistributedTestCase;
-import dunit.Host;
-import dunit.SerializableCallable;
-import dunit.VM;
+import com.gemstone.gemfire.test.dunit.AsyncInvocation;
+import com.gemstone.gemfire.test.dunit.DistributedTestCase;
+import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.SerializableCallable;
+import com.gemstone.gemfire.test.dunit.VM;
 
 public class ResourceManagerWithQueryMonitorDUnitTest extends ClientServerTestCase {
   

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d89038db/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/SelectStarQueryDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/SelectStarQueryDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/SelectStarQueryDUnitTest.java
index d34bd29..b943aca 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/SelectStarQueryDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/SelectStarQueryDUnitTest.java
@@ -40,10 +40,9 @@ import com.gemstone.gemfire.internal.AvailablePortHelper;
 import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
 import com.gemstone.gemfire.internal.cache.VMCachedDeserializable;
 import com.gemstone.gemfire.pdx.PdxInstance;
-
-import dunit.Host;
-import dunit.SerializableCallable;
-import dunit.VM;
+import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.SerializableCallable;
+import com.gemstone.gemfire.test.dunit.VM;
 
 /**
  * Test for #44807 to eliminate unnecessary serialization/deserialization in

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d89038db/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/functional/IndexCreationDeadLockJUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/functional/IndexCreationDeadLockJUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/functional/IndexCreationDeadLockJUnitTest.java
index 5de9b50..37abacf 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/functional/IndexCreationDeadLockJUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/functional/IndexCreationDeadLockJUnitTest.java
@@ -46,10 +46,9 @@ import com.gemstone.gemfire.cache.query.IndexType;
 import com.gemstone.gemfire.cache.query.QueryService;
 import com.gemstone.gemfire.cache.query.data.Portfolio;
 import com.gemstone.gemfire.cache.util.CacheWriterAdapter;
+import com.gemstone.gemfire.test.dunit.DistributedTestCase;
 import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
 
-import dunit.DistributedTestCase;
-
 /**
 *
 * @author prafulla

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d89038db/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/functional/IndexMaintenanceAsynchJUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/functional/IndexMaintenanceAsynchJUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/functional/IndexMaintenanceAsynchJUnitTest.java
index 6025caa..84612b5 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/functional/IndexMaintenanceAsynchJUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/functional/IndexMaintenanceAsynchJUnitTest.java
@@ -45,11 +45,10 @@ import com.gemstone.gemfire.cache.query.data.Portfolio;
 import com.gemstone.gemfire.cache.query.internal.QueryObserverAdapter;
 import com.gemstone.gemfire.cache.query.internal.QueryObserverHolder;
 import com.gemstone.gemfire.cache.query.internal.index.IndexProtocol;
+import com.gemstone.gemfire.test.dunit.DistributedTestCase;
+import com.gemstone.gemfire.test.dunit.DistributedTestCase.WaitCriterion;
 import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
 
-import dunit.DistributedTestCase;
-import dunit.DistributedTestCase.WaitCriterion;
-
 /**
  *
  * @author Ketan

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d89038db/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/functional/LikePredicateJUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/functional/LikePredicateJUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/functional/LikePredicateJUnitTest.java
index 97c9d4b..3e4a570 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/functional/LikePredicateJUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/functional/LikePredicateJUnitTest.java
@@ -57,10 +57,9 @@ import com.gemstone.gemfire.cache.query.internal.ResultsCollectionWrapper;
 import com.gemstone.gemfire.cache.query.internal.index.IndexManager;
 import com.gemstone.gemfire.cache.query.internal.index.IndexManager.TestHook;
 import com.gemstone.gemfire.cache.query.internal.types.ObjectTypeImpl;
+import com.gemstone.gemfire.test.dunit.DistributedTestCase;
 import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
 
-import dunit.DistributedTestCase;
-
 /**
  * 
  * @author asif

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d89038db/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/internal/ExecutionContextJUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/internal/ExecutionContextJUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/internal/ExecutionContextJUnitTest.java
index db0a274..35b5995 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/internal/ExecutionContextJUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/internal/ExecutionContextJUnitTest.java
@@ -44,10 +44,9 @@ import com.gemstone.gemfire.cache.query.SelectResults;
 import com.gemstone.gemfire.cache.query.data.Portfolio;
 import com.gemstone.gemfire.cache.query.data.Position;
 import com.gemstone.gemfire.internal.cache.InternalCache;
+import com.gemstone.gemfire.test.dunit.DistributedTestCase;
 import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
 
-import dunit.DistributedTestCase;
-
 /**
  * @author Asif
  * 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d89038db/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/AsynchIndexMaintenanceJUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/AsynchIndexMaintenanceJUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/AsynchIndexMaintenanceJUnitTest.java
index 5a4f9a5..7ad5f66 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/AsynchIndexMaintenanceJUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/AsynchIndexMaintenanceJUnitTest.java
@@ -28,11 +28,10 @@ import com.gemstone.gemfire.cache.query.CacheUtils;
 import com.gemstone.gemfire.cache.query.IndexType;
 import com.gemstone.gemfire.cache.query.QueryService;
 import com.gemstone.gemfire.cache.query.data.Portfolio;
+import com.gemstone.gemfire.test.dunit.DistributedTestCase;
+import com.gemstone.gemfire.test.dunit.DistributedTestCase.WaitCriterion;
 import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
 
-import dunit.DistributedTestCase;
-import dunit.DistributedTestCase.WaitCriterion;
-
 import java.util.HashSet;
 import java.util.Set;
 



Mime
View raw message