Merge remote-tracking branch 'remotes/origin/ignite-sprint-7' into ignite-sberb-34
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d2520e2a Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d2520e2a Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d2520e2a Branch: refs/heads/ignite-sberb-34 Commit: d2520e2ad62a2f7eb910e9cc0cbb6f47c13113f8 Parents: 9b7b966 b437ec7 Author: sboikov <sboi...@gridgain.com> Authored: Thu Jul 2 13:34:17 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Thu Jul 2 13:34:17 2015 +0300 ---------------------------------------------------------------------- assembly/dependencies-fabric.xml | 1 + .../apache/ignite/internal/IgniteKernal.java | 1 - .../managers/communication/GridIoManager.java | 124 +++++++++++++++---- .../managers/communication/GridIoMessage.java | 15 ++- .../managers/communication/GridIoPolicy.java | 32 ++--- .../eventstorage/GridEventStorageManager.java | 2 +- .../internal/processors/cache/CacheType.java | 8 +- .../processors/cache/GridCacheContext.java | 4 +- .../processors/cache/GridCacheIoManager.java | 12 +- .../GridDistributedTxFinishRequest.java | 11 +- .../GridDistributedTxPrepareRequest.java | 9 +- .../GridDistributedTxRemoteAdapter.java | 3 +- .../distributed/dht/GridDhtTxFinishRequest.java | 3 +- .../cache/distributed/dht/GridDhtTxLocal.java | 3 +- .../distributed/dht/GridDhtTxLocalAdapter.java | 3 +- .../cache/distributed/dht/GridDhtTxRemote.java | 5 +- .../near/GridNearTxFinishRequest.java | 3 +- .../cache/distributed/near/GridNearTxLocal.java | 3 +- .../distributed/near/GridNearTxRemote.java | 5 +- .../cache/transactions/IgniteInternalTx.java | 3 +- .../cache/transactions/IgniteTxAdapter.java | 11 +- .../transactions/IgniteTxLocalAdapter.java | 3 +- .../internal/processors/igfs/IgfsContext.java | 5 +- .../plugin/IgnitePluginProcessor.java | 3 +- .../plugin/extensions/communication/IoPool.java | 42 +++++++ .../ignite/spi/discovery/tcp/ClientImpl.java | 5 +- .../ignite/spi/discovery/tcp/ServerImpl.java | 5 +- .../TcpDiscoveryMulticastIpFinder.java | 2 +- modules/core/src/test/config/tests.properties | 6 +- .../communication/GridIoManagerSelfTest.java | 2 +- .../cache/IgniteInternalCacheTypesTest.java | 3 +- modules/core/src/test/resources/helloworld.gar | Bin 6092 -> 0 bytes modules/core/src/test/resources/helloworld1.gar | Bin 6092 -> 0 bytes modules/core/src/test/resources/readme.txt | 6 - modules/extdata/p2p/pom.xml | 2 +- modules/extdata/uri/META-INF/ignite.xml | 38 ++++++ .../extdata/uri/modules/uri-dependency/pom.xml | 42 +++++++ .../deployment/uri/tasks/GarHelloWorldBean.java | 60 +++++++++ .../src/main/resources/gar-example.properties | 18 +++ modules/extdata/uri/pom.xml | 60 ++++++++- .../deployment/uri/tasks/GarHelloWorldTask.java | 81 ++++++++++++ .../deployment/uri/tasks/gar-spring-bean.xml | 29 +++++ .../GridTaskUriDeploymentDeadlockSelfTest.java | 13 +- .../ignite/p2p/GridP2PDisabledSelfTest.java | 2 +- 44 files changed, 542 insertions(+), 146 deletions(-) ----------------------------------------------------------------------
