Merge remote-tracking branch 'origin/ignite-sprint-5' into ignite-sprint-5
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/36805cc1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/36805cc1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/36805cc1 Branch: refs/heads/ignite-gg-9614 Commit: 36805cc1dd157b343301ff4661bbdf3db5b596ff Parents: 489323b c3dde57 Author: avinogradov <avinogra...@gridgain.com> Authored: Mon May 18 12:55:06 2015 +0300 Committer: avinogradov <avinogra...@gridgain.com> Committed: Mon May 18 12:55:06 2015 +0300 ---------------------------------------------------------------------- .../socket/WordsSocketStreamerServer.java | 2 +- .../org/apache/ignite/internal/IgnitionEx.java | 136 ++++--------- .../internal/interop/InteropBootstrap.java | 34 ++++ .../interop/InteropBootstrapFactory.java | 39 ++++ .../internal/interop/InteropIgnition.java | 166 ++++++++++++++++ .../internal/interop/InteropProcessor.java | 36 ++++ .../processors/cache/GridCacheAdapter.java | 8 +- .../processors/cache/GridCacheMapEntry.java | 35 +--- .../distributed/GridDistributedLockRequest.java | 111 ++--------- .../GridDistributedTxFinishRequest.java | 70 ++----- .../GridDistributedTxPrepareRequest.java | 112 +++-------- .../GridDistributedTxRemoteAdapter.java | 20 +- .../distributed/dht/GridDhtLockFuture.java | 2 - .../distributed/dht/GridDhtLockRequest.java | 45 ++--- .../dht/GridDhtTransactionalCacheAdapter.java | 6 - .../distributed/dht/GridDhtTxFinishFuture.java | 3 - .../distributed/dht/GridDhtTxFinishRequest.java | 43 ++--- .../cache/distributed/dht/GridDhtTxLocal.java | 6 - .../distributed/dht/GridDhtTxLocalAdapter.java | 68 +------ .../distributed/dht/GridDhtTxPrepareFuture.java | 18 +- .../dht/GridDhtTxPrepareRequest.java | 60 +++--- .../cache/distributed/dht/GridDhtTxRemote.java | 8 +- .../colocated/GridDhtColocatedLockFuture.java | 6 - .../distributed/near/GridNearLockFuture.java | 6 - .../distributed/near/GridNearLockRequest.java | 61 +++--- .../near/GridNearOptimisticTxPrepareFuture.java | 15 +- .../GridNearPessimisticTxPrepareFuture.java | 2 - .../near/GridNearTransactionalCache.java | 4 - .../near/GridNearTxFinishRequest.java | 28 +-- .../cache/distributed/near/GridNearTxLocal.java | 20 +- .../near/GridNearTxPrepareRequest.java | 52 +++-- .../distributed/near/GridNearTxRemote.java | 24 +-- .../cache/transactions/IgniteInternalTx.java | 10 - .../transactions/IgniteTransactionsImpl.java | 4 +- .../cache/transactions/IgniteTxAdapter.java | 72 +------ .../cache/transactions/IgniteTxEntry.java | 48 +---- .../cache/transactions/IgniteTxHandler.java | 6 - .../transactions/IgniteTxLocalAdapter.java | 165 ++-------------- .../cache/transactions/IgniteTxLocalEx.java | 21 +- .../cache/transactions/IgniteTxManager.java | 62 +----- .../spi/discovery/tcp/TcpDiscoverySpi.java | 26 --- .../near/IgniteCacheNearOnlyTxTest.java | 190 +++++++++++++++++++ .../processors/cache/jta/CacheJtaManager.java | 4 +- 43 files changed, 744 insertions(+), 1110 deletions(-) ----------------------------------------------------------------------
