Author: husted
Date: Sun Aug 13 06:34:43 2006
New Revision: 431175
URL: http://svn.apache.org/viewvc?rev=431175&view=rev
Log:
Update "menu" lab for Struts 2.
Added:
struts/sandbox/trunk/mailreader-course/struts2/menu/menu.iml
- copied, changed from r431122,
struts/sandbox/trunk/mailreader-course/struts2/menu/lab-2-2.iml
struts/sandbox/trunk/mailreader-course/struts2/menu/src/java/struts.properties
(contents, props changed)
- copied, changed from r431122,
struts/sandbox/trunk/mailreader-course/struts2/menu/src/java/webwork.properties
struts/sandbox/trunk/mailreader-course/struts2/menu/src/java/struts.xml
(contents, props changed)
- copied, changed from r431122,
struts/sandbox/trunk/mailreader-course/struts2/menu/src/java/xwork.xml
Removed:
struts/sandbox/trunk/mailreader-course/struts2/menu/lab-2-2.iml
struts/sandbox/trunk/mailreader-course/struts2/menu/src/java/webwork.properties
struts/sandbox/trunk/mailreader-course/struts2/menu/src/java/xwork.xml
Modified:
struts/sandbox/trunk/mailreader-course/struts2/menu/src/java/Hello.java
struts/sandbox/trunk/mailreader-course/struts2/menu/src/java/MailReaderSupport.java
struts/sandbox/trunk/mailreader-course/struts2/menu/src/java/Register.java
struts/sandbox/trunk/mailreader-course/struts2/menu/src/java/resources.properties
struts/sandbox/trunk/mailreader-course/struts2/menu/src/test/RegisterTest.java
struts/sandbox/trunk/mailreader-course/struts2/menu/src/test/RetainTest.java
struts/sandbox/trunk/mailreader-course/struts2/menu/src/webapp/WEB-INF/entities/welcome-open.xml
struts/sandbox/trunk/mailreader-course/struts2/menu/src/webapp/WEB-INF/web.xml
struts/sandbox/trunk/mailreader-course/struts2/menu/src/webapp/WEB-INF/webtest-start.xml
struts/sandbox/trunk/mailreader-course/struts2/menu/src/webapp/WEB-INF/webtest.properties.sample
struts/sandbox/trunk/mailreader-course/struts2/menu/src/webapp/WEB-INF/webtest.xml
struts/sandbox/trunk/mailreader-course/struts2/menu/src/webapp/index.html
struts/sandbox/trunk/mailreader-course/struts2/menu/src/webapp/pages/Hello.jsp
struts/sandbox/trunk/mailreader-course/struts2/menu/src/webapp/pages/Menu.jsp
struts/sandbox/trunk/mailreader-course/struts2/menu/src/webapp/pages/Register.jsp
struts/sandbox/trunk/mailreader-course/struts2/menu/src/webapp/pages/Welcome.jsp
Copied: struts/sandbox/trunk/mailreader-course/struts2/menu/menu.iml (from
r431122, struts/sandbox/trunk/mailreader-course/struts2/menu/lab-2-2.iml)
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/menu/menu.iml?p2=struts/sandbox/trunk/mailreader-course/struts2/menu/menu.iml&p1=struts/sandbox/trunk/mailreader-course/struts2/menu/lab-2-2.iml&r1=431122&r2=431175&rev=431175&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/menu/lab-2-2.iml (original)
+++ struts/sandbox/trunk/mailreader-course/struts2/menu/menu.iml Sun Aug 13
06:34:43 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-2/WEB-INF/classes" />
+ <output url="file://C:/opt/Apache/Tomcat-5.5/webapps/menu/WEB-INF/classes"
/>
<exclude-output />
- <exploded url="file://C:/opt/Apache/Tomcat-5.0/webapps/lab-2-2" />
+ <exploded url="file://C:/opt/Apache/Tomcat-5.5/webapps/menu" />
<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-web.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/oscore.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-mailreader-dao-1.3.0-dev.jar!/" />
+ <root url="jar://$MODULE_DIR$/../lib/spring-web-1.2.6.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/freemarker-2.3.4.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -51,7 +51,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../lib/spring-core.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/webwork-2.2.2.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/xwork-1.1.2.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/freemarker.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/commons-digester-1.6.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/rife-continuations.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-collections-3.1.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-beans.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/ognl.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/commons-logging-1.0.4.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/struts-taglib-1.3.0.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-2" />
+ <setting name="EXPLODED_URL"
value="file://C:/opt/Apache/Tomcat-5.5/webapps/menu" />
<setting name="EXPLODED_ENABLED" value="true" />
<setting name="JAR_URL" value="file://" />
<setting name="JAR_ENABLED" value="false" />
@@ -179,83 +189,78 @@
<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=""
url="file://$MODULE_DIR$/META-INF/context.xml" optional="false">
@@ -263,6 +268,7 @@
<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/Hello.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/menu/src/java/Hello.java?rev=431175&r1=431174&r2=431175&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/menu/src/java/Hello.java
(original)
+++ struts/sandbox/trunk/mailreader-course/struts2/menu/src/java/Hello.java Sun
Aug 13 06:34:43 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/menu/src/java/MailReaderSupport.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/menu/src/java/MailReaderSupport.java?rev=431175&r1=431174&r2=431175&view=diff
==============================================================================
---
struts/sandbox/trunk/mailreader-course/struts2/menu/src/java/MailReaderSupport.java
(original)
+++
struts/sandbox/trunk/mailreader-course/struts2/menu/src/java/MailReaderSupport.java
Sun Aug 13 06:34:43 2006
@@ -1,9 +1,9 @@
import com.opensymphony.util.BeanUtils;
-import com.opensymphony.webwork.interceptor.ApplicationAware;
-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 java.util.Map;
Modified:
struts/sandbox/trunk/mailreader-course/struts2/menu/src/java/Register.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/menu/src/java/Register.java?rev=431175&r1=431174&r2=431175&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/menu/src/java/Register.java
(original)
+++ struts/sandbox/trunk/mailreader-course/struts2/menu/src/java/Register.java
Sun Aug 13 06:34:43 2006
@@ -1,9 +1,8 @@
-import com.opensymphony.xwork.Action;
import org.apache.struts.apps.mailreader.dao.User;
public class Register extends MailReaderSupport {
- public String execute()
+ public String save()
throws Exception {
User user = findUser(getUsername(), getPassword());
Modified:
struts/sandbox/trunk/mailreader-course/struts2/menu/src/java/resources.properties
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/menu/src/java/resources.properties?rev=431175&r1=431174&r2=431175&view=diff
==============================================================================
---
struts/sandbox/trunk/mailreader-course/struts2/menu/src/java/resources.properties
(original)
+++
struts/sandbox/trunk/mailreader-course/struts2/menu/src/java/resources.properties
Sun Aug 13 06:34:43 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/menu/src/java/struts.properties
(from r431122,
struts/sandbox/trunk/mailreader-course/struts2/menu/src/java/webwork.properties)
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/menu/src/java/struts.properties?p2=struts/sandbox/trunk/mailreader-course/struts2/menu/src/java/struts.properties&p1=struts/sandbox/trunk/mailreader-course/struts2/menu/src/java/webwork.properties&r1=431122&r2=431175&rev=431175&view=diff
==============================================================================
---
struts/sandbox/trunk/mailreader-course/struts2/menu/src/java/webwork.properties
(original)
+++
struts/sandbox/trunk/mailreader-course/struts2/menu/src/java/struts.properties
Sun Aug 13 06:34:43 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/menu/src/java/struts.properties
------------------------------------------------------------------------------
svn:eol-style = native
Copied: struts/sandbox/trunk/mailreader-course/struts2/menu/src/java/struts.xml
(from r431122,
struts/sandbox/trunk/mailreader-course/struts2/menu/src/java/xwork.xml)
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/menu/src/java/struts.xml?p2=struts/sandbox/trunk/mailreader-course/struts2/menu/src/java/struts.xml&p1=struts/sandbox/trunk/mailreader-course/struts2/menu/src/java/xwork.xml&r1=431122&r2=431175&rev=431175&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/menu/src/java/xwork.xml
(original)
+++ struts/sandbox/trunk/mailreader-course/struts2/menu/src/java/struts.xml Sun
Aug 13 06:34:43 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"/>
@@ -19,7 +22,11 @@
<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 type="chain">Menu</result>
</action>
@@ -29,4 +36,4 @@
</action>
</package>
-</xwork>
+</struts>
Propchange:
struts/sandbox/trunk/mailreader-course/struts2/menu/src/java/struts.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
struts/sandbox/trunk/mailreader-course/struts2/menu/src/test/RegisterTest.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/menu/src/test/RegisterTest.java?rev=431175&r1=431174&r2=431175&view=diff
==============================================================================
---
struts/sandbox/trunk/mailreader-course/struts2/menu/src/test/RegisterTest.java
(original)
+++
struts/sandbox/trunk/mailreader-course/struts2/menu/src/test/RegisterTest.java
Sun Aug 13 06:34:43 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("[EMAIL PROTECTED]");
- 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/menu/src/test/RetainTest.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/menu/src/test/RetainTest.java?rev=431175&r1=431174&r2=431175&view=diff
==============================================================================
---
struts/sandbox/trunk/mailreader-course/struts2/menu/src/test/RetainTest.java
(original)
+++
struts/sandbox/trunk/mailreader-course/struts2/menu/src/test/RetainTest.java
Sun Aug 13 06:34:43 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/menu/src/webapp/WEB-INF/entities/welcome-open.xml
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/menu/src/webapp/WEB-INF/entities/welcome-open.xml?rev=431175&r1=431174&r2=431175&view=diff
==============================================================================
---
struts/sandbox/trunk/mailreader-course/struts2/menu/src/webapp/WEB-INF/entities/welcome-open.xml
(original)
+++
struts/sandbox/trunk/mailreader-course/struts2/menu/src/webapp/WEB-INF/entities/welcome-open.xml
Sun Aug 13 06:34:43 2006
@@ -1,6 +1,6 @@
<invoke
description="Open welcome action"
- url="Welcome.do"/>
+ url="Welcome.action"/>
<verifyTitle
description="Welcome page title"
text="MailReader"/>
Modified:
struts/sandbox/trunk/mailreader-course/struts2/menu/src/webapp/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/menu/src/webapp/WEB-INF/web.xml?rev=431175&r1=431174&r2=431175&view=diff
==============================================================================
---
struts/sandbox/trunk/mailreader-course/struts2/menu/src/webapp/WEB-INF/web.xml
(original)
+++
struts/sandbox/trunk/mailreader-course/struts2/menu/src/webapp/WEB-INF/web.xml
Sun Aug 13 06:34:43 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/menu/src/webapp/WEB-INF/webtest-start.xml
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/menu/src/webapp/WEB-INF/webtest-start.xml?rev=431175&r1=431174&r2=431175&view=diff
==============================================================================
---
struts/sandbox/trunk/mailreader-course/struts2/menu/src/webapp/WEB-INF/webtest-start.xml
(original)
+++
struts/sandbox/trunk/mailreader-course/struts2/menu/src/webapp/WEB-INF/webtest-start.xml
Sun Aug 13 06:34:43 2006
@@ -15,7 +15,7 @@
]>
<project name="MailReader Training Course - Exercise navigation and database
logic
-- Canoo WebTests" basedir="." >
+- Canoo WebTests" basedir=".">
<!--
Canoo WebTest configuration file to test navigating between pages and
@@ -65,7 +65,7 @@
value="8080"/>
<property name="basepath"
- value="lab-2-2"/>
+ value="menu"/>
<property name="mailreader.home"
location="../../../"/>
Modified:
struts/sandbox/trunk/mailreader-course/struts2/menu/src/webapp/WEB-INF/webtest.properties.sample
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/menu/src/webapp/WEB-INF/webtest.properties.sample?rev=431175&r1=431174&r2=431175&view=diff
==============================================================================
---
struts/sandbox/trunk/mailreader-course/struts2/menu/src/webapp/WEB-INF/webtest.properties.sample
(original)
+++
struts/sandbox/trunk/mailreader-course/struts2/menu/src/webapp/WEB-INF/webtest.properties.sample
Sun Aug 13 06:34:43 2006
@@ -9,7 +9,7 @@
webtest.home = /opt/Canoo/webtest-1.7
host = localhost
port = 8080
-basepath = lab-2-2
+basepath = menu
webapps.home = /opt/Apache/Tomcat-5.5/webapps/
resource.home =
${webapps.home}/${basepath}/WEB-INF/classes/resources.properties"
# mailreader.home =
Modified:
struts/sandbox/trunk/mailreader-course/struts2/menu/src/webapp/WEB-INF/webtest.xml
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/menu/src/webapp/WEB-INF/webtest.xml?rev=431175&r1=431174&r2=431175&view=diff
==============================================================================
---
struts/sandbox/trunk/mailreader-course/struts2/menu/src/webapp/WEB-INF/webtest.xml
(original)
+++
struts/sandbox/trunk/mailreader-course/struts2/menu/src/webapp/WEB-INF/webtest.xml
Sun Aug 13 06:34:43 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 -->
@@ -70,7 +70,7 @@
value="8080"/>
<property name="basepath"
- value="lab-2-2"/>
+ value="menu"/>
<property name="mailreader.home"
location="../../../"/>
@@ -107,31 +107,32 @@
<webtest name="Register Trillian (MSS)">
&config;
<steps>
+ &welcome-open;
®ister-open;
<setInputField
- description="username"
- name="username"
- value="trillian"/>
+ description="username"
+ name="username"
+ value="trillian"/>
<setInputField
- description="password"
- name="password"
- value="astra"/>
+ description="password"
+ name="password"
+ value="astra"/>
<setInputField
- description="password2"
- name="password2"
- value="astra"/>
+ description="password2"
+ name="password2"
+ value="astra"/>
<setInputField
- description="fullName"
- name="fullName"
- value="Tricia McMillian"/>
+ description="fullName"
+ name="fullName"
+ value="Tricia McMillian"/>
<setInputField
- description="fromAddress"
- name="fromAddress"
- value="[EMAIL PROTECTED]"/>
+ description="fromAddress"
+ name="fromAddress"
+ value="[EMAIL PROTECTED]"/>
&save-click;
<verifyTitle
- description="Menu page title"
- text="MailReader - Menu"/>
+ description="Menu page title"
+ text="MailReader - Menu"/>
</steps>
</webtest>
Modified:
struts/sandbox/trunk/mailreader-course/struts2/menu/src/webapp/index.html
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/menu/src/webapp/index.html?rev=431175&r1=431174&r2=431175&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/menu/src/webapp/index.html
(original)
+++ struts/sandbox/trunk/mailreader-course/struts2/menu/src/webapp/index.html
Sun Aug 13 06:34:43 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/menu/src/webapp/pages/Hello.jsp
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/menu/src/webapp/pages/Hello.jsp?rev=431175&r1=431174&r2=431175&view=diff
==============================================================================
---
struts/sandbox/trunk/mailreader-course/struts2/menu/src/webapp/pages/Hello.jsp
(original)
+++
struts/sandbox/trunk/mailreader-course/struts2/menu/src/webapp/pages/Hello.jsp
Sun Aug 13 06:34:43 2006
@@ -1,12 +1,10 @@
-<%@ page contentType="text/html; charset=UTF-8" %>
-<%@ taglib prefix="ww" uri="/webwork" %>
-
+<%@ taglib prefix="s" uri="/tags" %>
<html>
<head>
<title>Hello</title>
</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/menu/src/webapp/pages/Menu.jsp
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/menu/src/webapp/pages/Menu.jsp?rev=431175&r1=431174&r2=431175&view=diff
==============================================================================
---
struts/sandbox/trunk/mailreader-course/struts2/menu/src/webapp/pages/Menu.jsp
(original)
+++
struts/sandbox/trunk/mailreader-course/struts2/menu/src/webapp/pages/Menu.jsp
Sun Aug 13 06:34:43 2006
@@ -1,17 +1,17 @@
-<%@ taglib uri="/webwork" prefix="ww" %>
+<%@ taglib prefix="s" uri="/tags" %>
<html>
<head>
<title>MailReader - Menu</title>
</head>
<body>
-<h3>Main Menu Options for <ww:property value="fullName"/></h3>
+<h3>Main Menu Options for <s:property value="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/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=431175&r1=431174&r2=431175&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 06:34:43 2006
@@ -1,29 +1,29 @@
-<%@ 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">
+<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:form>
+</s:form>
</body>
Modified:
struts/sandbox/trunk/mailreader-course/struts2/menu/src/webapp/pages/Welcome.jsp
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/menu/src/webapp/pages/Welcome.jsp?rev=431175&r1=431174&r2=431175&view=diff
==============================================================================
---
struts/sandbox/trunk/mailreader-course/struts2/menu/src/webapp/pages/Welcome.jsp
(original)
+++
struts/sandbox/trunk/mailreader-course/struts2/menu/src/webapp/pages/Welcome.jsp
Sun Aug 13 06:34:43 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="Missing"/>">Log into MailReader</a></li>
+ <li><a href="<s:url action="Register"/>">Register with MailReader</a></li>
+ <li><a href="<s:url action="Missing"/>">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>
