Merge remote-tracking branch 'remotes/origin/ignite-sprint-3' into ignite-662
Conflicts:
modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.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/1a9de867
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/1a9de867
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/1a9de867
Branch: refs/heads/ignite-gg-10002
Commit: 1a9de86780567eb99d82b7c9a08d32fd6462264e
Parents: 5caa107 dc62822
Author: sboikov <sboi...@gridgain.com>
Authored: Wed Apr 1 15:52:05 2015 +0300
Committer: sboikov <sboi...@gridgain.com>
Committed: Wed Apr 1 15:52:05 2015 +0300
----------------------------------------------------------------------
.../examples/datagrid/CacheQueryExample.java | 12 +-
.../store/jdbc/CacheAbstractJdbcStore.java | 2 +-
.../cache/store/jdbc/CacheJdbcBlobStore.java | 9 +-
.../configuration/FileSystemConfiguration.java | 6 +
.../ignite/internal/GridCachePluginContext.java | 2 +-
.../apache/ignite/internal/IgniteKernal.java | 5 +-
.../cache/CacheObjectByteArrayImpl.java | 2 +-
.../cache/DynamicCacheDescriptor.java | 2 +-
.../processors/cache/GridCacheAdapter.java | 4 +-
.../processors/cache/GridCacheProcessor.java | 66 +++++------
.../continuous/CacheContinuousQueryManager.java | 28 +++++
.../processors/igfs/IgfsDataManager.java | 11 +-
.../processors/igfs/IgfsFileAffinityRange.java | 23 +---
.../processors/igfs/IgfsHelperImpl.java | 3 +-
.../processors/plugin/CachePluginManager.java | 2 +-
.../ignite/plugin/CachePluginConfiguration.java | 5 +-
.../ignite/plugin/CachePluginContext.java | 2 +-
.../ignite/plugin/CachePluginProvider.java | 3 +-
.../ignite/startup/BasicWarmupClosure.java | 2 +-
...IgniteCacheJdbcBlobStoreNodeRestartTest.java | 52 +++++++++
...IgniteCacheStoreNodeRestartAbstractTest.java | 116 +++++++++++++++++++
.../ignite/testsuites/IgniteCacheTestSuite.java | 2 +
.../hibernate/CacheHibernateBlobStore.java | 9 +-
.../CacheHibernateBlobStoreNodeRestartTest.java | 52 +++++++++
.../testsuites/IgniteHibernateTestSuite.java | 2 +
.../processors/query/h2/IgniteH2Indexing.java | 4 +-
.../ant/beautifier/GridJavadocAntTask.java | 8 +-
27 files changed, 341 insertions(+), 93 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1a9de867/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java
----------------------------------------------------------------------
diff --cc
modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java
index 9e50565,6fdaa00..a4553c4
---
a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java
+++
b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java
@@@ -415,15 -415,8 +415,17 @@@ public class IgniteCacheTestSuite exten
suite.addTestSuite(GridCacheMarshallingNodeJoinSelfTest.class);
+ suite.addTestSuite(IgniteCacheJdbcBlobStoreNodeRestartTest.class);
+
+ suite.addTestSuite(IgniteCacheAtomicLocalStoreValueTest.class);
+ suite.addTestSuite(IgniteCacheAtomicStoreValueTest.class);
+ suite.addTestSuite(IgniteCacheAtomicNearEnabledStoreValueTest.class);
+
suite.addTestSuite(IgniteCacheAtomicPrimaryWriteOrderStoreValueTest.class);
+
suite.addTestSuite(IgniteCacheAtomicPrimaryWriteOrderNearEnabledStoreValueTest.class);
+ suite.addTestSuite(IgniteCacheTxLocalStoreValueTest.class);
+ suite.addTestSuite(IgniteCacheTxStoreValueTest.class);
+ suite.addTestSuite(IgniteCacheTxNearEnabledStoreValueTest.class);
+
return suite;
}
}
