WW-4504 - Mark current logging layer as @deprecated and use Log4j2 as default one
- Use log4j2 in all provided apps Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/88649ff8 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/88649ff8 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/88649ff8 Branch: refs/heads/master Commit: 88649ff82caf180c66afdd49d90b3e0cede09f12 Parents: 8e87711 Author: Johannes Geppert <joh...@gmail.com> Authored: Mon May 25 21:42:08 2015 +0200 Committer: Johannes Geppert <joh...@gmail.com> Committed: Mon May 25 21:42:08 2015 +0200 ---------------------------------------------------------------------- apps/blank/pom.xml | 12 +----- apps/blank/src/main/resources/log4j2.xml | 4 +- apps/jboss-blank/pom.xml | 8 ++++ apps/jboss-blank/src/main/resources/log4j2.xml | 15 +++++++ apps/mailreader/pom.xml | 31 ++++++-------- .../src/main/resources/log4j.properties | 36 ---------------- apps/mailreader/src/main/resources/log4j2.xml | 16 +++++++ apps/portlet/pom.xml | 12 +++++- apps/portlet/src/main/resources/log4j.xml | 15 ------- apps/portlet/src/main/resources/log4j2.xml | 15 +++++++ apps/rest-showcase/pom.xml | 1 + apps/showcase/pom.xml | 44 ++++++++------------ .../showcase/action/AbstractCRUDAction.java | 5 ++- .../struts2/showcase/action/EmployeeAction.java | 5 ++- .../struts2/showcase/action/SkillAction.java | 5 ++- .../showcase/application/TestDataProvider.java | 5 ++- .../src/main/resources/log4j.properties | 33 --------------- apps/showcase/src/main/resources/log4j2.xml | 16 +++++++ .../src/main/webapp/WEB-INF/decorators/main.jsp | 8 ++-- apps/showcase/src/main/webapp/WEB-INF/web.xml | 22 +--------- 20 files changed, 133 insertions(+), 175 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/struts/blob/88649ff8/apps/blank/pom.xml ---------------------------------------------------------------------- diff --git a/apps/blank/pom.xml b/apps/blank/pom.xml index f10b53c..cec84f6 100644 --- a/apps/blank/pom.xml +++ b/apps/blank/pom.xml @@ -47,11 +47,7 @@ <scope>provided</scope> </dependency> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-api</artifactId> - <version>${log4j2.version}</version> - </dependency> + <!-- Logging --> <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-core</artifactId> @@ -78,12 +74,6 @@ <scanTargets> <scanTarget>src/main/webapp/WEB-INF/web.xml</scanTarget> </scanTargets> - <systemProperties> - <systemProperty> - <name>xwork.loggerFactory</name> - <value>com.opensymphony.xwork2.util.logging.log4j2.Log4j2LoggerFactory</value> - </systemProperty> - </systemProperties> </configuration> </plugin> </plugins> http://git-wip-us.apache.org/repos/asf/struts/blob/88649ff8/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 index aee8b3b..092d5f6 100644 --- a/apps/blank/src/main/resources/log4j2.xml +++ b/apps/blank/src/main/resources/log4j2.xml @@ -6,8 +6,8 @@ </Console> </Appenders> <Loggers> - <Logger name="com.opensymphony.xwork2" level="debug"/> - <Logger name="org.apache.struts2" level="debug"/> + <Logger name="com.opensymphony.xwork2" level="info"/> + <Logger name="org.apache.struts2" level="info"/> <Root level="warn"> <AppenderRef ref="STDOUT"/> </Root> http://git-wip-us.apache.org/repos/asf/struts/blob/88649ff8/apps/jboss-blank/pom.xml ---------------------------------------------------------------------- diff --git a/apps/jboss-blank/pom.xml b/apps/jboss-blank/pom.xml index 0b395cc..07f0166 100644 --- a/apps/jboss-blank/pom.xml +++ b/apps/jboss-blank/pom.xml @@ -48,6 +48,14 @@ <version>2.0</version> <scope>provided</scope> </dependency> + + <!-- Logging --> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> + <version>${log4j2.version}</version> + </dependency> + <dependency> <groupId>${project.groupId}</groupId> <artifactId>struts2-junit-plugin</artifactId> http://git-wip-us.apache.org/repos/asf/struts/blob/88649ff8/apps/jboss-blank/src/main/resources/log4j2.xml ---------------------------------------------------------------------- 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 0000000..abe3dde --- /dev/null +++ b/apps/jboss-blank/src/main/resources/log4j2.xml @@ -0,0 +1,15 @@ +<?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"/> + <Root level="info"> + <AppenderRef ref="STDOUT"/> + </Root> + </Loggers> +</Configuration> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/struts/blob/88649ff8/apps/mailreader/pom.xml ---------------------------------------------------------------------- diff --git a/apps/mailreader/pom.xml b/apps/mailreader/pom.xml index 9e3e105..0965639 100644 --- a/apps/mailreader/pom.xml +++ b/apps/mailreader/pom.xml @@ -47,6 +47,18 @@ <version>1.3.5</version> </dependency> + <!-- Logging --> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> + <version>${log4j2.version}</version> + </dependency> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-jcl</artifactId> + <version>${log4j2.version}</version> + </dependency> + </dependencies> <build> @@ -67,30 +79,13 @@ <configuration> <stopKey>CTRL+C</stopKey> <stopPort>8999</stopPort> - <systemProperties> - <systemProperty> - <name>log4j.configuration</name> - <value>file:${basedir}/src/main/resources/log4j.properties</value> - </systemProperty> - <systemProperty> - <name>slf4j</name> - <value>false</value> - </systemProperty> - </systemProperties> - <scanIntervalSeconds>10</scanIntervalSeconds> + <scanIntervalSeconds>10</scanIntervalSeconds> <webAppSourceDirectory>${basedir}/src/main/webapp/</webAppSourceDirectory> <webAppConfig> <contextPath>/struts2-mailreader</contextPath> <descriptor>${basedir}/src/main/webapp/WEB-INF/web.xml</descriptor> </webAppConfig> </configuration> - <dependencies> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>1.2.17</version> - </dependency> - </dependencies> </plugin> </plugins> </build> http://git-wip-us.apache.org/repos/asf/struts/blob/88649ff8/apps/mailreader/src/main/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/apps/mailreader/src/main/resources/log4j.properties b/apps/mailreader/src/main/resources/log4j.properties deleted file mode 100644 index e350a2d..0000000 --- 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 - http://git-wip-us.apache.org/repos/asf/struts/blob/88649ff8/apps/mailreader/src/main/resources/log4j2.xml ---------------------------------------------------------------------- diff --git a/apps/mailreader/src/main/resources/log4j2.xml b/apps/mailreader/src/main/resources/log4j2.xml new file mode 100644 index 0000000..913b299 --- /dev/null +++ b/apps/mailreader/src/main/resources/log4j2.xml @@ -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="org.springframework" level="info"/> + <Root level="info"> + <AppenderRef ref="STDOUT"/> + </Root> + </Loggers> +</Configuration> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/struts/blob/88649ff8/apps/portlet/pom.xml ---------------------------------------------------------------------- diff --git a/apps/portlet/pom.xml b/apps/portlet/pom.xml index fc7d199..a5a7adc 100644 --- a/apps/portlet/pom.xml +++ b/apps/portlet/pom.xml @@ -137,9 +137,17 @@ <groupId>commons-collections</groupId> <artifactId>commons-collections</artifactId> </dependency> + + <!-- Logging --> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-api</artifactId> + <version>${log4j2.version}</version> + </dependency> <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> + <version>${log4j2.version}</version> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/struts/blob/88649ff8/apps/portlet/src/main/resources/log4j.xml ---------------------------------------------------------------------- diff --git a/apps/portlet/src/main/resources/log4j.xml b/apps/portlet/src/main/resources/log4j.xml deleted file mode 100644 index c6803da..0000000 --- a/apps/portlet/src/main/resources/log4j.xml +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version="1.0"?> -<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd"> - -<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/";> - <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender"> - <layout class="org.apache.log4j.PatternLayout"> - <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c] %m%n"/> - </layout> - </appender> - - <root> - <priority value="ERROR"/> - <appender-ref ref="CONSOLE"/> - </root> -</log4j:configuration> http://git-wip-us.apache.org/repos/asf/struts/blob/88649ff8/apps/portlet/src/main/resources/log4j2.xml ---------------------------------------------------------------------- diff --git a/apps/portlet/src/main/resources/log4j2.xml b/apps/portlet/src/main/resources/log4j2.xml new file mode 100644 index 0000000..092d5f6 --- /dev/null +++ b/apps/portlet/src/main/resources/log4j2.xml @@ -0,0 +1,15 @@ +<?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"/> + <Root level="warn"> + <AppenderRef ref="STDOUT"/> + </Root> + </Loggers> +</Configuration> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/struts/blob/88649ff8/apps/rest-showcase/pom.xml ---------------------------------------------------------------------- diff --git a/apps/rest-showcase/pom.xml b/apps/rest-showcase/pom.xml index 65f9130..b02923c 100644 --- a/apps/rest-showcase/pom.xml +++ b/apps/rest-showcase/pom.xml @@ -49,6 +49,7 @@ <artifactId>struts2-config-browser-plugin</artifactId> </dependency> + <!-- Logging --> <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-api</artifactId> http://git-wip-us.apache.org/repos/asf/struts/blob/88649ff8/apps/showcase/pom.xml ---------------------------------------------------------------------- diff --git a/apps/showcase/pom.xml b/apps/showcase/pom.xml index 8d2beab..bf70001 100644 --- a/apps/showcase/pom.xml +++ b/apps/showcase/pom.xml @@ -92,6 +92,23 @@ <scope>provided</scope> </dependency> + <!-- Logging --> + <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> + <version>${log4j2.version}</version> + </dependency> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-jcl</artifactId> + <version>${log4j2.version}</version> + </dependency> + <!-- Velocity --> <dependency> <groupId>org.apache.velocity</groupId> @@ -112,24 +129,6 @@ <artifactId>dwr</artifactId> </dependency> <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </dependency> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </dependency> - <dependency> - <groupId>org.apache.myfaces.core</groupId> - <artifactId>myfaces-impl</artifactId> - <version>1.1.2</version> - </dependency> - <dependency> - <groupId>org.apache.myfaces.core</groupId> - <artifactId>myfaces-api</artifactId> - <version>1.1.2</version> - </dependency> - <dependency> <groupId>commons-fileupload</groupId> <artifactId>commons-fileupload</artifactId> </dependency> @@ -189,14 +188,7 @@ <descriptor>${basedir}/src/main/webapp/WEB-INF/web.xml</descriptor> </webAppConfig> </configuration> - <dependencies> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>1.2.17</version> - </dependency> - </dependencies> - </plugin> + </plugin> <plugin> <artifactId>maven-surefire-plugin</artifactId> http://git-wip-us.apache.org/repos/asf/struts/blob/88649ff8/apps/showcase/src/main/java/org/apache/struts2/showcase/action/AbstractCRUDAction.java ---------------------------------------------------------------------- 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 e2db05c..42e51a5 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; http://git-wip-us.apache.org/repos/asf/struts/blob/88649ff8/apps/showcase/src/main/java/org/apache/struts2/showcase/action/EmployeeAction.java ---------------------------------------------------------------------- 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 d0ebb32..2115970 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; http://git-wip-us.apache.org/repos/asf/struts/blob/88649ff8/apps/showcase/src/main/java/org/apache/struts2/showcase/action/SkillAction.java ---------------------------------------------------------------------- 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 bbd1346..ebc1b0b 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; http://git-wip-us.apache.org/repos/asf/struts/blob/88649ff8/apps/showcase/src/main/java/org/apache/struts2/showcase/application/TestDataProvider.java ---------------------------------------------------------------------- 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 c45e718..6e60ebf 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", http://git-wip-us.apache.org/repos/asf/struts/blob/88649ff8/apps/showcase/src/main/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/apps/showcase/src/main/resources/log4j.properties b/apps/showcase/src/main/resources/log4j.properties deleted file mode 100644 index acb4e6e..0000000 --- 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 - http://git-wip-us.apache.org/repos/asf/struts/blob/88649ff8/apps/showcase/src/main/resources/log4j2.xml ---------------------------------------------------------------------- diff --git a/apps/showcase/src/main/resources/log4j2.xml b/apps/showcase/src/main/resources/log4j2.xml new file mode 100644 index 0000000..913b299 --- /dev/null +++ b/apps/showcase/src/main/resources/log4j2.xml @@ -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="org.springframework" level="info"/> + <Root level="info"> + <AppenderRef ref="STDOUT"/> + </Root> + </Loggers> +</Configuration> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/struts/blob/88649ff8/apps/showcase/src/main/webapp/WEB-INF/decorators/main.jsp ---------------------------------------------------------------------- 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 5d1747b..1479f18 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 @@ <span class="icon-bar"></span> <span class="icon-bar"></span> </a> - <s:a value="/showcase.jsp" cssClass="brand">Struts2 Showcase</s:a> + <s:url var="home" action="showcase" namespace="/" includeContext="false" /> + <s:a value="%{home}" cssClass="brand">Struts2 Showcase</s:a> <div class="nav-collapse"> <ul class="nav"> - <li><s:a value="/showcase.jsp"><i class="icon-home"></i> Home</s:a></li> + <li><s:a value="%{home}"><i class="icon-home"></i> Home</s:a></li> <li class="dropdown"> <a href="#" class="dropdown-toggle" data-toggle="dropdown">Configuration<b class="caret"></b></a> @@ -94,7 +95,8 @@ includeParams="none">Action Chaining</s:a></li> <li><s:a action="index" namespace="/config-browser" includeParams="none">Config Browser</s:a></li> - <li><s:a value="/conversion/index.jsp">Conversion</s:a></li> + <s:url var="conversion" action="index" namespace="/conversion" includeContext="false" /> + <li><s:a value="%{conversion}">Conversion</s:a></li> <li><s:a value="/person/index.html">Person Manager ( by Conventions )</s:a></li> </ul> </li> http://git-wip-us.apache.org/repos/asf/struts/blob/88649ff8/apps/showcase/src/main/webapp/WEB-INF/web.xml ---------------------------------------------------------------------- diff --git a/apps/showcase/src/main/webapp/WEB-INF/web.xml b/apps/showcase/src/main/webapp/WEB-INF/web.xml index f3b88e9..788c0b4 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 @@ <listener> <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class> </listener> - - <listener> - <listener-class> - org.apache.myfaces.webapp.StartupServletContextListener - </listener-class> - </listener> <listener> <listener-class> @@ -74,14 +68,7 @@ <param-value>true</param-value> </init-param> </servlet> - - <!-- JavaServer Faces Servlet Configuration, not used directly --> - <servlet> - <servlet-name>faces</servlet-name> - <servlet-class>javax.faces.webapp.FacesServlet</servlet-class> - <load-on-startup>1</load-on-startup> - </servlet> - <servlet> + <servlet> <servlet-name>JspSupportServlet</servlet-name> <servlet-class>org.apache.struts2.views.JspSupportServlet</servlet-class> <load-on-startup>1</load-on-startup> @@ -108,13 +95,6 @@ <load-on-startup>1</load-on-startup> </servlet> - - <!-- JavaServer Faces Servlet Mapping, not called directly --> - <servlet-mapping> - <servlet-name>faces</servlet-name> - <url-pattern>*.action</url-pattern> - </servlet-mapping> - <servlet-mapping> <servlet-name>dwr</servlet-name> <url-pattern>/dwr/*</url-pattern>
