Merge remote-tracking branch 'remotes/origin/ignite-591'
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/23dc8fc8 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/23dc8fc8 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/23dc8fc8 Branch: refs/heads/master Commit: 23dc8fc87352bdb38a0ff7d01dab048c22ceae77 Parents: 6d6ec77 cfeec2d Author: sevdokimov <sevdoki...@gridgain.com> Authored: Wed Jul 8 15:57:06 2015 +0300 Committer: sevdokimov <sevdoki...@gridgain.com> Committed: Wed Jul 8 15:57:06 2015 +0300 ---------------------------------------------------------------------- .../configuration/CacheConfiguration.java | 4 ++ .../configuration/TransactionConfiguration.java | 23 +++++++ .../processors/cache/GridCacheAttributes.java | 3 + .../processors/cache/GridCacheContext.java | 8 +-- .../processors/cache/GridCacheProcessor.java | 21 +++--- .../cache/GridCacheSharedContext.java | 15 +++- .../cache/jta/CacheJtaManagerAdapter.java | 17 +++-- .../cache/jta/CacheNoopJtaManager.java | 2 +- .../visor/cache/VisorCacheConfiguration.java | 11 --- .../loadtests/hashmap/GridCacheTestContext.java | 4 +- .../HibernateTransactionalDataRegion.java | 12 +++- .../hibernate/HibernateL2CacheSelfTest.java | 7 +- .../HibernateL2CacheTransactionalSelfTest.java | 5 -- .../apache/ignite/cache/jta/CacheTmLookup.java | 3 +- .../processors/cache/jta/CacheJtaManager.java | 72 ++++++++++++++++++-- .../cache/jta/GridCacheXAResource.java | 16 ++--- .../processors/cache/GridCacheJtaSelfTest.java | 52 ++++++++++---- .../GridTmLookupLifecycleAwareSelfTest.java | 29 ++++++-- .../commands/cache/VisorCacheCommand.scala | 2 - 19 files changed, 211 insertions(+), 95 deletions(-) ----------------------------------------------------------------------
