Merge remote-tracking branch 'origin/ignite-45' into ignite-45
Conflicts:
modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMarshallingNodeJoinSelfTest.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/5de1cc2d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5de1cc2d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5de1cc2d
Branch: refs/heads/ignite-45-gridcache
Commit: 5de1cc2dc89ec8af2bc20a342262068b9554ee3f
Parents: 1a8a51d 34046ec
Author: Alexey Goncharuk <[email protected]>
Authored: Mon Mar 23 18:40:19 2015 -0700
Committer: Alexey Goncharuk <[email protected]>
Committed: Mon Mar 23 18:40:19 2015 -0700
----------------------------------------------------------------------
.../java/org/apache/ignite/schema/Demo.java | 2 +-
.../examples/datagrid/CacheAffinityExample.java | 4 +-
.../examples/datagrid/CacheQueryExample.java | 14 +-
.../starschema/CacheStarSchemaExample.java | 4 +-
.../client/memcache/MemcacheRestExample.java | 2 +-
.../java8/datagrid/CacheAffinityExample.java | 4 +-
.../examples/ScalarSnowflakeSchemaExample.scala | 4 +-
.../integration/ClientAbstractSelfTest.java | 4 +-
.../rest/AbstractRestProcessorSelfTest.java | 2 +-
.../rest/RestBinaryProtocolSelfTest.java | 72 ++---
.../rest/RestMemcacheProtocolSelfTest.java | 80 ++---
.../processors/rest/RestProcessorTest.java | 3 +-
.../ignite/jdbc/JdbcComplexQuerySelfTest.java | 5 +-
.../ignite/jdbc/JdbcLocalCachesSelfTest.java | 4 +-
.../ignite/jdbc/JdbcMetadataSelfTest.java | 4 +-
.../jdbc/JdbcPreparedStatementSelfTest.java | 2 +-
.../ignite/jdbc/JdbcResultSetSelfTest.java | 2 +-
.../ignite/jdbc/JdbcStatementSelfTest.java | 2 +-
.../loadtests/client/ClientTcpSslLoadTest.java | 2 +-
.../src/main/java/org/apache/ignite/Ignite.java | 62 +---
.../java/org/apache/ignite/IgniteCache.java | 2 +-
.../main/java/org/apache/ignite/Ignition.java | 38 ++-
.../org/apache/ignite/cache/CacheManager.java | 2 +-
.../store/jdbc/CacheAbstractJdbcStore.java | 2 +-
.../configuration/CacheConfiguration.java | 4 +-
.../ignite/internal/GridKernalContextImpl.java | 4 +-
.../ignite/internal/IgniteComponentType.java | 4 +-
.../apache/ignite/internal/IgniteKernal.java | 80 +----
.../org/apache/ignite/internal/IgnitionEx.java | 40 ++-
.../impl/GridRouterCommandLineStartup.java | 4 +-
.../internal/cluster/IgniteClusterImpl.java | 4 +-
.../processors/cache/EvictableEntryImpl.java | 2 +-
.../internal/processors/cache/GridCache.java | 2 +-
.../processors/cache/GridCacheAdapter.java | 8 +-
.../cache/GridCacheConcurrentMap.java | 4 +-
.../processors/cache/GridCacheEntrySet.java | 2 +-
.../processors/cache/GridCacheIterator.java | 2 +-
.../processors/cache/GridCacheKeySet.java | 2 +-
.../processors/cache/GridCacheMapEntry.java | 2 +-
.../cache/GridCacheValueCollection.java | 2 +-
.../distributed/dht/GridDhtCacheAdapter.java | 2 +-
.../query/jdbc/GridCacheQueryJdbcTask.java | 2 +-
.../handlers/cache/GridCacheCommandHandler.java | 2 +-
.../cache/GridCacheQueryCommandHandler.java | 6 +-
.../spring/IgniteSpringProcessor.java | 85 ------
.../util/nodestart/IgniteSshHelper.java | 34 +++
.../util/nodestart/IgniteSshProcessor.java | 34 ---
.../util/spring/IgniteSpringHelper.java | 95 ++++++
.../visor/cache/VisorCacheClearTask.java | 2 +-
.../visor/cache/VisorCacheLoadTask.java | 2 +-
.../ignite/startup/BasicWarmupClosure.java | 3 +-
.../apache/ignite/GridTestStoreNodeStartup.java | 2 +-
.../IgniteCacheExpiryStoreLoadSelfTest.java | 2 +-
...CacheJdbcBlobStoreMultithreadedSelfTest.java | 4 +-
.../GridProjectionForCachesSelfTest.java | 4 +-
.../ignite/internal/GridStartStopSelfTest.java | 4 +-
.../checkpoint/GridCheckpointTaskSelfTest.java | 4 +-
.../GridDeploymentMessageCountSelfTest.java | 6 +-
.../GridDiscoveryManagerAliveCacheSelfTest.java | 2 +-
.../GridAffinityProcessorAbstractSelfTest.java | 2 +-
.../GridCacheAbstractFailoverSelfTest.java | 2 +-
.../cache/GridCacheAbstractFullApiSelfTest.java | 48 +--
.../GridCacheAbstractLocalStoreSelfTest.java | 10 +-
.../cache/GridCacheAbstractMetricsSelfTest.java | 80 ++---
.../GridCacheAbstractRemoveFailureTest.java | 4 +-
.../cache/GridCacheAbstractSelfTest.java | 4 +-
...acheAbstractUsersAffinityMapperSelfTest.java | 2 +-
.../cache/GridCacheAffinityRoutingSelfTest.java | 4 +-
.../GridCacheAtomicMessageCountSelfTest.java | 2 +-
.../cache/GridCacheBasicApiAbstractTest.java | 31 +-
.../cache/GridCacheClearAllSelfTest.java | 14 +-
.../cache/GridCacheClearLocallySelfTest.java | 10 +-
.../cache/GridCacheConcurrentMapSelfTest.java | 10 +-
.../cache/GridCacheConcurrentMapTest.java | 6 +-
.../GridCacheConcurrentTxMultiNodeTest.java | 5 +-
...idCacheConfigurationConsistencySelfTest.java | 2 +-
.../GridCacheDaemonNodeAbstractSelfTest.java | 4 +-
.../cache/GridCacheDeploymentSelfTest.java | 18 +-
.../cache/GridCacheEntryMemorySizeSelfTest.java | 4 +-
.../cache/GridCacheEntryVersionSelfTest.java | 4 +-
.../GridCacheEvictionEventAbstractTest.java | 2 +-
.../GridCacheFinishPartitionsSelfTest.java | 10 +-
...CacheFullTextQueryMultithreadedSelfTest.java | 2 +-
.../cache/GridCacheIncrementTransformTest.java | 2 +-
.../GridCacheInterceptorAbstractSelfTest.java | 12 +-
.../cache/GridCacheIteratorPerformanceTest.java | 6 +-
.../cache/GridCacheKeyCheckSelfTest.java | 6 +-
.../processors/cache/GridCacheLeakTest.java | 2 +-
.../cache/GridCacheLuceneQueryIndexTest.java | 17 +-
.../GridCacheMarshallerTxAbstractTest.java | 10 +-
.../GridCacheMarshallingNodeJoinSelfTest.java | 2 +-
.../cache/GridCacheMemoryModeSelfTest.java | 2 +-
...GridCacheMixedPartitionExchangeSelfTest.java | 2 +-
.../cache/GridCacheMultiUpdateLockSelfTest.java | 4 +-
...ridCacheMultinodeUpdateAbstractSelfTest.java | 6 +-
.../cache/GridCacheMvccManagerSelfTest.java | 2 +-
.../cache/GridCacheNestedTxAbstractTest.java | 12 +-
.../cache/GridCacheObjectToStringSelfTest.java | 2 +-
...HeapMultiThreadedUpdateAbstractSelfTest.java | 17 +-
...CacheOffHeapMultiThreadedUpdateSelfTest.java | 14 +-
.../cache/GridCacheOffHeapSelfTest.java | 9 +-
.../GridCacheOffHeapTieredAbstractSelfTest.java | 41 ++-
...heOffHeapTieredEvictionAbstractSelfTest.java | 8 +-
.../cache/GridCacheOffheapUpdateSelfTest.java | 8 +-
.../GridCacheOnCopyFlagAbstractSelfTest.java | 12 +-
.../GridCacheOrderedPreloadingSelfTest.java | 2 +-
.../cache/GridCacheP2PUndeploySelfTest.java | 6 +-
.../cache/GridCachePartitionedGetSelfTest.java | 8 +-
.../GridCachePreloadingEvictionsSelfTest.java | 8 +-
.../cache/GridCachePutAllFailoverSelfTest.java | 7 +-
.../processors/cache/GridCachePutAllTask.java | 2 +-
.../GridCacheQueryInternalKeysSelfTest.java | 2 +-
.../GridCacheReferenceCleanupSelfTest.java | 10 +-
.../cache/GridCacheReloadSelfTest.java | 3 +-
...ridCacheReplicatedSynchronousCommitTest.java | 6 +-
.../GridCacheReturnValueTransferSelfTest.java | 2 +-
.../cache/GridCacheSlowTxWarnTest.java | 2 +-
.../processors/cache/GridCacheStopSelfTest.java | 2 +-
.../cache/GridCacheStoreValueBytesSelfTest.java | 3 +-
.../cache/GridCacheSwapPreloadSelfTest.java | 10 +-
...cheTransactionalAbstractMetricsSelfTest.java | 8 +-
.../cache/GridCacheTtlManagerLoadTest.java | 2 +-
.../cache/GridCacheTtlManagerSelfTest.java | 6 +-
.../GridCacheValueBytesPreloadingSelfTest.java | 10 +-
...idCacheValueConsistencyAbstractSelfTest.java | 5 +-
.../GridCacheVariableTopologySelfTest.java | 2 +-
...BehindStorePartitionedMultiNodeSelfTest.java | 6 +-
.../IgniteCacheAbstractStopBusySelfTest.java | 2 +-
.../cache/IgniteCacheAbstractTest.java | 2 +-
...niteCacheCopyOnReadDisabledAbstractTest.java | 2 +-
.../cache/IgniteCacheDynamicStopSelfTest.java | 2 +-
.../IgniteCacheEntryListenerAbstractTest.java | 6 +-
.../cache/IgniteCacheStartStopLoadTest.java | 4 +-
.../cache/IgniteCacheTxPreloadNoWriteTest.java | 3 +-
.../IgniteClientAffinityAssignmentSelfTest.java | 4 +-
.../cache/IgniteDynamicCacheStartSelfTest.java | 46 +--
.../cache/IgnitePutAllLargeBatchSelfTest.java | 8 +-
...tAllUpdateNonPreloadedPartitionSelfTest.java | 4 +-
.../cache/IgniteStaticCacheStartSelfTest.java | 4 +-
.../IgniteTxConcurrentGetAbstractTest.java | 4 +-
.../IgniteTxExceptionAbstractSelfTest.java | 32 +-
.../cache/IgniteTxMultiNodeAbstractTest.java | 56 ++--
.../IgniteTxMultiThreadedAbstractTest.java | 2 +-
.../cache/IgniteTxReentryAbstractSelfTest.java | 3 +-
.../IgniteTxStoreExceptionAbstractSelfTest.java | 32 +-
...IgniteCacheAbstractExecutionContextTest.java | 4 +-
...eAbstractDataStructuresFailoverSelfTest.java | 2 +-
.../GridCacheSequenceApiSelfAbstractTest.java | 2 +-
.../IgniteAtomicLongApiAbstractSelfTest.java | 2 +-
...idCachePartitionedNodeRestartTxSelfTest.java | 24 +-
...PartitionedQueueCreateMultiNodeSelfTest.java | 2 +-
...tractDistributedByteArrayValuesSelfTest.java | 6 +-
.../GridCacheAbstractJobExecutionTest.java | 10 +-
.../GridCacheAbstractNodeRestartSelfTest.java | 10 +-
.../GridCacheAbstractPrimarySyncSelfTest.java | 2 +-
.../GridCacheAtomicTimeoutSelfTest.java | 8 +-
.../GridCacheBasicOpAbstractTest.java | 26 +-
.../GridCacheClientModesAbstractSelfTest.java | 10 +-
.../GridCacheEntrySetAbstractSelfTest.java | 2 +-
...heExpiredEntriesPreloadAbstractSelfTest.java | 2 +-
...GridCacheLoadingConcurrentGridStartTest.java | 6 +-
.../distributed/GridCacheLockAbstractTest.java | 5 +-
.../distributed/GridCacheMixedModeSelfTest.java | 2 +-
.../GridCacheMultiNodeAbstractTest.java | 10 +-
.../GridCacheMultiNodeLockAbstractTest.java | 14 +-
...dCacheMultithreadedFailoverAbstractTest.java | 6 +-
.../GridCacheNodeFailureAbstractTest.java | 6 +-
...dCachePartitionedAffinityFilterSelfTest.java | 3 +-
...chePartitionedReloadAllAbstractSelfTest.java | 6 +-
.../GridCachePreloadEventsAbstractSelfTest.java | 4 +-
...GridCachePreloadRestartAbstractSelfTest.java | 4 +-
.../GridCacheTransformEventSelfTest.java | 2 +-
.../IgniteCacheSystemTransactionsSelfTest.java | 2 +-
.../IgniteCrossCacheTxStoreSelfTest.java | 18 +-
...iteTxConsistencyRestartAbstractSelfTest.java | 4 +-
...xOriginatingNodeFailureAbstractSelfTest.java | 8 +-
...cOriginatingNodeFailureAbstractSelfTest.java | 16 +-
.../IgniteTxTimeoutAbstractTest.java | 2 +-
...tPartitionedOnlyByteArrayValuesSelfTest.java | 8 +-
.../dht/GridCacheAtomicNearCacheSelfTest.java | 32 +-
.../dht/GridCacheColocatedDebugTest.java | 109 ++++---
...eColocatedOptimisticTransactionSelfTest.java | 2 +-
.../dht/GridCacheDhtEntrySelfTest.java | 3 +-
...GridCacheDhtEvictionNearReadersSelfTest.java | 2 +-
.../dht/GridCacheDhtEvictionSelfTest.java | 4 +-
.../GridCacheDhtEvictionsDisabledSelfTest.java | 2 +-
.../dht/GridCacheDhtInternalEntrySelfTest.java | 16 +-
.../dht/GridCacheDhtMappingSelfTest.java | 3 +-
.../dht/GridCacheDhtMultiBackupTest.java | 4 +-
.../dht/GridCacheDhtPreloadBigDataSelfTest.java | 10 +-
.../dht/GridCacheDhtPreloadDelayedSelfTest.java | 21 +-
.../GridCacheDhtPreloadDisabledSelfTest.java | 8 +-
.../GridCacheDhtPreloadMessageCountTest.java | 6 +-
.../dht/GridCacheDhtPreloadPutGetSelfTest.java | 4 +-
.../dht/GridCacheDhtPreloadSelfTest.java | 18 +-
.../GridCacheDhtPreloadStartStopSelfTest.java | 4 +-
.../dht/GridCacheDhtPreloadUnloadSelfTest.java | 24 +-
...ePartitionedNearDisabledMetricsSelfTest.java | 10 +-
...idCachePartitionedPreloadEventsSelfTest.java | 4 +-
...dCachePartitionedTopologyChangeSelfTest.java | 12 +-
...ridCachePartitionedUnloadEventsSelfTest.java | 8 +-
.../dht/IgniteTxReentryColocatedSelfTest.java | 2 +-
...eAtomicInvalidPartitionHandlingSelfTest.java | 2 +-
.../atomic/GridCacheAtomicPreloadSelfTest.java | 4 +-
...GridCacheValueConsistencyAtomicSelfTest.java | 4 +-
...tomicClientOnlyMultiNodeFullApiSelfTest.java | 4 +-
...eAtomicNearOnlyMultiNodeFullApiSelfTest.java | 4 +-
...AtomicPartitionedTckMetricsSelfTestImpl.java | 8 +-
.../near/GridCacheGetStoreErrorSelfTest.java | 2 +-
.../near/GridCacheNearEvictionSelfTest.java | 6 +-
.../near/GridCacheNearMetricsSelfTest.java | 30 +-
.../near/GridCacheNearMultiGetSelfTest.java | 4 +-
.../near/GridCacheNearMultiNodeSelfTest.java | 6 +-
...idCacheNearOnlyMultiNodeFullApiSelfTest.java | 2 +-
.../near/GridCacheNearOnlyTopologySelfTest.java | 4 +-
.../GridCacheNearPartitionedClearSelfTest.java | 4 +-
.../GridCacheNearReaderPreloadSelfTest.java | 6 +-
.../near/GridCacheNearReadersSelfTest.java | 22 +-
.../near/GridCacheNearTxMultiNodeSelfTest.java | 12 +-
.../GridCachePartitionedAffinitySelfTest.java | 4 +-
.../GridCachePartitionedEvictionSelfTest.java | 2 +-
...idCachePartitionedHitsAndMissesSelfTest.java | 2 +-
...achePartitionedMultiNodeCounterSelfTest.java | 20 +-
...achePartitionedMultiNodeFullApiSelfTest.java | 15 +-
...ePartitionedMultiThreadedPutGetSelfTest.java | 4 +-
...achePartitionedPreloadLifecycleSelfTest.java | 13 +-
.../GridCachePartitionedStorePutSelfTest.java | 7 +-
.../near/GridCachePutArrayValueSelfTest.java | 2 +-
...idCacheRendezvousAffinityClientSelfTest.java | 4 +-
.../near/GridPartitionedBackupLoadSelfTest.java | 3 +-
.../near/IgniteCacheNearReadCommittedTest.java | 4 +-
.../near/IgniteTxReentryNearSelfTest.java | 2 +-
...idCacheReplicatedUnswapAdvancedSelfTest.java | 4 +-
.../GridCacheSyncReplicatedPreloadSelfTest.java | 4 +-
...CacheReplicatedPreloadLifecycleSelfTest.java | 15 +-
.../GridCacheReplicatedPreloadSelfTest.java | 32 +-
...GridCacheReplicatedPreloadUndeploysTest.java | 4 +-
.../GridCacheBatchEvictUnswapSelfTest.java | 3 +-
...heConcurrentEvictionConsistencySelfTest.java | 2 +-
.../GridCacheConcurrentEvictionsSelfTest.java | 3 +-
.../GridCacheDistributedEvictionsSelfTest.java | 4 +-
.../GridCacheEmptyEntriesAbstractSelfTest.java | 4 +-
.../eviction/GridCacheEvictionAbstractTest.java | 4 +-
.../GridCacheEvictionFilterSelfTest.java | 5 +-
.../GridCacheEvictionTouchSelfTest.java | 9 +-
.../GridCacheFifoEvictionPolicySelfTest.java | 2 +-
.../lru/GridCacheLruEvictionPolicySelfTest.java | 2 +-
.../GridCacheLruNearEvictionPolicySelfTest.java | 3 +-
...heNearOnlyLruNearEvictionPolicySelfTest.java | 2 +-
.../GridCacheRandomEvictionPolicySelfTest.java | 16 +-
.../IgniteCacheStoreSessionAbstractTest.java | 5 +-
...acheStoreSessionWriteBehindAbstractTest.java | 3 +-
.../IgniteCacheTxStoreSessionTest.java | 6 +-
...dCacheAtomicLocalTckMetricsSelfTestImpl.java | 8 +-
.../GridCacheLocalByteArrayValuesSelfTest.java | 4 +-
.../local/GridCacheLocalLoadAllSelfTest.java | 3 +-
.../cache/local/GridCacheLocalLockSelfTest.java | 6 +-
.../GridCacheLocalMultithreadedSelfTest.java | 2 +-
.../local/GridCacheLocalTxTimeoutSelfTest.java | 2 +-
.../GridCacheSwapScanQueryAbstractSelfTest.java | 12 +-
...ridCacheContinuousQueryAbstractSelfTest.java | 36 +--
...dCacheContinuousQueryReplicatedSelfTest.java | 8 +-
.../DataStreamProcessorSelfTest.java | 12 +-
.../datastreamer/DataStreamerImplSelfTest.java | 2 +-
.../processors/igfs/IgfsCacheSelfTest.java | 6 +-
.../GridServiceProcessorAbstractSelfTest.java | 4 +-
.../GridServiceProcessorMultiNodeSelfTest.java | 2 +-
.../loadtests/GridCacheLoadPopulationTask.java | 2 +-
.../cache/GridCacheAbstractLoadTest.java | 2 +-
.../loadtests/cache/GridCacheBenchmark.java | 3 +-
.../cache/GridCacheDataStructuresLoadTest.java | 2 +-
.../loadtests/cache/GridCacheLoadTest.java | 5 +-
.../loadtests/cache/GridCacheSwapLoadTest.java | 7 +-
.../capacity/GridCapacityLoadTest.java | 3 +-
.../colocation/GridTestCacheStore.java | 2 +-
.../colocation/GridTestLifecycleBean.java | 2 +-
.../loadtests/colocation/GridTestMain.java | 6 +-
.../GridContinuousOperationsLoadTest.java | 2 +-
.../GridCachePartitionedAtomicLongLoadTest.java | 2 +-
.../ignite/loadtests/dsi/GridDsiClient.java | 4 +-
.../ignite/loadtests/dsi/GridDsiPerfJob.java | 6 +-
.../cacheget/GridBenchmarkCacheGetLoadTest.java | 2 +-
.../mapper/GridContinuousMapperTask1.java | 2 +-
.../mapper/GridContinuousMapperTask2.java | 2 +-
.../swap/GridSwapEvictAllBenchmark.java | 4 +-
.../marshaller/GridMarshallerAbstractTest.java | 6 +-
.../OptimizedMarshallerNodeFailoverTest.java | 4 +-
.../CacheCheckpointSpiSecondCacheSelfTest.java | 4 +-
.../tcp/GridCacheDhtLockBackupSelfTest.java | 4 +-
.../ignite/testframework/junits/IgniteMock.java | 32 +-
.../junits/common/GridCommonAbstractTest.java | 13 +-
.../tests/p2p/CacheDeploymentTestTask1.java | 2 +-
.../tests/p2p/CacheDeploymentTestTask3.java | 2 +-
.../p2p/GridP2PContinuousDeploymentTask1.java | 2 +-
.../query/h2/GridH2IndexingGeoSelfTest.java | 8 +-
.../HibernateAccessStrategyAdapter.java | 2 +-
.../cache/hibernate/HibernateRegionFactory.java | 6 +-
.../HibernateL2CacheConfigurationSelfTest.java | 10 +-
.../GridCacheAbstractFieldsQuerySelfTest.java | 46 +--
.../cache/GridCacheCrossCacheQuerySelfTest.java | 15 +-
.../cache/GridCacheOffHeapAndSwapSelfTest.java | 4 +-
.../cache/GridCacheQuerySimpleBenchmark.java | 2 +-
.../processors/cache/GridCacheSwapSelfTest.java | 11 +-
.../cache/GridIndexingWithNoopSwapSelfTest.java | 2 +-
.../IgniteCacheAbstractFieldsQuerySelfTest.java | 40 +--
.../cache/IgniteCacheAbstractQuerySelfTest.java | 60 ++--
.../IgniteCacheFieldsQueryNoDataSelfTest.java | 2 +-
...hePartitionedQueryMultiThreadedSelfTest.java | 6 +-
.../cache/IgniteCacheQueryIndexSelfTest.java | 4 +-
.../cache/IgniteCacheQueryLoadSelfTest.java | 14 +-
.../IgniteCacheQueryMultiThreadedSelfTest.java | 32 +-
...gniteCacheSqlQueryMultiThreadedSelfTest.java | 5 +-
...GridCachePartitionedFieldsQuerySelfTest.java | 2 +-
.../IgniteCacheAtomicFieldsQuerySelfTest.java | 2 +-
.../IgniteCachePartitionedQuerySelfTest.java | 4 +-
.../IgniteCacheQueryNodeRestartSelfTest.java | 3 +-
.../GridCacheReplicatedFieldsQuerySelfTest.java | 4 +-
...gniteCacheReplicatedFieldsQuerySelfTest.java | 2 +-
.../IgniteCacheReplicatedQuerySelfTest.java | 12 +-
.../local/IgniteCacheLocalQuerySelfTest.java | 2 +-
...dCacheAbstractReduceFieldsQuerySelfTest.java | 10 +-
...cheReduceFieldsQueryPartitionedSelfTest.java | 2 +-
.../query/h2/GridH2IndexRebuildTest.java | 17 +-
.../processors/cache/GridCacheJtaSelfTest.java | 2 +-
.../scala/org/apache/ignite/scalar/scalar.scala | 6 +-
.../org/apache/ignite/IgniteSpringBean.java | 46 +--
.../spring/IgniteSpringProcessorImpl.java | 272 -----------------
.../util/spring/IgniteSpringHelperImpl.java | 301 +++++++++++++++++++
.../ignite/internal/GridFactorySelfTest.java | 24 ++
.../internal/IgniteDynamicCacheConfigTest.java | 76 ++---
.../p2p/GridP2PUserVersionChangeSelfTest.java | 6 +-
.../spring/GridSpringCacheManagerSelfTest.java | 20 +-
.../util/nodestart/IgniteSshHelperImpl.java | 28 ++
.../util/nodestart/IgniteSshProcessorImpl.java | 28 --
.../scala/org/apache/ignite/visor/visor.scala | 4 +-
.../cache/VisorCacheClearCommandSpec.scala | 8 +-
.../commands/cache/VisorCacheCommandSpec.scala | 4 +-
.../cswap/VisorCacheSwapCommandSpec.scala | 4 +-
.../cache/websession/WebSessionFilter.java | 2 +-
.../internal/websession/WebSessionSelfTest.java | 2 +-
.../yardstick/cache/IgniteGetBenchmark.java | 2 +-
.../cache/IgniteGetOffHeapBenchmark.java | 2 +-
.../cache/IgniteGetOffHeapValuesBenchmark.java | 2 +-
.../yardstick/cache/IgnitePutBenchmark.java | 2 +-
.../yardstick/cache/IgnitePutGetBenchmark.java | 2 +-
.../cache/IgnitePutGetOffHeapBenchmark.java | 2 +-
.../IgnitePutGetOffHeapValuesBenchmark.java | 2 +-
.../cache/IgnitePutGetTxBenchmark.java | 2 +-
.../cache/IgnitePutGetTxOffHeapBenchmark.java | 2 +-
.../IgnitePutGetTxOffHeapValuesBenchmark.java | 2 +-
.../cache/IgnitePutOffHeapBenchmark.java | 2 +-
.../cache/IgnitePutOffHeapValuesBenchmark.java | 2 +-
.../yardstick/cache/IgnitePutTxBenchmark.java | 2 +-
.../cache/IgnitePutTxOffHeapBenchmark.java | 2 +-
.../IgnitePutTxOffHeapValuesBenchmark.java | 2 +-
.../cache/IgniteSqlQueryBenchmark.java | 2 +-
.../cache/IgniteSqlQueryJoinBenchmark.java | 2 +-
.../IgniteSqlQueryJoinOffHeapBenchmark.java | 2 +-
.../cache/IgniteSqlQueryOffHeapBenchmark.java | 2 +-
.../cache/IgniteSqlQueryPutBenchmark.java | 2 +-
.../IgniteSqlQueryPutOffHeapBenchmark.java | 2 +-
.../store/jdbc/IgniteJdbcStoreGetBenchmark.java | 2 +-
.../jdbc/IgniteJdbcStoreGetTxBenchmark.java | 2 +-
.../store/jdbc/IgniteJdbcStorePutBenchmark.java | 2 +-
.../jdbc/IgniteJdbcStorePutGetBenchmark.java | 2 +-
.../jdbc/IgniteJdbcStorePutGetTxBenchmark.java | 2 +-
.../jdbc/IgniteJdbcStorePutTxBenchmark.java | 2 +-
367 files changed, 1895 insertions(+), 2026 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5de1cc2d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMarshallingNodeJoinSelfTest.java
----------------------------------------------------------------------
diff --cc
modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMarshallingNodeJoinSelfTest.java
index efb9bf1,a7e51b3..a7b1287
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMarshallingNodeJoinSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMarshallingNodeJoinSelfTest.java
@@@ -110,9 -110,9 +110,9 @@@ public class GridCacheMarshallingNodeJo
}
}, 1);
- IgniteCache<Integer, TestObject> cache = ignite(0).jcache(null);
- try (Transaction tx = ignite(0).transactions().txStart(PESSIMISTIC,
REPEATABLE_READ)) {
- IgniteCache<Integer, TestObject> cache = ignite(0).cache(null);
++ IgniteCache<Integer, TestObject> cache = ignite(0).cache(null);
+ try (Transaction tx = ignite(0).transactions().txStart(PESSIMISTIC,
REPEATABLE_READ)) {
cache.get(0);
allowJoin.countDown();
