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

git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@438945 13f79535-47bb-0310-9956-ffa450edef68
---
 .../struts2/showcase/tutorial/HelloName.java  |  2 +-
 .../struts2/showcase/tutorial/HelloName2.java |  2 +-
 .../struts2/showcase/tutorial/HelloWorld.java |  2 +-
 .../showcase/tutorial/struts-tutorial.xml     | 31 +++++++++++++++++++
 4 files changed, 34 insertions(+), 3 deletions(-)
 create mode 100644 apps/showcase/src/main/java/org/apache/struts2/showcase/tutorial/struts-tutorial.xml

diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/tutorial/HelloName.java b/apps/showcase/src/main/java/org/apache/struts2/showcase/tutorial/HelloName.java
index 6fdabd030..a9afa066a 100644
--- a/apps/showcase/src/main/java/org/apache/struts2/showcase/tutorial/HelloName.java
+++ b/apps/showcase/src/main/java/org/apache/struts2/showcase/tutorial/HelloName.java
@@ -1,4 +1,4 @@
-package tutorial;
+package org.apache.struts2.showcase.tutorial;
 
 import com.opensymphony.xwork2.ActionSupport;
 
diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/tutorial/HelloName2.java b/apps/showcase/src/main/java/org/apache/struts2/showcase/tutorial/HelloName2.java
index 6466d26cd..8f07cad93 100644
--- a/apps/showcase/src/main/java/org/apache/struts2/showcase/tutorial/HelloName2.java
+++ b/apps/showcase/src/main/java/org/apache/struts2/showcase/tutorial/HelloName2.java
@@ -1,4 +1,4 @@
-package tutorial;
+package org.apache.struts2.showcase.tutorial;
 
 import com.opensymphony.xwork2.ActionSupport;
 import org.apache.struts2.interceptor.ParameterAware;
diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/tutorial/HelloWorld.java b/apps/showcase/src/main/java/org/apache/struts2/showcase/tutorial/HelloWorld.java
index 9af9b6728..e65066e03 100644
--- a/apps/showcase/src/main/java/org/apache/struts2/showcase/tutorial/HelloWorld.java
+++ b/apps/showcase/src/main/java/org/apache/struts2/showcase/tutorial/HelloWorld.java
@@ -1,4 +1,4 @@
-package tutorial;
+package org.apache.struts2.showcase.tutorial;
 
 import com.opensymphony.xwork2.Action;
 
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
new file mode 100644
index 000000000..a581f2b33
--- /dev/null
+++ b/apps/showcase/src/main/java/org/apache/struts2/showcase/tutorial/struts-tutorial.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE struts PUBLIC
+        "-//Apache Software Foundation//DTD Struts Configuration 2.0//EN"
+        "http://struts.apache.org/dtds/struts-2.0.dtd">
+
+<struts>
+    <include file="struts-default.xml"/>
+
+    <package name="tutorial-hello" extends="struts-default" namespace="/tutorial">
+
+        <action name="HelloWorld" class="org.apache.struts2.showcase.tutorial.HelloWorld">
+            <result name="success">HelloWorld.jsp</result>
+        </action>
+
+    </package>
+
+    <package name="tutorial-actions" extends="struts-default" namespace="/tutorial">
+
+        <action name="HelloName" class="org.apache.struts2.showcase.tutorial.HelloName">
+            <result name="success">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 name="error">HelloName-error.html</result>
+        </action>
+
+    </package>
+
+</struts>