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 [2/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...
Copied: struts/sandbox/trunk/mailreader-course/struts2/logout/logout.iml (from r431122, struts/sandbox/trunk/mailreader-course/struts2/logout/lab-2-3.iml)
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/logout/logout.iml?p2=struts/sandbox/trunk/mailreader-course/struts2/logout/logout.iml&p1=struts/sandbox/trunk/mailreader-course/struts2/logout/lab-2-3.iml&r1=431122&r2=431180&rev=431180&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/logout/lab-2-3.iml (original)
+++ struts/sandbox/trunk/mailreader-course/struts2/logout/logout.iml Sun Aug 13 07:28:51 2006
@@ -2,9 +2,9 @@
<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-2-3/WEB-INF/classes" />
+ <output url="file://C:/opt/Apache/Tomcat-5.5/webapps/logout/WEB-INF/classes" />
<exclude-output />
- <exploded url="file://C:/opt/Apache/Tomcat-5.0/webapps/lab-2-3" />
+ <exploded url="file://C:/opt/Apache/Tomcat-5.5/webapps/logout" />
<exclude-exploded />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
@@ -15,7 +15,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../lib/spring-core.jar!/" />
+ <root url="jar://$APPLICATION_HOME_DIR$/lib/junit.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -24,7 +24,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../lib/rife-continuations.jar!/" />
+ <root url="jar://$MODULE_DIR$/../lib/spring-core-1.2.6.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -33,7 +33,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../lib/struts-taglib-1.3.0.jar!/" />
+ <root url="jar://$MODULE_DIR$/../lib/freemarker-2.3.4.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -42,7 +42,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../lib/spring-context.jar!/" />
+ <root url="jar://$MODULE_DIR$/../lib/spring-web-1.2.6.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -51,7 +51,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../lib/oscore.jar!/" />
+ <root url="jar://$MODULE_DIR$/../lib/struts2-api-2.0.0-SNAPSHOT.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -60,7 +60,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../lib/commons-collections-3.1.jar!/" />
+ <root url="jar://$MODULE_DIR$/../lib/ognl-2.6.7.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -69,7 +69,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../lib/struts-mailreader-dao-1.3.0-dev.jar!/" />
+ <root url="jar://$MODULE_DIR$/../lib/spring-aop-1.2.6.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -78,7 +78,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../lib/webwork-2.2.2.jar!/" />
+ <root url="jar://$MODULE_DIR$/../lib/struts-mailreader-dao-1.3.5-SNAPSHOT.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -87,7 +87,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../lib/spring-beans.jar!/" />
+ <root url="jar://$MODULE_DIR$/../lib/commons-collections-2.1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -96,7 +96,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../lib/ognl.jar!/" />
+ <root url="jar://$MODULE_DIR$/../lib/struts2-extras-2.0.0-SNAPSHOT.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -105,7 +105,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../lib/commons-digester-1.6.jar!/" />
+ <root url="jar://$MODULE_DIR$/../lib/struts2-core-2.0.0-SNAPSHOT.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -114,7 +114,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../lib/spring-web.jar!/" />
+ <root url="jar://$MODULE_DIR$/../lib/commons-logging-1.0.4.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -123,7 +123,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../lib/commons-logging-1.0.4.jar!/" />
+ <root url="jar://$MODULE_DIR$/../lib/commons-digester-1.6.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -132,7 +132,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../lib/xwork-1.1.2.jar!/" />
+ <root url="jar://$MODULE_DIR$/../lib/spring-context-1.2.6.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -141,7 +141,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../lib/freemarker.jar!/" />
+ <root url="jar://$MODULE_DIR$/../lib/xwork-2.0-SNAPSHOT.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -150,7 +150,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$APPLICATION_HOME_DIR$/lib/junit.jar!/" />
+ <root url="jar://$MODULE_DIR$/../lib/spring-beans-1.2.6.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -159,16 +159,26 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://C:/opt/Apache/Tomcat-5.0/common/lib/servlet-api.jar!/" />
+ <root url="jar://$MODULE_DIR$/../lib/oscore-2.2.4.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://C:/opt/Apache/Tomcat-5.5/common/lib/servlet-api.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="library" name="Tomcat 5.5" level="application_server_libraries" />
<orderEntryProperties />
</component>
<component name="WebModuleBuildComponent">
- <setting name="EXPLODED_URL" value="file://C:/opt/Apache/Tomcat-5.0/webapps/lab-2-3" />
+ <setting name="EXPLODED_URL" value="file://C:/opt/Apache/Tomcat-5.5/webapps/logout" />
<setting name="EXPLODED_ENABLED" value="true" />
<setting name="JAR_URL" value="file://" />
<setting name="JAR_ENABLED" value="false" />
@@ -179,85 +189,81 @@
<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>
+ <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-digester-1.6.jar" />
- <url>jar://$MODULE_DIR$/../../lib/commons-digester-1.6.jar!/</url>
+ <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/commons-logging-1.0.4.jar" />
- <url>jar://$MODULE_DIR$/../../lib/commons-logging-1.0.4.jar!/</url>
+ <attribute name="URI" value="/WEB-INF/lib/freemarker-2.3.4.jar" />
+ <url>jar://$MODULE_DIR$/../lib/freemarker-2.3.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>
+ <attribute name="URI" value="/WEB-INF/lib/ognl-2.6.7.jar" />
+ <url>jar://$MODULE_DIR$/../lib/ognl-2.6.7.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>
+ <attribute name="URI" value="/WEB-INF/lib/oscore-2.2.4.jar" />
+ <url>jar://$MODULE_DIR$/../lib/oscore-2.2.4.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>
+ <attribute name="URI" value="/WEB-INF/lib/spring-aop-1.2.6.jar" />
+ <url>jar://$MODULE_DIR$/../lib/spring-aop-1.2.6.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>
+ <attribute name="URI" value="/WEB-INF/lib/spring-beans-1.2.6.jar" />
+ <url>jar://$MODULE_DIR$/../lib/spring-beans-1.2.6.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>
+ <attribute name="URI" value="/WEB-INF/lib/spring-context-1.2.6.jar" />
+ <url>jar://$MODULE_DIR$/../lib/spring-context-1.2.6.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>
+ <attribute name="URI" value="/WEB-INF/lib/spring-core-1.2.6.jar" />
+ <url>jar://$MODULE_DIR$/../lib/spring-core-1.2.6.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>
+ <attribute name="URI" value="/WEB-INF/lib/spring-web-1.2.6.jar" />
+ <url>jar://$MODULE_DIR$/../lib/spring-web-1.2.6.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>
+ <attribute name="URI" value="/WEB-INF/lib/struts-mailreader-dao-1.3.5-SNAPSHOT.jar" />
+ <url>jar://$MODULE_DIR$/../lib/struts-mailreader-dao-1.3.5-SNAPSHOT.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>
+ <attribute name="URI" value="/WEB-INF/lib/struts2-api-2.0.0-SNAPSHOT.jar" />
+ <url>jar://$MODULE_DIR$/../lib/struts2-api-2.0.0-SNAPSHOT.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>
+ <attribute name="URI" value="/WEB-INF/lib/struts2-core-2.0.0-SNAPSHOT.jar" />
+ <url>jar://$MODULE_DIR$/../lib/struts2-core-2.0.0-SNAPSHOT.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>
+ <attribute name="URI" value="/WEB-INF/lib/struts2-extras-2.0.0-SNAPSHOT.jar" />
+ <url>jar://$MODULE_DIR$/../lib/struts2-extras-2.0.0-SNAPSHOT.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>
+ <attribute name="URI" value="/WEB-INF/lib/xwork-2.0-SNAPSHOT.jar" />
+ <url>jar://$MODULE_DIR$/../lib/xwork-2.0-SNAPSHOT.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" />
<deploymentDescriptor name="" url="file://$MODULE_DIR$/META-INF/context.xml" optional="false">
<option name="DEFAULT_DIR" value="WEB-INF" />
<option name="NAME" value="" />
Modified: struts/sandbox/trunk/mailreader-course/struts2/logout/src/java/Hello.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/logout/src/java/Hello.java?rev=431180&r1=431179&r2=431180&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/logout/src/java/Hello.java (original)
+++ struts/sandbox/trunk/mailreader-course/struts2/logout/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/logout/src/java/Login.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/logout/src/java/Login.java?rev=431180&r1=431179&r2=431180&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/logout/src/java/Login.java (original)
+++ struts/sandbox/trunk/mailreader-course/struts2/logout/src/java/Login.java Sun Aug 13 07:28:51 2006
@@ -1,10 +1,10 @@
+import com.opensymphony.util.BeanUtils;
import org.apache.struts.apps.mailreader.dao.ExpiredPasswordException;
import org.apache.struts.apps.mailreader.dao.User;
-import com.opensymphony.util.BeanUtils;
public class Login extends MailReaderSupport {
- public String execute() throws ExpiredPasswordException {
+ public String save() throws ExpiredPasswordException {
User user = findUser(getUsername(), getPassword());
Modified: struts/sandbox/trunk/mailreader-course/struts2/logout/src/java/MailReaderSupport.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/logout/src/java/MailReaderSupport.java?rev=431180&r1=431179&r2=431180&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/logout/src/java/MailReaderSupport.java (original)
+++ struts/sandbox/trunk/mailreader-course/struts2/logout/src/java/MailReaderSupport.java Sun Aug 13 07:28:51 2006
@@ -1,10 +1,10 @@
import com.opensymphony.util.BeanUtils;
-import com.opensymphony.webwork.interceptor.ApplicationAware;
-import com.opensymphony.webwork.interceptor.SessionAware;
-import com.opensymphony.xwork.ActionSupport;
+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;
+import org.apache.struts2.interceptor.ApplicationAware;
+import org.apache.struts2.interceptor.SessionAware;
import java.util.Map;
Modified: struts/sandbox/trunk/mailreader-course/struts2/logout/src/java/Register.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/logout/src/java/Register.java?rev=431180&r1=431179&r2=431180&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/logout/src/java/Register.java (original)
+++ struts/sandbox/trunk/mailreader-course/struts2/logout/src/java/Register.java Sun Aug 13 07:28:51 2006
@@ -1,10 +1,8 @@
-import com.opensymphony.xwork.Action;
-import com.opensymphony.util.BeanUtils;
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/logout/src/java/resources.properties
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/logout/src/java/resources.properties?rev=431180&r1=431179&r2=431180&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/logout/src/java/resources.properties (original)
+++ struts/sandbox/trunk/mailreader-course/struts2/logout/src/java/resources.properties Sun Aug 13 07:28:51 2006
@@ -1,2 +1,2 @@
-hello.nessage = Congratulations! WebWork is up and running ...
+hello.message = Congratulations! Struts is up and running ...
# Add your messages here ...
Copied: struts/sandbox/trunk/mailreader-course/struts2/logout/src/java/struts.properties (from r431122, struts/sandbox/trunk/mailreader-course/struts2/logout/src/java/webwork.properties)
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/logout/src/java/struts.properties?p2=struts/sandbox/trunk/mailreader-course/struts2/logout/src/java/struts.properties&p1=struts/sandbox/trunk/mailreader-course/struts2/logout/src/java/webwork.properties&r1=431122&r2=431180&rev=431180&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/logout/src/java/webwork.properties (original)
+++ struts/sandbox/trunk/mailreader-course/struts2/logout/src/java/struts.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
Propchange: struts/sandbox/trunk/mailreader-course/struts2/logout/src/java/struts.properties
------------------------------------------------------------------------------
svn:eol-style = native
Copied: struts/sandbox/trunk/mailreader-course/struts2/logout/src/java/struts.xml (from r431122, struts/sandbox/trunk/mailreader-course/struts2/logout/src/java/xwork.xml)
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/logout/src/java/struts.xml?p2=struts/sandbox/trunk/mailreader-course/struts2/logout/src/java/struts.xml&p1=struts/sandbox/trunk/mailreader-course/struts2/logout/src/java/xwork.xml&r1=431122&r2=431180&rev=431180&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/logout/src/java/xwork.xml (original)
+++ struts/sandbox/trunk/mailreader-course/struts2/logout/src/java/struts.xml Sun Aug 13 07:28:51 2006
@@ -1,10 +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"/>
-
- <package name="default" extends="webwork-default">
+<struts>
+ <include file="struts-default.xml"/>
+ <package name="default" extends="struts-default">
<default-action-ref name="Missing"/>
<action name="Hello" class="Hello">
@@ -19,12 +21,19 @@
<result>/pages/Welcome.jsp</result>
</action>
- <action name="Register" class="Register">
+ <action name="Register" class="Register" method="input">
+ <result name="input">/pages/Register.jsp</result>
+ </action>
+
+ <action name="Register_save" class="Register" method="save">
<result name="input">/pages/Register.jsp</result>
- <result name="cancel" type="redirect-action">Welcome</result>
<result type="redirect-action">Menu</result>
</action>
+ <action name="Register_cancel" class="Register" method="cancel">
+ <result name="cancel" type="redirect-action">Welcome</result>
+ </action>
+
<action name="Menu" class="MailReaderSupport">
<result>/pages/Menu.jsp</result>
</action>
@@ -33,11 +42,18 @@
<result type="redirect-action">Welcome</result>
</action>
- <action name="Login" class="Login">
+ <action name="Login" class="Login" method="input">
+ <result name="input">/pages/Login.jsp</result>
+ </action>
+
+ <action name="Login_save" class="Login" method="save">
<result name="input">/pages/Login.jsp</result>
- <result name="cancel" type="redirect-action">Welcome</result>
<result type="redirect-action">Menu</result>
</action>
+ <action name="Login_cancel" class="Login" method="cancel">
+ <result name="cancel" type="redirect-action">Welcome</result>
+ </action>
+
</package>
-</xwork>
+</struts>
Propchange: struts/sandbox/trunk/mailreader-course/struts2/logout/src/java/struts.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: struts/sandbox/trunk/mailreader-course/struts2/logout/src/test/RegisterTest.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/logout/src/test/RegisterTest.java?rev=431180&r1=431179&r2=431180&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/logout/src/test/RegisterTest.java (original)
+++ struts/sandbox/trunk/mailreader-course/struts2/logout/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/logout/src/test/RetainTest.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/logout/src/test/RetainTest.java?rev=431180&r1=431179&r2=431180&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/logout/src/test/RetainTest.java (original)
+++ struts/sandbox/trunk/mailreader-course/struts2/logout/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/logout/src/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/logout/src/webapp/WEB-INF/web.xml?rev=431180&r1=431179&r2=431180&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/logout/src/webapp/WEB-INF/web.xml (original)
+++ struts/sandbox/trunk/mailreader-course/struts2/logout/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/logout/src/webapp/WEB-INF/webtest.xml
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/logout/src/webapp/WEB-INF/webtest.xml?rev=431180&r1=431179&r2=431180&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/logout/src/webapp/WEB-INF/webtest.xml (original)
+++ struts/sandbox/trunk/mailreader-course/struts2/logout/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/logout/src/webapp/index.html
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/logout/src/webapp/index.html?rev=431180&r1=431179&r2=431180&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/logout/src/webapp/index.html (original)
+++ struts/sandbox/trunk/mailreader-course/struts2/logout/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/logout/src/webapp/pages/Hello.jsp
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/logout/src/webapp/pages/Hello.jsp?rev=431180&r1=431179&r2=431180&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/logout/src/webapp/pages/Hello.jsp (original)
+++ struts/sandbox/trunk/mailreader-course/struts2/logout/src/webapp/pages/Hello.jsp Sun Aug 13 07:28:51 2006
@@ -1,5 +1,4 @@
-<%@ page contentType="text/html; charset=UTF-8" %>
-<%@ taglib prefix="ww" uri="/webwork" %>
+<%@ taglib prefix="s" uri="/tags" %>
<html>
<head>
@@ -7,6 +6,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/logout/src/webapp/pages/Login.jsp
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/logout/src/webapp/pages/Login.jsp?rev=431180&r1=431179&r2=431180&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/logout/src/webapp/pages/Login.jsp (original)
+++ struts/sandbox/trunk/mailreader-course/struts2/logout/src/webapp/pages/Login.jsp Sun Aug 13 07:28:51 2006
@@ -1,22 +1,22 @@
-<%@ taglib uri="/webwork" prefix="ww" %>
+<%@ taglib prefix="s" uri="/tags" %>
<html>
<head>
<title>MailReader - Login</title>
</head>
-<body onLoad="self.focus();document.Login.username.focus()">
+<body onLoad="self.focus();document.Login_save.username.focus()">
-<ww:actionerror/>
-<ww:form method="POST" validate="true">
- <ww:textfield label="Username" name="username"/>
+<s:actionerror/>
+<s:form action="Login_save" validate="true">
+ <s:textfield label="Username" name="username"/>
- <ww:password label="Password" name="password" showPassword="true"/>
+ <s:password label="Password" name="password" showPassword="true"/>
- <ww:submit value="Save" name="Save"/>
+ <s:submit value="Save" name="Save"/>
- <ww:submit action="Login!cancel" value="Cancel" name="Cancel"
- onclick="form.onsubmit=null"/>
-</ww:form>
+ <s:submit action="Login_cancel" value="Cancel" name="Cancel"
+ onclick="form.onsubmit=null"/>
+</s:form>
</body>
</html>
Modified: struts/sandbox/trunk/mailreader-course/struts2/logout/src/webapp/pages/Menu.jsp
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/logout/src/webapp/pages/Menu.jsp?rev=431180&r1=431179&r2=431180&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/logout/src/webapp/pages/Menu.jsp (original)
+++ struts/sandbox/trunk/mailreader-course/struts2/logout/src/webapp/pages/Menu.jsp Sun Aug 13 07:28:51 2006
@@ -1,17 +1,17 @@
-<%@ taglib uri="/webwork" prefix="ww" %>
+<%@ taglib prefix="s" uri="/tags" %>
<html>
<head>
<title>MailReader - Menu</title>
</head>
<body>
-<h3>Menu Options for <ww:property value="user.fullName"/></h3>
+<h3>Menu Options for <s:property value="user.fullName"/></h3>
<ul>
- <li><a href="<ww:url action="Register!input" />">
+ <li><a href="<s:url action="Register" />">
Edit your registration profile
</a>
</li>
- <li><a href="<ww:url action="Logout"/>">
+ <li><a href="<s:url action="Logout"/>">
Log out of MailReader application
</a>
</ul>
Modified: struts/sandbox/trunk/mailreader-course/struts2/logout/src/webapp/pages/Register.jsp
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/logout/src/webapp/pages/Register.jsp?rev=431180&r1=431179&r2=431180&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/logout/src/webapp/pages/Register.jsp (original)
+++ struts/sandbox/trunk/mailreader-course/struts2/logout/src/webapp/pages/Register.jsp Sun Aug 13 07:28:51 2006
@@ -1,32 +1,32 @@
-<%@ taglib uri="/webwork" prefix="ww" %>
+<%@ taglib prefix="s" uri="/tags" %>
<html>
<head>
<title>MailReader - Register</title>
</head>
-<body onLoad="self.focus();document.Register.username.focus()">
+<body onLoad="self.focus();document.Register_save.username.focus()">
-<ww:actionerror/>
-<ww:form method="POST" validate="true" theme="simple">
+<s:actionerror/>
+<s:form action="Register_save" validate="true">
- <ww:textfield label="Username" name="username"/>
+ <s:textfield label="Username" name="username"/>
- <ww:password label="Password" name="password"/>
+ <s:password label="Password" name="password"/>
- <ww:password label="(Repeat) Password" name="password2"/>
+ <s:password label="(Repeat) Password" 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="Save" name="Save"/>
+ <s:submit value="Save" name="Save"/>
- <ww:submit action="Register!cancel" value="Cancel" name="Cancel"
- onclick="form.onsubmit=null"/>
+ <s:submit action="Register_cancel" value="Cancel" name="Cancel"
+ onclick="form.onsubmit=null"/>
-</ww:form>
+</s:form>
</body>
Modified: struts/sandbox/trunk/mailreader-course/struts2/logout/src/webapp/pages/Welcome.jsp
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/logout/src/webapp/pages/Welcome.jsp?rev=431180&r1=431179&r2=431180&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/logout/src/webapp/pages/Welcome.jsp (original)
+++ struts/sandbox/trunk/mailreader-course/struts2/logout/src/webapp/pages/Welcome.jsp Sun Aug 13 07:28:51 2006
@@ -1,4 +1,4 @@
-<%@ taglib uri="/webwork" prefix="ww" %>
+<%@ taglib prefix="s" uri="/tags" %>
<html>
<head>
<title>MailReader</title>
@@ -8,15 +8,15 @@
<h3>MailReader Options</h3>
<ul>
- <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>
+ <li><a href="<s:url action="Register"/>">Register with MailReader</a></li>
+ <li><a href="<s:url action="Login"/>">Log into MailReader</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="<s:url action="Missing"/>">English</a></li>
+ <li><a href="<s:url action="Missing"/>">Japanese</a></li>
+ <li><a href="<s:url action="Missing"/>">Russian</a></li>
</ul>
</body>
Modified: struts/sandbox/trunk/mailreader-course/struts2/mailreader-course-struts2.ipr
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/mailreader-course-struts2.ipr?rev=431180&r1=431179&r2=431180&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/mailreader-course-struts2.ipr (original)
+++ struts/sandbox/trunk/mailreader-course/struts2/mailreader-course-struts2.ipr Sun Aug 13 07:28:51 2006
@@ -2,6 +2,13 @@
<project version="4" relativePaths="false">
<component name="AntConfiguration">
<defaultAnt bundledAnt="true" />
+ <buildFile url="file://$PROJECT_DIR$/menu/src/webapp/WEB-INF/webtest.xml">
+ <additionalClassPath />
+ <antReference projectDefault="true" />
+ <customJdkName value="" />
+ <maximumHeapSize value="128" />
+ <properties />
+ </buildFile>
</component>
<component name="CodeStyleSettingsManager">
<option name="PER_PROJECT_SETTINGS" />
@@ -179,8 +186,11 @@
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/hello/hello.iml" filepath="$PROJECT_DIR$/hello/hello.iml" />
+ <module fileurl="file://$PROJECT_DIR$/logout/logout.iml" filepath="$PROJECT_DIR$/logout/logout.iml" />
<module fileurl="file://$PROJECT_DIR$/mailreader-course-struts2.iml" filepath="$PROJECT_DIR$/mailreader-course-struts2.iml" />
+ <module fileurl="file://$PROJECT_DIR$/menu/menu.iml" filepath="$PROJECT_DIR$/menu/menu.iml" />
<module fileurl="file://$PROJECT_DIR$/register/register.iml" filepath="$PROJECT_DIR$/register/register.iml" />
+ <module fileurl="file://$PROJECT_DIR$/register2/register2.iml" filepath="$PROJECT_DIR$/register2/register2.iml" />
<module fileurl="file://$PROJECT_DIR$/retain/retain.iml" filepath="$PROJECT_DIR$/retain/retain.iml" />
<module fileurl="file://$PROJECT_DIR$/welcome/welcome.iml" filepath="$PROJECT_DIR$/welcome/welcome.iml" />
</modules>
Modified: struts/sandbox/trunk/mailreader-course/struts2/menu/menu.iml
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/menu/menu.iml?rev=431180&r1=431179&r2=431180&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/menu/menu.iml (original)
+++ struts/sandbox/trunk/mailreader-course/struts2/menu/menu.iml Sun Aug 13 07:28:51 2006
@@ -263,12 +263,12 @@
<url>jar://$MODULE_DIR$/../lib/xwork-2.0-SNAPSHOT.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" />
<deploymentDescriptor name="" url="file://$MODULE_DIR$/META-INF/context.xml" optional="false">
<option name="DEFAULT_DIR" value="WEB-INF" />
<option name="NAME" value="" />
<option name="DESCRIPTION" value="" />
</deploymentDescriptor>
- <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" />
Modified: struts/sandbox/trunk/mailreader-course/struts2/menu/src/java/struts.xml
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/menu/src/java/struts.xml?rev=431180&r1=431179&r2=431180&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/menu/src/java/struts.xml (original)
+++ struts/sandbox/trunk/mailreader-course/struts2/menu/src/java/struts.xml Sun Aug 13 07:28:51 2006
@@ -26,7 +26,7 @@
<result name="input">/pages/Register.jsp</result>
</action>
- <action name="Register/save" class="Register" method="save">
+ <action name="Register_save" class="Register" method="save">
<result name="input">/pages/Register.jsp</result>
<result type="chain">Menu</result>
</action>
Modified: struts/sandbox/trunk/mailreader-course/struts2/menu/src/webapp/pages/Register.jsp
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/menu/src/webapp/pages/Register.jsp?rev=431180&r1=431179&r2=431180&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/menu/src/webapp/pages/Register.jsp (original)
+++ struts/sandbox/trunk/mailreader-course/struts2/menu/src/webapp/pages/Register.jsp Sun Aug 13 07:28:51 2006
@@ -4,10 +4,10 @@
<title>MailReader - Register</title>
</head>
-<body onLoad="self.focus();document.Register/save.username.focus()">
+<body onLoad="self.focus();document.Register_save.username.focus()">
<s:actionerror/>
-<s:form action="Register/save" validate="true">
+<s:form action="Register_save" validate="true">
<s:textfield label="Username" name="username"/>
Modified: struts/sandbox/trunk/mailreader-course/struts2/profile/src/java/Hello.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/profile/src/java/Hello.java?rev=431180&r1=431179&r2=431180&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/profile/src/java/Hello.java (original)
+++ struts/sandbox/trunk/mailreader-course/struts2/profile/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/profile/src/java/MailReaderSupport.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/profile/src/java/MailReaderSupport.java?rev=431180&r1=431179&r2=431180&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/profile/src/java/MailReaderSupport.java (original)
+++ struts/sandbox/trunk/mailreader-course/struts2/profile/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/profile/src/java/Register.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/profile/src/java/Register.java?rev=431180&r1=431179&r2=431180&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/profile/src/java/Register.java (original)
+++ struts/sandbox/trunk/mailreader-course/struts2/profile/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/profile/src/java/resources.properties
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/profile/src/java/resources.properties?rev=431180&r1=431179&r2=431180&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/profile/src/java/resources.properties (original)
+++ struts/sandbox/trunk/mailreader-course/struts2/profile/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/profile/src/java/resources_ja.properties
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/profile/src/java/resources_ja.properties?rev=431180&r1=431179&r2=431180&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/profile/src/java/resources_ja.properties (original)
+++ struts/sandbox/trunk/mailreader-course/struts2/profile/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/profile/src/java/resources_ru.properties
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/profile/src/java/resources_ru.properties?rev=431180&r1=431179&r2=431180&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/profile/src/java/resources_ru.properties (original)
+++ struts/sandbox/trunk/mailreader-course/struts2/profile/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/profile/src/java/webwork.properties
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/profile/src/java/webwork.properties?rev=431180&r1=431179&r2=431180&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/profile/src/java/webwork.properties (original)
+++ struts/sandbox/trunk/mailreader-course/struts2/profile/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/profile/src/java/xwork.xml
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/profile/src/java/xwork.xml?rev=431180&r1=431179&r2=431180&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/profile/src/java/xwork.xml (original)
+++ struts/sandbox/trunk/mailreader-course/struts2/profile/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"/>
@@ -45,4 +48,4 @@
</action>
</package>
-</xwork>
+</struts>
Modified: struts/sandbox/trunk/mailreader-course/struts2/profile/src/test/RegisterTest.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/profile/src/test/RegisterTest.java?rev=431180&r1=431179&r2=431180&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/profile/src/test/RegisterTest.java (original)
+++ struts/sandbox/trunk/mailreader-course/struts2/profile/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/profile/src/test/RetainTest.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/profile/src/test/RetainTest.java?rev=431180&r1=431179&r2=431180&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/profile/src/test/RetainTest.java (original)
+++ struts/sandbox/trunk/mailreader-course/struts2/profile/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/profile/src/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/profile/src/webapp/WEB-INF/web.xml?rev=431180&r1=431179&r2=431180&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/profile/src/webapp/WEB-INF/web.xml (original)
+++ struts/sandbox/trunk/mailreader-course/struts2/profile/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/profile/src/webapp/WEB-INF/webtest.xml
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/profile/src/webapp/WEB-INF/webtest.xml?rev=431180&r1=431179&r2=431180&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/profile/src/webapp/WEB-INF/webtest.xml (original)
+++ struts/sandbox/trunk/mailreader-course/struts2/profile/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/profile/src/webapp/index.html
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/profile/src/webapp/index.html?rev=431180&r1=431179&r2=431180&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/profile/src/webapp/index.html (original)
+++ struts/sandbox/trunk/mailreader-course/struts2/profile/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/profile/src/webapp/pages/Hello.jsp
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/profile/src/webapp/pages/Hello.jsp?rev=431180&r1=431179&r2=431180&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/profile/src/webapp/pages/Hello.jsp (original)
+++ struts/sandbox/trunk/mailreader-course/struts2/profile/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/profile/src/webapp/pages/Login.jsp
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/profile/src/webapp/pages/Login.jsp?rev=431180&r1=431179&r2=431180&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/profile/src/webapp/pages/Login.jsp (original)
+++ struts/sandbox/trunk/mailreader-course/struts2/profile/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/profile/src/webapp/pages/Menu.jsp
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/profile/src/webapp/pages/Menu.jsp?rev=431180&r1=431179&r2=431180&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/profile/src/webapp/pages/Menu.jsp (original)
+++ struts/sandbox/trunk/mailreader-course/struts2/profile/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/profile/src/webapp/pages/Register.jsp
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/profile/src/webapp/pages/Register.jsp?rev=431180&r1=431179&r2=431180&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/profile/src/webapp/pages/Register.jsp (original)
+++ struts/sandbox/trunk/mailreader-course/struts2/profile/src/webapp/pages/Register.jsp Sun Aug 13 07:28:51 2006
@@ -1,61 +1,61 @@
<%@ 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: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: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>
</body>
</html>
Modified: struts/sandbox/trunk/mailreader-course/struts2/profile/src/webapp/pages/Welcome.jsp
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/profile/src/webapp/pages/Welcome.jsp?rev=431180&r1=431179&r2=431180&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/profile/src/webapp/pages/Welcome.jsp (original)
+++ struts/sandbox/trunk/mailreader-course/struts2/profile/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/register/src/java/struts.xml
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/register/src/java/struts.xml?rev=431180&r1=431179&r2=431180&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/register/src/java/struts.xml (original)
+++ struts/sandbox/trunk/mailreader-course/struts2/register/src/java/struts.xml Sun Aug 13 07:28:51 2006
@@ -26,7 +26,7 @@
<result name="input">/pages/Register.jsp</result>
</action>
- <action name="Register/save" class="Register" method="save">
+ <action name="Register_save" class="Register" method="save">
<result name="input">/pages/Register.jsp</result>
<result>/pages/Missing.jsp</result>
</action>
Modified: struts/sandbox/trunk/mailreader-course/struts2/register/src/test/RegisterTest.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/register/src/test/RegisterTest.java?rev=431180&r1=431179&r2=431180&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/register/src/test/RegisterTest.java (original)
+++ struts/sandbox/trunk/mailreader-course/struts2/register/src/test/RegisterTest.java Sun Aug 13 07:28:51 2006
@@ -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/register/src/test/RetainTest.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/register/src/test/RetainTest.java?rev=431180&r1=431179&r2=431180&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/register/src/test/RetainTest.java (original)
+++ struts/sandbox/trunk/mailreader-course/struts2/register/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/register/src/webapp/pages/Hello.jsp
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/register/src/webapp/pages/Hello.jsp?rev=431180&r1=431179&r2=431180&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/register/src/webapp/pages/Hello.jsp (original)
+++ struts/sandbox/trunk/mailreader-course/struts2/register/src/webapp/pages/Hello.jsp Sun Aug 13 07:28:51 2006
@@ -5,6 +5,6 @@
</head>
<body>
-<h2><ww:text name="hello.message"/></h2>
+<h2><s:text name="hello.message"/></h2>
</body>
</html>
Modified: struts/sandbox/trunk/mailreader-course/struts2/register/src/webapp/pages/Register.jsp
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/register/src/webapp/pages/Register.jsp?rev=431180&r1=431179&r2=431180&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/register/src/webapp/pages/Register.jsp (original)
+++ struts/sandbox/trunk/mailreader-course/struts2/register/src/webapp/pages/Register.jsp Sun Aug 13 07:28:51 2006
@@ -4,10 +4,10 @@
<title>MailReader - Register</title>
</head>
-<body onLoad="self.focus();document.Register/save.username.focus()">
+<body onLoad="self.focus();document.Register_save.username.focus()">
<s:actionerror/>
-<s:form action="Register/save">
+<s:form action="Register_save">
<s:textfield label="Username" name="username"/>
Modified: struts/sandbox/trunk/mailreader-course/struts2/register2/register2.iml
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/register2/register2.iml?rev=431180&r1=431179&r2=431180&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/register2/register2.iml (original)
+++ struts/sandbox/trunk/mailreader-course/struts2/register2/register2.iml Sun Aug 13 07:28:51 2006
@@ -273,12 +273,12 @@
<url>jar://$MODULE_DIR$/../lib/xwork-2.0-SNAPSHOT.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" />
<deploymentDescriptor name="" url="file://$MODULE_DIR$/META-INF/context.xml" optional="false">
<option name="DEFAULT_DIR" value="WEB-INF" />
<option name="NAME" value="" />
<option name="DESCRIPTION" value="" />
</deploymentDescriptor>
- <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" />
Modified: struts/sandbox/trunk/mailreader-course/struts2/register2/src/java/struts.xml
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/register2/src/java/struts.xml?rev=431180&r1=431179&r2=431180&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/register2/src/java/struts.xml (original)
+++ struts/sandbox/trunk/mailreader-course/struts2/register2/src/java/struts.xml Sun Aug 13 07:28:51 2006
@@ -26,7 +26,7 @@
<result name="input">/pages/Register.jsp</result>
</action>
- <action name="Register/save" class="Register" method="save">
+ <action name="Register_save" class="Register" method="save">
<result name="input">/pages/Register.jsp</result>
<result>/pages/Missing.jsp</result>
</action>
Modified: struts/sandbox/trunk/mailreader-course/struts2/register2/src/test/RegisterTest.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/register2/src/test/RegisterTest.java?rev=431180&r1=431179&r2=431180&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/register2/src/test/RegisterTest.java (original)
+++ struts/sandbox/trunk/mailreader-course/struts2/register2/src/test/RegisterTest.java Sun Aug 13 07:28:51 2006
@@ -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/register2/src/test/RetainTest.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/register2/src/test/RetainTest.java?rev=431180&r1=431179&r2=431180&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/register2/src/test/RetainTest.java (original)
+++ struts/sandbox/trunk/mailreader-course/struts2/register2/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/register2/src/webapp/pages/Hello.jsp
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/register2/src/webapp/pages/Hello.jsp?rev=431180&r1=431179&r2=431180&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/register2/src/webapp/pages/Hello.jsp (original)
+++ struts/sandbox/trunk/mailreader-course/struts2/register2/src/webapp/pages/Hello.jsp Sun Aug 13 07:28:51 2006
@@ -5,6 +5,6 @@
</head>
<body>
-<h2><ww:text name="hello.message"/></h2>
+<h2><s:text name="hello.message"/></h2>
</body>
</html>
Modified: struts/sandbox/trunk/mailreader-course/struts2/register2/src/webapp/pages/Register.jsp
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/register2/src/webapp/pages/Register.jsp?rev=431180&r1=431179&r2=431180&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/register2/src/webapp/pages/Register.jsp (original)
+++ struts/sandbox/trunk/mailreader-course/struts2/register2/src/webapp/pages/Register.jsp Sun Aug 13 07:28:51 2006
@@ -4,9 +4,9 @@
<title>MailReader - Register</title>
</head>
-<body onLoad="self.focus();document.Register/save.username.focus()">
+<body onLoad="self.focus();document.Register_save.username.focus()">
<s:actionerror/>
-<s:form action="Register/save">
+<s:form action="Register_save">
<s:textfield label="Username" name="username"/>
Modified: struts/sandbox/trunk/mailreader-course/struts2/retain/src/test/RetainTest.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/retain/src/test/RetainTest.java?rev=431180&r1=431179&r2=431180&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/retain/src/test/RetainTest.java (original)
+++ struts/sandbox/trunk/mailreader-course/struts2/retain/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/subscribe/src/java/Hello.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/subscribe/src/java/Hello.java?rev=431180&r1=431179&r2=431180&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/subscribe/src/java/Hello.java (original)
+++ struts/sandbox/trunk/mailreader-course/struts2/subscribe/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/subscribe/src/java/MailReaderSupport.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/subscribe/src/java/MailReaderSupport.java?rev=431180&r1=431179&r2=431180&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/subscribe/src/java/MailReaderSupport.java (original)
+++ struts/sandbox/trunk/mailreader-course/struts2/subscribe/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/subscribe/src/java/Register.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/subscribe/src/java/Register.java?rev=431180&r1=431179&r2=431180&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/subscribe/src/java/Register.java (original)
+++ struts/sandbox/trunk/mailreader-course/struts2/subscribe/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/subscribe/src/java/Subscribe.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/subscribe/src/java/Subscribe.java?rev=431180&r1=431179&r2=431180&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/subscribe/src/java/Subscribe.java (original)
+++ struts/sandbox/trunk/mailreader-course/struts2/subscribe/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/subscribe/src/java/resources.properties
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/subscribe/src/java/resources.properties?rev=431180&r1=431179&r2=431180&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/subscribe/src/java/resources.properties (original)
+++ struts/sandbox/trunk/mailreader-course/struts2/subscribe/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/subscribe/src/java/resources_ja.properties
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/subscribe/src/java/resources_ja.properties?rev=431180&r1=431179&r2=431180&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/subscribe/src/java/resources_ja.properties (original)
+++ struts/sandbox/trunk/mailreader-course/struts2/subscribe/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/subscribe/src/java/resources_ru.properties
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/subscribe/src/java/resources_ru.properties?rev=431180&r1=431179&r2=431180&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/subscribe/src/java/resources_ru.properties (original)
+++ struts/sandbox/trunk/mailreader-course/struts2/subscribe/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