You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@struts.apache.org by hu...@apache.org on 2006/04/08 00:03:02 UTC

svn commit: r392435 - in /struts/sandbox/trunk/mailreader-course/action2: ./ lab-3-2/src/webapp/pages/ lab-3-3/src/webapp/pages/ lab-4-1/src/webapp/pages/ lab-4-2/ lab-4-2/src/webapp/css/ lab-4-2/src/webapp/pages/

Author: husted
Date: Fri Apr  7 15:03:00 2006
New Revision: 392435

URL: http://svn.apache.org/viewcvs?rev=392435&view=rev
Log:
MailReader Course
* Add lab 4-2 (last code lab)

Added:
    struts/sandbox/trunk/mailreader-course/action2/lab-4-2/
      - copied from r392422, struts/sandbox/trunk/mailreader-course/action2/lab-4-1/
    struts/sandbox/trunk/mailreader-course/action2/lab-4-2/lab-4-2.iml
    struts/sandbox/trunk/mailreader-course/action2/lab-4-2/src/webapp/css/
    struts/sandbox/trunk/mailreader-course/action2/lab-4-2/src/webapp/css/mailreader.css   (with props)
    struts/sandbox/trunk/mailreader-course/action2/lab-4-2/src/webapp/pages/Footer.jsp   (with props)
Removed:
    struts/sandbox/trunk/mailreader-course/action2/lab-4-2/lab-4-1.iml
Modified:
    struts/sandbox/trunk/mailreader-course/action2/lab-3-2/src/webapp/pages/Login.jsp
    struts/sandbox/trunk/mailreader-course/action2/lab-3-3/src/webapp/pages/Login.jsp
    struts/sandbox/trunk/mailreader-course/action2/lab-4-1/src/webapp/pages/Login.jsp
    struts/sandbox/trunk/mailreader-course/action2/lab-4-2/src/webapp/pages/Error.jsp
    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
    struts/sandbox/trunk/mailreader-course/action2/mailreader-course-action2.ipr

Modified: struts/sandbox/trunk/mailreader-course/action2/lab-3-2/src/webapp/pages/Login.jsp
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/mailreader-course/action2/lab-3-2/src/webapp/pages/Login.jsp?rev=392435&r1=392434&r2=392435&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/action2/lab-3-2/src/webapp/pages/Login.jsp (original)
+++ struts/sandbox/trunk/mailreader-course/action2/lab-3-2/src/webapp/pages/Login.jsp Fri Apr  7 15:03:00 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-3/src/webapp/pages/Login.jsp
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/mailreader-course/action2/lab-3-3/src/webapp/pages/Login.jsp?rev=392435&r1=392434&r2=392435&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/action2/lab-3-3/src/webapp/pages/Login.jsp (original)
+++ struts/sandbox/trunk/mailreader-course/action2/lab-3-3/src/webapp/pages/Login.jsp Fri Apr  7 15:03:00 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-4-1/src/webapp/pages/Login.jsp
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/mailreader-course/action2/lab-4-1/src/webapp/pages/Login.jsp?rev=392435&r1=392434&r2=392435&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/action2/lab-4-1/src/webapp/pages/Login.jsp (original)
+++ struts/sandbox/trunk/mailreader-course/action2/lab-4-1/src/webapp/pages/Login.jsp Fri Apr  7 15:03:00 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()">

Added: 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=392435&view=auto
==============================================================================
--- struts/sandbox/trunk/mailreader-course/action2/lab-4-2/lab-4-2.iml (added)
+++ struts/sandbox/trunk/mailreader-course/action2/lab-4-2/lab-4-2.iml Fri Apr  7 15:03:00 2006
@@ -0,0 +1,264 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module version="4" relativePaths="true" type="J2EE_WEB_MODULE" j2ee-integration="Tomcat Server">
+  <component name="ModuleRootManager" />
+  <component name="NewModuleRootManager">
+    <output url="file://C:/opt/Apache/Tomcat-5.0/webapps/lab-4-2/WEB-INF/classes" />
+    <exclude-output />
+    <exploded url="file://C:/opt/Apache/Tomcat-5.0/webapps/lab-4-2" />
+    <exclude-exploded />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="Tomcat" level="application_server_libraries" />
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../lib/freemarker.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../lib/struts-mailreader-dao-1.3.0-dev.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../lib/rife-continuations.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../lib/struts-taglib-1.3.0.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../lib/spring-context.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../lib/ognl.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../lib/xwork-1.1.2.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../lib/commons-collections-3.1.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../lib/spring-web.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../lib/spring-beans.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../lib/spring-core.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../lib/oscore.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../lib/commons-logging-1.0.4.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../lib/webwork-2.2.2.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../lib/commons-digester-1.6.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$APPLICATION_HOME_DIR$/lib/junit.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntryProperties />
+  </component>
+  <component name="WebModuleBuildComponent">
+    <setting name="EXPLODED_URL" value="file://C:/opt/Apache/Tomcat-5.0/webapps/lab-4-2" />
+    <setting name="EXPLODED_ENABLED" value="true" />
+    <setting name="JAR_URL" value="file://" />
+    <setting name="JAR_ENABLED" value="false" />
+    <setting name="SYNC_EXPLODED_DIR" value="true" />
+    <setting name="BUILD_ON_FRAME_DEACTIVATION" value="false" />
+    <setting name="RUN_JASPER_VALIDATION" value="false" />
+  </component>
+  <component name="WebModuleProperties">
+    <containerElement type="library" level="module">
+      <attribute name="method" value="1" />
+      <attribute name="URI" value="/WEB-INF/lib/junit.jar" />
+      <url>jar://$APPLICATION_HOME_DIR$/lib/junit.jar!/</url>
+    </containerElement>
+    <containerElement type="library" level="module">
+      <attribute name="method" value="1" />
+      <attribute name="URI" value="/WEB-INF/lib/commons-collections-3.1.jar" />
+      <url>jar://$MODULE_DIR$/../../lib/commons-collections-3.1.jar!/</url>
+    </containerElement>
+    <containerElement type="library" level="module">
+      <attribute name="method" value="1" />
+      <attribute name="URI" value="/WEB-INF/lib/commons-digester-1.6.jar" />
+      <url>jar://$MODULE_DIR$/../../lib/commons-digester-1.6.jar!/</url>
+    </containerElement>
+    <containerElement type="library" level="module">
+      <attribute name="method" value="1" />
+      <attribute name="URI" value="/WEB-INF/lib/commons-logging-1.0.4.jar" />
+      <url>jar://$MODULE_DIR$/../../lib/commons-logging-1.0.4.jar!/</url>
+    </containerElement>
+    <containerElement type="library" level="module">
+      <attribute name="method" value="1" />
+      <attribute name="URI" value="/WEB-INF/lib/freemarker.jar" />
+      <url>jar://$MODULE_DIR$/../../lib/freemarker.jar!/</url>
+    </containerElement>
+    <containerElement type="library" level="module">
+      <attribute name="method" value="1" />
+      <attribute name="URI" value="/WEB-INF/lib/ognl.jar" />
+      <url>jar://$MODULE_DIR$/../../lib/ognl.jar!/</url>
+    </containerElement>
+    <containerElement type="library" level="module">
+      <attribute name="method" value="1" />
+      <attribute name="URI" value="/WEB-INF/lib/oscore.jar" />
+      <url>jar://$MODULE_DIR$/../../lib/oscore.jar!/</url>
+    </containerElement>
+    <containerElement type="library" level="module">
+      <attribute name="method" value="1" />
+      <attribute name="URI" value="/WEB-INF/lib/rife-continuations.jar" />
+      <url>jar://$MODULE_DIR$/../../lib/rife-continuations.jar!/</url>
+    </containerElement>
+    <containerElement type="library" level="module">
+      <attribute name="method" value="1" />
+      <attribute name="URI" value="/WEB-INF/lib/spring-beans.jar" />
+      <url>jar://$MODULE_DIR$/../../lib/spring-beans.jar!/</url>
+    </containerElement>
+    <containerElement type="library" level="module">
+      <attribute name="method" value="1" />
+      <attribute name="URI" value="/WEB-INF/lib/spring-context.jar" />
+      <url>jar://$MODULE_DIR$/../../lib/spring-context.jar!/</url>
+    </containerElement>
+    <containerElement type="library" level="module">
+      <attribute name="method" value="1" />
+      <attribute name="URI" value="/WEB-INF/lib/spring-core.jar" />
+      <url>jar://$MODULE_DIR$/../../lib/spring-core.jar!/</url>
+    </containerElement>
+    <containerElement type="library" level="module">
+      <attribute name="method" value="1" />
+      <attribute name="URI" value="/WEB-INF/lib/spring-web.jar" />
+      <url>jar://$MODULE_DIR$/../../lib/spring-web.jar!/</url>
+    </containerElement>
+    <containerElement type="library" level="module">
+      <attribute name="method" value="1" />
+      <attribute name="URI" value="/WEB-INF/lib/struts-mailreader-dao-1.3.0-dev.jar" />
+      <url>jar://$MODULE_DIR$/../../lib/struts-mailreader-dao-1.3.0-dev.jar!/</url>
+    </containerElement>
+    <containerElement type="library" level="module">
+      <attribute name="method" value="1" />
+      <attribute name="URI" value="/WEB-INF/lib/struts-taglib-1.3.0.jar" />
+      <url>jar://$MODULE_DIR$/../../lib/struts-taglib-1.3.0.jar!/</url>
+    </containerElement>
+    <containerElement type="library" level="module">
+      <attribute name="method" value="1" />
+      <attribute name="URI" value="/WEB-INF/lib/webwork-2.2.2.jar" />
+      <url>jar://$MODULE_DIR$/../../lib/webwork-2.2.2.jar!/</url>
+    </containerElement>
+    <containerElement type="library" level="module">
+      <attribute name="method" value="1" />
+      <attribute name="URI" value="/WEB-INF/lib/xwork-1.1.2.jar" />
+      <url>jar://$MODULE_DIR$/../../lib/xwork-1.1.2.jar!/</url>
+    </containerElement>
+    <deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/src/webapp/WEB-INF/webtest.xml" optional="false" version="2.3" />
+    <deploymentDescriptor name="context.xml" url="file://$MODULE_DIR$/META-INF/context.xml" optional="false" version="5.x" />
+    <webroots>
+      <root url="file://$MODULE_DIR$/src/webapp" relative="/" />
+      <root url="file://$MODULE_DIR$/src/java" relative="/WEB-INF/src/java" />
+      <root url="file://$MODULE_DIR$/src/test" relative="/WEB-INF/src/test" />
+    </webroots>
+  </component>
+  <component name="WeblogicWebModuleProperties">
+    <option name="IS_RUN_APPC" value="false" />
+  </component>
+</module>
+

Added: struts/sandbox/trunk/mailreader-course/action2/lab-4-2/src/webapp/css/mailreader.css
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/mailreader-course/action2/lab-4-2/src/webapp/css/mailreader.css?rev=392435&view=auto
==============================================================================
--- struts/sandbox/trunk/mailreader-course/action2/lab-4-2/src/webapp/css/mailreader.css (added)
+++ struts/sandbox/trunk/mailreader-course/action2/lab-4-2/src/webapp/css/mailreader.css Fri Apr  7 15:03:00 2006
@@ -0,0 +1,46 @@
+/**
+* Mailreader stylesheet
+*/
+
+body {
+    background-color: #FFFFFF;
+    color: #000000;
+    link: 000066;
+    visited: #660066;
+    active: #33CCCC;
+}
+
+A:hover {
+    color: #FF0000;
+}
+
+h1 {
+    font-family: Arial, Helvetica, sans-serif;
+}
+
+h2 {
+    font-family: Arial, Helvetica, sans-serif;
+}
+
+h3 {
+    font-family: Arial, Helvetica, sans-serif;
+}
+
+h4 {
+    font-family: Arial, Helvetica, sans-serif;
+}
+
+h5 {
+    font-family: Arial, Helvetica, sans-serif;
+}
+
+h6 {
+    font-family: Arial, Helvetica, sans-serif;
+}
+
+font.hint {
+    font-style: italic;
+    font-size: 80%;
+    font-family: Arial, Helvetica, sans-serif;
+    text-align: left;
+}
\ No newline at end of file

Propchange: struts/sandbox/trunk/mailreader-course/action2/lab-4-2/src/webapp/css/mailreader.css
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: struts/sandbox/trunk/mailreader-course/action2/lab-4-2/src/webapp/pages/Error.jsp
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/mailreader-course/action2/lab-4-2/src/webapp/pages/Error.jsp?rev=392435&r1=392422&r2=392435&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/action2/lab-4-2/src/webapp/pages/Error.jsp (original)
+++ struts/sandbox/trunk/mailreader-course/action2/lab-4-2/src/webapp/pages/Error.jsp Fri Apr  7 15:03:00 2006
@@ -5,6 +5,8 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
     <title>Unexpected Error</title>
+    <link href="<ww:url value="/css/mailreader.css"/>" rel="stylesheet"
+          type="text/css"/>
 </head>
 
 <body>
@@ -33,6 +35,8 @@
 <p>
     <ww:property value="%{exceptionStack}"/>
 </p>
+
+<jsp:include page="Footer.jsp"/>
 
 </body>
 </html>

Added: struts/sandbox/trunk/mailreader-course/action2/lab-4-2/src/webapp/pages/Footer.jsp
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/mailreader-course/action2/lab-4-2/src/webapp/pages/Footer.jsp?rev=392435&view=auto
==============================================================================
--- struts/sandbox/trunk/mailreader-course/action2/lab-4-2/src/webapp/pages/Footer.jsp (added)
+++ struts/sandbox/trunk/mailreader-course/action2/lab-4-2/src/webapp/pages/Footer.jsp Fri Apr  7 15:03:00 2006
@@ -0,0 +1,5 @@
+<%@ taglib uri="/webwork" prefix="ww" %>
+<hr/>
+<p>
+    <a href="<ww:url action="Welcome" />"><ww:text name="index.title"/></a>
+</p>

Propchange: struts/sandbox/trunk/mailreader-course/action2/lab-4-2/src/webapp/pages/Footer.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

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=392435&r1=392422&r2=392435&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 Fri Apr  7 15:03:00 2006
@@ -1,12 +1,16 @@
 <%@ page contentType="text/html; charset=UTF-8" %>
 <%@ taglib prefix="ww" uri="/webwork" %>
-
 <html>
 <head>
     <title>Hello</title>
+    <link href="<ww:url value="/css/mailreader.css"/>" rel="stylesheet"
+          type="text/css"/>
 </head>
 
 <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=392435&r1=392422&r2=392435&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 Fri Apr  7 15:03:00 2006
@@ -4,7 +4,9 @@
 "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>
+    <link href="<ww:url value="/css/mailreader.css"/>" rel="stylesheet"
+          type="text/css"/>
 </head>
 
 <body onLoad="self.focus();document.Login.username.focus()">
@@ -20,6 +22,8 @@
     <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=392435&r1=392422&r2=392435&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 Fri Apr  7 15:03:00 2006
@@ -5,6 +5,8 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
     <title><ww:text name="menu.title"/></title>
+    <link href="<ww:url value="/css/mailreader.css"/>" rel="stylesheet"
+          type="text/css"/>
 </head>
 
 <body>
@@ -18,5 +20,8 @@
         <ww:text name="menu.logout"/>
     </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=392435&r1=392422&r2=392435&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 Fri Apr  7 15:03:00 2006
@@ -1,10 +1,18 @@
+<%@ taglib uri="/webwork" prefix="ww" %>
 <html>
-<head><title>Missing Feature</title></head>
+<head>
+    <title>Missing Feature</title>
+    <link href="<ww:url value="/css/mailreader.css"/>" rel="stylesheet"
+          type="text/css"/>
+</head>
 
 <body>
 <p>
     This feature is under construction.
     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=392435&r1=392422&r2=392435&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 Fri Apr  7 15:03:00 2006
@@ -10,6 +10,8 @@
     <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()">
@@ -117,6 +119,8 @@
             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=392435&r1=392422&r2=392435&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 Fri Apr  7 15:03:00 2006
@@ -13,6 +13,8 @@
     <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()">
@@ -59,6 +61,8 @@
                 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=392435&r1=392422&r2=392435&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 Fri Apr  7 15:03:00 2006
@@ -6,6 +6,8 @@
 <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>
@@ -24,6 +26,8 @@
     <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>

Modified: struts/sandbox/trunk/mailreader-course/action2/mailreader-course-action2.ipr
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/mailreader-course/action2/mailreader-course-action2.ipr?rev=392435&r1=392434&r2=392435&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/action2/mailreader-course-action2.ipr (original)
+++ struts/sandbox/trunk/mailreader-course/action2/mailreader-course-action2.ipr Fri Apr  7 15:03:00 2006
@@ -203,6 +203,7 @@
       <module fileurl="file://$PROJECT_DIR$/lab-3-2/lab-3-2.iml" filepath="$PROJECT_DIR$/lab-3-2/lab-3-2.iml" />
       <module fileurl="file://$PROJECT_DIR$/lab-3-3/lab-3-3.iml" filepath="$PROJECT_DIR$/lab-3-3/lab-3-3.iml" />
       <module fileurl="file://$PROJECT_DIR$/lab-4-1/lab-4-1.iml" filepath="$PROJECT_DIR$/lab-4-1/lab-4-1.iml" />
+      <module fileurl="file://$PROJECT_DIR$/lab-4-2/lab-4-2.iml" filepath="$PROJECT_DIR$/lab-4-2/lab-4-2.iml" />
       <module fileurl="file://$PROJECT_DIR$/mailreader-course-action2.iml" filepath="$PROJECT_DIR$/mailreader-course-action2.iml" />
     </modules>
   </component>



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