Return-Path: 
 <commits-return-2971-apmail-struts-commits-archive=struts.apache.org@struts.apache.org>
Delivered-To: apmail-struts-commits-archive@locus.apache.org
Received: (qmail 38391 invoked from network); 21 Jan 2007 15:55:34 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 21 Jan 2007 15:55:34 -0000
Received: (qmail 82795 invoked by uid 500); 21 Jan 2007 15:55:40 -0000
Delivered-To: apmail-struts-commits-archive@struts.apache.org
Received: (qmail 82249 invoked by uid 500); 21 Jan 2007 15:55:38 -0000
Mailing-List: contact commits-help@struts.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@struts.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@struts.apache.org>
List-Post: <mailto:commits@struts.apache.org>
List-Id: <commits.struts.apache.org>
Reply-To: dev@struts.apache.org
Delivered-To: mailing list commits@struts.apache.org
Received: (qmail 82240 invoked by uid 99); 21 Jan 2007 15:55:38 -0000
Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 21 Jan 2007 07:55:38 -0800
X-ASF-Spam-Status: No, hits=-9.4 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 21 Jan 2007 07:55:29 -0800
Received: by eris.apache.org (Postfix, from userid 65534)
	id 6C04C1A981C; Sun, 21 Jan 2007 07:54:23 -0800 (PST)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Subject: svn commit: r498380 - in
 /struts/sandbox/trunk/mailreader-course/struts2: ./
 browse/ browse/src/java/ hello/ localize/ localize/src/java/ logout/
 logout/src/java/ menu/ menu/src/java/ migrating/ migrating/META-INF/
 migrating/src/ migrating/src/main/ mi...
Date: Sun, 21 Jan 2007 15:54:20 -0000
To: commits@struts.apache.org
From: husted@apache.org
X-Mailer: svnmailer-1.1.0
Message-Id: <20070121155423.6C04C1A981C@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: husted
Date: Sun Jan 21 07:54:18 2007
New Revision: 498380

URL: http://svn.apache.org/viewvc?view=rev&rev=498380
Log:
mailreader-course Update configurations for Struts 2.0.3. Add migrating lab from ApacheCon tutorial. 


Added:
    struts/sandbox/trunk/mailreader-course/struts2/migrating/
    struts/sandbox/trunk/mailreader-course/struts2/migrating/META-INF/
    struts/sandbox/trunk/mailreader-course/struts2/migrating/META-INF/context.xml
    struts/sandbox/trunk/mailreader-course/struts2/migrating/migrating.iml
    struts/sandbox/trunk/mailreader-course/struts2/migrating/pom.xml
    struts/sandbox/trunk/mailreader-course/struts2/migrating/src/
    struts/sandbox/trunk/mailreader-course/struts2/migrating/src/main/
    struts/sandbox/trunk/mailreader-course/struts2/migrating/src/main/java/
    struts/sandbox/trunk/mailreader-course/struts2/migrating/src/main/java/MessageResources.properties
    struts/sandbox/trunk/mailreader-course/struts2/migrating/src/main/java/actions/
    struts/sandbox/trunk/mailreader-course/struts2/migrating/src/main/java/actions/Hello-validation.xml
    struts/sandbox/trunk/mailreader-course/struts2/migrating/src/main/java/actions/Hello.java
    struts/sandbox/trunk/mailreader-course/struts2/migrating/src/main/java/actions/HelloAction.java
    struts/sandbox/trunk/mailreader-course/struts2/migrating/src/main/java/actions/HelloForm.java
    struts/sandbox/trunk/mailreader-course/struts2/migrating/src/main/java/actions/LocaleAction.java
    struts/sandbox/trunk/mailreader-course/struts2/migrating/src/main/java/actions/build.bat
    struts/sandbox/trunk/mailreader-course/struts2/migrating/src/main/java/struts-config.xml
    struts/sandbox/trunk/mailreader-course/struts2/migrating/src/main/java/struts.xml
    struts/sandbox/trunk/mailreader-course/struts2/migrating/src/main/java/validation.xml
    struts/sandbox/trunk/mailreader-course/struts2/migrating/src/main/resources/
    struts/sandbox/trunk/mailreader-course/struts2/migrating/src/main/resources/actions/
    struts/sandbox/trunk/mailreader-course/struts2/migrating/src/main/resources/actions/build.bat
    struts/sandbox/trunk/mailreader-course/struts2/migrating/src/main/resources/resources.properties
    struts/sandbox/trunk/mailreader-course/struts2/migrating/src/main/resources/resources_es.properties
    struts/sandbox/trunk/mailreader-course/struts2/migrating/src/main/resources/struts.properties
    struts/sandbox/trunk/mailreader-course/struts2/migrating/src/main/webapp/
    struts/sandbox/trunk/mailreader-course/struts2/migrating/src/main/webapp/Hello.jsp
    struts/sandbox/trunk/mailreader-course/struts2/migrating/src/main/webapp/HelloInput.jsp
    struts/sandbox/trunk/mailreader-course/struts2/migrating/src/main/webapp/HelloPage.jsp
    struts/sandbox/trunk/mailreader-course/struts2/migrating/src/main/webapp/Hello_input.jsp
    struts/sandbox/trunk/mailreader-course/struts2/migrating/src/main/webapp/WEB-INF/
    struts/sandbox/trunk/mailreader-course/struts2/migrating/src/main/webapp/WEB-INF/struts-config.xml
    struts/sandbox/trunk/mailreader-course/struts2/migrating/src/main/webapp/WEB-INF/validation.xml
    struts/sandbox/trunk/mailreader-course/struts2/migrating/src/main/webapp/WEB-INF/web.xml
    struts/sandbox/trunk/mailreader-course/struts2/migrating/src/main/webapp/index.html
Modified:
    struts/sandbox/trunk/mailreader-course/struts2/browse/browse.iml
    struts/sandbox/trunk/mailreader-course/struts2/browse/src/java/DatabaseListener.java
    struts/sandbox/trunk/mailreader-course/struts2/hello/hello.iml
    struts/sandbox/trunk/mailreader-course/struts2/localize/localize.iml
    struts/sandbox/trunk/mailreader-course/struts2/localize/src/java/DatabaseListener.java
    struts/sandbox/trunk/mailreader-course/struts2/logout/logout.iml
    struts/sandbox/trunk/mailreader-course/struts2/logout/src/java/DatabaseListener.java
    struts/sandbox/trunk/mailreader-course/struts2/mailreader-course-struts2.ipr
    struts/sandbox/trunk/mailreader-course/struts2/menu/menu.iml
    struts/sandbox/trunk/mailreader-course/struts2/menu/src/java/DatabaseListener.java
    struts/sandbox/trunk/mailreader-course/struts2/profile/profile.iml
    struts/sandbox/trunk/mailreader-course/struts2/profile/src/java/DatabaseListener.java
    struts/sandbox/trunk/mailreader-course/struts2/register/register.iml
    struts/sandbox/trunk/mailreader-course/struts2/register/src/java/DatabaseListener.java
    struts/sandbox/trunk/mailreader-course/struts2/register2/register2.iml
    struts/sandbox/trunk/mailreader-course/struts2/register2/src/java/DatabaseListener.java
    struts/sandbox/trunk/mailreader-course/struts2/retain/retain.iml
    struts/sandbox/trunk/mailreader-course/struts2/subscribe/src/java/DatabaseListener.java
    struts/sandbox/trunk/mailreader-course/struts2/subscribe/subscribe.iml
    struts/sandbox/trunk/mailreader-course/struts2/theme/src/java/DatabaseListener.java
    struts/sandbox/trunk/mailreader-course/struts2/theme/theme.iml
    struts/sandbox/trunk/mailreader-course/struts2/welcome/welcome.iml

Modified: struts/sandbox/trunk/mailreader-course/struts2/browse/browse.iml
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/browse/browse.iml?view=diff&rev=498380&r1=498379&r2=498380
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/browse/browse.iml (original)
+++ struts/sandbox/trunk/mailreader-course/struts2/browse/browse.iml Sun Jan 21 07:54:18 2007
@@ -15,8 +15,8 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="Struts2" level="project" />
     <orderEntry type="library" name="junit" level="application" />
-    <orderEntry type="library" name="servlet-api" level="application" />
     <orderEntry type="library" name="Mailreader-dao" level="project" />
+    <orderEntry type="library" name="servlet-api" level="application" />
     <orderEntryProperties />
   </component>
   <component name="WebModuleBuildComponent">
@@ -31,8 +31,8 @@
   </component>
   <component name="WebModuleProperties">
     <containerElement type="library" name="junit" level="application">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib" />
+      <attribute name="method" value="0" />
+      <attribute name="URI" value="&lt;N/A&gt;" />
     </containerElement>
     <containerElement type="library" name="Mailreader-dao" level="project">
       <attribute name="method" value="1" />

Modified: struts/sandbox/trunk/mailreader-course/struts2/browse/src/java/DatabaseListener.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/browse/src/java/DatabaseListener.java?view=diff&rev=498380&r1=498379&r2=498380
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/browse/src/java/DatabaseListener.java (original)
+++ struts/sandbox/trunk/mailreader-course/struts2/browse/src/java/DatabaseListener.java Sun Jan 21 07:54:18 2007
@@ -186,6 +186,7 @@
      * <p>Calculate and return an absolute pathname to the XML file to contain
      * our persistent storage information.</p>
      *
+     * @return Absolute path to XML file.
      * @throws Exception if an input/output error occurs
      */
     private String calculatePath() throws Exception {

Modified: struts/sandbox/trunk/mailreader-course/struts2/hello/hello.iml
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/hello/hello.iml?view=diff&rev=498380&r1=498379&r2=498380
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/hello/hello.iml (original)
+++ struts/sandbox/trunk/mailreader-course/struts2/hello/hello.iml Sun Jan 21 07:54:18 2007
@@ -30,8 +30,8 @@
   </component>
   <component name="WebModuleProperties">
     <containerElement type="library" name="junit" level="application">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib" />
+      <attribute name="method" value="0" />
+      <attribute name="URI" value="&lt;N/A&gt;" />
     </containerElement>
     <containerElement type="library" name="Mailreader-dao" level="project">
       <attribute name="method" value="1" />

Modified: struts/sandbox/trunk/mailreader-course/struts2/localize/localize.iml
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/localize/localize.iml?view=diff&rev=498380&r1=498379&r2=498380
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/localize/localize.iml (original)
+++ struts/sandbox/trunk/mailreader-course/struts2/localize/localize.iml Sun Jan 21 07:54:18 2007
@@ -15,8 +15,8 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="Struts2" level="project" />
     <orderEntry type="library" name="junit" level="application" />
-    <orderEntry type="library" name="servlet-api" level="application" />
     <orderEntry type="library" name="Mailreader-dao" level="project" />
+    <orderEntry type="library" name="servlet-api" level="application" />
     <orderEntryProperties />
   </component>
   <component name="WebModuleBuildComponent">
@@ -31,8 +31,8 @@
   </component>
   <component name="WebModuleProperties">
     <containerElement type="library" name="junit" level="application">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib" />
+      <attribute name="method" value="0" />
+      <attribute name="URI" value="&lt;N/A&gt;" />
     </containerElement>
     <containerElement type="library" name="Mailreader-dao" level="project">
       <attribute name="method" value="1" />

Modified: struts/sandbox/trunk/mailreader-course/struts2/localize/src/java/DatabaseListener.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/localize/src/java/DatabaseListener.java?view=diff&rev=498380&r1=498379&r2=498380
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/localize/src/java/DatabaseListener.java (original)
+++ struts/sandbox/trunk/mailreader-course/struts2/localize/src/java/DatabaseListener.java Sun Jan 21 07:54:18 2007
@@ -186,6 +186,7 @@
      * <p>Calculate and return an absolute pathname to the XML file to contain
      * our persistent storage information.</p>
      *
+     * @return Absolute path to XML file.
      * @throws Exception if an input/output error occurs
      */
     private String calculatePath() throws Exception {

Modified: struts/sandbox/trunk/mailreader-course/struts2/logout/logout.iml
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/logout/logout.iml?view=diff&rev=498380&r1=498379&r2=498380
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/logout/logout.iml (original)
+++ struts/sandbox/trunk/mailreader-course/struts2/logout/logout.iml Sun Jan 21 07:54:18 2007
@@ -15,8 +15,8 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="Struts2" level="project" />
     <orderEntry type="library" name="junit" level="application" />
-    <orderEntry type="library" name="servlet-api" level="application" />
     <orderEntry type="library" name="Mailreader-dao" level="project" />
+    <orderEntry type="library" name="servlet-api" level="application" />
     <orderEntryProperties />
   </component>
   <component name="WebModuleBuildComponent">
@@ -31,8 +31,8 @@
   </component>
   <component name="WebModuleProperties">
     <containerElement type="library" name="junit" level="application">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib" />
+      <attribute name="method" value="0" />
+      <attribute name="URI" value="&lt;N/A&gt;" />
     </containerElement>
     <containerElement type="library" name="Mailreader-dao" level="project">
       <attribute name="method" value="1" />

Modified: struts/sandbox/trunk/mailreader-course/struts2/logout/src/java/DatabaseListener.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/logout/src/java/DatabaseListener.java?view=diff&rev=498380&r1=498379&r2=498380
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/logout/src/java/DatabaseListener.java (original)
+++ struts/sandbox/trunk/mailreader-course/struts2/logout/src/java/DatabaseListener.java Sun Jan 21 07:54:18 2007
@@ -186,6 +186,7 @@
      * <p>Calculate and return an absolute pathname to the XML file to contain
      * our persistent storage information.</p>
      *
+     * @return Absolute path to XML file.
      * @throws Exception if an input/output error occurs
      */
     private String calculatePath() throws Exception {

Modified: struts/sandbox/trunk/mailreader-course/struts2/mailreader-course-struts2.ipr
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/mailreader-course-struts2.ipr?view=diff&rev=498380&r1=498379&r2=498380
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/mailreader-course-struts2.ipr (original)
+++ struts/sandbox/trunk/mailreader-course/struts2/mailreader-course-struts2.ipr Sun Jan 21 07:54:18 2007
@@ -265,6 +265,7 @@
       <module fileurl="file://$PROJECT_DIR$/logout/logout.iml" filepath="$PROJECT_DIR$/logout/logout.iml" />
       <module fileurl="file://$PROJECT_DIR$/mailreader-course-struts2.iml" filepath="$PROJECT_DIR$/mailreader-course-struts2.iml" />
       <module fileurl="file://$PROJECT_DIR$/menu/menu.iml" filepath="$PROJECT_DIR$/menu/menu.iml" />
+      <module fileurl="file://$PROJECT_DIR$/migrating/migrating.iml" filepath="$PROJECT_DIR$/migrating/migrating.iml" />
       <module fileurl="file://$PROJECT_DIR$/profile/profile.iml" filepath="$PROJECT_DIR$/profile/profile.iml" />
       <module fileurl="file://$PROJECT_DIR$/register/register.iml" filepath="$PROJECT_DIR$/register/register.iml" />
       <module fileurl="file://$PROJECT_DIR$/register2/register2.iml" filepath="$PROJECT_DIR$/register2/register2.iml" />
@@ -282,31 +283,36 @@
       <option name="PORT" value="8080" />
       <option name="LOCAL" value="true" />
       <option name="OPEN_IN_BROWSER" value="true" />
-      <option name="OPEN_IN_BROWSER_URL" value="http://localhost:8080/welcome" />
+      <option name="OPEN_IN_BROWSER_URL" value="http://localhost:8080/migrating" />
       <option name="COMMON_VM_ARGUMENTS" value="" />
       <J2EE_MODULE DEPLOYMENT_SOURCE_NAME="exploded">
         <option name="CONTEXT_PATH" value="/" />
-        <option name="MODULE_NAME" value="retain" />
+        <option name="MODULE_NAME" value="theme" />
         <option name="DEPLOY" value="false" />
       </J2EE_MODULE>
       <J2EE_MODULE DEPLOYMENT_SOURCE_NAME="exploded">
         <option name="CONTEXT_PATH" value="/" />
-        <option name="MODULE_NAME" value="theme" />
+        <option name="MODULE_NAME" value="hello" />
         <option name="DEPLOY" value="false" />
       </J2EE_MODULE>
       <J2EE_MODULE DEPLOYMENT_SOURCE_NAME="exploded">
         <option name="CONTEXT_PATH" value="/" />
-        <option name="MODULE_NAME" value="subscribe" />
+        <option name="MODULE_NAME" value="welcome" />
+        <option name="DEPLOY" value="true" />
+      </J2EE_MODULE>
+      <J2EE_MODULE DEPLOYMENT_SOURCE_NAME="exploded">
+        <option name="CONTEXT_PATH" value="/" />
+        <option name="MODULE_NAME" value="profile" />
         <option name="DEPLOY" value="false" />
       </J2EE_MODULE>
       <J2EE_MODULE DEPLOYMENT_SOURCE_NAME="exploded">
         <option name="CONTEXT_PATH" value="/" />
-        <option name="MODULE_NAME" value="welcome" />
-        <option name="DEPLOY" value="true" />
+        <option name="MODULE_NAME" value="subscribe" />
+        <option name="DEPLOY" value="false" />
       </J2EE_MODULE>
       <J2EE_MODULE DEPLOYMENT_SOURCE_NAME="exploded">
         <option name="CONTEXT_PATH" value="/" />
-        <option name="MODULE_NAME" value="hello" />
+        <option name="MODULE_NAME" value="retain" />
         <option name="DEPLOY" value="false" />
       </J2EE_MODULE>
       <J2EE_MODULE DEPLOYMENT_SOURCE_NAME="exploded">
@@ -316,12 +322,12 @@
       </J2EE_MODULE>
       <J2EE_MODULE DEPLOYMENT_SOURCE_NAME="exploded">
         <option name="CONTEXT_PATH" value="/" />
-        <option name="MODULE_NAME" value="logout" />
+        <option name="MODULE_NAME" value="migrating" />
         <option name="DEPLOY" value="false" />
       </J2EE_MODULE>
       <J2EE_MODULE DEPLOYMENT_SOURCE_NAME="exploded">
         <option name="CONTEXT_PATH" value="/" />
-        <option name="MODULE_NAME" value="profile" />
+        <option name="MODULE_NAME" value="menu" />
         <option name="DEPLOY" value="false" />
       </J2EE_MODULE>
       <J2EE_MODULE DEPLOYMENT_SOURCE_NAME="exploded">
@@ -331,17 +337,17 @@
       </J2EE_MODULE>
       <J2EE_MODULE DEPLOYMENT_SOURCE_NAME="exploded">
         <option name="CONTEXT_PATH" value="/" />
-        <option name="MODULE_NAME" value="menu" />
+        <option name="MODULE_NAME" value="logout" />
         <option name="DEPLOY" value="false" />
       </J2EE_MODULE>
       <J2EE_MODULE DEPLOYMENT_SOURCE_NAME="exploded">
         <option name="CONTEXT_PATH" value="/" />
-        <option name="MODULE_NAME" value="register" />
+        <option name="MODULE_NAME" value="localize" />
         <option name="DEPLOY" value="false" />
       </J2EE_MODULE>
       <J2EE_MODULE DEPLOYMENT_SOURCE_NAME="exploded">
         <option name="CONTEXT_PATH" value="/" />
-        <option name="MODULE_NAME" value="localize" />
+        <option name="MODULE_NAME" value="register" />
         <option name="DEPLOY" value="false" />
       </J2EE_MODULE>
       <option name="DEPLOY_TOMCAT_MANAGER" value="false" />
@@ -407,13 +413,13 @@
   <component name="libraryTable">
     <library name="Struts2">
       <CLASSES>
-        <root url="jar://$PROJECT_DIR$/lib/freemarker-2.3.4.jar!/" />
         <root url="jar://$PROJECT_DIR$/lib/struts-core-1.3.5.jar!/" />
         <root url="jar://$PROJECT_DIR$/lib/struts2-api-2.0.3.jar!/" />
         <root url="jar://$PROJECT_DIR$/lib/ognl-2.6.9.jar!/" />
         <root url="jar://$PROJECT_DIR$/lib/commons-logging-1.0.4.jar!/" />
         <root url="jar://$PROJECT_DIR$/lib/xwork-2.0.0.jar!/" />
         <root url="jar://$PROJECT_DIR$/lib/struts2-core-2.0.3.jar!/" />
+        <root url="jar://$PROJECT_DIR$/lib/freemarker-2-3-8.jar!/" />
       </CLASSES>
       <JAVADOC />
       <SOURCES />
@@ -425,6 +431,22 @@
         <root url="jar://$PROJECT_DIR$/lib/oscore.jar!/" />
         <root url="jar://$PROJECT_DIR$/lib/commons-digester-1.6.jar!/" />
         <root url="jar://$PROJECT_DIR$/lib/commons-collections-3.1.jar!/" />
+      </CLASSES>
+      <JAVADOC />
+      <SOURCES />
+    </library>
+    <library name="Struts1">
+      <CLASSES>
+        <root url="jar://$PROJECT_DIR$/lib/oro-2.0.8.jar!/" />
+        <root url="jar://$PROJECT_DIR$/lib/commons-collections-3.1.jar!/" />
+        <root url="jar://$PROJECT_DIR$/lib/commons-beanutils-1.6.jar!/" />
+        <root url="jar://$PROJECT_DIR$/lib/struts-core-1.3.5.jar!/" />
+        <root url="jar://$PROJECT_DIR$/lib/commons-chain-1.1.jar!/" />
+        <root url="jar://$PROJECT_DIR$/lib/commons-logging-1.0.4.jar!/" />
+        <root url="jar://$PROJECT_DIR$/lib/commons-digester-1.6.jar!/" />
+        <root url="jar://$PROJECT_DIR$/lib/commons-validator-1.3.0.jar!/" />
+        <root url="jar://$PROJECT_DIR$/lib/antlr-2.7.2.jar!/" />
+        <root url="jar://$PROJECT_DIR$/lib/struts-taglib-1.3.5.jar!/" />
       </CLASSES>
       <JAVADOC />
       <SOURCES />

Modified: struts/sandbox/trunk/mailreader-course/struts2/menu/menu.iml
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/menu/menu.iml?view=diff&rev=498380&r1=498379&r2=498380
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/menu/menu.iml (original)
+++ struts/sandbox/trunk/mailreader-course/struts2/menu/menu.iml Sun Jan 21 07:54:18 2007
@@ -15,8 +15,8 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="Struts2" level="project" />
     <orderEntry type="library" name="junit" level="application" />
-    <orderEntry type="library" name="servlet-api" level="application" />
     <orderEntry type="library" name="Mailreader-dao" level="project" />
+    <orderEntry type="library" name="servlet-api" level="application" />
     <orderEntryProperties />
   </component>
   <component name="WebModuleBuildComponent">
@@ -31,8 +31,8 @@
   </component>
   <component name="WebModuleProperties">
     <containerElement type="library" name="junit" level="application">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib" />
+      <attribute name="method" value="0" />
+      <attribute name="URI" value="&lt;N/A&gt;" />
     </containerElement>
     <containerElement type="library" name="Mailreader-dao" level="project">
       <attribute name="method" value="1" />

Modified: struts/sandbox/trunk/mailreader-course/struts2/menu/src/java/DatabaseListener.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/menu/src/java/DatabaseListener.java?view=diff&rev=498380&r1=498379&r2=498380
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/menu/src/java/DatabaseListener.java (original)
+++ struts/sandbox/trunk/mailreader-course/struts2/menu/src/java/DatabaseListener.java Sun Jan 21 07:54:18 2007
@@ -186,6 +186,7 @@
      * <p>Calculate and return an absolute pathname to the XML file to contain
      * our persistent storage information.</p>
      *
+     * @return Absolute path to XML file.
      * @throws Exception if an input/output error occurs
      */
     private String calculatePath() throws Exception {

Added: struts/sandbox/trunk/mailreader-course/struts2/migrating/META-INF/context.xml
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/migrating/META-INF/context.xml?view=auto&rev=498380
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/migrating/META-INF/context.xml (added)
+++ struts/sandbox/trunk/mailreader-course/struts2/migrating/META-INF/context.xml Sun Jan 21 07:54:18 2007
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Context path="/">
+</Context>

Added: struts/sandbox/trunk/mailreader-course/struts2/migrating/migrating.iml
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/migrating/migrating.iml?view=auto&rev=498380
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/migrating/migrating.iml (added)
+++ struts/sandbox/trunk/mailreader-course/struts2/migrating/migrating.iml Sun Jan 21 07:54:18 2007
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module version="4" relativePaths="true" type="J2EE_WEB_MODULE">
+  <component name="AppServerSpecificValidatorsManager" />
+  <component name="ModuleRootManager" />
+  <component name="NewModuleRootManager" inherit-compiler-output="false">
+    <output url="file://$MODULE_DIR$/../../../../../../../opt/Apache/Tomcat-5.5/webapps/migrating/WEB-INF/classes" />
+    <exclude-output />
+    <exploded url="file://$MODULE_DIR$/../../../../../../../opt/Apache/Tomcat-5.5/webapps/migrating" />
+    <exclude-exploded />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$APPLICATION_HOME_DIR$/lib/j2ee.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="library" name="Struts1" level="project" />
+    <orderEntry type="library" name="Struts2" level="project" />
+    <orderEntryProperties />
+  </component>
+  <component name="WebModuleBuildComponent">
+    <setting name="EXPLODED_URL" value="file://$MODULE_DIR$/../../../../../../../opt/Apache/Tomcat-5.5/webapps/migrating" />
+    <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_MODULE_ON_FRAME_DEACTIVATION" value="false" />
+    <setting name="BUILD_EXTERNAL_DEPENDENCIES" value="false" />
+    <setting name="RUN_JASPER_VALIDATION" value="true" />
+  </component>
+  <component name="WebModuleProperties">
+    <containerElement type="library" level="module">
+      <attribute name="method" value="0" />
+      <attribute name="URI" value="&lt;N/A&gt;" />
+      <url>jar://$APPLICATION_HOME_DIR$/lib/j2ee.jar!/</url>
+    </containerElement>
+    <containerElement type="library" name="Struts1" level="project">
+      <attribute name="method" value="1" />
+      <attribute name="URI" value="/WEB-INF/lib" />
+    </containerElement>
+    <containerElement type="library" name="Struts2" level="project">
+      <attribute name="method" value="1" />
+      <attribute name="URI" value="/WEB-INF/lib" />
+    </containerElement>
+    <deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/src/main/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/main/resources" relative="/WEB-INF/classes" />
+      <root url="file://$MODULE_DIR$/src/main/webapp" relative="/" />
+    </webroots>
+  </component>
+  <component name="WeblogicWebModuleProperties" />
+</module>
+

Added: struts/sandbox/trunk/mailreader-course/struts2/migrating/pom.xml
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/migrating/pom.xml?view=auto&rev=498380
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/migrating/pom.xml (added)
+++ struts/sandbox/trunk/mailreader-course/struts2/migrating/pom.xml Sun Jan 21 07:54:18 2007
@@ -0,0 +1,204 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>migrating-tutorial</groupId>
+    <artifactId>migrating-tutorial</artifactId>
+    <packaging>war</packaging>
+    <version>1.0-SNAPSHOT</version>
+    <name>Migrating to Apache Struts 2</name>
+    <url>http://www.planetstruts.org/migrating</url>
+    <organization>
+        <name>Struts Mentor</name>
+        <url>http://www.strutsmentor.com</url>
+    </organization>
+    <licenses>
+        <license>
+            <name>Apache License 2.0</name>
+            <url>http://www.apache.org/LICENSE.txt</url>
+            <comments>see http://www.apache.org/LICENSE.txt</comments>
+        </license>
+    </licenses>
+    <build>
+        <resources>
+            <!-- Include resources under src/main/java in WEB-INF/classes -->
+            <resource>
+                <directory>src/main/java</directory>
+                <includes>
+                    <include>**/*.properties</include>
+                    <include>**/*.xml</include>
+                </includes>
+            </resource>
+            <resource>
+                <directory>src/main/resources</directory>
+            </resource>
+        </resources>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>1.5</source>
+                    <target>1.5</target>
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <includes>
+                        <include>**/*Test.java</include>
+                    </includes>
+                    <excludes>
+                        <exclude>**/XWorkTestCase.java</exclude>
+                    </excludes>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>attach-javadoc</id>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-source-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>attach-source</id>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.mortbay.jetty</groupId>
+                <artifactId>maven-jetty6-plugin</artifactId>
+                <configuration>
+                    <scanIntervalSeconds>10</scanIntervalSeconds>
+                </configuration>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.apache.geronimo.specs</groupId>
+                        <artifactId>geronimo-j2ee_1.4_spec</artifactId>
+                        <version>1.0</version>
+                        <scope>provided</scope>
+                    </dependency>
+                </dependencies>
+            </plugin>
+        </plugins>
+        <defaultGoal>install</defaultGoal>
+    </build>
+
+    <dependencies>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>3.8.1</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>opensymphony</groupId>
+            <artifactId>xwork</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.struts</groupId>
+            <artifactId>struts2-api</artifactId>
+            <version>2.0.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.struts</groupId>
+            <artifactId>struts2-core</artifactId>
+            <version>2.0.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.struts</groupId>
+            <artifactId>struts2-extras</artifactId>
+            <version>2.0.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-aop</artifactId>
+            <version>1.2.8</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-web</artifactId>
+            <version>1.2.8</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-beans</artifactId>
+            <version>1.2.8</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context</artifactId>
+            <version>1.2.8</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-core</artifactId>
+            <version>1.2.8</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-mock</artifactId>
+            <version>1.2.8</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>servlet-api</artifactId>
+            <version>2.3</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.struts</groupId>
+            <artifactId>struts-core</artifactId>
+            <version>1.3.5</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.struts</groupId>
+            <artifactId>struts-taglib</artifactId>
+            <version>1.3.5</version>
+        </dependency>
+
+        <!--dependency>
+           <groupId>org.apache.struts</groupId>
+           <artifactId>struts-tiles</artifactId>
+           <version>1.3.5</version>
+        </dependency-->
+
+        <!--dependency>
+           <groupId>org.apache.struts</groupId>
+           <artifactId>struts-extras</artifactId>
+           <version>1.3.5</version>
+        </dependency-->
+
+        <!--dependency>
+          <groupId>org.apache.struts</groupId>
+          <artifactId>struts-el</artifactId>
+          <version>1.3.5</version>
+       </dependency>
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>jstl</artifactId>
+            <version>1.0.4</version>
+        </dependency>
+        <dependency>
+            <groupId>taglibs</groupId>
+            <artifactId>standard</artifactId>
+            <version>1.0.4</version>
+        </dependency-->
+
+    </dependencies>
+</project>

Added: struts/sandbox/trunk/mailreader-course/struts2/migrating/src/main/java/MessageResources.properties
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/migrating/src/main/java/MessageResources.properties?view=auto&rev=498380
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/migrating/src/main/java/MessageResources.properties (added)
+++ struts/sandbox/trunk/mailreader-course/struts2/migrating/src/main/java/MessageResources.properties Sun Jan 21 07:54:18 2007
@@ -0,0 +1,30 @@
+# -- standard errors --
+errors.header=<UL>
+errors.prefix=<LI>
+errors.suffix=</LI>
+errors.footer=</UL>
+# -- validator --
+errors.invalid={0} is invalid.
+errors.maxlength={0} can not be greater than {1} characters.
+errors.minlength={0} can not be less than {1} characters.
+errors.range={0} is not in the range {1} through {2}.
+errors.required={0} is required.
+errors.byte={0} must be an byte.
+errors.date={0} is not a date.
+errors.double={0} must be an double.
+errors.float={0} must be an float.
+errors.integer={0} must be an integer.
+errors.long={0} must be an long.
+errors.short={0} must be an short.
+errors.creditcard={0} is not a valid credit card number.
+errors.email={0} is an invalid e-mail address.
+errors.url={0} is not a valid URL.
+# -- other --
+errors.cancel=Operation cancelled.
+errors.detail={0}
+errors.general=The process did not complete. Details should follow.
+errors.token=Request could not be completed. Operation is not in sequence.
+# -- welcome --
+welcome.title=Struts Blank Application
+welcome.heading=Welcome!
+welcome.message=To get started on your own application, copy the struts-blank.war to a new WAR file using the name for your application. Place it in your container's "webapp" folder (or equivalent), and let your container auto-deploy the application. Edit the skeleton configuration files as needed, restart your container, and you are on your way! (You can find the application.properties file with this message in the /WEB-INF/src/java/resources folder.)

Added: struts/sandbox/trunk/mailreader-course/struts2/migrating/src/main/java/actions/Hello-validation.xml
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/migrating/src/main/java/actions/Hello-validation.xml?view=auto&rev=498380
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/migrating/src/main/java/actions/Hello-validation.xml (added)
+++ struts/sandbox/trunk/mailreader-course/struts2/migrating/src/main/java/actions/Hello-validation.xml Sun Jan 21 07:54:18 2007
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!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="message">
+        <field-validator type="requiredstring">
+            <message key="requiredstring"/>
+        </field-validator>
+    </field>
+</validators>

Added: struts/sandbox/trunk/mailreader-course/struts2/migrating/src/main/java/actions/Hello.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/migrating/src/main/java/actions/Hello.java?view=auto&rev=498380
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/migrating/src/main/java/actions/Hello.java (added)
+++ struts/sandbox/trunk/mailreader-course/struts2/migrating/src/main/java/actions/Hello.java Sun Jan 21 07:54:18 2007
@@ -0,0 +1,23 @@
+package actions;
+
+import com.opensymphony.xwork2.ActionSupport;
+
+public class Hello extends ActionSupport {
+
+    /*
+    public String execute() throws Exception {
+        setMessage(getText(MESSAGE));
+        return SUCCESS;
+    }
+    */
+
+    private String message;
+
+    public String getMessage() {
+        return message;
+    }
+
+    public void setMessage(String message) {
+        this.message = message;
+    }
+}

Added: struts/sandbox/trunk/mailreader-course/struts2/migrating/src/main/java/actions/HelloAction.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/migrating/src/main/java/actions/HelloAction.java?view=auto&rev=498380
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/migrating/src/main/java/actions/HelloAction.java (added)
+++ struts/sandbox/trunk/mailreader-course/struts2/migrating/src/main/java/actions/HelloAction.java Sun Jan 21 07:54:18 2007
@@ -0,0 +1,28 @@
+package actions;
+
+import org.apache.struts.action.Action;
+import org.apache.struts.action.ActionForm;
+import org.apache.struts.action.ActionForward;
+import org.apache.struts.action.ActionMapping;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+public class HelloAction extends Action {
+
+    public ActionForward execute(
+            ActionMapping mapping,
+            ActionForm form,
+            HttpServletRequest request,
+            HttpServletResponse response)
+            throws Exception {
+
+        HelloForm input = (HelloForm) form;
+        input.setMessage(getResources(request).getMessage(MESSAGE));
+        return mapping.findForward(SUCCESS);
+    }
+
+    public static final String MESSAGE = "message";
+    public static final String SUCCESS = "success";
+
+}

Added: struts/sandbox/trunk/mailreader-course/struts2/migrating/src/main/java/actions/HelloForm.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/migrating/src/main/java/actions/HelloForm.java?view=auto&rev=498380
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/migrating/src/main/java/actions/HelloForm.java (added)
+++ struts/sandbox/trunk/mailreader-course/struts2/migrating/src/main/java/actions/HelloForm.java Sun Jan 21 07:54:18 2007
@@ -0,0 +1,16 @@
+package actions;
+
+import org.apache.struts.validator.ValidatorForm;
+
+public class HelloForm extends ValidatorForm {
+
+    private String message;
+
+    public String getMessage() {
+        return message;
+    }
+
+    public void setMessage(String message) {
+        this.message = message;
+    }
+}

Added: struts/sandbox/trunk/mailreader-course/struts2/migrating/src/main/java/actions/LocaleAction.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/migrating/src/main/java/actions/LocaleAction.java?view=auto&rev=498380
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/migrating/src/main/java/actions/LocaleAction.java (added)
+++ struts/sandbox/trunk/mailreader-course/struts2/migrating/src/main/java/actions/LocaleAction.java Sun Jan 21 07:54:18 2007
@@ -0,0 +1,42 @@
+package actions;
+
+import org.apache.struts.action.Action;
+import org.apache.struts.action.ActionForm;
+import org.apache.struts.action.ActionForward;
+import org.apache.struts.action.ActionMapping;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Locale;
+
+
+public final class LocaleAction extends Action {
+
+    public ActionForward execute(ActionMapping mapping,
+                                 ActionForm form,
+                                 HttpServletRequest request,
+                                 HttpServletResponse response)
+            throws Exception {
+
+        String language = request.getParameter(LANGUAGE);
+        String country = request.getParameter(COUNTRY);
+
+        Locale locale = getLocale(request);
+
+        if ((language != null && language.length() > 0) &&
+                (country != null && country.length() > 0)) {
+            locale = new java.util.Locale(language, country);
+        } else if (language != null && language.length() > 0) {
+            locale = new java.util.Locale(language, "");
+        }
+
+        setLocale(request, locale);
+
+        return mapping.findForward(SUCCESS);
+    }
+
+    private static final String LANGUAGE = "language";
+    private static final String COUNTRY = "country";
+    private static final String SUCCESS = "success";
+
+}

Added: struts/sandbox/trunk/mailreader-course/struts2/migrating/src/main/java/actions/build.bat
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/migrating/src/main/java/actions/build.bat?view=auto&rev=498380
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/migrating/src/main/java/actions/build.bat (added)
+++ struts/sandbox/trunk/mailreader-course/struts2/migrating/src/main/java/actions/build.bat Sun Jan 21 07:54:18 2007
@@ -0,0 +1,4 @@
+@echo off
+del *.class
+set CLASSPATH=..\..\lib\xwork-2.0.0.jar;..\..\lib\struts-core-1.3.5.jar;..\..\..\..\..\common\lib\servlet-api.jar
+javac *.java

Added: struts/sandbox/trunk/mailreader-course/struts2/migrating/src/main/java/struts-config.xml
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/migrating/src/main/java/struts-config.xml?view=auto&rev=498380
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/migrating/src/main/java/struts-config.xml (added)
+++ struts/sandbox/trunk/mailreader-course/struts2/migrating/src/main/java/struts-config.xml Sun Jan 21 07:54:18 2007
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE struts-config PUBLIC
+        "-//Apache Software Foundation//DTD Struts Configuration 1.3//EN"
+        "http://struts.apache.org/dtds/struts-config_1_3.dtd">
+<struts-config>
+    <form-beans>
+
+        <form-bean name="HelloForm"
+                   type="actions.HelloForm">
+        </form-bean>
+
+    </form-beans>
+
+    <action-mappings>
+
+        <action path="/HelloInput"
+                name="HelloForm"
+                forward="/HelloInput.jsp"
+                validate="false"/>
+
+        <action path="/Hello"
+                name="HelloForm"
+                forward="/HelloPage.jsp"
+                validate="true"
+                input="/HelloInput.do"/>
+
+        <action path="/Locale"
+                type="actions.LocaleAction">
+            <forward name="success" path="/HelloInput.do"/>
+        </action>
+
+    </action-mappings>
+
+    <message-resources parameter="resources"/>
+
+    <plug-in className="org.apache.struts.validator.ValidatorPlugIn">
+        <set-property
+                property="pathnames"
+                value="/org/apache/struts/validator/validator-rules.xml,
+                /WEB-INF/classes/validation.xml"/>
+    </plug-in>
+
+</struts-config>

Added: struts/sandbox/trunk/mailreader-course/struts2/migrating/src/main/java/struts.xml
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/migrating/src/main/java/struts.xml?view=auto&rev=498380
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/migrating/src/main/java/struts.xml (added)
+++ struts/sandbox/trunk/mailreader-course/struts2/migrating/src/main/java/struts.xml Sun Jan 21 07:54:18 2007
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE struts PUBLIC
+        "-//Apache Software Foundation//DTD Struts Configuration 2.0//EN"
+        "http://struts.apache.org/dtds/struts-2.0.dtd">
+
+<struts>
+    <constant name="struts.devMode" value="true" />
+    <constant name="struts.enable.DynamicMethodInvocation" value="false" />
+    <constant name="struts.custom.i18n.resources" value="resources"/>
+
+    <include file="struts-default.xml"/>
+
+    <package name="hello-default" extends="struts-default">
+
+        <action name="Hello_*" method="{1}" class="actions.Hello">
+            <result name="input">/Hello_input.jsp</result>
+            <result>/Hello.jsp</result>
+        </action>
+
+    </package>
+</struts>

Added: struts/sandbox/trunk/mailreader-course/struts2/migrating/src/main/java/validation.xml
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/migrating/src/main/java/validation.xml?view=auto&rev=498380
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/migrating/src/main/java/validation.xml (added)
+++ struts/sandbox/trunk/mailreader-course/struts2/migrating/src/main/java/validation.xml Sun Jan 21 07:54:18 2007
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE form-validation PUBLIC
+        "-//Apache Software Foundation//DTD Commons Validator Rules Configuration 1.3.0//EN"
+        "http://jakarta.apache.org/commons/dtds/validator_1_3_0.dtd">
+
+<form-validation>
+    <formset>
+        <form name="HelloForm">
+            <field property="message" depends="required">
+                <arg key="message"/>
+            </field>
+        </form>
+    </formset>
+</form-validation>

Added: struts/sandbox/trunk/mailreader-course/struts2/migrating/src/main/resources/actions/build.bat
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/migrating/src/main/resources/actions/build.bat?view=auto&rev=498380
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/migrating/src/main/resources/actions/build.bat (added)
+++ struts/sandbox/trunk/mailreader-course/struts2/migrating/src/main/resources/actions/build.bat Sun Jan 21 07:54:18 2007
@@ -0,0 +1,4 @@
+@echo off
+del *.class
+set CLASSPATH=..\..\lib\xwork-2.0-SNAPSHOT.jar;..\..\lib\struts-core-1.3.5.jar;..\..\..\..\..\common\lib\servlet-api.jar
+javac *.java

Added: struts/sandbox/trunk/mailreader-course/struts2/migrating/src/main/resources/resources.properties
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/migrating/src/main/resources/resources.properties?view=auto&rev=498380
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/migrating/src/main/resources/resources.properties (added)
+++ struts/sandbox/trunk/mailreader-course/struts2/migrating/src/main/resources/resources.properties Sun Jan 21 07:54:18 2007
@@ -0,0 +1,7 @@
+message = Message
+prompt = Enter Message
+# Struts 1
+errors.required={0} is required.
+# Struts 2
+requiredstring = ${getText(fieldName)} is required.
+

Added: struts/sandbox/trunk/mailreader-course/struts2/migrating/src/main/resources/resources_es.properties
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/migrating/src/main/resources/resources_es.properties?view=auto&rev=498380
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/migrating/src/main/resources/resources_es.properties (added)
+++ struts/sandbox/trunk/mailreader-course/struts2/migrating/src/main/resources/resources_es.properties Sun Jan 21 07:54:18 2007
@@ -0,0 +1,6 @@
+prompt = Entre el mensaje
+message = Mensaje
+# Struts 1
+errors.required={0} se requiere.
+# Struts 2
+requiredstring = ${getText(fieldName)} se requiere.

Added: struts/sandbox/trunk/mailreader-course/struts2/migrating/src/main/resources/struts.properties
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/migrating/src/main/resources/struts.properties?view=auto&rev=498380
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/migrating/src/main/resources/struts.properties (added)
+++ struts/sandbox/trunk/mailreader-course/struts2/migrating/src/main/resources/struts.properties Sun Jan 21 07:54:18 2007
@@ -0,0 +1 @@
+struts.custom.i18n.resources=resources

Added: struts/sandbox/trunk/mailreader-course/struts2/migrating/src/main/webapp/Hello.jsp
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/migrating/src/main/webapp/Hello.jsp?view=auto&rev=498380
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/migrating/src/main/webapp/Hello.jsp (added)
+++ struts/sandbox/trunk/mailreader-course/struts2/migrating/src/main/webapp/Hello.jsp Sun Jan 21 07:54:18 2007
@@ -0,0 +1,33 @@
+<%@ taglib prefix="s" uri="/struts-tags" %>
+<html>
+<head>
+    <title><s:text name="message"/></title>
+</head>
+
+<body>
+<h2><s:property value="message"/></h2>
+
+<ul>
+    <li>
+        <s:url id="url" action="Hello_input"/>
+        <s:a href="%{url}"><s:property value="prompt"/></s:a>
+    </li>
+</ul>
+
+<ul>
+    <li>
+        <s:url id="en" action="Hello_input">
+            <s:param name="request_locale">es</s:param>
+        </s:url>
+        <s:a href="%{en}">English</s:a>
+    </li>
+    <li>
+        <s:url id="es" action="Hello_input">
+            <s:param name="request_locale">es</s:param>
+        </s:url>
+        <s:a href="%{es}">Español</s:a>
+    </li>
+</ul>
+
+</body>
+</html>

Added: struts/sandbox/trunk/mailreader-course/struts2/migrating/src/main/webapp/HelloInput.jsp
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/migrating/src/main/webapp/HelloInput.jsp?view=auto&rev=498380
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/migrating/src/main/webapp/HelloInput.jsp (added)
+++ struts/sandbox/trunk/mailreader-course/struts2/migrating/src/main/webapp/HelloInput.jsp Sun Jan 21 07:54:18 2007
@@ -0,0 +1,23 @@
+<%@ taglib prefix="bean" uri="http://struts.apache.org/tags-bean" %>
+<%@ taglib prefix="html" uri="http://struts.apache.org/tags-html" %>
+<html>
+<head><title><bean:message key="prompt"/></title></head>
+
+<body>
+<h2><bean:message key="prompt"/></h2>
+<html:errors/>
+<html:form action="/Hello">
+    <table>
+        <tr>
+            <td>
+                <bean:message key="message"/>
+            </td>
+            <td>
+                <html:text property="message"/>
+            </td>
+        </tr>
+        <td colspan="2"><html:submit/></td>
+    </table>
+</html:form>
+</body>
+</html>

Added: struts/sandbox/trunk/mailreader-course/struts2/migrating/src/main/webapp/HelloPage.jsp
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/migrating/src/main/webapp/HelloPage.jsp?view=auto&rev=498380
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/migrating/src/main/webapp/HelloPage.jsp (added)
+++ struts/sandbox/trunk/mailreader-course/struts2/migrating/src/main/webapp/HelloPage.jsp Sun Jan 21 07:54:18 2007
@@ -0,0 +1,28 @@
+<%@ taglib prefix="bean" uri="http://struts.apache.org/tags-bean" %>
+<%@ taglib prefix="html" uri="http://struts.apache.org/tags-html" %>
+<html>
+<head>
+    <title><bean:message key="message"/></title>
+</head>
+
+<body>
+<h2><bean:write name="HelloForm" property="message"/></h2>
+
+<ul>
+    <li>
+        <html:link action="/HelloInput"><bean:message key="prompt"/></html:link>
+    </li>
+</ul>
+
+<ul>
+    <li>
+        <html:link action="/Locale?language=en">English</html:link>
+    </li>
+    <li>
+        <html:link action="/Locale?language=es">Español</html:link>
+    </li>
+
+</ul>
+
+</body>
+</html>

Added: struts/sandbox/trunk/mailreader-course/struts2/migrating/src/main/webapp/Hello_input.jsp
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/migrating/src/main/webapp/Hello_input.jsp?view=auto&rev=498380
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/migrating/src/main/webapp/Hello_input.jsp (added)
+++ struts/sandbox/trunk/mailreader-course/struts2/migrating/src/main/webapp/Hello_input.jsp Sun Jan 21 07:54:18 2007
@@ -0,0 +1,15 @@
+<%@ taglib prefix="s" uri="/struts-tags" %>
+<html>
+<head><title><s:text name="prompt"/></title></head>
+
+<body>
+<h2><s:text name="prompt"/></h2>
+
+<p>
+    <s:form action="Hello">
+        <s:textfield name="message" label="%{getText('message')}"/>
+        <s:submit/>
+    </s:form>
+</p>
+</body>
+</html>

Added: struts/sandbox/trunk/mailreader-course/struts2/migrating/src/main/webapp/WEB-INF/struts-config.xml
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/migrating/src/main/webapp/WEB-INF/struts-config.xml?view=auto&rev=498380
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/migrating/src/main/webapp/WEB-INF/struts-config.xml (added)
+++ struts/sandbox/trunk/mailreader-course/struts2/migrating/src/main/webapp/WEB-INF/struts-config.xml Sun Jan 21 07:54:18 2007
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE struts-config PUBLIC
+  "-//Apache Software Foundation//DTD Struts Configuration 1.3//EN"
+  "http://struts.apache.org/dtds/struts-config_1_3.dtd">
+
+<struts-config>
+    <message-resources parameter="MessageResources"/>
+    <plug-in className="org.apache.struts.validator.ValidatorPlugIn">
+        <set-property property="pathnames"
+                      value="/org/apache/struts/validator/validator-rules.xml,/WEB-INF/validation.xml"/>
+    </plug-in>
+</struts-config>
\ No newline at end of file

Added: struts/sandbox/trunk/mailreader-course/struts2/migrating/src/main/webapp/WEB-INF/validation.xml
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/migrating/src/main/webapp/WEB-INF/validation.xml?view=auto&rev=498380
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/migrating/src/main/webapp/WEB-INF/validation.xml (added)
+++ struts/sandbox/trunk/mailreader-course/struts2/migrating/src/main/webapp/WEB-INF/validation.xml Sun Jan 21 07:54:18 2007
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<!DOCTYPE form-validation PUBLIC
+  "-//Apache Software Foundation//DTD Commons Validator Rules Configuration 1.3.0//EN"
+  "http://jakarta.apache.org/commons/dtds/validator_1_3_0.dtd">
+
+
+<form-validation>
+</form-validation>

Added: struts/sandbox/trunk/mailreader-course/struts2/migrating/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/migrating/src/main/webapp/WEB-INF/web.xml?view=auto&rev=498380
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/migrating/src/main/webapp/WEB-INF/web.xml (added)
+++ struts/sandbox/trunk/mailreader-course/struts2/migrating/src/main/webapp/WEB-INF/web.xml Sun Jan 21 07:54:18 2007
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE web-app PUBLIC
+        "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
+        "http://java.sun.com/dtd/web-app_2_3.dtd">
+<web-app>
+
+    <!-- Struts 2 -->
+    <filter>
+        <filter-name>struts2</filter-name>
+        <filter-class>org.apache.struts2.dispatcher.FilterDispatcher</filter-class>
+    </filter>
+
+    <filter-mapping>
+        <filter-name>struts2</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
+
+    <!-- Struts 1 -->
+    <servlet>
+        <servlet-name>action</servlet-name>
+        <servlet-class>org.apache.struts.action.ActionServlet</servlet-class>
+        <init-param>
+            <param-name>config</param-name>
+            <param-value>/WEB-INF/classes/struts-config.xml</param-value>
+        </init-param>
+        <load-on-startup>2</load-on-startup>
+    </servlet>
+
+    <servlet-mapping>
+        <servlet-name>action</servlet-name>
+        <url-pattern>*.do</url-pattern>
+    </servlet-mapping>
+    <servlet-mapping>
+        <servlet-name>action</servlet-name>
+        <url-pattern>*.do</url-pattern>
+    </servlet-mapping>
+
+    <!-- Either version -->
+    <welcome-file-list>
+        <welcome-file>index.html</welcome-file>
+    </welcome-file-list>
+</web-app>
\ No newline at end of file

Added: struts/sandbox/trunk/mailreader-course/struts2/migrating/src/main/webapp/index.html
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/migrating/src/main/webapp/index.html?view=auto&rev=498380
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/migrating/src/main/webapp/index.html (added)
+++ struts/sandbox/trunk/mailreader-course/struts2/migrating/src/main/webapp/index.html Sun Jan 21 07:54:18 2007
@@ -0,0 +1,10 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+    <META HTTP-EQUIV="Refresh" CONTENT="0;URL=Hello_input.action">
+</head>
+
+<body>
+<p>Loading ...</p>
+</body>
+</html>

Modified: struts/sandbox/trunk/mailreader-course/struts2/profile/profile.iml
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/profile/profile.iml?view=diff&rev=498380&r1=498379&r2=498380
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/profile/profile.iml (original)
+++ struts/sandbox/trunk/mailreader-course/struts2/profile/profile.iml Sun Jan 21 07:54:18 2007
@@ -16,8 +16,8 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="Struts2" level="project" />
     <orderEntry type="library" name="junit" level="application" />
-    <orderEntry type="library" name="servlet-api" level="application" />
     <orderEntry type="library" name="Mailreader-dao" level="project" />
+    <orderEntry type="library" name="servlet-api" level="application" />
     <orderEntryProperties />
   </component>
   <component name="WebModuleBuildComponent">
@@ -32,8 +32,8 @@
   </component>
   <component name="WebModuleProperties">
     <containerElement type="library" name="junit" level="application">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib" />
+      <attribute name="method" value="0" />
+      <attribute name="URI" value="&lt;N/A&gt;" />
     </containerElement>
     <containerElement type="library" name="Mailreader-dao" level="project">
       <attribute name="method" value="1" />

Modified: struts/sandbox/trunk/mailreader-course/struts2/profile/src/java/DatabaseListener.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/profile/src/java/DatabaseListener.java?view=diff&rev=498380&r1=498379&r2=498380
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/profile/src/java/DatabaseListener.java (original)
+++ struts/sandbox/trunk/mailreader-course/struts2/profile/src/java/DatabaseListener.java Sun Jan 21 07:54:18 2007
@@ -186,6 +186,7 @@
      * <p>Calculate and return an absolute pathname to the XML file to contain
      * our persistent storage information.</p>
      *
+     * @return Absolute path to XML file.
      * @throws Exception if an input/output error occurs
      */
     private String calculatePath() throws Exception {

Modified: struts/sandbox/trunk/mailreader-course/struts2/register/register.iml
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/register/register.iml?view=diff&rev=498380&r1=498379&r2=498380
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/register/register.iml (original)
+++ struts/sandbox/trunk/mailreader-course/struts2/register/register.iml Sun Jan 21 07:54:18 2007
@@ -31,8 +31,8 @@
   </component>
   <component name="WebModuleProperties">
     <containerElement type="library" name="junit" level="application">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib" />
+      <attribute name="method" value="0" />
+      <attribute name="URI" value="&lt;N/A&gt;" />
     </containerElement>
     <containerElement type="library" name="Mailreader-dao" level="project">
       <attribute name="method" value="1" />

Modified: struts/sandbox/trunk/mailreader-course/struts2/register/src/java/DatabaseListener.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/register/src/java/DatabaseListener.java?view=diff&rev=498380&r1=498379&r2=498380
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/register/src/java/DatabaseListener.java (original)
+++ struts/sandbox/trunk/mailreader-course/struts2/register/src/java/DatabaseListener.java Sun Jan 21 07:54:18 2007
@@ -186,6 +186,7 @@
      * <p>Calculate and return an absolute pathname to the XML file to contain
      * our persistent storage information.</p>
      *
+     * @return Absolute path to XML file.
      * @throws Exception if an input/output error occurs
      */
     private String calculatePath() throws Exception {

Modified: struts/sandbox/trunk/mailreader-course/struts2/register2/register2.iml
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/register2/register2.iml?view=diff&rev=498380&r1=498379&r2=498380
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/register2/register2.iml (original)
+++ struts/sandbox/trunk/mailreader-course/struts2/register2/register2.iml Sun Jan 21 07:54:18 2007
@@ -31,8 +31,8 @@
   </component>
   <component name="WebModuleProperties">
     <containerElement type="library" name="junit" level="application">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib" />
+      <attribute name="method" value="0" />
+      <attribute name="URI" value="&lt;N/A&gt;" />
     </containerElement>
     <containerElement type="library" name="Mailreader-dao" level="project">
       <attribute name="method" value="1" />

Modified: struts/sandbox/trunk/mailreader-course/struts2/register2/src/java/DatabaseListener.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/register2/src/java/DatabaseListener.java?view=diff&rev=498380&r1=498379&r2=498380
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/register2/src/java/DatabaseListener.java (original)
+++ struts/sandbox/trunk/mailreader-course/struts2/register2/src/java/DatabaseListener.java Sun Jan 21 07:54:18 2007
@@ -186,6 +186,7 @@
      * <p>Calculate and return an absolute pathname to the XML file to contain
      * our persistent storage information.</p>
      *
+     * @return Absolute path to XML file.
      * @throws Exception if an input/output error occurs
      */
     private String calculatePath() throws Exception {

Modified: struts/sandbox/trunk/mailreader-course/struts2/retain/retain.iml
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/retain/retain.iml?view=diff&rev=498380&r1=498379&r2=498380
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/retain/retain.iml (original)
+++ struts/sandbox/trunk/mailreader-course/struts2/retain/retain.iml Sun Jan 21 07:54:18 2007
@@ -16,7 +16,6 @@
     <orderEntry type="library" name="Struts2" level="project" />
     <orderEntry type="library" name="Mailreader-dao" level="project" />
     <orderEntry type="library" name="junit" level="application" />
-    <orderEntry type="library" name="servlet-api" level="application" />
     <orderEntryProperties />
   </component>
   <component name="WebModuleBuildComponent">
@@ -31,16 +30,12 @@
   </component>
   <component name="WebModuleProperties">
     <containerElement type="library" name="junit" level="application">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib" />
+      <attribute name="method" value="0" />
+      <attribute name="URI" value="&lt;N/A&gt;" />
     </containerElement>
     <containerElement type="library" name="Mailreader-dao" level="project">
       <attribute name="method" value="1" />
       <attribute name="URI" value="/WEB-INF/lib" />
-    </containerElement>
-    <containerElement type="library" name="servlet-api" level="application">
-      <attribute name="method" value="0" />
-      <attribute name="URI" value="&lt;N/A&gt;" />
     </containerElement>
     <containerElement type="library" name="Struts2" level="project">
       <attribute name="method" value="1" />

Modified: struts/sandbox/trunk/mailreader-course/struts2/subscribe/src/java/DatabaseListener.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/subscribe/src/java/DatabaseListener.java?view=diff&rev=498380&r1=498379&r2=498380
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/subscribe/src/java/DatabaseListener.java (original)
+++ struts/sandbox/trunk/mailreader-course/struts2/subscribe/src/java/DatabaseListener.java Sun Jan 21 07:54:18 2007
@@ -186,6 +186,7 @@
      * <p>Calculate and return an absolute pathname to the XML file to contain
      * our persistent storage information.</p>
      *
+     * @return Absolute path to XML file.
      * @throws Exception if an input/output error occurs
      */
     private String calculatePath() throws Exception {

Modified: struts/sandbox/trunk/mailreader-course/struts2/subscribe/subscribe.iml
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/subscribe/subscribe.iml?view=diff&rev=498380&r1=498379&r2=498380
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/subscribe/subscribe.iml (original)
+++ struts/sandbox/trunk/mailreader-course/struts2/subscribe/subscribe.iml Sun Jan 21 07:54:18 2007
@@ -31,8 +31,8 @@
   </component>
   <component name="WebModuleProperties">
     <containerElement type="library" name="junit" level="application">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib" />
+      <attribute name="method" value="0" />
+      <attribute name="URI" value="&lt;N/A&gt;" />
     </containerElement>
     <containerElement type="library" name="Mailreader-dao" level="project">
       <attribute name="method" value="1" />

Modified: struts/sandbox/trunk/mailreader-course/struts2/theme/src/java/DatabaseListener.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/theme/src/java/DatabaseListener.java?view=diff&rev=498380&r1=498379&r2=498380
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/theme/src/java/DatabaseListener.java (original)
+++ struts/sandbox/trunk/mailreader-course/struts2/theme/src/java/DatabaseListener.java Sun Jan 21 07:54:18 2007
@@ -186,6 +186,7 @@
      * <p>Calculate and return an absolute pathname to the XML file to contain
      * our persistent storage information.</p>
      *
+     * @return Absolute path to XML file.
      * @throws Exception if an input/output error occurs
      */
     private String calculatePath() throws Exception {

Modified: struts/sandbox/trunk/mailreader-course/struts2/theme/theme.iml
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/theme/theme.iml?view=diff&rev=498380&r1=498379&r2=498380
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/theme/theme.iml (original)
+++ struts/sandbox/trunk/mailreader-course/struts2/theme/theme.iml Sun Jan 21 07:54:18 2007
@@ -14,7 +14,6 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="junit" level="application" />
-    <orderEntry type="library" name="servlet-api" level="application" />
     <orderEntry type="library" name="Struts2" level="project" />
     <orderEntry type="module-library">
       <library>
@@ -35,6 +34,7 @@
       </library>
     </orderEntry>
     <orderEntry type="library" name="Mailreader-dao" level="project" />
+    <orderEntry type="library" name="servlet-api" level="application" />
     <orderEntryProperties />
   </component>
   <component name="WebModuleBuildComponent">

Modified: struts/sandbox/trunk/mailreader-course/struts2/welcome/welcome.iml
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/welcome/welcome.iml?view=diff&rev=498380&r1=498379&r2=498380
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/welcome/welcome.iml (original)
+++ struts/sandbox/trunk/mailreader-course/struts2/welcome/welcome.iml Sun Jan 21 07:54:18 2007
@@ -15,7 +15,6 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="Struts2" level="project" />
     <orderEntry type="library" name="junit" level="application" />
-    <orderEntry type="library" name="servlet-api" level="application" />
     <orderEntryProperties />
   </component>
   <component name="WebModuleBuildComponent">
@@ -30,10 +29,6 @@
   </component>
   <component name="WebModuleProperties">
     <containerElement type="library" name="junit" level="application">
-      <attribute name="method" value="0" />
-      <attribute name="URI" value="&lt;N/A&gt;" />
-    </containerElement>
-    <containerElement type="library" name="servlet-api" level="application">
       <attribute name="method" value="0" />
       <attribute name="URI" value="&lt;N/A&gt;" />
     </containerElement>