Merge remote-tracking branch 'remotes/origin/master' into ignite-5578
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/df73c303 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/df73c303 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/df73c303 Branch: refs/heads/ignite-5578 Commit: df73c303a25ef7ee5a7527ce2b0c0ad0ea83e90c Parents: c3290e8 9e79c4b Author: sboikov <sboi...@gridgain.com> Authored: Thu Jul 27 11:09:24 2017 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Thu Jul 27 11:09:24 2017 +0300 ---------------------------------------------------------------------- .../cache/GridCacheSharedContext.java | 6 +- .../cache/distributed/near/GridNearTxLocal.java | 6 +- .../store/GridCacheStoreManagerAdapter.java | 5 +- .../IgniteTxImplicitSingleStateImpl.java | 2 +- .../IgniteTxRemoteStateAdapter.java | 2 +- .../cache/transactions/IgniteTxState.java | 2 +- .../cache/transactions/IgniteTxStateImpl.java | 2 +- .../transactions/PlatformTransactions.java | 2 +- ...cOriginatingNodeFailureAbstractSelfTest.java | 2 +- .../GridCachePartitionedTxSalvageSelfTest.java | 8 +- .../processors/cache/jta/CacheJtaResource.java | 20 +- .../cache/AbstractCacheJtaSelfTest.java | 183 -------------- .../GridPartitionedCacheJtaFactorySelfTest.java | 41 --- ...rtitionedCacheJtaFactoryUseSyncSelfTest.java | 32 --- ...titionedCacheJtaLookupClassNameSelfTest.java | 83 ------- .../GridReplicatedCacheJtaFactorySelfTest.java | 32 --- ...eplicatedCacheJtaFactoryUseSyncSelfTest.java | 32 --- ...plicatedCacheJtaLookupClassNameSelfTest.java | 32 --- .../cache/jta/AbstractCacheJtaSelfTest.java | 248 +++++++++++++++++++ .../GridPartitionedCacheJtaFactorySelfTest.java | 41 +++ ...rtitionedCacheJtaFactoryUseSyncSelfTest.java | 32 +++ ...titionedCacheJtaLookupClassNameSelfTest.java | 83 +++++++ .../GridReplicatedCacheJtaFactorySelfTest.java | 32 +++ ...eplicatedCacheJtaFactoryUseSyncSelfTest.java | 32 +++ ...plicatedCacheJtaLookupClassNameSelfTest.java | 32 +++ .../processors/cache/jta/package-info.java | 22 ++ .../ignite/testsuites/IgniteJtaTestSuite.java | 12 +- .../Cache/CacheAbstractTransactionalTest.cs | 53 ++-- 28 files changed, 593 insertions(+), 486 deletions(-) ----------------------------------------------------------------------
