Author: husted
Date: Sat Aug 12 17:59:40 2006
New Revision: 431123
URL: http://svn.apache.org/viewvc?rev=431123&view=rev
Log:
Reformat code only. No changes.
Added:
struts/sandbox/trunk/mailreader-course/struts2/mailreader-course-struts2.iml
Removed:
struts/sandbox/trunk/mailreader-course/struts2/mailreader-course-action2.iml
Modified:
struts/sandbox/trunk/mailreader-course/struts2/mailreader-course-struts2.ipr
struts/sandbox/trunk/mailreader-course/struts2/register/src/java/MailReaderSupport.java
struts/sandbox/trunk/mailreader-course/struts2/register/src/webapp/pages/Hello.jsp
struts/sandbox/trunk/mailreader-course/struts2/register/src/webapp/pages/Missing.jsp
struts/sandbox/trunk/mailreader-course/struts2/retain/retain.iml
struts/sandbox/trunk/mailreader-course/struts2/retain/src/test/RetainTest.java
struts/sandbox/trunk/mailreader-course/struts2/welcome/welcome.iml
Added:
struts/sandbox/trunk/mailreader-course/struts2/mailreader-course-struts2.iml
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/mailreader-course-struts2.iml?rev=431123&view=auto
==============================================================================
---
struts/sandbox/trunk/mailreader-course/struts2/mailreader-course-struts2.iml
(added)
+++
struts/sandbox/trunk/mailreader-course/struts2/mailreader-course-struts2.iml
Sat Aug 12 17:59:40 2006
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module version="4" relativePaths="true" type="JAVA_MODULE">
+ <component name="ModuleRootManager" />
+ <component name="NewModuleRootManager">
+ <output url="file://$MODULE_DIR$/classes" />
+ <exclude-output />
+ <content url="file://$MODULE_DIR$" />
+ <orderEntry type="inheritedJdk" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ <orderEntryProperties />
+ </component>
+</module>
+
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?rev=431123&r1=431122&r2=431123&view=diff
==============================================================================
---
struts/sandbox/trunk/mailreader-course/struts2/mailreader-course-struts2.ipr
(original)
+++
struts/sandbox/trunk/mailreader-course/struts2/mailreader-course-struts2.ipr
Sat Aug 12 17:59:40 2006
@@ -180,6 +180,7 @@
<modules>
<module fileurl="file://$PROJECT_DIR$/hello/hello.iml"
filepath="$PROJECT_DIR$/hello/hello.iml" />
<module fileurl="file://$PROJECT_DIR$/mailreader-course-struts2.iml"
filepath="$PROJECT_DIR$/mailreader-course-struts2.iml" />
+ <module fileurl="file://$PROJECT_DIR$/register/register.iml"
filepath="$PROJECT_DIR$/register/register.iml" />
<module fileurl="file://$PROJECT_DIR$/retain/retain.iml"
filepath="$PROJECT_DIR$/retain/retain.iml" />
<module fileurl="file://$PROJECT_DIR$/welcome/welcome.iml"
filepath="$PROJECT_DIR$/welcome/welcome.iml" />
</modules>
Modified:
struts/sandbox/trunk/mailreader-course/struts2/register/src/java/MailReaderSupport.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/register/src/java/MailReaderSupport.java?rev=431123&r1=431122&r2=431123&view=diff
==============================================================================
---
struts/sandbox/trunk/mailreader-course/struts2/register/src/java/MailReaderSupport.java
(original)
+++
struts/sandbox/trunk/mailreader-course/struts2/register/src/java/MailReaderSupport.java
Sat Aug 12 17:59:40 2006
@@ -1,9 +1,9 @@
import com.opensymphony.util.BeanUtils;
import com.opensymphony.xwork2.ActionSupport;
-import org.apache.struts2.interceptor.ApplicationAware;
import org.apache.struts.apps.mailreader.dao.ExpiredPasswordException;
import org.apache.struts.apps.mailreader.dao.User;
import org.apache.struts.apps.mailreader.dao.UserDatabase;
+import org.apache.struts2.interceptor.ApplicationAware;
import java.util.Map;
Modified:
struts/sandbox/trunk/mailreader-course/struts2/register/src/webapp/pages/Hello.jsp
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/register/src/webapp/pages/Hello.jsp?rev=431123&r1=431122&r2=431123&view=diff
==============================================================================
---
struts/sandbox/trunk/mailreader-course/struts2/register/src/webapp/pages/Hello.jsp
(original)
+++
struts/sandbox/trunk/mailreader-course/struts2/register/src/webapp/pages/Hello.jsp
Sat Aug 12 17:59:40 2006
@@ -3,6 +3,7 @@
<head>
<title>Hello</title>
</head>
+
<body>
<h2><ww:text name="hello.message"/></h2>
</body>
Modified:
struts/sandbox/trunk/mailreader-course/struts2/register/src/webapp/pages/Missing.jsp
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/register/src/webapp/pages/Missing.jsp?rev=431123&r1=431122&r2=431123&view=diff
==============================================================================
---
struts/sandbox/trunk/mailreader-course/struts2/register/src/webapp/pages/Missing.jsp
(original)
+++
struts/sandbox/trunk/mailreader-course/struts2/register/src/webapp/pages/Missing.jsp
Sat Aug 12 17:59:40 2006
@@ -1,5 +1,6 @@
<html>
<head><title>Missing Feature</title></head>
+
<body>
<p>
This feature is under construction.
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?rev=431123&r1=431122&r2=431123&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/retain/retain.iml (original)
+++ struts/sandbox/trunk/mailreader-course/struts2/retain/retain.iml Sat Aug 12
17:59:40 2006
@@ -254,12 +254,12 @@
<url>jar://$MODULE_DIR$/../lib/xwork-2.0-SNAPSHOT.jar!/</url>
</containerElement>
<deploymentDescriptor name="web.xml"
url="file://$MODULE_DIR$/src/webapp/WEB-INF/web.xml" optional="false"
version="2.3" />
+ <deploymentDescriptor name="context.xml"
url="file://$MODULE_DIR$/META-INF/context.xml" optional="false" version="5.x" />
<deploymentDescriptor name=""
url="file://$MODULE_DIR$/META-INF/context.xml" optional="false">
<option name="DEFAULT_DIR" value="WEB-INF" />
<option name="NAME" value="" />
<option name="DESCRIPTION" value="" />
</deploymentDescriptor>
- <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" />
Modified:
struts/sandbox/trunk/mailreader-course/struts2/retain/src/test/RetainTest.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/retain/src/test/RetainTest.java?rev=431123&r1=431122&r2=431123&view=diff
==============================================================================
---
struts/sandbox/trunk/mailreader-course/struts2/retain/src/test/RetainTest.java
(original)
+++
struts/sandbox/trunk/mailreader-course/struts2/retain/src/test/RetainTest.java
Sat Aug 12 17:59:40 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/struts2/welcome/welcome.iml
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/welcome/welcome.iml?rev=431123&r1=431122&r2=431123&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/welcome/welcome.iml
(original)
+++ struts/sandbox/trunk/mailreader-course/struts2/welcome/welcome.iml Sat Aug
12 17:59:40 2006
@@ -254,12 +254,12 @@
<url>jar://$MODULE_DIR$/../lib/xwork-2.0-SNAPSHOT.jar!/</url>
</containerElement>
<deploymentDescriptor name="web.xml"
url="file://$MODULE_DIR$/src/webapp/WEB-INF/web.xml" optional="false"
version="2.3" />
+ <deploymentDescriptor name="context.xml"
url="file://$MODULE_DIR$/META-INF/context.xml" optional="false" version="5.x" />
<deploymentDescriptor name=""
url="file://$MODULE_DIR$/META-INF/context.xml" optional="false">
<option name="DEFAULT_DIR" value="WEB-INF" />
<option name="NAME" value="" />
<option name="DESCRIPTION" value="" />
</deploymentDescriptor>
- <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" />
