LOG4J2-2011 moved classes from util.picocli to tools.picocli
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/e2f9d5ed Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/e2f9d5ed Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/e2f9d5ed Branch: refs/heads/master Commit: e2f9d5ed42c32f3051931780e786da7e6468ec91 Parents: 9011de1 Author: rpopma <[email protected]> Authored: Wed Aug 16 07:23:19 2017 +0900 Committer: rpopma <[email protected]> Committed: Wed Aug 16 07:23:19 2017 +0900 ---------------------------------------------------------------------- .../config/Log4j1ConfigurationConverter.java | 8 +- .../core/tools/BasicCommandLineArguments.java | 34 + .../log4j/core/tools/picocli/CommandLine.java | 3900 ++++++++++++++++++ .../core/util/BasicCommandLineArguments.java | 34 - .../log4j/core/util/picocli/CommandLine.java | 3900 ------------------ .../core/tools/picocli/CommandLineHelpTest.java | 1634 ++++++++ .../core/tools/picocli/CommandLineTest.java | 2921 +++++++++++++ .../core/tools/picocli/CustomLayoutDemo.java | 265 ++ .../logging/log4j/core/tools/picocli/Demo.java | 652 +++ .../core/util/picocli/CommandLineHelpTest.java | 1634 -------- .../core/util/picocli/CommandLineTest.java | 2921 ------------- .../core/util/picocli/CustomLayoutDemo.java | 265 -- .../logging/log4j/core/util/picocli/Demo.java | 652 --- 13 files changed, 9410 insertions(+), 9410 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/e2f9d5ed/log4j-1.2-api/src/main/java/org/apache/log4j/config/Log4j1ConfigurationConverter.java ---------------------------------------------------------------------- diff --git a/log4j-1.2-api/src/main/java/org/apache/log4j/config/Log4j1ConfigurationConverter.java b/log4j-1.2-api/src/main/java/org/apache/log4j/config/Log4j1ConfigurationConverter.java index 516286b..4475f6a 100644 --- a/log4j-1.2-api/src/main/java/org/apache/log4j/config/Log4j1ConfigurationConverter.java +++ b/log4j-1.2-api/src/main/java/org/apache/log4j/config/Log4j1ConfigurationConverter.java @@ -29,10 +29,10 @@ import java.util.concurrent.atomic.AtomicInteger; import org.apache.logging.log4j.core.config.ConfigurationException; import org.apache.logging.log4j.core.config.builder.api.ConfigurationBuilder; import org.apache.logging.log4j.core.config.builder.impl.BuiltConfiguration; -import org.apache.logging.log4j.core.util.BasicCommandLineArguments; -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.BasicCommandLineArguments; +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; /** * Tool for converting a Log4j 1.x properties configuration file to Log4j 2.x XML configuration file. http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/e2f9d5ed/log4j-core/src/main/java/org/apache/logging/log4j/core/tools/BasicCommandLineArguments.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/tools/BasicCommandLineArguments.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/tools/BasicCommandLineArguments.java new file mode 100644 index 0000000..451da11 --- /dev/null +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/tools/BasicCommandLineArguments.java @@ -0,0 +1,34 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache license, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the license for the specific language governing permissions and + * limitations under the license. + */ +package org.apache.logging.log4j.core.tools; + +import org.apache.logging.log4j.core.tools.picocli.CommandLine.Option; + +public class BasicCommandLineArguments { + + @Option(names = { "--help", "-?", "-h" }, usageHelp = true, description = "Prints this help and exits.") + private boolean help; + + public boolean isHelp() { + return help; + } + + public void setHelp(final boolean help) { + this.help = help; + } + +}
