Merge branches 'ignite-843' and 'ignite-sprint-5' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-843
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ec11f8fc Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ec11f8fc Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ec11f8fc Branch: refs/heads/ignite-843 Commit: ec11f8fc259a312a06186eee21c4ff691a7ab7e4 Parents: f8be273 f9a4dd7 Author: Andrey <anovi...@gridgain.com> Authored: Wed May 20 16:08:57 2015 +0700 Committer: Andrey <anovi...@gridgain.com> Committed: Wed May 20 16:08:57 2015 +0700 ---------------------------------------------------------------------- LICENSE | 238 +++++++++++++++++++ LICENSE.txt | 238 ------------------- NOTICE | 12 + NOTICE.txt | 12 - assembly/release-base.xml | 4 +- .../socket/WordsSocketStreamerServer.java | 2 +- .../internal/GridEventConsumeHandler.java | 26 ++ .../apache/ignite/internal/IgniteKernal.java | 26 +- .../org/apache/ignite/internal/IgnitionEx.java | 136 +++-------- .../interop/InteropAwareEventFilter.java | 37 +++ .../internal/interop/InteropBootstrap.java | 34 +++ .../interop/InteropBootstrapFactory.java | 39 +++ .../internal/interop/InteropIgnition.java | 166 +++++++++++++ .../interop/InteropLocalEventListener.java | 28 +++ .../internal/interop/InteropProcessor.java | 36 +++ .../managers/communication/GridIoManager.java | 6 +- .../GridLifecycleAwareMessageFilter.java | 5 +- .../eventstorage/GridEventStorageManager.java | 24 +- .../processors/cache/GridCacheAdapter.java | 8 +- .../processors/cache/GridCacheIoManager.java | 6 +- .../processors/cache/GridCacheMapEntry.java | 35 +-- .../GridCachePartitionExchangeManager.java | 4 +- .../distributed/GridDistributedLockRequest.java | 111 ++------- .../GridDistributedTxFinishRequest.java | 70 ++---- .../distributed/GridDistributedTxMapping.java | 5 +- .../GridDistributedTxPrepareRequest.java | 112 ++------- .../GridDistributedTxRemoteAdapter.java | 20 +- .../distributed/dht/GridDhtCacheAdapter.java | 6 +- .../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 | 19 +- .../dht/GridDhtTxPrepareRequest.java | 60 +++-- .../cache/distributed/dht/GridDhtTxRemote.java | 8 +- .../dht/atomic/GridDhtAtomicCache.java | 4 +- .../dht/atomic/GridNearAtomicUpdateFuture.java | 42 +++- .../dht/atomic/GridNearAtomicUpdateRequest.java | 36 ++- .../colocated/GridDhtColocatedLockFuture.java | 10 +- .../distributed/near/GridNearCacheEntry.java | 2 +- .../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 | 25 +- .../near/GridNearTxPrepareFutureAdapter.java | 9 +- .../near/GridNearTxPrepareRequest.java | 52 ++-- .../near/GridNearTxPrepareResponse.java | 28 ++- .../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 | 169 ++----------- .../cache/transactions/IgniteTxLocalEx.java | 21 +- .../cache/transactions/IgniteTxManager.java | 86 +++---- .../communication/tcp/TcpCommunicationSpi.java | 2 +- .../spi/discovery/tcp/TcpDiscoverySpi.java | 26 -- .../discovery/tcp/TcpDiscoverySpiAdapter.java | 10 +- .../cache/IgniteCacheNearLockValueSelfTest.java | 145 +++++++++++ .../near/IgniteCacheNearOnlyTxTest.java | 190 +++++++++++++++ .../ignite/testsuites/IgniteCacheTestSuite.java | 2 + .../testsuites/IgniteCacheTestSuite2.java | 1 + .../processors/cache/jta/CacheJtaManager.java | 4 +- pom.xml | 2 + 71 files changed, 1441 insertions(+), 1411 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ec11f8fc/pom.xml ----------------------------------------------------------------------
