Author: husted
Date: Tue Sep 5 10:29:41 2006
New Revision: 440415
URL: http://svn.apache.org/viewvc?view=rev&rev=440415
Log:
WW-1340 In blank, rename "tutorial" module to "example", to better indicate why
it is there.
Added:
struts/struts2/trunk/apps/blank/src/main/java/example/
- copied from r440388,
struts/struts2/trunk/apps/blank/src/main/java/tutorial/
struts/struts2/trunk/apps/blank/src/main/java/example/ExampleSupport.java
struts/struts2/trunk/apps/blank/src/main/java/example/HelloWorld.java
- copied, changed from r440414,
struts/struts2/trunk/apps/blank/src/main/java/tutorial/HelloWorld.java
struts/struts2/trunk/apps/blank/src/main/java/example/Login-validation.xml
- copied, changed from r440414,
struts/struts2/trunk/apps/blank/src/main/java/tutorial/Login-validation.xml
struts/struts2/trunk/apps/blank/src/main/java/example/Login.java
- copied, changed from r440414,
struts/struts2/trunk/apps/blank/src/main/java/tutorial/Login.java
struts/struts2/trunk/apps/blank/src/main/java/example/package.properties
- copied, changed from r440414,
struts/struts2/trunk/apps/blank/src/main/java/tutorial/package.properties
struts/struts2/trunk/apps/blank/src/main/resources/example.xml
- copied, changed from r440388,
struts/struts2/trunk/apps/blank/src/main/resources/tutorial.xml
struts/struts2/trunk/apps/blank/src/main/webapp/example/
- copied from r440388,
struts/struts2/trunk/apps/blank/src/main/webapp/tutorial/
struts/struts2/trunk/apps/blank/src/main/webapp/example/HelloWorld.jsp
- copied unchanged from r440414,
struts/struts2/trunk/apps/blank/src/main/webapp/tutorial/HelloWorld.jsp
struts/struts2/trunk/apps/blank/src/main/webapp/example/Login.jsp
- copied, changed from r440414,
struts/struts2/trunk/apps/blank/src/main/webapp/tutorial/Login.jsp
struts/struts2/trunk/apps/blank/src/main/webapp/example/Menu.jsp
- copied unchanged from r440414,
struts/struts2/trunk/apps/blank/src/main/webapp/tutorial/Menu.jsp
struts/struts2/trunk/apps/blank/src/main/webapp/example/Missing.jsp
- copied unchanged from r440414,
struts/struts2/trunk/apps/blank/src/main/webapp/tutorial/Missing.jsp
struts/struts2/trunk/apps/blank/src/main/webapp/example/Welcome.jsp
- copied, changed from r440414,
struts/struts2/trunk/apps/blank/src/main/webapp/tutorial/Welcome.jsp
struts/struts2/trunk/apps/blank/src/test/java/example/
- copied from r440388,
struts/struts2/trunk/apps/blank/src/test/java/tutorial/
struts/struts2/trunk/apps/blank/src/test/java/example/ConfigTest.java
- copied, changed from r440414,
struts/struts2/trunk/apps/blank/src/test/java/tutorial/ConfigTest.java
struts/struts2/trunk/apps/blank/src/test/java/example/HelloWorldTest.java
- copied, changed from r440414,
struts/struts2/trunk/apps/blank/src/test/java/tutorial/HelloWorldTest.java
struts/struts2/trunk/apps/blank/src/test/java/example/LoginTest.java
- copied, changed from r440414,
struts/struts2/trunk/apps/blank/src/test/java/tutorial/LoginTest.java
Removed:
struts/struts2/trunk/apps/blank/src/main/java/example/TutorialSupport.java
struts/struts2/trunk/apps/blank/src/main/java/org/apache/
struts/struts2/trunk/apps/blank/src/main/java/tutorial/
struts/struts2/trunk/apps/blank/src/main/resources/tutorial.xml
struts/struts2/trunk/apps/blank/src/main/webapp/tutorial/
struts/struts2/trunk/apps/blank/src/test/java/org/apache/
struts/struts2/trunk/apps/blank/src/test/java/tutorial/
Modified:
struts/struts2/trunk/apps/blank/src/main/resources/struts.xml
Added: struts/struts2/trunk/apps/blank/src/main/java/example/ExampleSupport.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/blank/src/main/java/example/ExampleSupport.java?view=auto&rev=440415
==============================================================================
--- struts/struts2/trunk/apps/blank/src/main/java/example/ExampleSupport.java
(added)
+++ struts/struts2/trunk/apps/blank/src/main/java/example/ExampleSupport.java
Tue Sep 5 10:29:41 2006
@@ -0,0 +1,9 @@
+package example;
+
+import com.opensymphony.xwork2.ActionSupport;
+
+/**
+ * Base Action class for the Tutorial package.
+ */
+public class ExampleSupport extends ActionSupport {
+}
Copied: struts/struts2/trunk/apps/blank/src/main/java/example/HelloWorld.java
(from r440414,
struts/struts2/trunk/apps/blank/src/main/java/tutorial/HelloWorld.java)
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/blank/src/main/java/example/HelloWorld.java?view=diff&rev=440415&p1=struts/struts2/trunk/apps/blank/src/main/java/tutorial/HelloWorld.java&r1=440414&p2=struts/struts2/trunk/apps/blank/src/main/java/example/HelloWorld.java&r2=440415
==============================================================================
--- struts/struts2/trunk/apps/blank/src/main/java/tutorial/HelloWorld.java
(original)
+++ struts/struts2/trunk/apps/blank/src/main/java/example/HelloWorld.java Tue
Sep 5 10:29:41 2006
@@ -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";
Copied:
struts/struts2/trunk/apps/blank/src/main/java/example/Login-validation.xml
(from r440414,
struts/struts2/trunk/apps/blank/src/main/java/tutorial/Login-validation.xml)
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/blank/src/main/java/example/Login-validation.xml?view=diff&rev=440415&p1=struts/struts2/trunk/apps/blank/src/main/java/tutorial/Login-validation.xml&r1=440414&p2=struts/struts2/trunk/apps/blank/src/main/java/example/Login-validation.xml&r2=440415
==============================================================================
--- struts/struts2/trunk/apps/blank/src/main/java/tutorial/Login-validation.xml
(original)
+++ struts/struts2/trunk/apps/blank/src/main/java/example/Login-validation.xml
Tue Sep 5 10:29:41 2006
@@ -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>
Copied: struts/struts2/trunk/apps/blank/src/main/java/example/Login.java (from
r440414, struts/struts2/trunk/apps/blank/src/main/java/tutorial/Login.java)
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/blank/src/main/java/example/Login.java?view=diff&rev=440415&p1=struts/struts2/trunk/apps/blank/src/main/java/tutorial/Login.java&r1=440414&p2=struts/struts2/trunk/apps/blank/src/main/java/example/Login.java&r2=440415
==============================================================================
--- struts/struts2/trunk/apps/blank/src/main/java/tutorial/Login.java (original)
+++ struts/struts2/trunk/apps/blank/src/main/java/example/Login.java Tue Sep 5
10:29:41 2006
@@ -1,6 +1,6 @@
-package tutorial;
+package example;
-public class Login extends TutorialSupport {
+public class Login extends ExampleSupport {
public String execute() throws Exception {
Copied:
struts/struts2/trunk/apps/blank/src/main/java/example/package.properties (from
r440414,
struts/struts2/trunk/apps/blank/src/main/java/tutorial/package.properties)
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/blank/src/main/java/example/package.properties?view=diff&rev=440415&p1=struts/struts2/trunk/apps/blank/src/main/java/tutorial/package.properties&r1=440414&p2=struts/struts2/trunk/apps/blank/src/main/java/example/package.properties&r2=440415
==============================================================================
--- struts/struts2/trunk/apps/blank/src/main/java/tutorial/package.properties
(original)
+++ struts/struts2/trunk/apps/blank/src/main/java/example/package.properties
Tue Sep 5 10:29:41 2006
@@ -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.
-
Copied: struts/struts2/trunk/apps/blank/src/main/resources/example.xml (from
r440388, struts/struts2/trunk/apps/blank/src/main/resources/tutorial.xml)
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/blank/src/main/resources/example.xml?view=diff&rev=440415&p1=struts/struts2/trunk/apps/blank/src/main/resources/tutorial.xml&r1=440388&p2=struts/struts2/trunk/apps/blank/src/main/resources/example.xml&r2=440415
==============================================================================
--- struts/struts2/trunk/apps/blank/src/main/resources/tutorial.xml (original)
+++ struts/struts2/trunk/apps/blank/src/main/resources/example.xml Tue Sep 5
10:29:41 2006
@@ -4,19 +4,19 @@
<struts>
- <package name="tutorial" namespace="/tutorial" extends="struts-default">
+ <package name="example" namespace="/example" extends="struts-default">
- <action name="HelloWorld" class="tutorial.HelloWorld">
- <result>/tutorial/HelloWorld.jsp</result>
+ <action name="HelloWorld" class="example.HelloWorld">
+ <result>/example/HelloWorld.jsp</result>
</action>
- <action name="Login!*" method="{1}" class="tutorial.Login">
- <result name="input">/tutorial/Login.jsp</result>
+ <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="tutorial.TutorialSupport">
- <result>/tutorial/{1}.jsp</result>
+ <action name="*" class="example.ExampleSupport">
+ <result>/example/{1}.jsp</result>
</action>
<!-- Add actions here -->
Modified: struts/struts2/trunk/apps/blank/src/main/resources/struts.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/blank/src/main/resources/struts.xml?view=diff&rev=440415&r1=440414&r2=440415
==============================================================================
--- struts/struts2/trunk/apps/blank/src/main/resources/struts.xml (original)
+++ struts/struts2/trunk/apps/blank/src/main/resources/struts.xml Tue Sep 5
10:29:41 2006
@@ -6,7 +6,7 @@
<include file="struts-default.xml"/>
- <include file="tutorial.xml"/>
+ <include file="example.xml"/>
<!-- Add packages here -->
Copied: struts/struts2/trunk/apps/blank/src/main/webapp/example/Login.jsp (from
r440414, struts/struts2/trunk/apps/blank/src/main/webapp/tutorial/Login.jsp)
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/blank/src/main/webapp/example/Login.jsp?view=diff&rev=440415&p1=struts/struts2/trunk/apps/blank/src/main/webapp/tutorial/Login.jsp&r1=440414&p2=struts/struts2/trunk/apps/blank/src/main/webapp/example/Login.jsp&r2=440415
==============================================================================
--- struts/struts2/trunk/apps/blank/src/main/webapp/tutorial/Login.jsp
(original)
+++ struts/struts2/trunk/apps/blank/src/main/webapp/example/Login.jsp Tue Sep
5 10:29:41 2006
@@ -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>
Copied: struts/struts2/trunk/apps/blank/src/main/webapp/example/Welcome.jsp
(from r440414,
struts/struts2/trunk/apps/blank/src/main/webapp/tutorial/Welcome.jsp)
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/blank/src/main/webapp/example/Welcome.jsp?view=diff&rev=440415&p1=struts/struts2/trunk/apps/blank/src/main/webapp/tutorial/Welcome.jsp&r1=440414&p2=struts/struts2/trunk/apps/blank/src/main/webapp/example/Welcome.jsp&r2=440415
==============================================================================
--- struts/struts2/trunk/apps/blank/src/main/webapp/tutorial/Welcome.jsp
(original)
+++ struts/struts2/trunk/apps/blank/src/main/webapp/example/Welcome.jsp Tue Sep
5 10:29:41 2006
@@ -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>
Copied: struts/struts2/trunk/apps/blank/src/test/java/example/ConfigTest.java
(from r440414,
struts/struts2/trunk/apps/blank/src/test/java/tutorial/ConfigTest.java)
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/blank/src/test/java/example/ConfigTest.java?view=diff&rev=440415&p1=struts/struts2/trunk/apps/blank/src/test/java/tutorial/ConfigTest.java&r1=440414&p2=struts/struts2/trunk/apps/blank/src/test/java/example/ConfigTest.java&r2=440415
==============================================================================
--- struts/struts2/trunk/apps/blank/src/test/java/tutorial/ConfigTest.java
(original)
+++ struts/struts2/trunk/apps/blank/src/test/java/example/ConfigTest.java Tue
Sep 5 10:29:41 2006
@@ -1,4 +1,4 @@
-package tutorial;
+package example;
import com.opensymphony.xwork2.ActionSupport;
import com.opensymphony.xwork2.XWorkTestCase;
Copied:
struts/struts2/trunk/apps/blank/src/test/java/example/HelloWorldTest.java (from
r440414,
struts/struts2/trunk/apps/blank/src/test/java/tutorial/HelloWorldTest.java)
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/blank/src/test/java/example/HelloWorldTest.java?view=diff&rev=440415&p1=struts/struts2/trunk/apps/blank/src/test/java/tutorial/HelloWorldTest.java&r1=440414&p2=struts/struts2/trunk/apps/blank/src/test/java/example/HelloWorldTest.java&r2=440415
==============================================================================
--- struts/struts2/trunk/apps/blank/src/test/java/tutorial/HelloWorldTest.java
(original)
+++ struts/struts2/trunk/apps/blank/src/test/java/example/HelloWorldTest.java
Tue Sep 5 10:29:41 2006
@@ -1,4 +1,4 @@
-package tutorial;
+package example;
import com.opensymphony.xwork2.ActionSupport;
import junit.framework.TestCase;
Copied: struts/struts2/trunk/apps/blank/src/test/java/example/LoginTest.java
(from r440414,
struts/struts2/trunk/apps/blank/src/test/java/tutorial/LoginTest.java)
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/blank/src/test/java/example/LoginTest.java?view=diff&rev=440415&p1=struts/struts2/trunk/apps/blank/src/test/java/tutorial/LoginTest.java&r1=440414&p2=struts/struts2/trunk/apps/blank/src/test/java/example/LoginTest.java&r2=440415
==============================================================================
--- struts/struts2/trunk/apps/blank/src/test/java/tutorial/LoginTest.java
(original)
+++ struts/struts2/trunk/apps/blank/src/test/java/example/LoginTest.java Tue
Sep 5 10:29:41 2006
@@ -1,4 +1,4 @@
-package tutorial;
+package example;
import com.opensymphony.xwork2.ActionSupport;
import com.opensymphony.xwork2.config.entities.ActionConfig;
