You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@logging.apache.org by Matt Sicker <bo...@gmail.com> on 2017/09/12 00:15:04 UTC
Re: logging-log4j2 git commit: Revert "Remove unused imports."
Looks like only the ClientGuiJConsolePlugin class had the JConsole import
that erred. You should be able to remove unused imports elsewhere, though.
On 11 September 2017 at 19:00, <gg...@apache.org> wrote:
> Repository: logging-log4j2
> Updated Branches:
> refs/heads/master 471ef52e4 -> c9b1cf8c0
>
>
> Revert "Remove unused imports."
>
> This reverts commit 0051b1b33d56c8ed6a55684114bacbbb08c1f747.
>
>
> Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
> Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/
> commit/c9b1cf8c
> Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/c9b1cf8c
> Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/c9b1cf8c
>
> Branch: refs/heads/master
> Commit: c9b1cf8c0ce37cfd4beadcc5b3d4391840be22f2
> Parents: 471ef52
> Author: Gary Gregory <ga...@gmail.com>
> Authored: Mon Sep 11 18:00:06 2017 -0600
> Committer: Gary Gregory <ga...@gmail.com>
> Committed: Mon Sep 11 18:00:06 2017 -0600
>
> ----------------------------------------------------------------------
> .../java/org/apache/logging/log4j/util/PropertiesUtilTest.java | 1 +
> .../org/apache/logging/log4j/core/appender/mom/JmsManager.java | 1 +
> .../logging/log4j/core/config/plugins/util/ResolverUtil.java | 1 +
> .../java/org/apache/logging/log4j/core/impl/MutableLogEvent.java | 1 +
> .../java/org/apache/logging/log4j/core/net/TcpSocketManager.java | 3 +++
> .../logging/log4j/core/pattern/ProcessIdPatternConverter.java | 4 ++++
> .../org/apache/logging/log4j/core/tools/picocli/CommandLine.java | 1 +
> .../org/apache/logging/log4j/core/appender/HttpAppenderTest.java | 1 +
> .../org/apache/logging/log4j/core/appender/SmtpAppenderTest.java | 1 +
> .../rolling/RollingAppenderDirectWriteWithFilenameTest.java | 1 +
> .../apache/logging/log4j/core/net/ssl/SslConfigurationTest.java | 1 +
> .../logging/log4j/core/tools/picocli/CustomLayoutDemo.java | 1 +
> .../apache/logging/log4j/jmx/gui/ClientGuiJConsolePlugin.java | 2 ++
> 13 files changed, 19 insertions(+)
> ----------------------------------------------------------------------
>
>
> http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/
> c9b1cf8c/log4j-api/src/test/java/org/apache/logging/log4j/
> util/PropertiesUtilTest.java
> ----------------------------------------------------------------------
> diff --git a/log4j-api/src/test/java/org/apache/logging/log4j/util/PropertiesUtilTest.java
> b/log4j-api/src/test/java/org/apache/logging/log4j/util/
> PropertiesUtilTest.java
> index 4dd5e7e..99dbeb9 100644
> --- a/log4j-api/src/test/java/org/apache/logging/log4j/util/
> PropertiesUtilTest.java
> +++ b/log4j-api/src/test/java/org/apache/logging/log4j/util/
> PropertiesUtilTest.java
> @@ -19,6 +19,7 @@ package org.apache.logging.log4j.util;
>
> import java.nio.charset.Charset;
> import java.nio.charset.StandardCharsets;
> +import java.nio.charset.UnsupportedCharsetException;
> import java.util.Map;
> import java.util.Properties;
>
>
> http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/
> c9b1cf8c/log4j-core/src/main/java/org/apache/logging/log4j/
> core/appender/mom/JmsManager.java
> ----------------------------------------------------------------------
> diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/JmsManager.java
> b/log4j-core/src/main/java/org/apache/logging/log4j/core/
> appender/mom/JmsManager.java
> index c4df884..f2090e3 100644
> --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/
> appender/mom/JmsManager.java
> +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/
> appender/mom/JmsManager.java
> @@ -18,6 +18,7 @@
> package org.apache.logging.log4j.core.appender.mom;
>
> import java.io.Serializable;
> +import java.util.Arrays;
> import java.util.Properties;
> import java.util.concurrent.CountDownLatch;
> import java.util.concurrent.TimeUnit;
>
> http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/
> c9b1cf8c/log4j-core/src/main/java/org/apache/logging/log4j/
> core/config/plugins/util/ResolverUtil.java
> ----------------------------------------------------------------------
> diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/
> config/plugins/util/ResolverUtil.java b/log4j-core/src/main/java/
> org/apache/logging/log4j/core/config/plugins/util/ResolverUtil.java
> index 29fe395..3ef796a 100644
> --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/
> config/plugins/util/ResolverUtil.java
> +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/
> config/plugins/util/ResolverUtil.java
> @@ -18,6 +18,7 @@ package org.apache.logging.log4j.core.
> config.plugins.util;
>
> import java.io.File;
> import java.io.FileInputStream;
> +import java.io.FileNotFoundException;
> import java.io.IOException;
> import java.io.UnsupportedEncodingException;
> import java.net.URI;
>
> http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/
> c9b1cf8c/log4j-core/src/main/java/org/apache/logging/log4j/
> core/impl/MutableLogEvent.java
> ----------------------------------------------------------------------
> diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/MutableLogEvent.java
> b/log4j-core/src/main/java/org/apache/logging/log4j/core/
> impl/MutableLogEvent.java
> index 97f5ff3..50c30bf 100644
> --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/
> impl/MutableLogEvent.java
> +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/
> impl/MutableLogEvent.java
> @@ -31,6 +31,7 @@ import org.apache.logging.log4j.message.Message;
> import org.apache.logging.log4j.message.ParameterizedMessage;
> import org.apache.logging.log4j.message.ReusableMessage;
> import org.apache.logging.log4j.message.SimpleMessage;
> +import org.apache.logging.log4j.status.StatusLogger;
> import org.apache.logging.log4j.util.ReadOnlyStringMap;
> import org.apache.logging.log4j.util.StackLocatorUtil;
> import org.apache.logging.log4j.util.StringBuilders;
>
> http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/
> c9b1cf8c/log4j-core/src/main/java/org/apache/logging/log4j/
> core/net/TcpSocketManager.java
> ----------------------------------------------------------------------
> diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/TcpSocketManager.java
> b/log4j-core/src/main/java/org/apache/logging/log4j/core/
> net/TcpSocketManager.java
> index f5b971d..15d2bc8 100644
> --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/
> net/TcpSocketManager.java
> +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/
> net/TcpSocketManager.java
> @@ -23,6 +23,7 @@ import java.net.ConnectException;
> import java.net.InetAddress;
> import java.net.InetSocketAddress;
> import java.net.Socket;
> +import java.net.SocketException;
> import java.net.UnknownHostException;
> import java.util.HashMap;
> import java.util.Map;
> @@ -32,6 +33,8 @@ import org.apache.logging.log4j.core.Layout;
> import org.apache.logging.log4j.core.appender.AppenderLoggingException;
> import org.apache.logging.log4j.core.appender.ManagerFactory;
> import org.apache.logging.log4j.core.appender.OutputStreamManager;
> +import org.apache.logging.log4j.core.net.TcpSocketManager.FactoryData;
> +import org.apache.logging.log4j.core.net.TcpSocketManager.
> TcpSocketManagerFactory;
> import org.apache.logging.log4j.core.util.Closer;
> import org.apache.logging.log4j.core.util.Log4jThread;
> import org.apache.logging.log4j.core.util.NullOutputStream;
>
> http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/
> c9b1cf8c/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/
> ProcessIdPatternConverter.java
> ----------------------------------------------------------------------
> diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/
> pattern/ProcessIdPatternConverter.java b/log4j-core/src/main/java/
> org/apache/logging/log4j/core/pattern/ProcessIdPatternConverter.java
> index d182dc0..7c37263 100644
> --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/
> ProcessIdPatternConverter.java
> +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/
> ProcessIdPatternConverter.java
> @@ -16,6 +16,10 @@
> */
> package org.apache.logging.log4j.core.pattern;
>
> +import java.io.File;
> +import java.io.IOException;
> +import java.lang.management.ManagementFactory;
> +
> import org.apache.logging.log4j.core.LogEvent;
> import org.apache.logging.log4j.core.config.plugins.Plugin;
> import org.apache.logging.log4j.util.ProcessIdUtil;
>
> http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/
> c9b1cf8c/log4j-core/src/main/java/org/apache/logging/log4j/
> core/tools/picocli/CommandLine.java
> ----------------------------------------------------------------------
> diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/tools/picocli/CommandLine.java
> b/log4j-core/src/main/java/org/apache/logging/log4j/core/
> tools/picocli/CommandLine.java
> index 7f51af3..615f097 100644
> --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/
> tools/picocli/CommandLine.java
> +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/
> tools/picocli/CommandLine.java
> @@ -62,6 +62,7 @@ import java.util.TreeSet;
> import java.util.UUID;
> import java.util.regex.Pattern;
>
> +import org.apache.logging.log4j.core.tools.picocli.CommandLine.Help.Ansi;
> import org.apache.logging.log4j.core.tools.picocli.CommandLine.
> Help.Ansi.IStyle;
> import org.apache.logging.log4j.core.tools.picocli.CommandLine.
> Help.Ansi.Style;
> import org.apache.logging.log4j.core.tools.picocli.CommandLine.
> Help.Ansi.Text;
>
> http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/
> c9b1cf8c/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/
> HttpAppenderTest.java
> ----------------------------------------------------------------------
> diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/HttpAppenderTest.java
> b/log4j-core/src/test/java/org/apache/logging/log4j/core/
> appender/HttpAppenderTest.java
> index 337a0c0..f51172e 100644
> --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/
> appender/HttpAppenderTest.java
> +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/
> appender/HttpAppenderTest.java
> @@ -46,6 +46,7 @@ import org.apache.logging.log4j.message.SimpleMessage;
> import org.apache.logging.log4j.status.StatusData;
> import org.apache.logging.log4j.status.StatusListener;
> import org.apache.logging.log4j.status.StatusLogger;
> +import org.junit.Ignore;
> import org.junit.Rule;
> import org.junit.Test;
>
>
> http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/
> c9b1cf8c/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/
> SmtpAppenderTest.java
> ----------------------------------------------------------------------
> diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SmtpAppenderTest.java
> b/log4j-core/src/test/java/org/apache/logging/log4j/core/
> appender/SmtpAppenderTest.java
> index 61b9b92..8425d18 100644
> --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/
> appender/SmtpAppenderTest.java
> +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/
> appender/SmtpAppenderTest.java
> @@ -30,6 +30,7 @@ import org.apache.logging.log4j.categories.Appenders;
> import org.apache.logging.log4j.core.Logger;
> import org.apache.logging.log4j.core.LoggerContext;
> import org.apache.logging.log4j.core.net.MimeMessageBuilder;
> +import org.apache.logging.log4j.core.util.CyclicBuffer;
> import org.apache.logging.log4j.test.AvailablePortFinder;
> import org.junit.Test;
> import org.junit.experimental.categories.Category;
>
> http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/
> c9b1cf8c/log4j-core/src/test/java/org/apache/logging/log4j/
> core/appender/rolling/RollingAppenderDirectWriteWithFilenameTest.java
> ----------------------------------------------------------------------
> diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/
> appender/rolling/RollingAppenderDirectWriteWithFilenameTest.java
> b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/
> RollingAppenderDirectWriteWithFilenameTest.java
> index 2f346c1..27977f6 100644
> --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/
> appender/rolling/RollingAppenderDirectWriteWithFilenameTest.java
> +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/
> appender/rolling/RollingAppenderDirectWriteWithFilenameTest.java
> @@ -24,6 +24,7 @@ import org.junit.Before;
> import org.junit.Rule;
> import org.junit.Test;
> import org.junit.rules.RuleChain;
> +import static org.hamcrest.Matchers.hasItemInArray;
> import static org.junit.Assert.*;
>
> /**
>
> http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/
> c9b1cf8c/log4j-core/src/test/java/org/apache/logging/log4j/core/net/ssl/
> SslConfigurationTest.java
> ----------------------------------------------------------------------
> diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/
> net/ssl/SslConfigurationTest.java b/log4j-core/src/test/java/
> org/apache/logging/log4j/core/net/ssl/SslConfigurationTest.java
> index 89fef7c..4452496 100644
> --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/
> net/ssl/SslConfigurationTest.java
> +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/
> net/ssl/SslConfigurationTest.java
> @@ -24,6 +24,7 @@ import javax.net.ssl.SSLSocket;
> import javax.net.ssl.SSLSocketFactory;
>
> import org.junit.Assert;
> +import org.junit.Before;
> import org.junit.Test;
>
> public class SslConfigurationTest {
>
> http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/
> c9b1cf8c/log4j-core/src/test/java/org/apache/logging/log4j/
> core/tools/picocli/CustomLayoutDemo.java
> ----------------------------------------------------------------------
> diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/
> tools/picocli/CustomLayoutDemo.java b/log4j-core/src/test/java/
> org/apache/logging/log4j/core/tools/picocli/CustomLayoutDemo.java
> index 45de326..27197ce 100644
> --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/
> tools/picocli/CustomLayoutDemo.java
> +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/
> tools/picocli/CustomLayoutDemo.java
> @@ -27,6 +27,7 @@ import java.awt.Point;
> import java.lang.reflect.Field;
>
> import static org.apache.logging.log4j.core.tools.picocli.CommandLine.*;
> +import static org.apache.logging.log4j.core.tools.picocli.CommandLine.
> Help.Column.Overflow.*;
> import static org.apache.logging.log4j.core.tools.picocli.CommandLine.
> Help.Column.Overflow.SPAN;
> import static org.apache.logging.log4j.core.tools.picocli.CommandLine.
> Help.Column.Overflow.TRUNCATE;
> import static org.apache.logging.log4j.core.tools.picocli.CommandLine.
> Help.Column.Overflow.WRAP;
>
> http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/
> c9b1cf8c/log4j-jmx-gui/src/main/java/org/apache/logging/log4j/jmx/gui/
> ClientGuiJConsolePlugin.java
> ----------------------------------------------------------------------
> diff --git a/log4j-jmx-gui/src/main/java/org/apache/logging/log4j/jmx/
> gui/ClientGuiJConsolePlugin.java b/log4j-jmx-gui/src/main/java/
> org/apache/logging/log4j/jmx/gui/ClientGuiJConsolePlugin.java
> index f7405c2..538dc8d 100644
> --- a/log4j-jmx-gui/src/main/java/org/apache/logging/log4j/jmx/
> gui/ClientGuiJConsolePlugin.java
> +++ b/log4j-jmx-gui/src/main/java/org/apache/logging/log4j/jmx/
> gui/ClientGuiJConsolePlugin.java
> @@ -22,6 +22,8 @@ import java.util.Map;
> import javax.swing.JPanel;
> import javax.swing.SwingWorker;
>
> +import com.sun.tools.jconsole.JConsolePlugin;
> +
> /**
> * Adapts the {@code ClientGui} to the {@code JConsolePlugin} API.
> */
>
>
--
Matt Sicker <bo...@gmail.com>