Merge remote-tracking branch 'remotes/origin/master' into ignite-901
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/f9987b7f Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f9987b7f Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f9987b7f Branch: refs/heads/ignite-901 Commit: f9987b7f5838bc6210cff9ad92d1af9c58d0bd55 Parents: 07558de aa2d7cb Author: sboikov <sboi...@gridgain.com> Authored: Mon Jul 13 09:11:26 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Mon Jul 13 09:11:26 2015 +0300 ---------------------------------------------------------------------- modules/core/pom.xml | 7 + .../affinity/fair/FairAffinityFunction.java | 5 +- .../configuration/CacheConfiguration.java | 2 +- .../META-INF/classnames-jdk.properties | 3 + .../cache/GridCacheAbstractFullApiSelfTest.java | 323 ++++++---- .../cache/GridCacheAbstractSelfTest.java | 14 +- ...eAtomicNearOnlyMultiNodeFullApiSelfTest.java | 3 + ...idCacheNearOnlyMultiNodeFullApiSelfTest.java | 5 +- .../near/GridCacheNearTxMultiNodeSelfTest.java | 10 +- ...achePartitionedMultiNodeFullApiSelfTest.java | 48 +- ...OnlyFairAffinityMultiJvmFullApiSelfTest.java | 31 + ...AtomicClientOnlyMultiJvmFullApiSelfTest.java | 31 + ...tOnlyMultiJvmP2PDisabledFullApiSelfTest.java | 31 + ...pyOnReadDisabledMultiJvmFullApiSelfTest.java | 31 + ...omicFairAffinityMultiJvmFullApiSelfTest.java | 31 + .../GridCacheAtomicMultiJvmFullApiSelfTest.java | 30 + ...tomicMultiJvmP2PDisabledFullApiSelfTest.java | 31 + ...bledFairAffinityMultiJvmFullApiSelfTest.java | 31 + ...tomicNearEnabledMultiJvmFullApiSelfTest.java | 31 + ...rimaryWriteOrderMultiJvmFullApiSelfTest.java | 31 + ...heAtomicNearOnlyMultiJvmFullApiSelfTest.java | 31 + ...rOnlyMultiJvmP2PDisabledFullApiSelfTest.java | 31 + ...cheAtomicOffHeapMultiJvmFullApiSelfTest.java | 31 + ...micOffHeapTieredMultiJvmFullApiSelfTest.java | 36 ++ ...rderFairAffinityMultiJvmFullApiSelfTest.java | 31 + ...rimaryWriteOrderMultiJvmFullApiSelfTest.java | 31 + ...OrderMultiJvmP2PDisabledFullApiSelfTest.java | 31 + ...rityOrderOffHeapMultiJvmFullApiSelfTest.java | 31 + ...derOffHeapTieredMultiJvmFullApiSelfTest.java | 36 ++ ...OnlyFairAffinityMultiJvmFullApiSelfTest.java | 31 + ...ridCacheNearOnlyMultiJvmFullApiSelfTest.java | 30 + ...rOnlyMultiJvmP2PDisabledFullApiSelfTest.java | 31 + ...pyOnReadDisabledMultiJvmFullApiSelfTest.java | 31 + ...onedFairAffinityMultiJvmFullApiSelfTest.java | 31 + ...CachePartitionedMultiJvmFullApiSelfTest.java | 30 + ...ionedMultiJvmP2PDisabledFullApiSelfTest.java | 31 + ...micOffHeapTieredMultiJvmFullApiSelfTest.java | 36 ++ ...bledFairAffinityMultiJvmFullApiSelfTest.java | 31 + ...onedNearDisabledMultiJvmFullApiSelfTest.java | 31 + ...abledMultiJvmP2PDisabledFullApiSelfTest.java | 31 + ...rDisabledOffHeapMultiJvmFullApiSelfTest.java | 31 + ...ledOffHeapTieredMultiJvmFullApiSelfTest.java | 36 ++ ...rtitionedOffHeapMultiJvmFullApiSelfTest.java | 31 + ...nedOffHeapTieredMultiJvmFullApiSelfTest.java | 36 ++ ...ReplicatedAtomicMultiJvmFullApiSelfTest.java | 31 + ...rimaryWriteOrderMultiJvmFullApiSelfTest.java | 31 + ...dCacheReplicatedMultiJvmFullApiSelfTest.java | 30 + ...catedMultiJvmP2PDisabledFullApiSelfTest.java | 31 + ...plicatedNearOnlyMultiJvmFullApiSelfTest.java | 37 ++ ...eplicatedOffHeapMultiJvmFullApiSelfTest.java | 31 + ...tedOffHeapTieredMultiJvmFullApiSelfTest.java | 36 ++ .../GridCommandLineTransformerSelfTest.java | 12 +- .../testframework/junits/GridAbstractTest.java | 380 +++++++++++- .../junits/common/GridCommonAbstractTest.java | 50 +- .../junits/multijvm/AffinityProcessProxy.java | 195 ++++++ .../multijvm/IgniteCacheProcessProxy.java | 602 +++++++++++++++++++ .../multijvm/IgniteClusterProcessProxy.java | 320 ++++++++++ .../multijvm/IgniteEventsProcessProxy.java | 148 +++++ .../junits/multijvm/IgniteNodeRunner.java | 184 ++++++ .../junits/multijvm/IgniteProcessProxy.java | 571 ++++++++++++++++++ ...IgniteCacheFullApiMultiJvmSelfTestSuite.java | 89 +++ parent/pom.xml | 40 ++ pom.xml | 1 - 63 files changed, 4104 insertions(+), 211 deletions(-) ----------------------------------------------------------------------
