You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ag...@apache.org on 2016/07/04 03:46:45 UTC
[06/14] ignite git commit: Merge remote-tracking branch
'upstream/master' into IGNITE-3227
Merge remote-tracking branch 'upstream/master' into IGNITE-3227
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/787479c2
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/787479c2
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/787479c2
Branch: refs/heads/ignite-3227
Commit: 787479c280edea5db3b2fa0eb821e3b6d0e104f1
Parents: 96a2ce9 6cfd991
Author: samaitra <sa...@gmail.com>
Authored: Fri Jun 24 19:35:06 2016 +0530
Committer: samaitra <sa...@gmail.com>
Committed: Fri Jun 24 19:35:06 2016 +0530
----------------------------------------------------------------------
modules/clients/pom.xml | 8 -
.../client/ClientDefaultCacheSelfTest.java | 119 +-
.../ignite/internal/client/ClientHttpTask.java | 33 +-
.../ignite/internal/client/ClientTcpTask.java | 10 +-
.../integration/ClientAbstractSelfTest.java | 92 +-
.../JettyRestProcessorAbstractSelfTest.java | 1018 ++++++++----------
.../internal/processors/rest/SimplePerson.java | 74 ++
modules/core/pom.xml | 15 +-
.../configuration/HadoopConfiguration.java | 35 +
.../apache/ignite/internal/LessNamingBean.java | 28 +
.../cache/query/GridCacheSqlIndexMetadata.java | 3 +-
.../cache/query/GridCacheSqlMetadata.java | 3 +-
.../processors/hadoop/HadoopJobInfo.java | 3 +-
.../platform/PlatformProcessorImpl.java | 35 +-
.../callback/PlatformCallbackGateway.java | 3 +-
.../dotnet/PlatformDotNetCacheStore.java | 27 +-
.../internal/util/IgniteExceptionRegistry.java | 5 +-
.../ignite/internal/util/IgniteUtils.java | 45 +-
.../ignite/internal/visor/cache/VisorCache.java | 4 +-
.../cache/VisorCacheAffinityConfiguration.java | 5 +-
.../cache/VisorCacheAggregatedMetrics.java | 3 +-
.../visor/cache/VisorCacheConfiguration.java | 3 +-
.../cache/VisorCacheDefaultConfiguration.java | 5 +-
.../cache/VisorCacheEvictionConfiguration.java | 5 +-
.../internal/visor/cache/VisorCacheMetrics.java | 3 +-
.../cache/VisorCacheNearConfiguration.java | 5 +-
.../visor/cache/VisorCachePartition.java | 3 +-
.../visor/cache/VisorCachePartitions.java | 3 +-
.../cache/VisorCacheQueryConfiguration.java | 3 +-
.../visor/cache/VisorCacheQueryMetrics.java | 5 +-
.../cache/VisorCacheRebalanceConfiguration.java | 5 +-
.../cache/VisorCacheStoreConfiguration.java | 3 +-
.../cache/VisorCacheTypeFieldMetadata.java | 3 +-
.../visor/cache/VisorCacheTypeMetadata.java | 3 +-
.../internal/visor/cache/VisorCacheV4.java | 124 +++
.../internal/visor/debug/VisorThreadInfo.java | 5 +-
.../visor/debug/VisorThreadLockInfo.java | 5 +-
.../internal/visor/event/VisorGridEvent.java | 5 +-
.../internal/visor/file/VisorFileBlock.java | 5 +-
.../ignite/internal/visor/igfs/VisorIgfs.java | 5 +-
.../internal/visor/igfs/VisorIgfsEndpoint.java | 5 +-
.../internal/visor/igfs/VisorIgfsMetrics.java | 5 +-
.../visor/igfs/VisorIgfsProfilerEntry.java | 5 +-
.../VisorIgfsProfilerUniformityCounters.java | 5 +-
.../visor/log/VisorLogSearchResult.java | 5 +-
.../visor/node/VisorAtomicConfiguration.java | 5 +-
.../visor/node/VisorBasicConfiguration.java | 5 +-
.../node/VisorExecutorServiceConfiguration.java | 5 +-
.../visor/node/VisorGridConfiguration.java | 5 +-
.../visor/node/VisorIgfsConfiguration.java | 3 +-
.../visor/node/VisorLifecycleConfiguration.java | 5 +-
.../visor/node/VisorMetricsConfiguration.java | 5 +-
.../visor/node/VisorNodeDataCollectorJob.java | 26 +-
.../node/VisorNodeDataCollectorTaskResult.java | 5 +-
.../node/VisorPeerToPeerConfiguration.java | 5 +-
.../visor/node/VisorRestConfiguration.java | 5 +-
.../node/VisorSegmentationConfiguration.java | 5 +-
.../visor/node/VisorSpisConfiguration.java | 5 +-
.../node/VisorTransactionConfiguration.java | 5 +-
.../internal/visor/query/VisorQueryField.java | 5 +-
.../internal/visor/query/VisorQueryResult.java | 5 +-
.../plugin/security/SecurityPermissionSet.java | 5 +-
.../ignite/plugin/security/SecuritySubject.java | 5 +-
.../apache/ignite/resources/SpringResource.java | 15 +-
.../ignite/spi/discovery/tcp/ServerImpl.java | 7 +-
.../spi/discovery/tcp/TcpDiscoveryImpl.java | 3 +-
.../ignite/internal/GridGetOrStartSelfTest.java | 70 ++
.../cluster/GridAddressResolverSelfTest.java | 97 ++
.../vm/TcpDiscoveryVmIpFinderSelfTest.java | 75 ++
.../testsuites/IgniteKernalSelfTestSuite.java | 2 +
.../processors/hadoop/HadoopClassLoader.java | 26 +-
.../processors/hadoop/HadoopDefaultJobInfo.java | 8 +-
.../hadoop/jobtracker/HadoopJobTracker.java | 14 +-
.../child/HadoopChildProcessRunner.java | 2 +-
.../processors/hadoop/v2/HadoopV2Job.java | 14 +-
.../hadoop/HadoopClassLoaderTest.java | 2 +-
.../processors/hadoop/HadoopSnappyTest.java | 2 +-
.../processors/hadoop/HadoopTasksV1Test.java | 2 +-
.../processors/hadoop/HadoopTasksV2Test.java | 2 +-
.../processors/hadoop/HadoopV2JobSelfTest.java | 2 +-
.../collections/HadoopAbstractMapTest.java | 6 +-
.../query/h2/twostep/GridMapQueryExecutor.java | 2 +-
.../IgniteCacheQueryNoRebalanceSelfTest.java | 82 ++
.../IgniteCacheQuerySelfTestSuite.java | 2 +
.../Binary/BinarySelfTest.cs | 138 ++-
.../Cache/Store/CacheStoreTest.cs | 11 +-
.../Apache.Ignite.Core.Tests/LifecycleTest.cs | 9 +
.../Apache.Ignite.Core.Tests/ReconnectTest.cs | 9 +
.../Apache.Ignite.Core.Tests/TestUtils.cs | 4 +-
.../Apache.Ignite.Core.csproj | 1 +
.../dotnet/Apache.Ignite.Core/IIgnite.cs | 25 +
.../dotnet/Apache.Ignite.Core/Ignition.cs | 23 +-
.../Impl/Binary/BinaryReflectiveActions.cs | 10 +-
.../dotnet/Apache.Ignite.Core/Impl/Ignite.cs | 38 +-
.../Apache.Ignite.Core/Impl/IgniteProxy.cs | 37 +-
.../Impl/LifecycleBeanHolder.cs | 2 +-
.../Lifecycle/ClientReconnectEventArgs.cs | 47 +
modules/rest-http/pom.xml | 25 +-
.../http/jetty/GridJettyJsonConfig.java | 317 ------
.../http/jetty/GridJettyObjectMapper.java | 274 +++++
.../http/jetty/GridJettyRestHandler.java | 127 +--
.../GridResourceSpringBeanInjector.java | 39 +-
.../GridSpringResourceInjectionSelfTest.java | 311 +++++-
.../spring-resource-with-duplicate-beans.xml | 30 +
.../processors/resource/spring-resource.xml | 2 +-
parent/pom.xml | 1 +
106 files changed, 2464 insertions(+), 1351 deletions(-)
----------------------------------------------------------------------