Merge branch 'ignite-1.5' into ignite-2099
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/9ff351b5 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/9ff351b5 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/9ff351b5 Branch: refs/heads/ignite-2099 Commit: 9ff351b50b481c85460c4c95f9c3aad93a5a9a6f Parents: d72d846 afbb0dc Author: vozerov-gridgain <[email protected]> Authored: Wed Dec 9 15:03:59 2015 +0300 Committer: vozerov-gridgain <[email protected]> Committed: Wed Dec 9 15:03:59 2015 +0300 ---------------------------------------------------------------------- .../configuration/CacheConfiguration.java | 4 +- .../configuration/TransactionConfiguration.java | 47 +++- .../portable/PortableClassDescriptor.java | 46 ++-- .../cache/jta/CacheJtaManagerAdapter.java | 4 +- .../portable/BinaryMarshallerSelfTest.java | 14 +- .../HibernateTransactionalDataRegion.java | 18 +- .../HibernateL2CacheTransactionalSelfTest.java | 23 +- modules/jta/pom.xml | 9 +- .../cache/jta/jndi/CacheJndiTmFactory.java | 132 +++++++++++ .../processors/cache/jta/CacheJtaManager.java | 41 +++- .../cache/AbstarctCacheJtaSelfTest.java | 183 +++++++++++++++ .../cache/CacheJndiTmFactorySelfTest.java | 166 ++++++++++++++ ...CacheJtaConfigurationValidationSelfTest.java | 4 +- ...CacheJtaFactoryConfigValidationSelfTest.java | 142 ++++++++++++ .../processors/cache/GridCacheJtaSelfTest.java | 221 ------------------- .../cache/GridCacheReplicatedJtaSelfTest.java | 32 --- .../cache/GridJtaLifecycleAwareSelfTest.java | 191 ++++++++++++++++ .../GridPartitionedCacheJtaFactorySelfTest.java | 41 ++++ ...titionedCacheJtaLookupClassNameSelfTest.java | 83 +++++++ .../GridReplicatedCacheJtaFactorySelfTest.java | 32 +++ ...plicatedCacheJtaLookupClassNameSelfTest.java | 32 +++ .../GridTmLookupLifecycleAwareSelfTest.java | 122 ---------- .../ignite/testsuites/IgniteJtaTestSuite.java | 26 ++- 23 files changed, 1186 insertions(+), 427 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/9ff351b5/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableClassDescriptor.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/9ff351b5/modules/core/src/test/java/org/apache/ignite/internal/portable/BinaryMarshallerSelfTest.java ----------------------------------------------------------------------
