Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 8FBE117718 for ; Thu, 30 Apr 2015 09:54:12 +0000 (UTC) Received: (qmail 44052 invoked by uid 500); 30 Apr 2015 09:54:12 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 43987 invoked by uid 500); 30 Apr 2015 09:54:12 -0000 Mailing-List: contact commits-help@ignite.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.incubator.apache.org Delivered-To: mailing list commits@ignite.incubator.apache.org Received: (qmail 43967 invoked by uid 99); 30 Apr 2015 09:54:12 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 30 Apr 2015 09:54:12 +0000 X-ASF-Spam-Status: No, hits=-0.0 required=5.0 tests=SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (athena.apache.org: local policy) Received: from [54.164.171.186] (HELO mx1-us-east.apache.org) (54.164.171.186) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 30 Apr 2015 09:54:07 +0000 Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-east.apache.org (ASF Mail Server at mx1-us-east.apache.org) with SMTP id 0C0904734E for ; Thu, 30 Apr 2015 09:53:46 +0000 (UTC) Received: (qmail 39752 invoked by uid 99); 30 Apr 2015 09:52:31 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 30 Apr 2015 09:52:31 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 5A3DDE3A5B; Thu, 30 Apr 2015 09:52:31 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: yzhdanov@apache.org To: commits@ignite.incubator.apache.org Date: Thu, 30 Apr 2015 09:52:44 -0000 Message-Id: <55447dff8f5f4ce2990899c529dac587@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [14/50] incubator-ignite git commit: Merge remote-tracking branch 'origin/ignite-sprint-4' into ignite-sprint-4 X-Virus-Checked: Checked by ClamAV on apache.org Merge remote-tracking branch 'origin/ignite-sprint-4' into ignite-sprint-4 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/bc9687f4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/bc9687f4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/bc9687f4 Branch: refs/heads/ignite-752 Commit: bc9687f4e0bd83809b908a226e0b8150abe527b2 Parents: f10a06b a7599bf Author: Yakov Zhdanov Authored: Wed Apr 29 11:39:12 2015 +0300 Committer: Yakov Zhdanov Committed: Wed Apr 29 11:39:12 2015 +0300 ---------------------------------------------------------------------- .../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 | 2 +- .../configuration/ConnectorConfiguration.java | 2 +- .../configuration/IgniteConfiguration.java | 2 +- .../org/apache/ignite/internal/IgnitionEx.java | 2 +- .../managers/communication/GridIoManager.java | 6 +- .../deployment/GridDeploymentManager.java | 2 +- .../GridDeploymentPerVersionStore.java | 3 +- .../cache/GridCacheSharedContext.java | 2 +- .../dht/preloader/GridDhtPreloader.java | 2 +- .../util/tostring/GridToStringBuilder.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 +- .../distributed/GridCacheLockAbstractTest.java | 75 +++++++++ .../logger/java/IgniteJavaLoggerTest.java | 65 -------- .../ignite/logger/java/JavaLoggerTest.java | 65 ++++++++ .../junits/logger/GridTestLog4jLogger.java | 10 +- .../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 +++++++++++++++ .../spi/deployment/uri/UriDeploymentSpi.java | 2 +- 57 files changed, 628 insertions(+), 552 deletions(-) ----------------------------------------------------------------------