Merge branch 'ignite-648' into ignite-648-failover
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/430c17e2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/430c17e2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/430c17e2 Branch: refs/heads/ignite-648-failover Commit: 430c17e2c289127dc9cf4061ab0198769da715f8 Parents: 4889b6d efb8239 Author: ashutak <ashu...@gridgain.com> Authored: Wed Jul 1 17:50:01 2015 +0300 Committer: ashutak <ashu...@gridgain.com> Committed: Wed Jul 1 17:50:01 2015 +0300 ---------------------------------------------------------------------- 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 +- .../ignite/internal/GridKernalContextImpl.java | 2 +- .../managers/communication/GridIoManager.java | 49 +-- .../discovery/GridDiscoveryManager.java | 32 +- .../cache/GridCacheDeploymentManager.java | 10 +- .../processors/cache/GridCacheProcessor.java | 62 +++- .../processors/cache/IgniteCacheFutureImpl.java | 42 +++ .../processors/cache/IgniteCacheProxy.java | 2 +- .../processors/clock/GridClockServer.java | 21 +- .../internal/util/future/IgniteFutureImpl.java | 18 +- .../shmem/IpcSharedMemoryServerEndpoint.java | 10 +- .../util/nio/GridNioMessageTracker.java | 23 +- .../ignite/spi/discovery/tcp/ServerImpl.java | 2 +- .../TcpDiscoveryMulticastIpFinder.java | 74 ++++- .../core/src/main/resources/ignite.properties | 2 +- .../core/src/test/config/spark/spark-config.xml | 46 +++ .../IgniteTopologyPrintFormatSelfTest.java | 289 +++++++++++++++++ .../cache/GridCacheAbstractFullApiSelfTest.java | 71 +++- .../cache/GridCacheAbstractSelfTest.java | 2 +- .../cache/GridCacheDaemonNodeStopSelfTest.java | 119 ------- .../IgniteDaemonNodeMarshallerCacheTest.java | 192 +++++++++++ ...achePartitionedMultiNodeFullApiSelfTest.java | 44 ++- ...heAtomicNearOnlyMultiJvmFullApiSelfTest.java | 2 +- .../GridP2PContinuousDeploymentSelfTest.java | 2 - .../testframework/junits/GridAbstractTest.java | 2 +- .../junits/common/GridCommonAbstractTest.java | 57 +++- .../multijvm/IgniteCacheProcessProxy.java | 4 +- .../multijvm/IgniteClusterProcessProxy.java | 320 +++++++++++++++++++ .../multijvm/IgniteEventsProcessProxy.java | 32 +- .../junits/multijvm/IgniteProcessProxy.java | 199 ++++++++---- .../ignite/testsuites/IgniteBasicTestSuite.java | 1 + .../testsuites/IgniteCacheTestSuite3.java | 1 - .../testsuites/IgniteKernalSelfTestSuite.java | 1 + 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 | 2 +- modules/extdata/uri/pom.xml | 2 +- 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 +- .../ignite/schema/model/PojoDescriptor.java | 2 + .../apache/ignite/schema/model/PojoField.java | 1 + .../parser/dialect/OracleMetadataDialect.java | 2 +- modules/slf4j/pom.xml | 2 +- modules/spark-2.10/pom.xml | 2 +- modules/spark/pom.xml | 2 +- .../org/apache/ignite/spark/IgniteContext.scala | 50 ++- .../org/apache/ignite/spark/IgniteRddSpec.scala | 18 ++ modules/spring/pom.xml | 2 +- modules/ssh/pom.xml | 2 +- modules/tools/pom.xml | 2 +- modules/urideploy/pom.xml | 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 +- 82 files changed, 1845 insertions(+), 412 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/430c17e2/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/430c17e2/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteProcessProxy.java ----------------------------------------------------------------------
