Merge remote-tracking branch 'origin/sprint-1' into sprint-1
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/1651ccc4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/1651ccc4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/1651ccc4 Branch: refs/heads/ignite-226 Commit: 1651ccc49babdbbd1177af3381a277e862a439ca Parents: db6d36a f0bd886 Author: Yakov Zhdanov <yzhda...@gridgain.com> Authored: Fri Feb 13 14:23:29 2015 +0300 Committer: Yakov Zhdanov <yzhda...@gridgain.com> Committed: Fri Feb 13 14:23:29 2015 +0300 ---------------------------------------------------------------------- config/ignite-log4j.xml | 2 +- examples/pom-standalone.xml | 2 +- .../configuration/IgniteConfiguration.java | 2 +- .../processors/cache/GridCacheProcessor.java | 2 +- .../optimized/optimized-classnames.properties | 2 +- .../discovery/tcp/TcpDiscoverySpiAdapter.java | 2 +- .../IgniteLog4jDailyRollingFileAppender.java | 77 ------------- ...IgniteLog4jExternallyRolledFileAppender.java | 63 ----------- .../logger/log4j/IgniteLog4jFileAppender.java | 107 ------------------- .../logger/log4j/IgniteLog4jFileAware.java | 32 ------ .../logger/log4j/IgniteLog4jNodeIdFilePath.java | 64 ----------- .../log4j/IgniteLog4jRollingFileAppender.java | 90 ---------------- .../log4j/Log4JDailyRollingFileAppender.java | 77 +++++++++++++ .../Log4JExternallyRolledFileAppender.java | 63 +++++++++++ .../ignite/logger/log4j/Log4JFileAppender.java | 107 +++++++++++++++++++ .../apache/ignite/logger/log4j/Log4JLogger.java | 8 +- .../ignite/logger/log4j/Log4jFileAware.java | 32 ++++++ .../logger/log4j/Log4jNodeIdFilePath.java | 64 +++++++++++ .../logger/log4j/Log4jRollingFileAppender.java | 90 ++++++++++++++++ .../log4j/GridLog4jCorrectFileNameTest.java | 12 +-- pom.xml | 25 +---- 21 files changed, 454 insertions(+), 469 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1651ccc4/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1651ccc4/pom.xml ----------------------------------------------------------------------
