diff --git a/apps/blank/pom.xml b/apps/blank/pom.xml index f10b53cf4..cec84f6b9 100644 --- a/apps/blank/pom.xml +++ b/apps/blank/pom.xml @@ -47,11 +47,7 @@ provided - - org.apache.logging.log4j - log4j-api - ${log4j2.version} - + org.apache.logging.log4j log4j-core @@ -78,12 +74,6 @@ src/main/webapp/WEB-INF/web.xml - - - xwork.loggerFactory - com.opensymphony.xwork2.util.logging.log4j2.Log4j2LoggerFactory - - diff --git a/apps/blank/src/main/resources/log4j2.xml b/apps/blank/src/main/resources/log4j2.xml index aee8b3be6..092d5f60b 100644 --- a/apps/blank/src/main/resources/log4j2.xml +++ b/apps/blank/src/main/resources/log4j2.xml @@ -6,8 +6,8 @@ - - + + diff --git a/apps/jboss-blank/pom.xml b/apps/jboss-blank/pom.xml index 0b395cc1f..07f016677 100644 --- a/apps/jboss-blank/pom.xml +++ b/apps/jboss-blank/pom.xml @@ -48,6 +48,14 @@ 2.0 provided + + + + org.apache.logging.log4j + log4j-core + ${log4j2.version} + + ${project.groupId} struts2-junit-plugin diff --git a/apps/jboss-blank/src/main/resources/log4j2.xml b/apps/jboss-blank/src/main/resources/log4j2.xml new file mode 100644 index 000000000..abe3dde77 --- /dev/null +++ b/apps/jboss-blank/src/main/resources/log4j2.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/apps/mailreader/pom.xml b/apps/mailreader/pom.xml index 9e3e10578..0965639bb 100644 --- a/apps/mailreader/pom.xml +++ b/apps/mailreader/pom.xml @@ -47,6 +47,18 @@ 1.3.5 + + + org.apache.logging.log4j + log4j-core + ${log4j2.version} + + + org.apache.logging.log4j + log4j-jcl + ${log4j2.version} + + @@ -67,30 +79,13 @@ CTRL+C 8999 - - - log4j.configuration - file:${basedir}/src/main/resources/log4j.properties - - - slf4j - false - - - 10 + 10 ${basedir}/src/main/webapp/ /struts2-mailreader ${basedir}/src/main/webapp/WEB-INF/web.xml - - - log4j - log4j - 1.2.17 - - diff --git a/apps/mailreader/src/main/resources/log4j.properties b/apps/mailreader/src/main/resources/log4j.properties deleted file mode 100644 index e350a2d70..000000000 --- a/apps/mailreader/src/main/resources/log4j.properties +++ /dev/null @@ -1,36 +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 - -# OpenSymphony Stuff -log4j.logger.freemarker=INFO -log4j.logger.com.opensymphony=INFO -log4j.logger.com.opensymphony.xwork2.ognl=ERROR -log4j.logger.org.apache.struts2=WARN -log4j.logger.org.apache.struts2.components=WARN -log4j.logger.org.apache.struts2.dispatcher=WARN -log4j.logger.org.apache.struts2.convention=INFO - -# Spring Stuff -log4j.logger.org.springframework=WARN - diff --git a/apps/mailreader/src/main/resources/log4j2.xml b/apps/mailreader/src/main/resources/log4j2.xml new file mode 100644 index 000000000..913b29930 --- /dev/null +++ b/apps/mailreader/src/main/resources/log4j2.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/apps/portlet/pom.xml b/apps/portlet/pom.xml index fc7d19995..a5a7adc69 100644 --- a/apps/portlet/pom.xml +++ b/apps/portlet/pom.xml @@ -137,9 +137,17 @@ commons-collections commons-collections + + - log4j - log4j + org.apache.logging.log4j + log4j-api + ${log4j2.version} + + + org.apache.logging.log4j + log4j-core + ${log4j2.version} diff --git a/apps/portlet/src/main/resources/log4j.xml b/apps/portlet/src/main/resources/log4j.xml deleted file mode 100644 index c6803daad..000000000 --- a/apps/portlet/src/main/resources/log4j.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/apps/portlet/src/main/resources/log4j2.xml b/apps/portlet/src/main/resources/log4j2.xml new file mode 100644 index 000000000..092d5f60b --- /dev/null +++ b/apps/portlet/src/main/resources/log4j2.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/apps/rest-showcase/pom.xml b/apps/rest-showcase/pom.xml index 65f913050..b02923cd1 100644 --- a/apps/rest-showcase/pom.xml +++ b/apps/rest-showcase/pom.xml @@ -49,6 +49,7 @@ struts2-config-browser-plugin + org.apache.logging.log4j log4j-api diff --git a/apps/showcase/pom.xml b/apps/showcase/pom.xml index 8d2beabe2..bf70001df 100644 --- a/apps/showcase/pom.xml +++ b/apps/showcase/pom.xml @@ -92,6 +92,23 @@ provided + + + org.apache.logging.log4j + log4j-api + ${log4j2.version} + + + org.apache.logging.log4j + log4j-core + ${log4j2.version} + + + org.apache.logging.log4j + log4j-jcl + ${log4j2.version} + + org.apache.velocity @@ -111,24 +128,6 @@ uk.ltd.getahead dwr - - log4j - log4j - - - commons-logging - commons-logging - - - org.apache.myfaces.core - myfaces-impl - 1.1.2 - - - org.apache.myfaces.core - myfaces-api - 1.1.2 - commons-fileupload commons-fileupload @@ -189,14 +188,7 @@ ${basedir}/src/main/webapp/WEB-INF/web.xml - - - log4j - log4j - 1.2.17 - - - + maven-surefire-plugin diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/action/AbstractCRUDAction.java b/apps/showcase/src/main/java/org/apache/struts2/showcase/action/AbstractCRUDAction.java index e2db05c70..42e51a5c8 100644 --- a/apps/showcase/src/main/java/org/apache/struts2/showcase/action/AbstractCRUDAction.java +++ b/apps/showcase/src/main/java/org/apache/struts2/showcase/action/AbstractCRUDAction.java @@ -21,7 +21,8 @@ package org.apache.struts2.showcase.action; import com.opensymphony.xwork2.ActionSupport; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.apache.struts2.showcase.dao.Dao; import org.apache.struts2.showcase.model.IdEntity; @@ -34,7 +35,7 @@ import java.util.Collection; public abstract class AbstractCRUDAction extends ActionSupport { - private static final Logger log = Logger.getLogger(AbstractCRUDAction.class); + private static final Logger log = LogManager.getLogger(AbstractCRUDAction.class); private Collection availableItems; private String[] toDelete; diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/action/EmployeeAction.java b/apps/showcase/src/main/java/org/apache/struts2/showcase/action/EmployeeAction.java index d0ebb32a6..21159705f 100644 --- a/apps/showcase/src/main/java/org/apache/struts2/showcase/action/EmployeeAction.java +++ b/apps/showcase/src/main/java/org/apache/struts2/showcase/action/EmployeeAction.java @@ -21,7 +21,8 @@ package org.apache.struts2.showcase.action; import com.opensymphony.xwork2.Preparable; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.apache.struts2.showcase.application.TestDataProvider; import org.apache.struts2.showcase.dao.Dao; import org.apache.struts2.showcase.dao.EmployeeDao; @@ -42,7 +43,7 @@ public class EmployeeAction extends AbstractCRUDAction implements Preparable { private static final long serialVersionUID = 7047317819789938957L; - private static final Logger log = Logger.getLogger(EmployeeAction.class); + private static final Logger log = LogManager.getLogger(EmployeeAction.class); @Autowired private EmployeeDao employeeDao; diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/action/SkillAction.java b/apps/showcase/src/main/java/org/apache/struts2/showcase/action/SkillAction.java index bbd1346f2..ebc1b0b48 100644 --- a/apps/showcase/src/main/java/org/apache/struts2/showcase/action/SkillAction.java +++ b/apps/showcase/src/main/java/org/apache/struts2/showcase/action/SkillAction.java @@ -21,7 +21,8 @@ package org.apache.struts2.showcase.action; import com.opensymphony.xwork2.Preparable; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.apache.struts2.showcase.dao.Dao; import org.apache.struts2.showcase.dao.SkillDao; import org.apache.struts2.showcase.model.Skill; @@ -33,7 +34,7 @@ import org.springframework.beans.factory.annotation.Autowired; public class SkillAction extends AbstractCRUDAction implements Preparable { - private static final Logger log = Logger.getLogger(SkillAction.class); + private static final Logger log = LogManager.getLogger(SkillAction.class); @Autowired private SkillDao skillDao; diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/application/TestDataProvider.java b/apps/showcase/src/main/java/org/apache/struts2/showcase/application/TestDataProvider.java index c45e71803..6e60ebfdd 100644 --- a/apps/showcase/src/main/java/org/apache/struts2/showcase/application/TestDataProvider.java +++ b/apps/showcase/src/main/java/org/apache/struts2/showcase/application/TestDataProvider.java @@ -20,7 +20,8 @@ */ package org.apache.struts2.showcase.application; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.apache.struts2.showcase.dao.EmployeeDao; import org.apache.struts2.showcase.dao.SkillDao; import org.apache.struts2.showcase.exception.StorageException; @@ -41,7 +42,7 @@ import java.util.Date; public class TestDataProvider implements Serializable, InitializingBean { private static final long serialVersionUID = 1L; - private static final Logger log = Logger.getLogger(TestDataProvider.class); + private static final Logger log = LogManager.getLogger(TestDataProvider.class); public static final String[] POSITIONS = { "Developer", diff --git a/apps/showcase/src/main/resources/log4j.properties b/apps/showcase/src/main/resources/log4j.properties deleted file mode 100644 index acb4e6eb9..000000000 --- a/apps/showcase/src/main/resources/log4j.properties +++ /dev/null @@ -1,33 +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=INFO - -# OpenSymphony Stuff -log4j.logger.freemarker=INFO -log4j.logger.com.opensymphony=INFO -log4j.logger.com.opensymphony.xwork2.ognl=INFO -log4j.logger.org.apache.struts2=INFO - -# Spring Stuff -log4j.logger.org.springframework=INFO - diff --git a/apps/showcase/src/main/resources/log4j2.xml b/apps/showcase/src/main/resources/log4j2.xml new file mode 100644 index 000000000..913b29930 --- /dev/null +++ b/apps/showcase/src/main/resources/log4j2.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/apps/showcase/src/main/webapp/WEB-INF/decorators/main.jsp b/apps/showcase/src/main/webapp/WEB-INF/decorators/main.jsp index 5d1747bc7..1479f1849 100644 --- a/apps/showcase/src/main/webapp/WEB-INF/decorators/main.jsp +++ b/apps/showcase/src/main/webapp/WEB-INF/decorators/main.jsp @@ -82,10 +82,11 @@ - Struts2 Showcase + + Struts2 Showcase
    -
  • Home
    • +
  • Home
  • Configuration @@ -94,7 +95,8 @@ includeParams="none">Action Chaining
  • Config Browser
    • -
  • Conversion
    • + +
  • Conversion
  • Person Manager ( by Conventions )
diff --git a/apps/showcase/src/main/webapp/WEB-INF/web.xml b/apps/showcase/src/main/webapp/WEB-INF/web.xml index f3b88e916..788c0b4cc 100644 --- a/apps/showcase/src/main/webapp/WEB-INF/web.xml +++ b/apps/showcase/src/main/webapp/WEB-INF/web.xml @@ -40,12 +40,6 @@ org.springframework.web.context.ContextLoaderListener - - - - org.apache.myfaces.webapp.StartupServletContextListener - - @@ -74,14 +68,7 @@ true - - - - faces - javax.faces.webapp.FacesServlet - 1 - - + JspSupportServlet org.apache.struts2.views.JspSupportServlet 1 @@ -108,13 +95,6 @@ 1 - - - - faces - *.action - - dwr /dwr/*