Apache/struts
1
0
Fork 0
mirror of https://github.com/apache/struts.git synced 2026-08-06 07:06:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

WW-1349 Move new Tutorial code into Showcase

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@438998 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Ted Nathan Husted
2006-08-31 18:08:14 +00:00
parent 53740eeca2
commit d891f22943
5 changed files with 22 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/showcase/src/main/java/org/apache/struts2/showcase/tutorial/struts-tutorial.xml
+14 -6
View File
@@ -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="HelloWorld" class="org.apache.struts2.showcase.tutorial.HelloWorld">
<result name="success">HelloWorld.jsp</result>
<action name="Welcome">
<result>Welcome.jsp</result>
</action>
</package>
<package name="tutorial-actions" extends="struts-default" namespace="/tutorial">
<package name="tutorial-hello" extends="tutorial-default">
<action name="HelloWorld" class="org.apache.struts2.showcase.tutorial.HelloWorld">
<result>HelloWorld.jsp</result>
</action>
</package>
<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>
apps/showcase/src/main/resources/struts.xml
+2 -2
View File
@@ -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">
@@ -53,8 +55,6 @@
</interceptor-stack>
</interceptors>
<default-action-ref name="showcase"/>
<action name="showcase">
<result>showcase.jsp</result>
</action>
apps/showcase/src/main/webapp/WEB-INF/decorators/main.jsp
+2 -1
View File
@@ -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>
apps/showcase/src/main/webapp/showcase.jsp
+4
View File
@@ -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>
apps/showcase/src/main/webapp/tutorial/index.html
-10
View File
@@ -1,10 +0,0 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<html>
<head>
<META HTTP-EQUIV="Refresh" CONTENT="0;URL=Hello.action">
</head>
<body>
<p>Loading ...</p>
</body>
</html>