This is an automated email from the ASF dual-hosted git repository.
veithen pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git
The following commit(s) were added to refs/heads/master by this push:
new f7fbaac AXIS2-5993: Get the log4j config from axis2-kernel
f7fbaac is described below
commit f7fbaac371b761761d743418f374962b1e137127
Author: Andreas Veithen <andreas.veit...@gmail.com>
AuthorDate: Thu Dec 24 16:02:51 2020 +0000
AXIS2-5993: Get the log4j config from axis2-kernel
Previously, in axis2-webapp we copied the log4j.properties file from the
axis2-kernel module. This was changed in 8c1c8dd, but that resulted in
the inclusion of an unexpected file in the war (namely web.xml under
WEB-INF/classes). Revert that change and instead copy the log4j2.xml
file from axis2-kernel.
---
modules/webapp/conf/log4j2.xml | 22 ----------------------
modules/webapp/pom.xml | 9 ++-------
2 files changed, 2 insertions(+), 29 deletions(-)
diff --git a/modules/webapp/conf/log4j2.xml b/modules/webapp/conf/log4j2.xml
deleted file mode 100644
index 6decd11..0000000
--- a/modules/webapp/conf/log4j2.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Configuration status="debug" name="axis2" packages="">
- <Appenders>
- <Console name="Console" target="SYSTEM_OUT">
- <PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36}
- %msg%n"/>
- </Console>
- </Appenders>
- <Loggers>
- <Logger name="org.apache" level="warn" additivity="false" >
- <AppenderRef ref="Console"/>
- </Logger>
- <Logger name="org.apache.axis2" level="debug" additivity="false" >
- <AppenderRef ref="Console"/>
- </Logger>
- <Logger name="org.springframework" level="warn" additivity="false" >
- <AppenderRef ref="Console"/>
- </Logger>
- <Root level="debug">
- <AppenderRef ref="Console"/>
- </Root>
- </Loggers>
-</Configuration>
diff --git a/modules/webapp/pom.xml b/modules/webapp/pom.xml
index 41f5bb6..fb08739 100644
--- a/modules/webapp/pom.xml
+++ b/modules/webapp/pom.xml
@@ -258,6 +258,7 @@
<directory>${project.build.directory}/kernel/conf</directory>
<includes>
<include>*.properties</include>
+ <include>log4j2.xml</include>
</includes>
</resource>
</resources>
@@ -348,6 +349,7 @@
<directory>../kernel/conf</directory>
<includes>
<include>*.properties</include>
+ <include>log4j2.xml</include>
</includes>
</resource>
</resources>
@@ -404,13 +406,6 @@
<exclude>servlet*.txt</exclude>
</excludes>
</resource>
- <resource>
- <directory>conf</directory>
- <targetPath>WEB-INF/classes</targetPath>
- <includes>
- <include>*.xml</include>
- </includes>
- </resource>
</webResources>
</configuration>
</plugin>
