Apache/struts
1
0
Fork 0
mirror of https://github.com/apache/struts.git synced 2026-08-11 01:27:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

WW-4504 - Mark current logging layer as @deprecated and use Log4j2 as default one

Browse Source 
- Use log4j2 in all archetypes
This commit is contained in:
Johannes Geppert
2015-05-25 21:47:03 +02:00
parent 88649ff82c
commit 93a307b95e
8 changed files with 43 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/pom.xml
-5
View File
@@ -47,11 +47,6 @@
<version>\${struts2.version}</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
<version>\${log4j2.version}</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/pom.xml
-6
View File
@@ -35,12 +35,6 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
<version>\${log4j2.version}</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
archetypes/struts2-archetype-convention/src/main/resources/archetype-resources/pom.xml
-5
View File
@@ -41,11 +41,6 @@
<version>\${struts2.version}</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
<version>\${log4j2.version}</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
archetypes/struts2-archetype-dbportlet/src/main/resources/archetype-resources/pom.xml
+6
View File
@@ -92,6 +92,12 @@
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>\${log4j2.version}</version>
</dependency>
</dependencies>
<build>
archetypes/struts2-archetype-dbportlet/src/main/resources/archetype-resources/src/main/resources/log4j2.xml
+16
View File
@@ -0,0 +1,16 @@
<?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>
<Logger name="com.opensymphony.xwork2" level="info"/>
<Logger name="org.apache.struts2" level="info"/>
<Logger name="\${groupId}" level="debug"/>
<Root level="warn">
<AppenderRef ref="STDOUT"/>
</Root>
</Loggers>
</Configuration>
archetypes/struts2-archetype-starter/src/main/resources/archetype-resources/pom.xml
+4 -9
View File
@@ -70,16 +70,11 @@
<version>1.3</version>
</dependency>
<!-- Logging -->
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.1.3</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.17</version>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>\${log4j2.version}</version>
</dependency>
<!-- Dwr -->
archetypes/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/resources/log4j.properties
-20
View File
@@ -1,20 +0,0 @@
log4j.rootLogger = DEBUG, stdout
log4j.category.com.opensymphony.sitemesh=DEBUG
log4j.category.org.apache.struts2=INFO
log4j.category.org.apache=INFO
log4j.category.catalia=INFO
log4j.appender.stdout = org.apache.log4j.ConsoleAppender
log4j.appender.stdout.Threshold = DEBUG
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
archetypes/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/resources/log4j2.xml
+17
View File
@@ -0,0 +1,17 @@
<?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>
<Logger name="com.opensymphony.sitemesh" level="info"/>
<Logger name="com.opensymphony.xwork2" level="info"/>
<Logger name="org.apache.struts2" level="info"/>
<Logger name="\${groupId}" level="debug"/>
<Root level="warn">
<AppenderRef ref="STDOUT"/>
</Root>
</Loggers>
</Configuration>