Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id B9807186D8 for ; Wed, 17 Jun 2015 12:06:32 +0000 (UTC) Received: (qmail 7995 invoked by uid 500); 17 Jun 2015 12:06:32 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 7963 invoked by uid 500); 17 Jun 2015 12:06:32 -0000 Mailing-List: contact commits-help@ignite.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.incubator.apache.org Delivered-To: mailing list commits@ignite.incubator.apache.org Received: (qmail 7870 invoked by uid 99); 17 Jun 2015 12:06:32 -0000 Received: from Unknown (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 17 Jun 2015 12:06:32 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd2-us-west.apache.org (ASF Mail Server at spamd2-us-west.apache.org) with ESMTP id 0A6291A5660 for ; Wed, 17 Jun 2015 12:06:32 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.791 X-Spam-Level: * X-Spam-Status: No, score=1.791 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, T_RP_MATCHES_RCVD=-0.01, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-us-west.apache.org ([10.40.0.8]) by localhost (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) with ESMTP id tgJdUKDmzFaW for ; Wed, 17 Jun 2015 12:06:22 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-west.apache.org (ASF Mail Server at mx1-us-west.apache.org) with SMTP id BF4DD28B2D for ; Wed, 17 Jun 2015 12:06:11 +0000 (UTC) Received: (qmail 6085 invoked by uid 99); 17 Jun 2015 12:06:11 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 17 Jun 2015 12:06:11 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 9B7AEE3C53; Wed, 17 Jun 2015 12:06:11 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sboikov@apache.org To: commits@ignite.incubator.apache.org Date: Wed, 17 Jun 2015 12:06:48 -0000 Message-Id: <34a0f51706e34aa6a7f2209db17b2a5e@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [38/50] incubator-ignite git commit: Merge branch 'ignite-960' into ignite-sprint-6 Merge branch 'ignite-960' into ignite-sprint-6 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d1a21501 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d1a21501 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d1a21501 Branch: refs/heads/ignite-gg-10123 Commit: d1a21501bea846bd5778b72c30ec84ec83644844 Parents: 53f4cb7 37d4710 Author: nikolay_tikhonov Authored: Tue Jun 16 19:16:58 2015 +0300 Committer: nikolay_tikhonov Committed: Tue Jun 16 19:16:58 2015 +0300 ---------------------------------------------------------------------- .../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 +- .../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 + 29 files changed, 1901 insertions(+), 116 deletions(-) ----------------------------------------------------------------------