struts git commit: WW-4492 Add support for Log4J2 as a struts and xwork logging backend
Repository: struts
Updated Branches:
refs/heads/develop 75027a3cb -> 48c0764f7
WW-4492 Add support for Log4J2 as a struts and xwork logging backend
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/48c0764f
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/48c0764f
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/48c0764f
Branch: refs/heads/develop
Commit: 48c0764f73def8f5a7e8bd5765b089519a787e1f
Parents: 75027a3
Author: Johannes Geppert
Authored: Sat Apr 18 12:29:13 2015 +0200
Committer: Johannes Geppert
Committed: Sat Apr 18 12:29:13 2015 +0200
--
pom.xml | 10 +-
xwork-core/pom.xml | 7 ++
.../util/logging/log4j2/Log4j2Logger.java | 121 +++
.../logging/log4j2/Log4j2LoggerFactory.java | 41 +++
.../util/logging/slf4j/Slf4jLoggerFactory.java | 5 +
5 files changed, 182 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/48c0764f/pom.xml
--
diff --git a/pom.xml b/pom.xml
index fc2121c..7aaaefc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -857,12 +857,18 @@
org.slf4j
slf4j-api
-1.7.2
+1.7.12
org.slf4j
slf4j-simple
-1.7.2
+1.7.12
+
+
+
+org.apache.logging.log4j
+log4j-api
+2.2
http://git-wip-us.apache.org/repos/asf/struts/blob/48c0764f/xwork-core/pom.xml
--
diff --git a/xwork-core/pom.xml b/xwork-core/pom.xml
index 07bb5ce..b48598e 100644
--- a/xwork-core/pom.xml
+++ b/xwork-core/pom.xml
@@ -219,6 +219,13 @@
slf4j-simple
true
+
+
+
+org.apache.logging.log4j
+log4j-api
+true
+
http://git-wip-us.apache.org/repos/asf/struts/blob/48c0764f/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/log4j2/Log4j2Logger.java
--
diff --git
a/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/log4j2/Log4j2Logger.java
b/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/log4j2/Log4j2Logger.java
new file mode 100644
index 000..44a10fd
--- /dev/null
+++
b/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/log4j2/Log4j2Logger.java
@@ -0,0 +1,121 @@
+/*
+ * Copyright 2002-2006,2009 The Apache Software Foundation.
+ *
+ * Licensed 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 com.opensymphony.xwork2.util.logging.log4j2;
+
+import com.opensymphony.xwork2.util.logging.Logger;
+import com.opensymphony.xwork2.util.logging.LoggerUtils;
+
+/**
+ * Simple logger that delegates to log4j2 logging
+ */
+public class Log4j2Logger implements Logger {
+
+private org.apache.logging.log4j.Logger log;
+
+public Log4j2Logger(org.apache.logging.log4j.Logger log) {
+this.log = log;
+}
+
+public void error(String msg, String... args) {
+log.error(LoggerUtils.format(msg, args));
+}
+
+public void error(String msg, Object... args) {
+log.error(LoggerUtils.format(msg, args));
+}
+
+public void error(String msg, Throwable ex, String... args) {
+log.error(LoggerUtils.format(msg, args), ex);
+}
+
+public void info(String msg, String... args) {
+log.info(LoggerUtils.format(msg, args));
+}
+
+public void info(String msg, Throwable ex, String... args) {
+log.info(LoggerUtils.format(msg, args), ex);
+}
+
+public boolean isInfoEnabled() {
+return log.isInfoEnabled();
+}
+
+public void warn(String msg, String... args) {
+log.warn(LoggerUtils.format(msg, args));
+}
+
+public void warn(String msg, Object... args) {
+log.warn(LoggerUtils.format(msg, args));
+}
+
+public void warn(String msg, Throwable ex, String... args) {
+log.warn(LoggerUtils.format(msg, args), ex);
+}
+
+public boolean isDeb
struts git commit: WW-4492 Add support for Log4J2 as a struts and xwork logging backend
Repository: struts Updated Branches: refs/heads/develop 48c0764f7 -> 093532edc WW-4492 Add support for Log4J2 as a struts and xwork logging backend - Use new log4j2 in blank and rest showcase app - Migrate to newer jetty plugin version Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/093532ed Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/093532ed Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/093532ed Branch: refs/heads/develop Commit: 093532edc2b3a6d0421e44f93ba4b7aefbd1fac3 Parents: 48c0764 Author: Johannes Geppert Authored: Sat Apr 18 21:15:48 2015 +0200 Committer: Johannes Geppert Committed: Sat Apr 18 21:15:48 2015 +0200 -- apps/blank/pom.xml | 18 +- apps/blank/src/main/resources/log4j.properties | 26 apps/blank/src/main/resources/log4j2.xml| 15 + apps/mailreader/pom.xml | 2 +- apps/rest-showcase/pom.xml | 32 -- .../main/java/org/demo/rest/example/Order.java | 66 ++-- .../org/demo/rest/example/OrdersController.java | 8 ++- .../src/main/resources/log4j.properties | 26 .../rest-showcase/src/main/resources/log4j2.xml | 16 + apps/showcase/pom.xml | 2 +- 10 files changed, 102 insertions(+), 109 deletions(-) -- http://git-wip-us.apache.org/repos/asf/struts/blob/093532ed/apps/blank/pom.xml -- diff --git a/apps/blank/pom.xml b/apps/blank/pom.xml index 979f077..c105dd8 100644 --- a/apps/blank/pom.xml +++ b/apps/blank/pom.xml @@ -48,8 +48,14 @@ -log4j -log4j +org.apache.logging.log4j +log4j-api +2.2 + + +org.apache.logging.log4j +log4j-core +2.2 @@ -64,7 +70,7 @@ org.mortbay.jetty jetty-maven-plugin -8.1.7.v20120910 +8.1.16.v20140903 CTRL+C 8999 @@ -72,6 +78,12 @@ src/main/webapp/WEB-INF/web.xml + + +xwork.loggerFactory + com.opensymphony.xwork2.util.logging.log4j2.Log4j2LoggerFactory + + http://git-wip-us.apache.org/repos/asf/struts/blob/093532ed/apps/blank/src/main/resources/log4j.properties -- diff --git a/apps/blank/src/main/resources/log4j.properties b/apps/blank/src/main/resources/log4j.properties deleted file mode 100644 index 3c5af7c..000 --- a/apps/blank/src/main/resources/log4j.properties +++ /dev/null @@ -1,26 +0,0 @@ -# -# Log4J Settings for log4j 1.2.x (via jakarta-commons-logging) -# -# The five logging levels used by Log are (in order): -# -# 1. DEBUG (the least serious) -# 2. INFO -# 3. WARN -# 4. ERROR -# 5. FATAL (the most serious) - - -# Set root logger level to WARN and append to stdout -log4j.rootLogger=INFO, stdout -log4j.appender.stdout=org.apache.log4j.ConsoleAppender -log4j.appender.stdout.Target=System.out -log4j.appender.stdout.layout=org.apache.log4j.PatternLayout - -# Pattern to output the caller's file name and line number. -log4j.appender.stdout.layout.ConversionPattern=%d %5p (%c:%L) - %m%n - -# Print only messages of level ERROR or above in the package noModule. -log4j.logger.noModule=FATAL - -log4j.logger.com.opensymphony.xwork2=DEBUG -log4j.logger.org.apache.struts2=DEBUG http://git-wip-us.apache.org/repos/asf/struts/blob/093532ed/apps/blank/src/main/resources/log4j2.xml -- diff --git a/apps/blank/src/main/resources/log4j2.xml b/apps/blank/src/main/resources/log4j2.xml new file mode 100644 index 000..aee8b3b --- /dev/null +++ b/apps/blank/src/main/resources/log4j2.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + \ No newline at end of file http://git-wip-us.apache.org/repos/asf/struts/blob/093532ed/apps/mailreader/pom.xml -- diff --git a/apps/mailreader/pom.xml b/apps/mailreader/pom.xml index 5d38811..022c4ef 100644 --- a/apps/mailreader/pom.xml +++ b/apps/mailreader/pom.xml @@ -63,7 +63,7 @@ org.mortbay.jetty jetty-maven-plugin -8.1.7.v20120910 +8.1.16.v20
struts git commit: WW-4492 Add support for Log4J2 as a struts and xwork logging backend
Repository: struts
Updated Branches:
refs/heads/develop 093532edc -> 951a4f8f2
WW-4492 Add support for Log4J2 as a struts and xwork logging backend
- Extend xwork LoggerFactory to autodetect log4j2 if available in classpath
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/951a4f8f
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/951a4f8f
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/951a4f8f
Branch: refs/heads/develop
Commit: 951a4f8f2bf91d5b9cf6141b3ba00fcc7202fa1b
Parents: 093532e
Author: Johannes Geppert
Authored: Sat Apr 18 21:27:22 2015 +0200
Committer: Johannes Geppert
Committed: Sat Apr 18 21:27:22 2015 +0200
--
.../opensymphony/xwork2/util/logging/LoggerFactory.java | 10 +-
1 file changed, 9 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/951a4f8f/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/LoggerFactory.java
--
diff --git
a/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/LoggerFactory.java
b/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/LoggerFactory.java
index e9c20f0..6326cfc 100644
---
a/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/LoggerFactory.java
+++
b/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/LoggerFactory.java
@@ -18,6 +18,7 @@ package com.opensymphony.xwork2.util.logging;
import com.opensymphony.xwork2.XWorkConstants;
import com.opensymphony.xwork2.XWorkException;
import com.opensymphony.xwork2.util.logging.jdk.JdkLoggerFactory;
+import com.opensymphony.xwork2.util.logging.log4j2.Log4j2LoggerFactory;
import com.opensymphony.xwork2.util.logging.slf4j.Slf4jLoggerFactory;
import java.util.concurrent.locks.ReadWriteLock;
@@ -80,7 +81,14 @@ public abstract class LoggerFactory {
Class.forName("org.slf4j.LoggerFactory");
factory = new Slf4jLoggerFactory();
} catch (ClassNotFoundException cnfex) {
-// slf4j not found, falling back to jdk logging
+// slf4j not found try if log4j2 is available in
classpath
+try {
+
Class.forName("org.apache.logging.log4j.LogManager");
+factory = new Log4j2LoggerFactory();
+} catch (ClassNotFoundException cnfex2) {
+// log4j2 not found, falling back to jdk
logging
+factory = new JdkLoggerFactory();
+}
factory = new JdkLoggerFactory();
}
}
