From 8c36b9a3beae906a3901da541d0e1145f6e50a3d Mon Sep 17 00:00:00 2001
From: Ted Nathan Husted <husted@apache.org>
Date: Tue, 5 Sep 2006 17:29:41 +0000
Subject: [PATCH] WW-1340 In blank, rename "tutorial" module to "example", to
 better indicate why it is there.

git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@440415 13f79535-47bb-0310-9956-ffa450edef68
---
 .../ExampleSupport.java}                      |  4 ++--
 .../{tutorial => example}/HelloWorld.java     |  4 ++--
 .../Login-validation.xml                      |  4 ++--
 .../java/{tutorial => example}/Login.java     |  4 ++--
 .../{tutorial => example}/package.properties  |  4 +---
 apps/blank/src/main/resources/example.xml     | 24 +++++++++++++++++++
 apps/blank/src/main/resources/struts.xml      |  2 +-
 apps/blank/src/main/resources/tutorial.xml    | 24 -------------------
 .../{tutorial => example}/HelloWorld.jsp      |  0
 .../webapp/{tutorial => example}/Login.jsp    |  2 +-
 .../webapp/{tutorial => example}/Menu.jsp     |  0
 .../webapp/{tutorial => example}/Missing.jsp  |  0
 .../webapp/{tutorial => example}/Welcome.jsp  |  2 +-
 .../{tutorial => example}/ConfigTest.java     |  2 +-
 .../{tutorial => example}/HelloWorldTest.java |  2 +-
 .../java/{tutorial => example}/LoginTest.java |  2 +-
 16 files changed, 39 insertions(+), 41 deletions(-)
 rename apps/blank/src/main/java/{tutorial/TutorialSupport.java => example/ExampleSupport.java} (56%)
 rename apps/blank/src/main/java/{tutorial => example}/HelloWorld.java (90%)
 rename apps/blank/src/main/java/{tutorial => example}/Login-validation.xml (79%)
 rename apps/blank/src/main/java/{tutorial => example}/Login.java (86%)
 rename apps/blank/src/main/java/{tutorial => example}/package.properties (66%)
 create mode 100644 apps/blank/src/main/resources/example.xml
 delete mode 100644 apps/blank/src/main/resources/tutorial.xml
 rename apps/blank/src/main/webapp/{tutorial => example}/HelloWorld.jsp (100%)
 rename apps/blank/src/main/webapp/{tutorial => example}/Login.jsp (81%)
 rename apps/blank/src/main/webapp/{tutorial => example}/Menu.jsp (100%)
 rename apps/blank/src/main/webapp/{tutorial => example}/Missing.jsp (100%)
 rename apps/blank/src/main/webapp/{tutorial => example}/Welcome.jsp (91%)
 rename apps/blank/src/test/java/{tutorial => example}/ConfigTest.java (96%)
 rename apps/blank/src/test/java/{tutorial => example}/HelloWorldTest.java (94%)
 rename apps/blank/src/test/java/{tutorial => example}/LoginTest.java (94%)

diff --git a/apps/blank/src/main/java/tutorial/TutorialSupport.java b/apps/blank/src/main/java/example/ExampleSupport.java
similarity index 56%
rename from apps/blank/src/main/java/tutorial/TutorialSupport.java
rename to apps/blank/src/main/java/example/ExampleSupport.java
index ce8a58a9b..4bdcf7f36 100644
--- a/apps/blank/src/main/java/tutorial/TutorialSupport.java
+++ b/apps/blank/src/main/java/example/ExampleSupport.java
@@ -1,9 +1,9 @@
-package tutorial;
+package example;
 
 import com.opensymphony.xwork2.ActionSupport;
 
 /**
  * Base Action class for the Tutorial package.
  */
-public class TutorialSupport extends ActionSupport {
+public class ExampleSupport extends ActionSupport {
 }
diff --git a/apps/blank/src/main/java/tutorial/HelloWorld.java b/apps/blank/src/main/java/example/HelloWorld.java
similarity index 90%
rename from apps/blank/src/main/java/tutorial/HelloWorld.java
rename to apps/blank/src/main/java/example/HelloWorld.java
index da9589955..557e39b0b 100644
--- a/apps/blank/src/main/java/tutorial/HelloWorld.java
+++ b/apps/blank/src/main/java/example/HelloWorld.java
@@ -1,9 +1,9 @@
-package tutorial;
+package example;
 
 /**
  * <code>Set welcome message.</code>
  */
-public class HelloWorld extends TutorialSupport {
+public class HelloWorld extends ExampleSupport {
 
     public static final String MESSAGE = "HelloWorld.message";
 
diff --git a/apps/blank/src/main/java/tutorial/Login-validation.xml b/apps/blank/src/main/java/example/Login-validation.xml
similarity index 79%
rename from apps/blank/src/main/java/tutorial/Login-validation.xml
rename to apps/blank/src/main/java/example/Login-validation.xml
index 4d10a340b..d703ee7a3 100644
--- a/apps/blank/src/main/java/tutorial/Login-validation.xml
+++ b/apps/blank/src/main/java/example/Login-validation.xml
@@ -5,12 +5,12 @@
 <validators>
     <field name="username">
         <field-validator type="requiredstring">
-            <message key="username.required"/>
+            <message key="requiredstring"/>
         </field-validator>
     </field>
     <field name="password">
         <field-validator type="requiredstring">
-            <message key="password.required"/>
+            <message key="requiredstring"/>
         </field-validator>
     </field>
 </validators>
diff --git a/apps/blank/src/main/java/tutorial/Login.java b/apps/blank/src/main/java/example/Login.java
similarity index 86%
rename from apps/blank/src/main/java/tutorial/Login.java
rename to apps/blank/src/main/java/example/Login.java
index d20606574..880baae1a 100644
--- a/apps/blank/src/main/java/tutorial/Login.java
+++ b/apps/blank/src/main/java/example/Login.java
@@ -1,6 +1,6 @@
-package tutorial;
+package example;
 
-public class Login extends TutorialSupport {
+public class Login extends ExampleSupport {
 
     public String execute() throws Exception {
 
diff --git a/apps/blank/src/main/java/tutorial/package.properties b/apps/blank/src/main/java/example/package.properties
similarity index 66%
rename from apps/blank/src/main/java/tutorial/package.properties
rename to apps/blank/src/main/java/example/package.properties
index c1203f54c..fcac645b8 100644
--- a/apps/blank/src/main/java/tutorial/package.properties
+++ b/apps/blank/src/main/java/example/package.properties
@@ -1,7 +1,5 @@
+requiredstring = ${getText(fieldName)} is required.
 password = Password
-password.required = Password is required.
 username = User Name
-username.required = User Name is required.
 HelloWorld.message= Struts is up and running ...
 Missing.message =  This feature is under construction. Please try again in the next interation.
-
diff --git a/apps/blank/src/main/resources/example.xml b/apps/blank/src/main/resources/example.xml
new file mode 100644
index 000000000..5a18fe5a1
--- /dev/null
+++ b/apps/blank/src/main/resources/example.xml
@@ -0,0 +1,24 @@
+<!DOCTYPE struts PUBLIC
+        "-//Apache Software Foundation//DTD Struts Configuration 2.0//EN"
+        "http://struts.apache.org/dtds/struts-2.0.dtd">
+
+<struts>
+
+    <package name="example" namespace="/example" extends="struts-default">
+
+        <action name="HelloWorld" class="example.HelloWorld">
+            <result>/example/HelloWorld.jsp</result>
+        </action>
+
+        <action name="Login!*" method="{1}" class="example.Login">
+            <result name="input">/example/Login.jsp</result>
+            <result type="redirect-action">Menu</result>
+        </action>
+
+        <action name="*" class="example.ExampleSupport">
+            <result>/example/{1}.jsp</result>
+        </action>
+
+        <!-- Add actions here -->
+    </package>
+</struts>
diff --git a/apps/blank/src/main/resources/struts.xml b/apps/blank/src/main/resources/struts.xml
index ea5c9ddef..b152a022e 100644
--- a/apps/blank/src/main/resources/struts.xml
+++ b/apps/blank/src/main/resources/struts.xml
@@ -6,7 +6,7 @@
 
     <include file="struts-default.xml"/>
 
-    <include file="tutorial.xml"/>
+    <include file="example.xml"/>
 
     <!-- Add packages here -->
 
diff --git a/apps/blank/src/main/resources/tutorial.xml b/apps/blank/src/main/resources/tutorial.xml
deleted file mode 100644
index 9f61e09db..000000000
--- a/apps/blank/src/main/resources/tutorial.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<!DOCTYPE struts PUBLIC
-        "-//Apache Software Foundation//DTD Struts Configuration 2.0//EN"
-        "http://struts.apache.org/dtds/struts-2.0.dtd">
-
-<struts>
-
-    <package name="tutorial" namespace="/tutorial" extends="struts-default">
-
-        <action name="HelloWorld" class="tutorial.HelloWorld">
-            <result>/tutorial/HelloWorld.jsp</result>
-        </action>
-
-        <action name="Login!*" method="{1}" class="tutorial.Login">
-            <result name="input">/tutorial/Login.jsp</result>
-            <result type="redirect-action">Menu</result>
-        </action>
-
-        <action name="*" class="tutorial.TutorialSupport">
-            <result>/tutorial/{1}.jsp</result>
-        </action>
-
-        <!-- Add actions here -->
-    </package>
-</struts>
diff --git a/apps/blank/src/main/webapp/tutorial/HelloWorld.jsp b/apps/blank/src/main/webapp/example/HelloWorld.jsp
similarity index 100%
rename from apps/blank/src/main/webapp/tutorial/HelloWorld.jsp
rename to apps/blank/src/main/webapp/example/HelloWorld.jsp
diff --git a/apps/blank/src/main/webapp/tutorial/Login.jsp b/apps/blank/src/main/webapp/example/Login.jsp
similarity index 81%
rename from apps/blank/src/main/webapp/tutorial/Login.jsp
rename to apps/blank/src/main/webapp/example/Login.jsp
index 71d926bca..eba21fd45 100644
--- a/apps/blank/src/main/webapp/tutorial/Login.jsp
+++ b/apps/blank/src/main/webapp/example/Login.jsp
@@ -8,7 +8,7 @@
 <body>
 <s:form action="Login">
     <s:textfield label="%{getText('username')}" name="username"/>
-    <s:textfield label="%{getText('password')}" name="password"/>
+    <s:password label="%{getText('password')}" name="password" />
     <s:submit/>
 </s:form>
 </body>
diff --git a/apps/blank/src/main/webapp/tutorial/Menu.jsp b/apps/blank/src/main/webapp/example/Menu.jsp
similarity index 100%
rename from apps/blank/src/main/webapp/tutorial/Menu.jsp
rename to apps/blank/src/main/webapp/example/Menu.jsp
diff --git a/apps/blank/src/main/webapp/tutorial/Missing.jsp b/apps/blank/src/main/webapp/example/Missing.jsp
similarity index 100%
rename from apps/blank/src/main/webapp/tutorial/Missing.jsp
rename to apps/blank/src/main/webapp/example/Missing.jsp
diff --git a/apps/blank/src/main/webapp/tutorial/Welcome.jsp b/apps/blank/src/main/webapp/example/Welcome.jsp
similarity index 91%
rename from apps/blank/src/main/webapp/tutorial/Welcome.jsp
rename to apps/blank/src/main/webapp/example/Welcome.jsp
index 6d84e6434..002a078af 100644
--- a/apps/blank/src/main/webapp/tutorial/Welcome.jsp
+++ b/apps/blank/src/main/webapp/example/Welcome.jsp
@@ -3,7 +3,7 @@
 <html>
 <head>
     <title>Welcome</title>
-    <link href="<s:url value="/css/tutorial.css"/>" rel="stylesheet"
+    <link href="<s:url value="/css/examplecss"/>" rel="stylesheet"
           type="text/css"/>
 </head>
 
diff --git a/apps/blank/src/test/java/tutorial/ConfigTest.java b/apps/blank/src/test/java/example/ConfigTest.java
similarity index 96%
rename from apps/blank/src/test/java/tutorial/ConfigTest.java
rename to apps/blank/src/test/java/example/ConfigTest.java
index 08cd32f5e..6b62f4c6d 100644
--- a/apps/blank/src/test/java/tutorial/ConfigTest.java
+++ b/apps/blank/src/test/java/example/ConfigTest.java
@@ -1,4 +1,4 @@
-package tutorial;
+package example;
 
 import com.opensymphony.xwork2.ActionSupport;
 import com.opensymphony.xwork2.XWorkTestCase;
diff --git a/apps/blank/src/test/java/tutorial/HelloWorldTest.java b/apps/blank/src/test/java/example/HelloWorldTest.java
similarity index 94%
rename from apps/blank/src/test/java/tutorial/HelloWorldTest.java
rename to apps/blank/src/test/java/example/HelloWorldTest.java
index 0127e2fb2..cb85f63f6 100644
--- a/apps/blank/src/test/java/tutorial/HelloWorldTest.java
+++ b/apps/blank/src/test/java/example/HelloWorldTest.java
@@ -1,4 +1,4 @@
-package tutorial;
+package example;
 
 import com.opensymphony.xwork2.ActionSupport;
 import junit.framework.TestCase;
diff --git a/apps/blank/src/test/java/tutorial/LoginTest.java b/apps/blank/src/test/java/example/LoginTest.java
similarity index 94%
rename from apps/blank/src/test/java/tutorial/LoginTest.java
rename to apps/blank/src/test/java/example/LoginTest.java
index cd22c8c54..2643241dc 100644
--- a/apps/blank/src/test/java/tutorial/LoginTest.java
+++ b/apps/blank/src/test/java/example/LoginTest.java
@@ -1,4 +1,4 @@
-package tutorial;
+package example;
 
 import com.opensymphony.xwork2.ActionSupport;
 import com.opensymphony.xwork2.config.entities.ActionConfig;