# gg-9470-rename
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/8e1e2812 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/8e1e2812 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/8e1e2812 Branch: refs/heads/master Commit: 8e1e281239d5758003957e48dfa86fdbbd1f9130 Parents: 0ea0d7c Author: sboikov <sboi...@gridgain.com> Authored: Thu Dec 4 21:40:10 2014 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Thu Dec 4 21:40:10 2014 +0300 ---------------------------------------------------------------------- .../ignite/logger/GridLoggerNodeIdAware.java | 31 ++++++++ .../apache/ignite/logger/GridNullLogger.java | 83 ++++++++++++++++++++ .../java/org/apache/ignite/logger/package.html | 15 ++++ .../gridgain/grid/GridBasicWarmupClosure.java | 2 +- .../org/gridgain/grid/kernal/GridGainEx.java | 2 +- .../grid/logger/GridLoggerNodeIdAware.java | 31 -------- .../gridgain/grid/logger/GridNullLogger.java | 83 -------------------- .../grid/logger/java/GridJavaLogger.java | 2 +- .../java/org/gridgain/grid/logger/package.html | 15 ---- .../grid/logger/java/GridJavaLoggerTest.java | 2 +- .../logger/GridLog4jRollingFileAppender.java | 2 +- .../junits/logger/GridTestLog4jLogger.java | 2 +- .../grid/logger/log4j/GridLog4jLogger.java | 2 +- 13 files changed, 136 insertions(+), 136 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8e1e2812/modules/core/src/main/java/org/apache/ignite/logger/GridLoggerNodeIdAware.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/logger/GridLoggerNodeIdAware.java b/modules/core/src/main/java/org/apache/ignite/logger/GridLoggerNodeIdAware.java new file mode 100644 index 0000000..7ddcd64 --- /dev/null +++ b/modules/core/src/main/java/org/apache/ignite/logger/GridLoggerNodeIdAware.java @@ -0,0 +1,31 @@ +/* @java.file.header */ + +/* _________ _____ __________________ _____ + * __ ____/___________(_)______ /__ ____/______ ____(_)_______ + * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \ + * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / / + * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/ + */ + +package org.apache.ignite.logger; + +import java.util.*; + +/** + * Interface for GridGain file appenders to attach node ID to log file names. + */ +public interface GridLoggerNodeIdAware { + /** + * Sets node ID. + * + * @param nodeId Node ID. + */ + public void setNodeId(UUID nodeId); + + /** + * Gets node ID. + * + * @return Node ID. + */ + public UUID getNodeId(); +} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8e1e2812/modules/core/src/main/java/org/apache/ignite/logger/GridNullLogger.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/logger/GridNullLogger.java b/modules/core/src/main/java/org/apache/ignite/logger/GridNullLogger.java new file mode 100644 index 0000000..dfb7e31 --- /dev/null +++ b/modules/core/src/main/java/org/apache/ignite/logger/GridNullLogger.java @@ -0,0 +1,83 @@ +/* @java.file.header */ + +/* _________ _____ __________________ _____ + * __ ____/___________(_)______ /__ ____/______ ____(_)_______ + * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \ + * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / / + * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/ + */ + +package org.apache.ignite.logger; + +import org.apache.ignite.*; +import org.jetbrains.annotations.*; + +/** + * Logger which does not output anything. + */ +public class GridNullLogger implements IgniteLogger { + /** {@inheritDoc} */ + @Override public IgniteLogger getLogger(Object ctgr) { + return this; + } + + /** {@inheritDoc} */ + @Override public void trace(String msg) { + // No-op. + } + + /** {@inheritDoc} */ + @Override public void debug(String msg) { + // No-op. + } + + /** {@inheritDoc} */ + @Override public void info(String msg) { + // No-op. + } + + /** {@inheritDoc} */ + @Override public void warning(String msg) { + // No-op. + } + + /** {@inheritDoc} */ + @Override public void warning(String msg, @Nullable Throwable e) { + // No-op. + } + + /** {@inheritDoc} */ + @Override public void error(String msg) { + // No-op. + } + + /** {@inheritDoc} */ + @Override public void error(String msg, @Nullable Throwable e) { + // No-op. + } + + /** {@inheritDoc} */ + @Override public boolean isTraceEnabled() { + return false; + } + + /** {@inheritDoc} */ + @Override public boolean isDebugEnabled() { + return false; + } + + /** {@inheritDoc} */ + @Override public boolean isInfoEnabled() { + return false; + } + + /** {@inheritDoc} */ + @Override public boolean isQuiet() { + return false; + } + + /** {@inheritDoc} */ + @Nullable @Override public String fileName() { + return null; + } +} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8e1e2812/modules/core/src/main/java/org/apache/ignite/logger/package.html ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/logger/package.html b/modules/core/src/main/java/org/apache/ignite/logger/package.html new file mode 100644 index 0000000..6d6a80f --- /dev/null +++ b/modules/core/src/main/java/org/apache/ignite/logger/package.html @@ -0,0 +1,15 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd";> +<!-- + @html.file.header + _________ _____ __________________ _____ + __ ____/___________(_)______ /__ ____/______ ____(_)_______ + _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \ + / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / / + \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/ +--> +<html> +<body> + <!-- Package description. --> + Contains logging functionality used throughout the system. +</body> +</html> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8e1e2812/modules/core/src/main/java/org/gridgain/grid/GridBasicWarmupClosure.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/GridBasicWarmupClosure.java b/modules/core/src/main/java/org/gridgain/grid/GridBasicWarmupClosure.java index f3d5eec..e89ce75 100644 --- a/modules/core/src/main/java/org/gridgain/grid/GridBasicWarmupClosure.java +++ b/modules/core/src/main/java/org/gridgain/grid/GridBasicWarmupClosure.java @@ -12,8 +12,8 @@ package org.gridgain.grid; import org.apache.ignite.*; import org.apache.ignite.configuration.*; import org.apache.ignite.lang.*; +import org.apache.ignite.logger.*; import org.gridgain.grid.cache.*; -import org.gridgain.grid.logger.*; import org.gridgain.grid.spi.discovery.tcp.*; import org.gridgain.grid.spi.discovery.tcp.ipfinder.*; import org.gridgain.grid.spi.discovery.tcp.ipfinder.vm.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8e1e2812/modules/core/src/main/java/org/gridgain/grid/kernal/GridGainEx.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/GridGainEx.java b/modules/core/src/main/java/org/gridgain/grid/kernal/GridGainEx.java index 25474bc..d16e340 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/GridGainEx.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/GridGainEx.java @@ -12,6 +12,7 @@ package org.gridgain.grid.kernal; import org.apache.ignite.*; import org.apache.ignite.configuration.*; import org.apache.ignite.lang.*; +import org.apache.ignite.logger.*; import org.apache.ignite.mbean.*; import org.gridgain.grid.*; import org.gridgain.grid.cache.*; @@ -20,7 +21,6 @@ import org.gridgain.grid.ggfs.*; import org.gridgain.grid.kernal.processors.interop.*; import org.gridgain.grid.kernal.processors.resource.*; import org.gridgain.grid.kernal.processors.spring.*; -import org.gridgain.grid.logger.*; import org.gridgain.grid.logger.java.*; import org.gridgain.grid.marshaller.*; import org.gridgain.grid.marshaller.jdk.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8e1e2812/modules/core/src/main/java/org/gridgain/grid/logger/GridLoggerNodeIdAware.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/logger/GridLoggerNodeIdAware.java b/modules/core/src/main/java/org/gridgain/grid/logger/GridLoggerNodeIdAware.java deleted file mode 100644 index 1ee14f1..0000000 --- a/modules/core/src/main/java/org/gridgain/grid/logger/GridLoggerNodeIdAware.java +++ /dev/null @@ -1,31 +0,0 @@ -/* @java.file.header */ - -/* _________ _____ __________________ _____ - * __ ____/___________(_)______ /__ ____/______ ____(_)_______ - * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \ - * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / / - * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/ - */ - -package org.gridgain.grid.logger; - -import java.util.*; - -/** - * Interface for GridGain file appenders to attach node ID to log file names. - */ -public interface GridLoggerNodeIdAware { - /** - * Sets node ID. - * - * @param nodeId Node ID. - */ - public void setNodeId(UUID nodeId); - - /** - * Gets node ID. - * - * @return Node ID. - */ - public UUID getNodeId(); -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8e1e2812/modules/core/src/main/java/org/gridgain/grid/logger/GridNullLogger.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/logger/GridNullLogger.java b/modules/core/src/main/java/org/gridgain/grid/logger/GridNullLogger.java deleted file mode 100644 index a4ee985..0000000 --- a/modules/core/src/main/java/org/gridgain/grid/logger/GridNullLogger.java +++ /dev/null @@ -1,83 +0,0 @@ -/* @java.file.header */ - -/* _________ _____ __________________ _____ - * __ ____/___________(_)______ /__ ____/______ ____(_)_______ - * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \ - * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / / - * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/ - */ - -package org.gridgain.grid.logger; - -import org.apache.ignite.*; -import org.jetbrains.annotations.*; - -/** - * Logger which does not output anything. - */ -public class GridNullLogger implements IgniteLogger { - /** {@inheritDoc} */ - @Override public IgniteLogger getLogger(Object ctgr) { - return this; - } - - /** {@inheritDoc} */ - @Override public void trace(String msg) { - // No-op. - } - - /** {@inheritDoc} */ - @Override public void debug(String msg) { - // No-op. - } - - /** {@inheritDoc} */ - @Override public void info(String msg) { - // No-op. - } - - /** {@inheritDoc} */ - @Override public void warning(String msg) { - // No-op. - } - - /** {@inheritDoc} */ - @Override public void warning(String msg, @Nullable Throwable e) { - // No-op. - } - - /** {@inheritDoc} */ - @Override public void error(String msg) { - // No-op. - } - - /** {@inheritDoc} */ - @Override public void error(String msg, @Nullable Throwable e) { - // No-op. - } - - /** {@inheritDoc} */ - @Override public boolean isTraceEnabled() { - return false; - } - - /** {@inheritDoc} */ - @Override public boolean isDebugEnabled() { - return false; - } - - /** {@inheritDoc} */ - @Override public boolean isInfoEnabled() { - return false; - } - - /** {@inheritDoc} */ - @Override public boolean isQuiet() { - return false; - } - - /** {@inheritDoc} */ - @Nullable @Override public String fileName() { - return null; - } -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8e1e2812/modules/core/src/main/java/org/gridgain/grid/logger/java/GridJavaLogger.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/logger/java/GridJavaLogger.java b/modules/core/src/main/java/org/gridgain/grid/logger/java/GridJavaLogger.java index c5da9cf..c22027e 100644 --- a/modules/core/src/main/java/org/gridgain/grid/logger/java/GridJavaLogger.java +++ b/modules/core/src/main/java/org/gridgain/grid/logger/java/GridJavaLogger.java @@ -10,8 +10,8 @@ package org.gridgain.grid.logger.java; import org.apache.ignite.*; +import org.apache.ignite.logger.*; import org.gridgain.grid.*; -import org.gridgain.grid.logger.*; import org.gridgain.grid.util.lang.*; import org.gridgain.grid.util.typedef.*; import org.gridgain.grid.util.typedef.internal.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8e1e2812/modules/core/src/main/java/org/gridgain/grid/logger/package.html ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/logger/package.html b/modules/core/src/main/java/org/gridgain/grid/logger/package.html deleted file mode 100644 index 6d6a80f..0000000 --- a/modules/core/src/main/java/org/gridgain/grid/logger/package.html +++ /dev/null @@ -1,15 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd";> -<!-- - @html.file.header - _________ _____ __________________ _____ - __ ____/___________(_)______ /__ ____/______ ____(_)_______ - _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \ - / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / / - \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/ ---> -<html> -<body> - <!-- Package description. --> - Contains logging functionality used throughout the system. -</body> -</html> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8e1e2812/modules/core/src/test/java/org/gridgain/grid/logger/java/GridJavaLoggerTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/logger/java/GridJavaLoggerTest.java b/modules/core/src/test/java/org/gridgain/grid/logger/java/GridJavaLoggerTest.java index 0977cbf..274f3f8 100644 --- a/modules/core/src/test/java/org/gridgain/grid/logger/java/GridJavaLoggerTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/logger/java/GridJavaLoggerTest.java @@ -11,7 +11,7 @@ package org.gridgain.grid.logger.java; import junit.framework.*; import org.apache.ignite.*; -import org.gridgain.grid.logger.*; +import org.apache.ignite.logger.*; import org.gridgain.grid.util.typedef.internal.*; import org.gridgain.testframework.junits.common.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8e1e2812/modules/core/src/test/java/org/gridgain/testframework/junits/logger/GridLog4jRollingFileAppender.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/testframework/junits/logger/GridLog4jRollingFileAppender.java b/modules/core/src/test/java/org/gridgain/testframework/junits/logger/GridLog4jRollingFileAppender.java index 45027bb..211b951 100644 --- a/modules/core/src/test/java/org/gridgain/testframework/junits/logger/GridLog4jRollingFileAppender.java +++ b/modules/core/src/test/java/org/gridgain/testframework/junits/logger/GridLog4jRollingFileAppender.java @@ -9,9 +9,9 @@ package org.gridgain.testframework.junits.logger; +import org.apache.ignite.logger.*; import org.apache.log4j.*; import org.gridgain.grid.*; -import org.gridgain.grid.logger.*; import org.gridgain.grid.util.typedef.internal.*; import java.io.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8e1e2812/modules/core/src/test/java/org/gridgain/testframework/junits/logger/GridTestLog4jLogger.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/testframework/junits/logger/GridTestLog4jLogger.java b/modules/core/src/test/java/org/gridgain/testframework/junits/logger/GridTestLog4jLogger.java index 5c4a179..224fd79 100644 --- a/modules/core/src/test/java/org/gridgain/testframework/junits/logger/GridTestLog4jLogger.java +++ b/modules/core/src/test/java/org/gridgain/testframework/junits/logger/GridTestLog4jLogger.java @@ -11,11 +11,11 @@ package org.gridgain.testframework.junits.logger; import org.apache.ignite.*; import org.apache.ignite.lang.*; +import org.apache.ignite.logger.*; import org.apache.log4j.*; import org.apache.log4j.varia.*; import org.apache.log4j.xml.*; import org.gridgain.grid.*; -import org.gridgain.grid.logger.*; import org.gridgain.grid.util.*; import org.gridgain.grid.util.lang.*; import org.gridgain.grid.util.tostring.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8e1e2812/modules/log4j/src/main/java/org/gridgain/grid/logger/log4j/GridLog4jLogger.java ---------------------------------------------------------------------- diff --git a/modules/log4j/src/main/java/org/gridgain/grid/logger/log4j/GridLog4jLogger.java b/modules/log4j/src/main/java/org/gridgain/grid/logger/log4j/GridLog4jLogger.java index 526bf45..4fda087 100644 --- a/modules/log4j/src/main/java/org/gridgain/grid/logger/log4j/GridLog4jLogger.java +++ b/modules/log4j/src/main/java/org/gridgain/grid/logger/log4j/GridLog4jLogger.java @@ -11,11 +11,11 @@ package org.gridgain.grid.logger.log4j; import org.apache.ignite.*; import org.apache.ignite.lang.*; +import org.apache.ignite.logger.*; import org.apache.log4j.*; import org.apache.log4j.varia.*; import org.apache.log4j.xml.*; import org.gridgain.grid.*; -import org.gridgain.grid.logger.*; import org.gridgain.grid.util.*; import org.gridgain.grid.util.lang.*; import org.gridgain.grid.util.tostring.*;
