Merge remote-tracking branch 'remotes/origin/ignite-sprint-6' into ignite-1020
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/9a0e659a Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9a0e659a Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9a0e659a Branch: refs/heads/ignite-1003-debug Commit: 9a0e659a847ab3ec7c03443e2ada28aac51a26ea Parents: 7fd1441 d1a2150 Author: sboikov <sboi...@gridgain.com> Authored: Wed Jun 17 10:25:34 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Wed Jun 17 10:25:34 2015 +0300 ---------------------------------------------------------------------- RELEASE_NOTES.txt | 2 +- .../cache/store/jdbc/CacheJdbcBlobStore.java | 22 +- .../store/jdbc/CacheJdbcBlobStoreFactory.java | 290 +++++++++++++++++++ .../cache/store/jdbc/CacheJdbcPojoStore.java | 6 +- .../store/jdbc/CacheJdbcPojoStoreFactory.java | 148 ++++++++++ .../configuration/CacheConfiguration.java | 3 +- .../internal/interop/InteropBootstrap.java | 3 +- .../internal/interop/InteropIgnition.java | 5 +- .../processors/cache/GridCacheProcessor.java | 23 +- .../util/spring/IgniteSpringHelper.java | 10 + .../SpringApplicationContextResource.java | 4 +- .../apache/ignite/resources/SpringResource.java | 6 +- modules/hibernate/pom.xml | 14 + .../hibernate/CacheHibernateBlobStore.java | 87 +----- .../CacheHibernateBlobStoreFactory.java | 235 +++++++++++++++ .../hibernate/src/test/config/factory-cache.xml | 59 ++++ .../src/test/config/factory-cache1.xml | 61 ++++ .../config/factory-incorrect-store-cache.xml | 56 ++++ .../CacheHibernateStoreFactorySelfTest.java | 273 +++++++++++++++++ .../testsuites/IgniteHibernateTestSuite.java | 2 + modules/spring/pom.xml | 7 + .../GridResourceSpringBeanInjector.java | 2 +- .../util/spring/IgniteSpringHelperImpl.java | 17 ++ .../src/test/config/incorrect-store-cache.xml | 57 ++++ modules/spring/src/test/config/node.xml | 43 +++ modules/spring/src/test/config/node1.xml | 45 +++ .../test/config/pojo-incorrect-store-cache.xml | 56 ++++ modules/spring/src/test/config/store-cache.xml | 59 ++++ modules/spring/src/test/config/store-cache1.xml | 62 ++++ .../jdbc/CacheJdbcBlobStoreFactorySelfTest.java | 172 +++++++++++ .../jdbc/CacheJdbcPojoStoreFactorySelfTest.java | 193 ++++++++++++ .../testsuites/IgniteSpringTestSuite.java | 5 + 32 files changed, 1907 insertions(+), 120 deletions(-) ----------------------------------------------------------------------
