Merge branches 'ignite-gg-9942' and 'ignite-sprint-3' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-gg-9942
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d47b66a2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d47b66a2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d47b66a2 Branch: refs/heads/ignite-gg-9973 Commit: d47b66a2177367e3e86e1ffba9217589783d27d1 Parents: c8428a4 ed6632a Author: AKuznetsov <akuznet...@gridgain.com> Authored: Thu Apr 2 08:51:46 2015 +0700 Committer: AKuznetsov <akuznet...@gridgain.com> Committed: Thu Apr 2 08:51:46 2015 +0700 ---------------------------------------------------------------------- examples/pom.xml | 19 +- examples/schema-import/pom.xml | 10 +- modules/aop/pom.xml | 6 +- modules/aws/pom.xml | 4 +- modules/clients/pom.xml | 10 +- modules/codegen/pom.xml | 4 +- modules/core/pom.xml | 8 +- .../apache/ignite/cache/CachingProvider.java | 2 +- .../configuration/FileSystemConfiguration.java | 6 + .../processors/cache/CacheObjectContext.java | 14 +- .../processors/cache/CacheObjectImpl.java | 10 +- .../processors/cache/GridCacheMapEntry.java | 2 +- .../cache/query/GridCacheQueryManager.java | 16 +- .../continuous/CacheContinuousQueryManager.java | 28 ++ .../IgniteCacheObjectProcessorImpl.java | 173 +++++++---- .../processors/igfs/IgfsDataManager.java | 11 +- .../processors/igfs/IgfsFileAffinityRange.java | 23 +- .../spi/discovery/tcp/TcpDiscoverySpi.java | 9 +- .../IgniteCacheAtomicLocalStoreValueTest.java | 49 +++ ...iteCacheAtomicNearEnabledStoreValueTest.java | 30 ++ ...maryWriteOrderNearEnabledStoreValueTest.java | 31 ++ ...heAtomicPrimaryWriteOrderStoreValueTest.java | 32 ++ .../cache/IgniteCacheAtomicStoreValueTest.java | 55 ++++ .../IgniteCacheStoreValueAbstractTest.java | 311 +++++++++++++++++++ .../cache/IgniteCacheTxLocalStoreValueTest.java | 49 +++ .../IgniteCacheTxNearEnabledStoreValueTest.java | 30 ++ .../cache/IgniteCacheTxStoreValueTest.java | 49 +++ .../junits/common/GridCommonAbstractTest.java | 2 +- .../ignite/testsuites/IgniteCacheTestSuite.java | 9 + modules/extdata/p2p/pom.xml | 4 +- modules/extdata/uri/pom.xml | 4 +- modules/geospatial/pom.xml | 4 +- modules/hadoop/pom.xml | 8 +- modules/hibernate/pom.xml | 6 +- modules/indexing/pom.xml | 4 +- modules/jcl/pom.xml | 4 +- modules/jta/pom.xml | 4 +- modules/log4j/pom.xml | 4 +- modules/rest-http/pom.xml | 2 +- modules/scalar/pom.xml | 10 +- modules/schedule/pom.xml | 4 +- modules/schema-import/pom.xml | 2 +- modules/slf4j/pom.xml | 2 +- modules/spring/pom.xml | 8 +- modules/ssh/pom.xml | 8 +- modules/urideploy/pom.xml | 6 +- modules/visor-console/pom.xml | 8 +- .../scala/org/apache/ignite/visor/visor.scala | 2 +- modules/visor-plugins/pom.xml | 2 +- modules/web/pom.xml | 8 +- modules/yardstick/pom.xml | 6 +- pom.xml | 56 ++-- 52 files changed, 947 insertions(+), 221 deletions(-) ----------------------------------------------------------------------
