Merge remote-tracking branch 'remotes/origin/sprint-1' into ignite-107
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/1b0ee715 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/1b0ee715 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/1b0ee715 Branch: refs/heads/sprint-1 Commit: 1b0ee715667debaa6a4455dcaaa19b66182d0b82 Parents: 2b8bbe9 8795b0f Author: avinogradov <avinogra...@gridgain.com> Authored: Fri Jan 23 16:03:52 2015 +0300 Committer: avinogradov <avinogra...@gridgain.com> Committed: Fri Jan 23 16:03:52 2015 +0300 ---------------------------------------------------------------------- assembly/libs/readme.txt | 12 +- docs/gridgain_readme.md | 4 +- examples/pom-standalone.xml | 18 +- modules/aop/readme.txt | 4 +- modules/aws/readme.txt | 4 +- .../spi/checkpoint/s3/GridS3CheckpointSpi.java | 17 +- .../GridClientAbstractMultiNodeSelfTest.java | 6 +- .../java/org/apache/ignite/IgniteCompute.java | 9 +- .../java/org/apache/ignite/IgniteManaged.java | 11 +- .../apache/ignite/cache/store/CacheStore.java | 5 +- .../cache/store/jdbc/CacheJdbcBlobStore.java | 8 +- .../org/apache/ignite/cluster/ClusterNode.java | 41 +- .../ignite/cluster/ClusterNodeLocalMap.java | 3 +- .../org/apache/ignite/compute/ComputeJob.java | 11 +- .../ignite/compute/ComputeJobSibling.java | 3 +- .../ignite/compute/ComputeLoadBalancer.java | 7 +- .../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 +- .../ignite/logger/java/IgniteJavaLogger.java | 4 +- .../apache/ignite/managed/ManagedService.java | 4 +- .../ignite/marshaller/IgniteMarshaller.java | 27 - .../marshaller/jdk/IgniteJdkMarshaller.java | 25 - .../optimized/IgniteOptimizedClassResolver.java | 2 +- .../optimized/IgniteOptimizedMarshaller.java | 23 - .../org/apache/ignite/mbean/IgniteMBean.java | 2 +- .../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 | 111 ++- .../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 +- .../apache/ignite/transactions/IgniteTx.java | 31 + .../org/gridgain/grid/GridMetadataAware.java | 187 ----- .../org/gridgain/grid/cache/GridCacheEntry.java | 77 +- .../grid/cache/GridCacheInterceptor.java | 2 +- .../grid/kernal/ClusterNodeLocalMapImpl.java | 80 -- .../org/gridgain/grid/kernal/GridGainEx.java | 8 +- .../grid/kernal/GridJobContextImpl.java | 4 +- .../grid/kernal/GridJobSiblingImpl.java | 3 +- .../org/gridgain/grid/kernal/GridKernal.java | 9 +- .../gridgain/grid/kernal/GridKernalContext.java | 3 +- .../grid/kernal/GridKernalContextImpl.java | 6 +- .../gridgain/grid/kernal/GridLoggerProxy.java | 5 +- .../gridgain/grid/kernal/GridProductImpl.java | 12 +- .../gridgain/grid/kernal/GridProperties.java | 2 +- .../grid/kernal/GridUpdateNotifier.java | 4 +- .../kernal/executor/GridExecutorService.java | 4 +- .../loadbalancer/GridLoadBalancerAdapter.java | 4 +- .../processors/cache/GridCacheAdapter.java | 2 +- .../processors/cache/GridCacheEntryEx.java | 85 ++- .../processors/cache/GridCacheEntryImpl.java | 54 +- .../cache/GridCacheEvictionEntry.java | 36 - .../cache/GridCacheFilterEvaluationEntry.java | 36 - .../processors/cache/GridCacheLogger.java | 3 +- .../processors/cache/GridCacheMapEntry.java | 88 +-- .../processors/cache/GridCacheStoreManager.java | 7 +- .../GridPartitionedCacheEntryImpl.java | 147 ---- .../cache/query/GridCacheQueryManager.java | 37 - .../GridCacheContinuousQueryEntry.java | 50 -- .../cache/transactions/IgniteTxEx.java | 3 +- .../cache/transactions/IgniteTxProxyImpl.java | 19 +- .../dataload/IgniteDataLoaderImpl.java | 2 +- .../resource/GridResourceCustomInjector.java | 555 -------------- .../GridResourceJobContextInjector.java | 2 +- .../resource/GridResourceProcessor.java | 197 +---- .../java/org/gridgain/grid/util/GridUtils.java | 19 - .../GridIpcSharedMemoryServerEndpoint.java | 21 +- .../grid/util/lang/GridComputeJobWrapper.java | 14 +- .../org/gridgain/grid/util/lang/GridFunc.java | 146 ---- .../util/lang/GridMetadataAwareAdapter.java | 159 +++- .../core/src/main/resources/gridgain.properties | 22 - .../core/src/main/resources/ignite.properties | 22 + .../tcp/GridTcpClientDiscoverySelfTest.java | 6 +- .../org/gridgain/grid/GridTestJobContext.java | 3 +- .../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 +- .../grid/kernal/GridUpdateNotifierSelfTest.java | 2 +- .../checkpoint/GridCheckpointTaskSelfTest.java | 14 +- .../continuous/GridMessageListenSelfTest.java | 13 +- .../gridgain/grid/lang/GridTupleSelfTest.java | 85 --- .../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 +- .../junits/logger/GridTestLog4jLogger.java | 4 +- modules/email/readme.txt | 4 +- .../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 +- modules/hadoop/readme.txt | 4 +- modules/hibernate/readme.txt | 4 +- .../hibernate/GridCacheHibernateBlobStore.java | 10 +- modules/indexing/readme.txt | 4 +- .../processors/query/h2/GridH2Indexing.java | 23 +- .../tcp/GridOrderedMessageCancelSelfTest.java | 4 - .../GridCacheQueryUserResourceSelfTest.java | 180 ----- .../testsuites/GridCacheQuerySelfTestSuite.java | 1 - modules/jcl/readme.txt | 4 +- .../gridgain/grid/logger/jcl/GridJclLogger.java | 3 +- modules/jta/readme.txt | 4 +- modules/log4j/readme.txt | 4 +- .../ignite/logger/log4j/IgniteLog4jLogger.java | 4 +- modules/rest-http/readme.txt | 4 +- modules/scalar/pom.xml | 4 +- modules/scalar/readme.txt | 4 +- modules/schedule/readme.txt | 4 +- .../processors/schedule/ScheduleFutureImpl.java | 6 +- modules/slf4j/readme.txt | 4 +- .../grid/logger/slf4j/GridSlf4jLogger.java | 3 +- modules/spring/readme.txt | 4 +- .../java/org/gridgain/grid/GridGainSpring.java | 8 +- .../java/org/gridgain/grid/GridSpringBean.java | 3 +- .../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 - modules/ssh/readme.txt | 4 +- modules/urideploy/readme.txt | 4 +- .../deployment/uri/GridUriDeploymentSpi.java | 7 +- .../grid/p2p/GridP2PDisabledSelfTest.java | 3 +- .../visor/commands/node/VisorNodeCommand.scala | 4 +- modules/web/readme.txt | 4 +- pom.xml | 10 +- 206 files changed, 1285 insertions(+), 10210 deletions(-) ----------------------------------------------------------------------
