# 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/717180b3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/717180b3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/717180b3 Branch: refs/heads/master Commit: 717180b3bc7980591bb44af29d07eb1bc8933047 Parents: 805377c Author: sboikov <sboi...@gridgain.com> Authored: Fri Dec 5 16:48:38 2014 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Fri Dec 5 16:49:01 2014 +0300 ---------------------------------------------------------------------- examples/config/example-cache.xml | 2 +- examples/config/example-compute.xml | 2 +- examples/config/example-streamer.xml | 2 +- examples/config/filesystem/example-ggfs.xml | 2 +- .../failover/ComputeFailoverNodeStartup.java | 2 +- .../HibernateL2CacheExampleNodeStartup.java | 2 +- .../store/CacheNodeWithStoreStartup.java | 2 +- .../MemcacheRestExampleNodeStartup.java | 2 +- .../examples/misc/springbean/spring-bean.xml | 2 +- .../scalar/examples/ScalarJvmCloudExample.scala | 4 +- .../apache/ignite/IgniteSystemProperties.java | 3 +- .../gridgain/grid/GridBasicWarmupClosure.java | 2 +- .../grid/spi/discovery/tcp/TcpDiscoverySpi.java | 3 +- .../GridTcpDiscoveryMulticastIpFinder.java | 2 +- .../ipfinder/vm/GridTcpDiscoveryVmIpFinder.java | 255 ------------------- .../tcp/ipfinder/vm/TcpDiscoveryVmIpFinder.java | 255 +++++++++++++++++++ .../spring-cache-client-benchmark-1.xml | 2 +- .../spring-cache-client-benchmark-2.xml | 2 +- .../spring-cache-client-benchmark-3.xml | 2 +- .../core/src/test/config/discovery-stress.xml | 2 +- modules/core/src/test/config/example-cache.xml | 2 +- modules/core/src/test/config/ggfs-loopback.xml | 2 +- .../core/src/test/config/ggfs-no-endpoint.xml | 2 +- modules/core/src/test/config/ggfs-shmem.xml | 2 +- .../src/test/config/io-manager-benchmark.xml | 2 +- .../src/test/config/job-loadtest/client.xml | 2 +- .../src/test/config/job-loadtest/server.xml | 2 +- modules/core/src/test/config/jobs-load-base.xml | 2 +- .../src/test/config/load/cache-benchmark.xml | 2 +- .../test/config/load/cache-client-benchmark.xml | 2 +- .../core/src/test/config/load/dsi-load-base.xml | 2 +- .../src/test/config/load/merge-sort-base.xml | 2 +- .../test/config/load/mongo-multinode-foster.xml | 2 +- .../core/src/test/config/spring-cache-load.xml | 2 +- .../config/spring-cache-put-remove-load.xml | 2 +- .../core/src/test/config/spring-cache-swap.xml | 2 +- .../src/test/config/spring-cache-teststore.xml | 2 +- .../core/src/test/config/spring-multicache.xml | 2 +- .../src/test/config/spring-start-nodes-attr.xml | 2 +- .../core/src/test/config/spring-start-nodes.xml | 2 +- .../config/streamer/spring-streamer-base.xml | 4 +- .../test/config/websession/spring-cache-1.xml | 2 +- .../test/config/websession/spring-cache-2.xml | 2 +- .../test/config/websession/spring-cache-3.xml | 2 +- .../optimized/GridOptimizedMarshallerTest.java | 4 +- ...idCacheCheckpointSpiSecondCacheSelfTest.java | 2 +- .../tcp/GridCacheDhtLockBackupSelfTest.java | 2 +- .../tcp/GridOrderedMessageCancelSelfTest.java | 2 +- .../GridCacheStoreValueBytesNode.java | 2 +- ...CachePartitionFairAffinityNodesSelfTest.java | 2 +- ...CacheJdbcBlobStoreMultithreadedSelfTest.java | 2 +- .../ggfs/GridGgfsEventsAbstractSelfTest.java | 2 +- .../GridGgfsFragmentizerAbstractSelfTest.java | 2 +- .../grid/kernal/GridAffinityMappedTest.java | 2 +- .../grid/kernal/GridAffinityP2PSelfTest.java | 2 +- .../grid/kernal/GridAffinitySelfTest.java | 2 +- .../kernal/GridCancelUnusedJobSelfTest.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 +- .../grid/kernal/GridTaskMapAsyncSelfTest.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/GridCacheBasicApiAbstractTest.java | 2 +- .../cache/GridCacheBasicStoreAbstractTest.java | 2 +- ...acheBasicStoreMultithreadedAbstractTest.java | 2 +- .../GridCacheBasicStoreNoBatchAbstractTest.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 +- .../GridCacheMissingCommitVersionSelfTest.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 +- .../cache/GridCachePartitionedWritesTest.java | 2 +- .../GridCachePreloadingEvictionsSelfTest.java | 2 +- .../cache/GridCachePutAllFailoverSelfTest.java | 2 +- .../GridCacheReferenceCleanupSelfTest.java | 2 +- .../GridCacheRefreshAheadAbstractSelfTest.java | 2 +- .../cache/GridCacheReloadSelfTest.java | 2 +- ...ridCacheReplicatedSynchronousCommitTest.java | 2 +- .../cache/GridCacheSlowTxWarnTest.java | 2 +- .../processors/cache/GridCacheStopSelfTest.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 +- .../GridCacheWriteBehindStoreAbstractTest.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/GridCacheNearOneNodeSelfTest.java | 2 +- .../near/GridCacheNearOnlyTopologySelfTest.java | 2 +- .../GridCacheNearReaderPreloadSelfTest.java | 2 +- .../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 +- .../local/GridCacheLocalLoadAllSelfTest.java | 2 +- .../cache/local/GridCacheLocalLockSelfTest.java | 2 +- .../GridCacheLocalMultithreadedSelfTest.java | 2 +- .../local/GridCacheLocalTxTimeoutSelfTest.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 +- ...heGgfsPerBlockLruEvictionPolicySelfTest.java | 4 +- .../ggfs/GridGgfsAbstractSelfTest.java | 2 +- .../processors/ggfs/GridGgfsCacheSelfTest.java | 2 +- .../ggfs/GridGgfsDataManagerSelfTest.java | 2 +- .../ggfs/GridGgfsMetaManagerSelfTest.java | 2 +- .../ggfs/GridGgfsMetricsSelfTest.java | 4 +- .../processors/ggfs/GridGgfsModesSelfTest.java | 4 +- .../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 +- .../cache/GridCacheCommandHandlerSelfTest.java | 2 +- .../GridServiceProcessorAbstractSelfTest.java | 2 +- .../streamer/GridStreamerEvictionSelfTest.java | 2 +- .../streamer/GridStreamerFailoverSelfTest.java | 2 +- .../streamer/GridStreamerSelfTest.java | 2 +- .../gridgain/grid/lang/GridFuncSelfTest.java | 2 +- .../grid/messaging/GridMessagingSelfTest.java | 2 +- .../GridP2PContinuousDeploymentSelfTest.java | 2 +- .../p2p/GridP2PDoubleDeploymentSelfTest.java | 2 +- .../GridP2PMissedResourceCacheSizeSelfTest.java | 2 +- ...SessionCancelSiblingsFromFutureSelfTest.java | 2 +- ...ridSessionCancelSiblingsFromJobSelfTest.java | 2 +- ...idSessionCancelSiblingsFromTaskSelfTest.java | 2 +- ...GridSessionJobWaitTaskAttributeSelfTest.java | 2 +- .../GridSessionSetFutureAttributeSelfTest.java | 2 +- ...nSetFutureAttributeWaitListenerSelfTest.java | 2 +- .../GridSessionSetJobAttributeSelfTest.java | 2 +- ...sionSetJobAttributeWaitListenerSelfTest.java | 2 +- .../GridSessionWaitAttributeSelfTest.java | 2 +- .../grid/spi/GridTcpSpiForwardingSelfTest.java | 2 +- .../tcp/GridTcpClientDiscoverySelfTest.java | 6 +- .../GridTcpDiscoveryConcurrentStartTest.java | 4 +- ...GridTcpDiscoveryMarshallerCheckSelfTest.java | 2 +- .../tcp/GridTcpDiscoveryMultiThreadedTest.java | 2 +- .../discovery/tcp/GridTcpDiscoverySelfTest.java | 4 +- .../GridTcpDiscoverySpiRandomStartStopTest.java | 2 +- .../tcp/GridTcpDiscoverySpiSelfTest.java | 2 +- .../GridTcpDiscoverySpiStartStopSelfTest.java | 2 +- .../GridTcpDiscoverySpiWildcardSelfTest.java | 2 +- .../vm/GridTcpDiscoveryVmIpFinderSelfTest.java | 10 +- .../noop/GridNoopSwapSpaceSpiSelfTest.java | 2 +- ...artupWithSpecifiedWorkDirectorySelfTest.java | 2 +- ...tartupWithUndefinedGridGainHomeSelfTest.java | 2 +- .../grid/util/GridTopologyHeapSizeSelfTest.java | 2 +- .../shmem/GridIpcSharedMemoryNodeStartup.java | 2 +- .../loadtests/GridCacheMultiNodeLoadTest.java | 2 +- ...ridCacheAffinityTransactionsOffHeapTest.java | 2 +- .../cache/GridCacheSingleNodeLoadTest.java | 2 +- .../GridCacheWriteBehindStoreLoadTest.java | 2 +- .../capacity/spring-capacity-cache.xml | 2 +- .../loadtests/colocation/spring-colocation.xml | 2 +- .../communication/GridIoManagerBenchmark0.java | 2 +- .../GridCachePartitionedAtomicLongLoadTest.java | 2 +- .../swap/GridSwapEvictAllBenchmark.java | 2 +- .../junits/spi/GridSpiAbstractTest.java | 2 +- .../core/src/test/webapp/META-INF/gg-config.xml | 2 +- ...dGgfsHadoop20FileSystemAbstractSelfTest.java | 4 +- .../GridGgfsHadoopDualAbstractSelfTest.java | 2 +- ...ridGgfsHadoopFileSystemAbstractSelfTest.java | 4 +- .../GridGgfsHadoopFileSystemClientSelfTest.java | 2 +- ...idGgfsHadoopFileSystemHandshakeSelfTest.java | 2 +- ...ridGgfsHadoopFileSystemIpcCacheSelfTest.java | 2 +- ...GgfsHadoopFileSystemLoggerStateSelfTest.java | 2 +- ...fsHadoopFileSystemSecondaryModeSelfTest.java | 4 +- .../ggfs/GridGgfsNearOnlyMultiNodeSelfTest.java | 2 +- ...idHibernateL2CacheConfigurationSelfTest.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 +- .../h2indexing/GridH2IndexingSpiLoadTest.java | 2 +- .../scalar/src/test/resources/spring-cache.xml | 2 +- .../test/resources/spring-ping-pong-partner.xml | 2 +- .../spring/GridSpringCacheManagerSelfTest.java | 2 +- .../GridSpringBeanSerializationSelfTest.java | 2 +- .../p2p/GridP2PUserVersionChangeSelfTest.java | 2 +- .../commands/alert/VisorAlertCommandSpec.scala | 4 +- .../cache/VisorCacheClearCommandSpec.scala | 4 +- .../cache/VisorCacheCompactCommandSpec.scala | 4 +- .../cswap/VisorCacheSwapCommandSpec.scala | 4 +- 345 files changed, 620 insertions(+), 622 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/717180b3/examples/config/example-cache.xml ---------------------------------------------------------------------- diff --git a/examples/config/example-cache.xml b/examples/config/example-cache.xml index b573295..ebc9920 100644 --- a/examples/config/example-cache.xml +++ b/examples/config/example-cache.xml @@ -180,7 +180,7 @@ --> <!-- Uncomment multicast IP finder to enable multicast-based discovery of initial nodes. --> <!--<bean class="org.gridgain.grid.spi.discovery.tcp.ipfinder.multicast.GridTcpDiscoveryMulticastIpFinder">--> - <bean class="org.gridgain.grid.spi.discovery.tcp.ipfinder.vm.GridTcpDiscoveryVmIpFinder"> + <bean class="org.gridgain.grid.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder"> <property name="addresses"> <list> <!-- In distributed environment, replace with actual host IP address. --> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/717180b3/examples/config/example-compute.xml ---------------------------------------------------------------------- diff --git a/examples/config/example-compute.xml b/examples/config/example-compute.xml index a56ef2d..f87567d 100644 --- a/examples/config/example-compute.xml +++ b/examples/config/example-compute.xml @@ -52,7 +52,7 @@ --> <!-- Uncomment multicast IP finder to enable multicast-based discovery of initial nodes. --> <!--<bean class="org.gridgain.grid.spi.discovery.tcp.ipfinder.multicast.GridTcpDiscoveryMulticastIpFinder">--> - <bean class="org.gridgain.grid.spi.discovery.tcp.ipfinder.vm.GridTcpDiscoveryVmIpFinder"> + <bean class="org.gridgain.grid.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder"> <property name="addresses"> <list> <!-- In distributed environment, replace with actual host IP address. --> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/717180b3/examples/config/example-streamer.xml ---------------------------------------------------------------------- diff --git a/examples/config/example-streamer.xml b/examples/config/example-streamer.xml index 8bc70ec..429edbd 100644 --- a/examples/config/example-streamer.xml +++ b/examples/config/example-streamer.xml @@ -275,7 +275,7 @@ --> <!-- Uncomment multicast IP finder to enable multicast-based discovery of initial nodes. --> <!--<bean class="org.gridgain.grid.spi.discovery.tcp.ipfinder.multicast.GridTcpDiscoveryMulticastIpFinder">--> - <bean class="org.gridgain.grid.spi.discovery.tcp.ipfinder.vm.GridTcpDiscoveryVmIpFinder"> + <bean class="org.gridgain.grid.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder"> <property name="addresses"> <list> <!-- In distributed environment, replace with actual host IP address. --> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/717180b3/examples/config/filesystem/example-ggfs.xml ---------------------------------------------------------------------- diff --git a/examples/config/filesystem/example-ggfs.xml b/examples/config/filesystem/example-ggfs.xml index ff974c7..a4f19f6 100644 --- a/examples/config/filesystem/example-ggfs.xml +++ b/examples/config/filesystem/example-ggfs.xml @@ -147,7 +147,7 @@ --> <!-- Uncomment multicast IP finder to enable multicast-based discovery of initial nodes. --> <!--<bean class="org.gridgain.grid.spi.discovery.tcp.ipfinder.multicast.GridTcpDiscoveryMulticastIpFinder">--> - <bean class="org.gridgain.grid.spi.discovery.tcp.ipfinder.vm.GridTcpDiscoveryVmIpFinder"> + <bean class="org.gridgain.grid.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder"> <property name="addresses"> <list> <!-- In distributed environment, replace with actual host IP address. --> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/717180b3/examples/src/main/java/org/gridgain/examples/compute/failover/ComputeFailoverNodeStartup.java ---------------------------------------------------------------------- diff --git a/examples/src/main/java/org/gridgain/examples/compute/failover/ComputeFailoverNodeStartup.java b/examples/src/main/java/org/gridgain/examples/compute/failover/ComputeFailoverNodeStartup.java index 06eebde..7950ec2 100644 --- a/examples/src/main/java/org/gridgain/examples/compute/failover/ComputeFailoverNodeStartup.java +++ b/examples/src/main/java/org/gridgain/examples/compute/failover/ComputeFailoverNodeStartup.java @@ -57,7 +57,7 @@ public class ComputeFailoverNodeStartup { // Configure discovery SPI. TcpDiscoverySpi discoSpi = new TcpDiscoverySpi(); - GridTcpDiscoveryVmIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(); + TcpDiscoveryVmIpFinder ipFinder = new TcpDiscoveryVmIpFinder(); ipFinder.setAddresses(Arrays.asList("127.0.0.1:47500..47509")); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/717180b3/examples/src/main/java/org/gridgain/examples/datagrid/hibernate/HibernateL2CacheExampleNodeStartup.java ---------------------------------------------------------------------- diff --git a/examples/src/main/java/org/gridgain/examples/datagrid/hibernate/HibernateL2CacheExampleNodeStartup.java b/examples/src/main/java/org/gridgain/examples/datagrid/hibernate/HibernateL2CacheExampleNodeStartup.java index f346be3..76d7b15 100644 --- a/examples/src/main/java/org/gridgain/examples/datagrid/hibernate/HibernateL2CacheExampleNodeStartup.java +++ b/examples/src/main/java/org/gridgain/examples/datagrid/hibernate/HibernateL2CacheExampleNodeStartup.java @@ -51,7 +51,7 @@ public class HibernateL2CacheExampleNodeStartup { TcpDiscoverySpi discoSpi = new TcpDiscoverySpi(); - GridTcpDiscoveryVmIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(); + TcpDiscoveryVmIpFinder ipFinder = new TcpDiscoveryVmIpFinder(); ipFinder.setAddresses(Collections.singletonList("127.0.0.1:47500..47509")); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/717180b3/examples/src/main/java/org/gridgain/examples/datagrid/store/CacheNodeWithStoreStartup.java ---------------------------------------------------------------------- diff --git a/examples/src/main/java/org/gridgain/examples/datagrid/store/CacheNodeWithStoreStartup.java b/examples/src/main/java/org/gridgain/examples/datagrid/store/CacheNodeWithStoreStartup.java index 8a2c2d5..2bf0cfd 100644 --- a/examples/src/main/java/org/gridgain/examples/datagrid/store/CacheNodeWithStoreStartup.java +++ b/examples/src/main/java/org/gridgain/examples/datagrid/store/CacheNodeWithStoreStartup.java @@ -50,7 +50,7 @@ public class CacheNodeWithStoreStartup { // Discovery SPI. TcpDiscoverySpi discoSpi = new TcpDiscoverySpi(); - GridTcpDiscoveryVmIpFinder ipFinder = new GridTcpDiscoveryMulticastIpFinder(); + TcpDiscoveryVmIpFinder ipFinder = new GridTcpDiscoveryMulticastIpFinder(); ipFinder.setAddresses(Arrays.asList("127.0.0.1:47500..47509")); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/717180b3/examples/src/main/java/org/gridgain/examples/misc/client/memcache/MemcacheRestExampleNodeStartup.java ---------------------------------------------------------------------- diff --git a/examples/src/main/java/org/gridgain/examples/misc/client/memcache/MemcacheRestExampleNodeStartup.java b/examples/src/main/java/org/gridgain/examples/misc/client/memcache/MemcacheRestExampleNodeStartup.java index c22ee36..4de9148 100644 --- a/examples/src/main/java/org/gridgain/examples/misc/client/memcache/MemcacheRestExampleNodeStartup.java +++ b/examples/src/main/java/org/gridgain/examples/misc/client/memcache/MemcacheRestExampleNodeStartup.java @@ -79,7 +79,7 @@ public class MemcacheRestExampleNodeStartup { TcpDiscoverySpi discoSpi = new TcpDiscoverySpi(); - GridTcpDiscoveryVmIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(); + TcpDiscoveryVmIpFinder ipFinder = new TcpDiscoveryVmIpFinder(); ipFinder.setAddresses(Collections.singletonList("127.0.0.1:47500..47509")); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/717180b3/examples/src/main/java/org/gridgain/examples/misc/springbean/spring-bean.xml ---------------------------------------------------------------------- diff --git a/examples/src/main/java/org/gridgain/examples/misc/springbean/spring-bean.xml b/examples/src/main/java/org/gridgain/examples/misc/springbean/spring-bean.xml index f17c32d..1d463fd 100644 --- a/examples/src/main/java/org/gridgain/examples/misc/springbean/spring-bean.xml +++ b/examples/src/main/java/org/gridgain/examples/misc/springbean/spring-bean.xml @@ -50,7 +50,7 @@ <property name="ipFinder"> <!-- Uncomment multicast IP finder to enable multicast-based discovery of initial nodes. --> <!--<bean class="org.gridgain.grid.spi.discovery.tcp.ipfinder.multicast.GridTcpDiscoveryMulticastIpFinder">--> - <bean class="org.gridgain.grid.spi.discovery.tcp.ipfinder.vm.GridTcpDiscoveryVmIpFinder"> + <bean class="org.gridgain.grid.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder"> <property name="addresses"> <list> <!-- In distributed environment, replace with actual host IP address. --> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/717180b3/examples/src/main/scala/org/gridgain/scalar/examples/ScalarJvmCloudExample.scala ---------------------------------------------------------------------- diff --git a/examples/src/main/scala/org/gridgain/scalar/examples/ScalarJvmCloudExample.scala b/examples/src/main/scala/org/gridgain/scalar/examples/ScalarJvmCloudExample.scala index 2086b91..e4b603e 100644 --- a/examples/src/main/scala/org/gridgain/scalar/examples/ScalarJvmCloudExample.scala +++ b/examples/src/main/scala/org/gridgain/scalar/examples/ScalarJvmCloudExample.scala @@ -5,7 +5,7 @@ import java.util.concurrent.TimeUnit._ import javax.swing.{JComponent, JLabel, JOptionPane} import org.apache.ignite.configuration.IgniteConfiguration import org.gridgain.grid.spi.discovery.tcp.TcpDiscoverySpi -import org.gridgain.grid.spi.discovery.tcp.ipfinder.vm.GridTcpDiscoveryVmIpFinder +import org.gridgain.grid.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder import org.gridgain.grid.util.scala.impl import org.gridgain.scalar.scalar @@ -27,7 +27,7 @@ object ScalarJvmCloudExample { def main(args: Array[String]) { try { // Shared IP finder for in-VM node discovery. - val ipFinder = new GridTcpDiscoveryVmIpFinder(true) + val ipFinder = new TcpDiscoveryVmIpFinder(true) val pool = Executors.newFixedThreadPool(NODES.size) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/717180b3/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java b/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java index 2eeba0d..cb3fdf0 100644 --- a/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java +++ b/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java @@ -9,7 +9,6 @@ package org.apache.ignite; -import org.gridgain.grid.spi.discovery.tcp.ipfinder.vm.*; import org.jetbrains.annotations.*; import javax.net.ssl.*; @@ -387,7 +386,7 @@ public final class IgniteSystemProperties { /** * Comma separated list of addresses in format "10.100.22.100:45000,10.100.22.101:45000". - * Makes sense only for {@link GridTcpDiscoveryVmIpFinder}. + * Makes sense only for {@link org.gridgain.grid.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder}. */ public static final String GG_TCP_DISCOVERY_ADDRESSES = "GRIDGAIN_TCP_DISCOVERY_ADDRESSES"; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/717180b3/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 d692178..ee2c343 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"); - TcpDiscoveryIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(true); + TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); for (int i = 0; i < gridCnt; i++) { IgniteConfiguration cfg0 = new IgniteConfiguration(cfg); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/717180b3/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 beb725d..7a1b964 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 @@ -25,7 +25,6 @@ import org.gridgain.grid.spi.discovery.tcp.internal.*; 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.*; -import org.gridgain.grid.spi.discovery.tcp.ipfinder.vm.*; import org.gridgain.grid.spi.discovery.tcp.messages.*; import org.gridgain.grid.util.*; import org.gridgain.grid.util.future.*; @@ -72,7 +71,7 @@ import static org.gridgain.grid.spi.discovery.tcp.messages.GridTcpDiscoveryStatu * <li>{@link GridTcpDiscoverySharedFsIpFinder}</li> * <li>{@gglink org.gridgain.grid.spi.discovery.tcp.ipfinder.s3.GridTcpDiscoveryS3IpFinder}</li> * <li>{@link GridTcpDiscoveryJdbcIpFinder}</li> - * <li>{@link GridTcpDiscoveryVmIpFinder}</li> + * <li>{@link org.gridgain.grid.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder}</li> * <li>{@link GridTcpDiscoveryMulticastIpFinder} - default</li> * </ul> * </li> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/717180b3/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/multicast/GridTcpDiscoveryMulticastIpFinder.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/multicast/GridTcpDiscoveryMulticastIpFinder.java b/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/multicast/GridTcpDiscoveryMulticastIpFinder.java index e4bee93..1c4a5f9 100644 --- a/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/multicast/GridTcpDiscoveryMulticastIpFinder.java +++ b/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/multicast/GridTcpDiscoveryMulticastIpFinder.java @@ -52,7 +52,7 @@ import static org.apache.ignite.spi.IgnitePortProtocol.*; * <li>Local address (see {@link #setLocalAddress(String)})</li> * </ul> */ -public class GridTcpDiscoveryMulticastIpFinder extends GridTcpDiscoveryVmIpFinder { +public class GridTcpDiscoveryMulticastIpFinder extends TcpDiscoveryVmIpFinder { /** Default multicast IP address (value is {@code 228.1.2.4}). */ public static final String DFLT_MCAST_GROUP = "228.1.2.4"; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/717180b3/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 deleted file mode 100644 index f993de7..0000000 --- a/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/vm/GridTcpDiscoveryVmIpFinder.java +++ /dev/null @@ -1,255 +0,0 @@ -/* @java.file.header */ - -/* _________ _____ __________________ _____ - * __ ____/___________(_)______ /__ ____/______ ____(_)_______ - * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \ - * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / / - * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/ - */ - -package org.gridgain.grid.spi.discovery.tcp.ipfinder.vm; - -import org.apache.ignite.*; -import org.apache.ignite.resources.*; -import org.apache.ignite.spi.*; -import org.gridgain.grid.*; -import org.gridgain.grid.spi.discovery.tcp.ipfinder.*; -import org.gridgain.grid.util.tostring.*; -import org.gridgain.grid.util.typedef.*; -import org.gridgain.grid.util.typedef.internal.*; - -import java.net.*; -import java.util.*; - -import static org.apache.ignite.IgniteSystemProperties.*; - -/** - * IP Finder which works only with pre-configured list of IP addresses specified - * via {@link #setAddresses(Collection)} method. By default, this IP finder is - * not {@code shared}, which means that all grid nodes have to be configured with the - * same list of IP addresses when this IP finder is used. - * <h1 class="header">Configuration</h1> - * <h2 class="header">Mandatory</h2> - * There are no mandatory configuration parameters. - * <h2 class="header">Optional</h2> - * <ul> - * <li>Addresses for initialization (see {@link #setAddresses(Collection)})</li> - * <li>Shared flag (see {@link #setShared(boolean)})</li> - * </ul> - */ -public class GridTcpDiscoveryVmIpFinder extends TcpDiscoveryIpFinderAdapter { - /** Grid logger. */ - @IgniteLoggerResource - private IgniteLogger log; - - /** Addresses. */ - @GridToStringInclude - private Collection<InetSocketAddress> addrs; - - /** - * Initialize from system property. - */ - { - String ips = IgniteSystemProperties.getString(GG_TCP_DISCOVERY_ADDRESSES); - - if (!F.isEmpty(ips)) { - Collection<InetSocketAddress> addrsList = new LinkedHashSet<>(); - - for (String s : ips.split(",")) { - if (!F.isEmpty(s)) { - s = s.trim(); - - if (!F.isEmpty(s)) { - try { - addrsList.addAll(address(s)); - } - catch (IgniteSpiException e) { - throw new GridRuntimeException(e); - } - } - } - } - - addrs = addrsList; - } - else - addrs = new LinkedHashSet<>(); - } - - /** - * Constructs new IP finder. - */ - public GridTcpDiscoveryVmIpFinder() { - // No-op. - } - - /** - * Constructs new IP finder. - * - * @param shared {@code true} if IP finder is shared. - * @see #setShared(boolean) - */ - public GridTcpDiscoveryVmIpFinder(boolean shared) { - setShared(shared); - } - - /** - * Parses provided values and initializes the internal collection of addresses. - * <p> - * Addresses may be represented as follows: - * <ul> - * <li>IP address (e.g. 127.0.0.1, 9.9.9.9, etc);</li> - * <li>IP address and port (e.g. 127.0.0.1:47500, 9.9.9.9:47501, etc);</li> - * <li>IP address and port range (e.g. 127.0.0.1:47500..47510, 9.9.9.9:47501..47504, etc);</li> - * <li>Hostname (e.g. host1.com, host2, etc);</li> - * <li>Hostname and port (e.g. host1.com:47500, host2:47502, etc).</li> - * <li>Hostname and port range (e.g. host1.com:47500..47510, host2:47502..47508, etc).</li> - * </ul> - * <p> - * If port is 0 or not provided then default port will be used (depends on - * discovery SPI configuration). - * <p> - * If port range is provided (e.g. host:port1..port2) the following should be considered: - * <ul> - * <li>{@code port1 < port2} should be {@code true};</li> - * <li>Both {@code port1} and {@code port2} should be greater than {@code 0}.</li> - * </ul> - * - * @param addrs Known nodes addresses. - * @throws org.apache.ignite.spi.IgniteSpiException If any error occurs. - */ - @IgniteSpiConfiguration(optional = true) - public synchronized void setAddresses(Collection<String> addrs) throws IgniteSpiException { - if (F.isEmpty(addrs)) - return; - - Collection<InetSocketAddress> newAddrs = new LinkedHashSet<>(); - - for (String ipStr : addrs) - newAddrs.addAll(address(ipStr)); - - this.addrs = newAddrs; - } - - /** - * Creates address from string. - * - * @param ipStr Address string. - * @return Socket addresses (may contain 1 or more addresses if provided string - * includes port range). - * @throws org.apache.ignite.spi.IgniteSpiException If failed. - */ - private static Collection<InetSocketAddress> address(String ipStr) throws IgniteSpiException { - ipStr = ipStr.trim(); - - String errMsg = "Failed to parse provided address: " + ipStr; - - int colonCnt = ipStr.length() - ipStr.replace(":", "").length(); - - if (colonCnt > 1) { - // IPv6 address (literal IPv6 addresses are enclosed in square brackets, for example - // https://[2001:db8:85a3:8d3:1319:8a2e:370:7348]:443). - if (ipStr.startsWith("[")) { - ipStr = ipStr.substring(1); - - if (ipStr.contains("]:")) - return addresses(ipStr, "\\]\\:", errMsg); - else if (ipStr.endsWith("]")) - ipStr = ipStr.substring(0, ipStr.length() - 1); - else - throw new IgniteSpiException(errMsg); - } - } - else { - // IPv4 address. - if (ipStr.endsWith(":")) - ipStr = ipStr.substring(0, ipStr.length() - 1); - else if (ipStr.indexOf(':') >= 0) - return addresses(ipStr, "\\:", errMsg); - } - - // Provided address does not contain port (will use default one). - return Collections.singleton(new InetSocketAddress(ipStr, 0)); - } - - /** - * Creates address from string with port information. - * - * @param ipStr Address string - * @param regexDelim Port regex delimiter. - * @param errMsg Error message. - * @return Socket addresses (may contain 1 or more addresses if provided string - * includes port range). - * @throws org.apache.ignite.spi.IgniteSpiException If failed. - */ - private static Collection<InetSocketAddress> addresses(String ipStr, String regexDelim, String errMsg) - throws IgniteSpiException { - String[] tokens = ipStr.split(regexDelim); - - if (tokens.length == 2) { - String addrStr = tokens[0]; - String portStr = tokens[1]; - - if (portStr.contains("..")) { - try { - int port1 = Integer.parseInt(portStr.substring(0, portStr.indexOf(".."))); - int port2 = Integer.parseInt(portStr.substring(portStr.indexOf("..") + 2, portStr.length())); - - if (port2 < port1 || port1 == port2 || port1 <= 0 || port2 <= 0) - throw new IgniteSpiException(errMsg); - - Collection<InetSocketAddress> res = new ArrayList<>(port2 - port1); - - // Upper bound included. - for (int i = port1; i <= port2; i++) - res.add(new InetSocketAddress(addrStr, i)); - - return res; - } - catch (IllegalArgumentException e) { - throw new IgniteSpiException(errMsg, e); - } - } - else { - try { - int port = Integer.parseInt(portStr); - - return Collections.singleton(new InetSocketAddress(addrStr, port)); - } - catch (IllegalArgumentException e) { - throw new IgniteSpiException(errMsg, e); - } - } - } - else - throw new IgniteSpiException(errMsg); - } - - /** {@inheritDoc} */ - @Override public synchronized Collection<InetSocketAddress> getRegisteredAddresses() { - return Collections.unmodifiableCollection(addrs); - } - - /** {@inheritDoc} */ - @Override public synchronized void registerAddresses(Collection<InetSocketAddress> addrs) { - assert !F.isEmpty(addrs); - - this.addrs = new LinkedHashSet<>(this.addrs); - - this.addrs.addAll(addrs); - } - - /** {@inheritDoc} */ - @Override public synchronized void unregisterAddresses(Collection<InetSocketAddress> addrs) { - assert !F.isEmpty(addrs); - - this.addrs = new LinkedHashSet<>(this.addrs); - - this.addrs.removeAll(addrs); - } - - /** {@inheritDoc} */ - @Override public String toString() { - return S.toString(GridTcpDiscoveryVmIpFinder.class, this, "super", super.toString()); - } -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/717180b3/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/vm/TcpDiscoveryVmIpFinder.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/vm/TcpDiscoveryVmIpFinder.java b/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/vm/TcpDiscoveryVmIpFinder.java new file mode 100644 index 0000000..fdcee08 --- /dev/null +++ b/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/vm/TcpDiscoveryVmIpFinder.java @@ -0,0 +1,255 @@ +/* @java.file.header */ + +/* _________ _____ __________________ _____ + * __ ____/___________(_)______ /__ ____/______ ____(_)_______ + * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \ + * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / / + * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/ + */ + +package org.gridgain.grid.spi.discovery.tcp.ipfinder.vm; + +import org.apache.ignite.*; +import org.apache.ignite.resources.*; +import org.apache.ignite.spi.*; +import org.gridgain.grid.*; +import org.gridgain.grid.spi.discovery.tcp.ipfinder.*; +import org.gridgain.grid.util.tostring.*; +import org.gridgain.grid.util.typedef.*; +import org.gridgain.grid.util.typedef.internal.*; + +import java.net.*; +import java.util.*; + +import static org.apache.ignite.IgniteSystemProperties.*; + +/** + * IP Finder which works only with pre-configured list of IP addresses specified + * via {@link #setAddresses(Collection)} method. By default, this IP finder is + * not {@code shared}, which means that all grid nodes have to be configured with the + * same list of IP addresses when this IP finder is used. + * <h1 class="header">Configuration</h1> + * <h2 class="header">Mandatory</h2> + * There are no mandatory configuration parameters. + * <h2 class="header">Optional</h2> + * <ul> + * <li>Addresses for initialization (see {@link #setAddresses(Collection)})</li> + * <li>Shared flag (see {@link #setShared(boolean)})</li> + * </ul> + */ +public class TcpDiscoveryVmIpFinder extends TcpDiscoveryIpFinderAdapter { + /** Grid logger. */ + @IgniteLoggerResource + private IgniteLogger log; + + /** Addresses. */ + @GridToStringInclude + private Collection<InetSocketAddress> addrs; + + /** + * Initialize from system property. + */ + { + String ips = IgniteSystemProperties.getString(GG_TCP_DISCOVERY_ADDRESSES); + + if (!F.isEmpty(ips)) { + Collection<InetSocketAddress> addrsList = new LinkedHashSet<>(); + + for (String s : ips.split(",")) { + if (!F.isEmpty(s)) { + s = s.trim(); + + if (!F.isEmpty(s)) { + try { + addrsList.addAll(address(s)); + } + catch (IgniteSpiException e) { + throw new GridRuntimeException(e); + } + } + } + } + + addrs = addrsList; + } + else + addrs = new LinkedHashSet<>(); + } + + /** + * Constructs new IP finder. + */ + public TcpDiscoveryVmIpFinder() { + // No-op. + } + + /** + * Constructs new IP finder. + * + * @param shared {@code true} if IP finder is shared. + * @see #setShared(boolean) + */ + public TcpDiscoveryVmIpFinder(boolean shared) { + setShared(shared); + } + + /** + * Parses provided values and initializes the internal collection of addresses. + * <p> + * Addresses may be represented as follows: + * <ul> + * <li>IP address (e.g. 127.0.0.1, 9.9.9.9, etc);</li> + * <li>IP address and port (e.g. 127.0.0.1:47500, 9.9.9.9:47501, etc);</li> + * <li>IP address and port range (e.g. 127.0.0.1:47500..47510, 9.9.9.9:47501..47504, etc);</li> + * <li>Hostname (e.g. host1.com, host2, etc);</li> + * <li>Hostname and port (e.g. host1.com:47500, host2:47502, etc).</li> + * <li>Hostname and port range (e.g. host1.com:47500..47510, host2:47502..47508, etc).</li> + * </ul> + * <p> + * If port is 0 or not provided then default port will be used (depends on + * discovery SPI configuration). + * <p> + * If port range is provided (e.g. host:port1..port2) the following should be considered: + * <ul> + * <li>{@code port1 < port2} should be {@code true};</li> + * <li>Both {@code port1} and {@code port2} should be greater than {@code 0}.</li> + * </ul> + * + * @param addrs Known nodes addresses. + * @throws org.apache.ignite.spi.IgniteSpiException If any error occurs. + */ + @IgniteSpiConfiguration(optional = true) + public synchronized void setAddresses(Collection<String> addrs) throws IgniteSpiException { + if (F.isEmpty(addrs)) + return; + + Collection<InetSocketAddress> newAddrs = new LinkedHashSet<>(); + + for (String ipStr : addrs) + newAddrs.addAll(address(ipStr)); + + this.addrs = newAddrs; + } + + /** + * Creates address from string. + * + * @param ipStr Address string. + * @return Socket addresses (may contain 1 or more addresses if provided string + * includes port range). + * @throws org.apache.ignite.spi.IgniteSpiException If failed. + */ + private static Collection<InetSocketAddress> address(String ipStr) throws IgniteSpiException { + ipStr = ipStr.trim(); + + String errMsg = "Failed to parse provided address: " + ipStr; + + int colonCnt = ipStr.length() - ipStr.replace(":", "").length(); + + if (colonCnt > 1) { + // IPv6 address (literal IPv6 addresses are enclosed in square brackets, for example + // https://[2001:db8:85a3:8d3:1319:8a2e:370:7348]:443). + if (ipStr.startsWith("[")) { + ipStr = ipStr.substring(1); + + if (ipStr.contains("]:")) + return addresses(ipStr, "\\]\\:", errMsg); + else if (ipStr.endsWith("]")) + ipStr = ipStr.substring(0, ipStr.length() - 1); + else + throw new IgniteSpiException(errMsg); + } + } + else { + // IPv4 address. + if (ipStr.endsWith(":")) + ipStr = ipStr.substring(0, ipStr.length() - 1); + else if (ipStr.indexOf(':') >= 0) + return addresses(ipStr, "\\:", errMsg); + } + + // Provided address does not contain port (will use default one). + return Collections.singleton(new InetSocketAddress(ipStr, 0)); + } + + /** + * Creates address from string with port information. + * + * @param ipStr Address string + * @param regexDelim Port regex delimiter. + * @param errMsg Error message. + * @return Socket addresses (may contain 1 or more addresses if provided string + * includes port range). + * @throws org.apache.ignite.spi.IgniteSpiException If failed. + */ + private static Collection<InetSocketAddress> addresses(String ipStr, String regexDelim, String errMsg) + throws IgniteSpiException { + String[] tokens = ipStr.split(regexDelim); + + if (tokens.length == 2) { + String addrStr = tokens[0]; + String portStr = tokens[1]; + + if (portStr.contains("..")) { + try { + int port1 = Integer.parseInt(portStr.substring(0, portStr.indexOf(".."))); + int port2 = Integer.parseInt(portStr.substring(portStr.indexOf("..") + 2, portStr.length())); + + if (port2 < port1 || port1 == port2 || port1 <= 0 || port2 <= 0) + throw new IgniteSpiException(errMsg); + + Collection<InetSocketAddress> res = new ArrayList<>(port2 - port1); + + // Upper bound included. + for (int i = port1; i <= port2; i++) + res.add(new InetSocketAddress(addrStr, i)); + + return res; + } + catch (IllegalArgumentException e) { + throw new IgniteSpiException(errMsg, e); + } + } + else { + try { + int port = Integer.parseInt(portStr); + + return Collections.singleton(new InetSocketAddress(addrStr, port)); + } + catch (IllegalArgumentException e) { + throw new IgniteSpiException(errMsg, e); + } + } + } + else + throw new IgniteSpiException(errMsg); + } + + /** {@inheritDoc} */ + @Override public synchronized Collection<InetSocketAddress> getRegisteredAddresses() { + return Collections.unmodifiableCollection(addrs); + } + + /** {@inheritDoc} */ + @Override public synchronized void registerAddresses(Collection<InetSocketAddress> addrs) { + assert !F.isEmpty(addrs); + + this.addrs = new LinkedHashSet<>(this.addrs); + + this.addrs.addAll(addrs); + } + + /** {@inheritDoc} */ + @Override public synchronized void unregisterAddresses(Collection<InetSocketAddress> addrs) { + assert !F.isEmpty(addrs); + + this.addrs = new LinkedHashSet<>(this.addrs); + + this.addrs.removeAll(addrs); + } + + /** {@inheritDoc} */ + @Override public String toString() { + return S.toString(TcpDiscoveryVmIpFinder.class, this, "super", super.toString()); + } +} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/717180b3/modules/core/src/test/config/benchmark/spring-cache-client-benchmark-1.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/benchmark/spring-cache-client-benchmark-1.xml b/modules/core/src/test/config/benchmark/spring-cache-client-benchmark-1.xml index 47175de..4d0d4d7 100644 --- a/modules/core/src/test/config/benchmark/spring-cache-client-benchmark-1.xml +++ b/modules/core/src/test/config/benchmark/spring-cache-client-benchmark-1.xml @@ -98,7 +98,7 @@ <property name="discoverySpi"> <bean class="org.gridgain.grid.spi.discovery.tcp.TcpDiscoverySpi"> <property name="ipFinder"> - <bean class="org.gridgain.grid.spi.discovery.tcp.ipfinder.vm.GridTcpDiscoveryVmIpFinder"> + <bean class="org.gridgain.grid.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder"> <property name="addresses"> <list> <!-- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/717180b3/modules/core/src/test/config/benchmark/spring-cache-client-benchmark-2.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/benchmark/spring-cache-client-benchmark-2.xml b/modules/core/src/test/config/benchmark/spring-cache-client-benchmark-2.xml index 19a5c88..2aa4ba5 100644 --- a/modules/core/src/test/config/benchmark/spring-cache-client-benchmark-2.xml +++ b/modules/core/src/test/config/benchmark/spring-cache-client-benchmark-2.xml @@ -88,7 +88,7 @@ <property name="discoverySpi"> <bean class="org.gridgain.grid.spi.discovery.tcp.TcpDiscoverySpi"> <property name="ipFinder"> - <bean class="org.gridgain.grid.spi.discovery.tcp.ipfinder.vm.GridTcpDiscoveryVmIpFinder"> + <bean class="org.gridgain.grid.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder"> <property name="addresses"> <list> <!-- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/717180b3/modules/core/src/test/config/benchmark/spring-cache-client-benchmark-3.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/benchmark/spring-cache-client-benchmark-3.xml b/modules/core/src/test/config/benchmark/spring-cache-client-benchmark-3.xml index 6ff84e0..b807184 100644 --- a/modules/core/src/test/config/benchmark/spring-cache-client-benchmark-3.xml +++ b/modules/core/src/test/config/benchmark/spring-cache-client-benchmark-3.xml @@ -88,7 +88,7 @@ <property name="discoverySpi"> <bean class="org.gridgain.grid.spi.discovery.tcp.TcpDiscoverySpi"> <property name="ipFinder"> - <bean class="org.gridgain.grid.spi.discovery.tcp.ipfinder.vm.GridTcpDiscoveryVmIpFinder"> + <bean class="org.gridgain.grid.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder"> <property name="addresses"> <list> <!-- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/717180b3/modules/core/src/test/config/discovery-stress.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/discovery-stress.xml b/modules/core/src/test/config/discovery-stress.xml index e8becc5..1b8f421 100644 --- a/modules/core/src/test/config/discovery-stress.xml +++ b/modules/core/src/test/config/discovery-stress.xml @@ -44,7 +44,7 @@ <property name="ackTimeout" value="10000"/> <property name="reconnectCount" value="3"/> <property name="ipFinder"> - <bean class="org.gridgain.grid.spi.discovery.tcp.ipfinder.vm.GridTcpDiscoveryVmIpFinder"> + <bean class="org.gridgain.grid.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder"> <property name="addresses"> <list> <value>fosters-210:47500</value> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/717180b3/modules/core/src/test/config/example-cache.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/example-cache.xml b/modules/core/src/test/config/example-cache.xml index e369809..aff7229 100644 --- a/modules/core/src/test/config/example-cache.xml +++ b/modules/core/src/test/config/example-cache.xml @@ -106,7 +106,7 @@ <property name="ipFinder"> <!-- Uncomment multicast IP finder to enable multicast-based discovery of initial nodes. --> <!--<bean class="org.gridgain.grid.spi.discovery.tcp.ipfinder.multicast.GridTcpDiscoveryMulticastIpFinder">--> - <bean class="org.gridgain.grid.spi.discovery.tcp.ipfinder.vm.GridTcpDiscoveryVmIpFinder"> + <bean class="org.gridgain.grid.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder"> <property name="addresses"> <list> <!-- In distributed environment, replace with actual host IP address. --> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/717180b3/modules/core/src/test/config/ggfs-loopback.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/ggfs-loopback.xml b/modules/core/src/test/config/ggfs-loopback.xml index 37f3bb6..450a72a 100644 --- a/modules/core/src/test/config/ggfs-loopback.xml +++ b/modules/core/src/test/config/ggfs-loopback.xml @@ -149,7 +149,7 @@ <bean class="org.gridgain.grid.spi.discovery.tcp.TcpDiscoverySpi"> <!-- Override default IP-finder.--> <property name="ipFinder"> - <bean class="org.gridgain.grid.spi.discovery.tcp.ipfinder.vm.GridTcpDiscoveryVmIpFinder"> + <bean class="org.gridgain.grid.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder"> <property name="addresses"> <list> <!-- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/717180b3/modules/core/src/test/config/ggfs-no-endpoint.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/ggfs-no-endpoint.xml b/modules/core/src/test/config/ggfs-no-endpoint.xml index 247259f..ecd68e9 100644 --- a/modules/core/src/test/config/ggfs-no-endpoint.xml +++ b/modules/core/src/test/config/ggfs-no-endpoint.xml @@ -149,7 +149,7 @@ <bean class="org.gridgain.grid.spi.discovery.tcp.TcpDiscoverySpi"> <!-- Override default IP-finder.--> <property name="ipFinder"> - <bean class="org.gridgain.grid.spi.discovery.tcp.ipfinder.vm.GridTcpDiscoveryVmIpFinder"> + <bean class="org.gridgain.grid.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder"> <property name="addresses"> <list> <!-- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/717180b3/modules/core/src/test/config/ggfs-shmem.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/ggfs-shmem.xml b/modules/core/src/test/config/ggfs-shmem.xml index 9d58a0d..d264ffb 100644 --- a/modules/core/src/test/config/ggfs-shmem.xml +++ b/modules/core/src/test/config/ggfs-shmem.xml @@ -149,7 +149,7 @@ <bean class="org.gridgain.grid.spi.discovery.tcp.TcpDiscoverySpi"> <!-- Override default IP-finder.--> <property name="ipFinder"> - <bean class="org.gridgain.grid.spi.discovery.tcp.ipfinder.vm.GridTcpDiscoveryVmIpFinder"> + <bean class="org.gridgain.grid.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder"> <property name="addresses"> <list> <!-- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/717180b3/modules/core/src/test/config/io-manager-benchmark.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/io-manager-benchmark.xml b/modules/core/src/test/config/io-manager-benchmark.xml index d048c40..0566a47 100644 --- a/modules/core/src/test/config/io-manager-benchmark.xml +++ b/modules/core/src/test/config/io-manager-benchmark.xml @@ -58,7 +58,7 @@ <property name="discoverySpi"> <bean class="org.gridgain.grid.spi.discovery.tcp.TcpDiscoverySpi"> <property name="ipFinder"> - <bean class="org.gridgain.grid.spi.discovery.tcp.ipfinder.vm.GridTcpDiscoveryVmIpFinder"> + <bean class="org.gridgain.grid.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder"> <property name="addresses"> <list> <value>127.0.0.1:47500</value> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/717180b3/modules/core/src/test/config/job-loadtest/client.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/job-loadtest/client.xml b/modules/core/src/test/config/job-loadtest/client.xml index 8ccb7e3..2ad72f5 100644 --- a/modules/core/src/test/config/job-loadtest/client.xml +++ b/modules/core/src/test/config/job-loadtest/client.xml @@ -86,7 +86,7 @@ <property name="discoverySpi"> <bean class="org.gridgain.grid.spi.discovery.tcp.TcpDiscoverySpi"> <property name="ipFinder"> - <bean class="org.gridgain.grid.spi.discovery.tcp.ipfinder.vm.GridTcpDiscoveryVmIpFinder"> + <bean class="org.gridgain.grid.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder"> <property name="addresses"> <list> <!-- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/717180b3/modules/core/src/test/config/job-loadtest/server.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/job-loadtest/server.xml b/modules/core/src/test/config/job-loadtest/server.xml index ca18c86..8009d6a 100644 --- a/modules/core/src/test/config/job-loadtest/server.xml +++ b/modules/core/src/test/config/job-loadtest/server.xml @@ -59,7 +59,7 @@ <property name="discoverySpi"> <bean class="org.gridgain.grid.spi.discovery.tcp.TcpDiscoverySpi"> <property name="ipFinder"> - <bean class="org.gridgain.grid.spi.discovery.tcp.ipfinder.vm.GridTcpDiscoveryVmIpFinder"> + <bean class="org.gridgain.grid.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder"> <property name="addresses"> <list> <!-- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/717180b3/modules/core/src/test/config/jobs-load-base.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/jobs-load-base.xml b/modules/core/src/test/config/jobs-load-base.xml index 475a763..df43b94 100644 --- a/modules/core/src/test/config/jobs-load-base.xml +++ b/modules/core/src/test/config/jobs-load-base.xml @@ -31,7 +31,7 @@ <property name="discoverySpi"> <bean class="org.gridgain.grid.spi.discovery.tcp.TcpDiscoverySpi"> <property name="ipFinder"> - <bean class="org.gridgain.grid.spi.discovery.tcp.ipfinder.vm.GridTcpDiscoveryVmIpFinder"> + <bean class="org.gridgain.grid.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder"> <property name="addresses"> <list> <!-- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/717180b3/modules/core/src/test/config/load/cache-benchmark.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/load/cache-benchmark.xml b/modules/core/src/test/config/load/cache-benchmark.xml index 6b3a9b8..c6608c5 100644 --- a/modules/core/src/test/config/load/cache-benchmark.xml +++ b/modules/core/src/test/config/load/cache-benchmark.xml @@ -68,7 +68,7 @@ <property name="discoverySpi"> <bean class="org.gridgain.grid.spi.discovery.tcp.TcpDiscoverySpi"> <property name="ipFinder"> - <bean class="org.gridgain.grid.spi.discovery.tcp.ipfinder.vm.GridTcpDiscoveryVmIpFinder"> + <bean class="org.gridgain.grid.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder"> <property name="addresses"> <list> <value>127.0.0.1:47500</value> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/717180b3/modules/core/src/test/config/load/cache-client-benchmark.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/load/cache-client-benchmark.xml b/modules/core/src/test/config/load/cache-client-benchmark.xml index 4f71491..668c315 100644 --- a/modules/core/src/test/config/load/cache-client-benchmark.xml +++ b/modules/core/src/test/config/load/cache-client-benchmark.xml @@ -68,7 +68,7 @@ <property name="discoverySpi"> <bean class="org.gridgain.grid.spi.discovery.tcp.TcpDiscoverySpi"> <property name="ipFinder"> - <bean class="org.gridgain.grid.spi.discovery.tcp.ipfinder.vm.GridTcpDiscoveryVmIpFinder"> + <bean class="org.gridgain.grid.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder"> <property name="addresses"> <list> <value>127.0.0.1:47500</value> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/717180b3/modules/core/src/test/config/load/dsi-load-base.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/load/dsi-load-base.xml b/modules/core/src/test/config/load/dsi-load-base.xml index fb937a3..8476ba8 100644 --- a/modules/core/src/test/config/load/dsi-load-base.xml +++ b/modules/core/src/test/config/load/dsi-load-base.xml @@ -46,7 +46,7 @@ <bean class="org.gridgain.grid.spi.discovery.tcp.TcpDiscoverySpi"> <property name="ipFinder"> <bean - class="org.gridgain.grid.spi.discovery.tcp.ipfinder.vm.GridTcpDiscoveryVmIpFinder"> + class="org.gridgain.grid.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder"> <property name="addresses"> <list> <value>127.0.0.1:47500</value> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/717180b3/modules/core/src/test/config/load/merge-sort-base.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/load/merge-sort-base.xml b/modules/core/src/test/config/load/merge-sort-base.xml index 882c1bc..3bb3645 100644 --- a/modules/core/src/test/config/load/merge-sort-base.xml +++ b/modules/core/src/test/config/load/merge-sort-base.xml @@ -108,7 +108,7 @@ <property name="statisticsPrintFrequency" value="60000"/> <property name="ipFinder"> - <bean class="org.gridgain.grid.spi.discovery.tcp.ipfinder.vm.GridTcpDiscoveryVmIpFinder"> + <bean class="org.gridgain.grid.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder"> <property name="addresses"> <list> <value>127.0.0.1:47500</value> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/717180b3/modules/core/src/test/config/load/mongo-multinode-foster.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/load/mongo-multinode-foster.xml b/modules/core/src/test/config/load/mongo-multinode-foster.xml index cde3373..d8a6587 100644 --- a/modules/core/src/test/config/load/mongo-multinode-foster.xml +++ b/modules/core/src/test/config/load/mongo-multinode-foster.xml @@ -134,7 +134,7 @@ <bean class="org.gridgain.grid.spi.discovery.tcp.TcpDiscoverySpi"> <!-- Override default IP-finder.--> <property name="ipFinder"> - <bean class="org.gridgain.grid.spi.discovery.tcp.ipfinder.vm.GridTcpDiscoveryVmIpFinder"> + <bean class="org.gridgain.grid.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder"> <property name="addresses"> <list> <value>10.1.10.212:47500</value> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/717180b3/modules/core/src/test/config/spring-cache-load.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/spring-cache-load.xml b/modules/core/src/test/config/spring-cache-load.xml index 4e96521..550ef79 100644 --- a/modules/core/src/test/config/spring-cache-load.xml +++ b/modules/core/src/test/config/spring-cache-load.xml @@ -59,7 +59,7 @@ <property name="discoverySpi"> <bean class="org.gridgain.grid.spi.discovery.tcp.TcpDiscoverySpi"> <property name="ipFinder"> - <bean class="org.gridgain.grid.spi.discovery.tcp.ipfinder.vm.GridTcpDiscoveryVmIpFinder"> + <bean class="org.gridgain.grid.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder"> <property name="addresses"> <list> <!-- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/717180b3/modules/core/src/test/config/spring-cache-put-remove-load.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/spring-cache-put-remove-load.xml b/modules/core/src/test/config/spring-cache-put-remove-load.xml index e0aaafe..513e300 100644 --- a/modules/core/src/test/config/spring-cache-put-remove-load.xml +++ b/modules/core/src/test/config/spring-cache-put-remove-load.xml @@ -56,7 +56,7 @@ <property name="discoverySpi"> <bean class="org.gridgain.grid.spi.discovery.tcp.TcpDiscoverySpi"> <property name="ipFinder"> - <bean class="org.gridgain.grid.spi.discovery.tcp.ipfinder.vm.GridTcpDiscoveryVmIpFinder"> + <bean class="org.gridgain.grid.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder"> <property name="addresses"> <list> <value>127.0.0.1:47500</value> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/717180b3/modules/core/src/test/config/spring-cache-swap.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/spring-cache-swap.xml b/modules/core/src/test/config/spring-cache-swap.xml index eed5391..5873e95 100644 --- a/modules/core/src/test/config/spring-cache-swap.xml +++ b/modules/core/src/test/config/spring-cache-swap.xml @@ -49,7 +49,7 @@ <property name="discoverySpi"> <bean class="org.gridgain.grid.spi.discovery.tcp.TcpDiscoverySpi"> <property name="ipFinder"> - <bean class="org.gridgain.grid.spi.discovery.tcp.ipfinder.vm.GridTcpDiscoveryVmIpFinder"> + <bean class="org.gridgain.grid.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder"> <property name="addresses"> <list> <value>127.0.0.1:47500</value> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/717180b3/modules/core/src/test/config/spring-cache-teststore.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/spring-cache-teststore.xml b/modules/core/src/test/config/spring-cache-teststore.xml index c08a630..bd139e6 100644 --- a/modules/core/src/test/config/spring-cache-teststore.xml +++ b/modules/core/src/test/config/spring-cache-teststore.xml @@ -45,7 +45,7 @@ <property name="discoverySpi"> <bean class="org.gridgain.grid.spi.discovery.tcp.TcpDiscoverySpi"> <property name="ipFinder"> - <bean class="org.gridgain.grid.spi.discovery.tcp.ipfinder.vm.GridTcpDiscoveryVmIpFinder"> + <bean class="org.gridgain.grid.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder"> <property name="addresses"> <list> <value>127.0.0.1:47500</value> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/717180b3/modules/core/src/test/config/spring-multicache.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/spring-multicache.xml b/modules/core/src/test/config/spring-multicache.xml index e8e3be3..fc3e030 100644 --- a/modules/core/src/test/config/spring-multicache.xml +++ b/modules/core/src/test/config/spring-multicache.xml @@ -257,7 +257,7 @@ <property name="discoverySpi"> <bean class="org.gridgain.grid.spi.discovery.tcp.TcpDiscoverySpi"> <property name="ipFinder"> - <bean class="org.gridgain.grid.spi.discovery.tcp.ipfinder.vm.GridTcpDiscoveryVmIpFinder"> + <bean class="org.gridgain.grid.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder"> <property name="addresses"> <list> <!-- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/717180b3/modules/core/src/test/config/spring-start-nodes-attr.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/spring-start-nodes-attr.xml b/modules/core/src/test/config/spring-start-nodes-attr.xml index 13cbe45..b7aa38e 100644 --- a/modules/core/src/test/config/spring-start-nodes-attr.xml +++ b/modules/core/src/test/config/spring-start-nodes-attr.xml @@ -39,7 +39,7 @@ <property name="discoverySpi"> <bean class="org.gridgain.grid.spi.discovery.tcp.TcpDiscoverySpi"> <property name="ipFinder"> - <bean class="org.gridgain.grid.spi.discovery.tcp.ipfinder.vm.GridTcpDiscoveryVmIpFinder"> + <bean class="org.gridgain.grid.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder"> <property name="addresses"> <list> <value>127.0.0.1:47500</value> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/717180b3/modules/core/src/test/config/spring-start-nodes.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/spring-start-nodes.xml b/modules/core/src/test/config/spring-start-nodes.xml index 0114dcf..e4246cb 100644 --- a/modules/core/src/test/config/spring-start-nodes.xml +++ b/modules/core/src/test/config/spring-start-nodes.xml @@ -33,7 +33,7 @@ <property name="discoverySpi"> <bean class="org.gridgain.grid.spi.discovery.tcp.TcpDiscoverySpi"> <property name="ipFinder"> - <bean class="org.gridgain.grid.spi.discovery.tcp.ipfinder.vm.GridTcpDiscoveryVmIpFinder"> + <bean class="org.gridgain.grid.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder"> <property name="addresses"> <list> <value>127.0.0.1:47500</value> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/717180b3/modules/core/src/test/config/streamer/spring-streamer-base.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/streamer/spring-streamer-base.xml b/modules/core/src/test/config/streamer/spring-streamer-base.xml index 4904988..b241f8e 100644 --- a/modules/core/src/test/config/streamer/spring-streamer-base.xml +++ b/modules/core/src/test/config/streamer/spring-streamer-base.xml @@ -68,7 +68,7 @@ <property name="maxMissedHeartbeats" value="3"/> <property name="ipFinder"> - <bean class="org.gridgain.grid.spi.discovery.tcp.ipfinder.vm.GridTcpDiscoveryVmIpFinder"> + <bean class="org.gridgain.grid.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder"> <property name="addresses"> <list> <value>127.0.0.1:47500</value> @@ -84,7 +84,7 @@ <bean id="discoSpi" class="org.gridgain.grid.spi.discovery.tcp.TcpDiscoverySpi"> <property name="ipFinder"> - <bean class="org.gridgain.grid.spi.discovery.tcp.ipfinder.vm.GridTcpDiscoveryVmIpFinder"> + <bean class="org.gridgain.grid.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder"> <property name="addresses"> <list> <value>10.1.10.210</value> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/717180b3/modules/core/src/test/config/websession/spring-cache-1.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/websession/spring-cache-1.xml b/modules/core/src/test/config/websession/spring-cache-1.xml index d4e9c8c..31b75da 100644 --- a/modules/core/src/test/config/websession/spring-cache-1.xml +++ b/modules/core/src/test/config/websession/spring-cache-1.xml @@ -80,7 +80,7 @@ <property name="discoverySpi"> <bean class="org.gridgain.grid.spi.discovery.tcp.TcpDiscoverySpi"> <property name="ipFinder"> - <bean class="org.gridgain.grid.spi.discovery.tcp.ipfinder.vm.GridTcpDiscoveryVmIpFinder"> + <bean class="org.gridgain.grid.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder"> <property name="addresses"> <list> <value>127.0.0.1:47500</value> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/717180b3/modules/core/src/test/config/websession/spring-cache-2.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/websession/spring-cache-2.xml b/modules/core/src/test/config/websession/spring-cache-2.xml index 6786226..35f8f41 100644 --- a/modules/core/src/test/config/websession/spring-cache-2.xml +++ b/modules/core/src/test/config/websession/spring-cache-2.xml @@ -80,7 +80,7 @@ <property name="discoverySpi"> <bean class="org.gridgain.grid.spi.discovery.tcp.TcpDiscoverySpi"> <property name="ipFinder"> - <bean class="org.gridgain.grid.spi.discovery.tcp.ipfinder.vm.GridTcpDiscoveryVmIpFinder"> + <bean class="org.gridgain.grid.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder"> <property name="addresses"> <list> <value>127.0.0.1:47500</value> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/717180b3/modules/core/src/test/config/websession/spring-cache-3.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/websession/spring-cache-3.xml b/modules/core/src/test/config/websession/spring-cache-3.xml index d27dc8e..bc24f47 100644 --- a/modules/core/src/test/config/websession/spring-cache-3.xml +++ b/modules/core/src/test/config/websession/spring-cache-3.xml @@ -80,7 +80,7 @@ <property name="discoverySpi"> <bean class="org.gridgain.grid.spi.discovery.tcp.TcpDiscoverySpi"> <property name="ipFinder"> - <bean class="org.gridgain.grid.spi.discovery.tcp.ipfinder.vm.GridTcpDiscoveryVmIpFinder"> + <bean class="org.gridgain.grid.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder"> <property name="addresses"> <list> <value>127.0.0.1:47500</value> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/717180b3/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 7fbed15..0a1797a 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 @@ -47,13 +47,13 @@ public class GridOptimizedMarshallerTest extends GridCommonAbstractTest { marsh.setRequireSerializable(false); - byte[] bytes = marsh.marshal(new GridTcpDiscoveryVmIpFinder()); + byte[] bytes = marsh.marshal(new TcpDiscoveryVmIpFinder()); TcpDiscoveryIpFinder ipFinder = marsh.unmarshal(bytes, null); assertFalse(ipFinder.isShared()); - ipFinder = marsh.unmarshal(marsh.marshal(new GridTcpDiscoveryVmIpFinder(true)), null); + ipFinder = marsh.unmarshal(marsh.marshal(new TcpDiscoveryVmIpFinder(true)), null); assertTrue(ipFinder.isShared()); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/717180b3/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 9058f8d..4dcdd7e 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 TcpDiscoveryIpFinder IP_FINDER = new GridTcpDiscoveryVmIpFinder(true); + private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); /** Data cache name. */ private static final String DATA_CACHE = null;
