Modified: struts/sandbox/trunk/action2/apps/mailreader/src/java/mailreader2/MailreaderSupport.java URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/action2/apps/mailreader/src/java/mailreader2/MailreaderSupport.java?rev=387108&r1=387107&r2=387108&view=diff ============================================================================== --- struts/sandbox/trunk/action2/apps/mailreader/src/java/mailreader2/MailreaderSupport.java (original) +++ struts/sandbox/trunk/action2/apps/mailreader/src/java/mailreader2/MailreaderSupport.java Sun Mar 19 18:19:35 2006 @@ -18,30 +18,23 @@ package mailreader2; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - +import com.opensymphony.webwork.interceptor.ApplicationAware; +import com.opensymphony.webwork.interceptor.SessionAware; import com.opensymphony.xwork.ActionSupport; import com.opensymphony.xwork.ModelDriven; -import com.opensymphony.webwork.interceptor.SessionAware; -import com.opensymphony.webwork.interceptor.ApplicationAware; -import org.apache.struts.apps.mailreader.dao.User; -import org.apache.struts.apps.mailreader.dao.Subscription; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.apache.struts.apps.mailreader.dao.ExpiredPasswordException; +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 java.util.Map; /** - * <p> - * Base Action for MailreaderSupport application. - * </p><p> - * All the BaseAction helper methods are prefixed with "do" - * so that they can be easily distinguished from Struts and Servlet API methods. - * BaseAction subclasses may also have prive "do" helpers of their own. - * </p><p> - * Methods are kept in alphabetical order, to make them easier to find. - * </p> + * <p> Base Action for MailreaderSupport application. </p><p> All the BaseAction helper methods are prefixed with "do" + * so that they can be easily distinguished from Struts and Servlet API methods. BaseAction subclasses may also have + * prive "do" helpers of their own. </p><p> Methods are kept in alphabetical order, to make them easier to find. </p> * * @version $Rev: 360442 $ $Date: 2005-12-31 15:10:04 -0500 (Sat, 31 Dec 2005) $ */ @@ -73,69 +66,62 @@ // ---- ModelDriven ---- - public Object getModel () { + public Object getModel() { return getSession().get(Constants.USER_KEY); } // ---- Database property ---- /** - * <p> - * Return a reference to the UserDatabase - * or null if the database is not available. - * </p> + * <p> Return a reference to the UserDatabase or null if the database is not available. </p> * - * @return a reference to the UserDatabase or null if the database is not - * available + * @return a reference to the UserDatabase or null if the database is not available */ protected UserDatabase getDatabase() { Object db = getApplication().get(Constants.DATABASE_KEY); - if (db==null) + if (db == null) { this.addActionError("error.database.missing"); + } return (UserDatabase) db; } protected void setDatabase(UserDatabase database) { - getApplication().put(Constants.DATABASE_KEY,database); + getApplication().put(Constants.DATABASE_KEY, database); } // ---- User property ---- public User getUser() { - return (User) getModel(); + return (User) getModel(); } public void setUser(User user) { - getSession().put(Constants.USER_KEY,user); + getSession().put(Constants.USER_KEY, user); } - public User findUser(String username, String password) throws ExpiredPasswordException - { + public User findUser(String username, String password) throws ExpiredPasswordException { // FIXME: Stupid hack to compensate for inadequate DAO layer - if (username.equals("Hermes")) + if (username.equals("Hermes")) { throw new ExpiredPasswordException("Hermes"); + } User user = getDatabase().findUser(username); if ((user != null) && !user.getPassword().equals(password)) { user = null; } if (user == null) { - this.addFieldError("password","error.password.mismatch"); + this.addFieldError("password", "error.password.mismatch"); } return user; } /** - * <p> - * The <code>Log</code> instance for this application. - * </p> + * <p> The <code>Log</code> instance for this application. </p> */ protected Log log = LogFactory.getLog(Constants.PACKAGE); /** - * <p> - * Persist the User object, including subscriptions, to the database. - * </p> + * <p> Persist the User object, including subscriptions, to the database. </p> * * @throws javax.servlet.ServletException On any error */ @@ -152,9 +138,7 @@ // ---- Subscription property ---- /** - * <p> - * Obtain the cached Subscription object, if any. - * </p> + * <p> Obtain the cached Subscription object, if any. </p> * * @return Cached Subscription object or null */ @@ -163,18 +147,16 @@ } protected void getSubscriprtion(Subscription subscription) { - getSession().put(Constants.SUBSCRIPTION_KEY,subscription); + getSession().put(Constants.SUBSCRIPTION_KEY, subscription); } // ---- Control methods ---- /** - * <p> - * Helper method to log event and cancel transaction. - * </p> + * <p> Helper method to log event and cancel transaction. </p> * - * @param method Method being processed - * @param key Attrkibute to remove from session, if any + * @param method Method being processed + * @param key Attrkibute to remove from session, if any */ protected void doCancel(String method, String key) { if (key != null) {
Modified: struts/sandbox/trunk/action2/apps/mailreader/src/java/xwork.xml URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/action2/apps/mailreader/src/java/xwork.xml?rev=387108&r1=387107&r2=387108&view=diff ============================================================================== --- struts/sandbox/trunk/action2/apps/mailreader/src/java/xwork.xml (original) +++ struts/sandbox/trunk/action2/apps/mailreader/src/java/xwork.xml Sun Mar 19 18:19:35 2006 @@ -36,6 +36,6 @@ <action name="Logoff"> <result type="chain">Welcome</result> </action> - + </package> </xwork> Modified: struts/sandbox/trunk/action2/apps/mailreader/src/webapp/WEB-INF/web.xml URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/action2/apps/mailreader/src/webapp/WEB-INF/web.xml?rev=387108&r1=387107&r2=387108&view=diff ============================================================================== --- struts/sandbox/trunk/action2/apps/mailreader/src/webapp/WEB-INF/web.xml (original) +++ struts/sandbox/trunk/action2/apps/mailreader/src/webapp/WEB-INF/web.xml Sun Mar 19 18:19:35 2006 @@ -20,9 +20,9 @@ <!-- Application Listener for Mailreader database --> <listener> - <listener-class> - mailreader2.ApplicationListener - </listener-class> + <listener-class> + mailreader2.ApplicationListener + </listener-class> </listener> <welcome-file-list> Modified: struts/sandbox/trunk/action2/apps/mailreader/src/webapp/css/mailreader.css URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/action2/apps/mailreader/src/webapp/css/mailreader.css?rev=387108&r1=387107&r2=387108&view=diff ============================================================================== --- struts/sandbox/trunk/action2/apps/mailreader/src/webapp/css/mailreader.css (original) +++ struts/sandbox/trunk/action2/apps/mailreader/src/webapp/css/mailreader.css Sun Mar 19 18:19:35 2006 @@ -1,46 +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 +/** +* 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 Modified: struts/sandbox/trunk/action2/apps/mailreader/src/webapp/index.html URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/action2/apps/mailreader/src/webapp/index.html?rev=387108&r1=387107&r2=387108&view=diff ============================================================================== --- struts/sandbox/trunk/action2/apps/mailreader/src/webapp/index.html (original) +++ struts/sandbox/trunk/action2/apps/mailreader/src/webapp/index.html Sun Mar 19 18:19:35 2006 @@ -1,8 +1,9 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html> <head> -<META HTTP-EQUIV="Refresh" CONTENT="0;URL=Welcome.do"> + <META HTTP-EQUIV="Refresh" CONTENT="0;URL=Welcome.do"> </head> + <body> <p>Loading ...</p> </body> Modified: struts/sandbox/trunk/action2/apps/mailreader/src/webapp/pages/ChangePassword.jsp URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/action2/apps/mailreader/src/webapp/pages/ChangePassword.jsp?rev=387108&r1=387107&r2=387108&view=diff ============================================================================== --- struts/sandbox/trunk/action2/apps/mailreader/src/webapp/pages/ChangePassword.jsp (original) +++ struts/sandbox/trunk/action2/apps/mailreader/src/webapp/pages/ChangePassword.jsp Sun Mar 19 18:19:35 2006 @@ -1,21 +1,23 @@ -<[EMAIL PROTECTED] uri="/webwork" prefix="ww" %> -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";> +<%@ taglib uri="/webwork" prefix="ww" %> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" +"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="change.title"/></title> - <link href="<ww:url value="/css/mailreader.css"/>" rel="stylesheet" type="text/css" /> - </head> - <body> +<head> + <title><ww:text name="change.title"/></title> + <link href="<ww:url value="/css/mailreader.css"/>" rel="stylesheet" type="text/css"/> +</head> - <p> - <ww:text name="change.message"/> - </p> +<body> - <p> - <a href="<ww:url action="Logon!input"/>"> - <ww:text name="change.try"/> - </a> - </p> +<p> + <ww:text name="change.message"/> +</p> - </body> +<p> + <a href="<ww:url action="Logon!input"/>"> + <ww:text name="change.try"/> + </a> +</p> + +</body> </html> Modified: struts/sandbox/trunk/action2/apps/mailreader/src/webapp/pages/Footer.jsp URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/action2/apps/mailreader/src/webapp/pages/Footer.jsp?rev=387108&r1=387107&r2=387108&view=diff ============================================================================== --- struts/sandbox/trunk/action2/apps/mailreader/src/webapp/pages/Footer.jsp (original) +++ struts/sandbox/trunk/action2/apps/mailreader/src/webapp/pages/Footer.jsp Sun Mar 19 18:19:35 2006 @@ -1,5 +1,6 @@ -<[EMAIL PROTECTED] uri="/webwork" prefix="ww" %> +<%@ taglib uri="/webwork" prefix="ww" %> <hr/> + <p> -<a href="<ww:url action="Welcome" />"><ww:text name="index.title"/></a> + <a href="<ww:url action="Welcome" />"><ww:text name="index.title"/></a> </p> Modified: struts/sandbox/trunk/action2/apps/mailreader/src/webapp/pages/Logon.jsp URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/action2/apps/mailreader/src/webapp/pages/Logon.jsp?rev=387108&r1=387107&r2=387108&view=diff ============================================================================== --- struts/sandbox/trunk/action2/apps/mailreader/src/webapp/pages/Logon.jsp (original) +++ struts/sandbox/trunk/action2/apps/mailreader/src/webapp/pages/Logon.jsp Sun Mar 19 18:19:35 2006 @@ -1,19 +1,20 @@ -<[EMAIL PROTECTED] uri="/webwork" prefix="ww" %> -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";> +<%@ taglib uri="/webwork" prefix="ww" %> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" +"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="logon.title"/></title> - <link href="<ww:url value="/css/mailreader.css"/>" rel="stylesheet" type="text/css" /> + <link href="<ww:url value="/css/mailreader.css"/>" rel="stylesheet" type="text/css"/> </head> <body> <ww:form method="POST"> - <ww:textfield label="%{getText('prompt.username')}" name="username" /> + <ww:textfield label="%{getText('prompt.username')}" name="username"/> - <ww:textfield label="%{getText('prompt.password')}" name="password" /> + <ww:textfield label="%{getText('prompt.password')}" name="password"/> - <ww:submit /> + <ww:submit/> </ww:form> <jsp:include page="Footer.jsp"/> Modified: struts/sandbox/trunk/action2/apps/mailreader/src/webapp/pages/MainMenu.jsp URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/action2/apps/mailreader/src/webapp/pages/MainMenu.jsp?rev=387108&r1=387107&r2=387108&view=diff ============================================================================== --- struts/sandbox/trunk/action2/apps/mailreader/src/webapp/pages/MainMenu.jsp (original) +++ struts/sandbox/trunk/action2/apps/mailreader/src/webapp/pages/MainMenu.jsp Sun Mar 19 18:19:35 2006 @@ -1,20 +1,21 @@ -<[EMAIL PROTECTED] uri="/webwork" prefix="ww" %> -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";> +<%@ taglib uri="/webwork" prefix="ww" %> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" +"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> - <link href="<ww:url value="/css/mailreader.css"/>" rel="stylesheet" type="text/css" /> + <link href="<ww:url value="/css/mailreader.css"/>" rel="stylesheet" type="text/css"/> </head> <body> <h3><ww:text name="mainMenu.heading"/> <ww:property value="user.fullName"/></h3> <ul> - <li><a href="<ww:url action="Registration!edit" />"> - <ww:text name="mainMenu.registration" /> + <li><a href="<ww:url action="Registration!edit" />"> + <ww:text name="mainMenu.registration"/> </a> </li> <li><a href="<ww:url action="Logoff"/>"> - <ww:text name="mainMenu.logoff" /> + <ww:text name="mainMenu.logoff"/> </a> </ul> </body> Modified: struts/sandbox/trunk/action2/apps/mailreader/src/webapp/pages/Registration.jsp URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/action2/apps/mailreader/src/webapp/pages/Registration.jsp?rev=387108&r1=387107&r2=387108&view=diff ============================================================================== --- struts/sandbox/trunk/action2/apps/mailreader/src/webapp/pages/Registration.jsp (original) +++ struts/sandbox/trunk/action2/apps/mailreader/src/webapp/pages/Registration.jsp Sun Mar 19 18:19:35 2006 @@ -1,5 +1,6 @@ <%@ page contentType="text/html;charset=UTF-8" language="java" %> <html> - <head><title>Simple jsp page</title></head> - <body>Place your content here</body> +<head><title>Simple jsp page</title></head> + +<body>Place your content here</body> </html> Modified: struts/sandbox/trunk/action2/apps/mailreader/src/webapp/pages/Welcome.jsp URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/action2/apps/mailreader/src/webapp/pages/Welcome.jsp?rev=387108&r1=387107&r2=387108&view=diff ============================================================================== --- struts/sandbox/trunk/action2/apps/mailreader/src/webapp/pages/Welcome.jsp (original) +++ struts/sandbox/trunk/action2/apps/mailreader/src/webapp/pages/Welcome.jsp Sun Mar 19 18:19:35 2006 @@ -1,11 +1,13 @@ -<[EMAIL PROTECTED] uri="/webwork" prefix="ww" %> -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";> +<%@ taglib uri="/webwork" prefix="ww" %> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" +"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";> <html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en"> <head> -<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> + <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" /> + <link href="<ww:url value="/css/mailreader.css"/>" rel="stylesheet" type="text/css"/> </head> + <body> <h3><ww:text name="index.heading"/></h3> @@ -25,7 +27,7 @@ </ul> <p><ww:i18n name="alternate"> - <img src="<ww:url><ww:text name="struts.logo.path"/></ww:url>" alt="<ww:text name="struts.logo.alt"/>" /> + <img src="<ww:url><ww:text name="struts.logo.path"/></ww:url>" alt="<ww:text name="struts.logo.alt"/>"/> </ww:i18n></p> <p><a href="<ww:url action="Tour" />"><ww:text name="index.tour"/></a></p> --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
