ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [07/52] [abbrv] incubator-ignite git commit: # Renaming
Date Fri, 05 Dec 2014 14:07:08 GMT
# Renaming


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

Branch: refs/heads/master
Commit: 805377cc776cdbb9bbb77dbe4ab5f78d36e468e9
Parents: 191aae2
Author: sboikov <sboikov@gridgain.com>
Authored: Fri Dec 5 16:45:14 2014 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Fri Dec 5 16:45:33 2014 +0300

----------------------------------------------------------------------
 .../ipfinder/s3/GridTcpDiscoveryS3IpFinder.java |  6 +-
 .../gridgain/grid/GridBasicWarmupClosure.java   |  2 +-
 .../discovery/tcp/TcpClientDiscoverySpi.java    |  3 +-
 .../tcp/TcpClientDiscoverySpiMBean.java         |  3 +-
 .../grid/spi/discovery/tcp/TcpDiscoverySpi.java | 11 ++-
 .../discovery/tcp/TcpDiscoverySpiAdapter.java   |  6 +-
 .../spi/discovery/tcp/TcpDiscoverySpiMBean.java |  3 +-
 .../tcp/ipfinder/GridTcpDiscoveryIpFinder.java  | 90 --------------------
 .../GridTcpDiscoveryIpFinderAdapter.java        | 77 -----------------
 .../tcp/ipfinder/TcpDiscoveryIpFinder.java      | 90 ++++++++++++++++++++
 .../ipfinder/TcpDiscoveryIpFinderAdapter.java   | 77 +++++++++++++++++
 .../jdbc/GridTcpDiscoveryJdbcIpFinder.java      |  2 +-
 .../GridTcpDiscoverySharedFsIpFinder.java       |  4 +-
 .../ipfinder/vm/GridTcpDiscoveryVmIpFinder.java |  2 +-
 .../optimized/GridOptimizedMarshallerTest.java  |  6 +-
 .../GridTestTcpDiscoveryIpFinderAdapter.java    |  4 +-
 ...idCacheCheckpointSpiSecondCacheSelfTest.java |  2 +-
 .../tcp/GridCacheDhtLockBackupSelfTest.java     |  2 +-
 .../tcp/GridOrderedMessageCancelSelfTest.java   |  2 +-
 ...CachePartitionFairAffinityNodesSelfTest.java |  2 +-
 ...CacheJdbcBlobStoreMultithreadedSelfTest.java |  2 +-
 .../GridGgfsFragmentizerAbstractSelfTest.java   |  2 +-
 .../grid/kernal/GridAffinityMappedTest.java     |  2 +-
 .../grid/kernal/GridAffinityP2PSelfTest.java    |  2 +-
 .../grid/kernal/GridAffinitySelfTest.java       |  2 +-
 .../grid/kernal/GridDiscoveryEventSelfTest.java |  2 +-
 .../grid/kernal/GridDiscoverySelfTest.java      |  2 +-
 .../kernal/GridJobMasterLeaveAwareSelfTest.java |  2 +-
 .../grid/kernal/GridManagementJobSelfTest.java  |  2 +-
 .../grid/kernal/GridMultipleJobsSelfTest.java   |  2 +-
 .../kernal/GridProjectionForCachesSelfTest.java |  2 +-
 ...ectionLocalJobMultipleArgumentsSelfTest.java |  2 +-
 .../grid/kernal/GridReleaseTypeSelfTest.java    |  2 +-
 .../GridTopologyBuildVersionSelfTest.java       |  2 +-
 .../GridCheckpointManagerAbstractSelfTest.java  |  2 +-
 .../checkpoint/GridCheckpointTaskSelfTest.java  |  2 +-
 .../GridCommunicationSendMessageSelfTest.java   |  2 +-
 .../GridDeploymentMessageCountSelfTest.java     |  2 +-
 .../GridDiscoveryManagerAliveCacheSelfTest.java |  2 +-
 .../GridDiscoveryManagerAttributesSelfTest.java |  2 +-
 .../discovery/GridDiscoveryManagerSelfTest.java |  2 +-
 .../GridAffinityProcessorAbstractSelfTest.java  |  2 +-
 ...ridCacheAbstractByteArrayValuesSelfTest.java |  2 +-
 .../cache/GridCacheAbstractSelfTest.java        |  2 +-
 .../cache/GridCacheAffinityRoutingSelfTest.java |  2 +-
 .../GridCacheAtomicMessageCountSelfTest.java    |  2 +-
 .../cache/GridCacheBasicStoreAbstractTest.java  |  2 +-
 .../cache/GridCacheClearAllSelfTest.java        |  2 +-
 .../cache/GridCacheConcurrentMapSelfTest.java   |  2 +-
 .../GridCacheConcurrentTxMultiNodeTest.java     |  2 +-
 ...idCacheConfigurationConsistencySelfTest.java |  2 +-
 ...ridCacheConfigurationValidationSelfTest.java |  2 +-
 .../GridCacheDaemonNodeAbstractSelfTest.java    |  2 +-
 .../cache/GridCacheDeploymentSelfTest.java      |  2 +-
 .../cache/GridCacheEntryMemorySizeSelfTest.java |  2 +-
 .../cache/GridCacheEntryVersionSelfTest.java    |  2 +-
 .../GridCacheEvictionEventAbstractTest.java     |  2 +-
 .../GridCacheFieldsQueryNoDataSelfTest.java     |  2 +-
 ...idCacheGetAndTransformStoreAbstractTest.java |  2 +-
 .../cache/GridCacheGlobalClearAllSelfTest.java  |  2 +-
 .../GridCacheGroupLockAbstractSelfTest.java     |  2 +-
 .../GridCacheGroupLockFailoverSelfTest.java     |  2 +-
 .../cache/GridCacheIncrementTransformTest.java  |  2 +-
 .../cache/GridCacheIteratorPerformanceTest.java |  2 +-
 .../cache/GridCacheKeyCheckSelfTest.java        |  2 +-
 .../processors/cache/GridCacheLeakTest.java     |  2 +-
 .../cache/GridCacheLuceneQueryIndexTest.java    |  2 +-
 .../GridCacheMarshallerTxAbstractTest.java      |  2 +-
 .../cache/GridCacheMemoryModeSelfTest.java      |  2 +-
 .../cache/GridCacheMultiUpdateLockSelfTest.java |  2 +-
 .../cache/GridCacheMvccManagerSelfTest.java     |  2 +-
 .../cache/GridCacheMvccPartitionedSelfTest.java |  2 +-
 .../processors/cache/GridCacheMvccSelfTest.java |  2 +-
 .../cache/GridCacheNestedTxAbstractTest.java    |  2 +-
 .../cache/GridCacheObjectToStringSelfTest.java  |  2 +-
 .../cache/GridCacheOffHeapSelfTest.java         |  2 +-
 .../processors/cache/GridCacheOffHeapTest.java  |  2 +-
 .../GridCacheOrderedPreloadingSelfTest.java     |  2 +-
 .../cache/GridCacheP2PUndeploySelfTest.java     |  2 +-
 .../cache/GridCachePartitionedGetSelfTest.java  |  2 +-
 ...hePartitionedProjectionAffinitySelfTest.java |  2 +-
 .../GridCachePreloadingEvictionsSelfTest.java   |  2 +-
 .../cache/GridCachePutAllFailoverSelfTest.java  |  2 +-
 .../GridCacheReferenceCleanupSelfTest.java      |  2 +-
 .../GridCacheRefreshAheadAbstractSelfTest.java  |  2 +-
 ...ridCacheReplicatedSynchronousCommitTest.java |  2 +-
 .../cache/GridCacheSlowTxWarnTest.java          |  2 +-
 .../cache/GridCacheStorePutxSelfTest.java       |  2 +-
 .../cache/GridCacheStoreValueBytesSelfTest.java |  2 +-
 .../cache/GridCacheSwapPreloadSelfTest.java     |  2 +-
 .../cache/GridCacheSwapReloadSelfTest.java      |  2 +-
 .../cache/GridCacheTtlManagerSelfTest.java      |  2 +-
 .../cache/GridCacheTxAbstractTest.java          |  2 +-
 .../GridCacheTxConcurrentGetAbstractTest.java   |  2 +-
 .../cache/GridCacheTxMultiNodeAbstractTest.java |  2 +-
 .../GridCacheTxReentryAbstractSelfTest.java     |  2 +-
 .../GridCacheVariableTopologySelfTest.java      |  2 +-
 ...BehindStorePartitionedMultiNodeSelfTest.java |  2 +-
 .../GridCacheAtomicLongApiSelfTest.java         |  2 +-
 ...CacheAtomicReferenceApiSelfAbstractTest.java |  2 +-
 ...cheAtomicReferenceMultiNodeAbstractTest.java |  2 +-
 ...idCacheAtomicStampedApiSelfAbstractTest.java |  2 +-
 .../GridCacheCountDownLatchSelfTest.java        |  2 +-
 .../GridCacheQueueApiSelfAbstractTest.java      |  2 +-
 ...ridCacheQueueJoinedNodeSelfAbstractTest.java |  2 +-
 ...GridCacheQueueMultiNodeAbstractSelfTest.java |  2 +-
 ...dCacheQueueMultiNodeConsistencySelfTest.java |  2 +-
 ...CacheQueueRotativeMultiNodeAbstractTest.java |  2 +-
 .../GridCacheSequenceApiSelfAbstractTest.java   |  2 +-
 ...dCacheSequenceMultiNodeAbstractSelfTest.java |  2 +-
 ...titionedAtomicSequenceMultiThreadedTest.java |  2 +-
 ...GridCachePartitionedNodeRestartSelfTest.java |  2 +-
 ...idCachePartitionedNodeRestartTxSelfTest.java |  2 +-
 ...PartitionedQueueCreateMultiNodeSelfTest.java |  2 +-
 ...dCachePartitionedQueueEntryMoveSelfTest.java |  2 +-
 .../GridCacheAbstractJobExecutionTest.java      |  2 +-
 .../GridCacheAbstractNodeRestartSelfTest.java   |  2 +-
 .../GridCacheAbstractPrimarySyncSelfTest.java   |  2 +-
 .../GridCacheBasicOpAbstractTest.java           |  2 +-
 .../distributed/GridCacheLockAbstractTest.java  |  2 +-
 .../GridCacheMultiNodeAbstractTest.java         |  2 +-
 .../GridCacheMultiNodeLockAbstractTest.java     |  2 +-
 ...dCacheMultithreadedFailoverAbstractTest.java |  2 +-
 .../GridCacheNodeFailureAbstractTest.java       |  2 +-
 ...dCachePartitionedAffinityFilterSelfTest.java |  2 +-
 ...chePartitionedReloadAllAbstractSelfTest.java |  2 +-
 .../GridCachePreloadEventsAbstractSelfTest.java |  2 +-
 .../GridCachePreloadLifecycleAbstractTest.java  |  2 +-
 ...GridCachePreloadRestartAbstractSelfTest.java |  2 +-
 .../GridCacheTransformEventSelfTest.java        |  2 +-
 ...cheTxConsistencyRestartAbstractSelfTest.java |  2 +-
 ...heAbstractTransformWriteThroughSelfTest.java |  2 +-
 .../dht/GridCacheColocatedDebugTest.java        |  2 +-
 ...eColocatedOptimisticTransactionSelfTest.java |  2 +-
 ...dCacheColocatedTxSingleThreadedSelfTest.java |  2 +-
 .../dht/GridCacheDhtEntrySelfTest.java          |  2 +-
 ...GridCacheDhtEvictionNearReadersSelfTest.java |  2 +-
 .../dht/GridCacheDhtEvictionSelfTest.java       |  2 +-
 .../GridCacheDhtEvictionsDisabledSelfTest.java  |  2 +-
 .../dht/GridCacheDhtInternalEntrySelfTest.java  |  2 +-
 .../dht/GridCacheDhtMappingSelfTest.java        |  2 +-
 .../dht/GridCacheDhtPreloadBigDataSelfTest.java |  2 +-
 .../dht/GridCacheDhtPreloadDelayedSelfTest.java |  2 +-
 .../GridCacheDhtPreloadDisabledSelfTest.java    |  2 +-
 .../GridCacheDhtPreloadMessageCountTest.java    |  2 +-
 ...ridCacheDhtPreloadMultiThreadedSelfTest.java |  2 +-
 .../dht/GridCacheDhtPreloadPutGetSelfTest.java  |  2 +-
 .../dht/GridCacheDhtPreloadSelfTest.java        |  2 +-
 .../GridCacheDhtPreloadStartStopSelfTest.java   |  2 +-
 .../dht/GridCacheDhtPreloadUnloadSelfTest.java  |  2 +-
 ...dCachePartitionedTopologyChangeSelfTest.java |  2 +-
 ...ridCachePartitionedUnloadEventsSelfTest.java |  2 +-
 ...eAtomicInvalidPartitionHandlingSelfTest.java |  2 +-
 ...unctionExcludeNeighborsAbstractSelfTest.java |  2 +-
 .../near/GridCacheGetStoreErrorSelfTest.java    |  2 +-
 .../near/GridCacheNearEvictionSelfTest.java     |  2 +-
 .../near/GridCacheNearMultiGetSelfTest.java     |  2 +-
 .../near/GridCacheNearMultiNodeSelfTest.java    |  2 +-
 .../near/GridCacheNearOnlyTopologySelfTest.java |  2 +-
 .../GridCacheNearReaderPreloadSelfTest.java     |  4 +-
 .../near/GridCacheNearReadersSelfTest.java      |  2 +-
 .../near/GridCacheNearTxMultiNodeSelfTest.java  |  2 +-
 ...AffinityExcludeNeighborsPerformanceTest.java |  2 +-
 ...rtitionedAffinityHashIdResolverSelfTest.java |  2 +-
 .../GridCachePartitionedAffinitySelfTest.java   |  2 +-
 ...ePartitionedBasicStoreMultiNodeSelfTest.java |  2 +-
 .../GridCachePartitionedEvictionSelfTest.java   |  2 +-
 ...titionedExplicitLockNodeFailureSelfTest.java |  2 +-
 ...GridCachePartitionedFilteredPutSelfTest.java |  2 +-
 .../GridCachePartitionedLoadCacheSelfTest.java  |  2 +-
 ...achePartitionedMultiNodeCounterSelfTest.java |  2 +-
 ...ePartitionedMultiThreadedPutGetSelfTest.java |  2 +-
 ...hePartitionedQueryMultiThreadedSelfTest.java |  2 +-
 .../GridCachePartitionedStorePutSelfTest.java   |  2 +-
 ...CachePartitionedTxMultiThreadedSelfTest.java |  2 +-
 .../GridCachePartitionedTxSalvageSelfTest.java  |  2 +-
 ...achePartitionedTxSingleThreadedSelfTest.java |  2 +-
 .../GridCachePartitionedTxTimeoutSelfTest.java  |  2 +-
 .../near/GridPartitionedBackupLoadSelfTest.java |  2 +-
 .../GridCacheReplicatedInvalidateSelfTest.java  |  2 +-
 ...dCacheReplicatedTxMultiThreadedSelfTest.java |  2 +-
 ...CacheReplicatedTxSingleThreadedSelfTest.java |  2 +-
 .../GridCacheReplicatedTxTimeoutSelfTest.java   |  2 +-
 ...idCacheReplicatedUnswapAdvancedSelfTest.java |  2 +-
 .../GridCacheSyncReplicatedPreloadSelfTest.java |  2 +-
 .../GridCacheReplicatedPreloadSelfTest.java     |  2 +-
 ...eplicatedPreloadStartStopEventsSelfTest.java |  2 +-
 ...heConcurrentEvictionConsistencySelfTest.java |  2 +-
 .../GridCacheConcurrentEvictionsSelfTest.java   |  2 +-
 .../GridCacheDistributedEvictionsSelfTest.java  |  2 +-
 .../GridCacheEmptyEntriesAbstractSelfTest.java  |  4 +-
 .../eviction/GridCacheEvictionAbstractTest.java |  2 +-
 .../GridCacheEvictionFilterSelfTest.java        |  2 +-
 .../GridCacheEvictionLockUnlockSelfTest.java    |  2 +-
 .../GridCacheEvictionTouchSelfTest.java         |  2 +-
 .../GridCacheLruNearEvictionPolicySelfTest.java |  2 +-
 ...heNearOnlyLruNearEvictionPolicySelfTest.java |  2 +-
 .../GridCacheSwapScanQueryAbstractSelfTest.java |  2 +-
 ...ridCacheContinuousQueryAbstractSelfTest.java |  2 +-
 ...dCacheAbstractReduceFieldsQuerySelfTest.java |  2 +-
 .../clock/GridTimeSyncProcessorSelfTest.java    |  2 +-
 .../closure/GridClosureProcessorSelfTest.java   |  2 +-
 .../dataload/GridDataLoaderImplSelfTest.java    |  2 +-
 .../dataload/GridDataLoaderPerformanceTest.java |  2 +-
 .../GridDataLoaderProcessorSelfTest.java        |  2 +-
 .../ggfs/GridGgfsDataManagerSelfTest.java       |  2 +-
 .../ggfs/GridGgfsMetaManagerSelfTest.java       |  2 +-
 .../ggfs/GridGgfsMetricsSelfTest.java           |  2 +-
 .../ggfs/GridGgfsProcessorSelfTest.java         |  2 +-
 .../GridGgfsProcessorValidationSelfTest.java    |  2 +-
 ...IpcEndpointRegistrationAbstractSelfTest.java |  2 +-
 .../processors/ggfs/GridGgfsSizeSelfTest.java   |  2 +-
 .../ggfs/GridGgfsStreamsSelfTest.java           |  2 +-
 .../processors/ggfs/GridGgfsTaskSelfTest.java   |  2 +-
 .../GridGgfsAbstractRecordResolverSelfTest.java |  2 +-
 .../GridServiceProcessorAbstractSelfTest.java   |  2 +-
 .../streamer/GridStreamerEvictionSelfTest.java  |  2 +-
 .../streamer/GridStreamerFailoverSelfTest.java  |  2 +-
 .../streamer/GridStreamerSelfTest.java          |  2 +-
 .../grid/messaging/GridMessagingSelfTest.java   |  2 +-
 .../GridP2PContinuousDeploymentSelfTest.java    |  2 +-
 .../p2p/GridP2PDoubleDeploymentSelfTest.java    |  2 +-
 .../GridP2PMissedResourceCacheSizeSelfTest.java |  2 +-
 .../tcp/GridTcpClientDiscoverySelfTest.java     |  2 +-
 .../GridTcpDiscoveryConcurrentStartTest.java    |  2 +-
 ...GridTcpDiscoveryMarshallerCheckSelfTest.java |  2 +-
 .../tcp/GridTcpDiscoveryMultiThreadedTest.java  |  2 +-
 .../GridTcpDiscoverySpiRandomStartStopTest.java |  2 +-
 .../tcp/GridTcpDiscoverySpiSelfTest.java        |  2 +-
 .../GridTcpDiscoverySpiStartStopSelfTest.java   |  2 +-
 .../GridTcpDiscoverySpiWildcardSelfTest.java    |  2 +-
 ...ridTcpDiscoveryIpFinderAbstractSelfTest.java |  2 +-
 ...artupWithSpecifiedWorkDirectorySelfTest.java |  2 +-
 ...tartupWithUndefinedGridGainHomeSelfTest.java |  2 +-
 .../grid/util/GridTopologyHeapSizeSelfTest.java |  2 +-
 .../loadtests/GridCacheMultiNodeLoadTest.java   |  2 +-
 ...ridCacheAffinityTransactionsOffHeapTest.java |  2 +-
 .../communication/GridIoManagerBenchmark0.java  |  2 +-
 .../GridCachePartitionedAtomicLongLoadTest.java |  2 +-
 .../swap/GridSwapEvictAllBenchmark.java         |  2 +-
 .../junits/spi/GridSpiAbstractTest.java         |  2 +-
 ...dGgfsHadoop20FileSystemAbstractSelfTest.java |  2 +-
 ...ridGgfsHadoopFileSystemAbstractSelfTest.java |  2 +-
 ...idGgfsHadoopFileSystemHandshakeSelfTest.java |  2 +-
 ...ridGgfsHadoopFileSystemIpcCacheSelfTest.java |  2 +-
 .../ggfs/GridGgfsNearOnlyMultiNodeSelfTest.java |  2 +-
 .../hibernate/GridHibernateL2CacheSelfTest.java |  2 +-
 .../GridCacheAbstractFieldsQuerySelfTest.java   |  2 +-
 .../cache/GridCacheAbstractQuerySelfTest.java   |  2 +-
 .../cache/GridCacheCrossCacheQuerySelfTest.java |  2 +-
 .../cache/GridCacheOffHeapAndSwapSelfTest.java  |  2 +-
 .../cache/GridCacheQueryLoadSelfTest.java       |  2 +-
 .../cache/GridCacheQueryMetricsSelfTest.java    |  2 +-
 .../GridCacheQueryMultiThreadedSelfTest.java    |  2 +-
 .../GridCacheQueryUserResourceSelfTest.java     |  2 +-
 .../GridCacheSqlQueryMultiThreadedSelfTest.java |  2 +-
 .../processors/cache/GridCacheSwapSelfTest.java |  2 +-
 .../cache/GridIndexingWithNoopSwapSelfTest.java |  2 +-
 ...idCachePartitionedHitsAndMissesSelfTest.java |  2 +-
 .../near/GridCacheQueryNodeRestartSelfTest.java |  2 +-
 .../spring/GridSpringCacheManagerSelfTest.java  |  2 +-
 .../GridSpringBeanSerializationSelfTest.java    |  2 +-
 .../p2p/GridP2PUserVersionChangeSelfTest.java   |  2 +-
 263 files changed, 440 insertions(+), 444 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/805377cc/modules/aws/src/main/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/s3/GridTcpDiscoveryS3IpFinder.java
----------------------------------------------------------------------
diff --git a/modules/aws/src/main/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/s3/GridTcpDiscoveryS3IpFinder.java b/modules/aws/src/main/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/s3/GridTcpDiscoveryS3IpFinder.java
index db0943a..69f9aa6 100644
--- a/modules/aws/src/main/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/s3/GridTcpDiscoveryS3IpFinder.java
+++ b/modules/aws/src/main/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/s3/GridTcpDiscoveryS3IpFinder.java
@@ -48,12 +48,12 @@ import java.util.concurrent.atomic.*;
  * like the following: {@code 192.168.1.136#1001}.
  * <p>
  * Note that storing data in AWS S3 service will result in charges to your AWS account.
- * Choose another implementation of {@link GridTcpDiscoveryIpFinder} for local
+ * Choose another implementation of {@link org.gridgain.grid.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder} for local
  * or home network tests.
  * <p>
- * Note that this finder is shared by default (see {@link GridTcpDiscoveryIpFinder#isShared()}.
+ * Note that this finder is shared by default (see {@link org.gridgain.grid.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder#isShared()}.
  */
-public class GridTcpDiscoveryS3IpFinder extends GridTcpDiscoveryIpFinderAdapter {
+public class GridTcpDiscoveryS3IpFinder extends TcpDiscoveryIpFinderAdapter {
     /** Delimiter to use in S3 entries name. */
     public static final String DELIM = "#";
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/805377cc/modules/core/src/main/java/org/gridgain/grid/GridBasicWarmupClosure.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/GridBasicWarmupClosure.java b/modules/core/src/main/java/org/gridgain/grid/GridBasicWarmupClosure.java
index 684e585..d692178 100644
--- a/modules/core/src/main/java/org/gridgain/grid/GridBasicWarmupClosure.java
+++ b/modules/core/src/main/java/org/gridgain/grid/GridBasicWarmupClosure.java
@@ -188,7 +188,7 @@ public class GridBasicWarmupClosure implements IgniteInClosure<IgniteConfigurati
         try {
             System.setProperty(IgniteSystemProperties.GG_UPDATE_NOTIFIER, "false");
 
-            GridTcpDiscoveryIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(true);
+            TcpDiscoveryIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(true);
 
             for (int i = 0; i < gridCnt; i++) {
                 IgniteConfiguration cfg0 = new IgniteConfiguration(cfg);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/805377cc/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/TcpClientDiscoverySpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/TcpClientDiscoverySpi.java b/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/TcpClientDiscoverySpi.java
index 33ec848..ff50969 100644
--- a/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/TcpClientDiscoverySpi.java
+++ b/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/TcpClientDiscoverySpi.java
@@ -16,7 +16,6 @@ import org.apache.ignite.spi.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.spi.discovery.*;
 import org.gridgain.grid.spi.discovery.tcp.internal.*;
-import org.gridgain.grid.spi.discovery.tcp.ipfinder.*;
 import org.gridgain.grid.spi.discovery.tcp.ipfinder.multicast.*;
 import org.gridgain.grid.spi.discovery.tcp.messages.*;
 import org.gridgain.grid.util.typedef.*;
@@ -38,7 +37,7 @@ import static org.gridgain.grid.spi.discovery.tcp.messages.GridTcpDiscoveryHeart
  * <p>
  * This discovery SPI requires at least on server node configured with
  * {@link TcpDiscoverySpi}. It will try to connect to random IP taken from
- * {@link GridTcpDiscoveryIpFinder} which should point to one of these server
+ * {@link org.gridgain.grid.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder} which should point to one of these server
  * nodes and will maintain connection only with this node (will not enter the ring).
  * If this connection is broken, it will try to reconnect using addresses from
  * the same IP finder.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/805377cc/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/TcpClientDiscoverySpiMBean.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/TcpClientDiscoverySpiMBean.java b/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/TcpClientDiscoverySpiMBean.java
index 5d45ec7..38e8e0c 100644
--- a/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/TcpClientDiscoverySpiMBean.java
+++ b/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/TcpClientDiscoverySpiMBean.java
@@ -11,7 +11,6 @@ package org.gridgain.grid.spi.discovery.tcp;
 
 import org.apache.ignite.mbean.*;
 import org.apache.ignite.spi.*;
-import org.gridgain.grid.spi.discovery.tcp.ipfinder.*;
 
 import java.util.*;
 
@@ -68,7 +67,7 @@ public interface TcpClientDiscoverySpiMBean extends IgniteSpiManagementMBean {
     public long getHeartbeatFrequency();
 
     /**
-     * Gets {@link GridTcpDiscoveryIpFinder} (string representation).
+     * Gets {@link org.gridgain.grid.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder} (string representation).
      *
      * @return IPFinder (string representation).
      */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/805377cc/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/TcpDiscoverySpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/TcpDiscoverySpi.java b/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/TcpDiscoverySpi.java
index 4541e94..beb725d 100644
--- a/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/TcpDiscoverySpi.java
+++ b/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/TcpDiscoverySpi.java
@@ -22,7 +22,6 @@ import org.gridgain.grid.kernal.managers.security.*;
 import org.gridgain.grid.security.*;
 import org.gridgain.grid.spi.discovery.*;
 import org.gridgain.grid.spi.discovery.tcp.internal.*;
-import org.gridgain.grid.spi.discovery.tcp.ipfinder.*;
 import org.gridgain.grid.spi.discovery.tcp.ipfinder.jdbc.*;
 import org.gridgain.grid.spi.discovery.tcp.ipfinder.multicast.*;
 import org.gridgain.grid.spi.discovery.tcp.ipfinder.sharedfs.*;
@@ -57,7 +56,7 @@ import static org.gridgain.grid.spi.discovery.tcp.messages.GridTcpDiscoveryStatu
  * done across it.
  * <p>
  * At startup SPI tries to send messages to random IP taken from
- * {@link GridTcpDiscoveryIpFinder} about self start (stops when send succeeds)
+ * {@link org.gridgain.grid.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder} about self start (stops when send succeeds)
  * and then this info goes to coordinator. When coordinator processes join request
  * and issues node added messages and all other nodes then receive info about new node.
  * <h1 class="header">Configuration</h1>
@@ -67,7 +66,7 @@ import static org.gridgain.grid.spi.discovery.tcp.messages.GridTcpDiscoveryStatu
  * The following configuration parameters are optional:
  * <ul>
  * <li>IP finder to share info about nodes IP addresses
- * (see {@link #setIpFinder(GridTcpDiscoveryIpFinder)}).
+ * (see {@link #setIpFinder(org.gridgain.grid.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder)}).
  * See the following IP finder implementations for details on configuration:
  * <ul>
  * <li>{@link GridTcpDiscoverySharedFsIpFinder}</li>
@@ -365,7 +364,7 @@ public class TcpDiscoverySpi extends TcpDiscoverySpiAdapter implements TcpDiscov
      *
      * @param joinTimeout Join timeout ({@code 0} means wait forever).
      *
-     * @see GridTcpDiscoveryIpFinder#isShared()
+     * @see org.gridgain.grid.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder#isShared()
      */
     @IgniteSpiConfiguration(optional = true)
     public void setJoinTimeout(long joinTimeout) {
@@ -1389,7 +1388,7 @@ public class TcpDiscoverySpi extends TcpDiscoverySpiAdapter implements TcpDiscov
 
     /**
      * Tries to send join request message to a random node presenting in topology.
-     * Address is provided by {@link GridTcpDiscoveryIpFinder} and message is
+     * Address is provided by {@link org.gridgain.grid.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder} and message is
      * sent to first node connection succeeded to.
      *
      * @return {@code true} if send succeeded.
@@ -2272,7 +2271,7 @@ public class TcpDiscoverySpi extends TcpDiscoverySpiAdapter implements TcpDiscov
      * addresses of the nodes that has left the topology.
      * <p>
      * This thread should run only on coordinator node and will clean IP finder
-     * if and only if {@link GridTcpDiscoveryIpFinder#isShared()} is {@code true}.
+     * if and only if {@link org.gridgain.grid.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder#isShared()} is {@code true}.
      */
     private class IpFinderCleaner extends IgniteSpiThread {
         /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/805377cc/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/TcpDiscoverySpiAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/TcpDiscoverySpiAdapter.java b/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/TcpDiscoverySpiAdapter.java
index 2945352..03b422a 100644
--- a/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/TcpDiscoverySpiAdapter.java
+++ b/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/TcpDiscoverySpiAdapter.java
@@ -74,7 +74,7 @@ abstract class TcpDiscoverySpiAdapter extends IgniteSpiAdapter implements Discov
     protected String locAddr;
 
     /** IP finder. */
-    protected GridTcpDiscoveryIpFinder ipFinder;
+    protected TcpDiscoveryIpFinder ipFinder;
 
     /** Socket operations timeout. */
     protected long sockTimeout = DFLT_SOCK_TIMEOUT;
@@ -176,7 +176,7 @@ abstract class TcpDiscoverySpiAdapter extends IgniteSpiAdapter implements Discov
      *
      * @return IP finder for IP addresses sharing and storing.
      */
-    public GridTcpDiscoveryIpFinder getIpFinder() {
+    public TcpDiscoveryIpFinder getIpFinder() {
         return ipFinder;
     }
 
@@ -188,7 +188,7 @@ abstract class TcpDiscoverySpiAdapter extends IgniteSpiAdapter implements Discov
      * @param ipFinder IP finder.
      */
     @IgniteSpiConfiguration(optional = true)
-    public void setIpFinder(GridTcpDiscoveryIpFinder ipFinder) {
+    public void setIpFinder(TcpDiscoveryIpFinder ipFinder) {
         this.ipFinder = ipFinder;
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/805377cc/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/TcpDiscoverySpiMBean.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/TcpDiscoverySpiMBean.java b/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/TcpDiscoverySpiMBean.java
index 0f9212d..6e6a33f 100644
--- a/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/TcpDiscoverySpiMBean.java
+++ b/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/TcpDiscoverySpiMBean.java
@@ -11,7 +11,6 @@ package org.gridgain.grid.spi.discovery.tcp;
 
 import org.apache.ignite.mbean.*;
 import org.apache.ignite.spi.*;
-import org.gridgain.grid.spi.discovery.tcp.ipfinder.*;
 import org.jetbrains.annotations.*;
 
 import java.util.*;
@@ -37,7 +36,7 @@ public interface TcpDiscoverySpiMBean extends IgniteSpiManagementMBean {
     public String getSpiState();
 
     /**
-     * Gets {@link GridTcpDiscoveryIpFinder} (string representation).
+     * Gets {@link org.gridgain.grid.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder} (string representation).
      *
      * @return IPFinder (string representation).
      */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/805377cc/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/GridTcpDiscoveryIpFinder.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/GridTcpDiscoveryIpFinder.java b/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/GridTcpDiscoveryIpFinder.java
deleted file mode 100644
index 4622122..0000000
--- a/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/GridTcpDiscoveryIpFinder.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/* @java.file.header */
-
-/*  _________        _____ __________________        _____
- *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
- *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
- *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
- *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
- */
-
-package org.gridgain.grid.spi.discovery.tcp.ipfinder;
-
-import org.apache.ignite.spi.*;
-
-import java.net.*;
-import java.util.*;
-
-/**
- * IP finder interface for {@link org.gridgain.grid.spi.discovery.tcp.TcpDiscoverySpi}.
- */
-public interface GridTcpDiscoveryIpFinder {
-    /**
-     * Callback invoked when SPI context is initialized after {@link org.gridgain.grid.spi.discovery.tcp.TcpDiscoverySpi#spiStart(String)}
-     * method is completed, SPI context can be stored for future access.
-     *
-     * @param spiCtx Spi context.
-     * @throws org.apache.ignite.spi.IgniteSpiException In case of error.
-     */
-    public void onSpiContextInitialized(IgniteSpiContext spiCtx) throws IgniteSpiException;
-
-    /**
-     * Callback invoked prior to stopping grid before SPI context is destroyed.
-     * Note that invoking SPI context after this callback is complete is considered
-     * illegal and may produce unknown results.
-     */
-    public void onSpiContextDestroyed();
-
-    /**
-     * Initializes addresses discovery SPI binds to.
-     *
-     * @param addrs Addresses discovery SPI binds to.
-     * @throws org.apache.ignite.spi.IgniteSpiException In case of error.
-     */
-    public void initializeLocalAddresses(Collection<InetSocketAddress> addrs) throws IgniteSpiException;
-
-    /**
-     * Gets all addresses registered in this finder.
-     *
-     * @return All known addresses, potentially empty, but never {@code null}.
-     * @throws org.apache.ignite.spi.IgniteSpiException In case of error.
-     */
-    public Collection<InetSocketAddress> getRegisteredAddresses() throws IgniteSpiException;
-
-    /**
-     * Checks whether IP finder is shared or not.
-     * <p>
-     * If it is shared then only coordinator can unregister addresses.
-     * <p>
-     * All nodes should register their address themselves, as early as possible on node start.
-     *
-     * @return {@code true} if IP finder is shared.
-     */
-    public boolean isShared();
-
-    /**
-     * Registers new addresses.
-     * <p>
-     * Implementation should accept duplicates quietly, but should not register address if it
-     * is already registered.
-     *
-     * @param addrs Addresses to register. Not {@code null} and not empty.
-     * @throws org.apache.ignite.spi.IgniteSpiException In case of error.
-     */
-    public void registerAddresses(Collection<InetSocketAddress> addrs) throws IgniteSpiException;
-
-    /**
-     * Unregisters provided addresses.
-     * <p>
-     * Implementation should accept addresses that are currently not
-     * registered quietly (just no-op).
-     *
-     * @param addrs Addresses to unregister. Not {@code null} and not empty.
-     * @throws org.apache.ignite.spi.IgniteSpiException In case of error.
-     */
-    public void unregisterAddresses(Collection<InetSocketAddress> addrs) throws IgniteSpiException;
-
-    /**
-     * Closes this IP finder and releases any system resources associated with it.
-     */
-    public void close();
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/805377cc/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/GridTcpDiscoveryIpFinderAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/GridTcpDiscoveryIpFinderAdapter.java b/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/GridTcpDiscoveryIpFinderAdapter.java
deleted file mode 100644
index 65bd879..0000000
--- a/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/GridTcpDiscoveryIpFinderAdapter.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/* @java.file.header */
-
-/*  _________        _____ __________________        _____
- *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
- *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
- *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
- *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
- */
-
-package org.gridgain.grid.spi.discovery.tcp.ipfinder;
-
-import org.apache.ignite.spi.*;
-import org.gridgain.grid.util.tostring.*;
-import org.gridgain.grid.util.typedef.internal.*;
-
-import java.net.*;
-import java.util.*;
-
-/**
- * IP finder interface implementation adapter.
- */
-public abstract class GridTcpDiscoveryIpFinderAdapter implements GridTcpDiscoveryIpFinder {
-    /** Shared flag. */
-    private boolean shared;
-
-    /** SPI context. */
-    @GridToStringExclude
-    private volatile IgniteSpiContext spiCtx;
-
-    /** {@inheritDoc} */
-    @Override public void onSpiContextInitialized(IgniteSpiContext spiCtx) throws IgniteSpiException {
-        this.spiCtx = spiCtx;
-    }
-
-    /** {@inheritDoc} */
-    @Override public void onSpiContextDestroyed() {
-        spiCtx = null;
-    }
-
-    /** {@inheritDoc} */
-    @Override public void initializeLocalAddresses(Collection<InetSocketAddress> addrs) throws IgniteSpiException {
-        registerAddresses(addrs);
-    }
-
-    /** {@inheritDoc} */
-    @Override public boolean isShared() {
-        return shared;
-    }
-
-    /**
-     * Sets shared flag. If {@code true} then it is expected that IP addresses registered
-     * with IP finder will be seen by IP finders on all other nodes.
-     *
-     * @param shared {@code true} if this IP finder is shared.
-     */
-    @IgniteSpiConfiguration(optional = true)
-    public void setShared(boolean shared) {
-        this.shared = shared;
-    }
-
-    /** {@inheritDoc} */
-    @Override public String toString() {
-        return S.toString(GridTcpDiscoveryIpFinderAdapter.class, this);
-    }
-
-    /** {@inheritDoc} */
-    @Override public void close() {
-        // No-op.
-    }
-
-    /**
-     * @return SPI context.
-     */
-    protected IgniteSpiContext spiContext() {
-        return spiCtx;
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/805377cc/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/TcpDiscoveryIpFinder.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/TcpDiscoveryIpFinder.java b/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/TcpDiscoveryIpFinder.java
new file mode 100644
index 0000000..b5ff462
--- /dev/null
+++ b/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/TcpDiscoveryIpFinder.java
@@ -0,0 +1,90 @@
+/* @java.file.header */
+
+/*  _________        _____ __________________        _____
+ *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
+ *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
+ *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
+ *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
+ */
+
+package org.gridgain.grid.spi.discovery.tcp.ipfinder;
+
+import org.apache.ignite.spi.*;
+
+import java.net.*;
+import java.util.*;
+
+/**
+ * IP finder interface for {@link org.gridgain.grid.spi.discovery.tcp.TcpDiscoverySpi}.
+ */
+public interface TcpDiscoveryIpFinder {
+    /**
+     * Callback invoked when SPI context is initialized after {@link org.gridgain.grid.spi.discovery.tcp.TcpDiscoverySpi#spiStart(String)}
+     * method is completed, SPI context can be stored for future access.
+     *
+     * @param spiCtx Spi context.
+     * @throws org.apache.ignite.spi.IgniteSpiException In case of error.
+     */
+    public void onSpiContextInitialized(IgniteSpiContext spiCtx) throws IgniteSpiException;
+
+    /**
+     * Callback invoked prior to stopping grid before SPI context is destroyed.
+     * Note that invoking SPI context after this callback is complete is considered
+     * illegal and may produce unknown results.
+     */
+    public void onSpiContextDestroyed();
+
+    /**
+     * Initializes addresses discovery SPI binds to.
+     *
+     * @param addrs Addresses discovery SPI binds to.
+     * @throws org.apache.ignite.spi.IgniteSpiException In case of error.
+     */
+    public void initializeLocalAddresses(Collection<InetSocketAddress> addrs) throws IgniteSpiException;
+
+    /**
+     * Gets all addresses registered in this finder.
+     *
+     * @return All known addresses, potentially empty, but never {@code null}.
+     * @throws org.apache.ignite.spi.IgniteSpiException In case of error.
+     */
+    public Collection<InetSocketAddress> getRegisteredAddresses() throws IgniteSpiException;
+
+    /**
+     * Checks whether IP finder is shared or not.
+     * <p>
+     * If it is shared then only coordinator can unregister addresses.
+     * <p>
+     * All nodes should register their address themselves, as early as possible on node start.
+     *
+     * @return {@code true} if IP finder is shared.
+     */
+    public boolean isShared();
+
+    /**
+     * Registers new addresses.
+     * <p>
+     * Implementation should accept duplicates quietly, but should not register address if it
+     * is already registered.
+     *
+     * @param addrs Addresses to register. Not {@code null} and not empty.
+     * @throws org.apache.ignite.spi.IgniteSpiException In case of error.
+     */
+    public void registerAddresses(Collection<InetSocketAddress> addrs) throws IgniteSpiException;
+
+    /**
+     * Unregisters provided addresses.
+     * <p>
+     * Implementation should accept addresses that are currently not
+     * registered quietly (just no-op).
+     *
+     * @param addrs Addresses to unregister. Not {@code null} and not empty.
+     * @throws org.apache.ignite.spi.IgniteSpiException In case of error.
+     */
+    public void unregisterAddresses(Collection<InetSocketAddress> addrs) throws IgniteSpiException;
+
+    /**
+     * Closes this IP finder and releases any system resources associated with it.
+     */
+    public void close();
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/805377cc/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/TcpDiscoveryIpFinderAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/TcpDiscoveryIpFinderAdapter.java b/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/TcpDiscoveryIpFinderAdapter.java
new file mode 100644
index 0000000..27eb5ed
--- /dev/null
+++ b/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/TcpDiscoveryIpFinderAdapter.java
@@ -0,0 +1,77 @@
+/* @java.file.header */
+
+/*  _________        _____ __________________        _____
+ *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
+ *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
+ *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
+ *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
+ */
+
+package org.gridgain.grid.spi.discovery.tcp.ipfinder;
+
+import org.apache.ignite.spi.*;
+import org.gridgain.grid.util.tostring.*;
+import org.gridgain.grid.util.typedef.internal.*;
+
+import java.net.*;
+import java.util.*;
+
+/**
+ * IP finder interface implementation adapter.
+ */
+public abstract class TcpDiscoveryIpFinderAdapter implements TcpDiscoveryIpFinder {
+    /** Shared flag. */
+    private boolean shared;
+
+    /** SPI context. */
+    @GridToStringExclude
+    private volatile IgniteSpiContext spiCtx;
+
+    /** {@inheritDoc} */
+    @Override public void onSpiContextInitialized(IgniteSpiContext spiCtx) throws IgniteSpiException {
+        this.spiCtx = spiCtx;
+    }
+
+    /** {@inheritDoc} */
+    @Override public void onSpiContextDestroyed() {
+        spiCtx = null;
+    }
+
+    /** {@inheritDoc} */
+    @Override public void initializeLocalAddresses(Collection<InetSocketAddress> addrs) throws IgniteSpiException {
+        registerAddresses(addrs);
+    }
+
+    /** {@inheritDoc} */
+    @Override public boolean isShared() {
+        return shared;
+    }
+
+    /**
+     * Sets shared flag. If {@code true} then it is expected that IP addresses registered
+     * with IP finder will be seen by IP finders on all other nodes.
+     *
+     * @param shared {@code true} if this IP finder is shared.
+     */
+    @IgniteSpiConfiguration(optional = true)
+    public void setShared(boolean shared) {
+        this.shared = shared;
+    }
+
+    /** {@inheritDoc} */
+    @Override public String toString() {
+        return S.toString(TcpDiscoveryIpFinderAdapter.class, this);
+    }
+
+    /** {@inheritDoc} */
+    @Override public void close() {
+        // No-op.
+    }
+
+    /**
+     * @return SPI context.
+     */
+    protected IgniteSpiContext spiContext() {
+        return spiCtx;
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/805377cc/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/jdbc/GridTcpDiscoveryJdbcIpFinder.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/jdbc/GridTcpDiscoveryJdbcIpFinder.java b/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/jdbc/GridTcpDiscoveryJdbcIpFinder.java
index c721ea5..0e1a15b 100644
--- a/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/jdbc/GridTcpDiscoveryJdbcIpFinder.java
+++ b/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/jdbc/GridTcpDiscoveryJdbcIpFinder.java
@@ -43,7 +43,7 @@ import static java.sql.Connection.*;
  * <p>
  * The database will contain 1 table which will hold IP addresses.
  */
-public class GridTcpDiscoveryJdbcIpFinder extends GridTcpDiscoveryIpFinderAdapter {
+public class GridTcpDiscoveryJdbcIpFinder extends TcpDiscoveryIpFinderAdapter {
     /** Query to get addresses. */
     public static final String GET_ADDRS_QRY = "select hostname, port from tbl_addrs";
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/805377cc/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/sharedfs/GridTcpDiscoverySharedFsIpFinder.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/sharedfs/GridTcpDiscoverySharedFsIpFinder.java b/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/sharedfs/GridTcpDiscoverySharedFsIpFinder.java
index 8e1207a..3778c3f 100644
--- a/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/sharedfs/GridTcpDiscoverySharedFsIpFinder.java
+++ b/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/sharedfs/GridTcpDiscoverySharedFsIpFinder.java
@@ -41,9 +41,9 @@ import java.util.concurrent.atomic.*;
  * <p>
  * The directory will contain empty files named like the following 192.168.1.136#1001.
  * <p>
- * Note that this finder is shared by default (see {@link GridTcpDiscoveryIpFinder#isShared()}.
+ * Note that this finder is shared by default (see {@link org.gridgain.grid.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder#isShared()}.
  */
-public class GridTcpDiscoverySharedFsIpFinder extends GridTcpDiscoveryIpFinderAdapter {
+public class GridTcpDiscoverySharedFsIpFinder extends TcpDiscoveryIpFinderAdapter {
     /**
      * Default path for discovering of local nodes (testing only). Note that this path is relative to
      * {@code GRIDGAIN_HOME/work} folder if {@code GRIDGAIN_HOME} system or environment variable specified,

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/805377cc/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/vm/GridTcpDiscoveryVmIpFinder.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/vm/GridTcpDiscoveryVmIpFinder.java b/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/vm/GridTcpDiscoveryVmIpFinder.java
index 9482c33..f993de7 100644
--- a/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/vm/GridTcpDiscoveryVmIpFinder.java
+++ b/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/vm/GridTcpDiscoveryVmIpFinder.java
@@ -37,7 +37,7 @@ import static org.apache.ignite.IgniteSystemProperties.*;
  *      <li>Shared flag (see {@link #setShared(boolean)})</li>
  * </ul>
  */
-public class GridTcpDiscoveryVmIpFinder extends GridTcpDiscoveryIpFinderAdapter {
+public class GridTcpDiscoveryVmIpFinder extends TcpDiscoveryIpFinderAdapter {
     /** Grid logger. */
     @IgniteLoggerResource
     private IgniteLogger log;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/805377cc/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/GridOptimizedMarshallerTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/GridOptimizedMarshallerTest.java b/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/GridOptimizedMarshallerTest.java
index d17c792..7fbed15 100644
--- a/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/GridOptimizedMarshallerTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/GridOptimizedMarshallerTest.java
@@ -49,7 +49,7 @@ public class GridOptimizedMarshallerTest extends GridCommonAbstractTest {
 
         byte[] bytes = marsh.marshal(new GridTcpDiscoveryVmIpFinder());
 
-        GridTcpDiscoveryIpFinder ipFinder = marsh.unmarshal(bytes, null);
+        TcpDiscoveryIpFinder ipFinder = marsh.unmarshal(bytes, null);
 
         assertFalse(ipFinder.isShared());
 
@@ -68,7 +68,7 @@ public class GridOptimizedMarshallerTest extends GridCommonAbstractTest {
 
         marsh.setRequireSerializable(false);
 
-        GridTcpDiscoveryIpFinderAdapter ipFinder = new GridTcpDiscoveryIpFinderAdapter() {
+        TcpDiscoveryIpFinderAdapter ipFinder = new TcpDiscoveryIpFinderAdapter() {
             @Override public Collection<InetSocketAddress> getRegisteredAddresses() {
                 return null;
             }
@@ -103,7 +103,7 @@ public class GridOptimizedMarshallerTest extends GridCommonAbstractTest {
 
         byte[] bytes = marsh.marshal(new GridTestTcpDiscoveryIpFinderAdapter());
 
-        GridTcpDiscoveryIpFinder ipFinder = marsh.unmarshal(bytes, null);
+        TcpDiscoveryIpFinder ipFinder = marsh.unmarshal(bytes, null);
 
         assertFalse(ipFinder.isShared());
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/805377cc/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/GridTestTcpDiscoveryIpFinderAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/GridTestTcpDiscoveryIpFinderAdapter.java b/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/GridTestTcpDiscoveryIpFinderAdapter.java
index f62fd3f..26f0fc7 100644
--- a/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/GridTestTcpDiscoveryIpFinderAdapter.java
+++ b/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/GridTestTcpDiscoveryIpFinderAdapter.java
@@ -10,7 +10,7 @@
 package org.apache.ignite.marshaller.optimized;
 
 import org.apache.ignite.spi.IgniteSpiException;
-import org.gridgain.grid.spi.discovery.tcp.ipfinder.GridTcpDiscoveryIpFinderAdapter;
+import org.gridgain.grid.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinderAdapter;
 
 import java.net.InetSocketAddress;
 import java.util.Collection;
@@ -18,7 +18,7 @@ import java.util.Collection;
 /**
  * Test TCP discovery IP finder adapter.
  */
-public class GridTestTcpDiscoveryIpFinderAdapter extends GridTcpDiscoveryIpFinderAdapter {
+public class GridTestTcpDiscoveryIpFinderAdapter extends TcpDiscoveryIpFinderAdapter {
     /** {@inheritDoc} */
     @Override public Collection<InetSocketAddress> getRegisteredAddresses() throws IgniteSpiException {
         return null;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/805377cc/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/cache/GridCacheCheckpointSpiSecondCacheSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/cache/GridCacheCheckpointSpiSecondCacheSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/cache/GridCacheCheckpointSpiSecondCacheSelfTest.java
index d88886e..9058f8d 100644
--- a/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/cache/GridCacheCheckpointSpiSecondCacheSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/cache/GridCacheCheckpointSpiSecondCacheSelfTest.java
@@ -24,7 +24,7 @@ import static org.gridgain.grid.cache.GridCacheWriteSynchronizationMode.*;
  */
 public class GridCacheCheckpointSpiSecondCacheSelfTest extends GridCommonAbstractTest {
     /** IP finder. */
-    private static final GridTcpDiscoveryIpFinder IP_FINDER = new GridTcpDiscoveryVmIpFinder(true);
+    private static final TcpDiscoveryIpFinder IP_FINDER = new GridTcpDiscoveryVmIpFinder(true);
 
     /** Data cache name. */
     private static final String DATA_CACHE = null;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/805377cc/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridCacheDhtLockBackupSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridCacheDhtLockBackupSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridCacheDhtLockBackupSelfTest.java
index d890ee6..5d7c240 100644
--- a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridCacheDhtLockBackupSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridCacheDhtLockBackupSelfTest.java
@@ -40,7 +40,7 @@ import static org.gridgain.grid.cache.GridCacheWriteSynchronizationMode.*;
  */
 public class GridCacheDhtLockBackupSelfTest extends GridCommonAbstractTest {
     /** Ip-finder. */
-    private static GridTcpDiscoveryIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(true);
+    private static TcpDiscoveryIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(true);
 
     /** Communication spi for grid start. */
     private CommunicationSpi commSpi;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/805377cc/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridOrderedMessageCancelSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridOrderedMessageCancelSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridOrderedMessageCancelSelfTest.java
index 6d6e6ec..09b484c 100644
--- a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridOrderedMessageCancelSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridOrderedMessageCancelSelfTest.java
@@ -39,7 +39,7 @@ import static org.gridgain.grid.cache.GridCachePreloadMode.*;
  */
 public class GridOrderedMessageCancelSelfTest extends GridCommonAbstractTest {
     /** IP finder. */
-    private static final GridTcpDiscoveryIpFinder IP_FINDER = new GridTcpDiscoveryVmIpFinder(true);
+    private static final TcpDiscoveryIpFinder IP_FINDER = new GridTcpDiscoveryVmIpFinder(true);
 
     /** Cancel latch. */
     private static CountDownLatch cancelLatch;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/805377cc/modules/core/src/test/java/org/gridgain/grid/cache/affinity/fair/GridCachePartitionFairAffinityNodesSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/cache/affinity/fair/GridCachePartitionFairAffinityNodesSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/cache/affinity/fair/GridCachePartitionFairAffinityNodesSelfTest.java
index 3623a21..4184c89 100644
--- a/modules/core/src/test/java/org/gridgain/grid/cache/affinity/fair/GridCachePartitionFairAffinityNodesSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/cache/affinity/fair/GridCachePartitionFairAffinityNodesSelfTest.java
@@ -25,7 +25,7 @@ import java.util.*;
  */
 public class GridCachePartitionFairAffinityNodesSelfTest extends GridCommonAbstractTest {
     /** IP finder. */
-    private static final GridTcpDiscoveryIpFinder IP_FINDER = new GridTcpDiscoveryVmIpFinder(true);
+    private static final TcpDiscoveryIpFinder IP_FINDER = new GridTcpDiscoveryVmIpFinder(true);
 
     /** Number of backups. */
     private int backups;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/805377cc/modules/core/src/test/java/org/gridgain/grid/cache/store/jdbc/GridCacheJdbcBlobStoreMultithreadedSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/cache/store/jdbc/GridCacheJdbcBlobStoreMultithreadedSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/cache/store/jdbc/GridCacheJdbcBlobStoreMultithreadedSelfTest.java
index 921652d..1b9b49e 100644
--- a/modules/core/src/test/java/org/gridgain/grid/cache/store/jdbc/GridCacheJdbcBlobStoreMultithreadedSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/cache/store/jdbc/GridCacheJdbcBlobStoreMultithreadedSelfTest.java
@@ -35,7 +35,7 @@ import static org.gridgain.testframework.GridTestUtils.*;
  */
 public class GridCacheJdbcBlobStoreMultithreadedSelfTest extends GridCommonAbstractTest {
     /** IP finder. */
-    private static final GridTcpDiscoveryIpFinder IP_FINDER = new GridTcpDiscoveryVmIpFinder(true);
+    private static final TcpDiscoveryIpFinder IP_FINDER = new GridTcpDiscoveryVmIpFinder(true);
 
     /** Number of grids to start. */
     private static final int GRID_CNT = 5;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/805377cc/modules/core/src/test/java/org/gridgain/grid/ggfs/GridGgfsFragmentizerAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/ggfs/GridGgfsFragmentizerAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/ggfs/GridGgfsFragmentizerAbstractSelfTest.java
index 0ef209a..dfb9713 100644
--- a/modules/core/src/test/java/org/gridgain/grid/ggfs/GridGgfsFragmentizerAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/ggfs/GridGgfsFragmentizerAbstractSelfTest.java
@@ -27,7 +27,7 @@ import static org.gridgain.grid.cache.GridCacheMode.*;
  */
 public class GridGgfsFragmentizerAbstractSelfTest extends GridGgfsCommonAbstractTest {
     /** IP finder. */
-    private static final GridTcpDiscoveryIpFinder IP_FINDER = new GridTcpDiscoveryVmIpFinder(true);
+    private static final TcpDiscoveryIpFinder IP_FINDER = new GridTcpDiscoveryVmIpFinder(true);
 
     /** Test nodes count. */
     protected static final int NODE_CNT = 4;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/805377cc/modules/core/src/test/java/org/gridgain/grid/kernal/GridAffinityMappedTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridAffinityMappedTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridAffinityMappedTest.java
index 2aff782..82a9370 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridAffinityMappedTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridAffinityMappedTest.java
@@ -31,7 +31,7 @@ import static org.gridgain.grid.cache.GridCacheMode.*;
  */
 public class GridAffinityMappedTest extends GridCommonAbstractTest {
     /** VM ip finder for TCP discovery. */
-    private static GridTcpDiscoveryIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(true);
+    private static TcpDiscoveryIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(true);
 
     /**
      *

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/805377cc/modules/core/src/test/java/org/gridgain/grid/kernal/GridAffinityP2PSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridAffinityP2PSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridAffinityP2PSelfTest.java
index 7508d6e..b39beaf 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridAffinityP2PSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridAffinityP2PSelfTest.java
@@ -33,7 +33,7 @@ import static org.gridgain.grid.cache.GridCacheMode.*;
  */
 public class GridAffinityP2PSelfTest extends GridCommonAbstractTest {
     /** VM ip finder for TCP discovery. */
-    private static GridTcpDiscoveryIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(true);
+    private static TcpDiscoveryIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(true);
 
     /** */
     private static final String EXT_AFFINITY_MAPPER_CLS_NAME = "org.gridgain.grid.tests.p2p.GridExternalAffinityMapper";

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/805377cc/modules/core/src/test/java/org/gridgain/grid/kernal/GridAffinitySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridAffinitySelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridAffinitySelfTest.java
index aa9cc01..014b5c2 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridAffinitySelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridAffinitySelfTest.java
@@ -31,7 +31,7 @@ import static org.gridgain.grid.cache.GridCacheMode.*;
  */
 public class GridAffinitySelfTest extends GridCommonAbstractTest {
     /** VM ip finder for TCP discovery. */
-    private static final GridTcpDiscoveryIpFinder IP_FINDER = new GridTcpDiscoveryVmIpFinder(true);
+    private static final TcpDiscoveryIpFinder IP_FINDER = new GridTcpDiscoveryVmIpFinder(true);
 
     /** {@inheritDoc} */
     @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/805377cc/modules/core/src/test/java/org/gridgain/grid/kernal/GridDiscoveryEventSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridDiscoveryEventSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridDiscoveryEventSelfTest.java
index a5fd26e..8474d52 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridDiscoveryEventSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridDiscoveryEventSelfTest.java
@@ -33,7 +33,7 @@ import static org.apache.ignite.events.IgniteEventType.*;
  */
 public class GridDiscoveryEventSelfTest extends GridCommonAbstractTest {
     /** */
-    private static GridTcpDiscoveryIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(true);
+    private static TcpDiscoveryIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(true);
 
     /** Daemon flag. */
     private boolean daemon;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/805377cc/modules/core/src/test/java/org/gridgain/grid/kernal/GridDiscoverySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridDiscoverySelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridDiscoverySelfTest.java
index bab4277..b669b98 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridDiscoverySelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridDiscoverySelfTest.java
@@ -38,7 +38,7 @@ import static org.apache.ignite.events.IgniteEventType.*;
  */
 public class GridDiscoverySelfTest extends GridCommonAbstractTest {
     /** IP finder. */
-    private static final GridTcpDiscoveryIpFinder IP_FINDER = new GridTcpDiscoveryVmIpFinder(true);
+    private static final TcpDiscoveryIpFinder IP_FINDER = new GridTcpDiscoveryVmIpFinder(true);
 
     /** */
     private static Ignite ignite;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/805377cc/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobMasterLeaveAwareSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobMasterLeaveAwareSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobMasterLeaveAwareSelfTest.java
index 3dba698..681f0ed 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobMasterLeaveAwareSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobMasterLeaveAwareSelfTest.java
@@ -48,7 +48,7 @@ public class GridJobMasterLeaveAwareSelfTest extends GridCommonAbstractTest {
     private static final int GRID_CNT = 2;
 
     /** Default IP finder for single-JVM cloud grid. */
-    private static final GridTcpDiscoveryIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(true);
+    private static final TcpDiscoveryIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(true);
 
     /** Counts how many times master-leave interface implementation was called. */
     private static volatile CountDownLatch invokeLatch;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/805377cc/modules/core/src/test/java/org/gridgain/grid/kernal/GridManagementJobSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridManagementJobSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridManagementJobSelfTest.java
index aebf5f9..aa219eb 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridManagementJobSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridManagementJobSelfTest.java
@@ -30,7 +30,7 @@ public class GridManagementJobSelfTest extends GridCommonAbstractTest {
     private static final String TASK_NAME = "task";
 
     /** IP finder. */
-    private final GridTcpDiscoveryIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(true);
+    private final TcpDiscoveryIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(true);
 
     /**
      * Do not start grid initially.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/805377cc/modules/core/src/test/java/org/gridgain/grid/kernal/GridMultipleJobsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridMultipleJobsSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridMultipleJobsSelfTest.java
index 59faab9..99ff28f 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridMultipleJobsSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridMultipleJobsSelfTest.java
@@ -39,7 +39,7 @@ public class GridMultipleJobsSelfTest extends GridCommonAbstractTest {
     private static final int TEST_TIMEOUT = 60 * 1000;
 
     /** IP finder. */
-    private static final GridTcpDiscoveryIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(true);
+    private static final TcpDiscoveryIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(true);
 
     /** {@inheritDoc} */
     @Override protected void beforeTestsStarted() throws Exception {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/805377cc/modules/core/src/test/java/org/gridgain/grid/kernal/GridProjectionForCachesSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridProjectionForCachesSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridProjectionForCachesSelfTest.java
index 8e62911..38e133c 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridProjectionForCachesSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridProjectionForCachesSelfTest.java
@@ -30,7 +30,7 @@ import static org.gridgain.grid.cache.GridCacheMode.*;
  */
 public class GridProjectionForCachesSelfTest extends GridCommonAbstractTest {
     /** */
-    private static final GridTcpDiscoveryIpFinder IP_FINDER = new GridTcpDiscoveryVmIpFinder(true);
+    private static final TcpDiscoveryIpFinder IP_FINDER = new GridTcpDiscoveryVmIpFinder(true);
 
     /** */
     private static final String CACHE_NAME = "cache";

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/805377cc/modules/core/src/test/java/org/gridgain/grid/kernal/GridProjectionLocalJobMultipleArgumentsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridProjectionLocalJobMultipleArgumentsSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridProjectionLocalJobMultipleArgumentsSelfTest.java
index 8de9022..6842d16 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridProjectionLocalJobMultipleArgumentsSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridProjectionLocalJobMultipleArgumentsSelfTest.java
@@ -30,7 +30,7 @@ import static org.gridgain.grid.cache.GridCacheMode.*;
  */
 public class GridProjectionLocalJobMultipleArgumentsSelfTest extends GridCommonAbstractTest {
     /** IP finder. */
-    private static final GridTcpDiscoveryIpFinder IP_FINDER = new GridTcpDiscoveryVmIpFinder(true);
+    private static final TcpDiscoveryIpFinder IP_FINDER = new GridTcpDiscoveryVmIpFinder(true);
 
     /** */
     private static Collection<Integer> ids;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/805377cc/modules/core/src/test/java/org/gridgain/grid/kernal/GridReleaseTypeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridReleaseTypeSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridReleaseTypeSelfTest.java
index 23a64be..5eb18d4 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridReleaseTypeSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridReleaseTypeSelfTest.java
@@ -26,7 +26,7 @@ import java.util.concurrent.atomic.*;
  */
 public class GridReleaseTypeSelfTest extends GridCommonAbstractTest {
     /** IP finder. */
-    private static final GridTcpDiscoveryIpFinder IP_FINDER = new GridTcpDiscoveryVmIpFinder(true);
+    private static final TcpDiscoveryIpFinder IP_FINDER = new GridTcpDiscoveryVmIpFinder(true);
 
     /** Counter. */
     private static final AtomicInteger cnt = new AtomicInteger();

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/805377cc/modules/core/src/test/java/org/gridgain/grid/kernal/GridTopologyBuildVersionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridTopologyBuildVersionSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridTopologyBuildVersionSelfTest.java
index f2b7ebe..8103061 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridTopologyBuildVersionSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridTopologyBuildVersionSelfTest.java
@@ -26,7 +26,7 @@ import java.util.concurrent.atomic.*;
  */
 public class GridTopologyBuildVersionSelfTest extends GridCommonAbstractTest {
     /** IP finder. */
-    private static final GridTcpDiscoveryIpFinder IP_FINDER = new GridTcpDiscoveryVmIpFinder(true);
+    private static final TcpDiscoveryIpFinder IP_FINDER = new GridTcpDiscoveryVmIpFinder(true);
 
     /** Counter. */
     private static final AtomicInteger cnt = new AtomicInteger();

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/805377cc/modules/core/src/test/java/org/gridgain/grid/kernal/managers/checkpoint/GridCheckpointManagerAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/managers/checkpoint/GridCheckpointManagerAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/managers/checkpoint/GridCheckpointManagerAbstractSelfTest.java
index ffc4e9b..1932bff 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/managers/checkpoint/GridCheckpointManagerAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/managers/checkpoint/GridCheckpointManagerAbstractSelfTest.java
@@ -87,7 +87,7 @@ public abstract class GridCheckpointManagerAbstractSelfTest extends GridCommonAb
     private static final String SES_VAL_OVERWRITTEN = SES_VAL + "-overwritten";
 
     /** IP finder. */
-    private static final GridTcpDiscoveryIpFinder IP_FINDER = new GridTcpDiscoveryVmIpFinder(true);
+    private static final TcpDiscoveryIpFinder IP_FINDER = new GridTcpDiscoveryVmIpFinder(true);
 
     /**
      * Static variable to control whether test should retry checkpoint read attempts.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/805377cc/modules/core/src/test/java/org/gridgain/grid/kernal/managers/checkpoint/GridCheckpointTaskSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/managers/checkpoint/GridCheckpointTaskSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/managers/checkpoint/GridCheckpointTaskSelfTest.java
index 947ee00..4f22297 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/managers/checkpoint/GridCheckpointTaskSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/managers/checkpoint/GridCheckpointTaskSelfTest.java
@@ -36,7 +36,7 @@ import static org.gridgain.grid.cache.GridCacheWriteSynchronizationMode.*;
  */
 public class GridCheckpointTaskSelfTest extends GridCommonAbstractTest {
     /** IP finder. */
-    private static final GridTcpDiscoveryIpFinder IP_FINDER = new GridTcpDiscoveryVmIpFinder(true);
+    private static final TcpDiscoveryIpFinder IP_FINDER = new GridTcpDiscoveryVmIpFinder(true);
 
     /** Checkpoints cache name. */
     private static final String CACHE_NAME = "checkpoints.cache";

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/805377cc/modules/core/src/test/java/org/gridgain/grid/kernal/managers/communication/GridCommunicationSendMessageSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/managers/communication/GridCommunicationSendMessageSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/managers/communication/GridCommunicationSendMessageSelfTest.java
index 176ab9d..3838256 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/managers/communication/GridCommunicationSendMessageSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/managers/communication/GridCommunicationSendMessageSelfTest.java
@@ -29,7 +29,7 @@ import static java.util.concurrent.TimeUnit.*;
  */
 public class GridCommunicationSendMessageSelfTest extends GridCommonAbstractTest {
     /** IP finder. */
-    private static final GridTcpDiscoveryIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(true);
+    private static final TcpDiscoveryIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(true);
 
     /** Sample count. */
     private static final int SAMPLE_CNT = 1;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/805377cc/modules/core/src/test/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentMessageCountSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentMessageCountSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentMessageCountSelfTest.java
index cf22d19..cafe28f 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentMessageCountSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentMessageCountSelfTest.java
@@ -34,7 +34,7 @@ import static org.gridgain.grid.cache.GridCacheWriteSynchronizationMode.*;
  */
 public class GridDeploymentMessageCountSelfTest extends GridCommonAbstractTest {
     /** VM ip finder for TCP discovery. */
-    private static GridTcpDiscoveryIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(true);
+    private static TcpDiscoveryIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(true);
 
     /** Test p2p task. */
     private static final String TEST_TASK = "org.gridgain.grid.tests.p2p.GridSingleSplitTestTask";

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/805377cc/modules/core/src/test/java/org/gridgain/grid/kernal/managers/discovery/GridDiscoveryManagerAliveCacheSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/managers/discovery/GridDiscoveryManagerAliveCacheSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/managers/discovery/GridDiscoveryManagerAliveCacheSelfTest.java
index ed5cd5a..a0a246b 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/managers/discovery/GridDiscoveryManagerAliveCacheSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/managers/discovery/GridDiscoveryManagerAliveCacheSelfTest.java
@@ -36,7 +36,7 @@ import static org.gridgain.grid.cache.GridCacheWriteSynchronizationMode.*;
  */
 public class GridDiscoveryManagerAliveCacheSelfTest extends GridCommonAbstractTest {
     /** */
-    private static final GridTcpDiscoveryIpFinder IP_FINDER = new GridTcpDiscoveryVmIpFinder(true);
+    private static final TcpDiscoveryIpFinder IP_FINDER = new GridTcpDiscoveryVmIpFinder(true);
 
     /** */
     private static final int PERM_NODES_CNT = 5;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/805377cc/modules/core/src/test/java/org/gridgain/grid/kernal/managers/discovery/GridDiscoveryManagerAttributesSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/managers/discovery/GridDiscoveryManagerAttributesSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/managers/discovery/GridDiscoveryManagerAttributesSelfTest.java
index d907af0..ae6483b 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/managers/discovery/GridDiscoveryManagerAttributesSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/managers/discovery/GridDiscoveryManagerAttributesSelfTest.java
@@ -27,7 +27,7 @@ public class GridDiscoveryManagerAttributesSelfTest extends GridCommonAbstractTe
     private static final String PREFER_IPV4 = "java.net.preferIPv4Stack";
 
     /** */
-    private static final GridTcpDiscoveryIpFinder IP_FINDER = new GridTcpDiscoveryVmIpFinder(true);
+    private static final TcpDiscoveryIpFinder IP_FINDER = new GridTcpDiscoveryVmIpFinder(true);
 
     /** */
     private static IgniteDeploymentMode mode = SHARED;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/805377cc/modules/core/src/test/java/org/gridgain/grid/kernal/managers/discovery/GridDiscoveryManagerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/managers/discovery/GridDiscoveryManagerSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/managers/discovery/GridDiscoveryManagerSelfTest.java
index 4b99627..f6983f9 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/managers/discovery/GridDiscoveryManagerSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/managers/discovery/GridDiscoveryManagerSelfTest.java
@@ -28,7 +28,7 @@ public class GridDiscoveryManagerSelfTest extends GridCommonAbstractTest {
     private static final String CACHE_NAME = "cache";
 
     /** */
-    private static final GridTcpDiscoveryIpFinder IP_FINDER = new GridTcpDiscoveryVmIpFinder(true);
+    private static final TcpDiscoveryIpFinder IP_FINDER = new GridTcpDiscoveryVmIpFinder(true);
 
     /** {@inheritDoc} */
     @Override protected void afterTest() throws Exception {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/805377cc/modules/core/src/test/java/org/gridgain/grid/kernal/processors/affinity/GridAffinityProcessorAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/affinity/GridAffinityProcessorAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/affinity/GridAffinityProcessorAbstractSelfTest.java
index 6421893..bf2d1d6 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/affinity/GridAffinityProcessorAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/affinity/GridAffinityProcessorAbstractSelfTest.java
@@ -37,7 +37,7 @@ public abstract class GridAffinityProcessorAbstractSelfTest extends GridCommonAb
     private static final String CACHE_NAME = "cache";
 
     /** IP finder. */
-    private static final GridTcpDiscoveryIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(true);
+    private static final TcpDiscoveryIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(true);
 
     /** Flag to start grid with cache. */
     private boolean withCache;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/805377cc/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractByteArrayValuesSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractByteArrayValuesSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractByteArrayValuesSelfTest.java
index dddb399..3d2d21f 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractByteArrayValuesSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractByteArrayValuesSelfTest.java
@@ -38,7 +38,7 @@ public abstract class GridCacheAbstractByteArrayValuesSelfTest extends GridCommo
     protected static final Integer SWAP_TEST_KEY = 3;
 
     /** Shared IP finder. */
-    private static final GridTcpDiscoveryIpFinder IP_FINDER = new GridTcpDiscoveryVmIpFinder(true);
+    private static final TcpDiscoveryIpFinder IP_FINDER = new GridTcpDiscoveryVmIpFinder(true);
 
     /** {@inheritDoc} */
     @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/805377cc/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractSelfTest.java
index 51e9caa..04d5921 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractSelfTest.java
@@ -48,7 +48,7 @@ public abstract class GridCacheAbstractSelfTest extends GridCommonAbstractTest {
     protected static final Map<Object, Object> map = new ConcurrentHashMap8<>();
 
     /** VM ip finder for TCP discovery. */
-    private static GridTcpDiscoveryIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(true);
+    private static TcpDiscoveryIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(true);
 
     /**
      * @return Grids count to start.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/805377cc/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAffinityRoutingSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAffinityRoutingSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAffinityRoutingSelfTest.java
index 29a5572..6d70f67 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAffinityRoutingSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAffinityRoutingSelfTest.java
@@ -46,7 +46,7 @@ public class GridCacheAffinityRoutingSelfTest extends GridCommonAbstractTest {
     private static final int KEY_CNT = 50;
 
     /** */
-    private static GridTcpDiscoveryIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(true);
+    private static TcpDiscoveryIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(true);
 
     /**
      * Constructs test.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/805377cc/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAtomicMessageCountSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAtomicMessageCountSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAtomicMessageCountSelfTest.java
index 4f3c31c..d676285 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAtomicMessageCountSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAtomicMessageCountSelfTest.java
@@ -35,7 +35,7 @@ import static org.gridgain.grid.cache.GridCacheWriteSynchronizationMode.*;
  */
 public class GridCacheAtomicMessageCountSelfTest extends GridCommonAbstractTest {
     /** VM ip finder for TCP discovery. */
-    private static GridTcpDiscoveryIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(true);
+    private static TcpDiscoveryIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(true);
 
     /** Starting grid index. */
     private int idx;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/805377cc/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheBasicStoreAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheBasicStoreAbstractTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheBasicStoreAbstractTest.java
index 46ec33e..af3ed16 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheBasicStoreAbstractTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheBasicStoreAbstractTest.java
@@ -33,7 +33,7 @@ import static org.gridgain.grid.cache.GridCacheWriteSynchronizationMode.*;
  */
 public abstract class GridCacheBasicStoreAbstractTest extends GridCommonAbstractTest {
     /** IP finder. */
-    private static final GridTcpDiscoveryIpFinder IP_FINDER = new GridTcpDiscoveryVmIpFinder(true);
+    private static final TcpDiscoveryIpFinder IP_FINDER = new GridTcpDiscoveryVmIpFinder(true);
 
     /** Cache store. */
     private static final GridCacheTestStore store = new GridCacheTestStore();

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/805377cc/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheClearAllSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheClearAllSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheClearAllSelfTest.java
index f0c89fd..ea36a1b 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheClearAllSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheClearAllSelfTest.java
@@ -45,7 +45,7 @@ public class GridCacheClearAllSelfTest extends GridCommonAbstractTest {
     private static final int GRID_CNT = 3;
 
     /** VM IP finder for TCP discovery SPI. */
-    private static final GridTcpDiscoveryIpFinder IP_FINDER = new GridTcpDiscoveryVmIpFinder(true);
+    private static final TcpDiscoveryIpFinder IP_FINDER = new GridTcpDiscoveryVmIpFinder(true);
 
     /** Local caches. */
     private GridCache<Integer, Integer>[] cachesLoc;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/805377cc/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheConcurrentMapSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheConcurrentMapSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheConcurrentMapSelfTest.java
index e7d498c..b6e48ca 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheConcurrentMapSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheConcurrentMapSelfTest.java
@@ -29,7 +29,7 @@ import static org.gridgain.grid.cache.GridCacheWriteSynchronizationMode.*;
  */
 public class GridCacheConcurrentMapSelfTest extends GridCommonAbstractTest {
     /** Ip finder. */
-    private static final GridTcpDiscoveryIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(true);
+    private static final TcpDiscoveryIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(true);
 
     /** {@inheritDoc} */
     @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/805377cc/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheConcurrentTxMultiNodeTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheConcurrentTxMultiNodeTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheConcurrentTxMultiNodeTest.java
index 30b17c6..fa9b379 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheConcurrentTxMultiNodeTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheConcurrentTxMultiNodeTest.java
@@ -49,7 +49,7 @@ import static org.gridgain.grid.cache.GridCacheWriteSynchronizationMode.*;
  */
 public class GridCacheConcurrentTxMultiNodeTest extends GridCommonAbstractTest {
     /** IP finder. */
-    private static final GridTcpDiscoveryIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(true);
+    private static final TcpDiscoveryIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(true);
 
     /** Timers. */
     private static final ConcurrentMap<Thread, ConcurrentMap<String, T5<Long, Long, Long, IgniteUuid, Object>>> timers =


Mime
View raw message