ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [11/18] incubator-ignite git commit: Merge branch 'ignite-240' into sprint-1
Date Fri, 13 Feb 2015 13:48:58 GMT
Merge branch 'ignite-240' into sprint-1

Conflicts:
	modules/log4j/src/main/java/org/apache/ignite/logger/log4j/Log4JLogger.java


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/f0bd8864
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f0bd8864
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f0bd8864

Branch: refs/heads/ignite-hadoop-tests
Commit: f0bd8864f4c9d926e164ae489e112adf69ddafc4
Parents: 56b4afd f6f6419
Author: anovikov <anovikov@gridgain.com>
Authored: Fri Feb 13 18:19:25 2015 +0700
Committer: anovikov <anovikov@gridgain.com>
Committed: Fri Feb 13 18:20:12 2015 +0700

----------------------------------------------------------------------
 config/ignite-log4j.xml                         |   2 +-
 .../configuration/IgniteConfiguration.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 +----
 19 files changed, 452 insertions(+), 467 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f0bd8864/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/Log4JLogger.java
----------------------------------------------------------------------
diff --cc modules/log4j/src/main/java/org/apache/ignite/logger/log4j/Log4JLogger.java
index e102974,611884f..e9fde2c
--- a/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/Log4JLogger.java
+++ b/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/Log4JLogger.java
@@@ -64,7 -64,10 +64,7 @@@ import static org.apache.ignite.IgniteS
   * logger in your task/job code. See {@link org.apache.ignite.resources.LoggerResource}
annotation about logger
   * injection.
   */
- public class Log4JLogger implements IgniteLogger, LoggerNodeIdAware, IgniteLog4jFileAware
{
+ public class Log4JLogger implements IgniteLogger, LoggerNodeIdAware, Log4jFileAware {
 -    /** */
 -    private static final long serialVersionUID = 0L;
 -
      /** Appenders. */
      private static Collection<FileAppender> fileAppenders = new GridConcurrentHashSet<>();
  

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f0bd8864/pom.xml
----------------------------------------------------------------------


Mime
View raw message