You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by tm...@apache.org on 2006/11/08 00:55:49 UTC
svn commit: r472338 - in
/struts/maven/trunk/struts2-archetype-starter/src/main/resources:
META-INF/archetype.xml
archetype-resources/src/main/webapp/WEB-INF/decorators/main.ftl
archetype-resources/src/main/webapp/WEB-INF/web.xml
Author: tmjee
Date: Tue Nov 7 15:55:48 2006
New Revision: 472338
URL: http://svn.apache.org/viewvc?view=rev&rev=472338
Log:
- 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
Modified:
struts/maven/trunk/struts2-archetype-starter/src/main/resources/META-INF/archetype.xml
struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/decorators/main.ftl
struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
Modified: struts/maven/trunk/struts2-archetype-starter/src/main/resources/META-INF/archetype.xml
URL: http://svn.apache.org/viewvc/struts/maven/trunk/struts2-archetype-starter/src/main/resources/META-INF/archetype.xml?view=diff&rev=472338&r1=472337&r2=472338
==============================================================================
--- struts/maven/trunk/struts2-archetype-starter/src/main/resources/META-INF/archetype.xml (original)
+++ struts/maven/trunk/struts2-archetype-starter/src/main/resources/META-INF/archetype.xml Tue Nov 7 15:55:48 2006
@@ -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>
Modified: struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/decorators/main.ftl
URL: http://svn.apache.org/viewvc/struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/decorators/main.ftl?view=diff&rev=472338&r1=472337&r2=472338
==============================================================================
--- struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/decorators/main.ftl (original)
+++ struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/decorators/main.ftl Tue Nov 7 15:55:48 2006
@@ -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
+
Modified: struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml?view=diff&rev=472338&r1=472337&r2=472338
==============================================================================
--- struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml (original)
+++ struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml Tue Nov 7 15:55:48 2006
@@ -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>
Re: svn commit: r472338 - in /struts/maven/trunk/struts2-archetype-starter/src/main/resources: META-INF/archetype.xml archetype-resources/src/main/webapp/WEB-INF/decorators/main.ftl archetype-resources/src/main/webapp/WEB-INF/web.xml
Posted by tm jee <tm...@yahoo.co.uk>.
Thx for the clarification Craig. :-)
Craig McClanahan <cr...@apache.org> wrote: On 11/8/06, tm jee wrote:
>
> > Does this need a servlet mapping?
>
> I don't think so. It just expose the servlet instance itself such
> that ServletConfig etc. could be obtained . This I think is needed
> when using a jsp taglib in freemarker
You're correct ... a servlet mapping is not required, if all you are after
is the "load on startup" behavior of the container calling init() at startup
time, but you do not want this servlet to process any requests. With the
current generation servlet APIs, you'd more likely do this sort of thing in
a ServletContextListener, but I imagine this design predates that.
rgds.
Craig
Send instant messages to your online friends http://uk.messenger.yahoo.com
Re: svn commit: r472338 - in /struts/maven/trunk/struts2-archetype-starter/src/main/resources: META-INF/archetype.xml archetype-resources/src/main/webapp/WEB-INF/decorators/main.ftl archetype-resources/src/main/webapp/WEB-INF/web.xml
Posted by Craig McClanahan <cr...@apache.org>.
On 11/8/06, tm jee <tm...@yahoo.co.uk> wrote:
>
> > Does this need a servlet mapping?
>
> I don't think so. It just expose the servlet instance itself such
> that ServletConfig etc. could be obtained . This I think is needed
> when using a jsp taglib in freemarker
You're correct ... a servlet mapping is not required, if all you are after
is the "load on startup" behavior of the container calling init() at startup
time, but you do not want this servlet to process any requests. With the
current generation servlet APIs, you'd more likely do this sort of thing in
a ServletContextListener, but I imagine this design predates that.
rgds.
Craig
Re: svn commit: r472338 - in /struts/maven/trunk/struts2-archetype-starter/src/main/resources: META-INF/archetype.xml archetype-resources/src/main/webapp/WEB-INF/decorators/main.ftl archetype-resources/src/main/webapp/WEB-INF/web.xml
Posted by tm jee <tm...@yahoo.co.uk>.
> Does this need a servlet mapping?
I don't think so. It just expose the servlet instance itself such that ServletConfig etc. could be obtained . This I think is needed when using a jsp taglib in freemarker
rgds.
Wendy Smoak <ws...@gmail.com> wrote: On 11/7/06, tmjee@apache.org wrote:
> Author: tmjee
> Date: Tue Nov 7 15:55:48 2006
> New Revision: 472338
>
> URL: http://svn.apache.org/viewvc?view=rev&rev=472338
...
> +
> + jspSupportServlet
> + org.apache.struts2.views.JspSupportServlet
> + 5
> +
Does this need a servlet mapping?
http://svn.apache.org/repos/asf/struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
Thanks,
Wendy
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org
For additional commands, e-mail: dev-help@struts.apache.org
Send instant messages to your online friends http://uk.messenger.yahoo.com
Re: svn commit: r472338 - in /struts/maven/trunk/struts2-archetype-starter/src/main/resources: META-INF/archetype.xml archetype-resources/src/main/webapp/WEB-INF/decorators/main.ftl archetype-resources/src/main/webapp/WEB-INF/web.xml
Posted by Wendy Smoak <ws...@gmail.com>.
On 11/7/06, tmjee@apache.org <tm...@apache.org> wrote:
> Author: tmjee
> Date: Tue Nov 7 15:55:48 2006
> New Revision: 472338
>
> URL: http://svn.apache.org/viewvc?view=rev&rev=472338
...
> + <servlet>
> + <servlet-name>jspSupportServlet</servlet-name>
> + <servlet-class>org.apache.struts2.views.JspSupportServlet</servlet-class>
> + <load-on-startup>5</load-on-startup>
> + </servlet>
Does this need a servlet mapping?
http://svn.apache.org/repos/asf/struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
Thanks,
Wendy
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org
For additional commands, e-mail: dev-help@struts.apache.org