struts-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hus...@apache.org
Subject svn commit: r392295 - in /struts/sandbox/trunk/mailreader-course/action2: lab-2-2/src/webapp/WEB-INF/ lab-2-3/src/webapp/WEB-INF/ lab-3-1/src/webapp/WEB-INF/ lab-3-1/src/webapp/WEB-INF/entities/ lab-3-1/src/webapp/pages/
Date Fri, 07 Apr 2006 14:08:40 GMT
Author: husted
Date: Fri Apr  7 07:08:37 2006
New Revision: 392295

URL: http://svn.apache.org/viewcvs?rev=392295&view=rev
Log:
MailReader Course
* lab 3-1 - Utilize message resources in WebTests

Modified:
    struts/sandbox/trunk/mailreader-course/action2/lab-2-2/src/webapp/WEB-INF/webtest-start.xml
    struts/sandbox/trunk/mailreader-course/action2/lab-2-2/src/webapp/WEB-INF/webtest.xml
    struts/sandbox/trunk/mailreader-course/action2/lab-2-3/src/webapp/WEB-INF/webtest.xml
    struts/sandbox/trunk/mailreader-course/action2/lab-3-1/src/webapp/WEB-INF/entities/register-page.xml
    struts/sandbox/trunk/mailreader-course/action2/lab-3-1/src/webapp/WEB-INF/entities/save-click.xml
    struts/sandbox/trunk/mailreader-course/action2/lab-3-1/src/webapp/WEB-INF/entities/welcome-open.xml
    struts/sandbox/trunk/mailreader-course/action2/lab-3-1/src/webapp/WEB-INF/webtest.xml
    struts/sandbox/trunk/mailreader-course/action2/lab-3-1/src/webapp/pages/Login.jsp
    struts/sandbox/trunk/mailreader-course/action2/lab-3-1/src/webapp/pages/Menu.jsp

Modified: struts/sandbox/trunk/mailreader-course/action2/lab-2-2/src/webapp/WEB-INF/webtest-start.xml
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/mailreader-course/action2/lab-2-2/src/webapp/WEB-INF/webtest-start.xml?rev=392295&r1=392294&r2=392295&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/action2/lab-2-2/src/webapp/WEB-INF/webtest-start.xml
(original)
+++ struts/sandbox/trunk/mailreader-course/action2/lab-2-2/src/webapp/WEB-INF/webtest-start.xml
Fri Apr  7 07:08:37 2006
@@ -52,7 +52,6 @@
      The tests are based on a set of MailReader Use Cases maintained at the
      Struts University site
      [http://opensource2.atlassian.com/confluence/oss/display/STRUTS/MailReader].
-
      */
     -->
 
@@ -74,10 +73,7 @@
     <property name="webapps.home"
               location="/opt/Apache/Tomcat-5.5/webapps"/>
 
-    <property name="resource.home"
-              location="${webapps.home}/${basepath}/WEB-INF/classes/resources.properties"/>
-
-    <property file="${resource.home}"/>
+    <property file="${webapps.home}/${basepath}/WEB-INF/classes/resources.properties"/>
 
 
     <taskdef file="${webtest.home}/webtestTaskdefs.properties">

Modified: struts/sandbox/trunk/mailreader-course/action2/lab-2-2/src/webapp/WEB-INF/webtest.xml
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/mailreader-course/action2/lab-2-2/src/webapp/WEB-INF/webtest.xml?rev=392295&r1=392294&r2=392295&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/action2/lab-2-2/src/webapp/WEB-INF/webtest.xml
(original)
+++ struts/sandbox/trunk/mailreader-course/action2/lab-2-2/src/webapp/WEB-INF/webtest.xml
Fri Apr  7 07:08:37 2006
@@ -52,8 +52,6 @@
      The tests are based on a set of MailReader Use Cases maintained at the
      Struts University site
      [http://opensource2.atlassian.com/confluence/oss/display/STRUTS/MailReader].
-
-     @version $Revision: 1.2 $ $Date: 2005-12-31 15:10:04 -0500 (Sat, 31 Dec 2005) $
      */
     -->
 
@@ -80,10 +78,7 @@
     <property name="webapps.home"
               location="/opt/Apache/Tomcat-5.5/webapps"/>
 
-    <property name="resource.home"
-              location="${webapps.home}/${basepath}/WEB-INF/classes/resources.properties"/>
-
-    <property file="${resource.home}"/>
+    <property file="${webapps.home}/${basepath}/WEB-INF/classes/resources.properties"/>
 
 
     <taskdef file="${webtest.home}/webtestTaskdefs.properties">

Modified: struts/sandbox/trunk/mailreader-course/action2/lab-2-3/src/webapp/WEB-INF/webtest.xml
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/mailreader-course/action2/lab-2-3/src/webapp/WEB-INF/webtest.xml?rev=392295&r1=392294&r2=392295&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/action2/lab-2-3/src/webapp/WEB-INF/webtest.xml
(original)
+++ struts/sandbox/trunk/mailreader-course/action2/lab-2-3/src/webapp/WEB-INF/webtest.xml
Fri Apr  7 07:08:37 2006
@@ -52,8 +52,6 @@
      The tests are based on a set of MailReader Use Cases maintained at the
      Struts University site
      [http://opensource2.atlassian.com/confluence/oss/display/STRUTS/MailReader].
-
-     @version $Revision: 1.2 $ $Date: 2005-12-31 15:10:04 -0500 (Sat, 31 Dec 2005) $
      */
     -->
 
@@ -80,10 +78,7 @@
     <property name="webapps.home"
               location="/opt/Apache/Tomcat-5.5/webapps"/>
 
-    <property name="resource.home"
-              location="${webapps.home}/${basepath}/WEB-INF/classes/resources.properties"/>
-
-    <property file="${resource.home}"/>
+    <property file="${webapps.home}/${basepath}/WEB-INF/classes/resources.properties"/>
 
 
     <taskdef file="${webtest.home}/webtestTaskdefs.properties">

Modified: struts/sandbox/trunk/mailreader-course/action2/lab-3-1/src/webapp/WEB-INF/entities/register-page.xml
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/mailreader-course/action2/lab-3-1/src/webapp/WEB-INF/entities/register-page.xml?rev=392295&r1=392294&r2=392295&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/action2/lab-3-1/src/webapp/WEB-INF/entities/register-page.xml
(original)
+++ struts/sandbox/trunk/mailreader-course/action2/lab-3-1/src/webapp/WEB-INF/entities/register-page.xml
Fri Apr  7 07:08:37 2006
@@ -1,3 +1,3 @@
 <verifyTitle
         description="Registration page title"
-        text="MailReader - Register"/>
+        text="${registration.title.create}"/>

Modified: struts/sandbox/trunk/mailreader-course/action2/lab-3-1/src/webapp/WEB-INF/entities/save-click.xml
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/mailreader-course/action2/lab-3-1/src/webapp/WEB-INF/entities/save-click.xml?rev=392295&r1=392294&r2=392295&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/action2/lab-3-1/src/webapp/WEB-INF/entities/save-click.xml
(original)
+++ struts/sandbox/trunk/mailreader-course/action2/lab-3-1/src/webapp/WEB-INF/entities/save-click.xml
Fri Apr  7 07:08:37 2006
@@ -1,3 +1,3 @@
 <clickButton
         description="Save"
-        name="Save"/>
+        name="${button.save}"/>

Modified: struts/sandbox/trunk/mailreader-course/action2/lab-3-1/src/webapp/WEB-INF/entities/welcome-open.xml
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/mailreader-course/action2/lab-3-1/src/webapp/WEB-INF/entities/welcome-open.xml?rev=392295&r1=392294&r2=392295&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/action2/lab-3-1/src/webapp/WEB-INF/entities/welcome-open.xml
(original)
+++ struts/sandbox/trunk/mailreader-course/action2/lab-3-1/src/webapp/WEB-INF/entities/welcome-open.xml
Fri Apr  7 07:08:37 2006
@@ -3,4 +3,4 @@
         url="Welcome.do"/>
 <verifyTitle
         description="Welcome page title"
-        text="MailReader"/>
+        text="${index.title}"/>

Modified: struts/sandbox/trunk/mailreader-course/action2/lab-3-1/src/webapp/WEB-INF/webtest.xml
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/mailreader-course/action2/lab-3-1/src/webapp/WEB-INF/webtest.xml?rev=392295&r1=392294&r2=392295&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/action2/lab-3-1/src/webapp/WEB-INF/webtest.xml
(original)
+++ struts/sandbox/trunk/mailreader-course/action2/lab-3-1/src/webapp/WEB-INF/webtest.xml
Fri Apr  7 07:08:37 2006
@@ -80,11 +80,7 @@
     <property name="webapps.home"
               location="/opt/Apache/Tomcat-5.5/webapps"/>
 
-    <property name="resource.home"
-              location="${webapps.home}/${basepath}/WEB-INF/classes/resources.properties"/>
-
-    <property file="${resource.home}"/>
-
+    <property file="${webapps.home}/${basepath}/WEB-INF/classes/resources.properties"/>
 
     <taskdef file="${webtest.home}/webtestTaskdefs.properties">
         <classpath>
@@ -116,7 +112,7 @@
                 &register-trillian;
                 <verifyTitle
                     description="Menu page title"
-                      text="MailReader - Menu"/>
+                      text="${menu.title}"/>
             </steps>
         </webtest>
 

Modified: struts/sandbox/trunk/mailreader-course/action2/lab-3-1/src/webapp/pages/Login.jsp
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/mailreader-course/action2/lab-3-1/src/webapp/pages/Login.jsp?rev=392295&r1=392294&r2=392295&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/action2/lab-3-1/src/webapp/pages/Login.jsp (original)
+++ struts/sandbox/trunk/mailreader-course/action2/lab-3-1/src/webapp/pages/Login.jsp Fri
Apr  7 07:08:37 2006
@@ -4,7 +4,7 @@
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
-    <title>MailReader - Login</title>
+    <title><ww:text name="login.title"/></title>
 </head>
 
 <body onLoad="self.focus();document.Login.username.focus()">

Modified: struts/sandbox/trunk/mailreader-course/action2/lab-3-1/src/webapp/pages/Menu.jsp
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/mailreader-course/action2/lab-3-1/src/webapp/pages/Menu.jsp?rev=392295&r1=392294&r2=392295&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/action2/lab-3-1/src/webapp/pages/Menu.jsp (original)
+++ struts/sandbox/trunk/mailreader-course/action2/lab-3-1/src/webapp/pages/Menu.jsp Fri Apr
 7 07:08:37 2006
@@ -4,7 +4,7 @@
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
-    <title><ww:text name="mainMenu.title"/></title>
+    <title><ww:text name="menu.title"/></title>
 </head>
 
 <body>



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


Mime
View raw message