Author: husted
Date: Thu Aug 31 11:08:14 2006
New Revision: 438998
URL: http://svn.apache.org/viewvc?rev=438998&view=rev
Log:
WW-1349 Move new Tutorial code into Showcase
Removed:
struts/struts2/trunk/apps/showcase/src/main/webapp/tutorial/index.html
Modified:
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/tutorial/struts-tutorial.xml
struts/struts2/trunk/apps/showcase/src/main/resources/struts.xml
struts/struts2/trunk/apps/showcase/src/main/webapp/WEB-INF/decorators/main.jsp
struts/struts2/trunk/apps/showcase/src/main/webapp/showcase.jsp
Modified:
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/tutorial/struts-tutorial.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/tutorial/struts-tutorial.xml?rev=438998&r1=438997&r2=438998&view=diff
==============================================================================
---
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/tutorial/struts-tutorial.xml
(original)
+++
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/tutorial/struts-tutorial.xml
Thu Aug 31 11:08:14 2006
@@ -6,23 +6,31 @@
<struts>
<include file="struts-default.xml"/>
- <package name="tutorial-hello" extends="struts-default"
namespace="/tutorial">
+ <package name="tutorial-default" extends="struts-default"
namespace="/tutorial">
+
+ <action name="Welcome">
+ <result>Welcome.jsp</result>
+ </action>
+
+ </package>
+
+ <package name="tutorial-hello" extends="tutorial-default">
<action name="HelloWorld"
class="org.apache.struts2.showcase.tutorial.HelloWorld">
- <result name="success">HelloWorld.jsp</result>
+ <result>HelloWorld.jsp</result>
</action>
</package>
- <package name="tutorial-actions" extends="struts-default"
namespace="/tutorial">
+ <package name="tutorial-actions" extends="tutorial-default">
<action name="HelloName"
class="org.apache.struts2.showcase.tutorial.HelloName">
- <result name="success">HelloName-success.jsp</result>
+ <result>HelloName-success.jsp</result>
<result name="error">HelloName-error.html</result>
</action>
<action name="HelloName2"
class="org.apache.struts2.showcase.tutorial.HelloName2">
- <result name="success">HelloName2-success.jsp</result>
+ <result>HelloName2-success.jsp</result>
<result name="error">HelloName-error.html</result>
</action>
Modified: struts/struts2/trunk/apps/showcase/src/main/resources/struts.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/resources/struts.xml?rev=438998&r1=438997&r2=438998&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/resources/struts.xml (original)
+++ struts/struts2/trunk/apps/showcase/src/main/resources/struts.xml Thu Aug 31
11:08:14 2006
@@ -44,6 +44,8 @@
<include file="struts-freemarker.xml" />
+ <include file="org/apache/struts2/showcase/tutorial/struts-tutorial.xml" />
+
<package name="default" extends="struts-default">
<interceptors>
<interceptor-stack name="crudStack">
@@ -52,8 +54,6 @@
<interceptor-ref name="defaultStack" />
</interceptor-stack>
</interceptors>
-
- <default-action-ref name="showcase"/>
<action name="showcase">
<result>showcase.jsp</result>
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?rev=438998&r1=438997&r2=438998&view=diff
==============================================================================
---
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
Thu Aug 31 11:08:14 2006
@@ -75,11 +75,12 @@
<li><a href="<s:url value="/wait/index.jsp"/>">Execute &
Wait</a></li>
<li><a href="<s:url
value="/token/index.jsp"/>">Token</a></li>
<li><a href="<s:url
value="/filedownload/index.jsp"/>">File Download</a></li>
- <li><a href="<s:url
value="/conversion/index.jsp"/>"/>Conversion</a></li>
+ <li><a href="<s:url
value="/conversion/index.jsp"/>">Conversion</a></li>
<li><a href="<s:url value="/jsf/index.jsp"/>">JSF</a></li>
<li><a href="<s:url
value="/freemarker/index.jsp"/>">Freemarker</a>
<li><a href="<s:url value="/chat/index.jsp"/>">Chat
(AJAX)</a>
<li><a href="<s:url action="hangmanMenu"
namespace="/hangman"/>">Hangman</a></li>
+ <li><a href="<s:url action="Welcome"
namespace="/tutorial"/>">Tutorial</a></li>
<li class="last"><a href="<s:url
value="/help.jsp"/>">Help</a></li>
</ul>
</div>
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?rev=438998&r1=438997&r2=438998&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/webapp/showcase.jsp (original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/showcase.jsp Thu Aug 31
11:08:14 2006
@@ -71,6 +71,10 @@
<!-- Hangman (AJAX and Non AJAX) Example -->
<li><s:url id="url" action="hangmanMenu" namespace="/hangman"/><s:a
href="%{#url}">Hangman (AJAX and Non AJAX) Example</s:a>
+
+ <!-- Tutorial -->
+ <li><s:url id="url" action="Welcome" namespace="/tutorial"/><s:a
href="%{#url}">Source code for the Tutorial</s:a>
+
</ul>
</p>
