Repository: incubator-ignite Updated Branches: refs/heads/ignite-929 5e5f86e79 -> 066392873
Merge remote-tracking branch 'remotes/origin/ignite-sprint-5' into ignite-929 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/8e56f59d Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/8e56f59d Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/8e56f59d Branch: refs/heads/ignite-929 Commit: 8e56f59d8fad7e06a074a84a30acfe0e6d4242fd Parents: 5e5f86e 45566fe Author: avinogradov <avinogra...@gridgain.com> Authored: Tue Jun 2 14:33:05 2015 +0300 Committer: avinogradov <avinogra...@gridgain.com> Committed: Tue Jun 2 14:33:05 2015 +0300 ---------------------------------------------------------------------- assembly/dependencies-visor-console.xml | 3 + .../hibernate/CacheHibernatePersonStore.java | 202 +--------- .../hibernate/CacheHibernateStoreExample.java | 17 + .../store/jdbc/CacheJdbcPersonStore.java | 180 ++------- .../store/jdbc/CacheJdbcStoreExample.java | 13 + .../store/spring/CacheSpringPersonStore.java | 128 ++++++ .../store/spring/CacheSpringStoreExample.java | 143 +++++++ .../datagrid/store/spring/package-info.java | 22 ++ .../apache/ignite/cache/store/CacheStore.java | 2 + .../ignite/cache/store/CacheStoreSession.java | 22 ++ .../cache/store/CacheStoreSessionListener.java | 133 +++++++ .../jdbc/CacheJdbcStoreSessionListener.java | 141 +++++++ .../configuration/CacheConfiguration.java | 32 ++ .../configuration/IgniteConfiguration.java | 38 +- .../org/apache/ignite/internal/IgnitionEx.java | 2 +- .../managers/communication/GridIoManager.java | 12 +- .../processors/cache/GridCacheProcessor.java | 12 +- .../cache/GridCacheSharedContext.java | 47 ++- .../processors/cache/GridCacheUtils.java | 54 +++ .../cache/store/CacheOsStoreManager.java | 1 - .../cache/store/CacheStoreManager.java | 7 +- .../store/GridCacheStoreManagerAdapter.java | 202 ++++++++-- .../cache/transactions/IgniteTxAdapter.java | 33 +- .../transactions/IgniteTxLocalAdapter.java | 142 ++++--- .../spi/discovery/tcp/TcpDiscoverySpi.java | 2 +- ...cheStoreSessionListenerAbstractSelfTest.java | 315 +++++++++++++++ ...heStoreSessionListenerLifecycleSelfTest.java | 395 +++++++++++++++++++ .../CacheJdbcStoreSessionListenerSelfTest.java | 175 ++++++++ .../IgniteCrossCacheTxStoreSelfTest.java | 147 ++++--- .../loadtests/hashmap/GridCacheTestContext.java | 3 +- .../junits/cache/TestCacheSession.java | 18 + .../cache/TestThreadLocalCacheSession.java | 15 + .../junits/common/GridCommonAbstractTest.java | 24 ++ .../testsuites/IgniteCacheTestSuite4.java | 3 + .../CacheHibernateStoreSessionListener.java | 216 ++++++++++ ...heHibernateStoreSessionListenerSelfTest.java | 228 +++++++++++ .../testsuites/IgniteHibernateTestSuite.java | 2 + .../IgniteCacheQuerySelfTestSuite.java | 2 +- modules/spring/pom.xml | 14 + .../spring/CacheSpringStoreSessionListener.java | 207 ++++++++++ ...CacheSpringStoreSessionListenerSelfTest.java | 197 +++++++++ .../testsuites/IgniteSpringTestSuite.java | 3 + 42 files changed, 3061 insertions(+), 493 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8e56f59d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8e56f59d/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite4.java ---------------------------------------------------------------------- diff --cc modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite4.java index fbf51f3,a8019d2..29baf9f --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite4.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite4.java @@@ -130,10 -131,10 +131,12 @@@ public class IgniteCacheTestSuite4 exte suite.addTestSuite(CacheRemoveAllSelfTest.class); + suite.addTestSuite(CacheStopAndDestroySelfTest.class); + suite.addTestSuite(CacheOffheapMapEntrySelfTest.class); + suite.addTestSuite(CacheJdbcStoreSessionListenerSelfTest.class); + return suite; } }
