Author: husted
Date: Tue Jul 18 17:39:14 2006
New Revision: 423314
URL: http://svn.apache.org/viewvc?rev=423314&view=rev
Log:
WW-1349 MailReader: Complete initial migration from WW to S2, using
compatability mode.
Modified:
struts/sandbox/trunk/action2/apps/mailreader/src/main/java/mailreader2/AuthenticationInterceptor.java
struts/sandbox/trunk/action2/apps/mailreader/src/main/java/mailreader2/MailreaderSupport.java
struts/sandbox/trunk/action2/apps/mailreader/src/main/java/mailreader2/Subscription.java
struts/sandbox/trunk/action2/apps/mailreader/src/main/java/struts.properties
struts/sandbox/trunk/action2/apps/mailreader/src/main/java/struts.xml
struts/sandbox/trunk/action2/apps/mailreader/src/main/webapp/pages/ChangePassword.jsp
struts/sandbox/trunk/action2/apps/mailreader/src/main/webapp/pages/Error.jsp
struts/sandbox/trunk/action2/apps/mailreader/src/main/webapp/pages/Footer.jsp
struts/sandbox/trunk/action2/apps/mailreader/src/main/webapp/pages/Logon.jsp
struts/sandbox/trunk/action2/apps/mailreader/src/main/webapp/pages/MainMenu.jsp
struts/sandbox/trunk/action2/apps/mailreader/src/main/webapp/pages/Registration.jsp
struts/sandbox/trunk/action2/apps/mailreader/src/main/webapp/pages/Subscription.jsp
struts/sandbox/trunk/action2/apps/mailreader/src/main/webapp/pages/Welcome.jsp
struts/sandbox/trunk/action2/apps/mailreader/src/main/webapp/pages/tour.html
Modified:
struts/sandbox/trunk/action2/apps/mailreader/src/main/java/mailreader2/AuthenticationInterceptor.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/action2/apps/mailreader/src/main/java/mailreader2/AuthenticationInterceptor.java?rev=423314&r1=423313&r2=423314&view=diff
==============================================================================
---
struts/sandbox/trunk/action2/apps/mailreader/src/main/java/mailreader2/AuthenticationInterceptor.java
(original)
+++
struts/sandbox/trunk/action2/apps/mailreader/src/main/java/mailreader2/AuthenticationInterceptor.java
Tue Jul 18 17:39:14 2006
@@ -1,8 +1,8 @@
package mailreader2;
-import com.opensymphony.xwork.interceptor.Interceptor;
-import com.opensymphony.xwork.ActionInvocation;
-import com.opensymphony.xwork.Action;
+import com.opensymphony.xwork2.interceptor.Interceptor;
+import com.opensymphony.xwork2.ActionInvocation;
+import com.opensymphony.xwork2.Action;
import java.util.Map;
import org.apache.struts.apps.mailreader.dao.User;
Modified:
struts/sandbox/trunk/action2/apps/mailreader/src/main/java/mailreader2/MailreaderSupport.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/action2/apps/mailreader/src/main/java/mailreader2/MailreaderSupport.java?rev=423314&r1=423313&r2=423314&view=diff
==============================================================================
---
struts/sandbox/trunk/action2/apps/mailreader/src/main/java/mailreader2/MailreaderSupport.java
(original)
+++
struts/sandbox/trunk/action2/apps/mailreader/src/main/java/mailreader2/MailreaderSupport.java
Tue Jul 18 17:39:14 2006
@@ -21,7 +21,7 @@
import com.opensymphony.util.BeanUtils;
import org.apache.struts2.interceptor.ApplicationAware;
import org.apache.struts2.interceptor.SessionAware;
-import com.opensymphony.xwork.ActionSupport;
+import com.opensymphony.xwork2.ActionSupport;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.struts.apps.mailreader.dao.ExpiredPasswordException;
Modified:
struts/sandbox/trunk/action2/apps/mailreader/src/main/java/mailreader2/Subscription.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/action2/apps/mailreader/src/main/java/mailreader2/Subscription.java?rev=423314&r1=423313&r2=423314&view=diff
==============================================================================
---
struts/sandbox/trunk/action2/apps/mailreader/src/main/java/mailreader2/Subscription.java
(original)
+++
struts/sandbox/trunk/action2/apps/mailreader/src/main/java/mailreader2/Subscription.java
Tue Jul 18 17:39:14 2006
@@ -1,6 +1,6 @@
package mailreader2;
-import com.opensymphony.xwork.Preparable;
+import com.opensymphony.xwork2.Preparable;
import java.util.LinkedHashMap;
import java.util.Map;
Modified:
struts/sandbox/trunk/action2/apps/mailreader/src/main/java/struts.properties
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/action2/apps/mailreader/src/main/java/struts.properties?rev=423314&r1=423313&r2=423314&view=diff
==============================================================================
---
struts/sandbox/trunk/action2/apps/mailreader/src/main/java/struts.properties
(original)
+++
struts/sandbox/trunk/action2/apps/mailreader/src/main/java/struts.properties
Tue Jul 18 17:39:14 2006
@@ -2,3 +2,5 @@
struts.devMode = true
struts.action.extension = do
struts.custom.i18n.resources = resources
+struts.compatibilityMode = true
+
Modified: struts/sandbox/trunk/action2/apps/mailreader/src/main/java/struts.xml
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/action2/apps/mailreader/src/main/java/struts.xml?rev=423314&r1=423313&r2=423314&view=diff
==============================================================================
--- struts/sandbox/trunk/action2/apps/mailreader/src/main/java/struts.xml
(original)
+++ struts/sandbox/trunk/action2/apps/mailreader/src/main/java/struts.xml Tue
Jul 18 17:39:14 2006
@@ -1,9 +1,12 @@
-<!DOCTYPE xwork PUBLIC "-//OpenSymphony Group//XWork 1.1.1//EN"
"http://www.opensymphony.com/xwork/xwork-1.1.1.dtd";>
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE struts PUBLIC
+ "-//Apache Software Foundation//DTD Struts Configuration 2.0//EN"
+ "http://struts.apache.org/dtds/struts-2.0.dtd";>
-<xwork>
- <include file="webwork-default.xml"/>
+<struts>
+ <include file="struts-default.xml"/>
- <package name="default" namespace="/" extends="webwork-default">
+ <package name="default" namespace="/" extends="struts-default">
<interceptors>
@@ -104,4 +107,4 @@
</action>
</package>
-</xwork>
+</struts>
Modified:
struts/sandbox/trunk/action2/apps/mailreader/src/main/webapp/pages/ChangePassword.jsp
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/action2/apps/mailreader/src/main/webapp/pages/ChangePassword.jsp?rev=423314&r1=423313&r2=423314&view=diff
==============================================================================
---
struts/sandbox/trunk/action2/apps/mailreader/src/main/webapp/pages/ChangePassword.jsp
(original)
+++
struts/sandbox/trunk/action2/apps/mailreader/src/main/webapp/pages/ChangePassword.jsp
Tue Jul 18 17:39:14 2006
@@ -1,23 +1,23 @@
<%@ page contentType="text/html; charset=UTF-8" %>
-<%@ taglib uri="/webwork" prefix="saf" %>
+<%@ taglib uri="/struts-action" 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">
<head>
- <title><saf:text name="change.title"/></title>
- <link href="<saf:url value="/css/mailreader.css"/>" rel="stylesheet"
+ <title><s:text name="change.title"/></title>
+ <link href="<s:url value="/css/mailreader.css"/>" rel="stylesheet"
type="text/css"/>
</head>
<body>
<p>
- <saf:text name="change.message"/>
+ <s:text name="change.message"/>
</p>
<p>
- <a href="<saf:url action="Logon!input"/>">
- <saf:text name="change.try"/>
+ <a href="<s:url action="Logon!input"/>">
+ <s:text name="change.try"/>
</a>
</p>
Modified:
struts/sandbox/trunk/action2/apps/mailreader/src/main/webapp/pages/Error.jsp
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/action2/apps/mailreader/src/main/webapp/pages/Error.jsp?rev=423314&r1=423313&r2=423314&view=diff
==============================================================================
---
struts/sandbox/trunk/action2/apps/mailreader/src/main/webapp/pages/Error.jsp
(original)
+++
struts/sandbox/trunk/action2/apps/mailreader/src/main/webapp/pages/Error.jsp
Tue Jul 18 17:39:14 2006
@@ -1,5 +1,5 @@
<%@ page contentType="text/html; charset=UTF-8" %>
-<%@ taglib uri="/webwork" prefix="saf" %>
+<%@ taglib uri="/struts-action" 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">
@@ -20,10 +20,10 @@
<h3>Error Message</h3>
-<saf:actionerror />
+<s:actionerror />
<p>
- <saf:property value="%{exception.message}"/>
+ <s:property value="%{exception.message}"/>
</p>
<hr/>
@@ -31,7 +31,7 @@
<h3>Technical Details</h3>
<p>
- <saf:property value="%{exceptionStack}"/>
+ <s:property value="%{exceptionStack}"/>
</p>
<jsp:include page="Footer.jsp"/>
Modified:
struts/sandbox/trunk/action2/apps/mailreader/src/main/webapp/pages/Footer.jsp
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/action2/apps/mailreader/src/main/webapp/pages/Footer.jsp?rev=423314&r1=423313&r2=423314&view=diff
==============================================================================
---
struts/sandbox/trunk/action2/apps/mailreader/src/main/webapp/pages/Footer.jsp
(original)
+++
struts/sandbox/trunk/action2/apps/mailreader/src/main/webapp/pages/Footer.jsp
Tue Jul 18 17:39:14 2006
@@ -1,6 +1,6 @@
-<%@ taglib uri="/webwork" prefix="saf" %>
+<%@ taglib uri="/struts-action" prefix="s" %>
<hr/>
<p>
- <a href="<saf:url action="Welcome" />"><saf:text name="index.title"/></a>
+ <a href="<s:url action="Welcome" />"><s:text name="index.title"/></a>
</p>
Modified:
struts/sandbox/trunk/action2/apps/mailreader/src/main/webapp/pages/Logon.jsp
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/action2/apps/mailreader/src/main/webapp/pages/Logon.jsp?rev=423314&r1=423313&r2=423314&view=diff
==============================================================================
---
struts/sandbox/trunk/action2/apps/mailreader/src/main/webapp/pages/Logon.jsp
(original)
+++
struts/sandbox/trunk/action2/apps/mailreader/src/main/webapp/pages/Logon.jsp
Tue Jul 18 17:39:14 2006
@@ -1,29 +1,29 @@
<%@ page contentType="text/html; charset=UTF-8" %>
-<%@ taglib uri="/webwork" prefix="saf" %>
+<%@ taglib uri="/struts-action" 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">
<head>
- <title><saf:text name="logon.title"/></title>
- <link href="<saf:url value="/css/mailreader.css"/>" rel="stylesheet"
+ <title><s:text name="logon.title"/></title>
+ <link href="<s:url value="/css/mailreader.css"/>" rel="stylesheet"
type="text/css"/>
</head>
<body onLoad="self.focus();document.Logon.username.focus()">
-<saf:actionerror />
-<saf:form method="POST" validate="true">
- <saf:textfield label="%{getText('username')}" name="username"/>
+<s:actionerror />
+<s:form method="POST" validate="true">
+ <s:textfield label="%{getText('username')}" name="username"/>
- <saf:password label="%{getText('password')}" name="password"
showPassword="true"/>
+ <s:password label="%{getText('password')}" name="password"
showPassword="true"/>
- <saf:submit value="%{getText('button.save')}"/>
+ <s:submit value="%{getText('button.save')}"/>
- <saf:reset value="%{getText('button.reset')}"/>
+ <s:reset value="%{getText('button.reset')}"/>
- <saf:submit action="Logon!cancel" value="%{getText('button.cancel')}"
+ <s:submit action="Logon!cancel" value="%{getText('button.cancel')}"
onclick="form.onsubmit=null"/>
-</saf:form>
+</s:form>
<jsp:include page="Footer.jsp"/>
</body>
Modified:
struts/sandbox/trunk/action2/apps/mailreader/src/main/webapp/pages/MainMenu.jsp
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/action2/apps/mailreader/src/main/webapp/pages/MainMenu.jsp?rev=423314&r1=423313&r2=423314&view=diff
==============================================================================
---
struts/sandbox/trunk/action2/apps/mailreader/src/main/webapp/pages/MainMenu.jsp
(original)
+++
struts/sandbox/trunk/action2/apps/mailreader/src/main/webapp/pages/MainMenu.jsp
Tue Jul 18 17:39:14 2006
@@ -1,24 +1,24 @@
<%@ page contentType="text/html; charset=UTF-8" %>
-<%@ taglib uri="/webwork" prefix="saf" %>
+<%@ taglib uri="/struts-action" 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">
<head>
- <title><saf:text name="mainMenu.title"/></title>
- <link href="<saf:url value="/css/mailreader.css"/>" rel="stylesheet"
+ <title><s:text name="mainMenu.title"/></title>
+ <link href="<s:url value="/css/mailreader.css"/>" rel="stylesheet"
type="text/css"/>
</head>
<body>
-<h3><saf:text name="mainMenu.heading"/> <saf:property
+<h3><s:text name="mainMenu.heading"/> <s:property
value="user.fullName"/></h3>
<ul>
- <li><a href="<saf:url action="Registration!input" />">
- <saf:text name="mainMenu.registration"/>
+ <li><a href="<s:url action="Registration!input" />">
+ <s:text name="mainMenu.registration"/>
</a>
</li>
- <li><a href="<saf:url action="Logoff"/>">
- <saf:text name="mainMenu.logoff"/>
+ <li><a href="<s:url action="Logoff"/>">
+ <s:text name="mainMenu.logoff"/>
</a>
</ul>
</body>
Modified:
struts/sandbox/trunk/action2/apps/mailreader/src/main/webapp/pages/Registration.jsp
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/action2/apps/mailreader/src/main/webapp/pages/Registration.jsp?rev=423314&r1=423313&r2=423314&view=diff
==============================================================================
---
struts/sandbox/trunk/action2/apps/mailreader/src/main/webapp/pages/Registration.jsp
(original)
+++
struts/sandbox/trunk/action2/apps/mailreader/src/main/webapp/pages/Registration.jsp
Tue Jul 18 17:39:14 2006
@@ -1,124 +1,124 @@
<%@ page contentType="text/html; charset=UTF-8" %>
-<%@ taglib uri="/webwork" prefix="saf" %>
+<%@ taglib uri="/struts-action" 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">
<head>
- <saf:if test="task=='Create'">
- <title><saf:text name="registration.title.create"/></title>
- </saf:if>
- <saf:if test="task=='Edit'">
- <title><saf:text name="registration.title.edit"/></title>
- </saf:if>
- <link href="<saf:url value="/css/mailreader.css"/>" rel="stylesheet"
+ <s:if test="task=='Create'">
+ <title><s:text name="registration.title.create"/></title>
+ </s:if>
+ <s:if test="task=='Edit'">
+ <title><s:text name="registration.title.edit"/></title>
+ </s:if>
+ <link href="<s:url value="/css/mailreader.css"/>" rel="stylesheet"
type="text/css"/>
</head>
<body onLoad="self.focus();document.Registration.username.focus()">
-<saf:actionerror/>
-<saf:form method="POST" validate="false">
- <saf:token />
- <saf:hidden name="task"/>
- <saf:if test="task == 'Create'">
- <saf:textfield label="%{getText('username')}" name="username"/>
- </saf:if>
- <saf:else>
- <saf:label label="%{getText('username')}" name="username"/>
- <saf:hidden name="username"/>
- </saf:else>
+<s:actionerror/>
+<s:form method="POST" validate="false">
+ <s:token />
+ <s:hidden name="task"/>
+ <s:if test="task == 'Create'">
+ <s:textfield label="%{getText('username')}" name="username"/>
+ </s:if>
+ <s:else>
+ <s:label label="%{getText('username')}" name="username"/>
+ <s:hidden name="username"/>
+ </s:else>
- <saf:password label="%{getText('password')}" name="password"/>
+ <s:password label="%{getText('password')}" name="password"/>
- <saf:password label="%{getText('password2')}" name="password2"/>
+ <s:password label="%{getText('password2')}" name="password2"/>
- <saf:textfield label="%{getText('fullName')}"
+ <s:textfield label="%{getText('fullName')}"
name="user.fullName"/>
- <saf:textfield label="%{getText('fromAddress')}"
+ <s:textfield label="%{getText('fromAddress')}"
name="user.fromAddress"/>
- <saf:textfield label="%{getText('replyToAddress')}"
+ <s:textfield label="%{getText('replyToAddress')}"
name="user.replyToAddress"/>
- <saf:if test="task == 'Create'">
- <saf:submit value="%{getText('button.save')}"
action="RegistrationSave"/>
+ <s:if test="task == 'Create'">
+ <s:submit value="%{getText('button.save')}" action="RegistrationSave"/>
- <saf:reset value="%{getText('button.reset')}"/>
+ <s:reset value="%{getText('button.reset')}"/>
- <saf:submit action="Welcome" value="%{getText('button.cancel')}"
+ <s:submit action="Welcome" value="%{getText('button.cancel')}"
onclick="form.onsubmit=null"/>
- </saf:if>
- <saf:else>
- <saf:submit value="%{getText('button.save')}" action="Registration"/>
+ </s:if>
+ <s:else>
+ <s:submit value="%{getText('button.save')}" action="Registration"/>
- <saf:reset value="%{getText('button.reset')}"/>
+ <s:reset value="%{getText('button.reset')}"/>
- <saf:submit action="MainMenu" value="%{getText('button.cancel')}"
+ <s:submit action="MainMenu" value="%{getText('button.cancel')}"
onclick="form.onsubmit=null"/>
- </saf:else>
+ </s:else>
-</saf:form>
+</s:form>
-<saf:if test="task == 'Edit'">
+<s:if test="task == 'Edit'">
<div align="center">
- <h3><saf:text name="heading.subscriptions"/></h3>
+ <h3><s:text name="heading.subscriptions"/></h3>
</div>
<table border="1" width="100%">
<tr>
<th align="center" width="30%">
- <saf:text name="heading.host"/>
+ <s:text name="heading.host"/>
</th>
<th align="center" width="25%">
- <saf:text name="heading.user"/>
+ <s:text name="heading.user"/>
</th>
<th align="center" width="10%">
- <saf:text name="heading.type"/>
+ <s:text name="heading.type"/>
</th>
<th align="center" width="10%">
- <saf:text name="heading.autoConnect"/>
+ <s:text name="heading.autoConnect"/>
</th>
<th align="center" width="15%">
- <saf:text name="heading.action"/>
+ <s:text name="heading.action"/>
</th>
</tr>
- <saf:iterator value="user.subscriptions">
+ <s:iterator value="user.subscriptions">
<tr>
<td align="left">
- <saf:property value="host"/>
+ <s:property value="host"/>
</td>
<td align="left">
- <saf:property value="username"/>
+ <s:property value="username"/>
</td>
<td align="center">
- <saf:property value="type"/>
+ <s:property value="type"/>
</td>
<td align="center">
- <saf:property value="autoConnect"/>
+ <s:property value="autoConnect"/>
</td>
<td align="center">
- <a href="<saf:url action="Subscription!delete"><saf:param
name="host" value="host"/></saf:url>">
- <saf:text name="registration.deleteSubscription"/>
+ <a href="<s:url action="Subscription!delete"><s:param
name="host" value="host"/></s:url>">
+ <s:text name="registration.deleteSubscription"/>
</a>
- <a href="<saf:url action="Subscription!edit"><saf:param
name="host" value="host"/></saf:url>">
- <saf:text name="registration.editSubscription"/>
+ <a href="<s:url action="Subscription!edit"><s:param
name="host" value="host"/></s:url>">
+ <s:text name="registration.editSubscription"/>
</a>
</td>
</tr>
- </saf:iterator>
+ </s:iterator>
</table>
- <a href="<saf:url action="Subscription!input"/>"><saf:text
+ <a href="<s:url action="Subscription!input"/>"><s:text
name="registration.addSubscription"/></a>
-</saf:if>
+</s:if>
<jsp:include page="Footer.jsp"/>
Modified:
struts/sandbox/trunk/action2/apps/mailreader/src/main/webapp/pages/Subscription.jsp
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/action2/apps/mailreader/src/main/webapp/pages/Subscription.jsp?rev=423314&r1=423313&r2=423314&view=diff
==============================================================================
---
struts/sandbox/trunk/action2/apps/mailreader/src/main/webapp/pages/Subscription.jsp
(original)
+++
struts/sandbox/trunk/action2/apps/mailreader/src/main/webapp/pages/Subscription.jsp
Tue Jul 18 17:39:14 2006
@@ -1,66 +1,66 @@
<%@ page contentType="text/html; charset=UTF-8" %>
-<%@ taglib uri="/webwork" prefix="saf" %>
+<%@ taglib uri="/struts-action" 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">
<head>
- <saf:if test="task=='Create'">
- <title><saf:text name="subscription.title.create"/></title>
- </saf:if>
- <saf:if test="task=='Edit'">
- <title><saf:text name="subscription.title.edit"/></title>
- </saf:if>
- <saf:if test="task=='Delete'">
- <title><saf:text name="subscription.title.delete"/></title>
- </saf:if>
- <link href="<saf:url value="/css/mailreader.css"/>" rel="stylesheet"
+ <s:if test="task=='Create'">
+ <title><s:text name="subscription.title.create"/></title>
+ </s:if>
+ <s:if test="task=='Edit'">
+ <title><s:text name="subscription.title.edit"/></title>
+ </s:if>
+ <s:if test="task=='Delete'">
+ <title><s:text name="subscription.title.delete"/></title>
+ </s:if>
+ <link href="<s:url value="/css/mailreader.css"/>" rel="stylesheet"
type="text/css"/>
</head>
<body onLoad="self.focus();document.Subscription.username.focus()">
-<saf:actionerror/>
-<saf:form method="POST" action="SubscriptionSave" validate="false">
- <saf:token />
- <saf:hidden name="task"/>
- <saf:label label="%{getText('username')}" name="user.username"/>
+<s:actionerror/>
+<s:form method="POST" action="SubscriptionSave" validate="false">
+ <s:token />
+ <s:hidden name="task"/>
+ <s:label label="%{getText('username')}" name="user.username"/>
- <saf:if test="task == 'Create'">
- <saf:textfield label="%{getText('mailHostname')}" name="host"/>
- </saf:if>
- <saf:else>
- <saf:label label="%{getText('mailHostname')}" name="host"/>
- <saf:hidden name="host"/>
- </saf:else>
+ <s:if test="task == 'Create'">
+ <s:textfield label="%{getText('mailHostname')}" name="host"/>
+ </s:if>
+ <s:else>
+ <s:label label="%{getText('mailHostname')}" name="host"/>
+ <s:hidden name="host"/>
+ </s:else>
- <saf:if test="task == 'Delete'">
- <saf:label label="%{getText('mailUsername')}"
+ <s:if test="task == 'Delete'">
+ <s:label label="%{getText('mailUsername')}"
name="subscription.username"/>
- <saf:label label="%{getText('mailPassword')}"
+ <s:label label="%{getText('mailPassword')}"
name="subscription.password"/>
- <saf:label label="%{getText('mailServerType')}"
+ <s:label label="%{getText('mailServerType')}"
name="subscription.type"/>
- <saf:label label="%{getText('autoConnect')}"
+ <s:label label="%{getText('autoConnect')}"
name="subscription.autoConnect"/>
- <saf:submit value="%{getText('button.confirm')}"/>
- </saf:if>
- <saf:else>
- <saf:textfield label="%{getText('mailUsername')}"
+ <s:submit value="%{getText('button.confirm')}"/>
+ </s:if>
+ <s:else>
+ <s:textfield label="%{getText('mailUsername')}"
name="subscription.username"/>
- <saf:textfield label="%{getText('mailPassword')}"
+ <s:textfield label="%{getText('mailPassword')}"
name="subscription.password"/>
- <saf:select label="%{getText('mailServerType')}"
+ <s:select label="%{getText('mailServerType')}"
name="subscription.type" list="types"/>
- <saf:checkbox label="%{getText('autoConnect')}"
+ <s:checkbox label="%{getText('autoConnect')}"
name="subscription.autoConnect"/>
- <saf:submit value="%{getText('button.save')}"/>
- <saf:reset value="%{getText('button.reset')}"/>
- </saf:else>
+ <s:submit value="%{getText('button.save')}"/>
+ <s:reset value="%{getText('button.reset')}"/>
+ </s:else>
- <saf:submit action="Registration!input"
+ <s:submit action="Registration!input"
value="%{getText('button.cancel')}"
onclick="form.onsubmit=null"/>
-</saf:form>
+</s:form>
<jsp:include page="Footer.jsp"/>
Modified:
struts/sandbox/trunk/action2/apps/mailreader/src/main/webapp/pages/Welcome.jsp
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/action2/apps/mailreader/src/main/webapp/pages/Welcome.jsp?rev=423314&r1=423313&r2=423314&view=diff
==============================================================================
---
struts/sandbox/trunk/action2/apps/mailreader/src/main/webapp/pages/Welcome.jsp
(original)
+++
struts/sandbox/trunk/action2/apps/mailreader/src/main/webapp/pages/Welcome.jsp
Tue Jul 18 17:39:14 2006
@@ -1,40 +1,40 @@
<%@ page contentType="text/html; charset=UTF-8" %>
-<%@ taglib uri="/webwork" prefix="saf" %>
+<%@ taglib uri="/struts-action" 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">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
- <title><saf:text name="index.title"/></title>
- <link href="<saf:url value="/css/mailreader.css"/>" rel="stylesheet"
+ <title><s:text name="index.title"/></title>
+ <link href="<s:url value="/css/mailreader.css"/>" rel="stylesheet"
type="text/css"/>
</head>
<body>
-<h3><saf:text name="index.heading"/></h3>
+<h3><s:text name="index.heading"/></h3>
<ul>
- <li><a href="<saf:url action="Registration!input"/>"><saf:text
+ <li><a href="<s:url action="Registration!input"/>"><s:text
name="index.registration"/></a></li>
- <li><a href="<saf:url action="Logon!input"/>"><saf:text
+ <li><a href="<s:url action="Logon!input"/>"><s:text
name="index.logon"/></a></li>
</ul>
<h3>Language Options</h3>
<ul>
- <li><a href="<saf:url
action="Welcome?request_locale=en"/>">English</a></li>
- <li><a href="<saf:url
action="Welcome?request_locale=ja"/>">Japanese</a></li>
- <li><a href="<saf:url
action="Welcome?request_locale=ru"/>">Russian</a></li>
+ <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>
</ul>
<hr/>
-<p><saf:i18n name="alternate">
- <img src="<saf:text name="struts.logo.path"/>"
- alt="<saf:text name="struts.logo.alt"/>"/>
-</saf:i18n></p>
+<p><s:i18n name="alternate">
+ <img src="<s:text name="struts.logo.path"/>"
+ alt="<s:text name="struts.logo.alt"/>"/>
+</s:i18n></p>
-<p><a href="<saf:url action="Tour" />"><saf:text name="index.tour"/></a></p>
+<p><a href="<s:url action="Tour" />"><s:text name="index.tour"/></a></p>
</body>
</html>
Modified:
struts/sandbox/trunk/action2/apps/mailreader/src/main/webapp/pages/tour.html
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/action2/apps/mailreader/src/main/webapp/pages/tour.html?rev=423314&r1=423313&r2=423314&view=diff
==============================================================================
---
struts/sandbox/trunk/action2/apps/mailreader/src/main/webapp/pages/tour.html
(original)
+++
struts/sandbox/trunk/action2/apps/mailreader/src/main/webapp/pages/tour.html
Tue Jul 18 17:39:14 2006
@@ -1362,9 +1362,9 @@
<hr/>
<h5>mailreader2.AuthenticationInterceptor</h5>
<pre><code>package mailreader2;
-import com.opensymphony.xwork.interceptor.Interceptor;
-import com.opensymphony.xwork.ActionInvocation;
-import com.opensymphony.xwork.Action;
+import com.opensymphony.xwork2.interceptor.Interceptor;
+import com.opensymphony.xwork2.ActionInvocation;
+import com.opensymphony.xwork2.Action;
import java.util.Map;
import org.apache.struts.apps.mailreader.dao.User;
@@ -2020,7 +2020,7 @@
<hr />
<p>
- By keeping routine safety precautions out of the Action class,
+ By keeping routine sety precautions out of the Action class,
the all-important Actions becomes smaller and easier to maintain.
</p>
