Author: husted
Date: Tue Dec 26 02:35:18 2006
New Revision: 490278
URL: http://svn.apache.org/viewvc?view=rev&rev=490278
Log:
WW-1538 Add a "workaround" test to Action Prefix example, in furtherance of
WW-1571. Add remaining problem items to sandbox area. Add note about scope of
Showcase to home page with links to Cookbook docs and MailReader app.
Modified:
struts/struts2/trunk/apps/showcase/src/main/resources/struts-tags-non-ui.xml
struts/struts2/trunk/apps/showcase/src/main/webapp/WEB-INF/decorators/main.jsp
struts/struts2/trunk/apps/showcase/src/main/webapp/showcase.jsp
struts/struts2/trunk/apps/showcase/src/main/webapp/tags/non-ui/actionPrefix/actionPrefixExample.ftl
struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/example.jsp
Modified:
struts/struts2/trunk/apps/showcase/src/main/resources/struts-tags-non-ui.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/resources/struts-tags-non-ui.xml?view=diff&rev=490278&r1=490277&r2=490278
==============================================================================
---
struts/struts2/trunk/apps/showcase/src/main/resources/struts-tags-non-ui.xml
(original)
+++
struts/struts2/trunk/apps/showcase/src/main/resources/struts-tags-non-ui.xml
Tue Dec 26 02:35:18 2006
@@ -103,6 +103,9 @@
<action name="redirectActionPrefix">
<result
type="freemarker">/tags/non-ui/actionPrefix/redirectActionPrefix.ftl</result>
</action>
+ <action name="redirectActionPrefixAction">
+ <result type="redirect-action">redirectActionPrefix</result>
+ </action>
<action name="viewSource">
<result
type="plaintext">/tags/non-ui/actionPrefix/actionPrefixExample.ftl</result>
</action>
Modified:
struts/struts2/trunk/apps/showcase/src/main/webapp/WEB-INF/decorators/main.jsp
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/WEB-INF/decorators/main.jsp?view=diff&rev=490278&r1=490277&r2=490278
==============================================================================
---
struts/struts2/trunk/apps/showcase/src/main/webapp/WEB-INF/decorators/main.jsp
(original)
+++
struts/struts2/trunk/apps/showcase/src/main/webapp/WEB-INF/decorators/main.jsp
Tue Dec 26 02:35:18 2006
@@ -77,10 +77,10 @@
<div class="wrapper">
<h2 class="accessibility">Navigation</h2>
<ul class="clearfix">
- <li><a href="<s:url
value="/showcase.jsp"/>"><strong>Home</strong></a></li>
- <li><a href="<s:url action="index"
namespace="/config-browser" includeParams="none" />">Config Browser</a></li>
+ <li><a href="<s:url value="/showcase.jsp"/>">Home</a></li>
<li><a href="<s:url
value="/ajax/index.jsp"/>">AJAX</a></li>
<li><a href="<s:url action="actionChain1!input"
namespace="/actionchaining" includeParams="none" />">Action Chaining</a></li>
+ <li><a href="<s:url action="index"
namespace="/config-browser" includeParams="none" />">Config Browser</a></li>
<li><a href="<s:url
value="/conversion/index.jsp"/>">Conversion</a></li>
<li><a href="<s:url
value="/empmanager/index.jsp"/>">CRUD</a></li>
<li><a href="<s:url value="/wait/index.jsp"/>">Execute &
Wait</a></li>
Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/showcase.jsp
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/showcase.jsp?view=diff&rev=490278&r1=490277&r2=490278
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/webapp/showcase.jsp (original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/showcase.jsp Tue Dec 26
02:35:18 2006
@@ -12,17 +12,28 @@
</head>
<body>
-<p>The Struts Showcase demonstrates using Struts tags as well as validations,
and so forth</p>
-
-<p>
-
- <%-- THIS LIST IS MAINTAINED IN MAIN.JSP TO CREATE THE MENU BAR -- EDIT
THERE AND COPY HERE --%>
-
+ <p>
+ The Struts Showcase demonstrates a variety of use cases and tag usages.
+ Essentially, the application exercises various framework features in
isolation.
+ <em>The Showcase is <strong>not</strong> meant as a "best practices"
example.</em>
+ </p>
+ <ul>
+ <li>
+ For more "by example" solutions,
+ see the <a
href="http://struts.apache.org/2.x/docs/cookbook.html">Struts Cookbook</a>
pages.
+ </li>
+ <li>
+ For a "best practices" example, see the
+ <a href="http://planetstruts.org/struts2-mailreader/">MailReader
application</a> Tour and source code.
+ </li>
+ </ul>
+ <p>
+ <%-- THIS LIST IS MAINTAINED IN WEB-INF/decorators/main.jsp TO CREATE THE
MENU BAR -- EDIT THERE AND COPY HERE --%>
<ul>
<li><a href="<s:url value="/showcase.jsp"/>">Home</a></li>
- <li><a href="<s:url action="index" namespace="/config-browser"
includeParams="none" />">Config Browser</a></li>
<li><a href="<s:url value="/ajax/index.jsp"/>">AJAX</a></li>
<li><a href="<s:url action="actionChain1!input"
namespace="/actionchaining" includeParams="none" />">Action Chaining</a></li>
+ <li><a href="<s:url action="index" namespace="/config-browser"
includeParams="none" />">Config Browser</a></li>
<li><a href="<s:url
value="/conversion/index.jsp"/>">Conversion</a></li>
<li><a href="<s:url value="/empmanager/index.jsp"/>">CRUD</a></li>
<li><a href="<s:url value="/wait/index.jsp"/>">Execute & Wait</a></li>
@@ -41,7 +52,7 @@
<h2>Sandbox</h2>
<p>
- These examples are under development.
+ These examples are under development and may not be fully operational.
</p>
<ul>
<li>AJAX / Remote Forms</li>
@@ -51,6 +62,13 @@
<li>Address</li>
<li>Java 5 Enum</li>
</ul>
+ </li>
+ <li>Tabs / Non-UI Tags<ul>
+ <li>
+ Action Prefix / Redirect Action
+ </li>
+ </ul>
+
</li>
<li>Tags / UI Tags<ul>
<li>UI Example</li>
Modified:
struts/struts2/trunk/apps/showcase/src/main/webapp/tags/non-ui/actionPrefix/actionPrefixExample.ftl
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/tags/non-ui/actionPrefix/actionPrefixExample.ftl?view=diff&rev=490278&r1=490277&r2=490278
==============================================================================
---
struts/struts2/trunk/apps/showcase/src/main/webapp/tags/non-ui/actionPrefix/actionPrefixExample.ftl
(original)
+++
struts/struts2/trunk/apps/showcase/src/main/webapp/tags/non-ui/actionPrefix/actionPrefixExample.ftl
Tue Dec 26 02:35:18 2006
@@ -39,7 +39,10 @@
<@s.submit name="redirect-action:redirectActionPrefix"
value="%{'redirect-action prefix'}" />
<@s.submit value="Normal Submit" />
- </@s.form>
+
+ <@s.submit name="action:redirectActionPrefixAction"
value="%{'redirect-action without prefix'}" />
+
+ </@s.form>
</body>
</html>
Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/example.jsp
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/example.jsp?view=diff&rev=490278&r1=490277&r2=490278
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/example.jsp
(original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/example.jsp Tue
Dec 26 02:35:18 2006
@@ -13,7 +13,7 @@
<s:fielderror />
-<s:form action="exampleSubmit" method="post" enctype="multipart/form-data"
tooltipConfig="%{'jsTooltipEnabled':'true'}">
+<s:form action="exampleSubmit" enctype="multipart/form-data"
tooltipConfig="%{'jsTooltipEnabled':'true'}">
<s:textfield
label="Name"
name="name"