You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by ap...@apache.org on 2007/07/21 12:41:14 UTC
svn commit: r558289 - in /struts/struts2/branches/STRUTS_2_0_X/apps/showcase/src/main: resources/struts-tiles.xml webapp/WEB-INF/tiles.xml webapp/WEB-INF/web.xml webapp/tiles/body.jsp webapp/tiles/layout.ftl webapp/tiles/layout.jsp

Author: apetrelli
Date: Sat Jul 21 03:41:12 2007
New Revision: 558289

URL: http://svn.apache.org/viewvc?view=rev&rev=558289
Log:
WW-1724
Merge from trunk to STRUTS_2_0_X branch.
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/branches/STRUTS_2_0_X/apps/showcase/src/main/webapp/tiles/layout.ftl   (contents, props changed)
      - copied, changed from r558101, struts/struts2/trunk/apps/showcase/src/main/webapp/tiles/layout.ftl
Modified:
    struts/struts2/branches/STRUTS_2_0_X/apps/showcase/src/main/resources/struts-tiles.xml
    struts/struts2/branches/STRUTS_2_0_X/apps/showcase/src/main/webapp/WEB-INF/tiles.xml
    struts/struts2/branches/STRUTS_2_0_X/apps/showcase/src/main/webapp/WEB-INF/web.xml
    struts/struts2/branches/STRUTS_2_0_X/apps/showcase/src/main/webapp/tiles/body.jsp
    struts/struts2/branches/STRUTS_2_0_X/apps/showcase/src/main/webapp/tiles/layout.jsp

Modified: struts/struts2/branches/STRUTS_2_0_X/apps/showcase/src/main/resources/struts-tiles.xml
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/apps/showcase/src/main/resources/struts-tiles.xml?view=diff&rev=558289&r1=558288&r2=558289
==============================================================================
--- struts/struts2/branches/STRUTS_2_0_X/apps/showcase/src/main/resources/struts-tiles.xml (original)
+++ struts/struts2/branches/STRUTS_2_0_X/apps/showcase/src/main/resources/struts-tiles.xml Sat Jul 21 03:41:12 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/branches/STRUTS_2_0_X/apps/showcase/src/main/webapp/WEB-INF/tiles.xml
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/apps/showcase/src/main/webapp/WEB-INF/tiles.xml?view=diff&rev=558289&r1=558288&r2=558289
==============================================================================
--- struts/struts2/branches/STRUTS_2_0_X/apps/showcase/src/main/webapp/WEB-INF/tiles.xml (original)
+++ struts/struts2/branches/STRUTS_2_0_X/apps/showcase/src/main/webapp/WEB-INF/tiles.xml Sat Jul 21 03:41:12 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/branches/STRUTS_2_0_X/apps/showcase/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/apps/showcase/src/main/webapp/WEB-INF/web.xml?view=diff&rev=558289&r1=558288&r2=558289
==============================================================================
--- struts/struts2/branches/STRUTS_2_0_X/apps/showcase/src/main/webapp/WEB-INF/web.xml (original)
+++ struts/struts2/branches/STRUTS_2_0_X/apps/showcase/src/main/webapp/WEB-INF/web.xml Sat Jul 21 03:41:12 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/branches/STRUTS_2_0_X/apps/showcase/src/main/webapp/tiles/body.jsp
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/apps/showcase/src/main/webapp/tiles/body.jsp?view=diff&rev=558289&r1=558288&r2=558289
==============================================================================
--- struts/struts2/branches/STRUTS_2_0_X/apps/showcase/src/main/webapp/tiles/body.jsp (original)
+++ struts/struts2/branches/STRUTS_2_0_X/apps/showcase/src/main/webapp/tiles/body.jsp Sat Jul 21 03:41:12 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>

Copied: struts/struts2/branches/STRUTS_2_0_X/apps/showcase/src/main/webapp/tiles/layout.ftl (from r558101, struts/struts2/trunk/apps/showcase/src/main/webapp/tiles/layout.ftl)
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/apps/showcase/src/main/webapp/tiles/layout.ftl?view=diff&rev=558289&p1=struts/struts2/trunk/apps/showcase/src/main/webapp/tiles/layout.ftl&r1=558101&p2=struts/struts2/branches/STRUTS_2_0_X/apps/showcase/src/main/webapp/tiles/layout.ftl&r2=558289
==============================================================================
    (empty)

Propchange: struts/struts2/branches/STRUTS_2_0_X/apps/showcase/src/main/webapp/tiles/layout.ftl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: struts/struts2/branches/STRUTS_2_0_X/apps/showcase/src/main/webapp/tiles/layout.ftl
------------------------------------------------------------------------------
    svn:keywords = Id Author Date Rev

Modified: struts/struts2/branches/STRUTS_2_0_X/apps/showcase/src/main/webapp/tiles/layout.jsp
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/apps/showcase/src/main/webapp/tiles/layout.jsp?view=diff&rev=558289&r1=558288&r2=558289
==============================================================================
--- struts/struts2/branches/STRUTS_2_0_X/apps/showcase/src/main/webapp/tiles/layout.jsp (original)
+++ struts/struts2/branches/STRUTS_2_0_X/apps/showcase/src/main/webapp/tiles/layout.jsp Sat Jul 21 03:41:12 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>