ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [50/50] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-sprint-3' into ignite-560
Date Mon, 13 Apr 2015 07:14:16 GMT
Merge remote-tracking branch 'remotes/origin/ignite-sprint-3' into ignite-560


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

Branch: refs/heads/ignite-560
Commit: 9c751573af0c8dd49a9e7f6248865969c82fbe24
Parents: 7d39661 fceebf2
Author: sboikov <sboikov@gridgain.com>
Authored: Mon Apr 13 10:10:00 2015 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Mon Apr 13 10:10:00 2015 +0300

----------------------------------------------------------------------
 DEVNOTES.txt                                    |    6 +-
 RELEASE_NOTES.txt                               |   13 +
 assembly/release-fabric.xml                     |    5 -
 assembly/release-hadoop.xml                     |    4 -
 bin/ignite.bat                                  |    2 +-
 bin/ignite.sh                                   |    2 +-
 bin/ignitevisorcmd.bat                          |   39 +-
 bin/include/service.sh                          |    8 +-
 config/hadoop/default-config.xml                |   15 +-
 examples/README.txt                             |   11 +-
 examples/config/example-ignite.xml              |    2 +-
 examples/pom.xml                                |    2 +-
 .../examples/datagrid/CacheAffinityExample.java |    9 +-
 .../examples/datagrid/CacheApiExample.java      |    9 +-
 .../examples/datagrid/CacheAsyncApiExample.java |    9 +-
 .../datagrid/CacheContinuousQueryExample.java   |    8 +-
 .../datagrid/CacheDataStreamerExample.java      |    9 +-
 .../examples/datagrid/CacheEventsExample.java   |    9 +-
 .../examples/datagrid/CachePutGetExample.java   |   10 +-
 .../datagrid/CacheTransactionExample.java       |    8 +-
 .../hibernate/HibernateL2CacheExample.java      |    5 +-
 .../starschema/CacheStarSchemaExample.java      |   10 +-
 .../store/auto/CacheAutoStoreExample.java       |    8 +-
 .../auto/CacheAutoStoreLoadDataExample.java     |    5 +-
 .../datagrid/store/auto/CacheConfig.java        |    4 +-
 .../store/dummy/CacheDummyStoreExample.java     |    5 +-
 .../hibernate/CacheHibernateStoreExample.java   |    5 +-
 .../store/jdbc/CacheJdbcStoreExample.java       |    5 +-
 .../datastructures/IgniteQueueExample.java      |   28 +-
 .../datastructures/IgniteSetExample.java        |   30 +-
 .../streaming/StreamTransformerExample.java     |  100 +
 .../streaming/StreamVisitorExample.java         |  168 +
 .../streaming/marketdata/CacheConfig.java       |   44 -
 .../streaming/marketdata/Instrument.java        |  106 -
 .../marketdata/QueryTopInstruments.java         |   73 -
 .../streaming/marketdata/StreamMarketData.java  |  103 -
 .../examples/streaming/numbers/CacheConfig.java |   46 -
 .../streaming/numbers/QueryPopularNumbers.java  |   74 -
 .../streaming/numbers/StreamRandomNumbers.java  |   78 -
 .../streaming/wordcount/CacheConfig.java        |   53 +
 .../streaming/wordcount/QueryWords.java         |   79 +
 .../streaming/wordcount/StreamWords.java        |   68 +
 .../streaming/wordcount/alice-in-wonderland.txt | 3735 ++++++++++++++++++
 .../streaming/wordcount/package-info.java       |   22 +
 .../streaming/StreamTransformerExample.java     |   97 +
 .../java8/streaming/StreamVisitorExample.java   |  168 +
 .../java8/streaming/marketdata/CacheConfig.java |   44 -
 .../java8/streaming/marketdata/Instrument.java  |  106 -
 .../marketdata/QueryTopInstruments.java         |   73 -
 .../streaming/marketdata/StreamMarketData.java  |  101 -
 .../java8/streaming/numbers/CacheConfig.java    |   46 -
 .../streaming/numbers/QueryPopularNumbers.java  |   74 -
 .../streaming/numbers/StreamRandomNumbers.java  |   74 -
 .../examples/MessagingExamplesSelfTest.java     |    2 +-
 .../java8/examples/BasicExamplesSelfTest.java   |    3 +
 .../java8/examples/CacheExamplesSelfTest.java   |    4 +
 .../examples/CheckpointExamplesSelfTest.java    |    3 +
 .../examples/ClusterGroupExampleSelfTest.java   |    3 +-
 .../examples/ContinuationExamplesSelfTest.java  |    3 +
 .../ContinuousMapperExamplesSelfTest.java       |    4 +-
 .../DeploymentExamplesMultiNodeSelfTest.java    |    2 +
 .../examples/DeploymentExamplesSelfTest.java    |    2 +
 .../HibernateL2CacheExampleSelfTest.java        |    3 +
 .../java8/examples/IgfsExamplesSelfTest.java    |    3 +
 .../examples/LifecycleExamplesSelfTest.java     |    3 +
 .../MemcacheRestExamplesMultiNodeSelfTest.java  |    2 +
 .../examples/MemcacheRestExamplesSelfTest.java  |    2 +
 .../examples/MessagingExamplesSelfTest.java     |    4 +-
 .../examples/MonteCarloExamplesSelfTest.java    |    3 +
 .../examples/SpringBeanExamplesSelfTest.java    |    3 +
 .../java8/examples/TaskExamplesSelfTest.java    |    2 +
 modules/aop/pom.xml                             |    2 +-
 modules/aws/pom.xml                             |    2 +-
 modules/clients/pom.xml                         |    2 +-
 modules/clients/readme.md                       |    2 -
 .../client/ClientReconnectionSelfTest.java      |   69 +-
 modules/codegen/pom.xml                         |    2 +-
 .../ignite/codegen/MessageCodeGenerator.java    |    1 -
 modules/core/pom.xml                            |    4 +-
 .../src/main/java/org/apache/ignite/Ignite.java |   26 +
 .../java/org/apache/ignite/IgniteCache.java     |   26 +-
 .../java/org/apache/ignite/IgniteCluster.java   |   11 +-
 .../java/org/apache/ignite/IgniteState.java     |    2 +-
 .../apache/ignite/IgniteSystemProperties.java   |    7 +
 .../ignite/cache/affinity/AffinityUuid.java     |   50 +
 .../cache/eviction/fifo/FifoEvictionPolicy.java |   58 +-
 .../eviction/fifo/FifoEvictionPolicyMBean.java  |   16 +
 .../apache/ignite/cache/query/ScanQuery.java    |    2 +-
 .../ignite/cache/query/SqlFieldsQuery.java      |   55 +-
 .../store/jdbc/CacheAbstractJdbcStore.java      |  104 +-
 .../ignite/cluster/ClusterStartNodeResult.java  |   46 +
 .../configuration/CacheConfiguration.java       |   61 +-
 .../configuration/CollectionConfiguration.java  |  114 +-
 .../configuration/IgniteConfiguration.java      |   35 +-
 .../ignite/internal/ClusterMetricsSnapshot.java |  385 +-
 .../internal/ComputeTaskInternalFuture.java     |    2 +-
 .../apache/ignite/internal/GridComponent.java   |    7 +-
 .../ignite/internal/GridJobExecuteRequest.java  |   10 +-
 .../ignite/internal/GridJobExecuteResponse.java |    4 +-
 .../ignite/internal/GridKernalContextImpl.java  |    3 +-
 .../ignite/internal/GridPluginComponent.java    |    9 +-
 .../ignite/internal/GridPluginContext.java      |   15 +-
 .../apache/ignite/internal/GridTaskMessage.java |   30 -
 .../ignite/internal/GridTaskSessionRequest.java |    6 +-
 .../org/apache/ignite/internal/IgniteEx.java    |    7 -
 .../apache/ignite/internal/IgniteKernal.java    |   93 +-
 .../ignite/internal/IgniteNodeAttributes.java   |    3 -
 .../org/apache/ignite/internal/IgnitionEx.java  |  175 +-
 .../ignite/internal/MarshallerContextImpl.java  |    3 +
 .../client/GridClientConfiguration.java         |   14 +-
 .../GridClientConnectionManagerAdapter.java     |    2 +-
 .../router/GridTcpRouterConfiguration.java      |    6 +-
 .../internal/cluster/ClusterGroupAdapter.java   |  150 +-
 .../cluster/ClusterStartNodeResultImpl.java     |   87 +
 .../cluster/IgniteClusterAsyncImpl.java         |    5 +-
 .../internal/cluster/IgniteClusterImpl.java     |   37 +-
 .../internal/managers/GridManagerAdapter.java   |   48 +-
 .../discovery/GridDiscoveryManager.java         |   42 +-
 .../eventstorage/GridEventStorageManager.java   |    4 +-
 .../processors/GridProcessorAdapter.java        |    7 +-
 .../affinity/GridAffinityProcessor.java         |    5 +-
 .../processors/cache/CacheDistributionMode.java |   67 -
 .../processors/cache/CacheLazyEntry.java        |   10 +-
 .../processors/cache/CacheMetricsImpl.java      |    7 +-
 .../processors/cache/CacheMetricsSnapshot.java  |  223 +-
 .../cache/DynamicCacheChangeRequest.java        |   19 +-
 .../cache/DynamicCacheDescriptor.java           |   17 +-
 .../processors/cache/GridCacheAdapter.java      |   96 +-
 .../processors/cache/GridCacheContext.java      |   64 +-
 .../cache/GridCacheEvictionManager.java         |    6 +-
 .../cache/GridCacheExplicitLockSpan.java        |    2 +-
 .../processors/cache/GridCacheIoManager.java    |   89 +-
 .../processors/cache/GridCacheMapEntry.java     |    6 +-
 .../processors/cache/GridCacheMessage.java      |    7 +
 .../processors/cache/GridCacheMvcc.java         |    2 +-
 .../cache/GridCacheMvccCandidate.java           |   50 +-
 .../processors/cache/GridCacheMvccManager.java  |   44 +-
 .../GridCachePartitionExchangeManager.java      |  136 +-
 .../processors/cache/GridCacheProcessor.java    |  482 ++-
 .../cache/GridCacheProjectionImpl.java          |    2 +-
 .../processors/cache/GridCacheProxyImpl.java    |    2 +-
 .../cache/GridLoadCacheCloseablePredicate.java  |   30 +
 .../processors/cache/IgniteCacheProxy.java      |   26 +
 .../processors/cache/KeyCacheObjectImpl.java    |   13 +-
 .../distributed/GridDistributedCacheEntry.java  |   12 +-
 .../dht/GridClientPartitionTopology.java        |    6 +-
 .../dht/GridDhtAffinityAssignmentRequest.java   |    5 +
 .../dht/GridDhtAffinityAssignmentResponse.java  |    5 +
 .../distributed/dht/GridDhtCacheAdapter.java    |   22 +-
 .../distributed/dht/GridDhtCacheEntry.java      |   36 +-
 .../distributed/dht/GridDhtLockFuture.java      |   26 +-
 .../dht/GridDhtPartitionTopologyImpl.java       |    6 +-
 .../dht/GridDhtTransactionalCacheAdapter.java   |   14 +-
 .../distributed/dht/GridDhtTxFinishFuture.java  |   22 +-
 .../cache/distributed/dht/GridDhtTxLocal.java   |    2 +
 .../distributed/dht/GridDhtTxLocalAdapter.java  |   79 +-
 .../distributed/dht/GridDhtTxPrepareFuture.java |   30 +-
 .../dht/atomic/GridDhtAtomicCache.java          |    6 +-
 .../dht/colocated/GridDhtColocatedCache.java    |   35 +-
 .../colocated/GridDhtColocatedLockFuture.java   |   46 +-
 .../GridDhtPartitionsAbstractMessage.java       |   15 +-
 .../GridDhtPartitionsExchangeFuture.java        |   43 +-
 .../distributed/near/GridNearAtomicCache.java   |    2 +-
 .../distributed/near/GridNearCacheEntry.java    |   10 +-
 .../distributed/near/GridNearLockFuture.java    |   13 +-
 .../near/GridNearTransactionalCache.java        |    2 +-
 .../near/GridNearTxFinishFuture.java            |    8 +-
 .../cache/distributed/near/GridNearTxLocal.java |    7 +
 .../near/GridNearTxPrepareFuture.java           |  122 +-
 .../near/GridNearTxPrepareRequest.java          |   64 +-
 .../cache/local/GridLocalLockFuture.java        |    2 +
 .../local/atomic/GridLocalAtomicCache.java      |    6 +-
 .../cache/query/GridCacheQueriesImpl.java       |    2 +-
 .../cache/query/GridCacheQueryAdapter.java      |    2 +-
 .../continuous/CacheContinuousQueryManager.java |   30 +-
 .../cache/transactions/IgniteTxAdapter.java     |    3 +-
 .../cache/transactions/IgniteTxHandler.java     |  120 +-
 .../transactions/IgniteTxLocalAdapter.java      |   82 +-
 .../cache/transactions/IgniteTxManager.java     |   13 +-
 .../cache/version/GridCacheVersionEx.java       |    2 +-
 .../cacheobject/IgniteCacheObjectProcessor.java |    8 +-
 .../IgniteCacheObjectProcessorImpl.java         |   64 +-
 .../continuous/GridContinuousProcessor.java     |    4 +-
 .../datastreamer/DataStreamerImpl.java          |    8 +-
 .../CacheDataStructuresCacheKey.java            |   62 +
 .../CacheDataStructuresConfigurationKey.java    |    2 +-
 .../datastructures/DataStructuresProcessor.java |  222 +-
 .../datastructures/GridCacheQueueAdapter.java   |    2 +-
 .../internal/processors/igfs/IgfsAsyncImpl.java |    4 +-
 .../ignite/internal/processors/igfs/IgfsEx.java |    4 +-
 .../processors/igfs/IgfsFileWorker.java         |  180 -
 .../processors/igfs/IgfsFileWorkerBatch.java    |  225 +-
 .../processors/igfs/IgfsFileWorkerTask.java     |   32 -
 .../internal/processors/igfs/IgfsImpl.java      |  150 +-
 .../processors/igfs/IgfsInputStreamImpl.java    |    2 +-
 .../processors/igfs/IgfsOutputStreamImpl.java   |    6 +-
 .../internal/processors/igfs/IgfsProcessor.java |    2 +-
 .../DiscoveryNodeValidationProcessor.java       |   27 +
 .../OsDiscoveryNodeValidationProcessor.java     |   72 +
 .../plugin/IgnitePluginProcessor.java           |   71 +-
 .../query/GridQueryFieldMetadata.java           |    2 +-
 .../processors/query/GridQueryProcessor.java    |   97 +-
 .../processors/rest/GridRestProcessor.java      |   33 +-
 .../security/GridSecurityProcessor.java         |   13 +-
 .../processors/security/SecurityContext.java    |    8 +-
 .../security/os/GridOsSecurityProcessor.java    |   11 +-
 .../processors/task/GridTaskProcessor.java      |    9 +-
 .../ignite/internal/util/GridJavaProcess.java   |   38 +-
 .../ignite/internal/util/IgniteUtils.java       |   46 +-
 .../internal/util/future/GridFutureAdapter.java |   20 +-
 .../ipc/shmem/IpcSharedMemoryNativeLoader.java  |   48 +-
 .../ignite/internal/util/lang/GridFunc.java     |   33 +
 .../util/lang/GridMetadataAwareAdapter.java     |    2 +-
 .../util/nodestart/IgniteNodeCallable.java      |   30 -
 .../util/nodestart/IgniteSshHelper.java         |    2 +-
 .../util/nodestart/StartNodeCallable.java       |   30 +
 .../ignite/internal/util/worker/GridWorker.java |    6 +-
 .../ignite/internal/visor/cache/VisorCache.java |   21 +-
 .../cache/VisorCacheAggregatedMetrics.java      |   38 +-
 .../visor/cache/VisorCacheClearTask.java        |    3 +
 .../visor/cache/VisorCacheConfiguration.java    |   15 +-
 .../VisorCacheConfigurationCollectorJob.java    |   76 +
 .../VisorCacheConfigurationCollectorTask.java   |   39 +
 .../internal/visor/cache/VisorCacheMetrics.java |   53 +-
 .../cache/VisorCacheMetricsCollectorTask.java   |   59 +-
 .../cache/VisorCacheQueryConfiguration.java     |    9 -
 .../visor/cache/VisorCacheStopTask.java         |   69 +
 .../VisorIgfsProfilerUniformityCounters.java    |    6 +-
 .../internal/visor/log/VisorLogSearchTask.java  |   15 +-
 .../visor/node/VisorGridConfiguration.java      |   38 -
 .../visor/node/VisorIgfsConfiguration.java      |    2 +-
 .../visor/node/VisorNodeDataCollectorTask.java  |    1 +
 .../node/VisorNodeEventsCollectorTask.java      |    3 +
 .../visor/node/VisorRestConfiguration.java      |    1 +
 .../node/VisorSegmentationConfiguration.java    |    4 +-
 .../internal/visor/query/VisorQueryArg.java     |   82 +
 .../visor/query/VisorQueryCleanupTask.java      |   10 +-
 .../internal/visor/query/VisorQueryCursor.java  |   96 +
 .../internal/visor/query/VisorQueryField.java   |   66 +-
 .../internal/visor/query/VisorQueryJob.java     |  174 +
 .../visor/query/VisorQueryNextPageTask.java     |   80 +-
 .../internal/visor/query/VisorQueryResult.java  |    6 +-
 .../visor/query/VisorQueryResultEx.java         |   16 +-
 .../internal/visor/query/VisorQueryTask.java    |  283 +-
 .../internal/visor/query/VisorQueryUtils.java   |   55 +-
 .../internal/visor/util/VisorTaskUtils.java     |   24 +-
 .../org/apache/ignite/lang/IgniteImmutable.java |   49 -
 .../ignite/plugin/CachePluginConfiguration.java |    2 +-
 .../org/apache/ignite/plugin/IgnitePlugin.java  |    3 -
 .../ignite/plugin/PluginConfiguration.java      |   10 +-
 .../org/apache/ignite/plugin/PluginContext.java |    7 +-
 .../apache/ignite/plugin/PluginProvider.java    |    9 +-
 .../plugin/security/AuthenticationContext.java  |   12 +-
 .../security/GridSecurityCredentials.java       |  184 -
 .../GridSecurityCredentialsBasicProvider.java   |   44 -
 .../GridSecurityCredentialsProvider.java        |   44 -
 .../plugin/security/GridSecurityException.java  |   58 -
 .../plugin/security/GridSecurityPermission.java |   69 -
 .../security/GridSecurityPermissionSet.java     |   66 -
 .../plugin/security/GridSecuritySubject.java    |   62 -
 .../security/GridSecuritySubjectType.java       |   48 -
 .../plugin/security/SecurityCredentials.java    |  191 +
 .../SecurityCredentialsBasicProvider.java       |   44 +
 .../security/SecurityCredentialsProvider.java   |   44 +
 .../plugin/security/SecurityException.java      |   61 +
 .../plugin/security/SecurityPermission.java     |   69 +
 .../plugin/security/SecurityPermissionSet.java  |   66 +
 .../ignite/plugin/security/SecuritySubject.java |   62 +
 .../plugin/security/SecuritySubjectType.java    |   48 +
 .../segmentation/GridSegmentationPolicy.java    |   47 -
 .../segmentation/GridSegmentationResolver.java  |   64 -
 .../plugin/segmentation/SegmentationPolicy.java |   49 +
 .../segmentation/SegmentationResolver.java      |   65 +
 .../ignite/spi/IgniteNodeValidationResult.java  |   66 +
 .../org/apache/ignite/spi/IgniteSpiAdapter.java |   30 +-
 .../org/apache/ignite/spi/IgniteSpiContext.java |    6 +-
 .../spi/IgniteSpiNodeValidationResult.java      |   66 -
 .../communication/tcp/TcpCommunicationSpi.java  |   16 +-
 .../spi/discovery/DiscoveryMetricsProvider.java |   10 +
 .../spi/discovery/DiscoverySpiDataExchange.java |    5 +-
 .../DiscoverySpiNodeAuthenticator.java          |    2 +-
 .../discovery/tcp/TcpClientDiscoverySpi.java    |   90 +-
 .../spi/discovery/tcp/TcpDiscoverySpi.java      |  329 +-
 .../discovery/tcp/TcpDiscoverySpiAdapter.java   |   37 +-
 .../tcp/internal/TcpDiscoveryNode.java          |   82 +-
 .../messages/TcpDiscoveryAbstractMessage.java   |   24 +-
 .../messages/TcpDiscoveryAuthFailedMessage.java |   25 +-
 .../TcpDiscoveryCheckFailedMessage.java         |   24 +-
 .../TcpDiscoveryClientReconnectMessage.java     |   30 +-
 .../TcpDiscoveryCustomEventMessage.java         |   32 +-
 .../messages/TcpDiscoveryDiscardMessage.java    |   24 +-
 .../TcpDiscoveryDuplicateIdMessage.java         |   24 +-
 .../messages/TcpDiscoveryHandshakeRequest.java  |    8 -
 .../messages/TcpDiscoveryHandshakeResponse.java |   22 -
 .../messages/TcpDiscoveryHeartbeatMessage.java  |   95 +-
 .../TcpDiscoveryJoinRequestMessage.java         |   32 +-
 .../TcpDiscoveryLoopbackProblemMessage.java     |   28 +-
 .../TcpDiscoveryNodeAddFinishedMessage.java     |   24 +-
 .../messages/TcpDiscoveryNodeAddedMessage.java  |   76 +-
 .../messages/TcpDiscoveryNodeFailedMessage.java |   28 +-
 .../messages/TcpDiscoveryNodeLeftMessage.java   |    8 -
 .../tcp/messages/TcpDiscoveryPingRequest.java   |   25 +-
 .../tcp/messages/TcpDiscoveryPingResponse.java  |   14 -
 .../TcpDiscoveryStatusCheckMessage.java         |   30 +-
 .../spi/swapspace/file/FileSwapSpaceSpi.java    |    4 +-
 .../ignite/startup/BasicWarmupClosure.java      |    9 +-
 .../startup/cmdline/CommandLineStartup.java     |    7 +-
 .../org/apache/ignite/stream/StreamVisitor.java |    2 +-
 .../resources/META-INF/classnames.properties    |   55 +-
 .../GridCacheAffinityBackupsSelfTest.java       |   15 +-
 .../ignite/IgniteCacheAffinitySelfTest.java     |    5 +
 .../cache/IgniteWarmupClosureSelfTest.java      |   82 +
 .../fair/GridFairAffinityFunctionSelfTest.java  |    2 -
 .../IgniteFairAffinityDynamicCacheSelfTest.java |   97 +
 .../internal/GridLifecycleAwareSelfTest.java    |    2 +-
 .../ignite/internal/GridProjectionSelfTest.java |   82 +
 .../ignite/internal/GridStartStopSelfTest.java  |    8 +-
 .../CacheMetricsForClusterGroupSelfTest.java    |  252 ++
 .../cache/GridCacheAbstractFullApiSelfTest.java |   13 +-
 .../GridCacheAbstractIteratorsSelfTest.java     |    3 +-
 .../cache/GridCacheAbstractSelfTest.java        |   10 +-
 .../cache/GridCacheBasicApiAbstractTest.java    |    4 +-
 .../cache/GridCacheClearAllSelfTest.java        |    2 +-
 .../cache/GridCacheDeploymentSelfTest.java      |    9 +-
 ...CacheOffHeapMultiThreadedUpdateSelfTest.java |   47 +-
 .../GridCacheOffHeapTieredAbstractSelfTest.java |    4 +-
 .../GridCacheOnCopyFlagAbstractSelfTest.java    |  112 +-
 .../GridCachePreloadingEvictionsSelfTest.java   |   23 +-
 .../cache/GridCacheReloadSelfTest.java          |    3 +-
 .../GridCacheReturnValueTransferSelfTest.java   |   16 +-
 .../cache/GridCacheSwapPreloadSelfTest.java     |    5 +-
 ...teCacheConfigurationDefaultTemplateTest.java |  111 +
 .../IgniteCacheConfigurationTemplateTest.java   |  448 +++
 .../cache/IgniteCachePeekModesAbstractTest.java |   40 +-
 .../IgniteCacheStoreValueAbstractTest.java      |  186 +-
 .../cache/IgniteDynamicCacheStartSelfTest.java  |   23 +
 .../IgniteTxMultiThreadedAbstractTest.java      |    5 +-
 ...actQueueFailoverDataConsistencySelfTest.java |    4 +-
 .../GridCacheQueueApiSelfAbstractTest.java      |   80 +
 .../GridCacheQueueCleanupSelfTest.java          |   11 +-
 ...GridCacheQueueMultiNodeAbstractSelfTest.java |    5 +-
 ...dCacheQueueMultiNodeConsistencySelfTest.java |   11 +-
 .../GridCacheSetAbstractSelfTest.java           |   15 +-
 .../GridCacheSetFailoverAbstractSelfTest.java   |    8 +-
 .../IgniteCollectionAbstractTest.java           |  181 +-
 .../IgniteDataStructureUniqueNameTest.java      |   47 +-
 .../GridCacheLocalAtomicOffheapSetSelfTest.java |   32 +
 .../GridCacheLocalAtomicQueueApiSelfTest.java   |    6 +
 .../local/GridCacheLocalAtomicSetSelfTest.java  |    6 +
 .../GridCacheLocalOffheapQueueApiSelfTest.java  |   31 +
 .../local/GridCacheLocalQueueApiSelfTest.java   |    6 +
 .../local/GridCacheLocalSetSelfTest.java        |    6 +
 ...artitionedAtomicOffheapQueueApiSelfTest.java |   32 +
 ...omicOffheapQueueCreateMultiNodeSelfTest.java |   32 +
 ...onedAtomicOffheapQueueMultiNodeSelfTest.java |   32 +
 ...dCachePartitionedAtomicQueueApiSelfTest.java |    6 +
 ...ionedAtomicQueueCreateMultiNodeSelfTest.java |    6 +
 ...micQueueFailoverDataConsistencySelfTest.java |    6 +
 ...PartitionedAtomicQueueMultiNodeSelfTest.java |    6 +
 ...itionedAtomicQueueRotativeMultiNodeTest.java |    6 +
 ...chePartitionedAtomicSetFailoverSelfTest.java |    6 +
 ...rtitionedDataStructuresFailoverSelfTest.java |    6 +
 ...artitionedOffHeapValuesQueueApiSelfTest.java |   31 +
 ...achePartitionedOffHeapValuesSetSelfTest.java |   32 +
 ...edOffheapDataStructuresFailoverSelfTest.java |   34 +
 ...hePartitionedOffheapSetFailoverSelfTest.java |   32 +
 .../GridCachePartitionedQueueApiSelfTest.java   |    6 +
 ...PartitionedQueueCreateMultiNodeSelfTest.java |    6 +
 ...dCachePartitionedQueueEntryMoveSelfTest.java |   10 +-
 ...nedQueueFailoverDataConsistencySelfTest.java |    6 +
 ...CachePartitionedQueueJoinedNodeSelfTest.java |    6 +
 ...dCachePartitionedQueueMultiNodeSelfTest.java |    6 +
 ...hePartitionedQueueRotativeMultiNodeTest.java |    6 +
 ...GridCachePartitionedSetFailoverSelfTest.java |    6 +
 .../GridCachePartitionedSetSelfTest.java        |    6 +
 .../IgnitePartitionedSetNoBackupsSelfTest.java  |    5 +-
 ...eplicatedDataStructuresFailoverSelfTest.java |    6 +
 .../GridCacheReplicatedQueueApiSelfTest.java    |   11 +
 ...idCacheReplicatedQueueMultiNodeSelfTest.java |    6 +
 ...cheReplicatedQueueRotativeMultiNodeTest.java |    6 +
 .../GridCacheReplicatedSetSelfTest.java         |    6 +
 .../distributed/GridCacheEventAbstractTest.java |   16 +-
 .../GridCacheMultiNodeAbstractTest.java         |   13 +-
 .../GridCacheNodeFailureAbstractTest.java       |   15 +-
 .../IgniteCacheAtomicNodeJoinTest.java          |   44 +
 .../IgniteCacheNodeJoinAbstractTest.java        |  109 +
 .../distributed/IgniteCacheTxNodeJoinTest.java  |   38 +
 .../dht/GridCacheDhtEntrySelfTest.java          |   12 +-
 ...GridCacheDhtEvictionNearReadersSelfTest.java |    2 +-
 .../dht/GridCacheDhtPreloadUnloadSelfTest.java  |    2 +-
 .../dht/IgniteCacheLockFailoverSelfTest.java    |  156 +
 .../dht/IgniteCacheMultiTxLockSelfTest.java     |  219 +
 .../near/GridCacheNearEvictionSelfTest.java     |    2 +-
 .../near/GridCacheNearMultiNodeSelfTest.java    |   26 +-
 ...idCacheNearOnlyMultiNodeFullApiSelfTest.java |    2 +-
 ...ePartitionedBasicStoreMultiNodeSelfTest.java |  118 +-
 ...achePartitionedMultiNodeFullApiSelfTest.java |    6 +-
 ...NearDisabledBasicStoreMultiNodeSelfTest.java |    8 +-
 .../near/IgniteCacheNearReadCommittedTest.java  |    4 +-
 ...licatedNearOnlyMultiNodeFullApiSelfTest.java |    2 +-
 ...CacheReplicatedPreloadLifecycleSelfTest.java |    5 +-
 .../GridCacheReplicatedPreloadSelfTest.java     |   23 +-
 .../eviction/GridCacheEvictionAbstractTest.java |    5 +-
 ...ridCacheFifoBatchEvictionPolicySelfTest.java |  384 ++
 .../continuous/GridEventConsumeSelfTest.java    |   10 +-
 .../processors/igfs/IgfsAbstractSelfTest.java   |   24 +-
 .../tostring/GridToStringBuilderSelfTest.java   |    5 +-
 .../GridP2PMissedResourceCacheSizeSelfTest.java |    2 +-
 .../GridAbstractCommunicationSelfTest.java      |    3 +-
 .../GridTcpCommunicationSpiAbstractTest.java    |    5 +-
 ...mmunicationSpiConcurrentConnectSelfTest.java |    3 +-
 ...cpCommunicationSpiMultithreadedSelfTest.java |    3 +-
 ...dTcpCommunicationSpiRecoveryAckSelfTest.java |    3 +-
 ...GridTcpCommunicationSpiRecoverySelfTest.java |    2 +-
 .../discovery/AbstractDiscoverySelfTest.java    |    4 +-
 ...ClusterMetricsSnapshotSerializeSelfTest.java |   28 +
 .../tcp/TcpClientDiscoverySelfTest.java         |    5 +-
 .../tcp/TcpDiscoverySpiStartStopSelfTest.java   |    5 +-
 .../testframework/GridSpiTestContext.java       |    6 +-
 .../testframework/junits/GridAbstractTest.java  |    6 +-
 .../ignite/testframework/junits/IgniteMock.java |   15 +
 .../junits/common/GridCommonAbstractTest.java   |   13 +-
 .../junits/spi/GridSpiAbstractTest.java         |   76 +-
 .../IgniteCacheDataStructuresSelfTestSuite.java |   10 +
 .../IgniteCacheEvictionSelfTestSuite.java       |    1 +
 .../IgniteCacheFailoverTestSuite.java           |    4 +
 .../IgniteCacheMetricsSelfTestSuite.java        |    4 +
 .../ignite/testsuites/IgniteCacheTestSuite.java |   14 +-
 .../IgniteSpiDiscoverySelfTestSuite.java        |    2 +
 ...rrentLinkedHashMapMultiThreadedSelfTest.java |    4 +-
 modules/extdata/p2p/pom.xml                     |    2 +-
 .../p2p/startcache/CacheAllNodesFilter.java     |   31 +
 .../CacheConfigurationP2PTestClient.java        |  118 +
 .../tests/p2p/startcache/Organization1.java     |   52 +
 .../tests/p2p/startcache/Organization2.java     |   52 +
 modules/extdata/uri/pom.xml                     |    2 +-
 modules/geospatial/pom.xml                      |    2 +-
 modules/hadoop/docs/hadoop_readme.pdf           |  Bin 82297 -> 82219 bytes
 modules/hadoop/pom.xml                          |    2 +-
 .../HadoopDefaultMapReducePlannerSelfTest.java  |    7 +-
 modules/hibernate/pom.xml                       |    2 +-
 modules/indexing/pom.xml                        |    2 +-
 .../processors/query/h2/IgniteH2Indexing.java   |   19 +-
 .../processors/query/h2/sql/GridSqlElement.java |    8 -
 .../processors/query/h2/sql/GridSqlQuery.java   |  183 +
 .../query/h2/sql/GridSqlQueryParser.java        |  121 +-
 .../query/h2/sql/GridSqlQuerySplitter.java      |  149 +-
 .../processors/query/h2/sql/GridSqlSelect.java  |  209 +-
 .../query/h2/sql/GridSqlSubquery.java           |    8 +-
 .../processors/query/h2/sql/GridSqlUnion.java   |  134 +
 .../query/h2/twostep/GridMergeIndex.java        |   17 +-
 .../h2/twostep/GridReduceQueryExecutor.java     |   13 +-
 .../cache/CacheConfigurationP2PTest.java        |  179 +
 .../cache/CacheConfigurationP2PTestServer.java  |   49 +
 .../GridCacheAbstractFieldsQuerySelfTest.java   |   10 +-
 .../processors/cache/GridCacheSwapSelfTest.java |    5 +-
 .../cache/IgniteCacheAbstractQuerySelfTest.java |    6 +-
 .../IgniteCacheCollocatedQuerySelfTest.java     |  209 +
 .../cache/IgniteCacheLargeResultSelfTest.java   |  104 +
 ...CacheOffheapTieredMultithreadedSelfTest.java |    4 +-
 ...hePartitionedQueryMultiThreadedSelfTest.java |    2 +-
 .../cache/IgniteCacheQueryIndexSelfTest.java    |    3 +-
 ...niteCacheAtomicNearEnabledQuerySelfTest.java |    7 +-
 .../near/IgniteCacheAtomicQuerySelfTest.java    |    7 +-
 .../IgniteCachePartitionedQuerySelfTest.java    |    5 +-
 .../IgniteCacheReplicatedQuerySelfTest.java     |   18 +-
 .../cache/ttl/CacheTtlAbstractSelfTest.java     |   14 +-
 .../h2/sql/AbstractH2CompareQueryTest.java      |  352 ++
 .../query/h2/sql/BaseH2CompareQueryTest.java    |  856 ++++
 .../query/h2/sql/GridQueryParsingTest.java      |   27 +-
 .../query/h2/sql/H2CompareBigQueryTest.java     |  677 ++++
 .../query/h2/sql/IgniteVsH2QueryTest.java       |  853 ----
 .../IgniteCacheQuerySelfTestSuite.java          |    8 +-
 .../IgniteCacheWithIndexingTestSuite.java       |    2 +
 .../processors/query/h2/sql/bigQuery.sql        |   55 +
 modules/jcl/pom.xml                             |    2 +-
 modules/jta/pom.xml                             |    2 +-
 .../processors/cache/GridCacheJtaSelfTest.java  |    6 +-
 modules/log4j/pom.xml                           |    2 +-
 modules/rest-http/pom.xml                       |    2 +-
 .../http/jetty/GridJettyRestHandler.java        |    2 +-
 modules/scalar/pom.xml                          |    2 +-
 modules/schedule/pom.xml                        |   22 +-
 modules/schema-import/pom.xml                   |    2 +-
 modules/slf4j/pom.xml                           |    2 +-
 modules/spring/pom.xml                          |    2 +-
 .../org/apache/ignite/IgniteSpringBean.java     |   21 +
 .../p2p/GridP2PUserVersionChangeSelfTest.java   |    8 +-
 modules/ssh/pom.xml                             |    2 +-
 .../util/nodestart/IgniteNodeCallableImpl.java  |  308 --
 .../util/nodestart/IgniteSshHelperImpl.java     |    4 +-
 .../util/nodestart/StartNodeCallableImpl.java   |  309 ++
 ...gniteProjectionStartStopRestartSelfTest.java |  261 +-
 .../IgniteStartStopRestartTestSuite.java        |    1 +
 modules/tools/pom.xml                           |    2 +-
 .../ignite/tools/classgen/ClassesGenerator.java |    2 +-
 .../ignite/tools/javadoc/IgniteLinkTaglet.java  |   20 +-
 modules/urideploy/README.txt                    |    2 +-
 modules/urideploy/licenses/edtftp-license.pdf   |  Bin 58355 -> 0 bytes
 modules/urideploy/licenses/jtidy-license.txt    |   50 -
 .../urideploy/licenses/jtidy-mit-license.txt    |   50 +
 modules/urideploy/pom.xml                       |    8 +-
 .../spi/deployment/uri/UriDeploymentSpi.java    |  182 +-
 .../uri/scanners/GridUriDeploymentScanner.java  |  286 --
 .../GridUriDeploymentScannerListener.java       |    2 +-
 .../uri/scanners/UriDeploymentScanner.java      |   47 +
 .../scanners/UriDeploymentScannerContext.java   |   92 +
 .../scanners/UriDeploymentScannerManager.java   |  221 ++
 .../file/GridUriDeploymentFileScanner.java      |  311 --
 .../scanners/file/UriDeploymentFileScanner.java |  327 ++
 .../ftp/GridUriDeploymentFtpClient.java         |  199 -
 .../ftp/GridUriDeploymentFtpConfiguration.java  |  115 -
 .../ftp/GridUriDeploymentFtpException.java      |   43 -
 .../scanners/ftp/GridUriDeploymentFtpFile.java  |  119 -
 .../ftp/GridUriDeploymentFtpScanner.java        |  234 --
 .../uri/scanners/ftp/package-info.java          |   22 -
 .../http/GridUriDeploymentHttpScanner.java      |  423 --
 .../scanners/http/UriDeploymentHttpScanner.java |  478 +++
 ...loymentMultiScannersErrorThrottlingTest.java |    3 -
 .../GridUriDeploymentMultiScannersSelfTest.java |    3 +-
 .../GridFileDeploymentUndeploySelfTest.java     |    4 +-
 .../uri/scanners/ftp/GridFtpDeploymentTest.java |   46 -
 .../uri/scanners/ftp/package-info.java          |   22 -
 modules/visor-console/pom.xml                   |    2 +-
 .../ignite/visor/commands/VisorConsole.scala    |   19 +
 .../commands/cache/VisorCacheClearCommand.scala |    3 +-
 .../commands/cache/VisorCacheCommand.scala      |  429 +-
 .../commands/cache/VisorCacheScanCommand.scala  |   13 +-
 .../commands/cache/VisorCacheStopCommand.scala  |  145 +
 .../config/VisorConfigurationCommand.scala      |   15 +-
 .../visor/commands/gc/VisorGcCommand.scala      |   15 +-
 .../commands/start/VisorStartCommand.scala      |    4 +-
 .../scala/org/apache/ignite/visor/visor.scala   |   45 +-
 modules/visor-plugins/pom.xml                   |    2 +-
 modules/web/pom.xml                             |    2 +-
 modules/yardstick/README.md                     |    3 +-
 .../yardstick/config/benchmark-store.properties |    5 +-
 modules/yardstick/pom.xml                       |    2 +-
 .../yardstick/IgniteAbstractBenchmark.java      |    5 +-
 .../yardstick/IgniteBenchmarkArguments.java     |   22 +-
 .../org/apache/ignite/yardstick/IgniteNode.java |   11 +-
 parent/pom.xml                                  |   50 +-
 pom.xml                                         |  146 +-
 543 files changed, 19743 insertions(+), 9753 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9c751573/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9c751573/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9c751573/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearAtomicCache.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9c751573/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheEntry.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9c751573/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite.java
index b6c526a,da79c55..2f29f3a
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite.java
@@@ -34,18 -35,31 +35,21 @@@ public class IgniteCacheFailoverTestSui
      public static TestSuite suite() throws Exception {
          TestSuite suite = new TestSuite("Cache Failover Test Suite");
  
 -        suite.addTestSuite(GridCacheAtomicInvalidPartitionHandlingSelfTest.class);
  
 -        suite.addTestSuite(GridCacheIncrementTransformTest.class);
 -
 -        // Failure consistency tests.
 -        suite.addTestSuite(GridCacheAtomicRemoveFailureTest.class);
 -        suite.addTestSuite(GridCacheAtomicPrimaryWriteOrderRemoveFailureTest.class);
 -
 -        suite.addTestSuite(GridCacheDhtAtomicRemoveFailureTest.class);
 -        suite.addTestSuite(GridCacheDhtRemoveFailureTest.class);
 -        suite.addTestSuite(GridCacheNearRemoveFailureTest.class);
 -        //suite.addTestSuite(GridCacheAtomicNearRemoveFailureTest.class); TODO IGNITE-560
 -        suite.addTestSuite(GridCacheAtomicPrimaryWriteOrderNearRemoveFailureTest.class);
 -
 -        suite.addTestSuite(GridCacheAtomicFailoverSelfTest.class);
 -        suite.addTestSuite(GridCacheAtomicPrimaryWriteOrderFailoverSelfTest.class);
 -        suite.addTestSuite(GridCacheAtomicReplicatedFailoverSelfTest.class);
 -
 -        //suite.addTestSuite(GridCachePartitionedFailoverSelfTest.class);  TODO IGNITE-631.
 -        //suite.addTestSuite(GridCacheColocatedFailoverSelfTest.class); TODO IGNITE-631.
 -        //suite.addTestSuite(GridCacheReplicatedFailoverSelfTest.class); TODO IGNITE-631.
 +        suite.addTestSuite(GridCacheAtomicNearRemoveFailureTest.class);
 +        suite.addTestSuite(GridCacheAtomicNearRemoveFailureTest.class);
 +        suite.addTestSuite(GridCacheAtomicNearRemoveFailureTest.class);
 +        suite.addTestSuite(GridCacheAtomicNearRemoveFailureTest.class);
 +        suite.addTestSuite(GridCacheAtomicNearRemoveFailureTest.class);
 +        suite.addTestSuite(GridCacheAtomicNearRemoveFailureTest.class);
 +        suite.addTestSuite(GridCacheAtomicNearRemoveFailureTest.class);
 +        suite.addTestSuite(GridCacheAtomicNearRemoveFailureTest.class);
 +        suite.addTestSuite(GridCacheAtomicNearRemoveFailureTest.class);
 +        suite.addTestSuite(GridCacheAtomicNearRemoveFailureTest.class);
  
+         suite.addTestSuite(IgniteCacheAtomicNodeJoinTest.class);
+         suite.addTestSuite(IgniteCacheTxNodeJoinTest.class);
+ 
          return suite;
      }
  }


Mime
View raw message