Author: apetrelli
Date: Fri Jul 20 12:32:02 2007
New Revision: 558101
URL: http://svn.apache.org/viewvc?view=rev&rev=558101
Log:
WW-1724
Added code to Struts 2 showcase to show that the content type is present even
with a FreeMarker result, i.e. with a FreeMarker layout page.
Added:
struts/struts2/trunk/apps/showcase/src/main/webapp/tiles/layout.ftl (with
props)
Modified:
struts/struts2/trunk/apps/showcase/src/main/resources/struts-tiles.xml
struts/struts2/trunk/apps/showcase/src/main/webapp/WEB-INF/tiles.xml
struts/struts2/trunk/apps/showcase/src/main/webapp/WEB-INF/web.xml
struts/struts2/trunk/apps/showcase/src/main/webapp/tiles/body.jsp
struts/struts2/trunk/apps/showcase/src/main/webapp/tiles/layout.jsp
Modified: struts/struts2/trunk/apps/showcase/src/main/resources/struts-tiles.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/resources/struts-tiles.xml?view=diff&rev=558101&r1=558100&r2=558101
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/resources/struts-tiles.xml
(original)
+++ struts/struts2/trunk/apps/showcase/src/main/resources/struts-tiles.xml Fri
Jul 20 12:32:02 2007
@@ -17,6 +17,10 @@
<result type="tiles">showcase.freemarker</result>
</action>
+ <action name="freemarkerLayout">
+ <result type="tiles">showcase.freemarkerLayout</result>
+ </action>
+
<action name="sanity">
<result type="redirect">/tiles/layout.jsp</result>
<result type="redirect" name="success">/tiles/layout.jsp</result>
Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/WEB-INF/tiles.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/WEB-INF/tiles.xml?view=diff&rev=558101&r1=558100&r2=558101
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/webapp/WEB-INF/tiles.xml
(original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/WEB-INF/tiles.xml Fri
Jul 20 12:32:02 2007
@@ -39,4 +39,10 @@
<put-attribute name="body" value="/tiles/body.ftl"/>
</definition>
+ <definition name="showcase.freemarkerLayout" template="/tiles/layout.ftl">
+ <put-attribute name="title" value="Tiles/Freemarker Showcase"/>
+ <put-attribute name="header" value="/tiles/header.jsp"/>
+ <put-attribute name="body" value="/tiles/body.ftl"/>
+ </definition>
+
</tiles-definitions>
Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/WEB-INF/web.xml?view=diff&rev=558101&r1=558100&r2=558101
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/webapp/WEB-INF/web.xml
(original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/WEB-INF/web.xml Fri Jul
20 12:32:02 2007
@@ -80,6 +80,12 @@
<servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
<load-on-startup>1</load-on-startup>
</servlet>
+ <servlet>
+ <servlet-name>JspSupportServlet</servlet-name>
+
<servlet-class>org.apache.struts2.views.JspSupportServlet</servlet-class>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+
<!-- JavaServer Faces Servlet Mapping, not called directly -->
<servlet-mapping>
Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/tiles/body.jsp
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/tiles/body.jsp?view=diff&rev=558101&r1=558100&r2=558101
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/webapp/tiles/body.jsp (original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/tiles/body.jsp Fri Jul
20 12:32:02 2007
@@ -10,6 +10,9 @@
<li>
<a href="freemarker.action">View FreeMarker Example</a>
</li>
+ <li>
+ <a href="freemarkerLayout.action">View Example with a FreeMarker
Layout</a>
+ </li>
</ul>
</div>
Added: struts/struts2/trunk/apps/showcase/src/main/webapp/tiles/layout.ftl
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/tiles/layout.ftl?view=auto&rev=558101
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/webapp/tiles/layout.ftl (added)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/tiles/layout.ftl Fri Jul
20 12:32:02 2007
@@ -0,0 +1,12 @@
+<#assign tiles=JspTaglibs["http://tiles.apache.org/tags-tiles";]>
+<@tiles.importAttribute name="title" scope="request"/>
+<html>
+ <head><title><@tiles.getAsString name="title"/></title></head>
+<body>
+ <@tiles.insertAttribute name="header"/>
+ <p id="body">
+ <@tiles.insertAttribute name="body"/>
+ </p>
+ <p>Notice that this is a layout made in FreeMarker</p>
+</body>
+</html>
Propchange: struts/struts2/trunk/apps/showcase/src/main/webapp/tiles/layout.ftl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/struts2/trunk/apps/showcase/src/main/webapp/tiles/layout.ftl
------------------------------------------------------------------------------
svn:keywords = Id Author Date Rev
Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/tiles/layout.jsp
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/tiles/layout.jsp?view=diff&rev=558101&r1=558100&r2=558101
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/webapp/tiles/layout.jsp
(original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/tiles/layout.jsp Fri Jul
20 12:32:02 2007
@@ -11,5 +11,7 @@
<p id="body">
<tiles:insertAttribute name="body"/>
</p>
+
+ <p>Notice that this is a layout made in JSP</p>
</body>
</html>
