Merge remote-tracking branch 'remotes/origin/ignite-157-2' into ignite-sprint-4
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ba210bbb Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ba210bbb Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ba210bbb Branch: refs/heads/ignite-709_2 Commit: ba210bbbfec66f4ff8913550e1e3b43ba65cf0e1 Parents: 99c7e22 f5f95fb Author: sboikov <sboi...@gridgain.com> Authored: Wed May 6 12:41:02 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Wed May 6 12:41:02 2015 +0300 ---------------------------------------------------------------------- .../ignite/codegen/MessageCodeGenerator.java | 4 +- .../communication/GridIoMessageFactory.java | 4 +- ...ridCacheOptimisticCheckPreparedTxFuture.java | 434 --------------- ...idCacheOptimisticCheckPreparedTxRequest.java | 232 -------- ...dCacheOptimisticCheckPreparedTxResponse.java | 179 ------- .../distributed/GridCacheTxRecoveryFuture.java | 506 ++++++++++++++++++ .../distributed/GridCacheTxRecoveryRequest.java | 261 +++++++++ .../GridCacheTxRecoveryResponse.java | 182 +++++++ .../GridDistributedTxRemoteAdapter.java | 2 +- .../cache/transactions/IgniteInternalTx.java | 5 +- .../cache/transactions/IgniteTxAdapter.java | 2 +- .../cache/transactions/IgniteTxHandler.java | 38 +- .../transactions/IgniteTxLocalAdapter.java | 2 +- .../cache/transactions/IgniteTxManager.java | 173 ++---- .../resources/META-INF/classnames.properties | 6 +- .../GridCacheAbstractFailoverSelfTest.java | 4 +- .../GridCacheAbstractNodeRestartSelfTest.java | 94 ++-- ...xOriginatingNodeFailureAbstractSelfTest.java | 2 +- ...rDisabledPrimaryNodeFailureRecoveryTest.java | 31 ++ ...rtitionedPrimaryNodeFailureRecoveryTest.java | 31 ++ ...woBackupsPrimaryNodeFailureRecoveryTest.java | 37 ++ ...ePrimaryNodeFailureRecoveryAbstractTest.java | 533 +++++++++++++++++++ .../GridCachePartitionedNodeRestartTest.java | 4 +- ...ePartitionedOptimisticTxNodeRestartTest.java | 4 +- .../GridCacheReplicatedNodeRestartSelfTest.java | 2 + .../testsuites/IgniteCacheRestartTestSuite.java | 4 +- .../ignite/testsuites/IgniteCacheTestSuite.java | 3 - .../IgniteCacheTxRecoverySelfTestSuite.java | 4 + 28 files changed, 1737 insertions(+), 1046 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ba210bbb/modules/core/src/main/resources/META-INF/classnames.properties ----------------------------------------------------------------------