You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@struts.apache.org by hu...@apache.org on 2006/04/07 02:29:40 UTC
svn commit: r392136 - in /struts/sandbox/trunk/mailreader-course/action2: ./
lab-1-1/src/webapp/pages/ lab-1-2/src/webapp/pages/
lab-1-3/src/webapp/pages/ lab-2-1/src/webapp/pages/
lab-2-2/src/webapp/WEB-INF/ lab-2-2/src/webapp/WEB-INF/entities/ lab-2-...
Author: husted
Date: Thu Apr 6 17:29:36 2006
New Revision: 392136
URL: http://svn.apache.org/viewcvs?rev=392136&view=rev
Log:
MailReader Course
* Add lab 3-1
Added:
struts/sandbox/trunk/mailreader-course/action2/lab-3-1/
- copied from r392069, struts/sandbox/trunk/mailreader-course/action2/lab-2-3/
struts/sandbox/trunk/mailreader-course/action2/lab-3-1/lab-3-1.iml
struts/sandbox/trunk/mailreader-course/action2/lab-3-1/src/java/Login-validation.xml
- copied unchanged from r392086, struts/sandbox/trunk/mailreader-course/action2/lab-2-3/src/java/Login-validation.xml
struts/sandbox/trunk/mailreader-course/action2/lab-3-1/src/java/Login.java
- copied unchanged from r392086, struts/sandbox/trunk/mailreader-course/action2/lab-2-3/src/java/Login.java
struts/sandbox/trunk/mailreader-course/action2/lab-3-1/src/java/Logout.java
- copied unchanged from r392086, struts/sandbox/trunk/mailreader-course/action2/lab-2-3/src/java/Logout.java
struts/sandbox/trunk/mailreader-course/action2/lab-3-1/src/java/MailReaderSupport.java
- copied unchanged from r392086, struts/sandbox/trunk/mailreader-course/action2/lab-2-3/src/java/MailReaderSupport.java
struts/sandbox/trunk/mailreader-course/action2/lab-3-1/src/java/Register.java
- copied unchanged from r392086, struts/sandbox/trunk/mailreader-course/action2/lab-2-3/src/java/Register.java
struts/sandbox/trunk/mailreader-course/action2/lab-3-1/src/java/resources_ja.properties (with props)
struts/sandbox/trunk/mailreader-course/action2/lab-3-1/src/java/resources_ru.properties (with props)
struts/sandbox/trunk/mailreader-course/action2/lab-3-1/src/java/xwork.xml
- copied, changed from r392086, struts/sandbox/trunk/mailreader-course/action2/lab-2-3/src/java/xwork.xml
struts/sandbox/trunk/mailreader-course/action2/lab-3-1/src/webapp/pages/Login.jsp
- copied, changed from r392086, struts/sandbox/trunk/mailreader-course/action2/lab-2-3/src/webapp/pages/Login.jsp
struts/sandbox/trunk/mailreader-course/action2/lab-3-1/src/webapp/pages/Menu.jsp
- copied, changed from r392086, struts/sandbox/trunk/mailreader-course/action2/lab-2-3/src/webapp/pages/Menu.jsp
struts/sandbox/trunk/mailreader-course/action2/lab-3-1/src/webapp/pages/Welcome.jsp
- copied, changed from r392086, struts/sandbox/trunk/mailreader-course/action2/lab-2-3/src/webapp/pages/Welcome.jsp
Removed:
struts/sandbox/trunk/mailreader-course/action2/lab-3-1/lab-2-2.iml
Modified:
struts/sandbox/trunk/mailreader-course/action2/lab-1-1/src/webapp/pages/Welcome.jsp
struts/sandbox/trunk/mailreader-course/action2/lab-1-2/src/webapp/pages/Welcome.jsp
struts/sandbox/trunk/mailreader-course/action2/lab-1-3/src/webapp/pages/Register.jsp
struts/sandbox/trunk/mailreader-course/action2/lab-1-3/src/webapp/pages/Welcome.jsp
struts/sandbox/trunk/mailreader-course/action2/lab-2-1/src/webapp/pages/Register.jsp
struts/sandbox/trunk/mailreader-course/action2/lab-2-1/src/webapp/pages/Welcome.jsp
struts/sandbox/trunk/mailreader-course/action2/lab-2-2/src/webapp/WEB-INF/entities/register-open.xml
struts/sandbox/trunk/mailreader-course/action2/lab-2-2/src/webapp/WEB-INF/entities/register-page.xml
struts/sandbox/trunk/mailreader-course/action2/lab-2-2/src/webapp/WEB-INF/entities/welcome-open.xml
struts/sandbox/trunk/mailreader-course/action2/lab-2-2/src/webapp/WEB-INF/webtest.xml
struts/sandbox/trunk/mailreader-course/action2/lab-2-2/src/webapp/pages/Menu.jsp
struts/sandbox/trunk/mailreader-course/action2/lab-2-2/src/webapp/pages/Register.jsp
struts/sandbox/trunk/mailreader-course/action2/lab-2-2/src/webapp/pages/Welcome.jsp
struts/sandbox/trunk/mailreader-course/action2/lab-2-3/src/java/xwork.xml
struts/sandbox/trunk/mailreader-course/action2/lab-2-3/src/webapp/WEB-INF/entities/register-open.xml
struts/sandbox/trunk/mailreader-course/action2/lab-2-3/src/webapp/WEB-INF/entities/register-page.xml
struts/sandbox/trunk/mailreader-course/action2/lab-2-3/src/webapp/WEB-INF/entities/welcome-open.xml
struts/sandbox/trunk/mailreader-course/action2/lab-2-3/src/webapp/WEB-INF/webtest.xml
struts/sandbox/trunk/mailreader-course/action2/lab-2-3/src/webapp/pages/Login.jsp
struts/sandbox/trunk/mailreader-course/action2/lab-2-3/src/webapp/pages/Menu.jsp
struts/sandbox/trunk/mailreader-course/action2/lab-2-3/src/webapp/pages/Register.jsp
struts/sandbox/trunk/mailreader-course/action2/lab-2-3/src/webapp/pages/Welcome.jsp
struts/sandbox/trunk/mailreader-course/action2/lab-3-1/src/java/resources.properties
struts/sandbox/trunk/mailreader-course/action2/lab-3-1/src/webapp/WEB-INF/entities/register-open.xml
struts/sandbox/trunk/mailreader-course/action2/lab-3-1/src/webapp/WEB-INF/entities/register-page.xml
struts/sandbox/trunk/mailreader-course/action2/lab-3-1/src/webapp/WEB-INF/entities/welcome-open.xml
struts/sandbox/trunk/mailreader-course/action2/lab-3-1/src/webapp/WEB-INF/webtest.xml
struts/sandbox/trunk/mailreader-course/action2/lab-3-1/src/webapp/pages/Register.jsp
struts/sandbox/trunk/mailreader-course/action2/mailreader-course-action2.ipr
Modified: struts/sandbox/trunk/mailreader-course/action2/lab-1-1/src/webapp/pages/Welcome.jsp
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/mailreader-course/action2/lab-1-1/src/webapp/pages/Welcome.jsp?rev=392136&r1=392135&r2=392136&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/action2/lab-1-1/src/webapp/pages/Welcome.jsp (original)
+++ struts/sandbox/trunk/mailreader-course/action2/lab-1-1/src/webapp/pages/Welcome.jsp Thu Apr 6 17:29:36 2006
@@ -1,15 +1,15 @@
<%@ taglib uri="/webwork" prefix="ww" %>
<html>
<head>
- <title>MailReader Application</title>
+ <title>MailReader</title>
</head>
<body>
<h3>MailReader Options</h3>
<ul>
- <li><a href="<ww:url action="Missing"/>">Register with the MailReader</a></li>
- <li><a href="<ww:url action="Missing"/>">Log on to the MailReader</a></li>
+ <li><a href="<ww:url action="Missing"/>">Register with MailReader</a></li>
+ <li><a href="<ww:url action="Missing"/>">Log into MailReader</a></li>
</ul>
<h3>Language Options</h3>
Modified: struts/sandbox/trunk/mailreader-course/action2/lab-1-2/src/webapp/pages/Welcome.jsp
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/mailreader-course/action2/lab-1-2/src/webapp/pages/Welcome.jsp?rev=392136&r1=392135&r2=392136&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/action2/lab-1-2/src/webapp/pages/Welcome.jsp (original)
+++ struts/sandbox/trunk/mailreader-course/action2/lab-1-2/src/webapp/pages/Welcome.jsp Thu Apr 6 17:29:36 2006
@@ -1,15 +1,15 @@
<%@ taglib uri="/webwork" prefix="ww" %>
<html>
<head>
- <title>MailReader Application</title>
+ <title>MailReader</title>
</head>
<body>
<h3>MailReader Options</h3>
<ul>
- <li><a href="<ww:url action="Missing"/>">Register with the MailReader</a></li>
- <li><a href="<ww:url action="Missing"/>">Log on to the MailReader</a></li>
+ <li><a href="<ww:url action="Missing"/>">Register with MailReader</a></li>
+ <li><a href="<ww:url action="Missing"/>">Log into MailReader</a></li>
</ul>
<h3>Language Options</h3>
Modified: struts/sandbox/trunk/mailreader-course/action2/lab-1-3/src/webapp/pages/Register.jsp
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/mailreader-course/action2/lab-1-3/src/webapp/pages/Register.jsp?rev=392136&r1=392135&r2=392136&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/action2/lab-1-3/src/webapp/pages/Register.jsp (original)
+++ struts/sandbox/trunk/mailreader-course/action2/lab-1-3/src/webapp/pages/Register.jsp Thu Apr 6 17:29:36 2006
@@ -1,7 +1,7 @@
<%@ taglib uri="/webwork" prefix="ww" %>
<html>
<head>
- <title>Register</title>
+ <title>MailReader - Register</title>
</head>
<body onLoad="self.focus();document.Register.username.focus()">
@@ -9,11 +9,11 @@
<ww:actionerror/>
<ww:form method="POST">
- <ww:textfield label="UserName" name="username"/>
+ <ww:textfield label="Username" name="username"/>
<ww:password label="Password" name="password"/>
- <ww:password label="Confirm Password" name="password2"/>
+ <ww:password label="(Repeat) Password" name="password2"/>
<ww:textfield label="Full Name" name="fullName"/>
Modified: struts/sandbox/trunk/mailreader-course/action2/lab-1-3/src/webapp/pages/Welcome.jsp
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/mailreader-course/action2/lab-1-3/src/webapp/pages/Welcome.jsp?rev=392136&r1=392135&r2=392136&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/action2/lab-1-3/src/webapp/pages/Welcome.jsp (original)
+++ struts/sandbox/trunk/mailreader-course/action2/lab-1-3/src/webapp/pages/Welcome.jsp Thu Apr 6 17:29:36 2006
@@ -1,7 +1,7 @@
<%@ taglib uri="/webwork" prefix="ww" %>
<html>
<head>
- <title>MailReader Application</title>
+ <title>MailReader</title>
</head>
<body>
Modified: struts/sandbox/trunk/mailreader-course/action2/lab-2-1/src/webapp/pages/Register.jsp
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/mailreader-course/action2/lab-2-1/src/webapp/pages/Register.jsp?rev=392136&r1=392135&r2=392136&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/action2/lab-2-1/src/webapp/pages/Register.jsp (original)
+++ struts/sandbox/trunk/mailreader-course/action2/lab-2-1/src/webapp/pages/Register.jsp Thu Apr 6 17:29:36 2006
@@ -1,7 +1,7 @@
<%@ taglib uri="/webwork" prefix="ww" %>
<html>
<head>
- <title>Register</title>
+ <title>MailReader - Register</title>
</head>
<body onLoad="self.focus();document.Register.username.focus()">
@@ -9,11 +9,11 @@
<ww:actionerror/>
<ww:form method="POST" validate="true">
- <ww:textfield label="UserName" name="username"/>
+ <ww:textfield label="Username" name="username"/>
<ww:password label="Password" name="password"/>
- <ww:password label="Confirm Password" name="password2"/>
+ <ww:password label="(Repeat) Password" name="password2"/>
<ww:textfield label="Full Name" name="fullName"/>
Modified: struts/sandbox/trunk/mailreader-course/action2/lab-2-1/src/webapp/pages/Welcome.jsp
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/mailreader-course/action2/lab-2-1/src/webapp/pages/Welcome.jsp?rev=392136&r1=392135&r2=392136&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/action2/lab-2-1/src/webapp/pages/Welcome.jsp (original)
+++ struts/sandbox/trunk/mailreader-course/action2/lab-2-1/src/webapp/pages/Welcome.jsp Thu Apr 6 17:29:36 2006
@@ -1,7 +1,7 @@
<%@ taglib uri="/webwork" prefix="ww" %>
<html>
<head>
- <title>MailReader Application</title>
+ <title>MailReader</title>
</head>
<body>
Modified: struts/sandbox/trunk/mailreader-course/action2/lab-2-2/src/webapp/WEB-INF/entities/register-open.xml
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/mailreader-course/action2/lab-2-2/src/webapp/WEB-INF/entities/register-open.xml?rev=392136&r1=392135&r2=392136&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/action2/lab-2-2/src/webapp/WEB-INF/entities/register-open.xml (original)
+++ struts/sandbox/trunk/mailreader-course/action2/lab-2-2/src/webapp/WEB-INF/entities/register-open.xml Thu Apr 6 17:29:36 2006
@@ -1,5 +1,5 @@
&welcome-open;
<clickLink
description="Click Register"
- label="Register with the MailReader"/>
+ label="Register with MailReader"/>
®ister-page;
Modified: struts/sandbox/trunk/mailreader-course/action2/lab-2-2/src/webapp/WEB-INF/entities/register-page.xml
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/mailreader-course/action2/lab-2-2/src/webapp/WEB-INF/entities/register-page.xml?rev=392136&r1=392135&r2=392136&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/action2/lab-2-2/src/webapp/WEB-INF/entities/register-page.xml (original)
+++ struts/sandbox/trunk/mailreader-course/action2/lab-2-2/src/webapp/WEB-INF/entities/register-page.xml Thu Apr 6 17:29:36 2006
@@ -1,3 +1,3 @@
<verifyTitle
description="Registration page title"
- text="Register"/>
+ text="MailReader - Register"/>
Modified: struts/sandbox/trunk/mailreader-course/action2/lab-2-2/src/webapp/WEB-INF/entities/welcome-open.xml
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/mailreader-course/action2/lab-2-2/src/webapp/WEB-INF/entities/welcome-open.xml?rev=392136&r1=392135&r2=392136&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/action2/lab-2-2/src/webapp/WEB-INF/entities/welcome-open.xml (original)
+++ struts/sandbox/trunk/mailreader-course/action2/lab-2-2/src/webapp/WEB-INF/entities/welcome-open.xml Thu Apr 6 17:29:36 2006
@@ -3,4 +3,4 @@
url="Welcome.do"/>
<verifyTitle
description="Welcome page title"
- text="MailReader Application"/>
+ text="MailReader"/>
Modified: struts/sandbox/trunk/mailreader-course/action2/lab-2-2/src/webapp/WEB-INF/webtest.xml
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/mailreader-course/action2/lab-2-2/src/webapp/WEB-INF/webtest.xml?rev=392136&r1=392135&r2=392136&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/action2/lab-2-2/src/webapp/WEB-INF/webtest.xml (original)
+++ struts/sandbox/trunk/mailreader-course/action2/lab-2-2/src/webapp/WEB-INF/webtest.xml Thu Apr 6 17:29:36 2006
@@ -119,7 +119,7 @@
®ister-trillian;
<verifyTitle
description="Menu page title"
- text="Menu"/>
+ text="MailReader - Menu"/>
</steps>
</webtest>
Modified: struts/sandbox/trunk/mailreader-course/action2/lab-2-2/src/webapp/pages/Menu.jsp
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/mailreader-course/action2/lab-2-2/src/webapp/pages/Menu.jsp?rev=392136&r1=392135&r2=392136&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/action2/lab-2-2/src/webapp/pages/Menu.jsp (original)
+++ struts/sandbox/trunk/mailreader-course/action2/lab-2-2/src/webapp/pages/Menu.jsp Thu Apr 6 17:29:36 2006
@@ -1,7 +1,7 @@
<%@ taglib uri="/webwork" prefix="ww" %>
<html>
<head>
- <title>Menu</title>
+ <title>MailReader - Menu</title>
</head>
<body>
Modified: struts/sandbox/trunk/mailreader-course/action2/lab-2-2/src/webapp/pages/Register.jsp
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/mailreader-course/action2/lab-2-2/src/webapp/pages/Register.jsp?rev=392136&r1=392135&r2=392136&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/action2/lab-2-2/src/webapp/pages/Register.jsp (original)
+++ struts/sandbox/trunk/mailreader-course/action2/lab-2-2/src/webapp/pages/Register.jsp Thu Apr 6 17:29:36 2006
@@ -1,7 +1,7 @@
<%@ taglib uri="/webwork" prefix="ww" %>
<html>
<head>
- <title>Register</title>
+ <title>MailReader - Register</title>
</head>
<body onLoad="self.focus();document.Register.username.focus()">
@@ -9,11 +9,11 @@
<ww:actionerror/>
<ww:form method="POST" validate="true">
- <ww:textfield label="UserName" name="username"/>
+ <ww:textfield label="Username" name="username"/>
<ww:password label="Password" name="password"/>
- <ww:password label="Confirm Password" name="password2"/>
+ <ww:password label="(Repeat) Password" name="password2"/>
<ww:textfield label="Full Name" name="fullName"/>
Modified: struts/sandbox/trunk/mailreader-course/action2/lab-2-2/src/webapp/pages/Welcome.jsp
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/mailreader-course/action2/lab-2-2/src/webapp/pages/Welcome.jsp?rev=392136&r1=392135&r2=392136&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/action2/lab-2-2/src/webapp/pages/Welcome.jsp (original)
+++ struts/sandbox/trunk/mailreader-course/action2/lab-2-2/src/webapp/pages/Welcome.jsp Thu Apr 6 17:29:36 2006
@@ -1,15 +1,15 @@
<%@ taglib uri="/webwork" prefix="ww" %>
<html>
<head>
- <title>MailReader Application</title>
+ <title>MailReader</title>
</head>
<body>
<h3>MailReader Options</h3>
<ul>
- <li><a href="<ww:url action="Register!input"/>">Register with the MailReader</a></li>
- <li><a href="<ww:url action="Missing"/>">Log on to the MailReader</a></li>
+ <li><a href="<ww:url action="Register!input"/>">Register with MailReader</a></li>
+ <li><a href="<ww:url action="Missing"/>">Log into MailReader</a></li>
</ul>
<h3>Language Options</h3>
Modified: struts/sandbox/trunk/mailreader-course/action2/lab-2-3/src/java/xwork.xml
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/mailreader-course/action2/lab-2-3/src/java/xwork.xml?rev=392136&r1=392135&r2=392136&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/action2/lab-2-3/src/java/xwork.xml (original)
+++ struts/sandbox/trunk/mailreader-course/action2/lab-2-3/src/java/xwork.xml Thu Apr 6 17:29:36 2006
@@ -21,6 +21,7 @@
<action name="Register" class="Register">
<result name="input">/pages/Register.jsp</result>
+ <result name="cancel" type="redirect-action">Welcome</result>
<result type="redirect-action">Menu</result>
</action>
Modified: struts/sandbox/trunk/mailreader-course/action2/lab-2-3/src/webapp/WEB-INF/entities/register-open.xml
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/mailreader-course/action2/lab-2-3/src/webapp/WEB-INF/entities/register-open.xml?rev=392136&r1=392135&r2=392136&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/action2/lab-2-3/src/webapp/WEB-INF/entities/register-open.xml (original)
+++ struts/sandbox/trunk/mailreader-course/action2/lab-2-3/src/webapp/WEB-INF/entities/register-open.xml Thu Apr 6 17:29:36 2006
@@ -1,5 +1,5 @@
&welcome-open;
<clickLink
description="Click Register"
- label="Register with the MailReader"/>
+ label="Register with MailReader"/>
®ister-page;
Modified: struts/sandbox/trunk/mailreader-course/action2/lab-2-3/src/webapp/WEB-INF/entities/register-page.xml
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/mailreader-course/action2/lab-2-3/src/webapp/WEB-INF/entities/register-page.xml?rev=392136&r1=392135&r2=392136&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/action2/lab-2-3/src/webapp/WEB-INF/entities/register-page.xml (original)
+++ struts/sandbox/trunk/mailreader-course/action2/lab-2-3/src/webapp/WEB-INF/entities/register-page.xml Thu Apr 6 17:29:36 2006
@@ -1,3 +1,3 @@
<verifyTitle
description="Registration page title"
- text="Register"/>
+ text="MailReader - Register"/>
Modified: struts/sandbox/trunk/mailreader-course/action2/lab-2-3/src/webapp/WEB-INF/entities/welcome-open.xml
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/mailreader-course/action2/lab-2-3/src/webapp/WEB-INF/entities/welcome-open.xml?rev=392136&r1=392135&r2=392136&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/action2/lab-2-3/src/webapp/WEB-INF/entities/welcome-open.xml (original)
+++ struts/sandbox/trunk/mailreader-course/action2/lab-2-3/src/webapp/WEB-INF/entities/welcome-open.xml Thu Apr 6 17:29:36 2006
@@ -3,4 +3,4 @@
url="Welcome.do"/>
<verifyTitle
description="Welcome page title"
- text="MailReader Application"/>
+ text="MailReader"/>
Modified: struts/sandbox/trunk/mailreader-course/action2/lab-2-3/src/webapp/WEB-INF/webtest.xml
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/mailreader-course/action2/lab-2-3/src/webapp/WEB-INF/webtest.xml?rev=392136&r1=392135&r2=392136&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/action2/lab-2-3/src/webapp/WEB-INF/webtest.xml (original)
+++ struts/sandbox/trunk/mailreader-course/action2/lab-2-3/src/webapp/WEB-INF/webtest.xml Thu Apr 6 17:29:36 2006
@@ -119,7 +119,7 @@
®ister-trillian;
<verifyTitle
description="Menu page title"
- text="Menu"/>
+ text="MailReader - Menu"/>
</steps>
</webtest>
Modified: struts/sandbox/trunk/mailreader-course/action2/lab-2-3/src/webapp/pages/Login.jsp
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/mailreader-course/action2/lab-2-3/src/webapp/pages/Login.jsp?rev=392136&r1=392135&r2=392136&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/action2/lab-2-3/src/webapp/pages/Login.jsp (original)
+++ struts/sandbox/trunk/mailreader-course/action2/lab-2-3/src/webapp/pages/Login.jsp Thu Apr 6 17:29:36 2006
@@ -1,14 +1,14 @@
<%@ taglib uri="/webwork" prefix="ww" %>
<html>
<head>
- <title>Login</title>
+ <title>MailReader - Login</title>
</head>
-<body onLoad="self.focus();document.Logon.username.focus()">
+<body onLoad="self.focus();document.Login.username.focus()">
<ww:actionerror/>
<ww:form method="POST" validate="true">
- <ww:textfield label="UserName" name="username"/>
+ <ww:textfield label="Username" name="username"/>
<ww:password label="Password" name="password" showPassword="true"/>
Modified: struts/sandbox/trunk/mailreader-course/action2/lab-2-3/src/webapp/pages/Menu.jsp
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/mailreader-course/action2/lab-2-3/src/webapp/pages/Menu.jsp?rev=392136&r1=392135&r2=392136&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/action2/lab-2-3/src/webapp/pages/Menu.jsp (original)
+++ struts/sandbox/trunk/mailreader-course/action2/lab-2-3/src/webapp/pages/Menu.jsp Thu Apr 6 17:29:36 2006
@@ -1,11 +1,11 @@
<%@ taglib uri="/webwork" prefix="ww" %>
<html>
<head>
- <title>Menu</title>
+ <title>MailReader - Menu</title>
</head>
<body>
-<h3>Main Menu Options for <ww:property value="user.fullName"/></h3>
+<h3>Menu Options for <ww:property value="user.fullName"/></h3>
<ul>
<li><a href="<ww:url action="Register!input" />">
Edit your registration profile
Modified: struts/sandbox/trunk/mailreader-course/action2/lab-2-3/src/webapp/pages/Register.jsp
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/mailreader-course/action2/lab-2-3/src/webapp/pages/Register.jsp?rev=392136&r1=392135&r2=392136&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/action2/lab-2-3/src/webapp/pages/Register.jsp (original)
+++ struts/sandbox/trunk/mailreader-course/action2/lab-2-3/src/webapp/pages/Register.jsp Thu Apr 6 17:29:36 2006
@@ -1,7 +1,7 @@
<%@ taglib uri="/webwork" prefix="ww" %>
<html>
<head>
- <title>Register</title>
+ <title>MailReader - Register</title>
</head>
<body onLoad="self.focus();document.Register.username.focus()">
@@ -9,11 +9,11 @@
<ww:actionerror/>
<ww:form method="POST" validate="true">
- <ww:textfield label="UserName" name="username"/>
+ <ww:textfield label="Username" name="username"/>
<ww:password label="Password" name="password"/>
- <ww:password label="Confirm Password" name="password2"/>
+ <ww:password label="(Repeat) Password" name="password2"/>
<ww:textfield label="Full Name" name="fullName"/>
@@ -22,6 +22,9 @@
<ww:textfield label="Reply To Address" name="replyToAddress"/>
<ww:submit value="Save" name="Save"/>
+
+ <ww:submit action="Register!cancel" value="Cancel" name="Cancel"
+ onclick="form.onsubmit=null"/>
</ww:form>
Modified: struts/sandbox/trunk/mailreader-course/action2/lab-2-3/src/webapp/pages/Welcome.jsp
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/mailreader-course/action2/lab-2-3/src/webapp/pages/Welcome.jsp?rev=392136&r1=392135&r2=392136&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/action2/lab-2-3/src/webapp/pages/Welcome.jsp (original)
+++ struts/sandbox/trunk/mailreader-course/action2/lab-2-3/src/webapp/pages/Welcome.jsp Thu Apr 6 17:29:36 2006
@@ -1,15 +1,15 @@
<%@ taglib uri="/webwork" prefix="ww" %>
<html>
<head>
- <title>MailReader Application</title>
+ <title>MailReader</title>
</head>
<body>
<h3>MailReader Options</h3>
<ul>
- <li><a href="<ww:url action="Register!input"/>">Register with the MailReader</a></li>
- <li><a href="<ww:url action="Login!input"/>">Log on to the MailReader</a></li>
+ <li><a href="<ww:url action="Register!input"/>">Register with MailReader</a></li>
+ <li><a href="<ww:url action="Login!input"/>">Log into MailReader</a></li>
</ul>
<h3>Language Options</h3>
Added: struts/sandbox/trunk/mailreader-course/action2/lab-3-1/lab-3-1.iml
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/mailreader-course/action2/lab-3-1/lab-3-1.iml?rev=392136&view=auto
==============================================================================
--- struts/sandbox/trunk/mailreader-course/action2/lab-3-1/lab-3-1.iml (added)
+++ struts/sandbox/trunk/mailreader-course/action2/lab-3-1/lab-3-1.iml Thu Apr 6 17:29:36 2006
@@ -0,0 +1,264 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module version="4" relativePaths="true" type="J2EE_WEB_MODULE" j2ee-integration="Tomcat Server">
+ <component name="ModuleRootManager" />
+ <component name="NewModuleRootManager">
+ <output url="file://C:/opt/Apache/Tomcat-5.0/webapps/lab-3-1/WEB-INF/classes" />
+ <exclude-output />
+ <exploded url="file://C:/opt/Apache/Tomcat-5.0/webapps/lab-3-1" />
+ <exclude-exploded />
+ <content url="file://$MODULE_DIR$">
+ <sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="false" />
+ </content>
+ <orderEntry type="inheritedJdk" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="library" name="Tomcat" level="application_server_libraries" />
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../lib/spring-core.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../lib/commons-digester-1.6.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../lib/webwork-2.2.2.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../lib/spring-web.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../lib/struts-mailreader-dao-1.3.0-dev.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../lib/rife-continuations.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../lib/freemarker.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../lib/xwork-1.1.2.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../lib/spring-beans.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../lib/oscore.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../lib/ognl.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../lib/spring-context.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../lib/commons-collections-3.1.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../lib/commons-logging-1.0.4.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../lib/struts-taglib-1.3.0.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$APPLICATION_HOME_DIR$/lib/junit.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntryProperties />
+ </component>
+ <component name="WebModuleBuildComponent">
+ <setting name="EXPLODED_URL" value="file://C:/opt/Apache/Tomcat-5.0/webapps/lab-3-1" />
+ <setting name="EXPLODED_ENABLED" value="true" />
+ <setting name="JAR_URL" value="file://" />
+ <setting name="JAR_ENABLED" value="false" />
+ <setting name="SYNC_EXPLODED_DIR" value="true" />
+ <setting name="BUILD_ON_FRAME_DEACTIVATION" value="false" />
+ <setting name="RUN_JASPER_VALIDATION" value="false" />
+ </component>
+ <component name="WebModuleProperties">
+ <containerElement type="library" level="module">
+ <attribute name="method" value="1" />
+ <attribute name="URI" value="/WEB-INF/lib/junit.jar" />
+ <url>jar://$APPLICATION_HOME_DIR$/lib/junit.jar!/</url>
+ </containerElement>
+ <containerElement type="library" level="module">
+ <attribute name="method" value="1" />
+ <attribute name="URI" value="/WEB-INF/lib/commons-collections-3.1.jar" />
+ <url>jar://$MODULE_DIR$/../../lib/commons-collections-3.1.jar!/</url>
+ </containerElement>
+ <containerElement type="library" level="module">
+ <attribute name="method" value="1" />
+ <attribute name="URI" value="/WEB-INF/lib/commons-digester-1.6.jar" />
+ <url>jar://$MODULE_DIR$/../../lib/commons-digester-1.6.jar!/</url>
+ </containerElement>
+ <containerElement type="library" level="module">
+ <attribute name="method" value="1" />
+ <attribute name="URI" value="/WEB-INF/lib/commons-logging-1.0.4.jar" />
+ <url>jar://$MODULE_DIR$/../../lib/commons-logging-1.0.4.jar!/</url>
+ </containerElement>
+ <containerElement type="library" level="module">
+ <attribute name="method" value="1" />
+ <attribute name="URI" value="/WEB-INF/lib/freemarker.jar" />
+ <url>jar://$MODULE_DIR$/../../lib/freemarker.jar!/</url>
+ </containerElement>
+ <containerElement type="library" level="module">
+ <attribute name="method" value="1" />
+ <attribute name="URI" value="/WEB-INF/lib/ognl.jar" />
+ <url>jar://$MODULE_DIR$/../../lib/ognl.jar!/</url>
+ </containerElement>
+ <containerElement type="library" level="module">
+ <attribute name="method" value="1" />
+ <attribute name="URI" value="/WEB-INF/lib/oscore.jar" />
+ <url>jar://$MODULE_DIR$/../../lib/oscore.jar!/</url>
+ </containerElement>
+ <containerElement type="library" level="module">
+ <attribute name="method" value="1" />
+ <attribute name="URI" value="/WEB-INF/lib/rife-continuations.jar" />
+ <url>jar://$MODULE_DIR$/../../lib/rife-continuations.jar!/</url>
+ </containerElement>
+ <containerElement type="library" level="module">
+ <attribute name="method" value="1" />
+ <attribute name="URI" value="/WEB-INF/lib/spring-beans.jar" />
+ <url>jar://$MODULE_DIR$/../../lib/spring-beans.jar!/</url>
+ </containerElement>
+ <containerElement type="library" level="module">
+ <attribute name="method" value="1" />
+ <attribute name="URI" value="/WEB-INF/lib/spring-context.jar" />
+ <url>jar://$MODULE_DIR$/../../lib/spring-context.jar!/</url>
+ </containerElement>
+ <containerElement type="library" level="module">
+ <attribute name="method" value="1" />
+ <attribute name="URI" value="/WEB-INF/lib/spring-core.jar" />
+ <url>jar://$MODULE_DIR$/../../lib/spring-core.jar!/</url>
+ </containerElement>
+ <containerElement type="library" level="module">
+ <attribute name="method" value="1" />
+ <attribute name="URI" value="/WEB-INF/lib/spring-web.jar" />
+ <url>jar://$MODULE_DIR$/../../lib/spring-web.jar!/</url>
+ </containerElement>
+ <containerElement type="library" level="module">
+ <attribute name="method" value="1" />
+ <attribute name="URI" value="/WEB-INF/lib/struts-mailreader-dao-1.3.0-dev.jar" />
+ <url>jar://$MODULE_DIR$/../../lib/struts-mailreader-dao-1.3.0-dev.jar!/</url>
+ </containerElement>
+ <containerElement type="library" level="module">
+ <attribute name="method" value="1" />
+ <attribute name="URI" value="/WEB-INF/lib/struts-taglib-1.3.0.jar" />
+ <url>jar://$MODULE_DIR$/../../lib/struts-taglib-1.3.0.jar!/</url>
+ </containerElement>
+ <containerElement type="library" level="module">
+ <attribute name="method" value="1" />
+ <attribute name="URI" value="/WEB-INF/lib/webwork-2.2.2.jar" />
+ <url>jar://$MODULE_DIR$/../../lib/webwork-2.2.2.jar!/</url>
+ </containerElement>
+ <containerElement type="library" level="module">
+ <attribute name="method" value="1" />
+ <attribute name="URI" value="/WEB-INF/lib/xwork-1.1.2.jar" />
+ <url>jar://$MODULE_DIR$/../../lib/xwork-1.1.2.jar!/</url>
+ </containerElement>
+ <deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/src/webapp/WEB-INF/web.xml" optional="false" version="2.3" />
+ <deploymentDescriptor name="context.xml" url="file://$MODULE_DIR$/META-INF/context.xml" optional="false" version="5.x" />
+ <webroots>
+ <root url="file://$MODULE_DIR$/src/webapp" relative="/" />
+ <root url="file://$MODULE_DIR$/src/java" relative="/WEB-INF/src/java" />
+ <root url="file://$MODULE_DIR$/src/test" relative="/WEB-INF/src/test" />
+ </webroots>
+ </component>
+ <component name="WeblogicWebModuleProperties">
+ <option name="IS_RUN_APPC" value="false" />
+ </component>
+</module>
+
Modified: struts/sandbox/trunk/mailreader-course/action2/lab-3-1/src/java/resources.properties
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/mailreader-course/action2/lab-3-1/src/java/resources.properties?rev=392136&r1=392069&r2=392136&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/action2/lab-3-1/src/java/resources.properties (original)
+++ struts/sandbox/trunk/mailreader-course/action2/lab-3-1/src/java/resources.properties Thu Apr 6 17:29:36 2006
@@ -1,2 +1,102 @@
hello.nessage = Congratulations! WebWork is up and running ...
-# Add your messages here ...
+
+index.title=MailReader
+index.login=Log into MailReader
+index.registration=Register with MailReader
+
+registration.title.create=MailReader - Register - Create
+registration.title.edit=MailReader - Register - Edit
+
+username=Username
+password=Password
+password2=(Repeat) Password
+fullName=Full Name
+fromAddress=From Address
+replyToAddress=Reply To Address
+
+menu.title=MailReader - Main Menu
+menu.heading=Menu Options for
+menu.registration=Edit your registration profile
+menu.logout=Log out of MailReader
+
+login.title=MailReader - Logon
+
+
+# Future use
+button.cancel=Cancel
+button.confirm=Confirm
+button.doSubmit=DO_SUBMIT
+button.doReset=DO_RESULT
+button.doCancel=org.apache.struts.taglib.html.CANCEL
+button.reset=Reset
+button.save=Save
+change.message=Your password has expired. Please ask the system administrator to change it.
+change.try=Try Again
+change.title=Password Has Expired
+database.load=Cannot load database from {0}
+error.database.missing=User database is missing, cannot validate logon credentials
+error.fromAddress.format=Invalid format for From Address
+error.fromAddress.required=From Address is required
+error.fullName.required=Full Name is required
+error.host.required=Mail Server is required
+error.noSubscription=No Subscription bean in user session
+error.password.expired=Your password has expired for username {0}
+error.password.required=Password is required
+error.password2.required=Confirmation password is required
+error.password.match=Password and confirmation password must match
+error.password.mismatch=Invalid username and/or password, please try again
+error.replyToAddress.format=Invalid format for Reply To Address
+webwork.messages.invalid.token=Cannot submit this form out of order
+error.type.invalid=Server Type must be 'imap' or 'pop3'
+error.type.required=Server Type is required
+error.username.required=Username is required
+error.username.unique=That username is already in use - please select another
+errors.footer=</ul><hr>
+errors.header=<h3><font color="red">Validation Error</font></h3><p>You must correct the following error(s) before proceeding:</p><ul>
+errors.prefix=<li>
+errors.suffix=</li>
+errors.ioException=I/O exception rendering error messages: {0}
+expired.password=User Password has expired for {0}
+heading.autoConnect=Auto
+heading.subscriptions=Current Subscriptions
+heading.host=Host Name
+heading.user=User Name
+heading.type=Server Type
+heading.action=Action
+index.heading=MailReader Demonstration Application Options
+index.tour=A Walking Tour of the MailReader Demonstration Application
+linkSubscription.io=I/O Error: {0}
+linkSubscription.noSubscription=No subscription under attribute {0}
+linkUser.io=I/O Error: {0}
+linkUser.noUser=No user under attribute {0}
+option.imap=IMAP Protocol
+option.pop3=POP3 Protocol
+# prompt.
+autoConnect=Auto Connect
+mailHostname=Mail Server
+mailPassword=Mail Password
+mailServerType=Server Type
+mailUsername=Mail Username
+registration.addSubscription=Add
+registration.deleteSubscription=Delete
+registration.editSubscription=Edit
+subscription.title.create=Create New Mail Subscription
+subscription.title.delete=Delete Existing Mail Subscription
+subscription.title.edit=Edit Existing Mail Subscription
+
+# Standard error messages for validator framework checks
+errors.required=${getText(fieldName)} is required.
+errors.minlength=${getText(fieldName)} cannot be less than {1} characters.
+errors.maxlength=${getText(fieldName)} cannot be greater than {1} characters.
+errors.invalid=${getText(fieldName)} is invalid.
+errors.byte=${getText(fieldName)} must be an byte.
+errors.short=${getText(fieldName)} must be an short.
+errors.integer=${getText(fieldName)} must be an integer.
+errors.long=${getText(fieldName)} must be an long.
+errors.float=${getText(fieldName)} must be an float.
+errors.double=${getText(fieldName)} must be an double.
+errors.date=${getText(fieldName)} is not a date.
+errors.range=${getText(fieldName)} is not in the range ${minLength} through ${maxLength}.
+errors.creditcard=${getText(fieldName)} is not a valid credit card number.
+errors.email=${getText(fieldName)} is an invalid e-mail address.
+errors.literal=${getText(fieldName)}
Added: struts/sandbox/trunk/mailreader-course/action2/lab-3-1/src/java/resources_ja.properties
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/mailreader-course/action2/lab-3-1/src/java/resources_ja.properties?rev=392136&view=auto
==============================================================================
--- struts/sandbox/trunk/mailreader-course/action2/lab-3-1/src/java/resources_ja.properties (added)
+++ struts/sandbox/trunk/mailreader-course/action2/lab-3-1/src/java/resources_ja.properties Thu Apr 6 17:29:36 2006
@@ -0,0 +1,89 @@
+button.cancel=\u30ad\u30e3\u30f3\u30bb\u30eb
+button.confirm=\u78ba\u8a8d
+button.reset=\u30ea\u30bb\u30c3\u30c8
+button.save=\u4fdd\u5b58
+change.message=\u30D1\u30B9\u30EF\u30FC\u30C9\u306E\u6709\u52B9\u671F\u9650\u304C\u904E\u304E\u307E\u3057\u305F\u3002\u30B7\u30B9\u30C6\u30E0\u7BA1\u7406\u8005\u306B\u304A\u554F\u3044\u5408\u308F\u305B\u4E0B\u3055\u3044
+change.try=\u518D\u8A66\u884C
+change.title=\u30d1\u30b9\u30ef\u30fc\u30c9\u671f\u9650\u5207\u308c
+database.load= {0} \u304B\u3089\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u3092\u30ED\u30FC\u30C9\u3067\u304D\u307E\u305B\u3093
+error.database.missing=\u30E6\u30FC\u30B6\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002\u30ED\u30B0\u30AA\u30F3\u306E\u8A8D\u8A3C\u304C\u51FA\u6765\u307E\u305B\u3093
+error.fromAddress.format=From\u30A2\u30C9\u30EC\u30B9\u306E\u66F8\u5F0F\u304C\u6B63\u3057\u304F\u3042\u308A\u307E\u305B\u3093
+error.fromAddress.required=From\u30A2\u30C9\u30EC\u30B9\u3092\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044
+error.fullName.required=\u30D5\u30EB\u30CD\u30FC\u30E0\u3092\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044
+error.host.required=\u30E1\u30FC\u30EB\u30B5\u30FC\u30D0\u3092\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044
+error.noSubscription=Subscription bean \u304c\u30bb\u30c3\u30b7\u30e7\u30f3\u306e\u4e2d\u306b\u3042\u308a\u307e\u305b\u3093
+error.password.expired=\u30E6\u30FC\u30B6 {0} \u306E\u30D1\u30B9\u30EF\u30FC\u30C9\u306E\u6709\u52B9\u671F\u9650\u304C\u904E\u304E\u307E\u3057\u305F
+error.password.required=\u30D1\u30B9\u30EF\u30FC\u30C9\u304C\u5FC5\u8981\u3067\u3059
+error.password2.required=\u30D1\u30B9\u30EF\u30FC\u30C9(\u78BA\u8A8D\u7528)\u304C\u5FC5\u8981\u3067\u3059
+error.password.match=\u30D1\u30B9\u30EF\u30FC\u30C9\u3068\u78BA\u8A8D\u7528\u30D1\u30B9\u30EF\u30FC\u30C9\u304C\u4E00\u81F4\u3057\u3066\u3044\u307E\u305B\u3093
+error.password.mismatch=\u30E6\u30FC\u30B6\u540D\u307E\u305F\u306F\u30D1\u30B9\u30EF\u30FC\u30C9\u304C\u4E0D\u6B63\u3067\u3059\u3002\u518D\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044
+error.replyToAddress.format=\u8FD4\u4FE1\u30A2\u30C9\u30EC\u30B9\u306E\u66F8\u5F0F\u304C\u6B63\u3057\u304F\u3042\u308A\u307E\u305B\u3093
+webwork.messages.invalid.token=\u3053\u306E\u30D5\u30A9\u30FC\u30E0\u306E\u5185\u5BB9\u304C\u6B63\u3057\u304F\u306A\u3044\u305F\u3081\u9001\u4FE1\u3059\u308B\u3053\u3068\u304C\u51FA\u6765\u307E\u305B\u3093
+error.type.invalid=\u30B5\u30FC\u30D0\u30BF\u30A4\u30D7\u306F 'imap' \u304B 'pop3'\u306E\u3069\u3061\u3089\u304B\u3067\u306A\u3051\u308C\u3070\u306A\u308A\u307E\u305B\u3093
+error.type.required=\u30B5\u30FC\u30D0\u30BF\u30A4\u30D7\u3092\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044
+error.username.required=\u30E6\u30FC\u30B6\u540D\u3092\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044
+error.username.unique=\u305D\u306E\u30E6\u30FC\u30B6\u540D\u306F\u65E2\u306B\u4F7F\u7528\u3055\u308C\u3066\u3044\u307E\u3059\u3002 \u5225\u306E\u30E6\u30FC\u30B6\u540D\u3092\u9078\u629E\u3057\u3066\u304F\u3060\u3055\u3044
+errors.footer=</ul><hr>
+errors.header=<h3><font color="red">\u5165\u529b\u30c1\u30a7\u30c3\u30af\u30a8\u30e9\u30fc</font></h3><p>\u4ee5\u4e0b\u306e\u30a8\u30e9\u30fc\u3092\u78ba\u8a8d\u3057\u3066\u304f\u3060\u3055\u3044:</p><ul>
+errors.prefix=<li>
+errors.suffix=</li>
+errors.ioException=I/O\u4f8b\u5916\u304c\u767a\u751f\u3057\u307e\u3057\u305f: {0}
+expired.password=\u30E6\u30FC\u30B6 {0} \u306E\u30D1\u30B9\u30EF\u30FC\u30C9\u306E\u6709\u52B9\u671F\u9650\u304C\u904E\u304E\u307E\u3057\u305F
+heading.autoConnect=\u81ea\u52d5\u63a5\u7d9a
+heading.subscriptions=\u73fe\u5728\u306e\u8cfc\u8aad\u60c5\u5831
+heading.host=\u30db\u30b9\u30c8\u540d
+heading.user=\u30e6\u30fc\u30b6\u540d
+heading.type=\u30b5\u30fc\u30d0\u30bf\u30a4\u30d7
+heading.action=\u64cd\u4f5c
+index.heading=MailReader\u30c7\u30e2\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3 \u30aa\u30d7\u30b7\u30e7\u30f3
+index.login=MailReader\u30c7\u30e2\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3 - \u30ed\u30b0\u30aa\u30f3
+index.registration=MailReader\u30c7\u30e2\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3 - \u30e6\u30fc\u30b6\u767b\u9332
+index.title=MailReader\u30c7\u30e2\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3(Struts 1.1-dev)
+index.tour=\u30b5\u30f3\u30d7\u30eb\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u3092\u6563\u7b56\u3059\u308b
+linkSubscription.io=I/O\u30a8\u30e9\u30fc: {0}
+linkSubscription.noSubscription=\u5c5e\u6027 {0} \u306b\u8cfc\u8aad\u60c5\u5831\u304c\u5b58\u5728\u3057\u307e\u305b\u3093
+linkUser.io=I/O\u30a8\u30e9\u30fc: {0}
+linkUser.noUser=\u5c5e\u6027 {0} \u306b\u30e6\u30fc\u30b6\u60c5\u5831\u304c\u5b58\u5728\u3057\u307e\u305b\u3093
+login.title=MailReader\u30c7\u30e2\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3 - \u30ed\u30b0\u30aa\u30f3
+menu.heading=\u30e1\u30a4\u30f3\u30e1\u30cb\u30e5\u30fc
+menu.logout=MailReader \u30c7\u30e2\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u306e\u30ed\u30b0\u30aa\u30d5
+menu.registration=\u30d7\u30ed\u30d5\u30a1\u30a4\u30eb\u306e\u7de8\u96c6
+menu.title=MailReader\u30c7\u30e2\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3 - \u30e1\u30a4\u30f3\u30e1\u30cb\u30e5\u30fc
+option.imap=IMAP \u30d7\u30ed\u30c8\u30b3\u30eb
+option.pop3=POP3 \u30d7\u30ed\u30c8\u30b3\u30eb
+# prompt.
+autoConnect=\u81ea\u52d5\u63a5\u7d9a
+fromAddress=From\u30a2\u30c9\u30ec\u30b9
+fullName=\u30d5\u30eb\u30cd\u30fc\u30e0
+mailHostname=\u30e1\u30fc\u30eb\u30b5\u30fc\u30d0
+mailPassword=\u30e1\u30fc\u30eb\u30d1\u30b9\u30ef\u30fc\u30c9
+mailServerType=\u30b5\u30fc\u30d0\u30bf\u30a4\u30d7
+mailUsername=\u30e1\u30fc\u30eb\u30e6\u30fc\u30b6\u540d
+.password=\u30d1\u30b9\u30ef\u30fc\u30c9
+password2=\u30d1\u30b9\u30ef\u30fc\u30c9(\u78ba\u8a8d\u7528)
+replyToAddress=\u8fd4\u4fe1\u30a2\u30c9\u30ec\u30b9
+username=\u30e6\u30fc\u30b6\u540d
+registration.addSubscription=\u65b0\u898f\u4f5c\u6210
+registration.deleteSubscription=\u524a\u9664
+registration.editSubscription=\u7de8\u96c6
+registration.title.create=MailReader\u30c7\u30e2\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3 - \u30e6\u30fc\u30b6\u767b\u9332
+registration.title.edit=MailReader\u30c7\u30e2\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3 - \u30d7\u30ed\u30d5\u30a1\u30a4\u30eb\u7de8\u96c6
+subscription.title.create=\u30e1\u30fc\u30eb\u8cfc\u8aad\u60c5\u5831\u306e\u65b0\u898f\u4f5c\u6210
+subscription.title.delete=\u30e1\u30fc\u30eb\u8cfc\u8aad\u60c5\u5831\u306e\u524a\u9664
+subscription.title.edit=\u30e1\u30fc\u30eb\u8cfc\u8aad\u60c5\u5831\u306e\u7de8\u96c6
+
+# Standard error messages for validator framework checks
+errors.required=${getText(fieldName)} \u3092\u5165\u529b\u3057\u3066\u304f\u3060\u3055\u3044\u3002
+errors.minlength=${getText(fieldName)} \u306f {1} \u6587\u5b57\u4ee5\u4e0a\u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002
+errors.maxlength=${getText(fieldName)} \u306f {2} \u6587\u5b57\u4ee5\u4e0b\u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002
+errors.invalid=${getText(fieldName)} \u306f\u6b63\u3057\u304f\u3042\u308a\u307e\u305b\u3093\u3002
+errors.byte=${getText(fieldName)} \u306fbyte\u578b\u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002
+errors.short=${getText(fieldName)} \u306fshort\u578b\u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002
+errors.integer=${getText(fieldName)} \u306finteger\u578b\u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002
+errors.long=${getText(fieldName)} \u306flong\u578b\u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002
+errors.float=${getText(fieldName)} \u306ffloat\u578b\u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002
+errors.double=${getText(fieldName)} \u306fdouble\u578b\u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002
+errors.date=${getText(fieldName)} \u306f\u65e5\u4ed8\u3067\u306f\u3042\u308a\u307e\u305b\u3093\u3002
+errors.range=${getText(fieldName)} \u306f {1} \u304b\u3089 {2} \u306e\u9593\u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002
+errors.creditcard=${getText(fieldName)} \u306f\u6b63\u3057\u3044\u30af\u30ec\u30b8\u30c3\u30c8\u30ab\u30fc\u30c9\u756a\u53f7\u3067\u306f\u3042\u308a\u307e\u305b\u3093\u3002
+errors.email=${getText(fieldName)} \u306f\u6b63\u3057\u3044\u30e1\u30fc\u30eb\u30a2\u30c9\u30ec\u30b9\u3067\u306f\u3042\u308a\u307e\u305b\u3093\u3002
Propchange: struts/sandbox/trunk/mailreader-course/action2/lab-3-1/src/java/resources_ja.properties
------------------------------------------------------------------------------
svn:eol-style = native
Added: struts/sandbox/trunk/mailreader-course/action2/lab-3-1/src/java/resources_ru.properties
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/mailreader-course/action2/lab-3-1/src/java/resources_ru.properties?rev=392136&view=auto
==============================================================================
--- struts/sandbox/trunk/mailreader-course/action2/lab-3-1/src/java/resources_ru.properties (added)
+++ struts/sandbox/trunk/mailreader-course/action2/lab-3-1/src/java/resources_ru.properties Thu Apr 6 17:29:36 2006
@@ -0,0 +1,89 @@
+button.cancel=\u041e\u0442\u043c\u0435\u043d\u0438\u0442\u044c
+button.confirm=\u041f\u043e\u0434\u0442\u0432\u0435\u0440\u0434\u0438\u0442\u044c
+button.reset=\u0421\u0431\u0440\u043e\u0441\u0438\u0442\u044c
+button.save=\u0421\u043e\u0445\u0440\u0430\u043d\u0438\u0442\u044c
+change.message=Your password has expired. Please ask the system administrator to change it.
+change.try=Try Again
+change.title=Password Has Expired
+database.load=\u0411\u0430\u0437\u0430 \u0434\u0430\u043d\u043d\u044b\u0445 \u043d\u0435 \u043c\u043e\u0436\u0435\u0442 \u0431\u044b\u0442\u044c \u0437\u0430\u0433\u0440\u0443\u0436\u0435\u043d\u0430 \u0438\u0437 {0}
+error.database.missing=\u041d\u0435 \u0443\u043a\u0430\u0437\u0430\u043d\u043e \u0438\u043c\u044f \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f - \u043d\u0435\u0432\u043e\u0437\u043c\u043e\u0436\u043d\u043e \u043f\u0440\u043e\u0432\u0435\u0441\u0442\u0438 \u0430\u0443\u0442\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0446\u0438\u044e.
+error.fromAddress.format=\u0412 \u043f\u043e\u043b\u0435 '\u0410\u0434\u0440\u0435\u0441 \u041e\u0442:' \u0443\u043a\u0430\u0437\u0430\u043d \u0430\u0434\u0440\u0435\u0441 \u0432 \u043d\u0435\u043f\u0440\u0430\u0432\u0438\u043b\u044c\u043d\u043e\u043c \u0444\u043e\u0440\u043c\u0430\u0442\u0435.
+error.fromAddress.required=\u0422\u0440\u0435\u0431\u0443\u0435\u0442\u0441\u044f \u0443\u043a\u0430\u0437\u0430\u0442\u044c \u0430\u0434\u0440\u0435\u0441 \u0432 \u043f\u043e\u043b\u0435 '\u0410\u0434\u0440\u0435\u0441 \u041e\u0442:'.
+error.fullName.required=\u0422\u0440\u0435\u0431\u0443\u0435\u0442\u0441\u044f \u0443\u043a\u0430\u0437\u0430\u0442\u044c \u043f\u043e\u043b\u043d\u043e\u0435 \u0438\u043c\u044f.
+error.host.required=\u0422\u0440\u0435\u0431\u0443\u0435\u0442\u0441\u044f \u0443\u043a\u0430\u0437\u0430\u0442\u044c \u043f\u043e\u0447\u0442\u043e\u0432\u044b\u0439 \u0441\u0435\u0440\u0432\u0435\u0440.
+error.noSubscription=\u041f\u043e\u0434\u043f\u0438\u0441\u043a\u0430 \u043d\u0435 \u043d\u0430\u0439\u0434\u0435\u043d\u0430 \u0432 \u0441\u0435\u0441\u0441\u0438\u0438 \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f
+error.password.expired=Your password has expired for username {0}
+error.password.required=\u0422\u0440\u0435\u0431\u0443\u0435\u0442\u0441\u044f \u0443\u043a\u0430\u0437\u0430\u0442\u044c \u043f\u0430\u0440\u043e\u043b\u044c.
+error.password2.required=\u0422\u0440\u0435\u0431\u0443\u0435\u0442\u0441\u044f \u0443\u043a\u0430\u0437\u0430\u0442\u044c \u043f\u043e\u0434\u0442\u0432\u0435\u0440\u0436\u0434\u0435\u043d\u0438\u0435 \u043f\u0430\u0440\u043e\u043b\u044f.
+error.password.match=\u041f\u0430\u0440\u043e\u043b\u044c \u0438 \u043f\u043e\u0434\u0442\u0432\u0435\u0440\u0436\u0434\u0435\u043d\u0438\u0435 \u043f\u0430\u0440\u043e\u043b\u044f \u043d\u0435 \u0441\u043e\u0432\u043f\u0430\u0434\u0430\u044e\u0442.
+error.password.mismatch=\u041d\u0435\u043f\u0440\u0430\u0432\u0438\u043b\u044c\u043d\u044b\u0435 \u0438\u043c\u044f \u0438/\u0438\u043b\u0438 \u043f\u0430\u0440\u043e\u043b\u044c - \u043f\u043e\u043f\u0440\u043e\u0431\u0443\u0439\u0442\u0435, \u043f\u043e\u0436\u0430\u043b\u0443\u0439\u0441\u0442\u0430, \u0441\u043d\u043e\u0432\u0430.
+error.replyToAddress.format=\u0412 \u043f\u043e\u043b\u0435 '\u0410\u0434\u0440\u0435\u0441 \u041e\u0442\u0432\u0435\u0442\u0438\u0442\u044c \u043d\u0430:' \u0443\u043a\u0430\u0437\u0430\u043d \u0430\u0434\u0440\u0435\u0441 \u0432 \u043d\u0435\u043f\u0440\u0430\u0432\u0438\u043b\u044c\u043d\u043e\u043c \u0444\u043e\u0440\u043c\u0430\u0442\u0435.
+webwork.messages.invalid.token=\u042d\u0442\u0430 \u0444\u043e\u0440\u043c\u0430 \u043d\u0435 \u043c\u043e\u0436\u0435\u0442 \u0431\u044b\u0442\u044c \u043e\u0431\u0440\u0430\u0431\u043e\u0442\u0430\u043d\u0430 - \u043d\u0430\u0440\u0443\u0448\u0435\u043d\u0438\u0435 \u043f\u043e\u0440\u044f\u0434\u043a\u0430 \u0437\u0430\u043d\u0435\u0441\u0435\u043d\u0438\u044f \u0434\u0430\u043d\u043d\u044b\u0445.
+error.type.invalid=\u0412 \u043a\u0430\u0447\u0435\u0441\u0442\u0432\u0435 \u0442\u0438\u043f\u0430 \u0441\u0435\u0440\u0432\u0435\u0440\u0430 \u043c\u043e\u0433\u0443\u0442 \u0431\u044b\u0442\u044c \u0443\u043a\u0430\u0437\u0430\u043d\u044b \u043b\u0438\u0448\u044c 'imap' \u0438\u043b\u0438 'pop3'
+error.type.required=\u0422\u0440\u0435\u0431\u0443\u0435\u0442\u0441\u044f \u0443\u043a\u0430\u0437\u0430\u0442\u044c \u0442\u0438\u043f \u0441\u0435\u0440\u0432\u0435\u0440\u0430
+error.username.required=\u0422\u0440\u0435\u0431\u0443\u0435\u0442\u0441\u044f \u0443\u043a\u0430\u0437\u0430\u0442\u044c \u0438\u043c\u044f \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f
+error.username.unique=\u0423\u043a\u0430\u0437\u0430\u043d\u043d\u043e\u0435 \u0438\u043c\u044f \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f \u0443\u0436\u0435 \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u0435\u0442\u0441\u044f - \u0432\u044b\u0431\u0435\u0440\u0438\u0442\u0435, \u043f\u043e\u0436\u0430\u043b\u0443\u0439\u0441\u0442\u0430, \u0434\u0440\u0443\u0433\u043e\u0435 \u0438\u043c\u044f.
+errors.footer=</ul><hr>
+errors.header=<h3><font color="red">\u041e\u0448\u0438\u0431\u043a\u0438 \u043f\u0440\u0438 \u0437\u0430\u043d\u0435\u0441\u0435\u043d\u0438\u0438 \u0434\u0430\u043d\u043d\u044b\u0445</font></h3><p>\u0412\u044b \u0434\u043e\u043b\u0436\u043d\u044b \u0438\u0441\u043f\u0440\u0430\u0432\u0438\u0442\u044c \u0443\u043a\u0430\u0437\u0430\u043d\u043d\u044b\u0435 \u043d\u0438\u0436\u0435 \u043e\u0448\u0438\u0431\u043a\u0438:</p><ul>
+errors.prefix=<li>
+errors.suffix=</li>
+errors.ioException=\u041e\u0448\u0438\u0431\u043a\u0430 \u0432\u0432\u043e\u0434\u0430/\u0432\u044b\u0432\u043e\u0434\u0430 \u043f\u0440\u0438 \u0441\u043e\u0437\u0434\u0430\u043d\u0438\u0438 \u0441\u043e\u043e\u0431\u0449\u0435\u043d\u0438\u0439 \u043e\u0431 \u043e\u0448\u0438\u0431\u043a\u0430\u0445: {0}
+expired.password=User Password has expired for {0}
+heading.autoConnect=\u0410\u0432\u0442\u043e\u043c\u0430\u0442\u0438\u0447\u0435\u0441\u043a\u0438
+heading.subscriptions=\u0417\u0430\u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0438\u0440\u043e\u0432\u0430\u043d\u043d\u044b\u0435 \u043f\u043e\u0434\u043f\u0438\u0441\u043a\u0438
+heading.host=\u0421\u0435\u0440\u0432\u0435\u0440
+heading.user=\u0418\u043c\u044f
+heading.type=\u0422\u0438\u043f \u0441\u0435\u0440\u0432\u0435\u0440\u0430
+heading.action=\u0414\u0435\u0439\u0441\u0442\u0432\u0438\u0435
+index.heading=\u0414\u0435\u043c\u043e\u043d\u0441\u0442\u0440\u0430\u0446\u0438\u043e\u043d\u043d\u043e\u0435 \u043f\u0440\u0438\u043b\u043e\u0436\u0435\u043d\u0438\u0435 '\u0427\u0442\u0435\u043d\u0438\u0435 \u043f\u043e\u0447\u0442\u044b'
+index.login=\u0412\u043e\u0439\u0442\u0438 \u043a\u0430\u043a \u0437\u0430\u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0438\u0440\u043e\u0432\u0430\u043d\u043d\u044b\u0439 \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c
+index.registration=\u0417\u0430\u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0438\u0440\u043e\u0432\u0430\u0442\u044c\u0441\u044f
+index.title=\u0414\u0435\u043c\u043e\u043d\u0441\u0442\u0440\u0430\u0446\u0438\u043e\u043d\u043d\u043e\u0435 \u043f\u0440\u0438\u043b\u043e\u0436\u0435\u043d\u0438\u0435 '\u0427\u0442\u0435\u043d\u0438\u0435 \u043f\u043e\u0447\u0442\u044b' (Struts 1.1-dev)
+index.tour=\u041e\u0431\u0437\u043e\u0440 \u0414\u0435\u043c\u043e\u043d\u0441\u0442\u0440\u0430\u0446\u0438\u043e\u043d\u043d\u043e\u0433\u043e \u043f\u0440\u0438\u043b\u043e\u0436\u0435\u043d\u0438\u044f '\u0427\u0442\u0435\u043d\u0438\u0435 \u043f\u043e\u0447\u0442\u044b'
+linkSubscription.io=\u041e\u0448\u0438\u0431\u043a\u0430 \u0432\u0432\u043e\u0434\u0430/\u0432\u044b\u0432\u043e\u0434\u0430 (\u0434\u043b\u044f \u043f\u043e\u0434\u043f\u0438\u0441\u043a\u0438): {0}
+linkSubscription.noSubscription=\u0410\u0442\u0440\u0438\u0431\u0443\u0442 {0} \u043d\u0435 \u0441\u043e\u0434\u0435\u0440\u0436\u0438\u0442 \u0438\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u0438 \u043e \u043f\u043e\u0434\u043f\u0438\u0441\u043a\u0435 \u0438\u043b\u0438 \u043d\u0435 \u0441\u0443\u0449\u0435\u0441\u0442\u0432\u0443\u0435\u0442.
+linkUser.io=\u041e\u0448\u0438\u0431\u043a\u0430 \u0432\u0432\u043e\u0434\u0430/\u0432\u044b\u0432\u043e\u0434\u0430 (\u0434\u043b\u044f \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f): {0}
+linkUser.noUser=\u0410\u0442\u0440\u0438\u0431\u0443\u0442 {0} \u043d\u0435 \u0441\u043e\u0434\u0435\u0440\u0436\u0438\u0442 \u0438\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u0438 \u043e \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u0435 \u0438\u043b\u0438 \u043d\u0435 \u0441\u0443\u0449\u0435\u0441\u0442\u0432\u0443\u0435\u0442.
+login.title=\u0414\u0435\u043c\u043e\u043d\u0441\u0442\u0440\u0430\u0446\u0438\u043e\u043d\u043d\u043e\u0435 \u043f\u0440\u0438\u043b\u043e\u0436\u0435\u043d\u0438\u0435 \u0427\u0442\u0435\u043d\u0438\u0435 \u043f\u043e\u0447\u0442\u044b - \u041f\u0440\u043e\u0432\u0435\u0440\u043a\u0430 \u0438\u043c\u0435\u043d\u0438 \u0438 \u043f\u0430\u0440\u043e\u043b\u044f.
+menu.heading=\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438 \u0433\u043b\u0430\u0432\u043d\u043e\u0433\u043e \u043c\u0435\u043d\u044e \u0434\u043b\u044f
+menu.logout=\u0412\u044b\u0439\u0442\u0438
+menu.registration=\u0418\u0437\u043c\u0435\u043d\u0438\u0442\u044c \u0441\u0432\u043e\u0438 \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438
+mainMenu.title=\u0414\u0435\u043c\u043e\u043d\u0441\u0442\u0440\u0430\u0446\u0438\u043e\u043d\u043d\u043e\u0435 \u043f\u0440\u0438\u043b\u043e\u0436\u0435\u043d\u0438\u0435 '\u0427\u0442\u0435\u043d\u0438\u0435 \u043f\u043e\u0447\u0442\u044b' - \u041e\u0441\u043d\u043e\u0432\u043d\u043e\u0435 \u043c\u0435\u043d\u044e
+option.imap=\u041f\u0440\u043e\u0442\u043e\u043a\u043e\u043b IMAP
+option.pop3=\u041f\u0440\u043e\u0442\u043e\u043a\u043e\u043b POP3
+# prompt.
+autoConnect=\u0410\u0432\u0442\u043e\u043c\u0430\u0442\u0438\u0447\u0435\u0441\u043a\u043e\u0435 \u0441\u043e\u0435\u0434\u0438\u043d\u0435\u043d\u0438\u0435:
+fromAddress=\u0410\u0434\u0440\u0435\u0441 \u041e\u0442:
+fullName=\u041f\u043e\u043b\u043d\u043e\u0435 \u0438\u043c\u044f:
+mailHostname=\u041f\u043e\u0447\u0442\u043e\u0432\u044b\u0439 \u0441\u0435\u0440\u0432\u0435\u0440:
+mailPassword=\u041f\u0430\u0440\u043e\u043b\u044c \u0434\u043b\u044f \u043f\u043e\u0447\u0442\u043e\u0432\u043e\u0433\u043e \u0441\u0435\u0440\u0432\u0435\u0440\u0430:
+mailServerType=\u0422\u0438\u043f \u0441\u0435\u0440\u0432\u0435\u0440\u0430:
+mailUsername=\u0418\u043c\u044f \u0434\u043b\u044f \u043f\u043e\u0447\u0442\u043e\u0432\u043e\u0433\u043e \u0441\u0435\u0440\u0432\u0435\u0440\u0430:
+password=\u041f\u0430\u0440\u043e\u043b\u044c:
+password2=(\u041f\u043e\u0434\u0442\u0432\u0435\u0440\u0436\u0434\u0435\u043d\u0438\u0435) \u041f\u0430\u0440\u043e\u043b\u044c:
+replyToAddress=\u0410\u0434\u0440\u0435\u0441 \u041e\u0442\u0432\u0435\u0442\u0438\u0442\u044c \u043d\u0430:
+username=\u0418\u043c\u044f:
+registration.addSubscription=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c
+registration.deleteSubscription=\u0423\u0434\u0430\u043b\u0438\u0442\u044c
+registration.editSubscription=\u0420\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c
+registration.title.create=\u0417\u0430\u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0438\u0440\u043e\u0432\u0430\u0442\u044c\u0441\u044f
+registration.title.edit=\u0418\u0437\u043c\u0435\u043d\u0438\u0442\u044c \u0434\u0430\u043d\u043d\u044b\u0435 \u043e \u0441\u0432\u043e\u0435\u0439 \u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0430\u0446\u0438\u0438
+subscription.title.create=\u0421\u043e\u0437\u0434\u0430\u0442\u044c \u043d\u043e\u0432\u0443\u044e \u043f\u043e\u0434\u043f\u0438\u0441\u043a\u0443
+subscription.title.delete=\u0423\u0434\u0430\u043b\u0438\u0442\u044c \u0441\u0443\u0449\u0435\u0441\u0442\u0432\u0443\u044e\u0449\u0443\u044e \u043f\u043e\u0434\u043f\u0438\u0441\u043a\u0443
+subscription.title.edit=\u0420\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u0441\u0443\u0449\u0435\u0441\u0442\u0432\u0443\u044e\u0449\u0443\u044e \u043f\u043e\u0434\u043f\u0438\u0441\u043a\u0443
+
+# Standard error messages for validator framework checks
+errors.required=${getText(fieldName)} is required.
+errors.minlength=${getText(fieldName)} cannot be less than {1} characters.
+errors.maxlength=${getText(fieldName)} cannot be greater than {2} characters.
+errors.invalid=${getText(fieldName)} is invalid.
+errors.byte=${getText(fieldName)} must be an byte.
+errors.short=${getText(fieldName)} must be an short.
+errors.integer=${getText(fieldName)} must be an integer.
+errors.long=${getText(fieldName)} must be an long.
+errors.float=${getText(fieldName)} must be an float.
+errors.double=${getText(fieldName)} must be an double.
+errors.date=${getText(fieldName)} is not a date.
+errors.range=${getText(fieldName)} is not in the range {1} through {2}.
+errors.creditcard=${getText(fieldName)} is not a valid credit card number.
+errors.email=${getText(fieldName)} is an invalid e-mail address.
Propchange: struts/sandbox/trunk/mailreader-course/action2/lab-3-1/src/java/resources_ru.properties
------------------------------------------------------------------------------
svn:eol-style = native
Copied: struts/sandbox/trunk/mailreader-course/action2/lab-3-1/src/java/xwork.xml (from r392086, struts/sandbox/trunk/mailreader-course/action2/lab-2-3/src/java/xwork.xml)
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/mailreader-course/action2/lab-3-1/src/java/xwork.xml?p2=struts/sandbox/trunk/mailreader-course/action2/lab-3-1/src/java/xwork.xml&p1=struts/sandbox/trunk/mailreader-course/action2/lab-2-3/src/java/xwork.xml&r1=392086&r2=392136&rev=392136&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/action2/lab-2-3/src/java/xwork.xml (original)
+++ struts/sandbox/trunk/mailreader-course/action2/lab-3-1/src/java/xwork.xml Thu Apr 6 17:29:36 2006
@@ -21,6 +21,7 @@
<action name="Register" class="Register">
<result name="input">/pages/Register.jsp</result>
+ <result name="cancel" type="redirect-action">Welcome</result>
<result type="redirect-action">Menu</result>
</action>
Modified: struts/sandbox/trunk/mailreader-course/action2/lab-3-1/src/webapp/WEB-INF/entities/register-open.xml
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/mailreader-course/action2/lab-3-1/src/webapp/WEB-INF/entities/register-open.xml?rev=392136&r1=392069&r2=392136&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/action2/lab-3-1/src/webapp/WEB-INF/entities/register-open.xml (original)
+++ struts/sandbox/trunk/mailreader-course/action2/lab-3-1/src/webapp/WEB-INF/entities/register-open.xml Thu Apr 6 17:29:36 2006
@@ -1,5 +1,5 @@
&welcome-open;
<clickLink
description="Click Register"
- label="Register with the MailReader"/>
+ label="Register with MailReader"/>
®ister-page;
Modified: struts/sandbox/trunk/mailreader-course/action2/lab-3-1/src/webapp/WEB-INF/entities/register-page.xml
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/mailreader-course/action2/lab-3-1/src/webapp/WEB-INF/entities/register-page.xml?rev=392136&r1=392069&r2=392136&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/action2/lab-3-1/src/webapp/WEB-INF/entities/register-page.xml (original)
+++ struts/sandbox/trunk/mailreader-course/action2/lab-3-1/src/webapp/WEB-INF/entities/register-page.xml Thu Apr 6 17:29:36 2006
@@ -1,3 +1,3 @@
<verifyTitle
description="Registration page title"
- text="Register"/>
+ text="MailReader - Register"/>
Modified: struts/sandbox/trunk/mailreader-course/action2/lab-3-1/src/webapp/WEB-INF/entities/welcome-open.xml
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/mailreader-course/action2/lab-3-1/src/webapp/WEB-INF/entities/welcome-open.xml?rev=392136&r1=392069&r2=392136&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/action2/lab-3-1/src/webapp/WEB-INF/entities/welcome-open.xml (original)
+++ struts/sandbox/trunk/mailreader-course/action2/lab-3-1/src/webapp/WEB-INF/entities/welcome-open.xml Thu Apr 6 17:29:36 2006
@@ -3,4 +3,4 @@
url="Welcome.do"/>
<verifyTitle
description="Welcome page title"
- text="MailReader Application"/>
+ text="MailReader"/>
Modified: struts/sandbox/trunk/mailreader-course/action2/lab-3-1/src/webapp/WEB-INF/webtest.xml
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/mailreader-course/action2/lab-3-1/src/webapp/WEB-INF/webtest.xml?rev=392136&r1=392069&r2=392136&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/action2/lab-3-1/src/webapp/WEB-INF/webtest.xml (original)
+++ struts/sandbox/trunk/mailreader-course/action2/lab-3-1/src/webapp/WEB-INF/webtest.xml Thu Apr 6 17:29:36 2006
@@ -119,7 +119,7 @@
®ister-trillian;
<verifyTitle
description="Menu page title"
- text="Menu"/>
+ text="MailReader - Menu"/>
</steps>
</webtest>
Copied: struts/sandbox/trunk/mailreader-course/action2/lab-3-1/src/webapp/pages/Login.jsp (from r392086, struts/sandbox/trunk/mailreader-course/action2/lab-2-3/src/webapp/pages/Login.jsp)
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/mailreader-course/action2/lab-3-1/src/webapp/pages/Login.jsp?p2=struts/sandbox/trunk/mailreader-course/action2/lab-3-1/src/webapp/pages/Login.jsp&p1=struts/sandbox/trunk/mailreader-course/action2/lab-2-3/src/webapp/pages/Login.jsp&r1=392086&r2=392136&rev=392136&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/action2/lab-2-3/src/webapp/pages/Login.jsp (original)
+++ struts/sandbox/trunk/mailreader-course/action2/lab-3-1/src/webapp/pages/Login.jsp Thu Apr 6 17:29:36 2006
@@ -1,20 +1,23 @@
+<%@ page contentType="text/html; charset=UTF-8" %>
<%@ taglib uri="/webwork" prefix="ww" %>
-<html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
- <title>Login</title>
+ <title>MailReader - Login</title>
</head>
-<body onLoad="self.focus();document.Logon.username.focus()">
+<body onLoad="self.focus();document.Login.username.focus()">
<ww:actionerror/>
<ww:form method="POST" validate="true">
- <ww:textfield label="UserName" name="username"/>
+ <ww:textfield label="%{getText('username')}" name="username"/>
- <ww:password label="Password" name="password" showPassword="true"/>
+ <ww:password label="%{getText('password')}" name="password" showPassword="true"/>
- <ww:submit value="Save" name="Save"/>
+ <ww:submit value="%{getText('button.save')}" name="Save"/>
- <ww:submit action="Login!cancel" value="Cancel" name="Cancel"
+ <ww:submit action="Login!cancel" value="%{getText('button.cancel')}" name="Cancel"
onclick="form.onsubmit=null"/>
</ww:form>
Copied: struts/sandbox/trunk/mailreader-course/action2/lab-3-1/src/webapp/pages/Menu.jsp (from r392086, struts/sandbox/trunk/mailreader-course/action2/lab-2-3/src/webapp/pages/Menu.jsp)
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/mailreader-course/action2/lab-3-1/src/webapp/pages/Menu.jsp?p2=struts/sandbox/trunk/mailreader-course/action2/lab-3-1/src/webapp/pages/Menu.jsp&p1=struts/sandbox/trunk/mailreader-course/action2/lab-2-3/src/webapp/pages/Menu.jsp&r1=392086&r2=392136&rev=392136&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/action2/lab-2-3/src/webapp/pages/Menu.jsp (original)
+++ struts/sandbox/trunk/mailreader-course/action2/lab-3-1/src/webapp/pages/Menu.jsp Thu Apr 6 17:29:36 2006
@@ -1,18 +1,21 @@
+<%@ page contentType="text/html; charset=UTF-8" %>
<%@ taglib uri="/webwork" prefix="ww" %>
-<html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
- <title>Menu</title>
+ <title><ww:text name="mainMenu.title"/></title>
</head>
<body>
-<h3>Main Menu Options for <ww:property value="user.fullName"/></h3>
+<h3><ww:text name="menu.heading"/> <ww:property value="user.fullName"/></h3>
<ul>
<li><a href="<ww:url action="Register!input" />">
- Edit your registration profile
+ <ww:text name="menu.registration"/>
</a>
</li>
<li><a href="<ww:url action="Logout"/>">
- Log out of MailReader application
+ <ww:text name="menu.logout"/>
</a>
</ul>
</body>
Modified: struts/sandbox/trunk/mailreader-course/action2/lab-3-1/src/webapp/pages/Register.jsp
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/mailreader-course/action2/lab-3-1/src/webapp/pages/Register.jsp?rev=392136&r1=392069&r2=392136&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/action2/lab-3-1/src/webapp/pages/Register.jsp (original)
+++ struts/sandbox/trunk/mailreader-course/action2/lab-3-1/src/webapp/pages/Register.jsp Thu Apr 6 17:29:36 2006
@@ -1,7 +1,10 @@
+<%@ page contentType="text/html; charset=UTF-8" %>
<%@ taglib uri="/webwork" prefix="ww" %>
-<html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
- <title>Register</title>
+ <title><ww:text name="registration.title.create"/></title>
</head>
<body onLoad="self.focus();document.Register.username.focus()">
@@ -9,11 +12,11 @@
<ww:actionerror/>
<ww:form method="POST" validate="true">
- <ww:textfield label="UserName" name="username"/>
+ <ww:textfield label="%{getText('username')}" name="username"/>
- <ww:password label="Password" name="password"/>
+ <ww:password label="%{getText('password')}" name="password"/>
- <ww:password label="Confirm Password" name="password2"/>
+ <ww:password label="%{getText('password2')}" name="password2"/>
<ww:textfield label="Full Name" name="fullName"/>
@@ -21,8 +24,11 @@
<ww:textfield label="Reply To Address" name="replyToAddress"/>
- <ww:submit value="Save" name="Save"/>
+ <ww:submit value="%{getText('button.save')}" name="Save"/>
+ <ww:submit action="Register!cancel" value="%{getText('button.cancel')}" name="Cancel"
+ onclick="form.onsubmit=null"/>
+
</ww:form>
Copied: struts/sandbox/trunk/mailreader-course/action2/lab-3-1/src/webapp/pages/Welcome.jsp (from r392086, struts/sandbox/trunk/mailreader-course/action2/lab-2-3/src/webapp/pages/Welcome.jsp)
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/mailreader-course/action2/lab-3-1/src/webapp/pages/Welcome.jsp?p2=struts/sandbox/trunk/mailreader-course/action2/lab-3-1/src/webapp/pages/Welcome.jsp&p1=struts/sandbox/trunk/mailreader-course/action2/lab-2-3/src/webapp/pages/Welcome.jsp&r1=392086&r2=392136&rev=392136&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/action2/lab-2-3/src/webapp/pages/Welcome.jsp (original)
+++ struts/sandbox/trunk/mailreader-course/action2/lab-3-1/src/webapp/pages/Welcome.jsp Thu Apr 6 17:29:36 2006
@@ -1,22 +1,28 @@
+<%@ page contentType="text/html; charset=UTF-8" %>
<%@ taglib uri="/webwork" prefix="ww" %>
-<html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
- <title>MailReader Application</title>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+ <title><ww:text name="index.title"/></title>
</head>
<body>
<h3>MailReader Options</h3>
<ul>
- <li><a href="<ww:url action="Register!input"/>">Register with the MailReader</a></li>
- <li><a href="<ww:url action="Login!input"/>">Log on to the MailReader</a></li>
+ <li><a href="<ww:url action="Register!input"/>"><ww:text
+ name="index.registration"/></a></li>
+ <li><a href="<ww:url action="Login!input"/>"><ww:text
+ name="index.login"/></a></li>
</ul>
<h3>Language Options</h3>
<ul>
- <li><a href="<ww:url action="Missing"/>">English</a></li>
- <li><a href="<ww:url action="Missing"/>">Japanese</a></li>
- <li><a href="<ww:url action="Missing"/>">Russian</a></li>
+ <li><a href="<ww:url action="Welcome?request_locale=en"/>">English</a></li>
+ <li><a href="<ww:url action="Welcome?request_locale=ja"/>">Japanese</a></li>
+ <li><a href="<ww:url action="Welcome?request_locale=ru"/>">Russian</a></li>
</ul>
</body>
Modified: struts/sandbox/trunk/mailreader-course/action2/mailreader-course-action2.ipr
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/mailreader-course/action2/mailreader-course-action2.ipr?rev=392136&r1=392135&r2=392136&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/action2/mailreader-course-action2.ipr (original)
+++ struts/sandbox/trunk/mailreader-course/action2/mailreader-course-action2.ipr Thu Apr 6 17:29:36 2006
@@ -185,6 +185,7 @@
<module fileurl="file://$PROJECT_DIR$/lab-2-1/lab-2-1.iml" filepath="$PROJECT_DIR$/lab-2-1/lab-2-1.iml" />
<module fileurl="file://$PROJECT_DIR$/lab-2-2/lab-2-2.iml" filepath="$PROJECT_DIR$/lab-2-2/lab-2-2.iml" />
<module fileurl="file://$PROJECT_DIR$/lab-2-3/lab-2-3.iml" filepath="$PROJECT_DIR$/lab-2-3/lab-2-3.iml" />
+ <module fileurl="file://$PROJECT_DIR$/lab-3-1/lab-3-1.iml" filepath="$PROJECT_DIR$/lab-3-1/lab-3-1.iml" />
<module fileurl="file://$PROJECT_DIR$/mailreader-course-action2.iml" filepath="$PROJECT_DIR$/mailreader-course-action2.iml" />
</modules>
</component>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org
For additional commands, e-mail: dev-help@struts.apache.org