Merge branch 'ignite-sprint-6' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-gg-10249
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/b76ed937 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b76ed937 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b76ed937 Branch: refs/heads/ignite-gg-10052 Commit: b76ed9372d5a406be9e91f87b8588a4e67e97a89 Parents: 6742444 420b6bd Author: iveselovskiy <iveselovs...@gridgain.com> Authored: Thu Jun 11 16:39:38 2015 +0300 Committer: iveselovskiy <iveselovs...@gridgain.com> Committed: Thu Jun 11 16:39:38 2015 +0300 ---------------------------------------------------------------------- examples/pom.xml | 2 +- idea/ignite_codeStyle.xml | 147 +++++++++++++++++++ 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/internal/GridPluginContext.java | 6 + .../internal/MarshallerContextAdapter.java | 30 +++- .../ignite/internal/MarshallerContextImpl.java | 10 +- .../internal/interop/InteropIgnition.java | 2 + .../processors/cache/GridCacheMessage.java | 51 ------- .../processors/cache/GridCacheProcessor.java | 10 +- .../cacheobject/IgniteCacheObjectProcessor.java | 9 +- .../IgniteCacheObjectProcessorImpl.java | 12 +- .../datastreamer/DataStreamerImpl.java | 8 +- .../portable/GridPortableInputStream.java | 10 ++ .../processors/query/GridQueryProcessor.java | 2 +- .../ignite/internal/util/IgniteUtils.java | 3 + .../internal/visor/VisorMultiNodeTask.java | 2 +- .../ignite/marshaller/MarshallerContext.java | 8 + .../org/apache/ignite/plugin/PluginContext.java | 6 + .../ignite/spi/discovery/tcp/ServerImpl.java | 38 +---- .../java/org/jsr166/ThreadLocalRandom8.java | 2 +- .../core/src/main/resources/ignite.properties | 2 +- modules/core/src/test/config/tests.properties | 2 +- .../internal/GridDiscoveryEventSelfTest.java | 6 +- ...ridFailFastNodeFailureDetectionSelfTest.java | 2 + .../GridFailoverTaskWithPredicateSelfTest.java | 3 - .../GridJobMasterLeaveAwareSelfTest.java | 2 - .../internal/GridJobStealingSelfTest.java | 3 - ...ectionLocalJobMultipleArgumentsSelfTest.java | 2 - .../GridTaskExecutionContextSelfTest.java | 9 -- .../IgniteComputeEmptyClusterGroupTest.java | 3 - .../IgniteComputeTopologyExceptionTest.java | 9 -- .../GridDiscoveryManagerAliveCacheSelfTest.java | 5 + .../cache/GridCacheAbstractSelfTest.java | 3 - .../cache/GridCacheAffinityRoutingSelfTest.java | 4 +- .../cache/GridCacheDeploymentSelfTest.java | 3 - .../cache/GridCacheEntryMemorySizeSelfTest.java | 91 +++++++----- .../cache/GridCacheMemoryModeSelfTest.java | 2 - .../GridCacheReferenceCleanupSelfTest.java | 3 - .../cache/IgniteCacheAbstractTest.java | 3 - .../IgniteCacheEntryListenerAbstractTest.java | 14 +- ...cheAtomicReferenceMultiNodeAbstractTest.java | 11 -- ...GridCacheQueueMultiNodeAbstractSelfTest.java | 2 - ...CacheQueueRotativeMultiNodeAbstractTest.java | 10 -- .../GridCacheSetAbstractSelfTest.java | 9 -- .../GridCacheAbstractJobExecutionTest.java | 3 - .../GridCachePreloadLifecycleAbstractTest.java | 2 - ...heAbstractTransformWriteThroughSelfTest.java | 3 - .../near/GridCacheNearEvictionSelfTest.java | 3 - ...idCachePartitionedHitsAndMissesSelfTest.java | 3 - .../GridCacheSwapScanQueryAbstractSelfTest.java | 3 - ...ridCacheContinuousQueryAbstractSelfTest.java | 2 - .../closure/GridClosureProcessorSelfTest.java | 29 ++-- .../continuous/GridEventConsumeSelfTest.java | 2 - .../DataStreamProcessorSelfTest.java | 44 +++--- .../internal/util/nio/GridNioSelfTest.java | 13 +- .../internal/util/nio/GridNioSslSelfTest.java | 2 + .../tostring/GridToStringBuilderSelfTest.java | 4 +- .../marshaller/MarshallerContextTestImpl.java | 11 +- .../ignite/messaging/GridMessagingSelfTest.java | 3 - .../GridP2PContinuousDeploymentSelfTest.java | 2 + .../p2p/GridP2PLocalDeploymentSelfTest.java | 6 +- .../p2p/GridP2PRemoteClassLoadersSelfTest.java | 31 ++-- .../spi/GridTcpSpiForwardingSelfTest.java | 3 - .../tcp/TcpClientDiscoverySpiSelfTest.java | 114 +++++++++++++- .../ignite/testframework/GridTestUtils.java | 14 ++ .../config/GridTestProperties.java | 14 +- .../junits/IgniteTestResources.java | 16 +- .../ignite/testsuites/IgniteBasicTestSuite.java | 29 +++- .../IgniteCacheFailoverTestSuite.java | 14 +- ...niteCacheP2pUnmarshallingErrorTestSuite.java | 20 ++- .../ignite/testsuites/IgniteCacheTestSuite.java | 28 +++- .../testsuites/IgniteKernalSelfTestSuite.java | 14 +- .../IgniteMarshallerSelfTestSuite.java | 28 +++- .../testsuites/IgniteUtilSelfTestSuite.java | 18 ++- modules/extdata/p2p/pom.xml | 2 +- .../tests/p2p/P2PTestTaskExternalPath1.java | 10 +- .../tests/p2p/P2PTestTaskExternalPath2.java | 8 +- 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 +- .../cache/GridCacheCrossCacheQuerySelfTest.java | 2 - .../cache/GridCacheOffHeapSelfTest.java | 1 - ...idCacheReduceQueryMultithreadedSelfTest.java | 10 -- .../processors/cache/GridCacheSwapSelfTest.java | 3 - .../IgniteCacheAbstractFieldsQuerySelfTest.java | 13 +- .../cache/IgniteCacheAbstractQuerySelfTest.java | 2 - ...hePartitionedQueryMultiThreadedSelfTest.java | 40 ++--- .../IgniteCacheQueryMultiThreadedSelfTest.java | 1 - ...dCacheAbstractReduceFieldsQuerySelfTest.java | 1 - .../query/h2/sql/GridQueryParsingTest.java | 5 +- 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 +- 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 +- parent/pom.xml | 1 + pom.xml | 2 +- 121 files changed, 737 insertions(+), 469 deletions(-) ----------------------------------------------------------------------
