Repository: logging-log4j-tools Updated Branches: refs/heads/master 0007b107b -> 5c1f0a0d5
LOG4J2-2011 moved classes from util.picocli to tools.picocli Project: http://git-wip-us.apache.org/repos/asf/logging-log4j-tools/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j-tools/commit/5c1f0a0d Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j-tools/tree/5c1f0a0d Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j-tools/diff/5c1f0a0d Branch: refs/heads/master Commit: 5c1f0a0d5c773846d05b4d78fc9eecf71df814b8 Parents: 0007b10 Author: rpopma <[email protected]> Authored: Wed Aug 16 07:24:48 2017 +0900 Committer: rpopma <[email protected]> Committed: Wed Aug 16 07:24:48 2017 +0900 ---------------------------------------------------------------------- .../org/apache/logging/log4j/server/AbstractSocketServer.java | 4 ++-- .../java/org/apache/logging/log4j/server/TcpSocketServer.java | 6 +++--- .../java/org/apache/logging/log4j/server/UdpSocketServer.java | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j-tools/blob/5c1f0a0d/log4j-server/src/main/java/org/apache/logging/log4j/server/AbstractSocketServer.java ---------------------------------------------------------------------- diff --git a/log4j-server/src/main/java/org/apache/logging/log4j/server/AbstractSocketServer.java b/log4j-server/src/main/java/org/apache/logging/log4j/server/AbstractSocketServer.java index 4f487f5..2024b6b 100644 --- a/log4j-server/src/main/java/org/apache/logging/log4j/server/AbstractSocketServer.java +++ b/log4j-server/src/main/java/org/apache/logging/log4j/server/AbstractSocketServer.java @@ -38,9 +38,9 @@ import org.apache.logging.log4j.core.config.Configuration; import org.apache.logging.log4j.core.config.ConfigurationSource; import org.apache.logging.log4j.core.config.xml.XmlConfiguration; import org.apache.logging.log4j.core.config.xml.XmlConfigurationFactory; -import org.apache.logging.log4j.core.util.BasicCommandLineArguments; +import org.apache.logging.log4j.core.tools.BasicCommandLineArguments; +import org.apache.logging.log4j.core.tools.picocli.CommandLine.Option; import org.apache.logging.log4j.core.util.Log4jThread; -import org.apache.logging.log4j.core.util.picocli.CommandLine.Option; import org.apache.logging.log4j.util.Strings; /** http://git-wip-us.apache.org/repos/asf/logging-log4j-tools/blob/5c1f0a0d/log4j-server/src/main/java/org/apache/logging/log4j/server/TcpSocketServer.java ---------------------------------------------------------------------- diff --git a/log4j-server/src/main/java/org/apache/logging/log4j/server/TcpSocketServer.java b/log4j-server/src/main/java/org/apache/logging/log4j/server/TcpSocketServer.java index 50e1d82..90b2f29 100644 --- a/log4j-server/src/main/java/org/apache/logging/log4j/server/TcpSocketServer.java +++ b/log4j-server/src/main/java/org/apache/logging/log4j/server/TcpSocketServer.java @@ -34,9 +34,9 @@ import org.apache.logging.log4j.core.config.ConfigurationFactory; import org.apache.logging.log4j.core.parser.ParseException; import org.apache.logging.log4j.core.util.Closer; import org.apache.logging.log4j.core.util.Log4jThread; -import org.apache.logging.log4j.core.util.picocli.CommandLine; -import org.apache.logging.log4j.core.util.picocli.CommandLine.Command; -import org.apache.logging.log4j.core.util.picocli.CommandLine.Option; +import org.apache.logging.log4j.core.tools.picocli.CommandLine; +import org.apache.logging.log4j.core.tools.picocli.CommandLine.Command; +import org.apache.logging.log4j.core.tools.picocli.CommandLine.Option; import org.apache.logging.log4j.message.EntryMessage; /** http://git-wip-us.apache.org/repos/asf/logging-log4j-tools/blob/5c1f0a0d/log4j-server/src/main/java/org/apache/logging/log4j/server/UdpSocketServer.java ---------------------------------------------------------------------- diff --git a/log4j-server/src/main/java/org/apache/logging/log4j/server/UdpSocketServer.java b/log4j-server/src/main/java/org/apache/logging/log4j/server/UdpSocketServer.java index 533c4b2..4229003 100644 --- a/log4j-server/src/main/java/org/apache/logging/log4j/server/UdpSocketServer.java +++ b/log4j-server/src/main/java/org/apache/logging/log4j/server/UdpSocketServer.java @@ -28,7 +28,7 @@ import java.util.List; import org.apache.logging.log4j.core.config.ConfigurationFactory; import org.apache.logging.log4j.core.parser.ParseException; -import org.apache.logging.log4j.core.util.picocli.CommandLine; +import org.apache.logging.log4j.core.tools.picocli.CommandLine; /** * Listens for Log4j events on a datagram socket and passes them on to Log4j.
