Author: husted
Date: Tue Jul 18 12:16:27 2006
New Revision: 423203
URL: http://svn.apache.org/viewvc?rev=423203&view=rev
Log:
WW-1349 Mailreader: First round of code updates.
Removed:
struts/sandbox/trunk/action2/apps/mailreader/src/main/java/webwork.properties
struts/sandbox/trunk/action2/apps/mailreader/src/main/java/xwork.xml
Modified:
struts/sandbox/trunk/action2/apps/mailreader/src/main/java/mailreader2/MailreaderSupport.java
struts/sandbox/trunk/action2/apps/mailreader/src/main/java/resources.properties
struts/sandbox/trunk/action2/apps/mailreader/src/main/java/resources_ja.properties
struts/sandbox/trunk/action2/apps/mailreader/src/main/java/resources_ru.properties
struts/sandbox/trunk/action2/apps/mailreader/src/main/java/struts.properties
struts/sandbox/trunk/action2/apps/mailreader/src/main/webapp/WEB-INF/web.xml
Modified:
struts/sandbox/trunk/action2/apps/mailreader/src/main/java/mailreader2/MailreaderSupport.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/action2/apps/mailreader/src/main/java/mailreader2/MailreaderSupport.java?rev=423203&r1=423202&r2=423203&view=diff
==============================================================================
---
struts/sandbox/trunk/action2/apps/mailreader/src/main/java/mailreader2/MailreaderSupport.java
(original)
+++
struts/sandbox/trunk/action2/apps/mailreader/src/main/java/mailreader2/MailreaderSupport.java
Tue Jul 18 12:16:27 2006
@@ -19,8 +19,8 @@
package mailreader2;
import com.opensymphony.util.BeanUtils;
-import com.opensymphony.webwork.interceptor.ApplicationAware;
-import com.opensymphony.webwork.interceptor.SessionAware;
+import org.apache.struts2.interceptor.ApplicationAware;
+import org.apache.struts2.interceptor.SessionAware;
import com.opensymphony.xwork.ActionSupport;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Modified:
struts/sandbox/trunk/action2/apps/mailreader/src/main/java/resources.properties
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/action2/apps/mailreader/src/main/java/resources.properties?rev=423203&r1=423202&r2=423203&view=diff
==============================================================================
---
struts/sandbox/trunk/action2/apps/mailreader/src/main/java/resources.properties
(original)
+++
struts/sandbox/trunk/action2/apps/mailreader/src/main/java/resources.properties
Tue Jul 18 12:16:27 2006
@@ -21,7 +21,7 @@
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
+struts.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
Modified:
struts/sandbox/trunk/action2/apps/mailreader/src/main/java/resources_ja.properties
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/action2/apps/mailreader/src/main/java/resources_ja.properties?rev=423203&r1=423202&r2=423203&view=diff
==============================================================================
---
struts/sandbox/trunk/action2/apps/mailreader/src/main/java/resources_ja.properties
(original)
+++
struts/sandbox/trunk/action2/apps/mailreader/src/main/java/resources_ja.properties
Tue Jul 18 12:16:27 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/action2/apps/mailreader/src/main/java/resources_ru.properties
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/action2/apps/mailreader/src/main/java/resources_ru.properties?rev=423203&r1=423202&r2=423203&view=diff
==============================================================================
---
struts/sandbox/trunk/action2/apps/mailreader/src/main/java/resources_ru.properties
(original)
+++
struts/sandbox/trunk/action2/apps/mailreader/src/main/java/resources_ru.properties
Tue Jul 18 12:16:27 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/action2/apps/mailreader/src/main/java/struts.properties
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/action2/apps/mailreader/src/main/java/struts.properties?rev=423203&r1=423202&r2=423203&view=diff
==============================================================================
---
struts/sandbox/trunk/action2/apps/mailreader/src/main/java/struts.properties
(original)
+++
struts/sandbox/trunk/action2/apps/mailreader/src/main/java/struts.properties
Tue Jul 18 12:16:27 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 = do
+struts.custom.i18n.resources = resources
Modified:
struts/sandbox/trunk/action2/apps/mailreader/src/main/webapp/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/action2/apps/mailreader/src/main/webapp/WEB-INF/web.xml?rev=423203&r1=423202&r2=423203&view=diff
==============================================================================
---
struts/sandbox/trunk/action2/apps/mailreader/src/main/webapp/WEB-INF/web.xml
(original)
+++
struts/sandbox/trunk/action2/apps/mailreader/src/main/webapp/WEB-INF/web.xml
Tue Jul 18 12:16:27 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>Action2 Mailreader</display-name>
+ <display-name>Struts 2 Mailreader</display-name>
<context-param>
<param-name>contextConfigLocation</param-name>
@@ -10,14 +10,14 @@
</context-param>
<filter>
- <filter-name>Action2</filter-name>
+ <filter-name>Struts2</filter-name>
<filter-class>
- com.opensymphony.webwork.dispatcher.FilterDispatcher
+ org.apache.struts2.dispatcher.FilterDispatcher
</filter-class>
</filter>
<filter-mapping>
- <filter-name>Action2</filter-name>
+ <filter-name>Struts2</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>
