Merge branch 'ignite-35' into sprint-1
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/8795b0fd Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/8795b0fd Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/8795b0fd Branch: refs/heads/ignite-32 Commit: 8795b0fd6add2dd82ab58ab8b0380ab0731af786 Parents: 4174b33 04361ab Author: nikolay_tikhonov <ntikho...@gridgain.com> Authored: Thu Jan 22 20:35:17 2015 +0300 Committer: nikolay_tikhonov <ntikho...@gridgain.com> Committed: Thu Jan 22 20:35:17 2015 +0300 ---------------------------------------------------------------------- .../spi/checkpoint/s3/GridS3CheckpointSpi.java | 17 +- .../GridClientAbstractMultiNodeSelfTest.java | 6 +- .../java/org/apache/ignite/IgniteCompute.java | 9 +- .../java/org/apache/ignite/IgniteManaged.java | 11 +- .../cache/store/jdbc/CacheJdbcBlobStore.java | 8 +- .../org/apache/ignite/compute/ComputeJob.java | 11 +- .../ignite/compute/ComputeLoadBalancer.java | 4 +- .../org/apache/ignite/compute/ComputeTask.java | 17 +- .../ignite/compute/ComputeTaskAdapter.java | 8 +- .../compute/ComputeTaskContinuousMapper.java | 8 +- .../ignite/compute/ComputeTaskSession.java | 6 +- .../configuration/IgniteDeploymentMode.java | 35 +- .../apache/ignite/lifecycle/LifecycleBean.java | 13 +- .../apache/ignite/managed/ManagedService.java | 4 +- .../ignite/marshaller/IgniteMarshaller.java | 27 - .../marshaller/jdk/IgniteJdkMarshaller.java | 25 - .../optimized/IgniteOptimizedMarshaller.java | 23 - .../IgniteAddressResolverResource.java | 58 -- .../resources/IgniteCacheNameResource.java | 4 +- .../IgniteExecutorServiceResource.java | 66 -- .../ignite/resources/IgniteHomeResource.java | 65 -- .../resources/IgniteInstanceResource.java | 17 +- .../resources/IgniteJobContextResource.java | 10 +- .../resources/IgniteLoadBalancerResource.java | 14 +- .../resources/IgniteLocalHostResource.java | 66 -- .../resources/IgniteLocalNodeIdResource.java | 66 -- .../ignite/resources/IgniteLoggerResource.java | 9 +- .../resources/IgniteMBeanServerResource.java | 5 +- .../resources/IgniteMarshallerResource.java | 65 -- .../ignite/resources/IgniteNameResource.java | 65 -- .../ignite/resources/IgniteServiceResource.java | 4 +- .../IgniteSpringApplicationContextResource.java | 5 +- .../ignite/resources/IgniteSpringResource.java | 18 +- .../IgniteTaskContinuousMapperResource.java | 10 +- .../resources/IgniteTaskSessionResource.java | 10 +- .../ignite/resources/IgniteUserResource.java | 132 ---- .../resources/IgniteUserResourceOnDeployed.java | 54 -- .../IgniteUserResourceOnUndeployed.java | 53 -- .../java/org/apache/ignite/spi/IgniteSpi.java | 10 +- .../org/apache/ignite/spi/IgniteSpiAdapter.java | 23 +- .../sharedfs/SharedFsCheckpointSpi.java | 13 +- .../PriorityQueueCollisionSpi.java | 16 +- .../communication/tcp/TcpCommunicationSpi.java | 38 +- .../discovery/tcp/TcpClientDiscoverySpi.java | 54 +- .../spi/discovery/tcp/TcpDiscoverySpi.java | 107 ++- .../discovery/tcp/TcpDiscoverySpiAdapter.java | 27 +- .../TcpDiscoveryMulticastIpFinder.java | 10 +- .../spi/loadbalancing/LoadBalancingSpi.java | 8 +- .../adaptive/AdaptiveLoadBalancingSpi.java | 4 +- .../roundrobin/RoundRobinLoadBalancingSpi.java | 10 +- .../WeightedRandomLoadBalancingSpi.java | 8 +- .../spi/swapspace/file/FileSwapSpaceSpi.java | 19 +- .../grid/cache/GridCacheInterceptor.java | 2 +- .../org/gridgain/grid/kernal/GridGainEx.java | 8 +- .../org/gridgain/grid/kernal/GridKernal.java | 9 +- .../grid/kernal/GridKernalContextImpl.java | 2 +- .../resource/GridResourceCustomInjector.java | 555 -------------- .../GridResourceJobContextInjector.java | 2 +- .../resource/GridResourceProcessor.java | 197 +---- .../GridIpcSharedMemoryServerEndpoint.java | 21 +- .../tcp/GridTcpClientDiscoverySelfTest.java | 6 +- .../kernal/GridCancelOnGridStopSelfTest.java | 6 +- .../GridExplicitImplicitDeploymentSelfTest.java | 6 +- .../GridFailoverCustomTopologySelfTest.java | 16 +- .../grid/kernal/GridFailoverSelfTest.java | 8 +- .../GridFailoverTaskWithPredicateSelfTest.java | 4 - .../kernal/GridFailoverTopologySelfTest.java | 18 +- .../grid/kernal/GridJobContextSelfTest.java | 8 +- .../kernal/GridJobMasterLeaveAwareSelfTest.java | 4 - .../grid/kernal/GridMultipleSpisSelfTest.java | 10 +- .../GridMultipleVersionsDeploymentSelfTest.java | 12 +- .../kernal/GridRuntimeExceptionSelfTest.java | 8 +- .../grid/kernal/GridStopWithCancelSelfTest.java | 8 +- .../grid/kernal/GridStopWithWaitSelfTest.java | 20 +- .../kernal/GridTaskInstantiationSelfTest.java | 8 +- .../checkpoint/GridCheckpointTaskSelfTest.java | 14 +- .../continuous/GridMessageListenSelfTest.java | 13 +- .../p2p/GridAbstractMultinodeRedeployTest.java | 10 +- .../GridP2PDifferentClassLoaderSelfTest.java | 8 +- .../p2p/GridP2PHotRedeploymentSelfTest.java | 35 +- .../grid/p2p/GridP2PJobClassLoaderSelfTest.java | 20 +- .../p2p/GridP2PLocalDeploymentSelfTest.java | 54 +- .../grid/p2p/GridP2PNodeLeftSelfTest.java | 21 +- .../p2p/GridP2PRemoteClassLoadersSelfTest.java | 8 +- .../p2p/GridP2PSameClassLoaderSelfTest.java | 33 +- .../org/gridgain/grid/p2p/GridP2PTestJob.java | 9 +- .../org/gridgain/grid/p2p/GridP2PTestTask.java | 8 +- .../GridSessionCheckpointAbstractSelfTest.java | 15 +- .../session/GridSessionJobFailoverSelfTest.java | 5 +- .../stealing/GridStealingLoadTestJob.java | 8 +- .../loadtests/dsi/GridDsiLifecycleBean.java | 2 +- .../loadtests/job/GridJobLoadTestJob.java | 12 +- .../testframework/junits/GridTestIgnite.java | 224 ++++++ .../junits/GridTestKernalContext.java | 4 +- .../testframework/junits/GridTestResources.java | 16 +- .../GridExternalCacheQueryReducerClosure.java | 43 -- .../tests/p2p/GridP2PAwareTestUserResource.java | 20 - .../p2p/GridP2PEventFilterExternalPath1.java | 5 - .../p2p/GridP2PEventFilterExternalPath2.java | 5 - .../tests/p2p/GridP2PTestTaskExternalPath1.java | 22 +- .../tests/p2p/GridP2PTestTaskExternalPath2.java | 24 +- .../hibernate/GridCacheHibernateBlobStore.java | 10 +- .../processors/query/h2/GridH2Indexing.java | 23 +- .../tcp/GridOrderedMessageCancelSelfTest.java | 4 - .../GridCacheQueryUserResourceSelfTest.java | 180 ----- .../testsuites/GridCacheQuerySelfTestSuite.java | 1 - .../java/org/gridgain/grid/GridGainSpring.java | 8 +- .../GridAbstractUserExternalResource.java | 155 ---- .../resource/GridUserExternalResource1.java | 25 - .../resource/GridUserExternalResource2.java | 25 - .../resource/GridUserExternalResourceTask1.java | 157 ---- .../resource/GridUserExternalResourceTask2.java | 169 ---- .../grid/external/resource/package.html | 23 - .../grid/kernal/GridFactorySelfTest.java | 33 +- .../resource/GridAbstractUserResource.java | 151 ---- .../GridResourceConcurrentUndeploySelfTest.java | 466 ------------ .../GridResourceEventFilterSelfTest.java | 186 ----- .../GridResourceFieldInjectionSelfTest.java | 638 ---------------- ...dResourceFieldOverrideInjectionSelfTest.java | 202 ----- .../resource/GridResourceIocSelfTest.java | 487 ------------ ...GridResourceIsolatedClassLoaderSelfTest.java | 762 ------------------- .../GridResourceIsolatedTaskSelfTest.java | 742 ------------------ .../GridResourceMethodInjectionSelfTest.java | 616 --------------- ...ResourceMethodOverrideInjectionSelfTest.java | 489 ------------ .../resource/GridResourceProcessorSelfTest.java | 8 +- .../GridResourceSharedUndeploySelfTest.java | 673 ---------------- .../resource/GridResourceUserExternalTest.java | 94 --- .../grid/p2p/GridP2PAbstractUserResource.java | 184 ----- .../GridP2PContinuousLocalDeploySelfTest.java | 319 -------- .../p2p/GridP2PUserVersionChangeSelfTest.java | 21 +- .../testsuites/GridResourceSelfTestSuite.java | 11 - .../testsuites/bamboo/GridSpringTestSuite.java | 1 - .../deployment/uri/GridUriDeploymentSpi.java | 7 +- .../grid/p2p/GridP2PDisabledSelfTest.java | 3 +- 134 files changed, 786 insertions(+), 9038 deletions(-) ----------------------------------------------------------------------
