From fe58d73f7a76b490df341fb91f95bb2f349b0adb Mon Sep 17 00:00:00 2001
From: Johannes Geppert <johgep@gmail.com>
Date: Tue, 26 May 2015 19:10:57 +0200
Subject: [PATCH] WW-4504 - Mark current logging layer as @deprecated and use
 Log4j2 as default one

- Use log4j2 in xwork tests
---
 xwork-core/pom.xml                             |  7 +++++++
 xwork-core/src/test/resources/log4j.properties |  6 ------
 xwork-core/src/test/resources/log4j2.xml       | 13 +++++++++++++
 3 files changed, 20 insertions(+), 6 deletions(-)
 delete mode 100644 xwork-core/src/test/resources/log4j.properties
 create mode 100644 xwork-core/src/test/resources/log4j2.xml

diff --git a/xwork-core/pom.xml b/xwork-core/pom.xml
index 5bbe611b9..fca191230 100644
--- a/xwork-core/pom.xml
+++ b/xwork-core/pom.xml
@@ -208,6 +208,13 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-core</artifactId>
+            <version>${log4j2.version}</version>
+            <scope>test</scope>
+        </dependency>
+
         <!-- SLF4J support -->
         <dependency>
             <groupId>org.slf4j</groupId>
diff --git a/xwork-core/src/test/resources/log4j.properties b/xwork-core/src/test/resources/log4j.properties
deleted file mode 100644
index cd27a6c7b..000000000
--- a/xwork-core/src/test/resources/log4j.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-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
-log4j.appender.stdout.layout.ConversionPattern = %d{ISO8601} %-5p [%F:%L] : %m%n
diff --git a/xwork-core/src/test/resources/log4j2.xml b/xwork-core/src/test/resources/log4j2.xml
new file mode 100644
index 000000000..263585ef9
--- /dev/null
+++ b/xwork-core/src/test/resources/log4j2.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Configuration>
+    <Appenders>
+        <Console name="STDOUT" target="SYSTEM_OUT">
+            <PatternLayout pattern="%d %-5p [%t] %C{2} (%F:%L) - %m%n"/>
+        </Console>
+    </Appenders>
+    <Loggers>
+        <Root level="info">
+            <AppenderRef ref="STDOUT"/>
+        </Root>
+    </Loggers>
+</Configuration>
\ No newline at end of file