ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dsetrak...@apache.org
Subject [3/7] incubator-ignite git commit: Merge remote-tracking branch 'origin/ignite-45' into ignite-45
Date Sat, 21 Mar 2015 04:41:27 GMT
Merge remote-tracking branch 'origin/ignite-45' into ignite-45

Conflicts:
	examples/src/main/java8/org/apache/ignite/examples/java8/streaming/numbers/QueryPopularNumbers.java
	examples/src/main/java8/org/apache/ignite/examples/java8/streaming/numbers/StreamRandomNumbers.java


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/9a606d57
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9a606d57
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9a606d57

Branch: refs/heads/ignite-45
Commit: 9a606d57502ac2a3f488775999af551203c01776
Parents: 947b392 dbfaf0a
Author: Dmitiry Setrakyan <dsetrakyan@gridgain.com>
Authored: Fri Mar 20 12:50:37 2015 -0700
Committer: Dmitiry Setrakyan <dsetrakyan@gridgain.com>
Committed: Fri Mar 20 12:50:37 2015 -0700

----------------------------------------------------------------------
 LICENSE.txt                                     |   26 -
 NOTICE.txt                                      |   13 +-
 assembly/release-fabric.xml                     |    1 +
 bin/ignite-schema-import.bat                    |    2 +-
 bin/ignite-schema-import.sh                     |    4 +-
 examples/config/example-cache.xml               |    2 +-
 examples/config/example-compute.xml             |   83 -
 examples/config/example-ignite.xml              |   83 +
 examples/config/example-streamer.xml            |    2 +-
 examples/config/filesystem/example-igfs.xml     |    2 +-
 examples/config/servlet/WEB-INF/web.xml         |    2 +-
 examples/config/servlet/readme.txt              |    2 +-
 examples/pom-standalone.xml                     |    2 +-
 examples/pom.xml                                |   52 +
 examples/schema-import/h2-server.bat            |   80 +
 examples/schema-import/h2-server.sh             |   63 +
 examples/schema-import/schema-import.bat        |   88 +
 examples/schema-import/schema-import.sh         |   57 +
 .../ignite/examples/ExampleNodeStartup.java     |    2 +-
 .../apache/ignite/examples/ExamplesUtils.java   |   18 -
 .../computegrid/ComputeBroadcastExample.java    |    6 +-
 .../computegrid/ComputeCallableExample.java     |    6 +-
 .../computegrid/ComputeClosureExample.java      |    6 +-
 .../ComputeClusterGroupsExample.java            |    6 +-
 .../ComputeContinuousMapperExample.java         |    6 +-
 .../ComputeExecutorServiceExample.java          |    6 +-
 .../ComputeFibonacciContinuationExample.java    |    6 +-
 .../computegrid/ComputeReducerExample.java      |    6 +-
 .../computegrid/ComputeRunnableExample.java     |    6 +-
 .../computegrid/ComputeScheduleExample.java     |    6 +-
 .../computegrid/ComputeTaskMapExample.java      |    6 +-
 .../computegrid/ComputeTaskSplitExample.java    |    6 +-
 .../failover/ComputeFailoverExample.java        |    1 -
 .../montecarlo/CreditRiskExample.java           |    6 +-
 .../examples/datagrid/CacheAffinityExample.java |    6 +-
 .../examples/datagrid/CacheApiExample.java      |    6 +-
 .../datagrid/CacheContinuousQueryExample.java   |    8 +-
 .../datagrid/CacheDataStreamerExample.java      |    6 +-
 .../examples/datagrid/CacheEventsExample.java   |   10 +-
 .../datagrid/CachePopularNumbersExample.java    |    6 +-
 .../examples/datagrid/CachePutGetExample.java   |    6 +-
 .../examples/datagrid/CacheQueryExample.java    |    6 +-
 .../datagrid/CacheTransactionExample.java       |    6 +-
 .../starschema/CacheStarSchemaExample.java      |    6 +-
 .../datagrid/starschema/DimProduct.java         |    1 -
 .../examples/datagrid/starschema/DimStore.java  |    1 -
 .../datagrid/starschema/FactPurchase.java       |    2 -
 .../store/CacheNodeWithStoreStartup.java        |   44 +-
 .../store/dummy/CacheDummyPersonStore.java      |    1 -
 .../store/jdbc/CacheJdbcPojoPersonStore.java    |    3 -
 .../datastructures/IgniteAtomicLongExample.java |    7 +-
 .../IgniteAtomicReferenceExample.java           |    7 +-
 .../IgniteAtomicSequenceExample.java            |    7 +-
 .../IgniteAtomicStampedExample.java             |    7 +-
 .../IgniteCountDownLatchExample.java            |    7 +-
 .../datastructures/IgniteQueueExample.java      |    7 +-
 .../datastructures/IgniteSetExample.java        |    7 +-
 .../ignite/examples/events/EventsExample.java   |    8 +-
 .../examples/messaging/MessagingExample.java    |    6 +-
 .../messaging/MessagingPingPongExample.java     |    6 +-
 .../MessagingPingPongListenActorExample.java    |    6 +-
 .../misc/deployment/DeploymentExample.java      |    6 +-
 .../misc/springbean/SpringBeanExample.java      |    4 +-
 .../examples/servicegrid/ServicesExample.java   |    4 +-
 .../streaming/StreamingCheckInExample.java      |  580 ------
 .../streaming/StreamingNodeStartup.java         |   35 -
 .../StreamingPopularNumbersExample.java         |  166 --
 .../streaming/StreamingPriceBarsExample.java    |  451 -----
 .../StreamingRunningAverageExample.java         |  247 ---
 .../ignite/examples/streaming/package-info.java |   22 -
 .../ignite/examples/java8/ComputeExample.java   |    4 +-
 .../examples/java8/ExampleNodeStartup.java      |    2 +-
 .../ignite/examples/java8/MessagingExample.java |    6 +-
 .../streaming/numbers/QueryPopularNumbers.java  |   28 +-
 .../streaming/numbers/StreamRandomNumbers.java  |   34 +-
 .../examples/ScalarCacheAffinityExample.scala   |    6 +-
 .../scalar/examples/ScalarCacheExample.scala    |    6 +-
 .../ScalarCachePopularNumbersExample.scala      |    6 +-
 .../examples/ScalarCacheQueryExample.scala      |    6 +-
 .../scalar/examples/ScalarClosureExample.scala  |    4 +-
 .../examples/ScalarContinuationExample.scala    |    4 +-
 .../examples/ScalarCreditRiskExample.scala      |    4 +-
 .../scalar/examples/ScalarPingPongExample.scala |    4 +-
 .../scalar/examples/ScalarPrimeExample.scala    |    4 +-
 .../scalar/examples/ScalarScheduleExample.scala |    4 +-
 .../examples/ScalarSnowflakeSchemaExample.scala |    6 +-
 .../scalar/examples/ScalarTaskExample.scala     |    4 +-
 .../examples/ScalarWorldShortestMapReduce.scala |    4 +-
 .../CacheExamplesMultiNodeSelfTest.java         |    2 +-
 .../java8/IgniteExamplesJ8SelfTestSuite.java    |   43 +
 .../integration/ClientAbstractSelfTest.java     |    4 +-
 .../rest/RestBinaryProtocolSelfTest.java        |    2 +-
 .../rest/TaskCommandHandlerSelfTest.java        |    2 +-
 modules/core/pom.xml                            |    3 +-
 .../src/main/java/com/romix/scala/None.java     |   27 -
 .../src/main/java/com/romix/scala/Option.java   |   42 -
 .../src/main/java/com/romix/scala/Some.java     |   38 -
 .../scala/collection/concurrent/BasicNode.java  |   32 -
 .../scala/collection/concurrent/CNodeBase.java  |   49 -
 .../romix/scala/collection/concurrent/Gen.java  |   29 -
 .../scala/collection/concurrent/INodeBase.java  |   47 -
 .../scala/collection/concurrent/ListMap.java    |  247 ---
 .../scala/collection/concurrent/MainNode.java   |   51 -
 .../romix/scala/collection/concurrent/Pair.java |   54 -
 .../scala/collection/concurrent/TrieMap.java    | 1826 ------------------
 .../src/main/java/org/apache/ignite/Ignite.java |   17 -
 .../org/apache/ignite/IgniteDataStreamer.java   |   37 +-
 .../java/org/apache/ignite/IgniteStreamer.java  |  154 --
 .../main/java/org/apache/ignite/Ignition.java   |    2 +-
 .../cache/IgniteCacheEntryEventFilter.java      |   28 +
 .../CacheIgfsPerBlockLruEvictionPolicy.java     |    3 +-
 .../ignite/cache/query/ContinuousQuery.java     |    7 +-
 .../cache/store/jdbc/CacheJdbcBlobStore.java    |    5 +-
 .../org/apache/ignite/cluster/ClusterGroup.java |    9 -
 .../configuration/CacheConfiguration.java       |    2 +-
 .../configuration/IgniteConfiguration.java      |   27 +-
 .../ignite/events/CacheQueryExecutedEvent.java  |    7 +-
 .../ignite/events/CacheQueryReadEvent.java      |   10 +-
 .../ignite/internal/GridKernalContext.java      |    8 -
 .../ignite/internal/GridKernalContextImpl.java  |   12 -
 .../apache/ignite/internal/IgniteKernal.java    |   28 +-
 .../org/apache/ignite/internal/IgnitionEx.java  |   16 +-
 .../internal/cluster/ClusterGroupAdapter.java   |   40 -
 .../cluster/IgniteClusterAsyncImpl.java         |    5 -
 .../communication/GridIoMessageFactory.java     |   16 -
 .../deployment/GridDeploymentLocalStore.java    |    5 +-
 .../GridDeploymentPerLoaderStore.java           |    6 +-
 .../GridDeploymentPerVersionStore.java          |    6 +-
 .../discovery/GridDiscoveryManager.java         |    7 +-
 .../processors/cache/GridCacheAdapter.java      |    6 +-
 .../cache/GridCacheAffinityManager.java         |   52 +-
 .../cache/GridCacheConcurrentMap.java           |    9 +-
 .../processors/cache/GridCacheContext.java      |   13 +-
 .../cache/GridCacheEvictionManager.java         |    2 +-
 .../processors/cache/GridCacheMapEntry.java     |   23 +-
 .../GridCachePartitionExchangeManager.java      |    2 +-
 .../processors/cache/GridCacheProcessor.java    |   26 +-
 .../processors/cache/GridCacheUtils.java        |    6 +-
 .../processors/cache/GridPartitionLockKey.java  |  104 -
 .../processors/cache/IgniteCacheProxy.java      |    2 +-
 .../CacheDataStructuresManager.java             |    2 +-
 .../distributed/dht/GridDhtLocalPartition.java  |    3 +-
 .../preloader/GridDhtPartitionSupplyPool.java   |    2 +-
 .../CacheContinuousQueryFilterEx.java           |    4 +-
 .../continuous/CacheContinuousQueryHandler.java |   12 +-
 .../continuous/CacheContinuousQueryManager.java |   19 +-
 .../processors/clock/GridClockServer.java       |    2 +-
 .../clock/GridClockSyncProcessor.java           |    2 +-
 .../datastreamer/DataStreamerImpl.java          |   17 +-
 .../processors/igfs/IgfsLocalMetrics.java       |   28 +-
 .../internal/processors/igfs/IgfsServer.java    |    4 +-
 .../processors/igfs/IgfsServerManager.java      |    4 +-
 .../processors/job/GridJobProcessor.java        |   11 +-
 .../processors/rest/GridRestProcessor.java      |    2 +-
 .../streamer/GridStreamProcessor.java           |  347 ----
 .../streamer/GridStreamerAttributes.java        |  127 --
 .../streamer/GridStreamerCancelRequest.java     |  110 --
 .../streamer/GridStreamerContextDelegate.java   |  102 -
 .../streamer/GridStreamerContextImpl.java       |  201 --
 .../streamer/GridStreamerExecutionBatch.java    |  175 --
 .../streamer/GridStreamerExecutionRequest.java  |  293 ---
 .../streamer/GridStreamerResponse.java          |  144 --
 .../GridStreamerRouteFailedException.java       |   36 -
 .../GridStreamerStageExecutionFuture.java       |  340 ----
 .../streamer/GridStreamerWindowIterator.java    |   40 -
 .../processors/streamer/IgniteStreamerEx.java   |   94 -
 .../processors/streamer/IgniteStreamerImpl.java | 1375 -------------
 .../streamer/StreamerMBeanAdapter.java          |  116 --
 .../streamer/StreamerMetricsAdapter.java        |  272 ---
 .../streamer/StreamerMetricsHolder.java         |  424 ----
 .../streamer/StreamerStageMBeanAdapter.java     |  101 -
 .../streamer/StreamerStageMetricsAdapter.java   |  135 --
 .../streamer/StreamerStageMetricsHolder.java    |  167 --
 .../streamer/StreamerStageWrapper.java          |   90 -
 .../streamer/StreamerWindowMetricsAdapter.java  |   65 -
 .../streamer/StreamerWindowMetricsHolder.java   |   50 -
 .../processors/streamer/package-info.java       |   22 -
 .../task/GridStreamerBroadcastTask.java         |  137 --
 .../streamer/task/GridStreamerQueryTask.java    |  140 --
 .../streamer/task/GridStreamerReduceTask.java   |  144 --
 .../processors/task/GridTaskProcessor.java      |    2 +-
 .../timeout/GridTimeoutProcessor.java           |    2 +-
 .../ignite/internal/util/IgniteUtils.java       |   23 -
 .../util/offheap/unsafe/GridUnsafeMap.java      |    6 +-
 .../unsafe/GridUnsafePartitionedMap.java        |    2 +-
 .../ignite/internal/util/worker/GridWorker.java |   14 +-
 .../visor/node/VisorGridConfiguration.java      |   12 -
 .../visor/node/VisorNodeDataCollectorJob.java   |   37 +-
 .../node/VisorNodeDataCollectorJobResult.java   |   28 -
 .../visor/node/VisorNodeDataCollectorTask.java  |    6 -
 .../node/VisorNodeDataCollectorTaskResult.java  |   43 +-
 .../internal/visor/streamer/VisorStreamer.java  |  104 -
 .../streamer/VisorStreamerConfiguration.java    |  177 --
 .../visor/streamer/VisorStreamerMetrics.java    |  350 ----
 .../streamer/VisorStreamerMetricsResetTask.java |   75 -
 .../visor/streamer/VisorStreamerResetTask.java  |   75 -
 .../streamer/VisorStreamerStageMetrics.java     |  277 ---
 .../optimized/OptimizedClassDescriptor.java     |  288 ++-
 .../optimized/OptimizedMarshaller.java          |   30 +-
 .../optimized/OptimizedMarshallerUtils.java     |   50 +-
 .../optimized/OptimizedObjectInputStream.java   |  111 +-
 .../optimized/OptimizedObjectOutputStream.java  |   84 +-
 .../communication/tcp/TcpCommunicationSpi.java  |    9 +-
 .../ignite/streamer/StreamerConfiguration.java  |  249 ---
 .../apache/ignite/streamer/StreamerContext.java |  142 --
 .../ignite/streamer/StreamerEventRouter.java    |   55 -
 .../streamer/StreamerEventRouterAdapter.java    |   60 -
 .../streamer/StreamerFailureListener.java       |   44 -
 .../apache/ignite/streamer/StreamerMBean.java   |  169 --
 .../apache/ignite/streamer/StreamerMetrics.java |  209 --
 .../apache/ignite/streamer/StreamerStage.java   |   61 -
 .../ignite/streamer/StreamerStageMBean.java     |  114 --
 .../ignite/streamer/StreamerStageMetrics.java   |   93 -
 .../apache/ignite/streamer/StreamerWindow.java  |  206 --
 .../ignite/streamer/StreamerWindowMBean.java    |   58 -
 .../ignite/streamer/StreamerWindowMetrics.java  |   44 -
 .../ignite/streamer/index/StreamerIndex.java    |  305 ---
 .../streamer/index/StreamerIndexEntry.java      |   57 -
 .../streamer/index/StreamerIndexPolicy.java     |   50 -
 .../streamer/index/StreamerIndexProvider.java   |  107 -
 .../index/StreamerIndexProviderAdapter.java     |  796 --------
 .../index/StreamerIndexProviderMBean.java       |   74 -
 .../streamer/index/StreamerIndexUpdateSync.java |   77 -
 .../streamer/index/StreamerIndexUpdater.java    |   88 -
 .../index/hash/StreamerHashIndexProvider.java   |  500 -----
 .../streamer/index/hash/package-info.java       |   21 -
 .../ignite/streamer/index/package-info.java     |   21 -
 .../index/tree/StreamerTreeIndexProvider.java   |  956 ---------
 .../streamer/index/tree/package-info.java       |   21 -
 .../apache/ignite/streamer/package-info.java    |   21 -
 .../router/StreamerAffinityEventRouter.java     |  150 --
 .../StreamerCacheAffinityEventRouter.java       |   70 -
 .../router/StreamerLocalEventRouter.java        |   46 -
 .../router/StreamerRandomEventRouter.java       |   89 -
 .../router/StreamerRoundRobinEventRouter.java   |   53 -
 .../ignite/streamer/router/package-info.java    |   21 -
 .../window/StreamerBoundedSizeBatchWindow.java  |  804 --------
 .../window/StreamerBoundedSizeSortedWindow.java |  218 ---
 .../window/StreamerBoundedSizeWindow.java       |  144 --
 .../StreamerBoundedSizeWindowAdapter.java       |  357 ----
 .../window/StreamerBoundedTimeBatchWindow.java  |  906 ---------
 .../window/StreamerBoundedTimeWindow.java       |  462 -----
 .../window/StreamerUnboundedWindow.java         |  111 --
 .../streamer/window/StreamerWindowAdapter.java  |  537 -----
 .../ignite/streamer/window/package-info.java    |   21 -
 .../org/jdk8/backport/ConcurrentHashMap8.java   |   20 +-
 .../jdk8/backport/ConcurrentLinkedDeque8.java   |    2 +-
 .../jdk8/backport/ConcurrentLinkedHashMap.java  |    4 +-
 .../main/java/org/jdk8/backport/LongAdder.java  |  235 ---
 .../main/java/org/jdk8/backport/LongAdder8.java |  235 +++
 .../main/java/org/jdk8/backport/Striped64.java  |  370 ----
 .../java/org/jdk8/backport/Striped64_8.java     |  370 ++++
 .../java/org/pcollections/AmortizedPQueue.java  |  156 --
 .../main/java/org/pcollections/ConsPStack.java  |  225 ---
 .../src/main/java/org/pcollections/Empty.java   |   47 -
 .../main/java/org/pcollections/HashPMap.java    |  175 --
 .../java/org/pcollections/HashTreePBag.java     |   47 -
 .../java/org/pcollections/HashTreePMap.java     |   52 -
 .../java/org/pcollections/HashTreePSet.java     |   46 -
 .../src/main/java/org/pcollections/IntTree.java |  320 ---
 .../main/java/org/pcollections/IntTreePMap.java |  165 --
 .../src/main/java/org/pcollections/MapPBag.java |  143 --
 .../src/main/java/org/pcollections/MapPSet.java |  101 -
 .../main/java/org/pcollections/OrderedPSet.java |   85 -
 .../src/main/java/org/pcollections/PBag.java    |   23 -
 .../main/java/org/pcollections/PCollection.java |   56 -
 .../src/main/java/org/pcollections/PMap.java    |   49 -
 .../main/java/org/pcollections/POrderedSet.java |   25 -
 .../src/main/java/org/pcollections/PQueue.java  |   38 -
 .../main/java/org/pcollections/PSequence.java   |   73 -
 .../src/main/java/org/pcollections/PSet.java    |   23 -
 .../src/main/java/org/pcollections/PStack.java  |   51 -
 .../src/main/java/org/pcollections/PVector.java |   45 -
 .../org/pcollections/SimpleImmutableEntry.java  |  146 --
 .../main/java/org/pcollections/TreePVector.java |  155 --
 .../resources/META-INF/classnames.properties    |    6 +-
 .../core/src/main/resources/ignite.properties   |    2 +-
 modules/core/src/test/config/example-cache.xml  |    1 -
 .../core/src/test/config/examples.properties    |   14 +-
 .../test/config/websession/example-cache.xml    |    2 +-
 ...CacheJdbcBlobStoreMultithreadedSelfTest.java |    4 +-
 .../internal/ClusterNodeMetricsSelfTest.java    |   31 +-
 ...idCacheConfigurationConsistencySelfTest.java |    2 +-
 .../IgniteCacheEntryListenerAbstractTest.java   |   13 +-
 .../cache/IgniteDynamicCacheStartSelfTest.java  |    8 +-
 ...titionedAtomicSequenceMultiThreadedTest.java |   48 +-
 .../IgniteCacheExpiryPolicyAbstractTest.java    |   79 +-
 ...eCacheExpiryPolicyWithStoreAbstractTest.java |   40 +-
 ...ridCacheContinuousQueryAbstractSelfTest.java |   33 +-
 .../DataStreamProcessorSelfTest.java            |    2 +-
 .../IgniteDataStreamerPerformanceTest.java      |    2 +-
 .../processors/igfs/IgfsCacheSelfTest.java      |   15 +-
 .../processors/service/DummyService.java        |    4 +
 .../streamer/GridStreamerEvictionSelfTest.java  |  163 --
 .../streamer/GridStreamerFailoverSelfTest.java  |  267 ---
 .../GridStreamerLifecycleAwareSelfTest.java     |  212 --
 .../streamer/GridStreamerSelfTest.java          |  796 --------
 .../processors/streamer/GridTestStage.java      |   52 -
 .../streamer/GridTestStreamerEventRouter.java   |   49 -
 .../ignite/internal/processors/streamer/SC.java |   31 -
 .../future/GridFutureListenPerformanceTest.java |    2 +-
 .../unsafe/GridUnsafeMemorySelfTest.java        |    9 +-
 .../ignite/jvmtest/BlockingQueueTest.java       |    2 +-
 .../lang/GridFutureListenPerformanceTest.java   |    2 +-
 .../GridImmutableCollectionsPerfomanceTest.java |  120 --
 .../lang/GridMetadataAwareAdapterSelfTest.java  |   14 +-
 .../GridCircularBufferPerformanceTest.java      |    9 +-
 .../ignite/lang/utils/GridPCollectionsTest.java |   54 -
 .../ignite/lang/utils/GridTrieMapSelfTest.java  |  242 ---
 .../colocation/GridTestCacheStore.java          |    3 +-
 .../communication/GridIoManagerBenchmark.java   |    2 +-
 .../communication/GridIoManagerBenchmark0.java  |    7 +-
 .../GridTcpCommunicationBenchmark.java          |    6 +-
 .../GridContinuousOperationsLoadTest.java       |    3 +-
 ...dBoundedConcurrentLinkedHashSetLoadTest.java |    4 +-
 .../job/GridJobExecutionLoadTestClient.java     |    2 +-
 ...GridJobExecutionLoadTestClientSemaphore.java |    2 +-
 ...JobExecutionSingleNodeSemaphoreLoadTest.java |    4 +-
 .../ignite/loadtests/streamer/EventClosure.java |   60 -
 .../streamer/GridStreamerBenchmark.java         |  140 --
 .../streamer/GridStreamerIndexLoadTest.java     |  179 --
 .../loadtests/streamer/GridStreamerLoad.java    |   62 -
 .../ignite/loadtests/streamer/IndexUpdater.java |   46 -
 .../ignite/loadtests/streamer/QueryClosure.java |  107 -
 .../loadtests/streamer/average/TestAverage.java |   70 -
 .../loadtests/streamer/average/TestStage.java   |   63 -
 .../marshaller/GridMarshallerAbstractTest.java  |   56 -
 ...arshallerSerialPersistentFieldsSelfTest.java |  110 ++
 .../optimized/OptimizedMarshallerTest.java      |    4 +-
 .../OptimizedObjectStreamSelfTest.java          |   22 +-
 .../index/GridStreamerIndexSelfTest.java        |  686 -------
 .../window/GridStreamerWindowSelfTest.java      |  911 ---------
 .../testframework/junits/GridAbstractTest.java  |    2 +-
 .../ignite/testframework/junits/IgniteMock.java |   10 -
 .../junits/common/GridAbstractExamplesTest.java |    2 +-
 .../ignite/testsuites/IgniteBasicTestSuite.java |    3 -
 .../ignite/testsuites/IgniteCacheTestSuite.java |    2 +
 .../IgniteMarshallerSelfTestSuite.java          |    1 +
 .../testsuites/IgniteStreamerSelfTestSuite.java |   46 -
 modules/core/src/test/webapp/WEB-INF/web.xml    |    4 +-
 .../HadoopExternalCommunication.java            |    4 +-
 .../hadoop/v1/HadoopV1ReduceTask.java           |    5 +-
 .../hadoop/v2/HadoopV2ReduceTask.java           |    5 +-
 .../taskexecutor/HadoopExecutorServiceTest.java |    5 +-
 .../query/h2/opt/GridLuceneIndex.java           |    8 +-
 .../query/h2/sql/GridSqlQueryParser.java        |    4 +-
 .../cache/GridCacheOffHeapAndSwapSelfTest.java  |   66 +-
 .../cache/GridCacheQuerySimpleBenchmark.java    |    5 +-
 .../processors/cache/GridCacheSwapSelfTest.java |    2 +-
 .../test/resources/spring-ping-pong-partner.xml |    2 +-
 modules/schema-import/pom.xml                   |   26 +-
 .../ignite/schema/generator/CodeGenerator.java  |  581 ++++++
 .../ignite/schema/generator/PojoGenerator.java  |  414 ----
 .../schema/generator/SnippetGenerator.java      |  144 --
 .../org/apache/ignite/schema/ui/Controls.java   |   42 +-
 .../ignite/schema/ui/SchemaImportApp.java       |  151 +-
 .../test/generator/CodeGeneratorTest.java       |   70 +
 .../test/generator/PojoGeneratorTest.java       |   70 -
 .../testsuites/IgniteSchemaImportTestSuite.java |    2 +-
 .../org/apache/ignite/IgniteSpringBean.java     |   14 -
 .../ignite/cache/spring/SpringCacheManager.java |    2 +-
 .../ignite/visor/commands/VisorConsole.scala    |    6 +-
 .../commands/cache/VisorCacheCommand.scala      |    4 +-
 .../visor/commands/logo_ignite_128x128.png      |  Bin 18667 -> 0 bytes
 .../ignite/visor/commands/logo_ignite_48x48.png |  Bin 16572 -> 0 bytes
 .../cache/websession/IgniteWebSession.java      |  286 ---
 .../websession/IgniteWebSessionFilter.java      |  466 -----
 .../websession/IgniteWebSessionListener.java    |  196 --
 .../ignite/cache/websession/WebSession.java     |  286 +++
 .../cache/websession/WebSessionFilter.java      |  467 +++++
 .../cache/websession/WebSessionListener.java    |  196 ++
 .../IgniteServletContextListenerStartup.java    |  181 --
 .../startup/servlet/IgniteServletStartup.java   |  187 --
 .../servlet/ServletContextListenerStartup.java  |  181 ++
 .../ignite/startup/servlet/ServletStartup.java  |  187 ++
 pom.xml                                         |   34 +-
 376 files changed, 4458 insertions(+), 29730 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9a606d57/examples/src/main/java8/org/apache/ignite/examples/java8/streaming/numbers/QueryPopularNumbers.java
----------------------------------------------------------------------
diff --cc examples/src/main/java8/org/apache/ignite/examples/java8/streaming/numbers/QueryPopularNumbers.java
index c86eb37,964b10f..173e153
--- a/examples/src/main/java8/org/apache/ignite/examples/java8/streaming/numbers/QueryPopularNumbers.java
+++ b/examples/src/main/java8/org/apache/ignite/examples/java8/streaming/numbers/QueryPopularNumbers.java
@@@ -43,25 -43,26 +43,25 @@@ public class QueryPopularNumbers 
          // Mark this cluster member as client.
          Ignition.setClientMode(true);
  
-         try (Ignite ignite = Ignition.start("examples/config/example-compute.xml")) {
-             if (!ExamplesUtils.hasServerNodes(ignite))
-                 return;
- 
+         try (Ignite ignite = Ignition.start("examples/config/example-ignite.xml")) {
 -            // Start new cache or get existing one.
              // The cache is configured with sliding window holding 1 second of the streaming
data.
-             IgniteCache<Integer, Long> stmCache = ignite.getOrCreateCache(CacheConfig.configure());
+             try (IgniteCache<Integer, Long> stmCache = ignite.getOrCreateCache(CacheConfig.configure()))
{
+                 if (!ExamplesUtils.hasServerNodes(ignite))
+                     return;
  
-             // Query top 10 popular numbers every 5 seconds.
-             while (true) {
-                 // Select top 10 words.
-                 SqlFieldsQuery top10 = new SqlFieldsQuery(
-                     "select _key, _val from Long order by _val desc limit 10");
+                 // Query top 10 popular numbers every 5 seconds.
+                 while (true) {
+                     // Select top 10 words.
+                     SqlFieldsQuery top10 = new SqlFieldsQuery(
+                         "select _key, _val from Long order by _val desc limit 10");
  
-                 // Execute query.
-                 List<List<?>> results = stmCache.queryFields(top10).getAll();
+                     // Execute query.
+                     List<List<?>> results = stmCache.queryFields(top10).getAll();
  
-                 ExamplesUtils.printQueryResults(results);
+                     ExamplesUtils.printQueryResults(results);
  
-                 Thread.sleep(5000);
+                     Thread.sleep(5000);
+                 }
              }
          }
      }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9a606d57/examples/src/main/java8/org/apache/ignite/examples/java8/streaming/numbers/StreamRandomNumbers.java
----------------------------------------------------------------------
diff --cc examples/src/main/java8/org/apache/ignite/examples/java8/streaming/numbers/StreamRandomNumbers.java
index eae5272,15a070e..cfa006d
--- a/examples/src/main/java8/org/apache/ignite/examples/java8/streaming/numbers/StreamRandomNumbers.java
+++ b/examples/src/main/java8/org/apache/ignite/examples/java8/streaming/numbers/StreamRandomNumbers.java
@@@ -49,29 -49,30 +49,29 @@@ public class StreamRandomNumbers 
          // Mark this cluster member as client.
          Ignition.setClientMode(true);
  
-         try (Ignite ignite = Ignition.start("examples/config/example-compute.xml")) {
-             if (!ExamplesUtils.hasServerNodes(ignite))
-                 return;
- 
+         try (Ignite ignite = Ignition.start("examples/config/example-ignite.xml")) {
 -            // Create new cache or get existing one.
              // The cache is configured with sliding window holding 1 second of the streaming
data.
-             IgniteCache<Integer, Long> stmCache = ignite.getOrCreateCache(CacheConfig.configure());
+             try (IgniteCache<Integer, Long> stmCache = ignite.getOrCreateCache(CacheConfig.configure()))
{
+                 if (!ExamplesUtils.hasServerNodes(ignite))
+                     return;
  
-             try (IgniteDataStreamer<Integer, Long> stmr = ignite.dataStreamer(stmCache.getName()))
{
-                 // Allow data updates.
-                 stmr.allowOverwrite(true);
+                 try (IgniteDataStreamer<Integer, Long> stmr = ignite.dataStreamer(stmCache.getName()))
{
+                     // Allow data updates.
+                     stmr.allowOverwrite(true);
  
-                 // Configure data transformation to count instances of the same word.
-                 stmr.receiver(new StreamTransformer<>((e, arg) -> {
-                     Long val = e.getValue();
+                     // Configure data transformation to count instances of the same word.
+                     stmr.receiver(new StreamTransformer<>((e, arg) -> {
+                         Long val = e.getValue();
  
-                     e.setValue(val == null ? 1L : val + 1);
+                         e.setValue(val == null ? 1L : val + 1);
  
-                     return null;
-                 }));
+                         return null;
+                     }));
  
-                 // Stream random numbers into the streamer cache.
-                 while (true)
-                     stmr.addData(RAND.nextInt(RANGE), 1L);
+                     // Stream random numbers into the streamer cache.
+                     while (true)
+                         stmr.addData(RAND.nextInt(RANGE), 1L);
+                 }
              }
          }
      }


Mime
View raw message