Author: husted
Date: Mon Aug 28 14:59:05 2006
New Revision: 437859
URL: http://svn.apache.org/viewvc?rev=437859&view=rev
Log:
WW-1353 Backport fixes from later revisions.
Modified:
struts/sandbox/trunk/struts2/apps/mailreader-bang/src/main/java/mailreader2/MailreaderSupport.java
struts/sandbox/trunk/struts2/apps/mailreader-bang/src/main/java/mailreader2/Subscription.java
struts/sandbox/trunk/struts2/apps/mailreader-bang/src/main/java/mailreader2/SubscriptionSave.java
struts/sandbox/trunk/struts2/apps/mailreader-bang/src/main/resources/struts.properties
struts/sandbox/trunk/struts2/apps/mailreader-bang/src/main/resources/struts.xml
struts/sandbox/trunk/struts2/apps/mailreader-bang/src/main/webapp/pages/ChangePassword.jsp
struts/sandbox/trunk/struts2/apps/mailreader-bang/src/main/webapp/pages/Error.jsp
struts/sandbox/trunk/struts2/apps/mailreader-bang/src/main/webapp/pages/Footer.jsp
struts/sandbox/trunk/struts2/apps/mailreader-bang/src/main/webapp/pages/Logon.jsp
struts/sandbox/trunk/struts2/apps/mailreader-bang/src/main/webapp/pages/MainMenu.jsp
struts/sandbox/trunk/struts2/apps/mailreader-bang/src/main/webapp/pages/Registration.jsp
struts/sandbox/trunk/struts2/apps/mailreader-bang/src/main/webapp/pages/Subscription.jsp
struts/sandbox/trunk/struts2/apps/mailreader-bang/src/main/webapp/pages/Welcome.jsp
Modified:
struts/sandbox/trunk/struts2/apps/mailreader-bang/src/main/java/mailreader2/MailreaderSupport.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2/apps/mailreader-bang/src/main/java/mailreader2/MailreaderSupport.java?rev=437859&r1=437858&r2=437859&view=diff
==============================================================================
---
struts/sandbox/trunk/struts2/apps/mailreader-bang/src/main/java/mailreader2/MailreaderSupport.java
(original)
+++
struts/sandbox/trunk/struts2/apps/mailreader-bang/src/main/java/mailreader2/MailreaderSupport.java
Mon Aug 28 14:59:05 2006
@@ -555,4 +555,5 @@
}
return sub.getHost();
}
+
}
Modified:
struts/sandbox/trunk/struts2/apps/mailreader-bang/src/main/java/mailreader2/Subscription.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2/apps/mailreader-bang/src/main/java/mailreader2/Subscription.java?rev=437859&r1=437858&r2=437859&view=diff
==============================================================================
---
struts/sandbox/trunk/struts2/apps/mailreader-bang/src/main/java/mailreader2/Subscription.java
(original)
+++
struts/sandbox/trunk/struts2/apps/mailreader-bang/src/main/java/mailreader2/Subscription.java
Mon Aug 28 14:59:05 2006
@@ -38,7 +38,6 @@
types = m;
setHost(getSubscriptionHost());
-
}
/**
Modified:
struts/sandbox/trunk/struts2/apps/mailreader-bang/src/main/java/mailreader2/SubscriptionSave.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2/apps/mailreader-bang/src/main/java/mailreader2/SubscriptionSave.java?rev=437859&r1=437858&r2=437859&view=diff
==============================================================================
---
struts/sandbox/trunk/struts2/apps/mailreader-bang/src/main/java/mailreader2/SubscriptionSave.java
(original)
+++
struts/sandbox/trunk/struts2/apps/mailreader-bang/src/main/java/mailreader2/SubscriptionSave.java
Mon Aug 28 14:59:05 2006
@@ -1,7 +1,7 @@
package mailreader2;
/**
- * <p> Workaround class. Submitting to an alias doesn't seem to work. </p>
+ * <p> Save a subscriptioin, resetting checkbox in prepare.</p>
*/
public final class SubscriptionSave extends Subscription {
Modified:
struts/sandbox/trunk/struts2/apps/mailreader-bang/src/main/resources/struts.properties
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2/apps/mailreader-bang/src/main/resources/struts.properties?rev=437859&r1=437858&r2=437859&view=diff
==============================================================================
---
struts/sandbox/trunk/struts2/apps/mailreader-bang/src/main/resources/struts.properties
(original)
+++
struts/sandbox/trunk/struts2/apps/mailreader-bang/src/main/resources/struts.properties
Mon Aug 28 14:59:05 2006
@@ -2,5 +2,5 @@
struts.devMode = true
struts.action.extension = do
struts.custom.i18n.resources = resources
-struts.compatibilityMode = true
+struts.compatibilityMode.WebWork = true
Modified:
struts/sandbox/trunk/struts2/apps/mailreader-bang/src/main/resources/struts.xml
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2/apps/mailreader-bang/src/main/resources/struts.xml?rev=437859&r1=437858&r2=437859&view=diff
==============================================================================
---
struts/sandbox/trunk/struts2/apps/mailreader-bang/src/main/resources/struts.xml
(original)
+++
struts/sandbox/trunk/struts2/apps/mailreader-bang/src/main/resources/struts.xml
Mon Aug 28 14:59:05 2006
@@ -36,8 +36,6 @@
<default-interceptor-ref name="user"/>
- <default-action-ref name="Welcome"/>
-
<global-results>
<result name="error">/pages/Error.jsp</result>
<result name="invalid.token">/pages/Error.jsp</result>
@@ -80,7 +78,7 @@
<interceptor-ref name="guest"/>
</action>
- <action name="RegistrationSave" class="mailreader2.RegistrationSave">
+ <action name="RegistrationSave" class="mailreader2.Registration">
<result name="input">/pages/Registration.jsp</result>
<result type="redirect-action">MainMenu</result>
<interceptor-ref name="guest-submit" />
Modified:
struts/sandbox/trunk/struts2/apps/mailreader-bang/src/main/webapp/pages/ChangePassword.jsp
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2/apps/mailreader-bang/src/main/webapp/pages/ChangePassword.jsp?rev=437859&r1=437858&r2=437859&view=diff
==============================================================================
---
struts/sandbox/trunk/struts2/apps/mailreader-bang/src/main/webapp/pages/ChangePassword.jsp
(original)
+++
struts/sandbox/trunk/struts2/apps/mailreader-bang/src/main/webapp/pages/ChangePassword.jsp
Mon Aug 28 14:59:05 2006
@@ -1,5 +1,5 @@
<%@ page contentType="text/html; charset=UTF-8" %>
-<%@ taglib uri="/struts-action" prefix="s" %>
+<%@ taglib uri="/struts-tags" prefix="s" %>
<!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">
Modified:
struts/sandbox/trunk/struts2/apps/mailreader-bang/src/main/webapp/pages/Error.jsp
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2/apps/mailreader-bang/src/main/webapp/pages/Error.jsp?rev=437859&r1=437858&r2=437859&view=diff
==============================================================================
---
struts/sandbox/trunk/struts2/apps/mailreader-bang/src/main/webapp/pages/Error.jsp
(original)
+++
struts/sandbox/trunk/struts2/apps/mailreader-bang/src/main/webapp/pages/Error.jsp
Mon Aug 28 14:59:05 2006
@@ -1,5 +1,5 @@
<%@ page contentType="text/html; charset=UTF-8" %>
-<%@ taglib uri="/struts-action" prefix="s" %>
+<%@ taglib uri="/struts-tags" prefix="s" %>
<!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">
Modified:
struts/sandbox/trunk/struts2/apps/mailreader-bang/src/main/webapp/pages/Footer.jsp
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2/apps/mailreader-bang/src/main/webapp/pages/Footer.jsp?rev=437859&r1=437858&r2=437859&view=diff
==============================================================================
---
struts/sandbox/trunk/struts2/apps/mailreader-bang/src/main/webapp/pages/Footer.jsp
(original)
+++
struts/sandbox/trunk/struts2/apps/mailreader-bang/src/main/webapp/pages/Footer.jsp
Mon Aug 28 14:59:05 2006
@@ -1,4 +1,4 @@
-<%@ taglib uri="/struts-action" prefix="s" %>
+<%@ taglib uri="/struts-tags" prefix="s" %>
<hr/>
<p>
Modified:
struts/sandbox/trunk/struts2/apps/mailreader-bang/src/main/webapp/pages/Logon.jsp
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2/apps/mailreader-bang/src/main/webapp/pages/Logon.jsp?rev=437859&r1=437858&r2=437859&view=diff
==============================================================================
---
struts/sandbox/trunk/struts2/apps/mailreader-bang/src/main/webapp/pages/Logon.jsp
(original)
+++
struts/sandbox/trunk/struts2/apps/mailreader-bang/src/main/webapp/pages/Logon.jsp
Mon Aug 28 14:59:05 2006
@@ -1,5 +1,5 @@
<%@ page contentType="text/html; charset=UTF-8" %>
-<%@ taglib uri="/struts-action" prefix="s" %>
+<%@ taglib uri="/struts-tags" prefix="s" %>
<!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">
Modified:
struts/sandbox/trunk/struts2/apps/mailreader-bang/src/main/webapp/pages/MainMenu.jsp
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2/apps/mailreader-bang/src/main/webapp/pages/MainMenu.jsp?rev=437859&r1=437858&r2=437859&view=diff
==============================================================================
---
struts/sandbox/trunk/struts2/apps/mailreader-bang/src/main/webapp/pages/MainMenu.jsp
(original)
+++
struts/sandbox/trunk/struts2/apps/mailreader-bang/src/main/webapp/pages/MainMenu.jsp
Mon Aug 28 14:59:05 2006
@@ -1,5 +1,5 @@
<%@ page contentType="text/html; charset=UTF-8" %>
-<%@ taglib uri="/struts-action" prefix="s" %>
+<%@ taglib uri="/struts-tags" prefix="s" %>
<!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">
Modified:
struts/sandbox/trunk/struts2/apps/mailreader-bang/src/main/webapp/pages/Registration.jsp
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2/apps/mailreader-bang/src/main/webapp/pages/Registration.jsp?rev=437859&r1=437858&r2=437859&view=diff
==============================================================================
---
struts/sandbox/trunk/struts2/apps/mailreader-bang/src/main/webapp/pages/Registration.jsp
(original)
+++
struts/sandbox/trunk/struts2/apps/mailreader-bang/src/main/webapp/pages/Registration.jsp
Mon Aug 28 14:59:05 2006
@@ -1,5 +1,5 @@
<%@ page contentType="text/html; charset=UTF-8" %>
-<%@ taglib uri="/struts-action" prefix="s" %>
+<%@ taglib uri="/struts-tags" prefix="s" %>
<!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">
Modified:
struts/sandbox/trunk/struts2/apps/mailreader-bang/src/main/webapp/pages/Subscription.jsp
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2/apps/mailreader-bang/src/main/webapp/pages/Subscription.jsp?rev=437859&r1=437858&r2=437859&view=diff
==============================================================================
---
struts/sandbox/trunk/struts2/apps/mailreader-bang/src/main/webapp/pages/Subscription.jsp
(original)
+++
struts/sandbox/trunk/struts2/apps/mailreader-bang/src/main/webapp/pages/Subscription.jsp
Mon Aug 28 14:59:05 2006
@@ -1,5 +1,5 @@
<%@ page contentType="text/html; charset=UTF-8" %>
-<%@ taglib uri="/struts-action" prefix="s" %>
+<%@ taglib uri="/struts-tags" prefix="s" %>
<!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">
Modified:
struts/sandbox/trunk/struts2/apps/mailreader-bang/src/main/webapp/pages/Welcome.jsp
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2/apps/mailreader-bang/src/main/webapp/pages/Welcome.jsp?rev=437859&r1=437858&r2=437859&view=diff
==============================================================================
---
struts/sandbox/trunk/struts2/apps/mailreader-bang/src/main/webapp/pages/Welcome.jsp
(original)
+++
struts/sandbox/trunk/struts2/apps/mailreader-bang/src/main/webapp/pages/Welcome.jsp
Mon Aug 28 14:59:05 2006
@@ -1,5 +1,5 @@
<%@ page contentType="text/html; charset=UTF-8" %>
-<%@ taglib uri="/struts-action" prefix="s" %>
+<%@ taglib uri="/struts-tags" prefix="s" %>
<!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">
@@ -22,9 +22,24 @@
<h3>Language Options</h3>
<ul>
- <li><a href="<s:url action="Welcome?request_locale=en"/>">English</a></li>
- <li><a href="<s:url action="Welcome?request_locale=ja"/>">Japanese</a></li>
- <li><a href="<s:url action="Welcome?request_locale=ru"/>">Russian</a></li>
+ <li>
+ <s:url id="en" action="Welcome">
+ <s:param name="request_locale">en</s:param>
+ </s:url>
+ <s:a href="%{en}">English</s:a>
+ </li>
+ <li>
+ <s:url id="ja" action="Welcome">
+ <s:param name="request_locale">ja</s:param>
+ </s:url>
+ <s:a href="%{ja}">Japanese</s:a>
+ </li>
+ <li>
+ <s:url id="ru" action="Welcome">
+ <s:param name="request_locale">ru</s:param>
+ </s:url>
+ <s:a href="%{ru}">Russian</s:a>
+ </li>
</ul>
<hr/>
