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-786 Commit: bc9687f4e0bd83809b908a226e0b8150abe527b2 Parents: f10a06b a7599bf Author: Yakov Zhdanov <yzhda...@gridgain.com> Authored: Wed Apr 29 11:39:12 2015 +0300 Committer: Yakov Zhdanov <yzhda...@gridgain.com> 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(-) ----------------------------------------------------------------------
