Merge remote-tracking branch 'remotes/origin/ignite-sprint-3' into ignite-gg-10009-2
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/f1112946 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f1112946 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f1112946 Branch: refs/heads/ignite-sprint-3 Commit: f111294648e856b6a68c78cdf753a50e81d800f5 Parents: 93912fe 214a461 Author: sboikov <sboi...@gridgain.com> Authored: Thu Apr 2 15:23:42 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Thu Apr 2 15:23:42 2015 +0300 ---------------------------------------------------------------------- DEVNOTES.txt | 2 + examples/pom.xml | 19 +- examples/schema-import/pom.xml | 10 +- ipc/shmem/README.txt | 2 +- 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 +- .../processors/cache/CacheObjectContext.java | 14 +- .../processors/cache/CacheObjectImpl.java | 10 +- .../processors/cache/GridCacheMapEntry.java | 2 +- .../cache/query/GridCacheQueryManager.java | 16 +- .../transactions/IgniteTxLocalAdapter.java | 4 +- .../IgniteCacheObjectProcessorImpl.java | 173 +++++++---- .../visor/cache/VisorCacheConfiguration.java | 81 ++--- .../cache/VisorCacheNearConfiguration.java | 11 +- .../visor/node/VisorGridConfiguration.java | 28 +- .../internal/visor/util/VisorMimeTypes.java | 4 +- .../spi/discovery/tcp/TcpDiscoverySpi.java | 9 +- .../resources/META-INF/classnames.properties | 79 ++--- .../ignite/IgniteCacheAffinitySelfTest.java | 2 + .../GridCacheOnCopyFlagAbstractSelfTest.java | 16 +- .../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 +++ .../processors/igfs/IgsfStartCacheTest.java | 115 +++++++ .../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 +- .../GridUriDeploymentFileResourceLoader.java | 2 +- 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 +- parent/pom.xml | 10 +- pom.xml | 56 ++-- 61 files changed, 1138 insertions(+), 318 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f1112946/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java ----------------------------------------------------------------------
