You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by hu...@apache.org on 2006/08/13 16:28:57 UTC
svn commit: r431180 [1/3] - in
/struts/sandbox/trunk/mailreader-course/struts2: ./ browse/src/java/
browse/src/test/ browse/src/webapp/ browse/src/webapp/WEB-INF/
browse/src/webapp/pages/ hello/src/webapp/pages/ localize/src/java/
localize/src/test/ lo...
Author: husted
Date: Sun Aug 13 07:28:51 2006
New Revision: 431180
URL: http://svn.apache.org/viewvc?rev=431180&view=rev
Log:
Update "logout" lab for Struts 2.
Added:
struts/sandbox/trunk/mailreader-course/struts2/logout/logout.iml
- copied, changed from r431122, struts/sandbox/trunk/mailreader-course/struts2/logout/lab-2-3.iml
struts/sandbox/trunk/mailreader-course/struts2/logout/src/java/struts.properties (contents, props changed)
- copied, changed from r431122, struts/sandbox/trunk/mailreader-course/struts2/logout/src/java/webwork.properties
struts/sandbox/trunk/mailreader-course/struts2/logout/src/java/struts.xml (contents, props changed)
- copied, changed from r431122, struts/sandbox/trunk/mailreader-course/struts2/logout/src/java/xwork.xml
Removed:
struts/sandbox/trunk/mailreader-course/struts2/logout/lab-2-3.iml
struts/sandbox/trunk/mailreader-course/struts2/logout/src/java/webwork.properties
struts/sandbox/trunk/mailreader-course/struts2/logout/src/java/xwork.xml
Modified:
struts/sandbox/trunk/mailreader-course/struts2/browse/src/java/AuthenticationInterceptor.java
struts/sandbox/trunk/mailreader-course/struts2/browse/src/java/Hello.java
struts/sandbox/trunk/mailreader-course/struts2/browse/src/java/MailReaderSupport.java
struts/sandbox/trunk/mailreader-course/struts2/browse/src/java/NPE.java
struts/sandbox/trunk/mailreader-course/struts2/browse/src/java/Register.java
struts/sandbox/trunk/mailreader-course/struts2/browse/src/java/Subscribe.java
struts/sandbox/trunk/mailreader-course/struts2/browse/src/java/resources.properties
struts/sandbox/trunk/mailreader-course/struts2/browse/src/java/resources_ja.properties
struts/sandbox/trunk/mailreader-course/struts2/browse/src/java/resources_ru.properties
struts/sandbox/trunk/mailreader-course/struts2/browse/src/java/webwork.properties
struts/sandbox/trunk/mailreader-course/struts2/browse/src/java/xwork.xml
struts/sandbox/trunk/mailreader-course/struts2/browse/src/test/RegisterTest.java
struts/sandbox/trunk/mailreader-course/struts2/browse/src/test/RetainTest.java
struts/sandbox/trunk/mailreader-course/struts2/browse/src/webapp/WEB-INF/web.xml
struts/sandbox/trunk/mailreader-course/struts2/browse/src/webapp/WEB-INF/webtest.xml
struts/sandbox/trunk/mailreader-course/struts2/browse/src/webapp/index.html
struts/sandbox/trunk/mailreader-course/struts2/browse/src/webapp/pages/Error.jsp
struts/sandbox/trunk/mailreader-course/struts2/browse/src/webapp/pages/Hello.jsp
struts/sandbox/trunk/mailreader-course/struts2/browse/src/webapp/pages/Login.jsp
struts/sandbox/trunk/mailreader-course/struts2/browse/src/webapp/pages/Menu.jsp
struts/sandbox/trunk/mailreader-course/struts2/browse/src/webapp/pages/Register.jsp
struts/sandbox/trunk/mailreader-course/struts2/browse/src/webapp/pages/Subscribe.jsp
struts/sandbox/trunk/mailreader-course/struts2/browse/src/webapp/pages/Welcome.jsp
struts/sandbox/trunk/mailreader-course/struts2/hello/src/webapp/pages/Hello.jsp
struts/sandbox/trunk/mailreader-course/struts2/localize/src/java/Hello.java
struts/sandbox/trunk/mailreader-course/struts2/localize/src/java/MailReaderSupport.java
struts/sandbox/trunk/mailreader-course/struts2/localize/src/java/Register.java
struts/sandbox/trunk/mailreader-course/struts2/localize/src/java/resources.properties
struts/sandbox/trunk/mailreader-course/struts2/localize/src/java/resources_ja.properties
struts/sandbox/trunk/mailreader-course/struts2/localize/src/java/resources_ru.properties
struts/sandbox/trunk/mailreader-course/struts2/localize/src/java/webwork.properties
struts/sandbox/trunk/mailreader-course/struts2/localize/src/java/xwork.xml
struts/sandbox/trunk/mailreader-course/struts2/localize/src/test/RegisterTest.java
struts/sandbox/trunk/mailreader-course/struts2/localize/src/test/RetainTest.java
struts/sandbox/trunk/mailreader-course/struts2/localize/src/webapp/WEB-INF/web.xml
struts/sandbox/trunk/mailreader-course/struts2/localize/src/webapp/WEB-INF/webtest.xml
struts/sandbox/trunk/mailreader-course/struts2/localize/src/webapp/index.html
struts/sandbox/trunk/mailreader-course/struts2/localize/src/webapp/pages/Hello.jsp
struts/sandbox/trunk/mailreader-course/struts2/localize/src/webapp/pages/Login.jsp
struts/sandbox/trunk/mailreader-course/struts2/localize/src/webapp/pages/Menu.jsp
struts/sandbox/trunk/mailreader-course/struts2/localize/src/webapp/pages/Register.jsp
struts/sandbox/trunk/mailreader-course/struts2/localize/src/webapp/pages/Welcome.jsp
struts/sandbox/trunk/mailreader-course/struts2/logout/src/java/Hello.java
struts/sandbox/trunk/mailreader-course/struts2/logout/src/java/Login.java
struts/sandbox/trunk/mailreader-course/struts2/logout/src/java/MailReaderSupport.java
struts/sandbox/trunk/mailreader-course/struts2/logout/src/java/Register.java
struts/sandbox/trunk/mailreader-course/struts2/logout/src/java/resources.properties
struts/sandbox/trunk/mailreader-course/struts2/logout/src/test/RegisterTest.java
struts/sandbox/trunk/mailreader-course/struts2/logout/src/test/RetainTest.java
struts/sandbox/trunk/mailreader-course/struts2/logout/src/webapp/WEB-INF/web.xml
struts/sandbox/trunk/mailreader-course/struts2/logout/src/webapp/WEB-INF/webtest.xml
struts/sandbox/trunk/mailreader-course/struts2/logout/src/webapp/index.html
struts/sandbox/trunk/mailreader-course/struts2/logout/src/webapp/pages/Hello.jsp
struts/sandbox/trunk/mailreader-course/struts2/logout/src/webapp/pages/Login.jsp
struts/sandbox/trunk/mailreader-course/struts2/logout/src/webapp/pages/Menu.jsp
struts/sandbox/trunk/mailreader-course/struts2/logout/src/webapp/pages/Register.jsp
struts/sandbox/trunk/mailreader-course/struts2/logout/src/webapp/pages/Welcome.jsp
struts/sandbox/trunk/mailreader-course/struts2/mailreader-course-struts2.ipr
struts/sandbox/trunk/mailreader-course/struts2/menu/menu.iml
struts/sandbox/trunk/mailreader-course/struts2/menu/src/java/struts.xml
struts/sandbox/trunk/mailreader-course/struts2/menu/src/webapp/pages/Register.jsp
struts/sandbox/trunk/mailreader-course/struts2/profile/src/java/Hello.java
struts/sandbox/trunk/mailreader-course/struts2/profile/src/java/MailReaderSupport.java
struts/sandbox/trunk/mailreader-course/struts2/profile/src/java/Register.java
struts/sandbox/trunk/mailreader-course/struts2/profile/src/java/resources.properties
struts/sandbox/trunk/mailreader-course/struts2/profile/src/java/resources_ja.properties
struts/sandbox/trunk/mailreader-course/struts2/profile/src/java/resources_ru.properties
struts/sandbox/trunk/mailreader-course/struts2/profile/src/java/webwork.properties
struts/sandbox/trunk/mailreader-course/struts2/profile/src/java/xwork.xml
struts/sandbox/trunk/mailreader-course/struts2/profile/src/test/RegisterTest.java
struts/sandbox/trunk/mailreader-course/struts2/profile/src/test/RetainTest.java
struts/sandbox/trunk/mailreader-course/struts2/profile/src/webapp/WEB-INF/web.xml
struts/sandbox/trunk/mailreader-course/struts2/profile/src/webapp/WEB-INF/webtest.xml
struts/sandbox/trunk/mailreader-course/struts2/profile/src/webapp/index.html
struts/sandbox/trunk/mailreader-course/struts2/profile/src/webapp/pages/Hello.jsp
struts/sandbox/trunk/mailreader-course/struts2/profile/src/webapp/pages/Login.jsp
struts/sandbox/trunk/mailreader-course/struts2/profile/src/webapp/pages/Menu.jsp
struts/sandbox/trunk/mailreader-course/struts2/profile/src/webapp/pages/Register.jsp
struts/sandbox/trunk/mailreader-course/struts2/profile/src/webapp/pages/Welcome.jsp
struts/sandbox/trunk/mailreader-course/struts2/register/src/java/struts.xml
struts/sandbox/trunk/mailreader-course/struts2/register/src/test/RegisterTest.java
struts/sandbox/trunk/mailreader-course/struts2/register/src/test/RetainTest.java
struts/sandbox/trunk/mailreader-course/struts2/register/src/webapp/pages/Hello.jsp
struts/sandbox/trunk/mailreader-course/struts2/register/src/webapp/pages/Register.jsp
struts/sandbox/trunk/mailreader-course/struts2/register2/register2.iml
struts/sandbox/trunk/mailreader-course/struts2/register2/src/java/struts.xml
struts/sandbox/trunk/mailreader-course/struts2/register2/src/test/RegisterTest.java
struts/sandbox/trunk/mailreader-course/struts2/register2/src/test/RetainTest.java
struts/sandbox/trunk/mailreader-course/struts2/register2/src/webapp/pages/Hello.jsp
struts/sandbox/trunk/mailreader-course/struts2/register2/src/webapp/pages/Register.jsp
struts/sandbox/trunk/mailreader-course/struts2/retain/src/test/RetainTest.java
struts/sandbox/trunk/mailreader-course/struts2/subscribe/src/java/Hello.java
struts/sandbox/trunk/mailreader-course/struts2/subscribe/src/java/MailReaderSupport.java
struts/sandbox/trunk/mailreader-course/struts2/subscribe/src/java/Register.java
struts/sandbox/trunk/mailreader-course/struts2/subscribe/src/java/Subscribe.java
struts/sandbox/trunk/mailreader-course/struts2/subscribe/src/java/resources.properties
struts/sandbox/trunk/mailreader-course/struts2/subscribe/src/java/resources_ja.properties
struts/sandbox/trunk/mailreader-course/struts2/subscribe/src/java/resources_ru.properties
struts/sandbox/trunk/mailreader-course/struts2/subscribe/src/java/webwork.properties
struts/sandbox/trunk/mailreader-course/struts2/subscribe/src/java/xwork.xml
struts/sandbox/trunk/mailreader-course/struts2/subscribe/src/test/RegisterTest.java
struts/sandbox/trunk/mailreader-course/struts2/subscribe/src/test/RetainTest.java
struts/sandbox/trunk/mailreader-course/struts2/subscribe/src/webapp/WEB-INF/web.xml
struts/sandbox/trunk/mailreader-course/struts2/subscribe/src/webapp/WEB-INF/webtest.xml
struts/sandbox/trunk/mailreader-course/struts2/subscribe/src/webapp/index.html
struts/sandbox/trunk/mailreader-course/struts2/subscribe/src/webapp/pages/Hello.jsp
struts/sandbox/trunk/mailreader-course/struts2/subscribe/src/webapp/pages/Login.jsp
struts/sandbox/trunk/mailreader-course/struts2/subscribe/src/webapp/pages/Menu.jsp
struts/sandbox/trunk/mailreader-course/struts2/subscribe/src/webapp/pages/Register.jsp
struts/sandbox/trunk/mailreader-course/struts2/subscribe/src/webapp/pages/Subscribe.jsp
struts/sandbox/trunk/mailreader-course/struts2/subscribe/src/webapp/pages/Welcome.jsp
struts/sandbox/trunk/mailreader-course/struts2/theme/src/java/AuthenticationInterceptor.java
struts/sandbox/trunk/mailreader-course/struts2/theme/src/java/Hello.java
struts/sandbox/trunk/mailreader-course/struts2/theme/src/java/MailReaderSupport.java
struts/sandbox/trunk/mailreader-course/struts2/theme/src/java/NPE.java
struts/sandbox/trunk/mailreader-course/struts2/theme/src/java/Register.java
struts/sandbox/trunk/mailreader-course/struts2/theme/src/java/Subscribe.java
struts/sandbox/trunk/mailreader-course/struts2/theme/src/java/resources.properties
struts/sandbox/trunk/mailreader-course/struts2/theme/src/java/resources_ja.properties
struts/sandbox/trunk/mailreader-course/struts2/theme/src/java/resources_ru.properties
struts/sandbox/trunk/mailreader-course/struts2/theme/src/java/webwork.properties
struts/sandbox/trunk/mailreader-course/struts2/theme/src/java/xwork.xml
struts/sandbox/trunk/mailreader-course/struts2/theme/src/test/RegisterTest.java
struts/sandbox/trunk/mailreader-course/struts2/theme/src/test/RetainTest.java
struts/sandbox/trunk/mailreader-course/struts2/theme/src/webapp/WEB-INF/web.xml
struts/sandbox/trunk/mailreader-course/struts2/theme/src/webapp/WEB-INF/webtest.xml
struts/sandbox/trunk/mailreader-course/struts2/theme/src/webapp/index.html
struts/sandbox/trunk/mailreader-course/struts2/theme/src/webapp/pages/Error.jsp
struts/sandbox/trunk/mailreader-course/struts2/theme/src/webapp/pages/Footer.jsp
struts/sandbox/trunk/mailreader-course/struts2/theme/src/webapp/pages/Hello.jsp
struts/sandbox/trunk/mailreader-course/struts2/theme/src/webapp/pages/Login.jsp
struts/sandbox/trunk/mailreader-course/struts2/theme/src/webapp/pages/Menu.jsp
struts/sandbox/trunk/mailreader-course/struts2/theme/src/webapp/pages/Missing.jsp
struts/sandbox/trunk/mailreader-course/struts2/theme/src/webapp/pages/Register.jsp
struts/sandbox/trunk/mailreader-course/struts2/theme/src/webapp/pages/Subscribe.jsp
struts/sandbox/trunk/mailreader-course/struts2/theme/src/webapp/pages/Welcome.jsp
Modified: struts/sandbox/trunk/mailreader-course/struts2/browse/src/java/AuthenticationInterceptor.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/browse/src/java/AuthenticationInterceptor.java?rev=431180&r1=431179&r2=431180&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/browse/src/java/AuthenticationInterceptor.java (original)
+++ struts/sandbox/trunk/mailreader-course/struts2/browse/src/java/AuthenticationInterceptor.java Sun Aug 13 07:28:51 2006
@@ -1,6 +1,6 @@
-import com.opensymphony.xwork.interceptor.Interceptor;
-import com.opensymphony.xwork.ActionInvocation;
-import com.opensymphony.xwork.Action;
+import com.opensymphony.xwork2.interceptor.Interceptor;
+import com.opensymphony.xwork2.ActionInvocation;
+import com.opensymphony.xwork2.Action;
import java.util.Map;
import org.apache.struts.apps.mailreader.dao.User;
Modified: struts/sandbox/trunk/mailreader-course/struts2/browse/src/java/Hello.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/browse/src/java/Hello.java?rev=431180&r1=431179&r2=431180&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/browse/src/java/Hello.java (original)
+++ struts/sandbox/trunk/mailreader-course/struts2/browse/src/java/Hello.java Sun Aug 13 07:28:51 2006
@@ -1,4 +1,4 @@
-import com.opensymphony.xwork.ActionSupport;
+import com.opensymphony.xwork2.ActionSupport;
/**
* Example Action class.
Modified: struts/sandbox/trunk/mailreader-course/struts2/browse/src/java/MailReaderSupport.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/browse/src/java/MailReaderSupport.java?rev=431180&r1=431179&r2=431180&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/browse/src/java/MailReaderSupport.java (original)
+++ struts/sandbox/trunk/mailreader-course/struts2/browse/src/java/MailReaderSupport.java Sun Aug 13 07:28:51 2006
@@ -1,7 +1,7 @@
import com.opensymphony.util.BeanUtils;
-import com.opensymphony.webwork.interceptor.ApplicationAware;
-import com.opensymphony.webwork.interceptor.SessionAware;
-import com.opensymphony.xwork.ActionSupport;
+import org.apache.struts2.interceptor.ApplicationAware;
+import org.apache.struts2.interceptor.SessionAware;
+import com.opensymphony.xwork2.ActionSupport;
import org.apache.struts.apps.mailreader.dao.ExpiredPasswordException;
import org.apache.struts.apps.mailreader.dao.User;
import org.apache.struts.apps.mailreader.dao.UserDatabase;
Modified: struts/sandbox/trunk/mailreader-course/struts2/browse/src/java/NPE.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/browse/src/java/NPE.java?rev=431180&r1=431179&r2=431180&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/browse/src/java/NPE.java (original)
+++ struts/sandbox/trunk/mailreader-course/struts2/browse/src/java/NPE.java Sun Aug 13 07:28:51 2006
@@ -1,4 +1,4 @@
-import com.opensymphony.xwork.Action;
+import com.opensymphony.xwork2.Action;
public class NPE implements Action {
Modified: struts/sandbox/trunk/mailreader-course/struts2/browse/src/java/Register.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/browse/src/java/Register.java?rev=431180&r1=431179&r2=431180&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/browse/src/java/Register.java (original)
+++ struts/sandbox/trunk/mailreader-course/struts2/browse/src/java/Register.java Sun Aug 13 07:28:51 2006
@@ -19,7 +19,7 @@
return INPUT;
}
- public String execute()
+ public String save()
throws Exception {
User user = getUser();
Modified: struts/sandbox/trunk/mailreader-course/struts2/browse/src/java/Subscribe.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/browse/src/java/Subscribe.java?rev=431180&r1=431179&r2=431180&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/browse/src/java/Subscribe.java (original)
+++ struts/sandbox/trunk/mailreader-course/struts2/browse/src/java/Subscribe.java Sun Aug 13 07:28:51 2006
@@ -1,4 +1,4 @@
-import com.opensymphony.xwork.Preparable;
+import com.opensymphony.xwork2.Preparable;
import java.util.LinkedHashMap;
import java.util.Map;
Modified: struts/sandbox/trunk/mailreader-course/struts2/browse/src/java/resources.properties
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/browse/src/java/resources.properties?rev=431180&r1=431179&r2=431180&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/browse/src/java/resources.properties (original)
+++ struts/sandbox/trunk/mailreader-course/struts2/browse/src/java/resources.properties Sun Aug 13 07:28:51 2006
@@ -1,4 +1,4 @@
-hello.nessage = Congratulations! WebWork is up and running ...
+hello.message = Congratulations! Struts is up and running ...
index.title=MailReader
index.login=Log into MailReader
@@ -51,7 +51,7 @@
change.try=Try Again
change.title=Password Has Expired
database.load=Cannot load database from {0}
-webwork.messages.invalid.token=Cannot submit this form out of order
+struts.messages.invalid.token=Cannot submit this form out of order
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>
Modified: struts/sandbox/trunk/mailreader-course/struts2/browse/src/java/resources_ja.properties
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/browse/src/java/resources_ja.properties?rev=431180&r1=431179&r2=431180&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/browse/src/java/resources_ja.properties (original)
+++ struts/sandbox/trunk/mailreader-course/struts2/browse/src/java/resources_ja.properties Sun Aug 13 07:28:51 2006
@@ -18,7 +18,7 @@
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
+struts.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
Modified: struts/sandbox/trunk/mailreader-course/struts2/browse/src/java/resources_ru.properties
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/browse/src/java/resources_ru.properties?rev=431180&r1=431179&r2=431180&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/browse/src/java/resources_ru.properties (original)
+++ struts/sandbox/trunk/mailreader-course/struts2/browse/src/java/resources_ru.properties Sun Aug 13 07:28:51 2006
@@ -18,7 +18,7 @@
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.
+struts.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
Modified: struts/sandbox/trunk/mailreader-course/struts2/browse/src/java/webwork.properties
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/browse/src/java/webwork.properties?rev=431180&r1=431179&r2=431180&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/browse/src/java/webwork.properties (original)
+++ struts/sandbox/trunk/mailreader-course/struts2/browse/src/java/webwork.properties Sun Aug 13 07:28:51 2006
@@ -1,4 +1,4 @@
-webwork.objectFactory = spring
-webwork.devMode = true
-webwork.action.extension = do
-webwork.custom.i18n.resources = resources
+struts.objectFactory = spring
+struts.devMode = true
+struts.action.extension = action
+struts.custom.i18n.resources = resources
Modified: struts/sandbox/trunk/mailreader-course/struts2/browse/src/java/xwork.xml
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/browse/src/java/xwork.xml?rev=431180&r1=431179&r2=431180&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/browse/src/java/xwork.xml (original)
+++ struts/sandbox/trunk/mailreader-course/struts2/browse/src/java/xwork.xml Sun Aug 13 07:28:51 2006
@@ -1,31 +1,34 @@
-<!DOCTYPE xwork PUBLIC "-//OpenSymphony Group//XWork 1.1.1//EN" "http://www.opensymphony.com/xwork/xwork-1.1.1.dtd">
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE struts PUBLIC
+ "-//Apache Software Foundation//DTD Struts Configuration 2.0//EN"
+ "http://struts.apache.org/dtds/struts-2.0.dtd">
-<xwork>
- <include file="webwork-default.xml"/>
+<struts>
+ <include file="struts-default.xml"/>
- <package name="default" extends="webwork-default">
+ <package name="default" extends="struts-default">
<interceptors>
<interceptor name="authentication"
class="AuthenticationInterceptor"/>
- <interceptor-stack name="user" >
- <interceptor-ref name="authentication" />
+ <interceptor-stack name="user">
+ <interceptor-ref name="authentication"/>
<interceptor-ref name="defaultStack"/>
</interceptor-stack>
- <interceptor-stack name="user-submit" >
- <interceptor-ref name="token-session" />
+ <interceptor-stack name="user-submit">
+ <interceptor-ref name="token-session"/>
<interceptor-ref name="user"/>
</interceptor-stack>
- <interceptor-stack name="guest" >
+ <interceptor-stack name="guest">
<interceptor-ref name="defaultStack"/>
</interceptor-stack>
- <interceptor-stack name="guest-submit" >
- <interceptor-ref name="token-session" />
+ <interceptor-stack name="guest-submit">
+ <interceptor-ref name="token-session"/>
<interceptor-ref name="guest"/>
</interceptor-stack>
@@ -71,7 +74,7 @@
<action name="RegisterCreate" class="RegisterCreate">
<result name="input">/pages/Register.jsp</result>
<result type="redirect-action">Menu</result>
- <interceptor-ref name="guest-submit" />
+ <interceptor-ref name="guest-submit"/>
</action>
<action name="Menu" class="MailReaderSupport">
@@ -97,7 +100,7 @@
<action name="SubscribeSave" class="SubscribeSave">
<result name="input">/pages/Subscribe.jsp</result>
<result type="redirect-action">Register!input</result>
- <interceptor-ref name="user-submit" />
+ <interceptor-ref name="user-submit"/>
</action>
<action name="NPE" class="NPE">
@@ -106,4 +109,4 @@
</action>
</package>
-</xwork>
+</struts>
Modified: struts/sandbox/trunk/mailreader-course/struts2/browse/src/test/RegisterTest.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/browse/src/test/RegisterTest.java?rev=431180&r1=431179&r2=431180&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/browse/src/test/RegisterTest.java (original)
+++ struts/sandbox/trunk/mailreader-course/struts2/browse/src/test/RegisterTest.java Sun Aug 13 07:28:51 2006
@@ -1,4 +1,4 @@
-import com.opensymphony.xwork.Action;
+import com.opensymphony.xwork2.Action;
import org.apache.struts.apps.mailreader.dao.User;
import java.util.HashMap;
@@ -21,13 +21,13 @@
action.setFullName("John Q. User");
action.setFromAddress("John.User@somewhere.com");
- String success = action.execute();
+ String success = action.save();
assertTrue("Expected SUCCESS", Action.SUCCESS.equals(success));
User user = database.findUser("user");
assertNotNull("Expected user", user);
- String input = action.execute();
+ String input = action.save();
assertTrue("Expected INPUT", Action.INPUT.equals(input));
}
Modified: struts/sandbox/trunk/mailreader-course/struts2/browse/src/test/RetainTest.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/browse/src/test/RetainTest.java?rev=431180&r1=431179&r2=431180&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/browse/src/test/RetainTest.java (original)
+++ struts/sandbox/trunk/mailreader-course/struts2/browse/src/test/RetainTest.java Sun Aug 13 07:28:51 2006
@@ -18,7 +18,7 @@
public void testDatabaseClean() throws Exception {
User user = database.findUser("user");
- assertNull("Expected user to be created", user);
+ assertNull("Expected user to be missing", user);
}
// Add your test methods here.
Modified: struts/sandbox/trunk/mailreader-course/struts2/browse/src/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/browse/src/webapp/WEB-INF/web.xml?rev=431180&r1=431179&r2=431180&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/browse/src/webapp/WEB-INF/web.xml (original)
+++ struts/sandbox/trunk/mailreader-course/struts2/browse/src/webapp/WEB-INF/web.xml Sun Aug 13 07:28:51 2006
@@ -2,7 +2,7 @@
<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
<web-app>
- <display-name>WebWork Application</display-name>
+ <display-name>Struts 2 Mailreader</display-name>
<context-param>
<param-name>contextConfigLocation</param-name>
@@ -10,17 +10,21 @@
</context-param>
<filter>
- <filter-name>webwork</filter-name>
- <filter-class>com.opensymphony.webwork.dispatcher.FilterDispatcher</filter-class>
+ <filter-name>Struts2</filter-name>
+ <filter-class>
+ org.apache.struts2.dispatcher.FilterDispatcher
+ </filter-class>
</filter>
<filter-mapping>
- <filter-name>webwork</filter-name>
+ <filter-name>Struts2</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>
<listener>
- <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
+ <listener-class>
+ org.springframework.web.context.ContextLoaderListener
+ </listener-class>
</listener>
<!-- Application Listener for Mailreader database -->
@@ -31,7 +35,6 @@
</listener>
<welcome-file-list>
- <welcome-file>index.jsp</welcome-file>
<welcome-file>index.html</welcome-file>
</welcome-file-list>
Modified: struts/sandbox/trunk/mailreader-course/struts2/browse/src/webapp/WEB-INF/webtest.xml
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/browse/src/webapp/WEB-INF/webtest.xml?rev=431180&r1=431179&r2=431180&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/browse/src/webapp/WEB-INF/webtest.xml (original)
+++ struts/sandbox/trunk/mailreader-course/struts2/browse/src/webapp/WEB-INF/webtest.xml Sun Aug 13 07:28:51 2006
@@ -56,7 +56,7 @@
-->
<!-- Load local preferences, if any -->
- <property file="webtest.properties" />
+ <property file="webtest.properties"/>
<!-- These properties can be customized using via webtest.properties -->
<!-- See webtest.properties.sample for a starter file -->
@@ -110,8 +110,8 @@
®ister-open;
®ister-trillian;
<verifyTitle
- description="Menu page title"
- text="MailReader - Menu"/>
+ description="Menu page title"
+ text="MailReader - Menu"/>
</steps>
</webtest>
Modified: struts/sandbox/trunk/mailreader-course/struts2/browse/src/webapp/index.html
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/browse/src/webapp/index.html?rev=431180&r1=431179&r2=431180&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/browse/src/webapp/index.html (original)
+++ struts/sandbox/trunk/mailreader-course/struts2/browse/src/webapp/index.html Sun Aug 13 07:28:51 2006
@@ -1,7 +1,7 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<html>
<head>
- <META HTTP-EQUIV="Refresh" CONTENT="0;URL=Welcome.do">
+ <META HTTP-EQUIV="Refresh" CONTENT="0;URL=Welcome.action">
</head>
<body>
Modified: struts/sandbox/trunk/mailreader-course/struts2/browse/src/webapp/pages/Error.jsp
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/browse/src/webapp/pages/Error.jsp?rev=431180&r1=431179&r2=431180&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/browse/src/webapp/pages/Error.jsp (original)
+++ struts/sandbox/trunk/mailreader-course/struts2/browse/src/webapp/pages/Error.jsp Sun Aug 13 07:28:51 2006
@@ -1,5 +1,5 @@
<%@ page contentType="text/html; charset=UTF-8" %>
-<%@ taglib uri="/webwork" prefix="ww" %>
+<%@ taglib prefix="s" uri="/tags" %>
<!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">
@@ -20,10 +20,10 @@
<h3>Error Message</h3>
-<ww:actionerror />
+<s:actionerror/>
<p>
- <ww:property value="%{exception.message}"/>
+ <s:property value="%{exception.message}"/>
</p>
<hr/>
@@ -31,7 +31,7 @@
<h3>Technical Details</h3>
<p>
- <ww:property value="%{exceptionStack}"/>
+ <s:property value="%{exceptionStack}"/>
</p>
</body>
Modified: struts/sandbox/trunk/mailreader-course/struts2/browse/src/webapp/pages/Hello.jsp
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/browse/src/webapp/pages/Hello.jsp?rev=431180&r1=431179&r2=431180&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/browse/src/webapp/pages/Hello.jsp (original)
+++ struts/sandbox/trunk/mailreader-course/struts2/browse/src/webapp/pages/Hello.jsp Sun Aug 13 07:28:51 2006
@@ -1,5 +1,5 @@
<%@ page contentType="text/html; charset=UTF-8" %>
-<%@ taglib prefix="ww" uri="/webwork" %>
+<%@ taglib prefix="s" uri="/tags" %>
<html>
<head>
@@ -7,6 +7,6 @@
</head>
<body>
-<h2><ww:text name="hello.nessage"/></h2>
+<h2><s:text name="hello.message"/></h2>
</body>
</html>
Modified: struts/sandbox/trunk/mailreader-course/struts2/browse/src/webapp/pages/Login.jsp
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/browse/src/webapp/pages/Login.jsp?rev=431180&r1=431179&r2=431180&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/browse/src/webapp/pages/Login.jsp (original)
+++ struts/sandbox/trunk/mailreader-course/struts2/browse/src/webapp/pages/Login.jsp Sun Aug 13 07:28:51 2006
@@ -1,25 +1,25 @@
<%@ page contentType="text/html; charset=UTF-8" %>
-<%@ taglib uri="/webwork" prefix="ww" %>
+<%@ taglib prefix="s" uri="/tags" %>
<!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><ww:text name="login.title"/></title>
+ <title><s:text name="login.title"/></title>
</head>
<body onLoad="self.focus();document.Login.username.focus()">
-<ww:actionerror/>
-<ww:form method="POST" validate="true">
- <ww:textfield label="%{getText('username')}" name="username"/>
+<s:actionerror/>
+<s:form method="POST" validate="true">
+ <s:textfield label="%{getText('username')}" name="username"/>
- <ww:password label="%{getText('password')}" name="password" showPassword="true"/>
+ <s:password label="%{getText('password')}" name="password" showPassword="true"/>
- <ww:submit value="%{getText('button.save')}" name="Save"/>
+ <s:submit value="%{getText('button.save')}" name="Save"/>
- <ww:submit action="Login!cancel" value="%{getText('button.cancel')}" name="Cancel"
+ <s:submit action="Login!cancel" value="%{getText('button.cancel')}" name="Cancel"
onclick="form.onsubmit=null"/>
-</ww:form>
+</s:form>
</body>
</html>
Modified: struts/sandbox/trunk/mailreader-course/struts2/browse/src/webapp/pages/Menu.jsp
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/browse/src/webapp/pages/Menu.jsp?rev=431180&r1=431179&r2=431180&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/browse/src/webapp/pages/Menu.jsp (original)
+++ struts/sandbox/trunk/mailreader-course/struts2/browse/src/webapp/pages/Menu.jsp Sun Aug 13 07:28:51 2006
@@ -1,21 +1,21 @@
<%@ page contentType="text/html; charset=UTF-8" %>
-<%@ taglib uri="/webwork" prefix="ww" %>
+<%@ taglib prefix="s" uri="/tags" %>
<!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><ww:text name="menu.title"/></title>
+ <title><s:text name="menu.title"/></title>
</head>
<body>
-<h3><ww:text name="menu.heading"/> <ww:property value="user.fullName"/></h3>
+<h3><s:text name="menu.heading"/> <s:property value="user.fullName"/></h3>
<ul>
- <li><a href="<ww:url action="Register!input" />">
- <ww:text name="menu.registration"/>
+ <li><a href="<s:url action="Register!input" />">
+ <s:text name="menu.registration"/>
</a>
</li>
- <li><a href="<ww:url action="Logout"/>">
- <ww:text name="menu.logout"/>
+ <li><a href="<s:url action="Logout"/>">
+ <s:text name="menu.logout"/>
</a>
</ul>
</body>
Modified: struts/sandbox/trunk/mailreader-course/struts2/browse/src/webapp/pages/Register.jsp
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/browse/src/webapp/pages/Register.jsp?rev=431180&r1=431179&r2=431180&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/browse/src/webapp/pages/Register.jsp (original)
+++ struts/sandbox/trunk/mailreader-course/struts2/browse/src/webapp/pages/Register.jsp Sun Aug 13 07:28:51 2006
@@ -1,122 +1,122 @@
<%@ page contentType="text/html; charset=UTF-8" %>
-<%@ taglib uri="/webwork" prefix="ww" %>
+<%@ taglib prefix="s" uri="/tags" %>
<!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>
- <ww:if test="task=='Create'">
- <title><ww:text name="registration.title.create"/></title>
- </ww:if>
- <ww:if test="task=='Edit'">
- <title><ww:text name="registration.title.edit"/></title>
- </ww:if>
+ <s:if test="task=='Create'">
+ <title><s:text name="registration.title.create"/></title>
+ </s:if>
+ <s:if test="task=='Edit'">
+ <title><s:text name="registration.title.edit"/></title>
+ </s:if>
</head>
<body onLoad="self.focus();document.Register.username.focus()">
-<ww:actionerror/>
-<ww:form method="POST" validate="true">
- <ww:token/>
- <ww:hidden name="task"/>
- <ww:if test="task == 'Create'">
- <ww:textfield label="%{getText('username')}" name="username"/>
- </ww:if>
- <ww:else>
- <ww:label label="%{getText('username')}" name="username"/>
- <ww:hidden name="username"/>
- </ww:else>
+<s:actionerror/>
+<s:form method="POST" validate="true">
+ <s:token/>
+ <s:hidden name="task"/>
+ <s:if test="task == 'Create'">
+ <s:textfield label="%{getText('username')}" name="username"/>
+ </s:if>
+ <s:else>
+ <s:label label="%{getText('username')}" name="username"/>
+ <s:hidden name="username"/>
+ </s:else>
- <ww:password label="%{getText('password')}" name="password"/>
+ <s:password label="%{getText('password')}" name="password"/>
- <ww:password label="%{getText('password2')}" name="password2"/>
+ <s:password label="%{getText('password2')}" name="password2"/>
- <ww:textfield label="%{getText('fullName')}"
- name="fullName"/>
+ <s:textfield label="%{getText('fullName')}"
+ name="fullName"/>
- <ww:textfield label="%{getText('fromAddress')}"
- name="fromAddress"/>
+ <s:textfield label="%{getText('fromAddress')}"
+ name="fromAddress"/>
- <ww:textfield label="%{getText('replyToAddress')}"
- name="replyToAddress"/>
+ <s:textfield label="%{getText('replyToAddress')}"
+ name="replyToAddress"/>
- <ww:if test="task == 'Create'">
- <ww:submit value="%{getText('button.save')}" action="RegisterCreate"/>
+ <s:if test="task == 'Create'">
+ <s:submit value="%{getText('button.save')}" action="RegisterCreate"/>
- <ww:reset value="%{getText('button.reset')}"/>
+ <s:reset value="%{getText('button.reset')}"/>
- <ww:submit action="Welcome" value="%{getText('button.cancel')}"
- onclick="form.onsubmit=null"/>
- </ww:if>
- <ww:else>
- <ww:submit value="%{getText('button.save')}" action="Register"/>
+ <s:submit action="Welcome" value="%{getText('button.cancel')}"
+ onclick="form.onsubmit=null"/>
+ </s:if>
+ <s:else>
+ <s:submit value="%{getText('button.save')}" action="Register"/>
- <ww:reset value="%{getText('button.reset')}"/>
+ <s:reset value="%{getText('button.reset')}"/>
- <ww:submit action="Menu" value="%{getText('button.cancel')}"
- onclick="form.onsubmit=null"/>
- </ww:else>
+ <s:submit action="Menu" value="%{getText('button.cancel')}"
+ onclick="form.onsubmit=null"/>
+ </s:else>
-</ww:form>
+</s:form>
-<ww:if test="task == 'Edit'">
+<s:if test="task == 'Edit'">
<div align="center">
- <h3><ww:text name="heading.subscriptions"/></h3>
+ <h3><s:text name="heading.subscriptions"/></h3>
</div>
<table border="1" width="100%">
<tr>
<th align="center" width="30%">
- <ww:text name="heading.host"/>
+ <s:text name="heading.host"/>
</th>
<th align="center" width="25%">
- <ww:text name="heading.user"/>
+ <s:text name="heading.user"/>
</th>
<th align="center" width="10%">
- <ww:text name="heading.type"/>
+ <s:text name="heading.type"/>
</th>
<th align="center" width="10%">
- <ww:text name="heading.autoConnect"/>
+ <s:text name="heading.autoConnect"/>
</th>
<th align="center" width="15%">
- <ww:text name="heading.action"/>
+ <s:text name="heading.action"/>
</th>
</tr>
- <ww:iterator value="user.subscriptions">
+ <s:iterator value="user.subscriptions">
<tr>
<td align="left">
- <ww:property value="host"/>
+ <s:property value="host"/>
</td>
<td align="left">
- <ww:property value="username"/>
+ <s:property value="username"/>
</td>
<td align="center">
- <ww:property value="type"/>
+ <s:property value="type"/>
</td>
<td align="center">
- <ww:property value="autoConnect"/>
+ <s:property value="autoConnect"/>
</td>
<td align="center">
- <a href="<ww:url action="Subscribe!delete"><ww:param name="host" value="host"/></ww:url>">
- <ww:text name="registration.deleteSubscription"/>
+ <a href="<s:url action="Subscribe!delete"><s:param name="host" value="host"/></s:url>">
+ <s:text name="registration.deleteSubscription"/>
</a>
- <a href="<ww:url action="Subscribe!edit"><ww:param name="host" value="host"/></ww:url>">
- <ww:text name="registration.editSubscription"/>
+ <a href="<s:url action="Subscribe!edit"><s:param name="host" value="host"/></s:url>">
+ <s:text name="registration.editSubscription"/>
</a>
</td>
</tr>
- </ww:iterator>
+ </s:iterator>
</table>
- <a href="<ww:url action="Subscribe!input"/>"><ww:text
+ <a href="<s:url action="Subscribe!input"/>"><s:text
name="registration.addSubscription"/></a>
-</ww:if>
+</s:if>
</body>
</html>
Modified: struts/sandbox/trunk/mailreader-course/struts2/browse/src/webapp/pages/Subscribe.jsp
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/browse/src/webapp/pages/Subscribe.jsp?rev=431180&r1=431179&r2=431180&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/browse/src/webapp/pages/Subscribe.jsp (original)
+++ struts/sandbox/trunk/mailreader-course/struts2/browse/src/webapp/pages/Subscribe.jsp Sun Aug 13 07:28:51 2006
@@ -1,64 +1,64 @@
<%@ page contentType="text/html; charset=UTF-8" %>
-<%@ taglib uri="/webwork" prefix="ww" %>
+<%@ taglib prefix="s" uri="/tags" %>
<!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>
- <ww:if test="task=='Create'">
- <title><ww:text name="subscription.title.create"/></title>
- </ww:if>
- <ww:if test="task=='Edit'">
- <title><ww:text name="subscription.title.edit"/></title>
- </ww:if>
- <ww:if test="task=='Delete'">
- <title><ww:text name="subscription.title.delete"/></title>
- </ww:if>
+ <s:if test="task=='Create'">
+ <title><s:text name="subscription.title.create"/></title>
+ </s:if>
+ <s:if test="task=='Edit'">
+ <title><s:text name="subscription.title.edit"/></title>
+ </s:if>
+ <s:if test="task=='Delete'">
+ <title><s:text name="subscription.title.delete"/></title>
+ </s:if>
</head>
<body onLoad="self.focus();document.Subscribe.username.focus()">
-<ww:actionerror/>
-<ww:form method="POST" action="SubscribeSave" validate="true">
- <ww:token/>
- <ww:hidden name="task"/>
- <ww:label label="%{getText('username')}" name="user.username"/>
+<s:actionerror/>
+<s:form method="POST" action="SubscribeSave" validate="true">
+ <s:token/>
+ <s:hidden name="task"/>
+ <s:label label="%{getText('username')}" name="user.username"/>
- <ww:if test="task == 'Create'">
- <ww:textfield label="%{getText('mailHostname')}" name="host"/>
- </ww:if>
- <ww:else>
- <ww:label label="%{getText('mailHostname')}" name="host"/>
- <ww:hidden name="host"/>
- </ww:else>
+ <s:if test="task == 'Create'">
+ <s:textfield label="%{getText('mailHostname')}" name="host"/>
+ </s:if>
+ <s:else>
+ <s:label label="%{getText('mailHostname')}" name="host"/>
+ <s:hidden name="host"/>
+ </s:else>
- <ww:if test="task == 'Delete'">
- <ww:label label="%{getText('mailUsername')}"
- name="subscription.username"/>
- <ww:label label="%{getText('mailPassword')}"
- name="subscription.password"/>
- <ww:label label="%{getText('mailServerType')}"
- name="subscription.type"/>
- <ww:label label="%{getText('autoConnect')}"
- name="subscription.autoConnect"/>
- <ww:submit value="%{getText('button.confirm')}"/>
- </ww:if>
- <ww:else>
- <ww:textfield label="%{getText('mailUsername')}"
- name="subscription.username"/>
- <ww:textfield label="%{getText('mailPassword')}"
- name="subscription.password"/>
- <ww:select label="%{getText('mailServerType')}"
- name="subscription.type" list="types"/>
- <ww:checkbox label="%{getText('autoConnect')}"
- name="subscription.autoConnect"/>
- <ww:submit value="%{getText('button.save')}"/>
- <ww:reset value="%{getText('button.reset')}"/>
- </ww:else>
+ <s:if test="task == 'Delete'">
+ <s:label label="%{getText('mailUsername')}"
+ name="subscription.username"/>
+ <s:label label="%{getText('mailPassword')}"
+ name="subscription.password"/>
+ <s:label label="%{getText('mailServerType')}"
+ name="subscription.type"/>
+ <s:label label="%{getText('autoConnect')}"
+ name="subscription.autoConnect"/>
+ <s:submit value="%{getText('button.confirm')}"/>
+ </s:if>
+ <s:else>
+ <s:textfield label="%{getText('mailUsername')}"
+ name="subscription.username"/>
+ <s:textfield label="%{getText('mailPassword')}"
+ name="subscription.password"/>
+ <s:select label="%{getText('mailServerType')}"
+ name="subscription.type" list="types"/>
+ <s:checkbox label="%{getText('autoConnect')}"
+ name="subscription.autoConnect"/>
+ <s:submit value="%{getText('button.save')}"/>
+ <s:reset value="%{getText('button.reset')}"/>
+ </s:else>
- <ww:submit action="Register!input"
- value="%{getText('button.cancel')}"
- onclick="form.onsubmit=null"/>
-</ww:form>
+ <s:submit action="Register!input"
+ value="%{getText('button.cancel')}"
+ onclick="form.onsubmit=null"/>
+</s:form>
</body>
</html>
Modified: struts/sandbox/trunk/mailreader-course/struts2/browse/src/webapp/pages/Welcome.jsp
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/browse/src/webapp/pages/Welcome.jsp?rev=431180&r1=431179&r2=431180&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/browse/src/webapp/pages/Welcome.jsp (original)
+++ struts/sandbox/trunk/mailreader-course/struts2/browse/src/webapp/pages/Welcome.jsp Sun Aug 13 07:28:51 2006
@@ -1,28 +1,28 @@
<%@ page contentType="text/html; charset=UTF-8" %>
-<%@ taglib uri="/webwork" prefix="ww" %>
+<%@ taglib prefix="s" uri="/tags" %>
<!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>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
- <title><ww:text name="index.title"/></title>
+ <title><s:text name="index.title"/></title>
</head>
<body>
<h3>MailReader Options</h3>
<ul>
- <li><a href="<ww:url action="Register!input"/>"><ww:text
+ <li><a href="<s:url action="Register!input"/>"><s:text
name="index.registration"/></a></li>
- <li><a href="<ww:url action="Login!input"/>"><ww:text
+ <li><a href="<s:url action="Login!input"/>"><s:text
name="index.login"/></a></li>
</ul>
<h3>Language Options</h3>
<ul>
- <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>
+ <li><a href="<s:url action="Welcome?request_locale=en"/>">English</a></li>
+ <li><a href="<s:url action="Welcome?request_locale=ja"/>">Japanese</a></li>
+ <li><a href="<s:url action="Welcome?request_locale=ru"/>">Russian</a></li>
</ul>
</body>
Modified: struts/sandbox/trunk/mailreader-course/struts2/hello/src/webapp/pages/Hello.jsp
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/hello/src/webapp/pages/Hello.jsp?rev=431180&r1=431179&r2=431180&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/hello/src/webapp/pages/Hello.jsp (original)
+++ struts/sandbox/trunk/mailreader-course/struts2/hello/src/webapp/pages/Hello.jsp Sun Aug 13 07:28:51 2006
@@ -1,4 +1,3 @@
-<%@ page contentType="text/html; charset=UTF-8" %>
<%@ taglib prefix="s" uri="/tags" %>
<html>
Modified: struts/sandbox/trunk/mailreader-course/struts2/localize/src/java/Hello.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/localize/src/java/Hello.java?rev=431180&r1=431179&r2=431180&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/localize/src/java/Hello.java (original)
+++ struts/sandbox/trunk/mailreader-course/struts2/localize/src/java/Hello.java Sun Aug 13 07:28:51 2006
@@ -1,4 +1,4 @@
-import com.opensymphony.xwork.ActionSupport;
+import com.opensymphony.xwork2.ActionSupport;
/**
* Example Action class.
Modified: struts/sandbox/trunk/mailreader-course/struts2/localize/src/java/MailReaderSupport.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/localize/src/java/MailReaderSupport.java?rev=431180&r1=431179&r2=431180&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/localize/src/java/MailReaderSupport.java (original)
+++ struts/sandbox/trunk/mailreader-course/struts2/localize/src/java/MailReaderSupport.java Sun Aug 13 07:28:51 2006
@@ -1,7 +1,7 @@
import com.opensymphony.util.BeanUtils;
-import com.opensymphony.webwork.interceptor.ApplicationAware;
-import com.opensymphony.webwork.interceptor.SessionAware;
-import com.opensymphony.xwork.ActionSupport;
+import org.apache.struts2.interceptor.ApplicationAware;
+import org.apache.struts2.interceptor.SessionAware;
+import com.opensymphony.xwork2.ActionSupport;
import org.apache.struts.apps.mailreader.dao.ExpiredPasswordException;
import org.apache.struts.apps.mailreader.dao.User;
import org.apache.struts.apps.mailreader.dao.UserDatabase;
Modified: struts/sandbox/trunk/mailreader-course/struts2/localize/src/java/Register.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/localize/src/java/Register.java?rev=431180&r1=431179&r2=431180&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/localize/src/java/Register.java (original)
+++ struts/sandbox/trunk/mailreader-course/struts2/localize/src/java/Register.java Sun Aug 13 07:28:51 2006
@@ -1,9 +1,9 @@
-import com.opensymphony.xwork.Action;
+import com.opensymphony.xwork2.Action;
import org.apache.struts.apps.mailreader.dao.User;
public class Register extends MailReaderSupport {
- public String execute()
+ public String save()
throws Exception {
User user = findUser(getUsername(), getPassword());
Modified: struts/sandbox/trunk/mailreader-course/struts2/localize/src/java/resources.properties
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/localize/src/java/resources.properties?rev=431180&r1=431179&r2=431180&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/localize/src/java/resources.properties (original)
+++ struts/sandbox/trunk/mailreader-course/struts2/localize/src/java/resources.properties Sun Aug 13 07:28:51 2006
@@ -1,4 +1,4 @@
-hello.nessage = Congratulations! WebWork is up and running ...
+hello.message = Congratulations! Struts is up and running ...
index.title=MailReader
index.login=Log into MailReader
@@ -51,7 +51,7 @@
change.try=Try Again
change.title=Password Has Expired
database.load=Cannot load database from {0}
-webwork.messages.invalid.token=Cannot submit this form out of order
+struts.messages.invalid.token=Cannot submit this form out of order
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>
Modified: struts/sandbox/trunk/mailreader-course/struts2/localize/src/java/resources_ja.properties
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/localize/src/java/resources_ja.properties?rev=431180&r1=431179&r2=431180&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/localize/src/java/resources_ja.properties (original)
+++ struts/sandbox/trunk/mailreader-course/struts2/localize/src/java/resources_ja.properties Sun Aug 13 07:28:51 2006
@@ -18,7 +18,7 @@
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
+struts.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
Modified: struts/sandbox/trunk/mailreader-course/struts2/localize/src/java/resources_ru.properties
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/localize/src/java/resources_ru.properties?rev=431180&r1=431179&r2=431180&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/localize/src/java/resources_ru.properties (original)
+++ struts/sandbox/trunk/mailreader-course/struts2/localize/src/java/resources_ru.properties Sun Aug 13 07:28:51 2006
@@ -18,7 +18,7 @@
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.
+struts.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
Modified: struts/sandbox/trunk/mailreader-course/struts2/localize/src/java/webwork.properties
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/localize/src/java/webwork.properties?rev=431180&r1=431179&r2=431180&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/localize/src/java/webwork.properties (original)
+++ struts/sandbox/trunk/mailreader-course/struts2/localize/src/java/webwork.properties Sun Aug 13 07:28:51 2006
@@ -1,4 +1,4 @@
-webwork.objectFactory = spring
-webwork.devMode = true
-webwork.action.extension = do
-webwork.custom.i18n.resources = resources
+struts.objectFactory = spring
+struts.devMode = true
+struts.action.extension = action
+struts.custom.i18n.resources = resources
Modified: struts/sandbox/trunk/mailreader-course/struts2/localize/src/java/xwork.xml
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/localize/src/java/xwork.xml?rev=431180&r1=431179&r2=431180&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/localize/src/java/xwork.xml (original)
+++ struts/sandbox/trunk/mailreader-course/struts2/localize/src/java/xwork.xml Sun Aug 13 07:28:51 2006
@@ -1,9 +1,12 @@
-<!DOCTYPE xwork PUBLIC "-//OpenSymphony Group//XWork 1.1.1//EN" "http://www.opensymphony.com/xwork/xwork-1.1.1.dtd">
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE struts PUBLIC
+ "-//Apache Software Foundation//DTD Struts Configuration 2.0//EN"
+ "http://struts.apache.org/dtds/struts-2.0.dtd">
-<xwork>
- <include file="webwork-default.xml"/>
+<struts>
+ <include file="struts-default.xml"/>
- <package name="default" extends="webwork-default">
+ <package name="default" extends="struts-default">
<default-action-ref name="Missing"/>
@@ -40,4 +43,4 @@
</action>
</package>
-</xwork>
+</struts>
Modified: struts/sandbox/trunk/mailreader-course/struts2/localize/src/test/RegisterTest.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/localize/src/test/RegisterTest.java?rev=431180&r1=431179&r2=431180&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/localize/src/test/RegisterTest.java (original)
+++ struts/sandbox/trunk/mailreader-course/struts2/localize/src/test/RegisterTest.java Sun Aug 13 07:28:51 2006
@@ -1,4 +1,4 @@
-import com.opensymphony.xwork.Action;
+import com.opensymphony.xwork2.Action;
import org.apache.struts.apps.mailreader.dao.User;
import java.util.HashMap;
@@ -21,13 +21,13 @@
action.setFullName("John Q. User");
action.setFromAddress("John.User@somewhere.com");
- String success = action.execute();
+ String success = action.save();
assertTrue("Expected SUCCESS", Action.SUCCESS.equals(success));
User user = database.findUser("user");
assertNotNull("Expected user", user);
- String input = action.execute();
+ String input = action.save();
assertTrue("Expected INPUT", Action.INPUT.equals(input));
}
Modified: struts/sandbox/trunk/mailreader-course/struts2/localize/src/test/RetainTest.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/localize/src/test/RetainTest.java?rev=431180&r1=431179&r2=431180&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/localize/src/test/RetainTest.java (original)
+++ struts/sandbox/trunk/mailreader-course/struts2/localize/src/test/RetainTest.java Sun Aug 13 07:28:51 2006
@@ -18,7 +18,7 @@
public void testDatabaseClean() throws Exception {
User user = database.findUser("user");
- assertNull("Expected user to be created", user);
+ assertNull("Expected user to be missing", user);
}
// Add your test methods here.
Modified: struts/sandbox/trunk/mailreader-course/struts2/localize/src/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/localize/src/webapp/WEB-INF/web.xml?rev=431180&r1=431179&r2=431180&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/localize/src/webapp/WEB-INF/web.xml (original)
+++ struts/sandbox/trunk/mailreader-course/struts2/localize/src/webapp/WEB-INF/web.xml Sun Aug 13 07:28:51 2006
@@ -2,7 +2,7 @@
<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
<web-app>
- <display-name>WebWork Application</display-name>
+ <display-name>Struts 2 Mailreader</display-name>
<context-param>
<param-name>contextConfigLocation</param-name>
@@ -10,17 +10,21 @@
</context-param>
<filter>
- <filter-name>webwork</filter-name>
- <filter-class>com.opensymphony.webwork.dispatcher.FilterDispatcher</filter-class>
+ <filter-name>Struts2</filter-name>
+ <filter-class>
+ org.apache.struts2.dispatcher.FilterDispatcher
+ </filter-class>
</filter>
<filter-mapping>
- <filter-name>webwork</filter-name>
+ <filter-name>Struts2</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>
<listener>
- <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
+ <listener-class>
+ org.springframework.web.context.ContextLoaderListener
+ </listener-class>
</listener>
<!-- Application Listener for Mailreader database -->
@@ -31,7 +35,6 @@
</listener>
<welcome-file-list>
- <welcome-file>index.jsp</welcome-file>
<welcome-file>index.html</welcome-file>
</welcome-file-list>
Modified: struts/sandbox/trunk/mailreader-course/struts2/localize/src/webapp/WEB-INF/webtest.xml
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/localize/src/webapp/WEB-INF/webtest.xml?rev=431180&r1=431179&r2=431180&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/localize/src/webapp/WEB-INF/webtest.xml (original)
+++ struts/sandbox/trunk/mailreader-course/struts2/localize/src/webapp/WEB-INF/webtest.xml Sun Aug 13 07:28:51 2006
@@ -58,7 +58,7 @@
-->
<!-- Load local preferences, if any -->
- <property file="webtest.properties" />
+ <property file="webtest.properties"/>
<!-- These properties can be customized using via webtest.properties -->
<!-- See webtest.properties.sample for a starter file -->
@@ -111,8 +111,8 @@
®ister-open;
®ister-trillian;
<verifyTitle
- description="Menu page title"
- text="${menu.title}"/>
+ description="Menu page title"
+ text="${menu.title}"/>
</steps>
</webtest>
Modified: struts/sandbox/trunk/mailreader-course/struts2/localize/src/webapp/index.html
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/localize/src/webapp/index.html?rev=431180&r1=431179&r2=431180&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/localize/src/webapp/index.html (original)
+++ struts/sandbox/trunk/mailreader-course/struts2/localize/src/webapp/index.html Sun Aug 13 07:28:51 2006
@@ -1,7 +1,7 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<html>
<head>
- <META HTTP-EQUIV="Refresh" CONTENT="0;URL=Welcome.do">
+ <META HTTP-EQUIV="Refresh" CONTENT="0;URL=Welcome.action">
</head>
<body>
Modified: struts/sandbox/trunk/mailreader-course/struts2/localize/src/webapp/pages/Hello.jsp
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/localize/src/webapp/pages/Hello.jsp?rev=431180&r1=431179&r2=431180&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/localize/src/webapp/pages/Hello.jsp (original)
+++ struts/sandbox/trunk/mailreader-course/struts2/localize/src/webapp/pages/Hello.jsp Sun Aug 13 07:28:51 2006
@@ -1,5 +1,5 @@
<%@ page contentType="text/html; charset=UTF-8" %>
-<%@ taglib prefix="ww" uri="/webwork" %>
+<%@ taglib prefix="s" uri="/tags" %>
<html>
<head>
@@ -7,6 +7,6 @@
</head>
<body>
-<h2><ww:text name="hello.nessage"/></h2>
+<h2><s:text name="hello.message"/></h2>
</body>
</html>
Modified: struts/sandbox/trunk/mailreader-course/struts2/localize/src/webapp/pages/Login.jsp
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/localize/src/webapp/pages/Login.jsp?rev=431180&r1=431179&r2=431180&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/localize/src/webapp/pages/Login.jsp (original)
+++ struts/sandbox/trunk/mailreader-course/struts2/localize/src/webapp/pages/Login.jsp Sun Aug 13 07:28:51 2006
@@ -1,25 +1,25 @@
<%@ page contentType="text/html; charset=UTF-8" %>
-<%@ taglib uri="/webwork" prefix="ww" %>
+<%@ taglib prefix="s" uri="/tags" %>
<!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><ww:text name="login.title"/></title>
+ <title><s:text name="login.title"/></title>
</head>
<body onLoad="self.focus();document.Login.username.focus()">
-<ww:actionerror/>
-<ww:form method="POST" validate="true">
- <ww:textfield label="%{getText('username')}" name="username"/>
+<s:actionerror/>
+<s:form method="POST" validate="true">
+ <s:textfield label="%{getText('username')}" name="username"/>
- <ww:password label="%{getText('password')}" name="password" showPassword="true"/>
+ <s:password label="%{getText('password')}" name="password" showPassword="true"/>
- <ww:submit value="%{getText('button.save')}" name="Save"/>
+ <s:submit value="%{getText('button.save')}" name="Save"/>
- <ww:submit action="Login!cancel" value="%{getText('button.cancel')}" name="Cancel"
+ <s:submit action="Login!cancel" value="%{getText('button.cancel')}" name="Cancel"
onclick="form.onsubmit=null"/>
-</ww:form>
+</s:form>
</body>
</html>
Modified: struts/sandbox/trunk/mailreader-course/struts2/localize/src/webapp/pages/Menu.jsp
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/localize/src/webapp/pages/Menu.jsp?rev=431180&r1=431179&r2=431180&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/localize/src/webapp/pages/Menu.jsp (original)
+++ struts/sandbox/trunk/mailreader-course/struts2/localize/src/webapp/pages/Menu.jsp Sun Aug 13 07:28:51 2006
@@ -1,21 +1,21 @@
<%@ page contentType="text/html; charset=UTF-8" %>
-<%@ taglib uri="/webwork" prefix="ww" %>
+<%@ taglib prefix="s" uri="/tags" %>
<!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><ww:text name="menu.title"/></title>
+ <title><s:text name="menu.title"/></title>
</head>
<body>
-<h3><ww:text name="menu.heading"/> <ww:property value="user.fullName"/></h3>
+<h3><s:text name="menu.heading"/> <s:property value="user.fullName"/></h3>
<ul>
- <li><a href="<ww:url action="Register!input" />">
- <ww:text name="menu.registration"/>
+ <li><a href="<s:url action="Register!input" />">
+ <s:text name="menu.registration"/>
</a>
</li>
- <li><a href="<ww:url action="Logout"/>">
- <ww:text name="menu.logout"/>
+ <li><a href="<s:url action="Logout"/>">
+ <s:text name="menu.logout"/>
</a>
</ul>
</body>
Modified: struts/sandbox/trunk/mailreader-course/struts2/localize/src/webapp/pages/Register.jsp
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/localize/src/webapp/pages/Register.jsp?rev=431180&r1=431179&r2=431180&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/localize/src/webapp/pages/Register.jsp (original)
+++ struts/sandbox/trunk/mailreader-course/struts2/localize/src/webapp/pages/Register.jsp Sun Aug 13 07:28:51 2006
@@ -1,35 +1,35 @@
<%@ page contentType="text/html; charset=UTF-8" %>
-<%@ taglib uri="/webwork" prefix="ww" %>
+<%@ taglib prefix="s" uri="/tags" %>
<!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><ww:text name="registration.title.create"/></title>
+ <title><s:text name="registration.title.create"/></title>
</head>
<body onLoad="self.focus();document.Register.username.focus()">
-<ww:actionerror/>
-<ww:form method="POST" validate="true">
+<s:actionerror/>
+<s:form method="POST" validate="true">
- <ww:textfield label="%{getText('username')}" name="username"/>
+ <s:textfield label="%{getText('username')}" name="username"/>
- <ww:password label="%{getText('password')}" name="password"/>
+ <s:password label="%{getText('password')}" name="password"/>
- <ww:password label="%{getText('password2')}" name="password2"/>
+ <s:password label="%{getText('password2')}" name="password2"/>
- <ww:textfield label="Full Name" name="fullName"/>
+ <s:textfield label="Full Name" name="fullName"/>
- <ww:textfield label="From Address" name="fromAddress"/>
+ <s:textfield label="From Address" name="fromAddress"/>
- <ww:textfield label="Reply To Address" name="replyToAddress"/>
+ <s:textfield label="Reply To Address" name="replyToAddress"/>
- <ww:submit value="%{getText('button.save')}" name="Save"/>
+ <s:submit value="%{getText('button.save')}" name="Save"/>
- <ww:submit action="Register!cancel" value="%{getText('button.cancel')}" name="Cancel"
+ <s:submit action="Register!cancel" value="%{getText('button.cancel')}" name="Cancel"
onclick="form.onsubmit=null"/>
-
-</ww:form>
+
+</s:form>
</body>
Modified: struts/sandbox/trunk/mailreader-course/struts2/localize/src/webapp/pages/Welcome.jsp
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/localize/src/webapp/pages/Welcome.jsp?rev=431180&r1=431179&r2=431180&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/localize/src/webapp/pages/Welcome.jsp (original)
+++ struts/sandbox/trunk/mailreader-course/struts2/localize/src/webapp/pages/Welcome.jsp Sun Aug 13 07:28:51 2006
@@ -1,28 +1,28 @@
<%@ page contentType="text/html; charset=UTF-8" %>
-<%@ taglib uri="/webwork" prefix="ww" %>
+<%@ taglib prefix="s" uri="/tags" %>
<!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>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
- <title><ww:text name="index.title"/></title>
+ <title><s:text name="index.title"/></title>
</head>
<body>
-<h3><ww:text name="index.heading"/></h3>
+<h3><s:text name="index.heading"/></h3>
<ul>
- <li><a href="<ww:url action="Register!input"/>"><ww:text
+ <li><a href="<s:url action="Register!input"/>"><s:text
name="index.registration"/></a></li>
- <li><a href="<ww:url action="Login!input"/>"><ww:text
+ <li><a href="<s:url action="Login!input"/>"><s:text
name="index.login"/></a></li>
</ul>
<h3>Language Options</h3>
<ul>
- <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>
+ <li><a href="<s:url action="Welcome?request_locale=en"/>">English</a></li>
+ <li><a href="<s:url action="Welcome?request_locale=ja"/>">Japanese</a></li>
+ <li><a href="<s:url action="Welcome?request_locale=ru"/>">Russian</a></li>
</ul>
</body>