Merge remote-tracking branch 'remotes/origin/ignite-sprint-7' into ignite-gg-10239
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/3484f1f9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/3484f1f9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/3484f1f9 Branch: refs/heads/ignite-gg-10239 Commit: 3484f1f94f98c0488f2dbb01fb2b072ddfe9ea9d Parents: 9cccb0c b437ec7 Author: ptupitsyn <ptupit...@gridgain.com> Authored: Thu Jul 2 14:18:56 2015 +0300 Committer: ptupitsyn <ptupit...@gridgain.com> Committed: Thu Jul 2 14:18:56 2015 +0300 ---------------------------------------------------------------------- assembly/dependencies-fabric.xml | 1 + examples/pom.xml | 2 +- modules/aop/pom.xml | 2 +- modules/aws/pom.xml | 2 +- modules/clients/pom.xml | 2 +- modules/cloud/pom.xml | 2 +- modules/codegen/pom.xml | 2 +- modules/core/pom.xml | 2 +- .../ignite/compute/ComputeTaskSplitAdapter.java | 2 +- .../configuration/CacheConfiguration.java | 105 +++---- .../configuration/NearCacheConfiguration.java | 10 +- .../apache/ignite/internal/IgniteKernal.java | 1 - .../managers/communication/GridIoManager.java | 173 ++++++++--- .../managers/communication/GridIoMessage.java | 15 +- .../managers/communication/GridIoPolicy.java | 32 +- .../discovery/GridDiscoveryManager.java | 26 +- .../eventstorage/GridEventStorageManager.java | 2 +- .../internal/processors/cache/CacheType.java | 8 +- .../processors/cache/GridCacheContext.java | 4 +- .../processors/cache/GridCacheIoManager.java | 12 +- .../processors/cache/IgniteCacheFutureImpl.java | 42 +++ .../processors/cache/IgniteCacheProxy.java | 2 +- .../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 +- .../processors/clock/GridClockServer.java | 21 +- .../internal/processors/igfs/IgfsContext.java | 5 +- .../plugin/IgnitePluginProcessor.java | 3 +- .../internal/util/future/IgniteFutureImpl.java | 18 +- .../util/nio/GridNioMessageTracker.java | 23 +- .../plugin/extensions/communication/IoPool.java | 42 +++ .../ignite/spi/discovery/tcp/ClientImpl.java | 5 +- .../ignite/spi/discovery/tcp/ServerImpl.java | 7 +- .../TcpDiscoveryMulticastIpFinder.java | 76 ++++- .../core/src/main/resources/ignite.properties | 2 +- modules/core/src/test/config/tests.properties | 6 +- .../communication/GridIoManagerSelfTest.java | 2 +- .../IgniteTopologyPrintFormatSelfTest.java | 289 +++++++++++++++++++ .../cache/IgniteInternalCacheTypesTest.java | 3 +- .../GridP2PContinuousDeploymentSelfTest.java | 2 - .../testsuites/IgniteKernalSelfTestSuite.java | 1 + 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/docker/Dockerfile | 55 ++++ modules/docker/README.txt | 11 + modules/docker/build_users_libs.sh | 39 +++ modules/docker/download_ignite.sh | 49 ++++ modules/docker/execute.sh | 62 ++++ modules/docker/run.sh | 34 +++ modules/extdata/p2p/pom.xml | 4 +- 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 | 62 +++- .../deployment/uri/tasks/GarHelloWorldTask.java | 81 ++++++ .../deployment/uri/tasks/gar-spring-bean.xml | 29 ++ modules/gce/pom.xml | 2 +- modules/geospatial/pom.xml | 2 +- modules/hadoop/pom.xml | 2 +- modules/hibernate/pom.xml | 2 +- modules/indexing/pom.xml | 2 +- modules/jcl/pom.xml | 2 +- modules/jta/pom.xml | 2 +- modules/log4j/pom.xml | 2 +- modules/mesos/pom.xml | 2 +- modules/rest-http/pom.xml | 2 +- modules/scalar-2.10/pom.xml | 2 +- modules/scalar/pom.xml | 2 +- modules/schedule/pom.xml | 2 +- modules/schema-import/pom.xml | 2 +- modules/slf4j/pom.xml | 2 +- modules/spark-2.10/pom.xml | 2 +- modules/spark/pom.xml | 2 +- modules/spring/pom.xml | 2 +- modules/ssh/pom.xml | 2 +- modules/tools/pom.xml | 2 +- modules/urideploy/pom.xml | 2 +- .../GridTaskUriDeploymentDeadlockSelfTest.java | 13 +- .../ignite/p2p/GridP2PDisabledSelfTest.java | 2 +- modules/visor-console-2.10/pom.xml | 2 +- modules/visor-console/pom.xml | 2 +- modules/visor-plugins/pom.xml | 2 +- modules/web/pom.xml | 2 +- modules/yardstick/pom.xml | 2 +- pom.xml | 14 +- 97 files changed, 1389 insertions(+), 301 deletions(-) ----------------------------------------------------------------------
