Merge branch 'master' into ignite-648
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/01410fa9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/01410fa9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/01410fa9 Branch: refs/heads/ignite-648 Commit: 01410fa9274d80e0d62fd2a708538520d3e07301 Parents: 9fa7acf 6386794 Author: ashutak <ashu...@gridgain.com> Authored: Fri Jul 10 14:10:06 2015 +0300 Committer: ashutak <ashu...@gridgain.com> Committed: Fri Jul 10 14:10:06 2015 +0300 ---------------------------------------------------------------------- RELEASE_NOTES.txt | 12 + .../examples/ScalarCacheAffinityExample.scala | 2 +- .../scalar/examples/ScalarCacheExample.scala | 2 +- .../ScalarCachePopularNumbersExample.scala | 2 +- .../examples/ScalarCacheQueryExample.scala | 2 +- .../examples/ScalarSnowflakeSchemaExample.scala | 4 +- .../src/main/java/org/apache/ignite/Ignite.java | 2 +- .../java/org/apache/ignite/IgniteCache.java | 14 +- .../org/apache/ignite/cache/CacheManager.java | 13 +- .../configuration/CacheConfiguration.java | 4 + .../configuration/TransactionConfiguration.java | 23 + .../apache/ignite/internal/IgniteKernal.java | 34 +- .../discovery/GridDiscoveryManager.java | 23 +- .../cache/DynamicCacheChangeRequest.java | 39 +- .../processors/cache/GridCacheAttributes.java | 3 + .../processors/cache/GridCacheContext.java | 8 +- .../processors/cache/GridCacheGateway.java | 4 +- .../processors/cache/GridCacheIoManager.java | 8 +- .../GridCachePartitionExchangeManager.java | 6 +- .../processors/cache/GridCacheProcessor.java | 220 ++--- .../cache/GridCacheSharedContext.java | 15 +- .../processors/cache/IgniteCacheProxy.java | 448 +++++++--- .../distributed/dht/GridDhtCacheEntry.java | 4 +- .../GridDhtPartitionsExchangeFuture.java | 30 +- .../distributed/near/GridNearGetFuture.java | 4 +- .../cache/jta/CacheJtaManagerAdapter.java | 17 +- .../cache/jta/CacheNoopJtaManager.java | 2 +- .../continuous/CacheContinuousQueryHandler.java | 4 +- .../datastreamer/DataStreamProcessor.java | 3 + .../datastructures/DataStructuresProcessor.java | 39 +- .../GridCacheCountDownLatchImpl.java | 15 +- .../ignite/internal/util/IgniteUtils.java | 6 +- .../visor/cache/VisorCacheConfiguration.java | 11 - .../visor/cache/VisorCacheStopTask.java | 2 +- .../tcp/internal/TcpDiscoveryNode.java | 8 +- .../affinity/IgniteClientNodeAffinityTest.java | 14 +- .../IgniteFairAffinityDynamicCacheSelfTest.java | 3 +- ...cheStoreSessionListenerAbstractSelfTest.java | 112 ++- .../GridCacheTxLoadFromStoreOnLockSelfTest.java | 34 +- .../cache/CacheFutureExceptionSelfTest.java | 72 +- .../CacheMetricsForClusterGroupSelfTest.java | 10 +- .../cache/CacheOffheapMapEntrySelfTest.java | 7 +- .../cache/CacheStopAndDestroySelfTest.java | 859 +++++++++++++++++++ ...eUsageMultinodeDynamicStartAbstractTest.java | 2 +- ...ProjectionForCachesOnDaemonNodeSelfTest.java | 2 +- .../IgniteCacheConfigurationTemplateTest.java | 26 +- .../cache/IgniteDynamicCacheStartSelfTest.java | 156 ++-- .../IgniteDynamicClientCacheStartSelfTest.java | 5 +- .../IgniteClientDataStructuresAbstractTest.java | 109 ++- .../IgniteCountDownLatchAbstractSelfTest.java | 12 +- ...teCacheClientNodePartitionsExchangeTest.java | 29 +- ...CacheLocalOffHeapAndSwapMetricsSelfTest.java | 2 +- .../DataStreamerMultinodeCreateCacheTest.java | 14 +- .../loadtests/hashmap/GridCacheTestContext.java | 4 +- .../testsuites/IgniteCacheTestSuite4.java | 2 + .../CacheConfigurationP2PTestClient.java | 4 +- .../testsuites/IgniteHadoopTestSuite.java | 2 +- .../HibernateTransactionalDataRegion.java | 12 +- .../hibernate/HibernateL2CacheSelfTest.java | 7 +- .../HibernateL2CacheTransactionalSelfTest.java | 5 - .../apache/ignite/cache/jta/CacheTmLookup.java | 3 +- .../processors/cache/jta/CacheJtaManager.java | 72 +- .../cache/jta/GridCacheXAResource.java | 16 +- .../processors/cache/GridCacheJtaSelfTest.java | 52 +- .../GridTmLookupLifecycleAwareSelfTest.java | 29 +- modules/kafka/pom.xml | 11 - .../util/spring/IgniteSpringHelperImpl.java | 10 +- .../IgniteExcludeInConfigurationTest.java | 5 +- .../org/apache/ignite/spring/sprint-exclude.xml | 19 + .../commands/cache/VisorCacheCommand.scala | 2 - .../visor/commands/open/VisorOpenCommand.scala | 2 +- 71 files changed, 2115 insertions(+), 643 deletions(-) ----------------------------------------------------------------------
