ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From voze...@apache.org
Subject [10/12] incubator-ignite git commit: Merge branch 'sprint-1' into ignite-191
Date Thu, 12 Feb 2015 12:41:47 GMT
Merge branch 'sprint-1' into ignite-191

Conflicts:
	modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/VisorConsole.scala


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

Branch: refs/heads/sprint-1
Commit: f403ee368c42017386c9f6bb626709b665332d44
Parents: 89834da 210bd2e
Author: vozerov-gridgain <vozerov@gridgain.com>
Authored: Thu Feb 12 15:10:28 2015 +0300
Committer: vozerov-gridgain <vozerov@gridgain.com>
Committed: Thu Feb 12 15:10:28 2015 +0300

----------------------------------------------------------------------
 assembly/dependencies-optional-fabric.xml       |    1 +
 assembly/dependencies-optional-hadoop.xml       |    2 +-
 assembly/dependencies-schema-load.xml           |    2 +-
 assembly/dependencies-visor-trial.xml           |   80 -
 assembly/release-base-fabric.xml                |   83 -
 assembly/release-base.xml                       |    2 +
 assembly/release-fabric.xml                     |   59 +-
 assembly/release-scala.xml                      |   50 +
 examples/pom-standalone.xml                     |   83 +-
 examples/pom.xml                                |   79 +-
 .../scalar/examples/ScalarCacheExample.scala    |    5 +-
 .../ClientAbstractMultiThreadedSelfTest.java    |   29 +-
 .../ClientAbstractMultiNodeSelfTest.java        |   18 +-
 .../integration/ClientAbstractSelfTest.java     |  195 +-
 .../rest/AbstractRestProcessorSelfTest.java     |    3 +-
 .../rest/RestBinaryProtocolSelfTest.java        |  211 +-
 .../rest/RestMemcacheProtocolSelfTest.java      |   80 +-
 .../processors/rest/RestProcessorTest.java      |    2 +-
 .../ignite/jdbc/JdbcComplexQuerySelfTest.java   |    5 +-
 .../ignite/jdbc/JdbcLocalCachesSelfTest.java    |   14 +-
 .../ignite/jdbc/JdbcMetadataSelfTest.java       |    5 +-
 .../jdbc/JdbcPreparedStatementSelfTest.java     |    4 +-
 .../ignite/jdbc/JdbcResultSetSelfTest.java      |    3 +-
 .../ignite/jdbc/JdbcStatementSelfTest.java      |    3 +-
 .../loadtests/client/ClientTcpSslLoadTest.java  |    4 +-
 modules/core/pom.xml                            |   81 +
 .../java/org/apache/ignite/IgniteCache.java     |   67 +-
 .../org/apache/ignite/IgniteCountDownLatch.java |    2 -
 .../org/apache/ignite/cache/CacheEntry.java     |  623 ----
 .../apache/ignite/cache/CacheProjection.java    |   56 +-
 .../java/org/apache/ignite/cache/GridCache.java |    3 +-
 .../cache/eviction/CacheEvictionFilter.java     |    8 +-
 .../cache/eviction/CacheEvictionPolicy.java     |   10 +-
 .../ignite/cache/eviction/EvictableEntry.java   |   67 +-
 .../eviction/fifo/CacheFifoEvictionPolicy.java  |   48 +-
 .../fifo/CacheFifoEvictionPolicyMBean.java      |    8 -
 .../ignitefs/CacheIgniteFsEvictionFilter.java   |    5 +-
 .../CacheIgniteFsPerBlockLruEvictionPolicy.java |   49 +-
 .../eviction/lru/CacheLruEvictionPolicy.java    |   32 +-
 .../lru/CacheLruEvictionPolicyMBean.java        |    8 -
 .../random/CacheRandomEvictionPolicy.java       |   33 +-
 .../configuration/AtomicConfiguration.java      |    2 +-
 .../configuration/CacheConfiguration.java       |    6 +-
 .../processors/cache/CacheEntryImpl.java        |    2 +-
 .../processors/cache/CacheInvokeEntry.java      |   35 +-
 .../cache/CacheVersionedEntryImpl.java          |   62 +
 .../processors/cache/EvictableEntryImpl.java    |  188 +
 .../processors/cache/GridCacheAdapter.java      |  261 +-
 .../cache/GridCacheAffinityManager.java         |    2 +-
 .../cache/GridCacheConcurrentMap.java           |  115 +-
 .../processors/cache/GridCacheContext.java      |   36 +-
 .../cache/GridCacheDeploymentManager.java       |    8 +-
 .../processors/cache/GridCacheEntryEx.java      |   55 +-
 .../processors/cache/GridCacheEntryImpl.java    |  729 ----
 .../processors/cache/GridCacheEntrySet.java     |   33 +-
 .../cache/GridCacheEvictionEntry.java           |  494 ---
 .../cache/GridCacheEvictionManager.java         |   42 +-
 .../cache/GridCacheFilterEvaluationEntry.java   |  400 ---
 .../processors/cache/GridCacheIterator.java     |   33 +-
 .../processors/cache/GridCacheKeySet.java       |   30 +-
 .../processors/cache/GridCacheMapAdapter.java   |   70 +-
 .../processors/cache/GridCacheMapEntry.java     |  202 +-
 .../processors/cache/GridCacheMessage.java      |   20 +-
 .../processors/cache/GridCachePeekMode.java     |    4 +-
 .../processors/cache/GridCacheProcessor.java    |    7 +-
 .../processors/cache/GridCacheProjectionEx.java |   25 +-
 .../cache/GridCacheProjectionImpl.java          |  126 +-
 .../processors/cache/GridCacheProxyImpl.java    |   82 +-
 .../processors/cache/GridCacheStoreManager.java |   53 +-
 .../processors/cache/GridCacheSwapManager.java  |    5 +-
 .../processors/cache/GridCacheUtils.java        |   69 +-
 .../cache/GridCacheValueCollection.java         |   29 +-
 .../cache/GridCacheWriteBehindStore.java        |   17 +-
 .../processors/cache/IgniteCacheProxy.java      |   49 +-
 .../GridDistributedCacheAdapter.java            |    7 +-
 .../GridDistributedTxRemoteAdapter.java         |   12 +-
 .../GridPartitionedCacheEntryImpl.java          |  423 ---
 .../distributed/dht/GridDhtCacheAdapter.java    |   47 +-
 .../distributed/dht/GridDhtCacheEntry.java      |   13 -
 .../distributed/dht/GridDhtCacheEntryImpl.java  |  172 -
 .../cache/distributed/dht/GridDhtGetFuture.java |    6 +-
 .../distributed/dht/GridDhtLockFuture.java      |    6 +-
 .../dht/GridDhtTransactionalCacheAdapter.java   |   16 +-
 .../distributed/dht/GridDhtTxLocalAdapter.java  |    4 +-
 .../dht/GridPartitionedGetFuture.java           |    6 +-
 .../dht/atomic/GridDhtAtomicCache.java          |   47 +-
 .../dht/atomic/GridDhtAtomicCacheEntry.java     |   20 -
 .../dht/atomic/GridNearAtomicUpdateFuture.java  |    5 +-
 .../dht/atomic/GridNearAtomicUpdateRequest.java |    7 +-
 .../dht/colocated/GridDhtColocatedCache.java    |   43 +-
 .../colocated/GridDhtColocatedCacheEntry.java   |   12 -
 .../colocated/GridDhtColocatedLockFuture.java   |    6 +-
 .../colocated/GridDhtDetachedCacheEntry.java    |    3 -
 .../distributed/near/GridNearAtomicCache.java   |   36 +-
 .../distributed/near/GridNearCacheAdapter.java  |  109 +-
 .../distributed/near/GridNearCacheEntry.java    |   14 +-
 .../distributed/near/GridNearGetFuture.java     |    6 +-
 .../distributed/near/GridNearGetRequest.java    |    8 +-
 .../distributed/near/GridNearLockFuture.java    |    8 +-
 .../distributed/near/GridNearLockRequest.java   |    8 +-
 .../near/GridNearTransactionalCache.java        |   16 +-
 .../near/GridNearTxFinishFuture.java            |    6 +-
 .../processors/cache/local/GridLocalCache.java  |   10 +-
 .../cache/local/GridLocalLockFuture.java        |    6 +-
 .../local/atomic/GridLocalAtomicCache.java      |   63 +-
 .../query/GridCacheDistributedQueryManager.java |    6 +-
 .../cache/query/GridCacheLocalQueryFuture.java  |    6 +-
 .../cache/query/GridCacheQueriesImpl.java       |    4 +-
 .../cache/query/GridCacheQueryAdapter.java      |    9 +-
 .../cache/query/GridCacheQueryInfo.java         |    8 +-
 .../cache/query/GridCacheQueryManager.java      |  302 +-
 .../cache/query/GridCacheQueryRequest.java      |    8 +-
 .../GridCacheContinuousQueryAdapter.java        |    5 +-
 .../GridCacheContinuousQueryEntry.java          |  432 +--
 .../GridCacheContinuousQueryHandler.java        |   14 +-
 .../GridCacheContinuousQueryManager.java        |   14 +-
 .../cache/transactions/IgniteInternalTx.java    |    4 +-
 .../cache/transactions/IgniteTxEntry.java       |   12 +-
 .../transactions/IgniteTxLocalAdapter.java      |   42 +-
 .../cache/transactions/IgniteTxLocalEx.java     |    8 +-
 .../GridCacheVersionConflictContext.java        |    4 +-
 .../processors/fs/GridGgfsDataManager.java      |   12 +-
 .../portable/GridPortableProcessor.java         |    3 +
 .../portable/os/GridOsPortableProcessor.java    |    5 +
 .../processors/rest/GridRestProcessor.java      |    5 +-
 .../service/GridServiceProcessor.java           |   27 +-
 .../ignite/internal/util/IgniteUtils.java       |   26 -
 .../ignite/internal/util/lang/GridFunc.java     |  410 +--
 .../ignite/internal/util/typedef/PCE.java       |   11 +-
 .../ignite/internal/visor/cache/VisorCache.java |    6 +-
 .../visor/cache/VisorCacheSwapBackupsTask.java  |   17 +-
 .../visor/node/VisorNodeDataCollectorTask.java  |    3 +-
 .../org/apache/ignite/lang/IgniteFuture.java    |    1 -
 .../apache/ignite/GridTestStoreNodeStartup.java |    4 +-
 .../ignite/IgniteCacheAffinitySelfTest.java     |    8 +-
 ...CachePartitionFairAffinityNodesSelfTest.java |    4 +-
 .../GridJobMasterLeaveAwareSelfTest.java        |    6 +-
 .../ignite/internal/GridProjectionSelfTest.java |    2 +-
 .../ignite/internal/GridStartStopSelfTest.java  |    6 +-
 .../checkpoint/GridCheckpointTaskSelfTest.java  |    4 +-
 .../GridDeploymentMessageCountSelfTest.java     |    7 +-
 .../GridDiscoveryManagerAliveCacheSelfTest.java |    2 +-
 .../GridAffinityProcessorAbstractSelfTest.java  |    8 +-
 .../cache/GridCacheAbstractFullApiSelfTest.java |  210 +-
 .../cache/GridCacheAbstractMetricsSelfTest.java |  348 +-
 .../GridCacheAbstractRemoveFailureTest.java     |   11 +-
 .../cache/GridCacheAbstractSelfTest.java        |   60 +-
 .../cache/GridCacheAbstractTxReadTest.java      |    1 -
 .../cache/GridCacheAffinityApiSelfTest.java     |   14 +-
 .../cache/GridCacheAffinityRoutingSelfTest.java |    4 +-
 .../cache/GridCacheAlwaysEvictionPolicy.java    |    3 +-
 .../GridCacheAsyncOperationsLimitSelfTest.java  |    6 +-
 .../cache/GridCacheBasicApiAbstractTest.java    |    8 +-
 .../cache/GridCacheBasicStoreAbstractTest.java  |    2 +-
 .../cache/GridCacheClearAllSelfTest.java        |  301 +-
 .../cache/GridCacheClearLocalySelfTest.java     |  336 ++
 .../cache/GridCacheConcurrentMapSelfTest.java   |   84 +-
 .../cache/GridCacheConcurrentMapTest.java       |   15 +-
 .../GridCacheConcurrentTxMultiNodeTest.java     |   21 +-
 ...idCacheConfigurationConsistencySelfTest.java |    6 +-
 .../GridCacheDaemonNodeAbstractSelfTest.java    |    8 +-
 .../cache/GridCacheDeploymentSelfTest.java      |   29 +-
 .../cache/GridCacheEntryMemorySizeSelfTest.java |   74 +-
 .../cache/GridCacheEntryVersionSelfTest.java    |    6 +-
 .../GridCacheEvictionEventAbstractTest.java     |    5 +-
 .../GridCacheFinishPartitionsSelfTest.java      |   10 +-
 .../cache/GridCacheGlobalClearAllSelfTest.java  |  167 -
 .../GridCacheGroupLockAbstractSelfTest.java     |  203 +-
 .../GridCacheGroupLockFailoverSelfTest.java     |    7 +-
 .../cache/GridCacheGroupLockPutTask.java        |   11 +-
 .../GridCacheInterceptorAbstractSelfTest.java   |    2 +-
 .../cache/GridCacheKeyCheckSelfTest.java        |    7 +-
 .../processors/cache/GridCacheLeakTest.java     |    3 +-
 .../cache/GridCacheLifecycleAwareSelfTest.java  |    4 +-
 .../GridCacheMarshallerTxAbstractTest.java      |   16 +-
 .../cache/GridCacheMemoryModeSelfTest.java      |    2 +-
 ...GridCacheMixedPartitionExchangeSelfTest.java |    5 +-
 .../cache/GridCacheMultiUpdateLockSelfTest.java |   10 +-
 ...ridCacheMultinodeUpdateAbstractSelfTest.java |    2 +-
 .../cache/GridCacheMvccManagerSelfTest.java     |    4 +-
 .../cache/GridCacheMvccPartitionedSelfTest.java |    2 +-
 .../cache/GridCacheNestedTxAbstractTest.java    |    9 +-
 .../cache/GridCacheObjectToStringSelfTest.java  |   17 +-
 ...HeapMultiThreadedUpdateAbstractSelfTest.java |   75 +-
 ...CacheOffHeapMultiThreadedUpdateSelfTest.java |   76 +-
 .../cache/GridCacheOffHeapSelfTest.java         |   12 +-
 .../processors/cache/GridCacheOffHeapTest.java  |    5 +-
 .../GridCacheOffHeapTieredAbstractSelfTest.java |   87 +-
 ...heOffHeapTieredEvictionAbstractSelfTest.java |   23 +-
 .../cache/GridCacheOffheapUpdateSelfTest.java   |   28 +-
 .../GridCacheOrderedPreloadingSelfTest.java     |    2 +-
 .../cache/GridCacheP2PUndeploySelfTest.java     |   15 +-
 .../cache/GridCachePartitionedGetSelfTest.java  |   28 +-
 .../GridCachePreloadingEvictionsSelfTest.java   |   21 +-
 .../cache/GridCachePutAllFailoverSelfTest.java  |   11 +-
 .../GridCacheReferenceCleanupSelfTest.java      |   37 +-
 .../cache/GridCacheReloadSelfTest.java          |    4 +-
 ...ridCacheReplicatedSynchronousCommitTest.java |    6 +-
 .../cache/GridCacheSlowTxWarnTest.java          |    6 +-
 .../processors/cache/GridCacheStopSelfTest.java |    9 +-
 .../cache/GridCacheStoreValueBytesSelfTest.java |    4 +-
 .../cache/GridCacheSwapPreloadSelfTest.java     |   21 +-
 .../processors/cache/GridCacheTestEntryEx.java  |   47 +-
 ...cheTransactionalAbstractMetricsSelfTest.java |   13 +-
 .../GridCacheValueBytesPreloadingSelfTest.java  |   10 +-
 ...idCacheValueConsistencyAbstractSelfTest.java |    7 +-
 .../GridCacheVariableTopologySelfTest.java      |    8 +-
 ...BehindStorePartitionedMultiNodeSelfTest.java |   11 +-
 .../IgniteCacheEntryListenerAbstractTest.java   |    1 -
 .../processors/cache/IgniteTxAbstractTest.java  |   29 +-
 .../IgniteTxConcurrentGetAbstractTest.java      |    6 +-
 .../IgniteTxExceptionAbstractSelfTest.java      |   52 +-
 .../cache/IgniteTxMultiNodeAbstractTest.java    |   74 +-
 .../IgniteTxMultiThreadedAbstractTest.java      |    7 +-
 .../cache/IgniteTxReentryAbstractSelfTest.java  |    5 +-
 .../IgniteTxStoreExceptionAbstractSelfTest.java |   52 +-
 ...eAbstractDataStructuresFailoverSelfTest.java |   26 +-
 ...dCacheQueueMultiNodeConsistencySelfTest.java |    2 +-
 .../GridCacheSequenceApiSelfAbstractTest.java   |   11 +-
 ...idCachePartitionedNodeRestartTxSelfTest.java |   32 +-
 ...PartitionedQueueCreateMultiNodeSelfTest.java |    8 +-
 ...dCachePartitionedQueueEntryMoveSelfTest.java |    2 +-
 ...tractDistributedByteArrayValuesSelfTest.java |   54 +-
 .../GridCacheAbstractNodeRestartSelfTest.java   |   44 +-
 .../GridCacheAbstractPrimarySyncSelfTest.java   |    7 +-
 .../GridCacheAtomicTimeoutSelfTest.java         |   45 +-
 .../GridCacheBasicOpAbstractTest.java           |   74 +-
 .../GridCacheClientModesAbstractSelfTest.java   |   30 +-
 .../GridCacheEntrySetAbstractSelfTest.java      |   16 +-
 ...acheEntrySetIterationPreloadingSelfTest.java |    8 +-
 .../distributed/GridCacheEventAbstractTest.java |  133 +-
 ...heExpiredEntriesPreloadAbstractSelfTest.java |    1 -
 .../distributed/GridCacheLockAbstractTest.java  |    2 +-
 .../distributed/GridCacheMixedModeSelfTest.java |    5 +-
 .../GridCacheMultiNodeAbstractTest.java         |  190 +-
 .../GridCacheMultiNodeLockAbstractTest.java     |   33 +-
 ...dCacheMultithreadedFailoverAbstractTest.java |   26 +-
 .../GridCacheNodeFailureAbstractTest.java       |   15 +-
 ...dCachePartitionedAffinityFilterSelfTest.java |    5 +-
 ...chePartitionedReloadAllAbstractSelfTest.java |    9 +-
 .../GridCachePreloadEventsAbstractSelfTest.java |    4 +-
 ...GridCachePreloadRestartAbstractSelfTest.java |   22 +-
 .../GridCacheTransformEventSelfTest.java        |    6 +-
 .../IgniteCrossCacheTxStoreSelfTest.java        |   26 +-
 ...iteTxConsistencyRestartAbstractSelfTest.java |   16 +-
 ...xOriginatingNodeFailureAbstractSelfTest.java |   12 +-
 ...cOriginatingNodeFailureAbstractSelfTest.java |   28 +-
 .../IgniteTxTimeoutAbstractTest.java            |   11 +-
 ...tPartitionedOnlyByteArrayValuesSelfTest.java |   25 +-
 .../dht/GridCacheAtomicNearCacheSelfTest.java   |   42 +-
 .../dht/GridCacheColocatedDebugTest.java        |  120 +-
 ...eColocatedOptimisticTransactionSelfTest.java |   17 +-
 .../dht/GridCacheDhtEntrySelfTest.java          |   48 +-
 ...GridCacheDhtEvictionNearReadersSelfTest.java |    4 +-
 .../dht/GridCacheDhtEvictionSelfTest.java       |   11 +-
 .../GridCacheDhtEvictionsDisabledSelfTest.java  |    4 +-
 .../dht/GridCacheDhtInternalEntrySelfTest.java  |   23 +-
 .../dht/GridCacheDhtMappingSelfTest.java        |    2 +-
 .../dht/GridCacheDhtMultiBackupTest.java        |    7 +-
 .../dht/GridCacheDhtPreloadBigDataSelfTest.java |   14 +-
 .../dht/GridCacheDhtPreloadDelayedSelfTest.java |   42 +-
 .../GridCacheDhtPreloadDisabledSelfTest.java    |    8 +-
 .../GridCacheDhtPreloadMessageCountTest.java    |   14 +-
 .../dht/GridCacheDhtPreloadPutGetSelfTest.java  |   56 +-
 .../dht/GridCacheDhtPreloadUnloadSelfTest.java  |   22 +-
 ...cheGroupLockPartitionedAbstractSelfTest.java |   17 +-
 ...ockPartitionedMultiNodeAbstractSelfTest.java |   35 +-
 ...ePartitionedNearDisabledMetricsSelfTest.java |   11 +-
 ...idCachePartitionedPreloadEventsSelfTest.java |    6 +-
 ...dCachePartitionedTopologyChangeSelfTest.java |   49 +-
 ...ridCachePartitionedUnloadEventsSelfTest.java |    8 +-
 .../dht/IgniteTxReentryColocatedSelfTest.java   |    5 +-
 ...eAtomicInvalidPartitionHandlingSelfTest.java |    7 +-
 .../atomic/GridCacheAtomicPreloadSelfTest.java  |   14 +-
 ...GridCacheValueConsistencyAtomicSelfTest.java |    4 +-
 ...unctionExcludeNeighborsAbstractSelfTest.java |   12 +-
 ...tomicClientOnlyMultiNodeFullApiSelfTest.java |   10 +-
 ...eAtomicNearOnlyMultiNodeFullApiSelfTest.java |    4 +-
 .../near/GridCacheGetStoreErrorSelfTest.java    |    9 +-
 .../near/GridCacheNearEvictionSelfTest.java     |   20 +-
 .../near/GridCacheNearMetricsSelfTest.java      |  199 +-
 .../near/GridCacheNearMultiGetSelfTest.java     |   17 +-
 .../near/GridCacheNearMultiNodeSelfTest.java    |   10 +-
 ...idCacheNearOnlyMultiNodeFullApiSelfTest.java |  142 +-
 .../near/GridCacheNearOnlySelfTest.java         |   11 +-
 .../near/GridCacheNearOnlyTopologySelfTest.java |   25 +-
 .../GridCacheNearPartitionedClearSelfTest.java  |   19 +-
 .../GridCacheNearReaderPreloadSelfTest.java     |   27 +-
 .../near/GridCacheNearReadersSelfTest.java      |   14 +-
 .../near/GridCacheNearTxMultiNodeSelfTest.java  |   23 +-
 ...AffinityExcludeNeighborsPerformanceTest.java |    2 +-
 .../GridCachePartitionedAffinitySelfTest.java   |   11 +-
 .../GridCachePartitionedFullApiSelfTest.java    |  172 +-
 .../GridCachePartitionedLoadCacheSelfTest.java  |   10 +-
 ...achePartitionedMultiNodeCounterSelfTest.java |   48 +-
 ...achePartitionedMultiNodeFullApiSelfTest.java |   88 +-
 ...ePartitionedMultiThreadedPutGetSelfTest.java |   14 +-
 ...achePartitionedPreloadLifecycleSelfTest.java |   67 +-
 ...hePartitionedQueryMultiThreadedSelfTest.java |    4 +-
 .../GridCachePartitionedStorePutSelfTest.java   |   20 +-
 .../near/GridCachePutArrayValueSelfTest.java    |   14 +-
 ...idCacheRendezvousAffinityClientSelfTest.java |    5 +-
 .../near/IgniteTxReentryNearSelfTest.java       |    5 +-
 .../GridCacheReplicatedEvictionSelfTest.java    |    2 +-
 ...ReplicatedFullApiMultithreadedSelfTest1.java |   36 +-
 ...idCacheReplicatedUnswapAdvancedSelfTest.java |   13 +-
 .../GridCacheSyncReplicatedPreloadSelfTest.java |   17 +-
 ...CacheReplicatedPreloadLifecycleSelfTest.java |   82 +-
 .../GridCacheReplicatedPreloadSelfTest.java     |   51 +-
 ...GridCacheReplicatedPreloadUndeploysTest.java |    4 +-
 .../GridCacheBatchEvictUnswapSelfTest.java      |   10 +-
 ...heConcurrentEvictionConsistencySelfTest.java |   22 +-
 .../GridCacheConcurrentEvictionsSelfTest.java   |    6 +-
 .../GridCacheDistributedEvictionsSelfTest.java  |   16 +-
 .../GridCacheEmptyEntriesAbstractSelfTest.java  |   50 +-
 .../eviction/GridCacheEvictionAbstractTest.java |   69 +-
 .../GridCacheEvictionFilterSelfTest.java        |   29 +-
 .../GridCacheEvictionLockUnlockSelfTest.java    |    2 +-
 .../GridCacheEvictionTouchSelfTest.java         |   42 +-
 .../cache/eviction/GridCacheMockEntry.java      |  287 +-
 .../GridCacheFifoEvictionPolicySelfTest.java    |   14 +-
 .../lru/GridCacheLruEvictionPolicySelfTest.java |   15 +-
 .../GridCacheLruNearEvictionPolicySelfTest.java |    2 +-
 ...heNearOnlyLruNearEvictionPolicySelfTest.java |    2 +-
 .../GridCacheRandomEvictionPolicySelfTest.java  |   25 +-
 ...iteCacheNoLoadPreviousValueAbstractTest.java |    1 -
 .../IgniteCacheNoReadThroughAbstractTest.java   |    1 -
 .../IgniteCacheNoWriteThroughAbstractTest.java  |    1 -
 .../GridCacheLocalByteArrayValuesSelfTest.java  |   29 +-
 .../local/GridCacheLocalLoadAllSelfTest.java    |    2 +-
 .../local/GridCacheLocalTxTimeoutSelfTest.java  |   20 +-
 .../GridCacheSwapScanQueryAbstractSelfTest.java |   43 -
 ...ridCacheContinuousQueryAbstractSelfTest.java |   59 +-
 .../dataload/GridDataLoaderImplSelfTest.java    |    2 +-
 .../GridDataLoaderProcessorSelfTest.java        |   26 +-
 .../processors/fs/GridGgfsCacheSelfTest.java    |    6 +-
 .../fs/GridGgfsProcessorSelfTest.java           |    3 +-
 .../GridServiceProcessorAbstractSelfTest.java   |   10 +-
 .../GridServiceProcessorMultiNodeSelfTest.java  |    2 +-
 .../util/future/GridFinishedFutureSelfTest.java |    2 +-
 .../apache/ignite/lang/GridFuncSelfTest.java    | 3254 ------------------
 .../loadtests/GridCacheMultiNodeLoadTest.java   |    2 -
 .../cache/GridCacheAbstractLoadTest.java        |   12 +-
 ...ridCacheAffinityTransactionsOffHeapTest.java |   40 +-
 .../loadtests/cache/GridCacheBenchmark.java     |    6 +-
 .../cache/GridCacheDataStructuresLoadTest.java  |    6 +-
 .../cache/GridCacheGroupLockComparisonTest.java |    9 +-
 .../loadtests/cache/GridCacheLoadTest.java      |   26 +-
 .../cache/GridCachePutRemoveLoadTest.java       |    8 +-
 .../cache/GridCacheSingleNodeLoadTest.java      |    6 +-
 .../loadtests/cache/GridCacheSwapLoadTest.java  |   10 +-
 .../capacity/GridCapacityLoadTest.java          |    2 +-
 .../colocation/GridTestCacheStore.java          |    7 +-
 .../loadtests/colocation/GridTestMain.java      |   12 +-
 .../GridCachePartitionedAtomicLongLoadTest.java |    4 +-
 .../ignite/loadtests/dsi/GridDsiClient.java     |    4 +-
 .../ignite/loadtests/dsi/GridDsiPerfJob.java    |   23 +-
 .../cacheget/GridBenchmarkCacheGetLoadTest.java |    1 -
 .../mapper/GridContinuousMapperTask1.java       |    3 +-
 .../mapper/GridContinuousMapperTask2.java       |    3 +-
 .../swap/GridSwapEvictAllBenchmark.java         |   10 +-
 .../marshaller/GridMarshallerAbstractTest.java  |   55 +-
 .../p2p/GridAbstractMultinodeRedeployTest.java  |    4 +-
 .../CacheCheckpointSpiSecondCacheSelfTest.java  |   14 +-
 .../GridCacheStoreValueBytesTest.java           |   16 +-
 .../ignite/testframework/GridTestUtils.java     |   17 +-
 .../GridAbstractLifecycleAwareSelfTest.java     |    6 +-
 .../junits/common/GridCommonAbstractTest.java   |   66 +-
 .../ignite/testsuites/IgniteCacheTestSuite.java |    1 -
 .../testsuites/IgniteLangSelfTestSuite.java     |    1 -
 ...idHibernateL2CacheConfigurationSelfTest.java |   36 +-
 .../cache/GridCacheCrossCacheQuerySelfTest.java |    5 +-
 .../cache/GridCacheOffHeapAndSwapSelfTest.java  |   11 +-
 .../cache/GridCacheQueryLoadSelfTest.java       |    9 +-
 .../processors/cache/GridCacheSwapSelfTest.java |   11 +-
 .../near/GridCachePartitionedQuerySelfTest.java |   36 +-
 modules/scalar/pom.xml                          |   15 -
 .../ignite/scalar/ScalarConversions.scala       |    6 +-
 .../pimps/ScalarCacheProjectionPimp.scala       |   10 +-
 .../tests/ScalarCacheProjectionSpec.scala       |   39 -
 .../cache/spring/SpringDynamicCacheManager.java |   17 +-
 .../p2p/GridP2PUserVersionChangeSelfTest.java   |   23 +-
 .../spring/GridSpringCacheManagerSelfTest.java  |   23 +-
 .../GridSpringDynamicCacheManagerSelfTest.java  |   11 +-
 .../optimized/OptimizedClassNamesGenerator.java |    2 +-
 modules/visor-console/pom.xml                   |   15 -
 .../ignite/visor/commands/VisorConsole.scala    |   27 +-
 .../config/VisorConfigurationCommand.scala      |   11 +-
 .../commands/deploy/VisorDeployCommand.scala    |   11 +-
 .../commands/disco/VisorDiscoveryCommand.scala  |   21 +-
 .../commands/events/VisorEventsCommand.scala    |   15 +-
 .../visor/commands/node/VisorNodeCommand.scala  |   16 +-
 .../commands/start/VisorStartCommand.scala      |    9 +-
 .../commands/tasks/VisorTasksCommand.scala      |   16 +-
 .../commands/top/VisorTopologyCommand.scala     |   22 +-
 .../visor/commands/vvm/VisorVvmCommand.scala    |   22 +-
 .../cache/VisorCacheClearCommandSpec.scala      |   16 +-
 .../commands/cache/VisorCacheCommandSpec.scala  |    2 +-
 .../cache/VisorCacheCompactCommandSpec.scala    |    8 +-
 .../cswap/VisorCacheSwapCommandSpec.scala       |    4 +-
 .../internal/websession/WebSessionSelfTest.java |    4 +-
 pom.xml                                         |  158 +-
 402 files changed, 5836 insertions(+), 12784 deletions(-)
----------------------------------------------------------------------


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

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f403ee36/modules/core/src/test/java/org/apache/ignite/marshaller/GridMarshallerAbstractTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f403ee36/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/VisorConsole.scala
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f403ee36/pom.xml
----------------------------------------------------------------------


Mime
View raw message