Author: husted
Date: Sun Aug 13 12:05:50 2006
New Revision: 431206
URL: http://svn.apache.org/viewvc?rev=431206&view=rev
Log:
Update "browse" lab for Struts 2.
Added:
struts/sandbox/trunk/mailreader-course/struts2/browse/browse.iml
- copied, changed from r431122,
struts/sandbox/trunk/mailreader-course/struts2/browse/lab-4-1.iml
struts/sandbox/trunk/mailreader-course/struts2/browse/src/java/RegisterCreate-validation.xml
(contents, props changed)
- copied, changed from r431122,
struts/sandbox/trunk/mailreader-course/struts2/browse/src/java/RegisterSave-validation.xml
struts/sandbox/trunk/mailreader-course/struts2/browse/src/java/RegisterCreate.java
(contents, props changed)
- copied, changed from r431122,
struts/sandbox/trunk/mailreader-course/struts2/browse/src/java/RegisterSave.java
struts/sandbox/trunk/mailreader-course/struts2/browse/src/java/struts.properties
(contents, props changed)
- copied, changed from r431180,
struts/sandbox/trunk/mailreader-course/struts2/browse/src/java/webwork.properties
struts/sandbox/trunk/mailreader-course/struts2/browse/src/java/struts.xml
(contents, props changed)
- copied, changed from r431180,
struts/sandbox/trunk/mailreader-course/struts2/browse/src/java/xwork.xml
Removed:
struts/sandbox/trunk/mailreader-course/struts2/browse/lab-4-1.iml
struts/sandbox/trunk/mailreader-course/struts2/browse/src/java/RegisterSave-validation.xml
struts/sandbox/trunk/mailreader-course/struts2/browse/src/java/RegisterSave.java
struts/sandbox/trunk/mailreader-course/struts2/browse/src/java/webwork.properties
struts/sandbox/trunk/mailreader-course/struts2/browse/src/java/xwork.xml
Modified:
struts/sandbox/trunk/mailreader-course/struts2/browse/src/java/Login.java
struts/sandbox/trunk/mailreader-course/struts2/browse/src/java/Subscribe.java
struts/sandbox/trunk/mailreader-course/struts2/browse/src/java/SubscribeSave.java
struts/sandbox/trunk/mailreader-course/struts2/browse/src/test/RegisterTest.java
struts/sandbox/trunk/mailreader-course/struts2/browse/src/webapp/pages/Login.jsp
struts/sandbox/trunk/mailreader-course/struts2/browse/src/webapp/pages/Menu.jsp
struts/sandbox/trunk/mailreader-course/struts2/browse/src/webapp/pages/Register.jsp
struts/sandbox/trunk/mailreader-course/struts2/browse/src/webapp/pages/Subscribe.jsp
struts/sandbox/trunk/mailreader-course/struts2/browse/src/webapp/pages/Welcome.jsp
Copied: struts/sandbox/trunk/mailreader-course/struts2/browse/browse.iml (from
r431122, struts/sandbox/trunk/mailreader-course/struts2/browse/lab-4-1.iml)
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/browse/browse.iml?p2=struts/sandbox/trunk/mailreader-course/struts2/browse/browse.iml&p1=struts/sandbox/trunk/mailreader-course/struts2/browse/lab-4-1.iml&r1=431122&r2=431206&rev=431206&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/browse/lab-4-1.iml (original)
+++ struts/sandbox/trunk/mailreader-course/struts2/browse/browse.iml Sun Aug 13
12:05:50 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-4-1/WEB-INF/classes" />
+ <output
url="file://C:/opt/Apache/Tomcat-5.5/webapps/browse/WEB-INF/classes" />
<exclude-output />
- <exploded url="file://C:/opt/Apache/Tomcat-5.0/webapps/lab-4-1" />
+ <exploded url="file://C:/opt/Apache/Tomcat-5.5/webapps/browse" />
<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/freemarker.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/struts-mailreader-dao-1.3.0-dev.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/rife-continuations.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/struts-taglib-1.3.0.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/spring-context.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/ognl.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/commons-collections-3.1.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-web.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/spring-beans.jar!/" />
+ <root
url="jar://$MODULE_DIR$/../lib/struts2-core-2.0.0-SNAPSHOT.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -105,7 +105,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../lib/spring-core.jar!/" />
+ <root
url="jar://$MODULE_DIR$/../lib/struts2-extras-2.0.0-SNAPSHOT.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -114,7 +114,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../lib/oscore.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/webwork-2.2.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/commons-digester-1.6.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-4-1" />
+ <setting name="EXPLODED_URL"
value="file://C:/opt/Apache/Tomcat-5.5/webapps/browse" />
<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/browse/src/java/Login.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/browse/src/java/Login.java?rev=431206&r1=431205&r2=431206&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/browse/src/java/Login.java
(original)
+++ struts/sandbox/trunk/mailreader-course/struts2/browse/src/java/Login.java
Sun Aug 13 12:05:50 2006
@@ -3,7 +3,7 @@
public class Login extends MailReaderSupport {
- public String execute() throws ExpiredPasswordException {
+ public String save() throws ExpiredPasswordException {
User user = findUser(getUsername(), getPassword());
Copied:
struts/sandbox/trunk/mailreader-course/struts2/browse/src/java/RegisterCreate-validation.xml
(from r431122,
struts/sandbox/trunk/mailreader-course/struts2/browse/src/java/RegisterSave-validation.xml)
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/browse/src/java/RegisterCreate-validation.xml?p2=struts/sandbox/trunk/mailreader-course/struts2/browse/src/java/RegisterCreate-validation.xml&p1=struts/sandbox/trunk/mailreader-course/struts2/browse/src/java/RegisterSave-validation.xml&r1=431122&r2=431206&rev=431206&view=diff
==============================================================================
(empty)
Propchange:
struts/sandbox/trunk/mailreader-course/struts2/browse/src/java/RegisterCreate-validation.xml
------------------------------------------------------------------------------
svn:eol-style = native
Copied:
struts/sandbox/trunk/mailreader-course/struts2/browse/src/java/RegisterCreate.java
(from r431122,
struts/sandbox/trunk/mailreader-course/struts2/browse/src/java/RegisterSave.java)
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/browse/src/java/RegisterCreate.java?p2=struts/sandbox/trunk/mailreader-course/struts2/browse/src/java/RegisterCreate.java&p1=struts/sandbox/trunk/mailreader-course/struts2/browse/src/java/RegisterSave.java&r1=431122&r2=431206&rev=431206&view=diff
==============================================================================
---
struts/sandbox/trunk/mailreader-course/struts2/browse/src/java/RegisterSave.java
(original)
+++
struts/sandbox/trunk/mailreader-course/struts2/browse/src/java/RegisterCreate.java
Sun Aug 13 12:05:50 2006
@@ -1,5 +1,5 @@
/**
* <p>Stub class to allow extra validation on initial Save.</p>
*/
-public class RegisterSave extends Register {
+public class RegisterCreate extends Register {
}
Propchange:
struts/sandbox/trunk/mailreader-course/struts2/browse/src/java/RegisterCreate.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
struts/sandbox/trunk/mailreader-course/struts2/browse/src/java/Subscribe.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/browse/src/java/Subscribe.java?rev=431206&r1=431205&r2=431206&view=diff
==============================================================================
---
struts/sandbox/trunk/mailreader-course/struts2/browse/src/java/Subscribe.java
(original)
+++
struts/sandbox/trunk/mailreader-course/struts2/browse/src/java/Subscribe.java
Sun Aug 13 12:05:50 2006
@@ -39,7 +39,7 @@
setSubscription(sub);
- return INPUT;
+ return SUCCESS;
}
Modified:
struts/sandbox/trunk/mailreader-course/struts2/browse/src/java/SubscribeSave.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/browse/src/java/SubscribeSave.java?rev=431206&r1=431205&r2=431206&view=diff
==============================================================================
---
struts/sandbox/trunk/mailreader-course/struts2/browse/src/java/SubscribeSave.java
(original)
+++
struts/sandbox/trunk/mailreader-course/struts2/browse/src/java/SubscribeSave.java
Sun Aug 13 12:05:50 2006
@@ -2,11 +2,7 @@
public void prepare() {
super.prepare();
- // checkbox workaround
+ // checkbox workaround
getSubscription().setAutoConnect(false);
- }
-
- public String execute() throws Exception {
- return save();
}
}
Copied:
struts/sandbox/trunk/mailreader-course/struts2/browse/src/java/struts.properties
(from r431180,
struts/sandbox/trunk/mailreader-course/struts2/browse/src/java/webwork.properties)
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/browse/src/java/struts.properties?p2=struts/sandbox/trunk/mailreader-course/struts2/browse/src/java/struts.properties&p1=struts/sandbox/trunk/mailreader-course/struts2/browse/src/java/webwork.properties&r1=431180&r2=431206&rev=431206&view=diff
==============================================================================
(empty)
Propchange:
struts/sandbox/trunk/mailreader-course/struts2/browse/src/java/struts.properties
------------------------------------------------------------------------------
svn:eol-style = native
Copied:
struts/sandbox/trunk/mailreader-course/struts2/browse/src/java/struts.xml (from
r431180,
struts/sandbox/trunk/mailreader-course/struts2/browse/src/java/xwork.xml)
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/browse/src/java/struts.xml?p2=struts/sandbox/trunk/mailreader-course/struts2/browse/src/java/struts.xml&p1=struts/sandbox/trunk/mailreader-course/struts2/browse/src/java/xwork.xml&r1=431180&r2=431206&rev=431206&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/browse/src/java/xwork.xml
(original)
+++ struts/sandbox/trunk/mailreader-course/struts2/browse/src/java/struts.xml
Sun Aug 13 12:05:50 2006
@@ -40,7 +40,7 @@
<global-results>
<result name="error">/pages/Error.jsp</result>
- <result name="login" type="redirect-action">Login!input</result>
+ <result name="login" type="redirect-action">Login</result>
</global-results>
<global-exception-mappings>
@@ -64,17 +64,26 @@
<interceptor-ref name="guest"/>
</action>
- <action name="Register" class="Register">
+ <action name="Register" class="Register" method="input">
<result name="input">/pages/Register.jsp</result>
+ <interceptor-ref name="guest"/>
+ </action>
+
+ <action name="Register_cancel" class="Register" method="cancel">
<result name="cancel" type="redirect-action">Welcome</result>
+ <interceptor-ref name="guest"/>
+ </action>
+
+ <action name="Register_create" class="RegisterCreate" method="save">
+ <result name="input">/pages/Register.jsp</result>
<result type="redirect-action">Menu</result>
<interceptor-ref name="guest"/>
</action>
- <action name="RegisterCreate" class="RegisterCreate">
+ <action name="Register_save" class="Register" method="save">
<result name="input">/pages/Register.jsp</result>
<result type="redirect-action">Menu</result>
- <interceptor-ref name="guest-submit"/>
+ <interceptor-ref name="guest"/>
</action>
<action name="Menu" class="MailReaderSupport">
@@ -85,21 +94,40 @@
<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>
+ <interceptor-ref name="guest"/>
+ </action>
+
+ <action name="Login_cancel" class="Login" method="cancel">
<result name="cancel" type="redirect-action">Welcome</result>
+ <interceptor-ref name="guest"/>
+ </action>
+
+ <action name="Login_save" class="Login" method="save">
+ <result name="input">/pages/Login.jsp</result>
<result type="redirect-action">Menu</result>
<interceptor-ref name="guest"/>
</action>
- <action name="Subscribe" class="Subscribe">
+ <action name="Subscribe" class="Subscribe" method="input">
<result name="input">/pages/Subscribe.jsp</result>
- <result type="redirect-action">Register!input</result>
+ <result type="redirect-action">Register</result>
+ </action>
+
+ <action name="Subscribe_delete" class="Subscribe" method="delete">
+ <result name="input" type="redirect-action">Login</result>
+ <result>/pages/Subscribe.jsp</result>
+ </action>
+
+ <action name="Subscribe_edit" class="Subscribe" method="edit">
+ <result name="input" type="redirect-action">Login</result>
+ <result>/pages/Subscribe.jsp</result>
</action>
- <action name="SubscribeSave" class="SubscribeSave">
+ <action name="Subscribe_save" class="SubscribeSave" method="save">
<result name="input">/pages/Subscribe.jsp</result>
- <result type="redirect-action">Register!input</result>
+ <result type="redirect-action">Register</result>
<interceptor-ref name="user-submit"/>
</action>
Propchange:
struts/sandbox/trunk/mailreader-course/struts2/browse/src/java/struts.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
struts/sandbox/trunk/mailreader-course/struts2/browse/src/test/RegisterTest.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/browse/src/test/RegisterTest.java?rev=431206&r1=431205&r2=431206&view=diff
==============================================================================
---
struts/sandbox/trunk/mailreader-course/struts2/browse/src/test/RegisterTest.java
(original)
+++
struts/sandbox/trunk/mailreader-course/struts2/browse/src/test/RegisterTest.java
Sun Aug 13 12:05:50 2006
@@ -11,10 +11,11 @@
super.setUp();
action = new Register();
action.setApplication(new HashMap());
+ action.setSession(new HashMap());
action.setDatabase(database);
}
- public void testExecute() throws Exception {
+ public void testSave() throws Exception {
action.setUsername("user");
action.setPassword("pass");
Modified:
struts/sandbox/trunk/mailreader-course/struts2/browse/src/webapp/pages/Login.jsp
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/browse/src/webapp/pages/Login.jsp?rev=431206&r1=431205&r2=431206&view=diff
==============================================================================
---
struts/sandbox/trunk/mailreader-course/struts2/browse/src/webapp/pages/Login.jsp
(original)
+++
struts/sandbox/trunk/mailreader-course/struts2/browse/src/webapp/pages/Login.jsp
Sun Aug 13 12:05:50 2006
@@ -7,18 +7,18 @@
<title><s:text name="login.title"/></title>
</head>
-<body onLoad="self.focus();document.Login.username.focus()">
+<body onLoad="self.focus();document.Login_save.username.focus()">
<s:actionerror/>
-<s:form method="POST" validate="true">
+<s:form action="Login_save" validate="true">
<s:textfield label="%{getText('username')}" name="username"/>
<s:password label="%{getText('password')}" name="password"
showPassword="true"/>
<s:submit value="%{getText('button.save')}" name="Save"/>
- <s:submit action="Login!cancel" value="%{getText('button.cancel')}"
name="Cancel"
- onclick="form.onsubmit=null"/>
+ <s:submit action="Login_cancel" value="%{getText('button.cancel')}"
name="Cancel"
+ onclick="form.onsubmit=null"/>
</s:form>
</body>
Modified:
struts/sandbox/trunk/mailreader-course/struts2/browse/src/webapp/pages/Menu.jsp
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/browse/src/webapp/pages/Menu.jsp?rev=431206&r1=431205&r2=431206&view=diff
==============================================================================
---
struts/sandbox/trunk/mailreader-course/struts2/browse/src/webapp/pages/Menu.jsp
(original)
+++
struts/sandbox/trunk/mailreader-course/struts2/browse/src/webapp/pages/Menu.jsp
Sun Aug 13 12:05:50 2006
@@ -10,7 +10,7 @@
<body>
<h3><s:text name="menu.heading"/> <s:property value="user.fullName"/></h3>
<ul>
- <li><a href="<s:url action="Register!input" />">
+ <li><a href="<s:url action="Register" />">
<s:text name="menu.registration"/>
</a>
</li>
Modified:
struts/sandbox/trunk/mailreader-course/struts2/browse/src/webapp/pages/Register.jsp
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/browse/src/webapp/pages/Register.jsp?rev=431206&r1=431205&r2=431206&view=diff
==============================================================================
---
struts/sandbox/trunk/mailreader-course/struts2/browse/src/webapp/pages/Register.jsp
(original)
+++
struts/sandbox/trunk/mailreader-course/struts2/browse/src/webapp/pages/Register.jsp
Sun Aug 13 12:05:50 2006
@@ -12,11 +12,10 @@
</s:if>
</head>
-<body onLoad="self.focus();document.Register.username.focus()">
+<body onLoad="self.focus();document.Register_save.username.focus()">
<s:actionerror/>
-<s:form method="POST" validate="true">
- <s:token/>
+<s:form action="Register_save" validate="true">
<s:hidden name="task"/>
<s:if test="task == 'Create'">
<s:textfield label="%{getText('username')}" name="username"/>
@@ -31,29 +30,29 @@
<s:password label="%{getText('password2')}" name="password2"/>
<s:textfield label="%{getText('fullName')}"
- name="fullName"/>
+ name="fullName"/>
<s:textfield label="%{getText('fromAddress')}"
- name="fromAddress"/>
+ name="fromAddress"/>
<s:textfield label="%{getText('replyToAddress')}"
- name="replyToAddress"/>
+ name="replyToAddress"/>
<s:if test="task == 'Create'">
- <s:submit value="%{getText('button.save')}" action="RegisterCreate"/>
+ <s:submit value="%{getText('button.save')}" action="Register_create"/>
<s:reset value="%{getText('button.reset')}"/>
<s:submit action="Welcome" value="%{getText('button.cancel')}"
- onclick="form.onsubmit=null"/>
+ onclick="form.onsubmit=null"/>
</s:if>
<s:else>
- <s:submit value="%{getText('button.save')}" action="Register"/>
+ <s:submit value="%{getText('button.save')}"/>
<s:reset value="%{getText('button.reset')}"/>
<s:submit action="Menu" value="%{getText('button.cancel')}"
- onclick="form.onsubmit=null"/>
+ onclick="form.onsubmit=null"/>
</s:else>
</s:form>
@@ -99,11 +98,11 @@
</td>
<td align="center">
- <a href="<s:url action="Subscribe!delete"><s:param
name="host" value="host"/></s:url>">
+ <a href="<s:url action="Subscribe_delete"><s:param
name="host" value="host"/></s:url>">
<s:text name="registration.deleteSubscription"/>
</a>
- <a href="<s:url action="Subscribe!edit"><s:param
name="host" value="host"/></s:url>">
+ <a href="<s:url action="Subscribe_edit"><s:param
name="host" value="host"/></s:url>">
<s:text name="registration.editSubscription"/>
</a>
@@ -113,7 +112,7 @@
</table>
- <a href="<s:url action="Subscribe!input"/>"><s:text
+ <a href="<s:url action="Subscribe"/>"><s:text
name="registration.addSubscription"/></a>
</s:if>
Modified:
struts/sandbox/trunk/mailreader-course/struts2/browse/src/webapp/pages/Subscribe.jsp
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/browse/src/webapp/pages/Subscribe.jsp?rev=431206&r1=431205&r2=431206&view=diff
==============================================================================
---
struts/sandbox/trunk/mailreader-course/struts2/browse/src/webapp/pages/Subscribe.jsp
(original)
+++
struts/sandbox/trunk/mailreader-course/struts2/browse/src/webapp/pages/Subscribe.jsp
Sun Aug 13 12:05:50 2006
@@ -15,11 +15,10 @@
</s:if>
</head>
-<body onLoad="self.focus();document.Subscribe.username.focus()">
+<body onLoad="self.focus();document.Subscribe_save.username.focus()">
<s:actionerror/>
-<s:form method="POST" action="SubscribeSave" validate="true">
- <s:token/>
+<s:form action="Subscribe_save" validate="true">
<s:hidden name="task"/>
<s:label label="%{getText('username')}" name="user.username"/>
@@ -33,31 +32,31 @@
<s:if test="task == 'Delete'">
<s:label label="%{getText('mailUsername')}"
- name="subscription.username"/>
+ name="subscription.username"/>
<s:label label="%{getText('mailPassword')}"
- name="subscription.password"/>
+ name="subscription.password"/>
<s:label label="%{getText('mailServerType')}"
- name="subscription.type"/>
+ name="subscription.type"/>
<s:label label="%{getText('autoConnect')}"
- name="subscription.autoConnect"/>
+ name="subscription.autoConnect"/>
<s:submit value="%{getText('button.confirm')}"/>
</s:if>
<s:else>
<s:textfield label="%{getText('mailUsername')}"
- name="subscription.username"/>
+ name="subscription.username"/>
<s:textfield label="%{getText('mailPassword')}"
- name="subscription.password"/>
+ name="subscription.password"/>
<s:select label="%{getText('mailServerType')}"
- name="subscription.type" list="types"/>
+ name="subscription.type" list="types"/>
<s:checkbox label="%{getText('autoConnect')}"
- name="subscription.autoConnect"/>
+ name="subscription.autoConnect"/>
<s:submit value="%{getText('button.save')}"/>
<s:reset value="%{getText('button.reset')}"/>
</s:else>
- <s:submit action="Register!input"
- value="%{getText('button.cancel')}"
- onclick="form.onsubmit=null"/>
+ <s:submit action="Register"
+ value="%{getText('button.cancel')}"
+ onclick="form.onsubmit=null"/>
</s:form>
</body>
Modified:
struts/sandbox/trunk/mailreader-course/struts2/browse/src/webapp/pages/Welcome.jsp
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/browse/src/webapp/pages/Welcome.jsp?rev=431206&r1=431205&r2=431206&view=diff
==============================================================================
---
struts/sandbox/trunk/mailreader-course/struts2/browse/src/webapp/pages/Welcome.jsp
(original)
+++
struts/sandbox/trunk/mailreader-course/struts2/browse/src/webapp/pages/Welcome.jsp
Sun Aug 13 12:05:50 2006
@@ -12,19 +12,33 @@
<h3>MailReader Options</h3>
<ul>
- <li><a href="<s:url action="Register!input"/>"><s:text
+ <li><a href="<s:url action="Register"/>"><s:text
name="index.registration"/></a></li>
- <li><a href="<s:url action="Login!input"/>"><s:text
+ <li><a href="<s:url action="Login"/>"><s:text
name="index.login"/></a></li>
</ul>
<h3>Language Options</h3>
<ul>
- <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>
+ <li>
+ <s:url id="en" action="Welcome">
+ <s:param name="request_locale">en</s:param>
+ </s:url>
+ <s:a href="%{en}">English</s:a>
+ </li>
+ <li>
+ <s:url id="ja" action="Welcome">
+ <s:param name="request_locale">ja</s:param>
+ </s:url>
+ <s:a href="%{ja}">Japanese</s:a>
+ </li>
+ <li>
+ <s:url id="ru" action="Welcome">
+ <s:param name="request_locale">ru</s:param>
+ </s:url>
+ <s:a href="%{ru}">Russian</s:a>
+ </li>
</ul>
-
+<hr/>
</body>
</html>
-
