Merge branches 'ignite-32' and 'sprint-1' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-32
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/7e062cb7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/7e062cb7 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/7e062cb7 Branch: refs/heads/ignite-160 Commit: 7e062cb7625b2a69c687f536244c515dc63b9215 Parents: 666ad8b 603374c Author: AKuznetsov <akuznet...@gridgain.com> Authored: Wed Feb 4 17:27:10 2015 +0700 Committer: AKuznetsov <akuznet...@gridgain.com> Committed: Wed Feb 4 17:27:10 2015 +0700 ---------------------------------------------------------------------- docs/core-site.ignite.xml | 2 +- examples/config/example-cache.xml | 14 +- examples/config/example-compute.xml | 8 +- examples/config/example-streamer.xml | 30 +- examples/config/filesystem/core-site.xml | 10 +- examples/config/filesystem/example-ggfs.xml | 165 ----------- examples/config/filesystem/example-ignitefs.xml | 165 +++++++++++ examples/config/filesystem/readme.txt | 8 +- .../hibernate/example-hibernate-L2-cache.xml | 6 +- examples/config/servlet/WEB-INF/web.xml | 2 +- examples/rest/http-rest-example.php | 8 +- examples/rest/memcache-rest-example.php | 4 +- .../ignite/examples/ComputeNodeStartup.java | 4 +- .../apache/ignite/examples/ExamplesUtils.java | 6 +- .../compute/ComputeBroadcastExample.java | 34 +-- .../compute/ComputeCallableExample.java | 18 +- .../examples/compute/ComputeClosureExample.java | 20 +- .../compute/ComputeContinuousMapperExample.java | 24 +- .../compute/ComputeExecutorServiceExample.java | 16 +- .../ComputeFibonacciContinuationExample.java | 35 ++- .../compute/ComputeProjectionExample.java | 23 +- .../examples/compute/ComputeReducerExample.java | 20 +- .../compute/ComputeRunnableExample.java | 17 +- .../compute/ComputeScheduleExample.java | 14 +- .../examples/compute/ComputeTaskMapExample.java | 30 +- .../compute/ComputeTaskSplitExample.java | 26 +- .../failover/ComputeFailoverExample.java | 17 +- .../failover/ComputeFailoverNodeStartup.java | 12 +- .../compute/montecarlo/CreditRiskExample.java | 30 +- .../compute/montecarlo/CreditRiskManager.java | 14 +- .../apache/ignite/examples/compute/package.html | 2 +- .../examples/datagrid/CacheAffinityExample.java | 37 ++- .../examples/datagrid/CacheApiExample.java | 104 ++----- .../datagrid/CacheContinuousQueryExample.java | 10 +- .../datagrid/CacheDataLoaderExample.java | 16 +- .../examples/datagrid/CacheEventsExample.java | 21 +- .../examples/datagrid/CacheNodeStartup.java | 4 +- .../datagrid/CachePopularNumbersExample.java | 32 +-- .../examples/datagrid/CachePutGetExample.java | 29 +- .../examples/datagrid/CacheQueryExample.java | 26 +- .../datagrid/CacheTransactionExample.java | 41 ++- .../datastructures/CacheAtomicLongExample.java | 16 +- .../CacheAtomicReferenceExample.java | 24 +- .../CacheAtomicSequenceExample.java | 14 +- .../CacheAtomicStampedExample.java | 22 +- .../CacheCountDownLatchExample.java | 16 +- .../datastructures/CacheQueueExample.java | 46 +-- .../datastructures/CacheSetExample.java | 36 +-- .../hibernate/HibernateL2CacheExample.java | 18 +- .../HibernateL2CacheExampleNodeStartup.java | 12 +- .../ignite/examples/datagrid/package.html | 2 +- .../starschema/CacheStarSchemaExample.java | 57 ++-- .../datagrid/starschema/DimProduct.java | 3 +- .../examples/datagrid/starschema/DimStore.java | 3 +- .../datagrid/starschema/FactPurchase.java | 3 +- .../examples/datagrid/starschema/package.html | 2 +- .../store/CacheNodeWithStoreStartup.java | 12 +- .../datagrid/store/CacheStoreExample.java | 17 +- .../store/CacheStoreLoadDataExample.java | 15 +- .../store/dummy/CacheDummyPersonStore.java | 9 +- .../datagrid/store/hibernate/hibernate.cfg.xml | 2 +- .../store/jdbc/CacheJdbcPersonStore.java | 10 +- .../ignite/examples/events/EventsExample.java | 32 +-- .../ignite/examples/fs/IgniteFsExample.java | 278 +++++++++++++++++++ .../examples/fs/IgniteFsMapReduceExample.java | 249 +++++++++++++++++ .../ignite/examples/fs/IgniteFsNodeStartup.java | 41 +++ .../org/apache/ignite/examples/fs/package.html | 23 ++ .../ignite/examples/ggfs/GgfsExample.java | 278 ------------------- .../examples/ggfs/GgfsMapReduceExample.java | 249 ----------------- .../ignite/examples/ggfs/GgfsNodeStartup.java | 41 --- .../apache/ignite/examples/ggfs/package.html | 23 -- .../examples/messaging/MessagingExample.java | 36 +-- .../messaging/MessagingPingPongExample.java | 26 +- .../MessagingPingPongListenActorExample.java | 20 +- .../client/memcache/MemcacheRestExample.java | 22 +- .../MemcacheRestExampleNodeStartup.java | 14 +- .../misc/deployment/DeploymentExample.java | 34 +-- .../misc/lifecycle/LifecycleExample.java | 24 +- .../misc/springbean/SpringBeanExample.java | 30 +- .../examples/misc/springbean/package.html | 2 +- .../examples/misc/springbean/spring-bean.xml | 8 +- .../org/apache/ignite/examples/package.html | 2 +- .../examples/services/ServicesExample.java | 16 +- .../streaming/StreamingCheckInExample.java | 30 +- .../streaming/StreamingNodeStartup.java | 4 +- .../StreamingPopularNumbersExample.java | 40 +-- .../streaming/StreamingPriceBarsExample.java | 38 +-- .../StreamingRunningAverageExample.java | 6 +- .../apache/ignite/examples/ComputeExample.java | 12 +- .../ignite/examples/MessagingExample.java | 48 ++-- .../examples/ScalarCacheAffinityExample1.scala | 22 +- .../examples/ScalarCacheAffinityExample2.scala | 18 +- .../ScalarCacheAffinitySimpleExample.scala | 6 +- .../scalar/examples/ScalarCacheExample.scala | 4 +- .../ScalarCachePopularNumbersExample.scala | 26 +- .../examples/ScalarCacheQueryExample.scala | 20 +- .../scalar/examples/ScalarClosureExample.scala | 20 +- .../examples/ScalarContinuationExample.scala | 33 ++- .../examples/ScalarCreditRiskExample.scala | 22 +- .../scalar/examples/ScalarJvmCloudExample.scala | 22 +- .../examples/ScalarPiCalculationExample.scala | 6 +- .../scalar/examples/ScalarPingPongExample.scala | 14 +- .../scalar/examples/ScalarPrimeExample.scala | 16 +- .../scalar/examples/ScalarScheduleExample.scala | 6 +- .../examples/ScalarSnowflakeSchemaExample.scala | 40 +-- .../scalar/examples/ScalarTaskExample.scala | 14 +- .../examples/ScalarWorldShortestMapReduce.scala | 2 +- .../BasicExamplesMultiNodeSelfTest.java | 28 ++ .../ignite/examples/BasicExamplesSelfTest.java | 82 ++++++ .../CacheExamplesMultiNodeSelfTest.java | 48 ++++ .../ignite/examples/CacheExamplesSelfTest.java | 155 +++++++++++ ...heStoreLoadDataExampleMultiNodeSelfTest.java | 39 +++ .../examples/CheckpointExamplesSelfTest.java | 45 +++ .../ContinuationExamplesMultiNodeSelfTest.java | 28 ++ .../examples/ContinuationExamplesSelfTest.java | 33 +++ ...ntinuousMapperExamplesMultiNodeSelfTest.java | 28 ++ .../ContinuousMapperExamplesSelfTest.java | 33 +++ .../DeploymentExamplesMultiNodeSelfTest.java | 30 ++ .../examples/DeploymentExamplesSelfTest.java | 33 +++ .../EventsExamplesMultiNodeSelfTest.java | 28 ++ .../ignite/examples/EventsExamplesSelfTest.java | 33 +++ .../GridBasicExamplesMultiNodeSelfTest.java | 28 -- .../examples/GridBasicExamplesSelfTest.java | 82 ------ .../GridCacheExamplesMultiNodeSelfTest.java | 48 ---- .../examples/GridCacheExamplesSelfTest.java | 155 ----------- ...heStoreLoadDataExampleMultiNodeSelfTest.java | 39 --- .../GridCheckpointExamplesSelfTest.java | 45 --- ...idContinuationExamplesMultiNodeSelfTest.java | 28 -- .../GridContinuationExamplesSelfTest.java | 33 --- ...ntinuousMapperExamplesMultiNodeSelfTest.java | 28 -- .../GridContinuousMapperExamplesSelfTest.java | 33 --- ...GridDeploymentExamplesMultiNodeSelfTest.java | 30 -- .../GridDeploymentExamplesSelfTest.java | 33 --- .../GridEventsExamplesMultiNodeSelfTest.java | 28 -- .../examples/GridEventsExamplesSelfTest.java | 33 --- ...ibernateL2CacheExampleMultiNodeSelfTest.java | 31 --- .../GridHibernateL2CacheExampleSelfTest.java | 33 --- .../examples/GridLifecycleExamplesSelfTest.java | 33 --- ...idMemcacheRestExamplesMultiNodeSelfTest.java | 31 --- .../GridMemcacheRestExamplesSelfTest.java | 41 --- .../examples/GridMessagingExamplesSelfTest.java | 52 ---- ...GridMonteCarloExamplesMultiNodeSelfTest.java | 28 -- .../GridMonteCarloExamplesSelfTest.java | 74 ----- .../examples/GridProjectionExampleSelfTest.java | 39 --- .../GridSpringBeanExamplesSelfTest.java | 33 --- .../GridTaskExamplesMultiNodeSelfTest.java | 28 -- .../examples/GridTaskExamplesSelfTest.java | 40 --- ...ibernateL2CacheExampleMultiNodeSelfTest.java | 31 +++ .../HibernateL2CacheExampleSelfTest.java | 33 +++ .../examples/IgniteFsExamplesSelfTest.java | 16 +- .../examples/LifecycleExamplesSelfTest.java | 33 +++ .../MemcacheRestExamplesMultiNodeSelfTest.java | 31 +++ .../examples/MemcacheRestExamplesSelfTest.java | 41 +++ .../examples/MessagingExamplesSelfTest.java | 52 ++++ .../MonteCarloExamplesMultiNodeSelfTest.java | 28 ++ .../examples/MonteCarloExamplesSelfTest.java | 74 +++++ .../examples/ProjectionExampleSelfTest.java | 39 +++ .../examples/SpringBeanExamplesSelfTest.java | 33 +++ .../examples/TaskExamplesMultiNodeSelfTest.java | 28 ++ .../ignite/examples/TaskExamplesSelfTest.java | 40 +++ .../testsuites/IgniteExamplesSelfTestSuite.java | 54 ++-- .../ScalarExamplesSelfTestSuite.scala | 7 +- .../src/main/java/org/apache/ignite/Ignite.java | 4 +- .../org/apache/ignite/cluster/ClusterGroup.java | 9 +- .../ignite/internal/ClusterGroupAdapter.java | 51 +--- .../ignite/internal/IgniteClusterAsyncImpl.java | 12 +- .../apache/ignite/internal/IgniteKernal.java | 2 +- .../processors/cache/GridCacheMapEntry.java | 6 +- .../processors/cache/IgniteCacheProxy.java | 7 + .../GridProjectionForCachesSelfTest.java | 27 +- .../fs/GridGgfsCommonAbstractTest.java | 4 +- .../ipc/shmem/GgfsSharedMemoryTestServer.java | 2 +- .../IpcSharedMemoryCrashDetectionSelfTest.java | 2 +- .../IpcSharedMemoryBenchmarkReader.java | 2 +- .../ignite/p2p/GridP2PUndeploySelfTest.java | 2 +- .../GridAbstractCommunicationSelfTest.java | 6 +- ...mmunicationSpiConcurrentConnectSelfTest.java | 6 +- .../tcp/GridTcpCommunicationSpiLanTest.java | 6 +- ...cpCommunicationSpiMultithreadedSelfTest.java | 6 +- ...dTcpCommunicationSpiRecoveryAckSelfTest.java | 6 +- ...GridTcpCommunicationSpiRecoverySelfTest.java | 6 +- .../GridAbstractDiscoverySelfTest.java | 12 +- .../testframework/junits/GridAbstractTest.java | 10 +- .../testframework/junits/GridTestIgnite.java | 230 --------------- .../testframework/junits/GridTestResources.java | 255 ----------------- .../ignite/testframework/junits/IgniteMock.java | 230 +++++++++++++++ .../junits/IgniteTestResources.java | 255 +++++++++++++++++ .../junits/spi/GridSpiAbstractTest.java | 6 +- ...idHadoopDefaultMapReducePlannerSelfTest.java | 6 +- .../scala/org/apache/ignite/scalar/scalar.scala | 14 +- .../tests/ScalarAffinityRoutingSpec.scala | 12 +- .../tests/ScalarCacheProjectionSpec.scala | 2 +- .../ignite/scalar/tests/ScalarCacheSpec.scala | 2 +- .../scalar/tests/ScalarProjectionSpec.scala | 36 +-- .../org/apache/ignite/IgniteSpringBean.java | 2 +- 195 files changed, 3394 insertions(+), 3493 deletions(-) ----------------------------------------------------------------------
