You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@struts.apache.org by hu...@apache.org on 2006/04/07 23:35:36 UTC
svn commit: r392422 - in /struts/sandbox/trunk/mailreader-course/action2: ./
lab-1-0/ lab-3-2/src/java/ lab-4-1/ lab-4-1/src/java/
lab-4-1/src/webapp/pages/
Author: husted
Date: Fri Apr 7 14:35:35 2006
New Revision: 392422
URL: http://svn.apache.org/viewcvs?rev=392422&view=rev
Log:
MailReader Course
* Add lab 4-1
Added:
struts/sandbox/trunk/mailreader-course/action2/lab-3-2/src/java/RegisterSave-validation.xml (with props)
struts/sandbox/trunk/mailreader-course/action2/lab-3-2/src/java/RegisterSave.java (with props)
struts/sandbox/trunk/mailreader-course/action2/lab-4-1/
- copied from r392376, struts/sandbox/trunk/mailreader-course/action2/lab-3-3/
struts/sandbox/trunk/mailreader-course/action2/lab-4-1/lab-4-1.iml
struts/sandbox/trunk/mailreader-course/action2/lab-4-1/src/java/AuthenticationInterceptor.java (with props)
struts/sandbox/trunk/mailreader-course/action2/lab-4-1/src/java/NPE.java (with props)
struts/sandbox/trunk/mailreader-course/action2/lab-4-1/src/webapp/pages/Error.jsp (with props)
Removed:
struts/sandbox/trunk/mailreader-course/action2/lab-4-1/lab-3-3.iml
Modified:
struts/sandbox/trunk/mailreader-course/action2/lab-1-0/lab-1-0.iml
struts/sandbox/trunk/mailreader-course/action2/lab-4-1/src/java/xwork.xml
struts/sandbox/trunk/mailreader-course/action2/lab-4-1/src/webapp/pages/Register.jsp
struts/sandbox/trunk/mailreader-course/action2/lab-4-1/src/webapp/pages/Subscribe.jsp
struts/sandbox/trunk/mailreader-course/action2/mailreader-course-action2.ipr
Modified: struts/sandbox/trunk/mailreader-course/action2/lab-1-0/lab-1-0.iml
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/mailreader-course/action2/lab-1-0/lab-1-0.iml?rev=392422&r1=392421&r2=392422&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/action2/lab-1-0/lab-1-0.iml (original)
+++ struts/sandbox/trunk/mailreader-course/action2/lab-1-0/lab-1-0.iml Fri Apr 7 14:35:35 2006
@@ -2,14 +2,13 @@
<module version="4" relativePaths="true" type="J2EE_WEB_MODULE" j2ee-integration="Tomcat Server">
<component name="ModuleRootManager" />
<component name="NewModuleRootManager">
- <output url="file://$MODULE_DIR$/exploded/WEB-INF/classes" />
+ <output url="file://C:/opt/Apache/Tomcat-5.0/webapps/lab-1-0/WEB-INF/classes" />
<exclude-output />
<exploded url="file://C:/opt/Apache/Tomcat-5.0/webapps/lab-1-0" />
<exclude-exploded />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" />
- <excludeFolder url="file://$MODULE_DIR$/exploded" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
Added: struts/sandbox/trunk/mailreader-course/action2/lab-3-2/src/java/RegisterSave-validation.xml
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/mailreader-course/action2/lab-3-2/src/java/RegisterSave-validation.xml?rev=392422&view=auto
==============================================================================
--- struts/sandbox/trunk/mailreader-course/action2/lab-3-2/src/java/RegisterSave-validation.xml (added)
+++ struts/sandbox/trunk/mailreader-course/action2/lab-3-2/src/java/RegisterSave-validation.xml Fri Apr 7 14:35:35 2006
@@ -0,0 +1,28 @@
+<!DOCTYPE validators PUBLIC "-//OpenSymphony Group//XWork Validator 1.0.2//EN" "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd">
+
+<validators>
+
+ <field name="password">
+ <field-validator type="requiredstring">
+ <message key="error.password.required"/>
+ </field-validator>
+ <field-validator type="stringlength">
+ <param name="trim">true</param>
+ <param name="minLength">4</param>
+ <param name="maxLength">10</param>
+ <message key="errors.range"/>
+ </field-validator>
+ </field>
+
+ <field name="password2">
+ <field-validator type="requiredstring">
+ <message key="error.password2.required"/>
+ </field-validator>
+ </field>
+
+ <validator type="expression">
+ <param name="expression">password eq password2</param>
+ <message key="error.password.match"/>
+ </validator>
+
+</validators>
Propchange: struts/sandbox/trunk/mailreader-course/action2/lab-3-2/src/java/RegisterSave-validation.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: struts/sandbox/trunk/mailreader-course/action2/lab-3-2/src/java/RegisterSave.java
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/mailreader-course/action2/lab-3-2/src/java/RegisterSave.java?rev=392422&view=auto
==============================================================================
--- struts/sandbox/trunk/mailreader-course/action2/lab-3-2/src/java/RegisterSave.java (added)
+++ struts/sandbox/trunk/mailreader-course/action2/lab-3-2/src/java/RegisterSave.java Fri Apr 7 14:35:35 2006
@@ -0,0 +1,5 @@
+/**
+ * <p>Stub class to allow extra validation on initial Save.</p>
+ */
+public class RegisterSave extends Register {
+}
Propchange: struts/sandbox/trunk/mailreader-course/action2/lab-3-2/src/java/RegisterSave.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: struts/sandbox/trunk/mailreader-course/action2/lab-4-1/lab-4-1.iml
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/mailreader-course/action2/lab-4-1/lab-4-1.iml?rev=392422&view=auto
==============================================================================
--- struts/sandbox/trunk/mailreader-course/action2/lab-4-1/lab-4-1.iml (added)
+++ struts/sandbox/trunk/mailreader-course/action2/lab-4-1/lab-4-1.iml Fri Apr 7 14:35:35 2006
@@ -0,0 +1,264 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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" />
+ <exclude-output />
+ <exploded url="file://C:/opt/Apache/Tomcat-5.0/webapps/lab-4-1" />
+ <exclude-exploded />
+ <content url="file://$MODULE_DIR$">
+ <sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" />
+ </content>
+ <orderEntry type="inheritedJdk" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="library" name="Tomcat" level="application_server_libraries" />
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../lib/freemarker.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../lib/struts-mailreader-dao-1.3.0-dev.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../lib/rife-continuations.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../lib/struts-taglib-1.3.0.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../lib/spring-context.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../lib/ognl.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../lib/xwork-1.1.2.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../lib/commons-collections-3.1.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../lib/spring-web.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../lib/spring-beans.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../lib/spring-core.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../lib/oscore.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../lib/commons-logging-1.0.4.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../lib/webwork-2.2.2.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../lib/commons-digester-1.6.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$APPLICATION_HOME_DIR$/lib/junit.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntryProperties />
+ </component>
+ <component name="WebModuleBuildComponent">
+ <setting name="EXPLODED_URL" value="file://C:/opt/Apache/Tomcat-5.0/webapps/lab-4-1" />
+ <setting name="EXPLODED_ENABLED" value="true" />
+ <setting name="JAR_URL" value="file://" />
+ <setting name="JAR_ENABLED" value="false" />
+ <setting name="SYNC_EXPLODED_DIR" value="true" />
+ <setting name="BUILD_ON_FRAME_DEACTIVATION" value="false" />
+ <setting name="RUN_JASPER_VALIDATION" value="false" />
+ </component>
+ <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>
+ </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>
+ </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>
+ </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>
+ </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>
+ </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>
+ </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>
+ </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>
+ </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>
+ </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>
+ </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>
+ </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>
+ </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>
+ </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>
+ </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>
+ </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" />
+ <webroots>
+ <root url="file://$MODULE_DIR$/src/webapp" relative="/" />
+ <root url="file://$MODULE_DIR$/src/java" relative="/WEB-INF/src/java" />
+ <root url="file://$MODULE_DIR$/src/test" relative="/WEB-INF/src/test" />
+ </webroots>
+ </component>
+ <component name="WeblogicWebModuleProperties">
+ <option name="IS_RUN_APPC" value="false" />
+ </component>
+</module>
+
Added: struts/sandbox/trunk/mailreader-course/action2/lab-4-1/src/java/AuthenticationInterceptor.java
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/mailreader-course/action2/lab-4-1/src/java/AuthenticationInterceptor.java?rev=392422&view=auto
==============================================================================
--- struts/sandbox/trunk/mailreader-course/action2/lab-4-1/src/java/AuthenticationInterceptor.java (added)
+++ struts/sandbox/trunk/mailreader-course/action2/lab-4-1/src/java/AuthenticationInterceptor.java Fri Apr 7 14:35:35 2006
@@ -0,0 +1,29 @@
+import com.opensymphony.xwork.interceptor.Interceptor;
+import com.opensymphony.xwork.ActionInvocation;
+import com.opensymphony.xwork.Action;
+import java.util.Map;
+import org.apache.struts.apps.mailreader.dao.User;
+
+public class AuthenticationInterceptor implements Interceptor {
+
+ public void destroy () {}
+
+ public void init() {}
+
+ public String intercept(ActionInvocation actionInvocation) throws Exception {
+
+ Map session = actionInvocation.getInvocationContext().getSession();
+
+ User user = (User) session.get(MailReaderSupport.USER_KEY);
+
+ boolean isAuthenticated = (null!=user) && (null!=user.getDatabase());
+
+ if (!isAuthenticated) {
+ return Action.LOGIN;
+ }
+ else {
+ return actionInvocation.invoke();
+ }
+
+ }
+}
\ No newline at end of file
Propchange: struts/sandbox/trunk/mailreader-course/action2/lab-4-1/src/java/AuthenticationInterceptor.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: struts/sandbox/trunk/mailreader-course/action2/lab-4-1/src/java/NPE.java
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/mailreader-course/action2/lab-4-1/src/java/NPE.java?rev=392422&view=auto
==============================================================================
--- struts/sandbox/trunk/mailreader-course/action2/lab-4-1/src/java/NPE.java (added)
+++ struts/sandbox/trunk/mailreader-course/action2/lab-4-1/src/java/NPE.java Fri Apr 7 14:35:35 2006
@@ -0,0 +1,9 @@
+import com.opensymphony.xwork.Action;
+
+public class NPE implements Action {
+
+ public String execute() {
+ throw new NullPointerException("Oops!");
+ }
+
+}
Propchange: struts/sandbox/trunk/mailreader-course/action2/lab-4-1/src/java/NPE.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: struts/sandbox/trunk/mailreader-course/action2/lab-4-1/src/java/xwork.xml
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/mailreader-course/action2/lab-4-1/src/java/xwork.xml?rev=392422&r1=392376&r2=392422&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/action2/lab-4-1/src/java/xwork.xml (original)
+++ struts/sandbox/trunk/mailreader-course/action2/lab-4-1/src/java/xwork.xml Fri Apr 7 14:35:35 2006
@@ -5,29 +5,73 @@
<package name="default" extends="webwork-default">
+ <interceptors>
+
+ <interceptor name="authentication"
+ class="AuthenticationInterceptor"/>
+
+ <interceptor-stack name="user" >
+ <interceptor-ref name="authentication" />
+ <interceptor-ref name="defaultStack"/>
+ </interceptor-stack>
+
+ <interceptor-stack name="user-submit" >
+ <interceptor-ref name="token-session" />
+ <interceptor-ref name="user"/>
+ </interceptor-stack>
+
+ <interceptor-stack name="guest" >
+ <interceptor-ref name="defaultStack"/>
+ </interceptor-stack>
+
+ <interceptor-stack name="guest-submit" >
+ <interceptor-ref name="token-session" />
+ <interceptor-ref name="guest"/>
+ </interceptor-stack>
+
+ </interceptors>
+
+ <default-interceptor-ref name="user"/>
+
<default-action-ref name="Missing"/>
+ <global-results>
+ <result name="error">/pages/Error.jsp</result>
+ <result name="login" type="redirect-action">Login!input</result>
+ </global-results>
+
+ <global-exception-mappings>
+ <exception-mapping
+ result="error"
+ exception="java.lang.Throwable"/>
+ </global-exception-mappings>
+
<action name="Hello" class="Hello">
<result>/pages/Hello.jsp</result>
+ <interceptor-ref name="guest"/>
</action>
<action name="Missing">
<result>/pages/Missing.jsp</result>
+ <interceptor-ref name="guest"/>
</action>
<action name="Welcome">
<result>/pages/Welcome.jsp</result>
+ <interceptor-ref name="guest"/>
</action>
<action name="Register" class="Register">
<result name="input">/pages/Register.jsp</result>
<result name="cancel" type="redirect-action">Welcome</result>
<result type="redirect-action">Menu</result>
+ <interceptor-ref name="guest"/>
</action>
<action name="RegisterSave" class="RegisterSave">
<result name="input">/pages/Register.jsp</result>
<result type="redirect-action">Menu</result>
+ <interceptor-ref name="guest-submit" />
</action>
<action name="Menu" class="MailReaderSupport">
@@ -42,6 +86,7 @@
<result name="input">/pages/Login.jsp</result>
<result name="cancel" type="redirect-action">Welcome</result>
<result type="redirect-action">Menu</result>
+ <interceptor-ref name="guest"/>
</action>
<action name="Subscribe" class="Subscribe">
@@ -52,6 +97,12 @@
<action name="SubscribeSave" class="SubscribeSave">
<result name="input">/pages/Subscribe.jsp</result>
<result type="redirect-action">Register!input</result>
+ <interceptor-ref name="user-submit" />
+ </action>
+
+ <action name="NPE" class="NPE">
+ <result>/pages/Hello.jsp</result>
+ <interceptor-ref name="guest"/>
</action>
</package>
Added: struts/sandbox/trunk/mailreader-course/action2/lab-4-1/src/webapp/pages/Error.jsp
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/mailreader-course/action2/lab-4-1/src/webapp/pages/Error.jsp?rev=392422&view=auto
==============================================================================
--- struts/sandbox/trunk/mailreader-course/action2/lab-4-1/src/webapp/pages/Error.jsp (added)
+++ struts/sandbox/trunk/mailreader-course/action2/lab-4-1/src/webapp/pages/Error.jsp Fri Apr 7 14:35:35 2006
@@ -0,0 +1,38 @@
+<%@ page contentType="text/html; charset=UTF-8" %>
+<%@ taglib uri="/webwork" prefix="ww" %>
+<!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>Unexpected Error</title>
+</head>
+
+<body>
+<h2>An unexpected error has occured</h2>
+
+<p>
+ Please report this error to your system administrator
+ or appropriate technical support personnel.
+ Thank you for your cooperation.
+</p>
+
+<hr/>
+
+<h3>Error Message</h3>
+
+<ww:actionerror />
+
+<p>
+ <ww:property value="%{exception.message}"/>
+</p>
+
+<hr/>
+
+<h3>Technical Details</h3>
+
+<p>
+ <ww:property value="%{exceptionStack}"/>
+</p>
+
+</body>
+</html>
Propchange: struts/sandbox/trunk/mailreader-course/action2/lab-4-1/src/webapp/pages/Error.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Modified: struts/sandbox/trunk/mailreader-course/action2/lab-4-1/src/webapp/pages/Register.jsp
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/mailreader-course/action2/lab-4-1/src/webapp/pages/Register.jsp?rev=392422&r1=392376&r2=392422&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/action2/lab-4-1/src/webapp/pages/Register.jsp (original)
+++ struts/sandbox/trunk/mailreader-course/action2/lab-4-1/src/webapp/pages/Register.jsp Fri Apr 7 14:35:35 2006
@@ -16,6 +16,7 @@
<ww:actionerror/>
<ww:form method="POST" validate="true">
+ <ww:token/>
<ww:hidden name="task"/>
<ww:if test="task == 'Create'">
<ww:textfield label="%{getText('username')}" name="username"/>
Modified: struts/sandbox/trunk/mailreader-course/action2/lab-4-1/src/webapp/pages/Subscribe.jsp
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/mailreader-course/action2/lab-4-1/src/webapp/pages/Subscribe.jsp?rev=392422&r1=392376&r2=392422&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/action2/lab-4-1/src/webapp/pages/Subscribe.jsp (original)
+++ struts/sandbox/trunk/mailreader-course/action2/lab-4-1/src/webapp/pages/Subscribe.jsp Fri Apr 7 14:35:35 2006
@@ -19,6 +19,7 @@
<ww:actionerror/>
<ww:form method="POST" action="SubscribeSave" validate="true">
+ <ww:token/>
<ww:hidden name="task"/>
<ww:label label="%{getText('username')}" name="user.username"/>
Modified: struts/sandbox/trunk/mailreader-course/action2/mailreader-course-action2.ipr
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/mailreader-course/action2/mailreader-course-action2.ipr?rev=392422&r1=392421&r2=392422&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/action2/mailreader-course-action2.ipr (original)
+++ struts/sandbox/trunk/mailreader-course/action2/mailreader-course-action2.ipr Fri Apr 7 14:35:35 2006
@@ -202,6 +202,7 @@
<module fileurl="file://$PROJECT_DIR$/lab-3-1/lab-3-1.iml" filepath="$PROJECT_DIR$/lab-3-1/lab-3-1.iml" />
<module fileurl="file://$PROJECT_DIR$/lab-3-2/lab-3-2.iml" filepath="$PROJECT_DIR$/lab-3-2/lab-3-2.iml" />
<module fileurl="file://$PROJECT_DIR$/lab-3-3/lab-3-3.iml" filepath="$PROJECT_DIR$/lab-3-3/lab-3-3.iml" />
+ <module fileurl="file://$PROJECT_DIR$/lab-4-1/lab-4-1.iml" filepath="$PROJECT_DIR$/lab-4-1/lab-4-1.iml" />
<module fileurl="file://$PROJECT_DIR$/mailreader-course-action2.iml" filepath="$PROJECT_DIR$/mailreader-course-action2.iml" />
</modules>
</component>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org
For additional commands, e-mail: dev-help@struts.apache.org