From d891f22943bdb4d31b5bc80f2ace1108699a8eac Mon Sep 17 00:00:00 2001
From: Ted Nathan Husted <husted@apache.org>
Date: Thu, 31 Aug 2006 18:08:14 +0000
Subject: [PATCH] WW-1349 Move new Tutorial code into Showcase

git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@438998 13f79535-47bb-0310-9956-ffa450edef68
---
 .../showcase/tutorial/struts-tutorial.xml     | 20 +++++++++++++------
 apps/showcase/src/main/resources/struts.xml   |  4 ++--
 .../main/webapp/WEB-INF/decorators/main.jsp   |  3 ++-
 apps/showcase/src/main/webapp/showcase.jsp    |  4 ++++
 .../src/main/webapp/tutorial/index.html       | 10 ----------
 5 files changed, 22 insertions(+), 19 deletions(-)
 delete mode 100644 apps/showcase/src/main/webapp/tutorial/index.html

diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/tutorial/struts-tutorial.xml b/apps/showcase/src/main/java/org/apache/struts2/showcase/tutorial/struts-tutorial.xml
index a581f2b33..da3e0f77b 100644
--- a/apps/showcase/src/main/java/org/apache/struts2/showcase/tutorial/struts-tutorial.xml
+++ b/apps/showcase/src/main/java/org/apache/struts2/showcase/tutorial/struts-tutorial.xml
@@ -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>
 
diff --git a/apps/showcase/src/main/resources/struts.xml b/apps/showcase/src/main/resources/struts.xml
index fd1dfa7da..3c739ff34 100644
--- a/apps/showcase/src/main/resources/struts.xml
+++ b/apps/showcase/src/main/resources/struts.xml
@@ -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>
diff --git a/apps/showcase/src/main/webapp/WEB-INF/decorators/main.jsp b/apps/showcase/src/main/webapp/WEB-INF/decorators/main.jsp
index 9c41a3c43..57aba6ff2 100644
--- a/apps/showcase/src/main/webapp/WEB-INF/decorators/main.jsp
+++ b/apps/showcase/src/main/webapp/WEB-INF/decorators/main.jsp
@@ -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>
diff --git a/apps/showcase/src/main/webapp/showcase.jsp b/apps/showcase/src/main/webapp/showcase.jsp
index 41bc1ab63..bec94f5c1 100644
--- a/apps/showcase/src/main/webapp/showcase.jsp
+++ b/apps/showcase/src/main/webapp/showcase.jsp
@@ -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>
 
diff --git a/apps/showcase/src/main/webapp/tutorial/index.html b/apps/showcase/src/main/webapp/tutorial/index.html
deleted file mode 100644
index c6d985456..000000000
--- a/apps/showcase/src/main/webapp/tutorial/index.html
+++ /dev/null
@@ -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>