- remove unused link to home.html, instead just link to '#'
- removed taglib from web.xml
- use 2.4 web.xml instead of 2.3
- added missing resource tag to log4j.properties in archetype.xml
git-svn-id: https://svn.apache.org/repos/asf/struts/maven/trunk@472338 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/struts2-archetype-starter/src/main/resources/META-INF/archetype.xml b/struts2-archetype-starter/src/main/resources/META-INF/archetype.xml
index cfa1e8d..d0eeae6 100644
--- a/struts2-archetype-starter/src/main/resources/META-INF/archetype.xml
+++ b/struts2-archetype-starter/src/main/resources/META-INF/archetype.xml
@@ -17,6 +17,7 @@
<resource>src/main/resources/xwork-conversion.properties</resource>
<resource>src/main/resources/struts.properties</resource>
<resource>src/main/resources/applicationContext.xml</resource>
+ <resource>src/main/resources/log4j.properties</resource>
<resource>src/main/webapp/ftl/index.ftl</resource>
<resource>src/main/webapp/ftl/helloWorld.ftl</resource>
<resource>src/main/webapp/WEB-INF/decorators/main.ftl</resource>
diff --git a/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/decorators/main.ftl b/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/decorators/main.ftl
index 7f1d0ab..24b8bbb 100644
--- a/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/decorators/main.ftl
+++ b/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/decorators/main.ftl
@@ -57,7 +57,7 @@
<div class="wrapper">
<h3>Nav. bar</h3>
<ul class="clearfix">
- <li><a href="home.html">Home</a></li>
+ <li><a href="#">Home</a></li>
<li><a href="#">Articles</a></li>
<li><a href="#">Archive</a></li>
<li><a href="#">Photos</a></li>
@@ -79,4 +79,4 @@
<div id="extra2"> </div>
</body>
</html>
-
\ No newline at end of file
+
diff --git a/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml b/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
index a6d20b9..53c156f 100644
--- a/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
+++ b/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
@@ -1,9 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE web-app PUBLIC
- "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
- "http://java.sun.com/dtd/web-app_2_3.dtd">
+
+<web-app id="starter" version="2.4"
+ xmlns="http://java.sun.com/xml/ns/j2ee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
-<web-app>
<display-name>Struts 2 - Maven Archetype - Starter</display-name>
<context-param>
@@ -59,6 +60,11 @@
<param-value>true</param-value>
</init-param>
</servlet>
+ <servlet>
+ <servlet-name>jspSupportServlet</servlet-name>
+ <servlet-class>org.apache.struts2.views.JspSupportServlet</servlet-class>
+ <load-on-startup>5</load-on-startup>
+ </servlet>
<servlet-mapping>
<servlet-name>dwr</servlet-name>
@@ -73,14 +79,4 @@
<welcome-file>index.html</welcome-file>
</welcome-file-list>
-
- <!-- Taglibs -->
- <taglib>
- <taglib-uri>sitemesh-page</taglib-uri>
- <taglib-location>/WEB-INF/sitemesh-page.tld</taglib-location>
- </taglib>
- <taglib>
- <taglib-uri>sitemesh-decorator</taglib-uri>
- <taglib-location>/WEB-INF/sitemesh-decorator.tld</taglib-location>
- </taglib>
</web-app>
