Merge branch 'ignite-sprint-4' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-776
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/382ca010 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/382ca010 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/382ca010 Branch: refs/heads/ignite-157-2 Commit: 382ca010264449212cd71b1c77cc7a78a473b757 Parents: 5330a51 acc731c Author: Andrey <anovi...@gridgain.com> Authored: Wed Apr 29 09:28:27 2015 +0700 Committer: Andrey <anovi...@gridgain.com> Committed: Wed Apr 29 09:29:40 2015 +0700 ---------------------------------------------------------------------- RELEASE_NOTES.txt | 13 + .../spi/checkpoint/s3/S3CheckpointSpi.java | 2 +- .../clients/src/test/resources/spring-cache.xml | 4 +- .../src/test/resources/spring-server-node.xml | 4 +- .../test/resources/spring-server-ssl-node.xml | 4 +- .../java/org/apache/ignite/IgniteLogger.java | 8 +- .../java/org/apache/ignite/IgniteServices.java | 2 +- .../main/java/org/apache/ignite/Ignition.java | 46 +- .../eviction/sorted/SortedEvictionPolicy.java | 2 +- .../configuration/ConnectorConfiguration.java | 2 +- .../configuration/IgniteConfiguration.java | 2 +- .../ignite/internal/GridJobContextImpl.java | 7 +- .../ignite/internal/GridUpdateNotifier.java | 2 +- .../org/apache/ignite/internal/IgnitionEx.java | 167 +++++- .../internal/cluster/ClusterGroupAdapter.java | 16 + .../managers/communication/GridIoManager.java | 6 +- .../deployment/GridDeploymentManager.java | 2 +- .../GridDeploymentPerVersionStore.java | 3 +- .../processors/cache/GridCacheMvccManager.java | 2 +- .../cache/GridCacheSharedContext.java | 2 +- ...ridCacheOptimisticCheckPreparedTxFuture.java | 59 +- .../distributed/dht/GridDhtLockFuture.java | 18 +- .../distributed/dht/GridDhtLockRequest.java | 38 +- .../distributed/dht/GridDhtTxFinishFuture.java | 102 +++- .../cache/distributed/dht/GridDhtTxLocal.java | 6 + .../distributed/dht/GridDhtTxLocalAdapter.java | 23 + .../distributed/dht/GridDhtTxPrepareFuture.java | 10 +- .../cache/distributed/dht/GridDhtTxRemote.java | 7 + .../dht/preloader/GridDhtPreloader.java | 2 +- .../distributed/near/GridNearLockRequest.java | 54 +- .../cache/distributed/near/GridNearTxLocal.java | 6 + .../cache/transactions/IgniteInternalTx.java | 5 + .../cache/transactions/IgniteTxAdapter.java | 10 + .../cache/transactions/IgniteTxHandler.java | 57 +- .../cache/transactions/IgniteTxManager.java | 117 +++- .../ignite/internal/util/GridJavaProcess.java | 4 + .../util/spring/IgniteSpringHelper.java | 54 +- .../util/tostring/GridToStringBuilder.java | 2 +- .../ignite/internal/visor/cache/VisorCache.java | 92 ++-- .../visor/cache/VisorCacheConfiguration.java | 7 - .../visor/cache/VisorCacheNodesTask.java | 74 +++ .../cache/VisorCacheStoreConfiguration.java | 35 -- .../cache/VisorCacheTypeFieldMetadata.java | 36 +- .../visor/cache/VisorCacheTypeMetadata.java | 99 +--- .../internal/visor/igfs/VisorIgfsMetrics.java | 128 +---- .../visor/node/VisorBasicConfiguration.java | 11 + .../visor/node/VisorNodeDataCollectorJob.java | 2 +- .../node/VisorNodeEventsCollectorTask.java | 58 +- .../internal/visor/query/VisorQueryArg.java | 19 +- .../internal/visor/query/VisorQueryCursor.java | 1 - .../internal/visor/query/VisorQueryJob.java | 9 +- .../internal/visor/query/VisorQueryTask.java | 41 -- .../internal/visor/util/VisorEventMapper.java | 13 + .../internal/visor/util/VisorTaskUtils.java | 2 +- .../apache/ignite/logger/java/JavaLogger.java | 12 +- .../apache/ignite/marshaller/Marshaller.java | 14 +- .../ignite/marshaller/jdk/JdkMarshaller.java | 10 +- .../optimized/OptimizedMarshaller.java | 8 +- .../apache/ignite/resources/LoggerResource.java | 2 +- .../apache/ignite/resources/SpringResource.java | 2 +- .../org/apache/ignite/services/Service.java | 2 +- .../ignite/services/ServiceConfiguration.java | 2 +- .../checkpoint/cache/CacheCheckpointSpi.java | 2 +- .../spi/checkpoint/jdbc/JdbcCheckpointSpi.java | 2 +- .../sharedfs/SharedFsCheckpointSpi.java | 4 +- .../fifoqueue/FifoQueueCollisionSpi.java | 10 +- .../jobstealing/JobStealingCollisionSpi.java | 14 +- .../PriorityQueueCollisionSpi.java | 6 +- .../communication/tcp/TcpCommunicationSpi.java | 12 +- .../spi/discovery/tcp/TcpDiscoverySpi.java | 10 +- .../memory/MemoryEventStorageSpi.java | 10 +- .../spi/failover/always/AlwaysFailoverSpi.java | 10 +- .../jobstealing/JobStealingFailoverSpi.java | 6 +- .../spi/failover/never/NeverFailoverSpi.java | 8 +- .../apache/ignite/spi/indexing/IndexingSpi.java | 4 +- .../adaptive/AdaptiveLoadBalancingSpi.java | 12 +- .../roundrobin/RoundRobinLoadBalancingSpi.java | 10 +- .../WeightedRandomLoadBalancingSpi.java | 10 +- .../spi/swapspace/file/FileSwapSpaceSpi.java | 10 +- .../src/test/config/load/merge-sort-base.xml | 2 +- .../internal/GridDiscoveryEventSelfTest.java | 30 +- ...ProjectionForCachesOnDaemonNodeSelfTest.java | 147 +++++ .../cache/IgniteCachePutAllRestartTest.java | 203 +++++++ .../cache/IgniteCacheTxPreloadNoWriteTest.java | 29 +- ...xOriginatingNodeFailureAbstractSelfTest.java | 6 +- ...cOriginatingNodeFailureAbstractSelfTest.java | 7 +- ...itionedTxOriginatingNodeFailureSelfTest.java | 2 - .../near/IgniteCacheNearTxRollbackTest.java | 133 +++++ .../logger/java/IgniteJavaLoggerTest.java | 65 --- .../ignite/logger/java/JavaLoggerTest.java | 65 +++ .../spi/discovery/tcp/TcpDiscoverySelfTest.java | 5 +- .../junits/logger/GridTestLog4jLogger.java | 10 +- .../ignite/testsuites/IgniteBasicTestSuite.java | 2 + .../IgniteCacheFailoverTestSuite.java | 8 +- .../testsuites/IgniteCacheRestartTestSuite.java | 3 +- .../testsuites/IgniteLoggingSelfTestSuite.java | 2 +- .../processors/hadoop/HadoopProcessor.java | 2 +- .../ignite/logger/jcl/IgniteJclLogger.java | 167 ------ .../org/apache/ignite/logger/jcl/JclLogger.java | 167 ++++++ .../ignite/logger/jcl/IgniteJclLoggerTest.java | 48 -- .../apache/ignite/logger/jcl/JclLoggerTest.java | 48 ++ .../ignite/testsuites/IgniteJclTestSuite.java | 2 +- .../apache/ignite/logger/log4j/Log4JLogger.java | 8 +- .../ignite/logger/slf4j/GridSlf4jLogger.java | 138 ----- .../apache/ignite/logger/slf4j/Slf4jLogger.java | 138 +++++ .../util/spring/IgniteSpringHelperImpl.java | 217 ++++++-- .../IgniteStartFromStreamConfigurationTest.java | 50 ++ .../testsuites/IgniteSpringTestSuite.java | 2 + .../spi/deployment/uri/UriDeploymentSpi.java | 2 +- .../ignite/visor/commands/VisorConsole.scala | 314 ++++++----- .../visor/commands/VisorConsoleCommand.scala | 77 --- .../ignite/visor/commands/VisorTextTable.scala | 539 ------------------ .../visor/commands/ack/VisorAckCommand.scala | 42 +- .../commands/alert/VisorAlertCommand.scala | 35 +- .../commands/cache/VisorCacheClearCommand.scala | 51 +- .../commands/cache/VisorCacheCommand.scala | 34 +- .../commands/cache/VisorCacheScanCommand.scala | 60 +- .../commands/cache/VisorCacheStopCommand.scala | 30 +- .../commands/cache/VisorCacheSwapCommand.scala | 66 +-- .../commands/common/VisorConsoleCommand.scala | 90 +++ .../visor/commands/common/VisorTextTable.scala | 543 +++++++++++++++++++ .../config/VisorConfigurationCommand.scala | 438 +++++++-------- .../commands/deploy/VisorDeployCommand.scala | 47 +- .../commands/disco/VisorDiscoveryCommand.scala | 58 +- .../commands/events/VisorEventsCommand.scala | 338 +++++------- .../visor/commands/gc/VisorGcCommand.scala | 130 ++--- .../visor/commands/kill/VisorKillCommand.scala | 53 +- .../visor/commands/node/VisorNodeCommand.scala | 47 +- .../visor/commands/ping/VisorPingCommand.scala | 41 +- .../commands/start/VisorStartCommand.scala | 34 +- .../commands/tasks/VisorTasksCommand.scala | 76 +-- .../commands/top/VisorTopologyCommand.scala | 36 +- .../visor/commands/vvm/VisorVvmCommand.scala | 32 +- .../scala/org/apache/ignite/visor/visor.scala | 286 +++++++--- .../ignite/visor/VisorTextTableSpec.scala | 3 +- pom.xml | 5 +- 136 files changed, 3933 insertions(+), 2969 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/382ca010/modules/core/src/main/java/org/apache/ignite/internal/GridUpdateNotifier.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/GridUpdateNotifier.java index 3020313,8210025..a43d30d --- a/modules/core/src/main/java/org/apache/ignite/internal/GridUpdateNotifier.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/GridUpdateNotifier.java @@@ -110,18 -105,12 +110,18 @@@ class GridUpdateNotifier this.ver = ver; - url = "http://tiny.cc/updater/update_status_community.php";; + url = "http://tiny.cc/updater/update_status_ignite.php";; this.gridName = gridName == null ? "null" : gridName; - this.reportOnlyNew = reportOnlyNew; this.gw = gw; + pluginVers = U.newHashMap(pluginProviders.size()); + + for (PluginProvider provider : pluginProviders) + pluginVers.put(provider.name() + "-plugin-version", provider.version()); + + this.reportOnlyNew = reportOnlyNew; + vmProps = getSystemProperties(); } catch (ParserConfigurationException e) {
