struts-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hus...@apache.org
Subject svn commit: r394670 - in /struts/sandbox/trunk/mailreader-course: ./ action2/lab-1-0/ action2/lab-1-0/src/java/ action2/lab-1-0/src/webapp/pages/ action2/lab-1-1/ action2/lab-1-2/ action2/lab-1-3/ action2/lab-1-3/src/java/ action2/lab-2-1/ action2/lab-...
Date Mon, 17 Apr 2006 14:06:10 GMT
Author: husted
Date: Mon Apr 17 07:06:06 2006
New Revision: 394670

URL: http://svn.apache.org/viewcvs?rev=394670&view=rev
Log:
MailReader Course / Action2 
* Various minor changes found during the course's first presentation

Modified:
    struts/sandbox/trunk/mailreader-course/STATUS.txt
    struts/sandbox/trunk/mailreader-course/action2/lab-1-0/lab-1-0.iml
    struts/sandbox/trunk/mailreader-course/action2/lab-1-0/src/java/resources.properties
    struts/sandbox/trunk/mailreader-course/action2/lab-1-0/src/webapp/pages/Hello.jsp
    struts/sandbox/trunk/mailreader-course/action2/lab-1-1/lab-1-1.iml
    struts/sandbox/trunk/mailreader-course/action2/lab-1-2/lab-1-2.iml
    struts/sandbox/trunk/mailreader-course/action2/lab-1-3/lab-1-3.iml
    struts/sandbox/trunk/mailreader-course/action2/lab-1-3/src/java/Register.java
    struts/sandbox/trunk/mailreader-course/action2/lab-2-1/lab-2-1.iml
    struts/sandbox/trunk/mailreader-course/action2/lab-2-1/src/java/Register.java
    struts/sandbox/trunk/mailreader-course/action2/lab-2-2/lab-2-2.iml
    struts/sandbox/trunk/mailreader-course/action2/lab-2-2/src/java/Register.java
    struts/sandbox/trunk/mailreader-course/action2/lab-2-3/lab-2-3.iml
    struts/sandbox/trunk/mailreader-course/action2/lab-2-3/src/java/Login.java
    struts/sandbox/trunk/mailreader-course/action2/lab-2-3/src/java/MailReaderSupport.java
    struts/sandbox/trunk/mailreader-course/action2/lab-2-3/src/java/Register.java
    struts/sandbox/trunk/mailreader-course/action2/lab-2-3/src/webapp/pages/Register.jsp
    struts/sandbox/trunk/mailreader-course/action2/lab-3-1/lab-3-1.iml
    struts/sandbox/trunk/mailreader-course/action2/lab-3-1/src/java/resources_ja.properties
    struts/sandbox/trunk/mailreader-course/action2/lab-3-1/src/webapp/pages/Welcome.jsp
    struts/sandbox/trunk/mailreader-course/action2/lab-3-2/lab-3-2.iml
    struts/sandbox/trunk/mailreader-course/action2/lab-3-2/src/java/Register.java
    struts/sandbox/trunk/mailreader-course/action2/lab-3-2/src/java/xwork.xml
    struts/sandbox/trunk/mailreader-course/action2/lab-3-2/src/webapp/pages/Register.jsp
    struts/sandbox/trunk/mailreader-course/action2/lab-3-3/lab-3-3.iml
    struts/sandbox/trunk/mailreader-course/action2/lab-3-3/src/java/xwork.xml
    struts/sandbox/trunk/mailreader-course/action2/lab-3-3/src/webapp/pages/Register.jsp
    struts/sandbox/trunk/mailreader-course/action2/lab-3-3/src/webapp/pages/Welcome.jsp
    struts/sandbox/trunk/mailreader-course/action2/lab-4-1/lab-4-1.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-2/lab-4-2.iml
    struts/sandbox/trunk/mailreader-course/action2/lab-4-2/src/java/xwork.xml
    struts/sandbox/trunk/mailreader-course/action2/lab-4-2/src/webapp/WEB-INF/web.xml
    struts/sandbox/trunk/mailreader-course/action2/lab-4-2/src/webapp/pages/Hello.jsp
    struts/sandbox/trunk/mailreader-course/action2/lab-4-2/src/webapp/pages/Login.jsp
    struts/sandbox/trunk/mailreader-course/action2/lab-4-2/src/webapp/pages/Menu.jsp
    struts/sandbox/trunk/mailreader-course/action2/lab-4-2/src/webapp/pages/Missing.jsp
    struts/sandbox/trunk/mailreader-course/action2/lab-4-2/src/webapp/pages/Register.jsp
    struts/sandbox/trunk/mailreader-course/action2/lab-4-2/src/webapp/pages/Subscribe.jsp
    struts/sandbox/trunk/mailreader-course/action2/lab-4-2/src/webapp/pages/Welcome.jsp

Modified: struts/sandbox/trunk/mailreader-course/STATUS.txt
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/mailreader-course/STATUS.txt?rev=394670&r1=394669&r2=394670&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/STATUS.txt (original)
+++ struts/sandbox/trunk/mailreader-course/STATUS.txt Mon Apr 17 07:06:06 2006
@@ -26,8 +26,8 @@
 
     * Present and apply MVC application architecture
     * Build a working web application
-    * Understand how to unit test web application
-    * Explain key best practices
+    * Understand how to unit test web applications
+    * Explore key best practices
     * Use popular extensions to increase productivity
 
 AUDIENCE

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=394670&r1=394669&r2=394670&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 Mon Apr 17 07:06:06 2006
@@ -12,7 +12,6 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Tomcat" level="application_server_libraries" />
     <orderEntry type="module-library">
       <library>
         <CLASSES>
@@ -250,7 +249,11 @@
       <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" />
+    <deploymentDescriptor name="" url="file://$MODULE_DIR$/META-INF/context.xml" optional="false">
+      <option name="DEFAULT_DIR" value="WEB-INF" />
+      <option name="NAME" value="" />
+      <option name="DESCRIPTION" value="" />
+    </deploymentDescriptor>
     <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/action2/lab-1-0/src/java/resources.properties
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/mailreader-course/action2/lab-1-0/src/java/resources.properties?rev=394670&r1=394669&r2=394670&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/action2/lab-1-0/src/java/resources.properties (original)
+++ struts/sandbox/trunk/mailreader-course/action2/lab-1-0/src/java/resources.properties Mon Apr 17 07:06:06 2006
@@ -1,2 +1,2 @@
-hello.nessage = Congratulations! WebWork is up and running ...
+hello.message = Congratulations! WebWork is up and running ...
 # Add your messages here ...

Modified: struts/sandbox/trunk/mailreader-course/action2/lab-1-0/src/webapp/pages/Hello.jsp
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/mailreader-course/action2/lab-1-0/src/webapp/pages/Hello.jsp?rev=394670&r1=394669&r2=394670&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/action2/lab-1-0/src/webapp/pages/Hello.jsp (original)
+++ struts/sandbox/trunk/mailreader-course/action2/lab-1-0/src/webapp/pages/Hello.jsp Mon Apr 17 07:06:06 2006
@@ -7,6 +7,6 @@
 </head>
 
 <body>
-<h2><ww:text name="hello.nessage"/></h2>
+<h2><ww:text name="hello.message"/></h2>
 </body>
 </html>

Modified: struts/sandbox/trunk/mailreader-course/action2/lab-1-1/lab-1-1.iml
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/mailreader-course/action2/lab-1-1/lab-1-1.iml?rev=394670&r1=394669&r2=394670&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/action2/lab-1-1/lab-1-1.iml (original)
+++ struts/sandbox/trunk/mailreader-course/action2/lab-1-1/lab-1-1.iml Mon Apr 17 07:06:06 2006
@@ -12,7 +12,6 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Tomcat" level="application_server_libraries" />
     <orderEntry type="module-library">
       <library>
         <CLASSES>
@@ -250,7 +249,11 @@
       <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" />
+    <deploymentDescriptor name="" url="file://$MODULE_DIR$/META-INF/context.xml" optional="false">
+      <option name="DEFAULT_DIR" value="WEB-INF" />
+      <option name="NAME" value="" />
+      <option name="DESCRIPTION" value="" />
+    </deploymentDescriptor>
     <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/action2/lab-1-2/lab-1-2.iml
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/mailreader-course/action2/lab-1-2/lab-1-2.iml?rev=394670&r1=394669&r2=394670&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/action2/lab-1-2/lab-1-2.iml (original)
+++ struts/sandbox/trunk/mailreader-course/action2/lab-1-2/lab-1-2.iml Mon Apr 17 07:06:06 2006
@@ -12,7 +12,6 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Tomcat" level="application_server_libraries" />
     <orderEntry type="module-library">
       <library>
         <CLASSES>
@@ -250,7 +249,11 @@
       <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" />
+    <deploymentDescriptor name="" url="file://$MODULE_DIR$/META-INF/context.xml" optional="false">
+      <option name="DEFAULT_DIR" value="WEB-INF" />
+      <option name="NAME" value="" />
+      <option name="DESCRIPTION" value="" />
+    </deploymentDescriptor>
     <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/action2/lab-1-3/lab-1-3.iml
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/mailreader-course/action2/lab-1-3/lab-1-3.iml?rev=394670&r1=394669&r2=394670&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/action2/lab-1-3/lab-1-3.iml (original)
+++ struts/sandbox/trunk/mailreader-course/action2/lab-1-3/lab-1-3.iml Mon Apr 17 07:06:06 2006
@@ -12,7 +12,6 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Tomcat" level="application_server_libraries" />
     <orderEntry type="module-library">
       <library>
         <CLASSES>
@@ -157,6 +156,15 @@
         <SOURCES />
       </library>
     </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://C:/opt/Apache/Tomcat-5.0/common/lib/servlet-api.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
     <orderEntryProperties />
   </component>
   <component name="WebModuleBuildComponent">
@@ -250,7 +258,11 @@
       <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" />
+    <deploymentDescriptor name="" url="file://$MODULE_DIR$/META-INF/context.xml" optional="false">
+      <option name="DEFAULT_DIR" value="WEB-INF" />
+      <option name="NAME" value="" />
+      <option name="DESCRIPTION" value="" />
+    </deploymentDescriptor>
     <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/action2/lab-1-3/src/java/Register.java
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/mailreader-course/action2/lab-1-3/src/java/Register.java?rev=394670&r1=394669&r2=394670&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/action2/lab-1-3/src/java/Register.java (original)
+++ struts/sandbox/trunk/mailreader-course/action2/lab-1-3/src/java/Register.java Mon Apr 17 07:06:06 2006
@@ -11,14 +11,14 @@
 
         if (haveUser) {
             addActionError(ERROR_USERNAME_UNIQUE);
-            return Action.INPUT;
+            return INPUT;
         }
 
         createUser(getUsername(), getPassword());
 
         saveUser();
 
-        return Action.SUCCESS;
+        return SUCCESS;
     }
 
 }

Modified: struts/sandbox/trunk/mailreader-course/action2/lab-2-1/lab-2-1.iml
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/mailreader-course/action2/lab-2-1/lab-2-1.iml?rev=394670&r1=394669&r2=394670&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/action2/lab-2-1/lab-2-1.iml (original)
+++ struts/sandbox/trunk/mailreader-course/action2/lab-2-1/lab-2-1.iml Mon Apr 17 07:06:06 2006
@@ -12,7 +12,6 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Tomcat" level="application_server_libraries" />
     <orderEntry type="module-library">
       <library>
         <CLASSES>
@@ -157,6 +156,15 @@
         <SOURCES />
       </library>
     </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://C:/opt/Apache/Tomcat-5.0/common/lib/servlet-api.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
     <orderEntryProperties />
   </component>
   <component name="WebModuleBuildComponent">
@@ -250,7 +258,11 @@
       <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" />
+    <deploymentDescriptor name="" url="file://$MODULE_DIR$/META-INF/context.xml" optional="false">
+      <option name="DEFAULT_DIR" value="WEB-INF" />
+      <option name="NAME" value="" />
+      <option name="DESCRIPTION" value="" />
+    </deploymentDescriptor>
     <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/action2/lab-2-1/src/java/Register.java
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/mailreader-course/action2/lab-2-1/src/java/Register.java?rev=394670&r1=394669&r2=394670&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/action2/lab-2-1/src/java/Register.java (original)
+++ struts/sandbox/trunk/mailreader-course/action2/lab-2-1/src/java/Register.java Mon Apr 17 07:06:06 2006
@@ -11,14 +11,14 @@
 
         if (haveUser) {
             addActionError(ERROR_USERNAME_UNIQUE);
-            return Action.INPUT;
+            return INPUT;
         }
 
         createUser(getUsername(), getPassword());
 
         saveUser();
 
-        return Action.SUCCESS;
+        return SUCCESS;
     }
 
 }

Modified: struts/sandbox/trunk/mailreader-course/action2/lab-2-2/lab-2-2.iml
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/mailreader-course/action2/lab-2-2/lab-2-2.iml?rev=394670&r1=394669&r2=394670&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/action2/lab-2-2/lab-2-2.iml (original)
+++ struts/sandbox/trunk/mailreader-course/action2/lab-2-2/lab-2-2.iml Mon Apr 17 07:06:06 2006
@@ -12,7 +12,6 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Tomcat" level="application_server_libraries" />
     <orderEntry type="module-library">
       <library>
         <CLASSES>
@@ -157,6 +156,15 @@
         <SOURCES />
       </library>
     </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://C:/opt/Apache/Tomcat-5.0/common/lib/servlet-api.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
     <orderEntryProperties />
   </component>
   <component name="WebModuleBuildComponent">
@@ -250,7 +258,11 @@
       <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" />
+    <deploymentDescriptor name="" url="file://$MODULE_DIR$/META-INF/context.xml" optional="false">
+      <option name="DEFAULT_DIR" value="WEB-INF" />
+      <option name="NAME" value="" />
+      <option name="DESCRIPTION" value="" />
+    </deploymentDescriptor>
     <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/action2/lab-2-2/src/java/Register.java
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/mailreader-course/action2/lab-2-2/src/java/Register.java?rev=394670&r1=394669&r2=394670&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/action2/lab-2-2/src/java/Register.java (original)
+++ struts/sandbox/trunk/mailreader-course/action2/lab-2-2/src/java/Register.java Mon Apr 17 07:06:06 2006
@@ -11,14 +11,14 @@
 
         if (haveUser) {
             addActionError(ERROR_USERNAME_UNIQUE);
-            return Action.INPUT;
+            return INPUT;
         }
 
         createUser(getUsername(), getPassword());
 
         saveUser();
 
-        return Action.SUCCESS;
+        return SUCCESS;
     }
 
 }

Modified: struts/sandbox/trunk/mailreader-course/action2/lab-2-3/lab-2-3.iml
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/mailreader-course/action2/lab-2-3/lab-2-3.iml?rev=394670&r1=394669&r2=394670&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/action2/lab-2-3/lab-2-3.iml (original)
+++ struts/sandbox/trunk/mailreader-course/action2/lab-2-3/lab-2-3.iml Mon Apr 17 07:06:06 2006
@@ -12,7 +12,6 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Tomcat" level="application_server_libraries" />
     <orderEntry type="module-library">
       <library>
         <CLASSES>
@@ -157,6 +156,15 @@
         <SOURCES />
       </library>
     </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://C:/opt/Apache/Tomcat-5.0/common/lib/servlet-api.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
     <orderEntryProperties />
   </component>
   <component name="WebModuleBuildComponent">
@@ -250,7 +258,11 @@
       <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" />
+    <deploymentDescriptor name="" url="file://$MODULE_DIR$/META-INF/context.xml" optional="false">
+      <option name="DEFAULT_DIR" value="WEB-INF" />
+      <option name="NAME" value="" />
+      <option name="DESCRIPTION" value="" />
+    </deploymentDescriptor>
     <webroots>
       <root url="file://$MODULE_DIR$/src/webapp" relative="/" />
     </webroots>

Modified: struts/sandbox/trunk/mailreader-course/action2/lab-2-3/src/java/Login.java
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/mailreader-course/action2/lab-2-3/src/java/Login.java?rev=394670&r1=394669&r2=394670&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/action2/lab-2-3/src/java/Login.java (original)
+++ struts/sandbox/trunk/mailreader-course/action2/lab-2-3/src/java/Login.java Mon Apr 17 07:06:06 2006
@@ -1,5 +1,6 @@
 import org.apache.struts.apps.mailreader.dao.ExpiredPasswordException;
 import org.apache.struts.apps.mailreader.dao.User;
+import com.opensymphony.util.BeanUtils;
 
 public class Login extends MailReaderSupport {
 
@@ -9,6 +10,7 @@
 
         if (user != null) {
             setUser(user);
+            BeanUtils.setValues(this, user, null);
         }
 
         if (hasErrors()) {

Modified: struts/sandbox/trunk/mailreader-course/action2/lab-2-3/src/java/MailReaderSupport.java
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/mailreader-course/action2/lab-2-3/src/java/MailReaderSupport.java?rev=394670&r1=394669&r2=394670&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/action2/lab-2-3/src/java/MailReaderSupport.java (original)
+++ struts/sandbox/trunk/mailreader-course/action2/lab-2-3/src/java/MailReaderSupport.java Mon Apr 17 07:06:06 2006
@@ -202,6 +202,7 @@
     }
 
     public void saveUser() throws Exception {
+        BeanUtils.setValues(getUser(), this, null);
         getDatabase().save();
     }
 

Modified: struts/sandbox/trunk/mailreader-course/action2/lab-2-3/src/java/Register.java
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/mailreader-course/action2/lab-2-3/src/java/Register.java?rev=394670&r1=394669&r2=394670&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/action2/lab-2-3/src/java/Register.java (original)
+++ struts/sandbox/trunk/mailreader-course/action2/lab-2-3/src/java/Register.java Mon Apr 17 07:06:06 2006
@@ -1,4 +1,5 @@
 import com.opensymphony.xwork.Action;
+import com.opensymphony.util.BeanUtils;
 import org.apache.struts.apps.mailreader.dao.User;
 
 public class Register extends MailReaderSupport {
@@ -11,7 +12,7 @@
 
         if (haveUser) {
             addActionError(ERROR_USERNAME_UNIQUE);
-            return Action.INPUT;
+            return INPUT;
         }
 
         user = createUser(getUsername(), getPassword());
@@ -20,7 +21,7 @@
 
         saveUser();
 
-        return Action.SUCCESS;
+        return SUCCESS;
     }
 
 }

Modified: struts/sandbox/trunk/mailreader-course/action2/lab-2-3/src/webapp/pages/Register.jsp
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/mailreader-course/action2/lab-2-3/src/webapp/pages/Register.jsp?rev=394670&r1=394669&r2=394670&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/action2/lab-2-3/src/webapp/pages/Register.jsp (original)
+++ struts/sandbox/trunk/mailreader-course/action2/lab-2-3/src/webapp/pages/Register.jsp Mon Apr 17 07:06:06 2006
@@ -7,7 +7,7 @@
 <body onLoad="self.focus();document.Register.username.focus()">
 
 <ww:actionerror/>
-<ww:form method="POST" validate="true">
+<ww:form method="POST" validate="true" theme="simple">
 
     <ww:textfield label="Username" name="username"/>
 

Modified: struts/sandbox/trunk/mailreader-course/action2/lab-3-1/lab-3-1.iml
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/mailreader-course/action2/lab-3-1/lab-3-1.iml?rev=394670&r1=394669&r2=394670&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/action2/lab-3-1/lab-3-1.iml (original)
+++ struts/sandbox/trunk/mailreader-course/action2/lab-3-1/lab-3-1.iml Mon Apr 17 07:06:06 2006
@@ -12,7 +12,6 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Tomcat" level="application_server_libraries" />
     <orderEntry type="module-library">
       <library>
         <CLASSES>
@@ -157,6 +156,16 @@
         <SOURCES />
       </library>
     </orderEntry>
+    <orderEntry type="library" name="Tomcat" level="application_server_libraries" />
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://C:/opt/Apache/Tomcat-5.0/common/lib/servlet-api.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
     <orderEntryProperties />
   </component>
   <component name="WebModuleBuildComponent">
@@ -251,6 +260,11 @@
     </containerElement>
     <deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/src/webapp/WEB-INF/web.xml" optional="false" version="2.3" />
     <deploymentDescriptor name="context.xml" url="file://$MODULE_DIR$/META-INF/context.xml" optional="false" version="5.x" />
+    <deploymentDescriptor name="" url="file://$MODULE_DIR$/META-INF/context.xml" optional="false">
+      <option name="DEFAULT_DIR" value="WEB-INF" />
+      <option name="NAME" value="" />
+      <option name="DESCRIPTION" value="" />
+    </deploymentDescriptor>
     <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/action2/lab-3-1/src/java/resources_ja.properties
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/mailreader-course/action2/lab-3-1/src/java/resources_ja.properties?rev=394670&r1=394669&r2=394670&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/action2/lab-3-1/src/java/resources_ja.properties (original)
+++ struts/sandbox/trunk/mailreader-course/action2/lab-3-1/src/java/resources_ja.properties Mon Apr 17 07:06:06 2006
@@ -59,7 +59,7 @@
 mailPassword=\u30e1\u30fc\u30eb\u30d1\u30b9\u30ef\u30fc\u30c9
 mailServerType=\u30b5\u30fc\u30d0\u30bf\u30a4\u30d7
 mailUsername=\u30e1\u30fc\u30eb\u30e6\u30fc\u30b6\u540d
-.password=\u30d1\u30b9\u30ef\u30fc\u30c9
+password=\u30d1\u30b9\u30ef\u30fc\u30c9
 password2=\u30d1\u30b9\u30ef\u30fc\u30c9(\u78ba\u8a8d\u7528)
 replyToAddress=\u8fd4\u4fe1\u30a2\u30c9\u30ec\u30b9
 username=\u30e6\u30fc\u30b6\u540d

Modified: struts/sandbox/trunk/mailreader-course/action2/lab-3-1/src/webapp/pages/Welcome.jsp
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/mailreader-course/action2/lab-3-1/src/webapp/pages/Welcome.jsp?rev=394670&r1=394669&r2=394670&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/action2/lab-3-1/src/webapp/pages/Welcome.jsp (original)
+++ struts/sandbox/trunk/mailreader-course/action2/lab-3-1/src/webapp/pages/Welcome.jsp Mon Apr 17 07:06:06 2006
@@ -9,7 +9,7 @@
 </head>
 
 <body>
-<h3>MailReader Options</h3>
+<h3><ww:text name="index.heading"/></h3>
 
 <ul>
     <li><a href="<ww:url action="Register!input"/>"><ww:text

Modified: struts/sandbox/trunk/mailreader-course/action2/lab-3-2/lab-3-2.iml
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/mailreader-course/action2/lab-3-2/lab-3-2.iml?rev=394670&r1=394669&r2=394670&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/action2/lab-3-2/lab-3-2.iml (original)
+++ struts/sandbox/trunk/mailreader-course/action2/lab-3-2/lab-3-2.iml Mon Apr 17 07:06:06 2006
@@ -12,7 +12,6 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Tomcat" level="application_server_libraries" />
     <orderEntry type="module-library">
       <library>
         <CLASSES>
@@ -157,6 +156,15 @@
         <SOURCES />
       </library>
     </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://C:/opt/Apache/Tomcat-5.0/common/lib/servlet-api.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
     <orderEntryProperties />
   </component>
   <component name="WebModuleBuildComponent">
@@ -250,7 +258,11 @@
       <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" />
+    <deploymentDescriptor name="" url="file://$MODULE_DIR$/META-INF/context.xml" optional="false">
+      <option name="DEFAULT_DIR" value="WEB-INF" />
+      <option name="NAME" value="" />
+      <option name="DESCRIPTION" value="" />
+    </deploymentDescriptor>
     <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/action2/lab-3-2/src/java/Register.java
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/mailreader-course/action2/lab-3-2/src/java/Register.java?rev=394670&r1=394669&r2=394670&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/action2/lab-3-2/src/java/Register.java (original)
+++ struts/sandbox/trunk/mailreader-course/action2/lab-3-2/src/java/Register.java Mon Apr 17 07:06:06 2006
@@ -26,7 +26,7 @@
         boolean editing = (null != user);
 
         if (editing) {
-            // FIXME: Any way to call the RegisterSave validators from here?
+            // FIXME: Any way to call the RegisterCreate validators from here?
             String newPassword = getPassword();
             boolean changing = ((null != newPassword) && (newPassword.length()>0));
             if (!changing) {

Modified: struts/sandbox/trunk/mailreader-course/action2/lab-3-2/src/java/xwork.xml
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/mailreader-course/action2/lab-3-2/src/java/xwork.xml?rev=394670&r1=394669&r2=394670&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/action2/lab-3-2/src/java/xwork.xml (original)
+++ struts/sandbox/trunk/mailreader-course/action2/lab-3-2/src/java/xwork.xml Mon Apr 17 07:06:06 2006
@@ -25,7 +25,7 @@
             <result type="redirect-action">Menu</result>
         </action>
 
-        <action name="RegisterSave" class="RegisterSave">
+        <action name="RegisterCreate" class="RegisterCreate">
             <result name="input">/pages/Register.jsp</result>
             <result type="redirect-action">Menu</result>
         </action>

Modified: struts/sandbox/trunk/mailreader-course/action2/lab-3-2/src/webapp/pages/Register.jsp
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/mailreader-course/action2/lab-3-2/src/webapp/pages/Register.jsp?rev=394670&r1=394669&r2=394670&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/action2/lab-3-2/src/webapp/pages/Register.jsp (original)
+++ struts/sandbox/trunk/mailreader-course/action2/lab-3-2/src/webapp/pages/Register.jsp Mon Apr 17 07:06:06 2006
@@ -39,7 +39,7 @@
                    name="replyToAddress"/>
 
     <ww:if test="task == 'Create'">
-        <ww:submit value="%{getText('button.save')}" action="RegisterSave"/>
+        <ww:submit value="%{getText('button.save')}" action="RegisterCreate"/>
 
         <ww:reset value="%{getText('button.reset')}"/>
 

Modified: struts/sandbox/trunk/mailreader-course/action2/lab-3-3/lab-3-3.iml
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/mailreader-course/action2/lab-3-3/lab-3-3.iml?rev=394670&r1=394669&r2=394670&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/action2/lab-3-3/lab-3-3.iml (original)
+++ struts/sandbox/trunk/mailreader-course/action2/lab-3-3/lab-3-3.iml Mon Apr 17 07:06:06 2006
@@ -12,7 +12,6 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Tomcat" level="application_server_libraries" />
     <orderEntry type="module-library">
       <library>
         <CLASSES>
@@ -157,6 +156,15 @@
         <SOURCES />
       </library>
     </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://C:/opt/Apache/Tomcat-5.0/common/lib/servlet-api.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
     <orderEntryProperties />
   </component>
   <component name="WebModuleBuildComponent">
@@ -250,7 +258,11 @@
       <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" />
+    <deploymentDescriptor name="" url="file://$MODULE_DIR$/META-INF/context.xml" optional="false">
+      <option name="DEFAULT_DIR" value="WEB-INF" />
+      <option name="NAME" value="" />
+      <option name="DESCRIPTION" value="" />
+    </deploymentDescriptor>
     <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/action2/lab-3-3/src/java/xwork.xml
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/mailreader-course/action2/lab-3-3/src/java/xwork.xml?rev=394670&r1=394669&r2=394670&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/action2/lab-3-3/src/java/xwork.xml (original)
+++ struts/sandbox/trunk/mailreader-course/action2/lab-3-3/src/java/xwork.xml Mon Apr 17 07:06:06 2006
@@ -25,7 +25,7 @@
             <result type="redirect-action">Menu</result>
         </action>
 
-        <action name="RegisterSave" class="RegisterSave">
+        <action name="RegisterCreate" class="RegisterCreate">
             <result name="input">/pages/Register.jsp</result>
             <result type="redirect-action">Menu</result>
         </action>

Modified: struts/sandbox/trunk/mailreader-course/action2/lab-3-3/src/webapp/pages/Register.jsp
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/mailreader-course/action2/lab-3-3/src/webapp/pages/Register.jsp?rev=394670&r1=394669&r2=394670&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/action2/lab-3-3/src/webapp/pages/Register.jsp (original)
+++ struts/sandbox/trunk/mailreader-course/action2/lab-3-3/src/webapp/pages/Register.jsp Mon Apr 17 07:06:06 2006
@@ -39,7 +39,7 @@
                    name="replyToAddress"/>
 
     <ww:if test="task == 'Create'">
-        <ww:submit value="%{getText('button.save')}" action="RegisterSave"/>
+        <ww:submit value="%{getText('button.save')}" action="RegisterCreate"/>
 
         <ww:reset value="%{getText('button.reset')}"/>
 

Modified: struts/sandbox/trunk/mailreader-course/action2/lab-3-3/src/webapp/pages/Welcome.jsp
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/mailreader-course/action2/lab-3-3/src/webapp/pages/Welcome.jsp?rev=394670&r1=394669&r2=394670&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/action2/lab-3-3/src/webapp/pages/Welcome.jsp (original)
+++ struts/sandbox/trunk/mailreader-course/action2/lab-3-3/src/webapp/pages/Welcome.jsp Mon Apr 17 07:06:06 2006
@@ -25,6 +25,18 @@
     <li><a href="<ww:url action="Welcome?request_locale=ru"/>">Russian</a></li>
 </ul>
 
+<hr />
+
+<ww:form>
+
+<ww:doubleselect
+    label="doubleselect test1"
+    name="menu"
+    list="{'fruit','other'}"
+    doubleName="dishes"
+    doubleList="top == 'fruit'
+      ? {'apple', 'orange'} :   {'monkey', 'chicken'}" />
+</ww:form>
 </body>
 </html>
 

Modified: 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=394670&r1=394669&r2=394670&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/action2/lab-4-1/lab-4-1.iml (original)
+++ struts/sandbox/trunk/mailreader-course/action2/lab-4-1/lab-4-1.iml Mon Apr 17 07:06:06 2006
@@ -12,7 +12,6 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Tomcat" level="application_server_libraries" />
     <orderEntry type="module-library">
       <library>
         <CLASSES>
@@ -157,6 +156,15 @@
         <SOURCES />
       </library>
     </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://C:/opt/Apache/Tomcat-5.0/common/lib/servlet-api.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
     <orderEntryProperties />
   </component>
   <component name="WebModuleBuildComponent">
@@ -250,7 +258,11 @@
       <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" />
+    <deploymentDescriptor name="" url="file://$MODULE_DIR$/META-INF/context.xml" optional="false">
+      <option name="DEFAULT_DIR" value="WEB-INF" />
+      <option name="NAME" value="" />
+      <option name="DESCRIPTION" value="" />
+    </deploymentDescriptor>
     <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/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=394670&r1=394669&r2=394670&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 Mon Apr 17 07:06:06 2006
@@ -68,7 +68,7 @@
             <interceptor-ref name="guest"/>
         </action>
 
-        <action name="RegisterSave" class="RegisterSave">
+        <action name="RegisterCreate" class="RegisterCreate">
             <result name="input">/pages/Register.jsp</result>
             <result type="redirect-action">Menu</result>
             <interceptor-ref name="guest-submit" />

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=394670&r1=394669&r2=394670&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 Mon Apr 17 07:06:06 2006
@@ -40,7 +40,7 @@
                    name="replyToAddress"/>
 
     <ww:if test="task == 'Create'">
-        <ww:submit value="%{getText('button.save')}" action="RegisterSave"/>
+        <ww:submit value="%{getText('button.save')}" action="RegisterCreate"/>
 
         <ww:reset value="%{getText('button.reset')}"/>
 

Modified: struts/sandbox/trunk/mailreader-course/action2/lab-4-2/lab-4-2.iml
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/mailreader-course/action2/lab-4-2/lab-4-2.iml?rev=394670&r1=394669&r2=394670&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/action2/lab-4-2/lab-4-2.iml (original)
+++ struts/sandbox/trunk/mailreader-course/action2/lab-4-2/lab-4-2.iml Mon Apr 17 07:06:06 2006
@@ -12,7 +12,6 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Tomcat" level="application_server_libraries" />
     <orderEntry type="module-library">
       <library>
         <CLASSES>
@@ -157,6 +156,25 @@
         <SOURCES />
       </library>
     </orderEntry>
+    <orderEntry type="library" name="Tomcat" level="application_server_libraries" />
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://C:/opt/Apache/Tomcat-5.0/common/lib/servlet-api.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../lib/sitemesh-2.2.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
     <orderEntryProperties />
   </component>
   <component name="WebModuleBuildComponent">
@@ -211,6 +229,11 @@
     </containerElement>
     <containerElement type="library" level="module">
       <attribute name="method" value="1" />
+      <attribute name="URI" value="/WEB-INF/lib/sitemesh-2.2.jar" />
+      <url>jar://$MODULE_DIR$/../../lib/sitemesh-2.2.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>
@@ -251,6 +274,11 @@
     </containerElement>
     <deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/src/webapp/WEB-INF/webtest.xml" optional="false" version="2.3" />
     <deploymentDescriptor name="context.xml" url="file://$MODULE_DIR$/META-INF/context.xml" optional="false" version="5.x" />
+    <deploymentDescriptor name="" url="file://$MODULE_DIR$/META-INF/context.xml" optional="false">
+      <option name="DEFAULT_DIR" value="WEB-INF" />
+      <option name="NAME" value="" />
+      <option name="DESCRIPTION" value="" />
+    </deploymentDescriptor>
     <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/action2/lab-4-2/src/java/xwork.xml
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/mailreader-course/action2/lab-4-2/src/java/xwork.xml?rev=394670&r1=394669&r2=394670&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/action2/lab-4-2/src/java/xwork.xml (original)
+++ struts/sandbox/trunk/mailreader-course/action2/lab-4-2/src/java/xwork.xml Mon Apr 17 07:06:06 2006
@@ -38,6 +38,7 @@
         <global-results>
             <result name="error">/pages/Error.jsp</result>
             <result name="login" type="redirect-action">Login!input</result>
+            <result name="cancel" type="redirect-action">Welcome</result>
         </global-results>
 
         <global-exception-mappings>
@@ -63,12 +64,11 @@
 
         <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">
+        <action name="RegisterCreate" class="RegisterCreate">
             <result name="input">/pages/Register.jsp</result>
             <result type="redirect-action">Menu</result>
             <interceptor-ref name="guest-submit" />
@@ -84,7 +84,6 @@
 
         <action name="Login" class="Login">
             <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>

Modified: struts/sandbox/trunk/mailreader-course/action2/lab-4-2/src/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/mailreader-course/action2/lab-4-2/src/webapp/WEB-INF/web.xml?rev=394670&r1=394669&r2=394670&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/action2/lab-4-2/src/webapp/WEB-INF/web.xml (original)
+++ struts/sandbox/trunk/mailreader-course/action2/lab-4-2/src/webapp/WEB-INF/web.xml Mon Apr 17 07:06:06 2006
@@ -10,9 +10,19 @@
     </context-param>
 
     <filter>
+        <filter-name>sitemesh</filter-name>
+        <filter-class>com.opensymphony.module.sitemesh.filter.PageFilter</filter-class>
+    </filter>
+
+    <filter>
         <filter-name>webwork</filter-name>
         <filter-class>com.opensymphony.webwork.dispatcher.FilterDispatcher</filter-class>
     </filter>
+
+    <filter-mapping>
+        <filter-name>sitemesh</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
 
     <filter-mapping>
         <filter-name>webwork</filter-name>

Modified: struts/sandbox/trunk/mailreader-course/action2/lab-4-2/src/webapp/pages/Hello.jsp
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/mailreader-course/action2/lab-4-2/src/webapp/pages/Hello.jsp?rev=394670&r1=394669&r2=394670&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/action2/lab-4-2/src/webapp/pages/Hello.jsp (original)
+++ struts/sandbox/trunk/mailreader-course/action2/lab-4-2/src/webapp/pages/Hello.jsp Mon Apr 17 07:06:06 2006
@@ -10,7 +10,5 @@
 <body>
 <h2><ww:text name="hello.nessage"/></h2>
 
-<jsp:include page="Footer.jsp"/>
-
 </body>
 </html>

Modified: struts/sandbox/trunk/mailreader-course/action2/lab-4-2/src/webapp/pages/Login.jsp
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/mailreader-course/action2/lab-4-2/src/webapp/pages/Login.jsp?rev=394670&r1=394669&r2=394670&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/action2/lab-4-2/src/webapp/pages/Login.jsp (original)
+++ struts/sandbox/trunk/mailreader-course/action2/lab-4-2/src/webapp/pages/Login.jsp Mon Apr 17 07:06:06 2006
@@ -5,8 +5,6 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
     <title><ww:text name="login.title"/></title>
-    <link href="<ww:url value="/css/mailreader.css"/>" rel="stylesheet"
-          type="text/css"/>
 </head>
 
 <body onLoad="self.focus();document.Login.username.focus()">
@@ -22,8 +20,6 @@
     <ww:submit action="Login!cancel" value="%{getText('button.cancel')}" name="Cancel"
                onclick="form.onsubmit=null"/>
 </ww:form>
-
-<jsp:include page="Footer.jsp"/>
 
 </body>
 </html>

Modified: struts/sandbox/trunk/mailreader-course/action2/lab-4-2/src/webapp/pages/Menu.jsp
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/mailreader-course/action2/lab-4-2/src/webapp/pages/Menu.jsp?rev=394670&r1=394669&r2=394670&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/action2/lab-4-2/src/webapp/pages/Menu.jsp (original)
+++ struts/sandbox/trunk/mailreader-course/action2/lab-4-2/src/webapp/pages/Menu.jsp Mon Apr 17 07:06:06 2006
@@ -21,7 +21,5 @@
     </a>
 </ul>
 
-<jsp:include page="Footer.jsp"/>
-
 </body>
 </html>

Modified: struts/sandbox/trunk/mailreader-course/action2/lab-4-2/src/webapp/pages/Missing.jsp
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/mailreader-course/action2/lab-4-2/src/webapp/pages/Missing.jsp?rev=394670&r1=394669&r2=394670&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/action2/lab-4-2/src/webapp/pages/Missing.jsp (original)
+++ struts/sandbox/trunk/mailreader-course/action2/lab-4-2/src/webapp/pages/Missing.jsp Mon Apr 17 07:06:06 2006
@@ -12,7 +12,5 @@
     Please try again in the next interation.
 </p>
 
-<jsp:include page="Footer.jsp"/>
-
 </body>
 </html>

Modified: struts/sandbox/trunk/mailreader-course/action2/lab-4-2/src/webapp/pages/Register.jsp
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/mailreader-course/action2/lab-4-2/src/webapp/pages/Register.jsp?rev=394670&r1=394669&r2=394670&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/action2/lab-4-2/src/webapp/pages/Register.jsp (original)
+++ struts/sandbox/trunk/mailreader-course/action2/lab-4-2/src/webapp/pages/Register.jsp Mon Apr 17 07:06:06 2006
@@ -10,11 +10,9 @@
     <ww:if test="task=='Edit'">
         <title><ww:text name="registration.title.edit"/></title>
     </ww:if>
-    <link href="<ww:url value="/css/mailreader.css"/>" rel="stylesheet"
-          type="text/css"/>
 </head>
 
-<body onLoad="self.focus();document.Register.username.focus()">
+<body>
 
 <ww:actionerror/>
 <ww:form method="POST" validate="true">
@@ -42,7 +40,7 @@
                    name="replyToAddress"/>
 
     <ww:if test="task == 'Create'">
-        <ww:submit value="%{getText('button.save')}" action="RegisterSave"/>
+        <ww:submit value="%{getText('button.save')}" action="RegisterCreate"/>
 
         <ww:reset value="%{getText('button.reset')}"/>
 
@@ -119,8 +117,6 @@
             name="registration.addSubscription"/></a>
 
 </ww:if>
-
-<jsp:include page="Footer.jsp"/>
 
 </body>
 </html>

Modified: struts/sandbox/trunk/mailreader-course/action2/lab-4-2/src/webapp/pages/Subscribe.jsp
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/mailreader-course/action2/lab-4-2/src/webapp/pages/Subscribe.jsp?rev=394670&r1=394669&r2=394670&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/action2/lab-4-2/src/webapp/pages/Subscribe.jsp (original)
+++ struts/sandbox/trunk/mailreader-course/action2/lab-4-2/src/webapp/pages/Subscribe.jsp Mon Apr 17 07:06:06 2006
@@ -13,8 +13,6 @@
     <ww:if test="task=='Delete'">
         <title><ww:text name="subscription.title.delete"/></title>
     </ww:if>
-    <link href="<ww:url value="/css/mailreader.css"/>" rel="stylesheet"
-          type="text/css"/>
 </head>
 
 <body onLoad="self.focus();document.Subscribe.username.focus()">
@@ -61,8 +59,6 @@
                 value="%{getText('button.cancel')}"
                 onclick="form.onsubmit=null"/>
 </ww:form>
-
-<jsp:include page="Footer.jsp"/>
 
 </body>
 </html>

Modified: struts/sandbox/trunk/mailreader-course/action2/lab-4-2/src/webapp/pages/Welcome.jsp
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/mailreader-course/action2/lab-4-2/src/webapp/pages/Welcome.jsp?rev=394670&r1=394669&r2=394670&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/action2/lab-4-2/src/webapp/pages/Welcome.jsp (original)
+++ struts/sandbox/trunk/mailreader-course/action2/lab-4-2/src/webapp/pages/Welcome.jsp Mon Apr 17 07:06:06 2006
@@ -6,8 +6,6 @@
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
     <title><ww:text name="index.title"/></title>
-    <link href="<ww:url value="/css/mailreader.css"/>" rel="stylesheet"
-          type="text/css"/>
 </head>
 
 <body>
@@ -26,8 +24,6 @@
     <li><a href="<ww:url action="Welcome?request_locale=ja"/>">Japanese</a></li>
     <li><a href="<ww:url action="Welcome?request_locale=ru"/>">Russian</a></li>
 </ul>
-
-<jsp:include page="Footer.jsp"/>
 
 </body>
 </html>



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org
For additional commands, e-mail: dev-help@struts.apache.org


Mime
View raw message