Repository: logging-log4j2 Updated Branches: refs/heads/StyledMessage dd6c53ea3 -> 8b83de4c9
Better example and update Javadoc for running examples. Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/8b83de4c Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/8b83de4c Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/8b83de4c Branch: refs/heads/StyledMessage Commit: 8b83de4c9a2af2719524430375f1950a893f8fe8 Parents: dd6c53e Author: Gary Gregory <ggreg...@apache.org> Authored: Mon Jun 27 22:49:50 2016 -0700 Committer: Gary Gregory <ggreg...@apache.org> Committed: Mon Jun 27 22:49:50 2016 -0700 ---------------------------------------------------------------------- .../ConsoleAppenderAnsiMessagesMain.java | 2 +- .../ConsoleAppenderAnsiStyleJira180Main.java | 2 +- .../ConsoleAppenderAnsiStyleJira272Main.java | 2 +- .../ConsoleAppenderAnsiStyleJira319Main.java | 2 +- .../ConsoleAppenderAnsiStyleLayoutMain.java | 2 +- ...nsoleAppenderDefaultSuppressedThrowable.java | 2 +- .../ConsoleAppenderJAnsiMessageMain.java | 15 +++++++--- .../ConsoleAppenderNoAnsiStyleLayoutMain.java | 2 +- .../log4j/core/appender/Jira739Test.java | 2 +- .../src/test/resources/log4j-message-styled.xml | 2 +- .../test/resources/log4j2-console-msg-ansi.xml | 31 ++++++++++++++++++++ 11 files changed, 51 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/8b83de4c/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ConsoleAppenderAnsiMessagesMain.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ConsoleAppenderAnsiMessagesMain.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ConsoleAppenderAnsiMessagesMain.java index f1f45ea..d963737 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ConsoleAppenderAnsiMessagesMain.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ConsoleAppenderAnsiMessagesMain.java @@ -30,7 +30,7 @@ import org.apache.logging.log4j.core.config.Configurator; * Running from a Windows command line from the root of the project: * </p> * <pre> - * java -classpath log4j-core\target\test-classes;log4j-core\target\classes;log4j-api\target\classes;%HOME%\.m2\repository\org\fusesource\jansi\jansi\1.11\jansi-1.11.jar; org.apache.logging.log4j.core.appender.ConsoleAppenderAnsiMessagesMain log4j-core/target/test-classes/log4j2-console.xml + * java -classpath log4j-core\target\test-classes;log4j-core\target\classes;log4j-api\target\classes;%HOME%\.m2\repository\org\fusesource\jansi\jansi\1.13\jansi-1.13.jar; org.apache.logging.log4j.core.appender.ConsoleAppenderAnsiMessagesMain log4j-core/target/test-classes/log4j2-console.xml * </pre> */ public class ConsoleAppenderAnsiMessagesMain { http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/8b83de4c/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ConsoleAppenderAnsiStyleJira180Main.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ConsoleAppenderAnsiStyleJira180Main.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ConsoleAppenderAnsiStyleJira180Main.java index b1bbb19..b0e1e9d 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ConsoleAppenderAnsiStyleJira180Main.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ConsoleAppenderAnsiStyleJira180Main.java @@ -28,7 +28,7 @@ import org.apache.logging.log4j.core.config.Configurator; * Running from a Windows command line from the root of the project: * </p> * <pre> - * java -classpath log4j-core\target\test-classes;log4j-core\target\classes;log4j-api\target\classes;%HOME%\.m2\repository\org\fusesource\jansi\jansi\1.11\jansi-1.11.jar; org.apache.logging.log4j.core.appender.ConsoleAppenderAnsiStyleJira180Main log4j-core/target/test-classes/log4j2-180.xml + * java -classpath log4j-core\target\test-classes;log4j-core\target\classes;log4j-api\target\classes;%HOME%\.m2\repository\org\fusesource\jansi\jansi\1.13\jansi-1.13.jar; org.apache.logging.log4j.core.appender.ConsoleAppenderAnsiStyleJira180Main log4j-core/target/test-classes/log4j2-180.xml * </pre> */ public class ConsoleAppenderAnsiStyleJira180Main { http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/8b83de4c/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ConsoleAppenderAnsiStyleJira272Main.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ConsoleAppenderAnsiStyleJira272Main.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ConsoleAppenderAnsiStyleJira272Main.java index ec96e6a..c5d8b81 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ConsoleAppenderAnsiStyleJira272Main.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ConsoleAppenderAnsiStyleJira272Main.java @@ -28,7 +28,7 @@ import org.apache.logging.log4j.core.config.Configurator; * Running from a Windows command line from the root of the project: * </p> * <pre> - * java -classpath log4j-core\target\test-classes;log4j-core\target\classes;log4j-api\target\classes;%HOME%\.m2\repository\org\fusesource\jansi\jansi\1.11\jansi-1.11.jar; org.apache.logging.log4j.core.appender.ConsoleAppenderAnsiStyleJira272Main log4j-core/target/test-classes/log4j2-272.xml + * java -classpath log4j-core\target\test-classes;log4j-core\target\classes;log4j-api\target\classes;%HOME%\.m2\repository\org\fusesource\jansi\jansi\1.13\jansi-1.13.jar; org.apache.logging.log4j.core.appender.ConsoleAppenderAnsiStyleJira272Main log4j-core/target/test-classes/log4j2-272.xml * </pre> */ public class ConsoleAppenderAnsiStyleJira272Main { http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/8b83de4c/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ConsoleAppenderAnsiStyleJira319Main.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ConsoleAppenderAnsiStyleJira319Main.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ConsoleAppenderAnsiStyleJira319Main.java index e95988b..29cef2e 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ConsoleAppenderAnsiStyleJira319Main.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ConsoleAppenderAnsiStyleJira319Main.java @@ -28,7 +28,7 @@ import org.apache.logging.log4j.core.config.Configurator; * Running from a Windows command line from the root of the project: * </p> * <pre> - * java -classpath log4j-core\target\test-classes;log4j-core\target\classes;log4j-api\target\classes;%HOME%\.m2\repository\org\fusesource\jansi\jansi\1.11\jansi-1.11.jar; org.apache.logging.log4j.core.appender.ConsoleAppenderAnsiStyleJira319Main log4j-core/target/test-classes/log4j2-319.xml + * java -classpath log4j-core\target\test-classes;log4j-core\target\classes;log4j-api\target\classes;%HOME%\.m2\repository\org\fusesource\jansi\jansi\1.13\jansi-1.13.jar; org.apache.logging.log4j.core.appender.ConsoleAppenderAnsiStyleJira319Main log4j-core/target/test-classes/log4j2-319.xml * </pre> */ public class ConsoleAppenderAnsiStyleJira319Main { http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/8b83de4c/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ConsoleAppenderAnsiStyleLayoutMain.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ConsoleAppenderAnsiStyleLayoutMain.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ConsoleAppenderAnsiStyleLayoutMain.java index 860bf43..7159f53 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ConsoleAppenderAnsiStyleLayoutMain.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ConsoleAppenderAnsiStyleLayoutMain.java @@ -36,7 +36,7 @@ import org.junit.Test; * </pre> * or: * <pre> - * java -classpath log4j-core\target\test-classes;log4j-core\target\classes;log4j-api\target\classes;%HOME%\.m2\repository\org\fusesource\jansi\jansi\1.11\jansi-1.11.jar; org.apache.logging.log4j.core.appender.ConsoleAppenderAnsiStyleLayoutMain log4j-core/target/test-classes/log4j2-console-style-ansi.xml + * java -classpath log4j-core\target\test-classes;log4j-core\target\classes;log4j-api\target\classes;%HOME%\.m2\repository\org\fusesource\jansi\jansi\1.13\jansi-1.13.jar; org.apache.logging.log4j.core.appender.ConsoleAppenderAnsiStyleLayoutMain log4j-core/target/test-classes/log4j2-console-style-ansi.xml * </pre> * */ http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/8b83de4c/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ConsoleAppenderDefaultSuppressedThrowable.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ConsoleAppenderDefaultSuppressedThrowable.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ConsoleAppenderDefaultSuppressedThrowable.java index e16b5da..e2b6718 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ConsoleAppenderDefaultSuppressedThrowable.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ConsoleAppenderDefaultSuppressedThrowable.java @@ -32,7 +32,7 @@ import org.apache.logging.log4j.core.config.Configurator; * </p> * * <pre> - * java -classpath log4j-core\target\test-classes;log4j-core\target\classes;log4j-api\target\classes;%HOME%\.m2\repository\org\fusesource\jansi\jansi\1.11\jansi-1.11.jar; org.apache.logging.log4j.core.appender.ConsoleAppenderNoAnsiStyleLayoutMain log4j-core/target/test-classes/log4j2-console-style-ansi.xml + * java -classpath log4j-core\target\test-classes;log4j-core\target\classes;log4j-api\target\classes;%HOME%\.m2\repository\org\fusesource\jansi\jansi\1.13\jansi-1.13.jar; org.apache.logging.log4j.core.appender.ConsoleAppenderNoAnsiStyleLayoutMain log4j-core/target/test-classes/log4j2-console-style-ansi.xml * </pre> */ public class ConsoleAppenderDefaultSuppressedThrowable { http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/8b83de4c/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ConsoleAppenderJAnsiMessageMain.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ConsoleAppenderJAnsiMessageMain.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ConsoleAppenderJAnsiMessageMain.java index cbee636..c60f51a 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ConsoleAppenderJAnsiMessageMain.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ConsoleAppenderJAnsiMessageMain.java @@ -16,8 +16,12 @@ */ package org.apache.logging.log4j.core.appender; -import static org.fusesource.jansi.Ansi.*; -import static org.fusesource.jansi.Ansi.Color.*; +import static org.fusesource.jansi.Ansi.ansi; +import static org.fusesource.jansi.Ansi.Color.CYAN; +import static org.fusesource.jansi.Ansi.Color.RED; + +import java.util.Map; +import java.util.Map.Entry; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -39,7 +43,7 @@ import org.junit.Test; * or, on Windows: * * <pre> - * java -classpath log4j-core\target\test-classes;log4j-core\target\classes;log4j-api\target\classes;%HOMEDRIVE%\%HOMEPATH%\.m2\repository\org\fusesource\jansi\jansi\1.11\jansi-1.11.jar; org.apache.logging.log4j.core.appender.ConsoleAppenderJAnsiMessageMain log4j-core/target/test-classes/log4j2-console-style-ansi.xml + * java -classpath log4j-core\target\test-classes;log4j-core\target\classes;log4j-api\target\classes;%USERPROFILE%\.m2\repository\org\fusesource\jansi\jansi\1.13\jansi-1.13.jar; org.apache.logging.log4j.core.appender.ConsoleAppenderJAnsiMessageMain log4j-core/src/test/resources/log4j-console-msg-styled.xml * </pre> * */ @@ -59,7 +63,7 @@ public class ConsoleAppenderJAnsiMessageMain { public void test(final String[] args) { // System.out.println(System.getProperty("java.class.path")); - final String config = args == null || args.length == 0 ? "target/test-classes/log4j2-console-style-ansi.xml" + final String config = args == null || args.length == 0 ? "target/test-classes/log4j-console-msg-styled.xml" : args[0]; final LoggerContext ctx = Configurator.initialize(ConsoleAppenderAnsiMessagesMain.class.getName(), config); final Logger logger = LogManager.getLogger(ConsoleAppenderJAnsiMessageMain.class); @@ -67,6 +71,9 @@ public class ConsoleAppenderJAnsiMessageMain { logger.info(ansi().fg(RED).a("Hello").fg(CYAN).a(" World").reset()); // JAnsi format: // logger.info("@|red Hello|@ @|cyan World|@"); + for (Entry<Object, Object> entry : System.getProperties().entrySet()) { + logger.info("@|KeyStyle {}|@ = @|DataStyle {}|@", entry.getKey(), entry.getValue()); + } } finally { Configurator.shutdown(ctx); } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/8b83de4c/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ConsoleAppenderNoAnsiStyleLayoutMain.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ConsoleAppenderNoAnsiStyleLayoutMain.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ConsoleAppenderNoAnsiStyleLayoutMain.java index b7a48b7..3ce83b4 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ConsoleAppenderNoAnsiStyleLayoutMain.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ConsoleAppenderNoAnsiStyleLayoutMain.java @@ -32,7 +32,7 @@ import org.apache.logging.log4j.core.config.Configurator; * </p> * * <pre> - * java -classpath log4j-core\target\test-classes;log4j-core\target\classes;log4j-api\target\classes;%HOME%\.m2\repository\org\fusesource\jansi\jansi\1.11\jansi-1.11.jar; org.apache.logging.log4j.core.appender.ConsoleAppenderNoAnsiStyleLayoutMain log4j-core/target/test-classes/log4j2-console-style-ansi.xml + * java -classpath log4j-core\target\test-classes;log4j-core\target\classes;log4j-api\target\classes;%HOME%\.m2\repository\org\fusesource\jansi\jansi\1.13\jansi-1.13.jar; org.apache.logging.log4j.core.appender.ConsoleAppenderNoAnsiStyleLayoutMain log4j-core/target/test-classes/log4j2-console-style-ansi.xml * </pre> */ public class ConsoleAppenderNoAnsiStyleLayoutMain { http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/8b83de4c/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/Jira739Test.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/Jira739Test.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/Jira739Test.java index 8585738..d0dcff2 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/Jira739Test.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/Jira739Test.java @@ -29,7 +29,7 @@ import org.apache.logging.log4j.core.config.Configurator; * </p> * * <pre> - * java -classpath log4j-core\target\test-classes;log4j-core\target\classes;log4j-api\target\classes;%HOME%\.m2\repository\org\fusesource\jansi\jansi\1.11\jansi-1.11.jar; org.apache.logging.log4j.core.appender.ConsoleAppenderAnsiMessagesMain log4j-core/target/test-classes/log4j2-console.xml + * java -classpath log4j-core\target\test-classes;log4j-core\target\classes;log4j-api\target\classes;%HOME%\.m2\repository\org\fusesource\jansi\jansi\1.13\jansi-1.13.jar; org.apache.logging.log4j.core.appender.ConsoleAppenderAnsiMessagesMain log4j-core/target/test-classes/log4j2-console.xml * </pre> */ public class Jira739Test { http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/8b83de4c/log4j-core/src/test/resources/log4j-message-styled.xml ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/resources/log4j-message-styled.xml b/log4j-core/src/test/resources/log4j-message-styled.xml index 30ba401..4ddfbb8 100644 --- a/log4j-core/src/test/resources/log4j-message-styled.xml +++ b/log4j-core/src/test/resources/log4j-message-styled.xml @@ -20,7 +20,7 @@ <Appenders> <List name="List"> <PatternLayout> - <Pattern>%message{ansi}{WarningStyle=red,bold DataStyle=blue}%n</Pattern> + <Pattern>%message{ansi}{WarningStyle=red,bold DataStyle=blue, KeyStyle=white}%n</Pattern> </PatternLayout> </List> </Appenders> http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/8b83de4c/log4j-core/src/test/resources/log4j2-console-msg-ansi.xml ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/resources/log4j2-console-msg-ansi.xml b/log4j-core/src/test/resources/log4j2-console-msg-ansi.xml new file mode 100644 index 0000000..333740a --- /dev/null +++ b/log4j-core/src/test/resources/log4j2-console-msg-ansi.xml @@ -0,0 +1,31 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + 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. + +--> +<Configuration status="OFF"> + <Appenders> + <Console name="Console" target="SYSTEM_OUT"> + <PatternLayout pattern="%style{%d}{white} %style{[%t]} %style{%-5level:}{yellow} %style{%msg{ansi}{KeyStyle=white DataStyle=cyan,bold}%n%throwable}{green}" /> + </Console> + </Appenders> + <Loggers> + <Logger name="org.foo" level="DEBUG" /> + <Root level="TRACE"> + <AppenderRef ref="Console" /> + </Root> + </Loggers> +</Configuration>
