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/06 18:59:41 UTC
svn commit: r392013 - in /struts/sandbox/trunk/mailreader-course/action2: ./
lab-1-3/ lab-1-3/src/java/ lab-1-3/src/test/ lab-1-3/src/webapp/WEB-INF/
lab-1-3/src/webapp/pages/
Author: husted
Date: Thu Apr 6 09:59:39 2006
New Revision: 392013
URL: http://svn.apache.org/viewcvs?rev=392013&view=rev
Log:
MailReader Course
* Add lab 1-3
Added:
struts/sandbox/trunk/mailreader-course/action2/lab-1-3/
- copied from r391989, struts/sandbox/trunk/mailreader-course/action2/lab-1-2/
struts/sandbox/trunk/mailreader-course/action2/lab-1-3/lab-1-3.iml
struts/sandbox/trunk/mailreader-course/action2/lab-1-3/src/java/DatabaseListener.java
- copied, changed from r391975, struts/sandbox/trunk/action2/apps/mailreader/src/java/mailreader2/ApplicationListener.java
Removed:
struts/sandbox/trunk/mailreader-course/action2/lab-1-3/lab-1-2-src.iml
Modified:
struts/sandbox/trunk/mailreader-course/action2/lab-1-3/src/java/xwork.xml
struts/sandbox/trunk/mailreader-course/action2/lab-1-3/src/test/RetainTest.java
struts/sandbox/trunk/mailreader-course/action2/lab-1-3/src/webapp/WEB-INF/web.xml
struts/sandbox/trunk/mailreader-course/action2/lab-1-3/src/webapp/pages/Welcome.jsp
struts/sandbox/trunk/mailreader-course/action2/mailreader-course-action2.ipr
Added: struts/sandbox/trunk/mailreader-course/action2/lab-1-3/lab-1-3.iml
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/mailreader-course/action2/lab-1-3/lab-1-3.iml?rev=392013&view=auto
==============================================================================
--- struts/sandbox/trunk/mailreader-course/action2/lab-1-3/lab-1-3.iml (added)
+++ struts/sandbox/trunk/mailreader-course/action2/lab-1-3/lab-1-3.iml Thu Apr 6 09:59:39 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-1-3/WEB-INF/classes" />
+ <exclude-output />
+ <exploded url="file://C:/opt/Apache/Tomcat-5.0/webapps/lab-1-3" />
+ <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://$APPLICATION_HOME_DIR$/lib/junit.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/oscore.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/spring-context.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/webwork-2.2.2.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/freemarker.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://$MODULE_DIR$/../../lib/rife-continuations.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-beans.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/commons-logging-1.0.4.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>
+ <orderEntryProperties />
+ </component>
+ <component name="WebModuleBuildComponent">
+ <setting name="EXPLODED_URL" value="file://C:/opt/Apache/Tomcat-5.0/webapps/lab-1-3" />
+ <setting name="EXPLODED_ENABLED" value="true" />
+ <setting name="JAR_URL" value="file://" />
+ <setting name="JAR_ENABLED" value="false" />
+ <setting name="SYNC_EXPLODED_DIR" value="true" />
+ <setting name="BUILD_ON_FRAME_DEACTIVATION" value="false" />
+ <setting name="RUN_JASPER_VALIDATION" value="false" />
+ </component>
+ <component name="WebModuleProperties">
+ <containerElement type="library" level="module">
+ <attribute name="method" value="1" />
+ <attribute name="URI" value="/WEB-INF/lib/junit.jar" />
+ <url>jar://$APPLICATION_HOME_DIR$/lib/junit.jar!/</url>
+ </containerElement>
+ <containerElement type="library" level="module">
+ <attribute name="method" value="1" />
+ <attribute name="URI" value="/WEB-INF/lib/commons-collections-3.1.jar" />
+ <url>jar://$MODULE_DIR$/../../lib/commons-collections-3.1.jar!/</url>
+ </containerElement>
+ <containerElement type="library" level="module">
+ <attribute name="method" value="1" />
+ <attribute name="URI" value="/WEB-INF/lib/commons-digester-1.6.jar" />
+ <url>jar://$MODULE_DIR$/../../lib/commons-digester-1.6.jar!/</url>
+ </containerElement>
+ <containerElement type="library" level="module">
+ <attribute name="method" value="1" />
+ <attribute name="URI" value="/WEB-INF/lib/commons-logging-1.0.4.jar" />
+ <url>jar://$MODULE_DIR$/../../lib/commons-logging-1.0.4.jar!/</url>
+ </containerElement>
+ <containerElement type="library" level="module">
+ <attribute name="method" value="1" />
+ <attribute name="URI" value="/WEB-INF/lib/freemarker.jar" />
+ <url>jar://$MODULE_DIR$/../../lib/freemarker.jar!/</url>
+ </containerElement>
+ <containerElement type="library" level="module">
+ <attribute name="method" value="1" />
+ <attribute name="URI" value="/WEB-INF/lib/ognl.jar" />
+ <url>jar://$MODULE_DIR$/../../lib/ognl.jar!/</url>
+ </containerElement>
+ <containerElement type="library" level="module">
+ <attribute name="method" value="1" />
+ <attribute name="URI" value="/WEB-INF/lib/oscore.jar" />
+ <url>jar://$MODULE_DIR$/../../lib/oscore.jar!/</url>
+ </containerElement>
+ <containerElement type="library" level="module">
+ <attribute name="method" value="1" />
+ <attribute name="URI" value="/WEB-INF/lib/rife-continuations.jar" />
+ <url>jar://$MODULE_DIR$/../../lib/rife-continuations.jar!/</url>
+ </containerElement>
+ <containerElement type="library" level="module">
+ <attribute name="method" value="1" />
+ <attribute name="URI" value="/WEB-INF/lib/spring-beans.jar" />
+ <url>jar://$MODULE_DIR$/../../lib/spring-beans.jar!/</url>
+ </containerElement>
+ <containerElement type="library" level="module">
+ <attribute name="method" value="1" />
+ <attribute name="URI" value="/WEB-INF/lib/spring-context.jar" />
+ <url>jar://$MODULE_DIR$/../../lib/spring-context.jar!/</url>
+ </containerElement>
+ <containerElement type="library" level="module">
+ <attribute name="method" value="1" />
+ <attribute name="URI" value="/WEB-INF/lib/spring-core.jar" />
+ <url>jar://$MODULE_DIR$/../../lib/spring-core.jar!/</url>
+ </containerElement>
+ <containerElement type="library" level="module">
+ <attribute name="method" value="1" />
+ <attribute name="URI" value="/WEB-INF/lib/spring-web.jar" />
+ <url>jar://$MODULE_DIR$/../../lib/spring-web.jar!/</url>
+ </containerElement>
+ <containerElement type="library" level="module">
+ <attribute name="method" value="1" />
+ <attribute name="URI" value="/WEB-INF/lib/struts-mailreader-dao-1.3.0-dev.jar" />
+ <url>jar://$MODULE_DIR$/../../lib/struts-mailreader-dao-1.3.0-dev.jar!/</url>
+ </containerElement>
+ <containerElement type="library" level="module">
+ <attribute name="method" value="1" />
+ <attribute name="URI" value="/WEB-INF/lib/struts-taglib-1.3.0.jar" />
+ <url>jar://$MODULE_DIR$/../../lib/struts-taglib-1.3.0.jar!/</url>
+ </containerElement>
+ <containerElement type="library" level="module">
+ <attribute name="method" value="1" />
+ <attribute name="URI" value="/WEB-INF/lib/webwork-2.2.2.jar" />
+ <url>jar://$MODULE_DIR$/../../lib/webwork-2.2.2.jar!/</url>
+ </containerElement>
+ <containerElement type="library" level="module">
+ <attribute name="method" value="1" />
+ <attribute name="URI" value="/WEB-INF/lib/xwork-1.1.2.jar" />
+ <url>jar://$MODULE_DIR$/../../lib/xwork-1.1.2.jar!/</url>
+ </containerElement>
+ <deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/src/webapp/WEB-INF/web.xml" optional="false" version="2.3" />
+ <deploymentDescriptor name="context.xml" url="file://$MODULE_DIR$/META-INF/context.xml" optional="false" version="5.x" />
+ <webroots>
+ <root url="file://$MODULE_DIR$/src/webapp" relative="/" />
+ <root url="file://$MODULE_DIR$/src/java" relative="/WEB-INF/src/java" />
+ <root url="file://$MODULE_DIR$/src/test" relative="/WEB-INF/src/test" />
+ </webroots>
+ </component>
+ <component name="WeblogicWebModuleProperties">
+ <option name="IS_RUN_APPC" value="false" />
+ </component>
+</module>
+
Copied: struts/sandbox/trunk/mailreader-course/action2/lab-1-3/src/java/DatabaseListener.java (from r391975, struts/sandbox/trunk/action2/apps/mailreader/src/java/mailreader2/ApplicationListener.java)
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/mailreader-course/action2/lab-1-3/src/java/DatabaseListener.java?p2=struts/sandbox/trunk/mailreader-course/action2/lab-1-3/src/java/DatabaseListener.java&p1=struts/sandbox/trunk/action2/apps/mailreader/src/java/mailreader2/ApplicationListener.java&r1=391975&r2=392013&rev=392013&view=diff
==============================================================================
--- struts/sandbox/trunk/action2/apps/mailreader/src/java/mailreader2/ApplicationListener.java (original)
+++ struts/sandbox/trunk/mailreader-course/action2/lab-1-3/src/java/DatabaseListener.java Thu Apr 6 09:59:39 2006
@@ -16,8 +16,6 @@
* $Id: ApplicationListener.java 372087 2006-01-25 03:38:42Z craigmcc $
*/
-package mailreader2;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.struts.apps.mailreader.dao.impl.memory.MemoryUserDatabase;
@@ -50,12 +48,12 @@
* <li>Class to store protocol list (an array here). </li>
* <p/>
* </ul>
- * <p>
+ * <p/>
* DEVELOPMENT NOTE - Another approach would be to instantiate the database via Spring.
* </p>
*/
-public final class ApplicationListener implements ServletContextListener {
+public final class DatabaseListener implements ServletContextListener {
// ------------------------------------------------------ Manifest Constants
Modified: struts/sandbox/trunk/mailreader-course/action2/lab-1-3/src/java/xwork.xml
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/mailreader-course/action2/lab-1-3/src/java/xwork.xml?rev=392013&r1=391989&r2=392013&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/action2/lab-1-3/src/java/xwork.xml (original)
+++ struts/sandbox/trunk/mailreader-course/action2/lab-1-3/src/java/xwork.xml Thu Apr 6 09:59:39 2006
@@ -19,5 +19,10 @@
<result>/pages/Welcome.jsp</result>
</action>
+ <action name="Register" class="Register">
+ <result name="input">/pages/Register.jsp</result>
+ <result>/pages/Missing.jsp</result>
+ </action>
+
</package>
</xwork>
Modified: struts/sandbox/trunk/mailreader-course/action2/lab-1-3/src/test/RetainTest.java
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/mailreader-course/action2/lab-1-3/src/test/RetainTest.java?rev=392013&r1=391989&r2=392013&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/action2/lab-1-3/src/test/RetainTest.java (original)
+++ struts/sandbox/trunk/mailreader-course/action2/lab-1-3/src/test/RetainTest.java Thu Apr 6 09:59:39 2006
@@ -1,7 +1,7 @@
import junit.framework.TestCase;
+import org.apache.struts.apps.mailreader.dao.Subscription;
import org.apache.struts.apps.mailreader.dao.User;
import org.apache.struts.apps.mailreader.dao.UserDatabase;
-import org.apache.struts.apps.mailreader.dao.Subscription;
import org.apache.struts.apps.mailreader.dao.impl.memory.MemoryUserDatabase;
public class RetainTest extends TestCase {
@@ -18,7 +18,7 @@
public void testDatabaseClean() throws Exception {
User user = database.findUser("user");
- assertNull("Expected user to be created",user);
+ assertNull("Expected user to be created", user);
}
// Add your test methods here.
@@ -32,7 +32,7 @@
public void testFindUser() throws Exception {
User user1 = database.createUser("user");
User user2 = database.findUser("user");
- assertSame("Expected users to match",user1,user2);
+ assertSame("Expected users to match", user1, user2);
}
public void testCreateSubscription() throws Exception {
@@ -43,7 +43,7 @@
public void testFindSubscription() throws Exception {
Subscription sub1 = database.createUser("user").createSubscription("mail.yahoo.com");
Subscription sub2 = database.findUser("user").findSubscription("mail.yahoo.com");
- assertSame("Expected Subscriptions to match",sub1,sub2);
+ assertSame("Expected Subscriptions to match", sub1, sub2);
}
public void testDatabsaeSave() throws Exception {
@@ -73,25 +73,25 @@
public void testFinderUserBogus() throws Exception {
User user1 = database.findUser("bogus");
- assertNull("Expected bogus user to be not found",user1);
+ assertNull("Expected bogus user to be not found", user1);
User user2 = database.createUser("user");
assertNotNull("Expected user to be created", user2);
user1 = database.findUser("bogus");
- assertNull("Expected bogus user to be not found",user1);
+ assertNull("Expected bogus user to be not found", user1);
user1 = database.findUser("user");
- assertNotNull("Expected user to be found",user1);
+ assertNotNull("Expected user to be found", user1);
}
public void testFindSubBogus() throws Exception {
- User user =database.createUser("user");
+ User user = database.createUser("user");
Subscription sub = user.findSubscription("mail.bogus.com");
assertNull(sub);
sub = database.findUser("user").createSubscription("mail.hotmail.com");
assertNotNull(sub);
Subscription sub2 = user.findSubscription("mail.bogus.com");
assertNull(sub2);
- Subscription sub3 =user.findSubscription("mail.hotmail.com");
- assertSame(sub,sub3);
+ Subscription sub3 = user.findSubscription("mail.hotmail.com");
+ assertSame(sub, sub3);
}
}
Modified: struts/sandbox/trunk/mailreader-course/action2/lab-1-3/src/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/mailreader-course/action2/lab-1-3/src/webapp/WEB-INF/web.xml?rev=392013&r1=391989&r2=392013&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/action2/lab-1-3/src/webapp/WEB-INF/web.xml (original)
+++ struts/sandbox/trunk/mailreader-course/action2/lab-1-3/src/webapp/WEB-INF/web.xml Thu Apr 6 09:59:39 2006
@@ -23,6 +23,13 @@
<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
</listener>
+ <!-- Application Listener for Mailreader database -->
+ <listener>
+ <listener-class>
+ DatabaseListener
+ </listener-class>
+ </listener>
+
<welcome-file-list>
<welcome-file>index.jsp</welcome-file>
<welcome-file>index.html</welcome-file>
Modified: struts/sandbox/trunk/mailreader-course/action2/lab-1-3/src/webapp/pages/Welcome.jsp
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/mailreader-course/action2/lab-1-3/src/webapp/pages/Welcome.jsp?rev=392013&r1=391989&r2=392013&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/action2/lab-1-3/src/webapp/pages/Welcome.jsp (original)
+++ struts/sandbox/trunk/mailreader-course/action2/lab-1-3/src/webapp/pages/Welcome.jsp Thu Apr 6 09:59:39 2006
@@ -8,7 +8,7 @@
<h3>MailReader Options</h3>
<ul>
- <li><a href="<ww:url action="Missing"/>">Register with the MailReader</a></li>
+ <li><a href="<ww:url action="Register!input"/>">Register with the MailReader</a></li>
<li><a href="<ww:url action="Missing"/>">Log on to the MailReader</a></li>
</ul>
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=392013&r1=392012&r2=392013&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/action2/mailreader-course-action2.ipr (original)
+++ struts/sandbox/trunk/mailreader-course/action2/mailreader-course-action2.ipr Thu Apr 6 09:59:39 2006
@@ -181,6 +181,7 @@
<module fileurl="file://$PROJECT_DIR$/lab-1-0/lab-1-0.iml" filepath="$PROJECT_DIR$/lab-1-0/lab-1-0.iml" />
<module fileurl="file://$PROJECT_DIR$/lab-1-1/lab-1-1.iml" filepath="$PROJECT_DIR$/lab-1-1/lab-1-1.iml" />
<module fileurl="file://$PROJECT_DIR$/lab-1-2/lab-1-2.iml" filepath="$PROJECT_DIR$/lab-1-2/lab-1-2.iml" />
+ <module fileurl="file://$PROJECT_DIR$/lab-1-3/lab-1-3.iml" filepath="$PROJECT_DIR$/lab-1-3/lab-1-3.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