Author: husted
Date: Sun Jan 21 17:31:09 2007
New Revision: 498503
URL: http://svn.apache.org/viewvc?view=rev&rev=498503
Log:
Update mailreader course to remove obsolete markup and code.
Modified:
struts/sandbox/trunk/mailreader-course/struts2/browse/src/java/struts.xml
struts/sandbox/trunk/mailreader-course/struts2/browse/src/webapp/pages/Login.jsp
struts/sandbox/trunk/mailreader-course/struts2/browse/src/webapp/pages/Register.jsp
struts/sandbox/trunk/mailreader-course/struts2/browse/src/webapp/pages/Subscribe.jsp
struts/sandbox/trunk/mailreader-course/struts2/hello/src/java/struts.xml
struts/sandbox/trunk/mailreader-course/struts2/localize/src/java/struts.xml
struts/sandbox/trunk/mailreader-course/struts2/localize/src/webapp/pages/Login.jsp
struts/sandbox/trunk/mailreader-course/struts2/localize/src/webapp/pages/Register.jsp
struts/sandbox/trunk/mailreader-course/struts2/logout/src/java/struts.xml
struts/sandbox/trunk/mailreader-course/struts2/mailreader-course-struts2.ipr
struts/sandbox/trunk/mailreader-course/struts2/menu/src/java/struts.xml
struts/sandbox/trunk/mailreader-course/struts2/migrating/migrating.iml
struts/sandbox/trunk/mailreader-course/struts2/migrating/src/main/java/actions/build.bat
struts/sandbox/trunk/mailreader-course/struts2/migrating/src/main/java/struts.xml
struts/sandbox/trunk/mailreader-course/struts2/migrating/src/main/webapp/Hello.jsp
struts/sandbox/trunk/mailreader-course/struts2/migrating/src/main/webapp/HelloInput.jsp
struts/sandbox/trunk/mailreader-course/struts2/migrating/src/main/webapp/Hello_input.jsp
struts/sandbox/trunk/mailreader-course/struts2/profile/src/java/struts.xml
struts/sandbox/trunk/mailreader-course/struts2/profile/src/webapp/pages/Login.jsp
struts/sandbox/trunk/mailreader-course/struts2/profile/src/webapp/pages/Register.jsp
struts/sandbox/trunk/mailreader-course/struts2/register/src/java/struts.xml
struts/sandbox/trunk/mailreader-course/struts2/register2/src/java/struts.xml
struts/sandbox/trunk/mailreader-course/struts2/retain/src/java/struts.xml
struts/sandbox/trunk/mailreader-course/struts2/subscribe/src/java/struts.xml
struts/sandbox/trunk/mailreader-course/struts2/subscribe/src/webapp/pages/Login.jsp
struts/sandbox/trunk/mailreader-course/struts2/subscribe/src/webapp/pages/Register.jsp
struts/sandbox/trunk/mailreader-course/struts2/subscribe/src/webapp/pages/Subscribe.jsp
struts/sandbox/trunk/mailreader-course/struts2/theme/src/java/struts.xml
struts/sandbox/trunk/mailreader-course/struts2/theme/src/webapp/pages/Login.jsp
struts/sandbox/trunk/mailreader-course/struts2/theme/src/webapp/pages/Register.jsp
struts/sandbox/trunk/mailreader-course/struts2/theme/src/webapp/pages/Subscribe.jsp
struts/sandbox/trunk/mailreader-course/struts2/welcome/src/java/struts.xml
Modified:
struts/sandbox/trunk/mailreader-course/struts2/browse/src/java/struts.xml
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/browse/src/java/struts.xml?view=diff&rev=498503&r1=498502&r2=498503
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/browse/src/java/struts.xml
(original)
+++ struts/sandbox/trunk/mailreader-course/struts2/browse/src/java/struts.xml
Sun Jan 21 17:31:09 2007
@@ -7,8 +7,6 @@
<constant name="struts.devMode" value="true" />
<constant name="struts.enable.DynamicMethodInvocation" value="false" />
- <include file="struts-default.xml"/>
-
<package name="default" extends="struts-default">
<interceptors>
Modified:
struts/sandbox/trunk/mailreader-course/struts2/browse/src/webapp/pages/Login.jsp
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/browse/src/webapp/pages/Login.jsp?view=diff&rev=498503&r1=498502&r2=498503
==============================================================================
---
struts/sandbox/trunk/mailreader-course/struts2/browse/src/webapp/pages/Login.jsp
(original)
+++
struts/sandbox/trunk/mailreader-course/struts2/browse/src/webapp/pages/Login.jsp
Sun Jan 21 17:31:09 2007
@@ -11,13 +11,13 @@
<s:actionerror/>
<s:form action="Login_save" validate="true">
- <s:textfield label="%{getText('username')}" name="username"/>
+ <s:textfield key="username"/>
- <s:password label="%{getText('password')}" name="password"
showPassword="true"/>
+ <s:password key="password" showPassword="true"/>
- <s:submit value="%{getText('button.save')}" name="Save"/>
+ <s:submit key="button.save"/>
- <s:submit action="Login_cancel" value="%{getText('button.cancel')}"
name="Cancel"
+ <s:submit action="Login_cancel" key="button.cancel"
onclick="form.onsubmit=null"/>
</s:form>
Modified:
struts/sandbox/trunk/mailreader-course/struts2/browse/src/webapp/pages/Register.jsp
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/browse/src/webapp/pages/Register.jsp?view=diff&rev=498503&r1=498502&r2=498503
==============================================================================
---
struts/sandbox/trunk/mailreader-course/struts2/browse/src/webapp/pages/Register.jsp
(original)
+++
struts/sandbox/trunk/mailreader-course/struts2/browse/src/webapp/pages/Register.jsp
Sun Jan 21 17:31:09 2007
@@ -18,40 +18,37 @@
<s:form action="Register_save" validate="true">
<s:hidden name="task"/>
<s:if test="task == 'Create'">
- <s:textfield label="%{getText('username')}" name="username"/>
+ <s:textfield key="username"/>
</s:if>
<s:else>
- <s:label label="%{getText('username')}" name="username"/>
+ <s:label key="username"/>
<s:hidden name="username"/>
</s:else>
- <s:password label="%{getText('password')}" name="password"/>
+ <s:password key="password"/>
- <s:password label="%{getText('password2')}" name="password2"/>
+ <s:password key="password2"/>
- <s:textfield label="%{getText('fullName')}"
- name="fullName"/>
+ <s:textfield key="fullName"/>
- <s:textfield label="%{getText('fromAddress')}"
- name="fromAddress"/>
+ <s:textfield key="fromAddress"/>
- <s:textfield label="%{getText('replyToAddress')}"
- name="replyToAddress"/>
+ <s:textfield key="replyToAddress"/>
<s:if test="task == 'Create'">
- <s:submit value="%{getText('button.save')}" action="Register_create"/>
+ <s:submit key="button.save" action="Register_create"/>
- <s:reset value="%{getText('button.reset')}"/>
+ <s:reset key="button.reset"/>
- <s:submit action="Welcome" value="%{getText('button.cancel')}"
+ <s:submit action="Welcome" key="button.cancel"
onclick="form.onsubmit=null"/>
</s:if>
<s:else>
- <s:submit value="%{getText('button.save')}"/>
+ <s:submit key="button.save"/>
- <s:reset value="%{getText('button.reset')}"/>
+ <s:reset key="button.reset"/>
- <s:submit action="Menu" value="%{getText('button.cancel')}"
+ <s:submit action="Menu" key="button.cancel"
onclick="form.onsubmit=null"/>
</s:else>
Modified:
struts/sandbox/trunk/mailreader-course/struts2/browse/src/webapp/pages/Subscribe.jsp
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/browse/src/webapp/pages/Subscribe.jsp?view=diff&rev=498503&r1=498502&r2=498503
==============================================================================
---
struts/sandbox/trunk/mailreader-course/struts2/browse/src/webapp/pages/Subscribe.jsp
(original)
+++
struts/sandbox/trunk/mailreader-course/struts2/browse/src/webapp/pages/Subscribe.jsp
Sun Jan 21 17:31:09 2007
@@ -20,42 +20,42 @@
<s:actionerror/>
<s:form action="Subscribe_save" validate="true">
<s:hidden name="task"/>
- <s:label label="%{getText('username')}" name="user.username"/>
+ <s:label key="user.username"/>
<s:if test="task == 'Create'">
- <s:textfield label="%{getText('mailHostname')}" name="host"/>
+ <s:textfield key="mailHostname" name="host"/>
</s:if>
<s:else>
- <s:label label="%{getText('mailHostname')}" name="host"/>
+ <s:label key="mailHostname" name="host"/>
<s:hidden name="host"/>
</s:else>
<s:if test="task == 'Delete'">
- <s:label label="%{getText('mailUsername')}"
+ <s:label key="mailUsername"
name="subscription.username"/>
- <s:label label="%{getText('mailPassword')}"
+ <s:label key="mailPassword"
name="subscription.password"/>
- <s:label label="%{getText('mailServerType')}"
+ <s:label key="mailServerType"
name="subscription.type"/>
- <s:label label="%{getText('autoConnect')}"
+ <s:label key="autoConnect"
name="subscription.autoConnect"/>
- <s:submit value="%{getText('button.confirm')}"/>
+ <s:submit key="button.confirm"/>
</s:if>
<s:else>
- <s:textfield label="%{getText('mailUsername')}"
+ <s:textfield key="mailUsername"
name="subscription.username"/>
- <s:textfield label="%{getText('mailPassword')}"
+ <s:textfield key="mailPassword"
name="subscription.password"/>
- <s:select label="%{getText('mailServerType')}"
+ <s:select key="mailServerType"
name="subscription.type" list="types"/>
- <s:checkbox label="%{getText('autoConnect')}"
+ <s:checkbox key="autoConnect"
name="subscription.autoConnect"/>
- <s:submit value="%{getText('button.save')}"/>
- <s:reset value="%{getText('button.reset')}"/>
+ <s:submit key="button.save"/>
+ <s:reset key="button.reset"/>
</s:else>
<s:submit action="Register"
- value="%{getText('button.cancel')}"
+ key="button.cancel"
onclick="form.onsubmit=null"/>
</s:form>
Modified:
struts/sandbox/trunk/mailreader-course/struts2/hello/src/java/struts.xml
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/hello/src/java/struts.xml?view=diff&rev=498503&r1=498502&r2=498503
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/hello/src/java/struts.xml
(original)
+++ struts/sandbox/trunk/mailreader-course/struts2/hello/src/java/struts.xml
Sun Jan 21 17:31:09 2007
@@ -7,8 +7,6 @@
<constant name="struts.devMode" value="true" />
<constant name="struts.enable.DynamicMethodInvocation" value="false" />
- <include file="struts-default.xml"/>
-
<package name="default" extends="struts-default">
<default-action-ref name="Hello"/>
Modified:
struts/sandbox/trunk/mailreader-course/struts2/localize/src/java/struts.xml
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/localize/src/java/struts.xml?view=diff&rev=498503&r1=498502&r2=498503
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/localize/src/java/struts.xml
(original)
+++ struts/sandbox/trunk/mailreader-course/struts2/localize/src/java/struts.xml
Sun Jan 21 17:31:09 2007
@@ -4,8 +4,6 @@
"http://struts.apache.org/dtds/struts-2.0.dtd";>
<struts>
- <include file="struts-default.xml"/>
-
<package name="default" extends="struts-default">
<default-action-ref name="Missing"/>
Modified:
struts/sandbox/trunk/mailreader-course/struts2/localize/src/webapp/pages/Login.jsp
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/localize/src/webapp/pages/Login.jsp?view=diff&rev=498503&r1=498502&r2=498503
==============================================================================
---
struts/sandbox/trunk/mailreader-course/struts2/localize/src/webapp/pages/Login.jsp
(original)
+++
struts/sandbox/trunk/mailreader-course/struts2/localize/src/webapp/pages/Login.jsp
Sun Jan 21 17:31:09 2007
@@ -11,14 +11,14 @@
<s:actionerror/>
<s:form action="Login_save" validate="true">
- <s:textfield label="%{getText('username')}" name="username"/>
+ <s:textfield key="username"/>
- <s:password label="%{getText('password')}" name="password"
showPassword="true"/>
+ <s:password key="password" showPassword="true"/>
- <s:submit value="%{getText('button.save')}" name="Save"/>
+ <s:submit key="button.save"/>
- <s:submit action="Login_cancel" value="%{getText('button.cancel')}"
name="Cancel"
- onclick="form.onsubmit=null"/>
+ <s:submit action="Login_cancel" key="button.cancel"
+ onclick="form.onsubmit=null"/>
</s:form>
</body>
Modified:
struts/sandbox/trunk/mailreader-course/struts2/localize/src/webapp/pages/Register.jsp
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/localize/src/webapp/pages/Register.jsp?view=diff&rev=498503&r1=498502&r2=498503
==============================================================================
---
struts/sandbox/trunk/mailreader-course/struts2/localize/src/webapp/pages/Register.jsp
(original)
+++
struts/sandbox/trunk/mailreader-course/struts2/localize/src/webapp/pages/Register.jsp
Sun Jan 21 17:31:09 2007
@@ -12,21 +12,21 @@
<s:actionerror/>
<s:form action="Register_save" validate="true">
- <s:textfield label="%{getText('username')}" name="username"/>
+ <s:textfield key="username"/>
- <s:password label="%{getText('password')}" name="password"/>
+ <s:password key="password"/>
- <s:password label="%{getText('password2')}" name="password2"/>
+ <s:password key="password2"/>
- <s:textfield label="%{getText('fullName')}" name="fullName"/>
+ <s:textfield key="fullName"/>
- <s:textfield label="%{getText('fromAddress')}" name="fromAddress"/>
+ <s:textfield key="fromAddress"/>
- <s:textfield label="%{getText('replyToAddress')}" name="replyToAddress"/>
+ <s:textfield key="replyToAddress"/>
- <s:submit value="%{getText('button.save')}" name="Save"/>
+ <s:submit key="button.save"/>
- <s:submit action="Register_cancel" value="%{getText('button.cancel')}"
name="Cancel"
+ <s:submit action="Register_cancel" key="button.cancel"
onclick="form.onsubmit=null"/>
</s:form>
Modified:
struts/sandbox/trunk/mailreader-course/struts2/logout/src/java/struts.xml
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/logout/src/java/struts.xml?view=diff&rev=498503&r1=498502&r2=498503
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/logout/src/java/struts.xml
(original)
+++ struts/sandbox/trunk/mailreader-course/struts2/logout/src/java/struts.xml
Sun Jan 21 17:31:09 2007
@@ -7,8 +7,6 @@
<constant name="struts.devMode" value="true" />
<constant name="struts.enable.DynamicMethodInvocation" value="false" />
- <include file="struts-default.xml"/>
-
<package name="default" extends="struts-default">
<default-action-ref name="Missing"/>
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?view=diff&rev=498503&r1=498502&r2=498503
==============================================================================
---
struts/sandbox/trunk/mailreader-course/struts2/mailreader-course-struts2.ipr
(original)
+++
struts/sandbox/trunk/mailreader-course/struts2/mailreader-course-struts2.ipr
Sun Jan 21 17:31:09 2007
@@ -283,7 +283,7 @@
<option name="PORT" value="8080" />
<option name="LOCAL" value="true" />
<option name="OPEN_IN_BROWSER" value="true" />
- <option name="OPEN_IN_BROWSER_URL"
value="http://localhost:8080/migrating"; />
+ <option name="OPEN_IN_BROWSER_URL"
value="http://localhost:8080/subscribe"; />
<option name="COMMON_VM_ARGUMENTS" value="" />
<J2EE_MODULE DEPLOYMENT_SOURCE_NAME="exploded">
<option name="CONTEXT_PATH" value="/" />
Modified:
struts/sandbox/trunk/mailreader-course/struts2/menu/src/java/struts.xml
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/menu/src/java/struts.xml?view=diff&rev=498503&r1=498502&r2=498503
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/menu/src/java/struts.xml
(original)
+++ struts/sandbox/trunk/mailreader-course/struts2/menu/src/java/struts.xml Sun
Jan 21 17:31:09 2007
@@ -7,8 +7,6 @@
<constant name="struts.devMode" value="true" />
<constant name="struts.enable.DynamicMethodInvocation" value="false" />
- <include file="struts-default.xml"/>
-
<package name="default" extends="struts-default">
<default-action-ref name="Missing"/>
Modified: struts/sandbox/trunk/mailreader-course/struts2/migrating/migrating.iml
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/migrating/migrating.iml?view=diff&rev=498503&r1=498502&r2=498503
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/migrating/migrating.iml
(original)
+++ struts/sandbox/trunk/mailreader-course/struts2/migrating/migrating.iml Sun
Jan 21 17:31:09 2007
@@ -64,6 +64,7 @@
<webroots>
<root url="file://$MODULE_DIR$/src/main/resources"
relative="/WEB-INF/classes" />
<root url="file://$MODULE_DIR$/src/main/webapp" relative="/" />
+ <root url="file://$MODULE_DIR$/src/main/java"
relative="/WEB-INF/classes" />
</webroots>
</component>
<component name="WeblogicWebModuleProperties" />
Modified:
struts/sandbox/trunk/mailreader-course/struts2/migrating/src/main/java/actions/build.bat
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/migrating/src/main/java/actions/build.bat?view=diff&rev=498503&r1=498502&r2=498503
==============================================================================
---
struts/sandbox/trunk/mailreader-course/struts2/migrating/src/main/java/actions/build.bat
(original)
+++
struts/sandbox/trunk/mailreader-course/struts2/migrating/src/main/java/actions/build.bat
Sun Jan 21 17:31:09 2007
@@ -1,4 +1,4 @@
@echo off
del *.class
-set
CLASSPATH=..\..\lib\xwork-2.0.0.jar;..\..\lib\struts-core-1.3.5.jar;..\..\..\..\..\common\lib\servlet-api.jar
+set
CLASSPATH=..\..\lib\xwork-2.0.0.jar;..\..\lib\struts-core-1.3.5.jar;%CATALINA_HOME%\common\lib\servlet-api.jar
javac *.java
Modified:
struts/sandbox/trunk/mailreader-course/struts2/migrating/src/main/java/struts.xml
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/migrating/src/main/java/struts.xml?view=diff&rev=498503&r1=498502&r2=498503
==============================================================================
---
struts/sandbox/trunk/mailreader-course/struts2/migrating/src/main/java/struts.xml
(original)
+++
struts/sandbox/trunk/mailreader-course/struts2/migrating/src/main/java/struts.xml
Sun Jan 21 17:31:09 2007
@@ -8,8 +8,6 @@
<constant name="struts.enable.DynamicMethodInvocation" value="false" />
<constant name="struts.custom.i18n.resources" value="resources"/>
- <include file="struts-default.xml"/>
-
<package name="hello-default" extends="struts-default">
<action name="Hello_*" method="{1}" class="actions.Hello">
Modified:
struts/sandbox/trunk/mailreader-course/struts2/migrating/src/main/webapp/Hello.jsp
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/migrating/src/main/webapp/Hello.jsp?view=diff&rev=498503&r1=498502&r2=498503
==============================================================================
---
struts/sandbox/trunk/mailreader-course/struts2/migrating/src/main/webapp/Hello.jsp
(original)
+++
struts/sandbox/trunk/mailreader-course/struts2/migrating/src/main/webapp/Hello.jsp
Sun Jan 21 17:31:09 2007
@@ -17,7 +17,7 @@
<ul>
<li>
<s:url id="en" action="Hello_input">
- <s:param name="request_locale">es</s:param>
+ <s:param name="request_locale">en</s:param>
</s:url>
<s:a href="%{en}">English</s:a>
</li>
Modified:
struts/sandbox/trunk/mailreader-course/struts2/migrating/src/main/webapp/HelloInput.jsp
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/migrating/src/main/webapp/HelloInput.jsp?view=diff&rev=498503&r1=498502&r2=498503
==============================================================================
---
struts/sandbox/trunk/mailreader-course/struts2/migrating/src/main/webapp/HelloInput.jsp
(original)
+++
struts/sandbox/trunk/mailreader-course/struts2/migrating/src/main/webapp/HelloInput.jsp
Sun Jan 21 17:31:09 2007
@@ -1,7 +1,9 @@
<%@ taglib prefix="bean" uri="http://struts.apache.org/tags-bean"; %>
<%@ taglib prefix="html" uri="http://struts.apache.org/tags-html"; %>
<html>
-<head><title><bean:message key="prompt"/></title></head>
+<head>
+ <title><bean:message key="prompt"/></title>
+</head>
<body>
<h2><bean:message key="prompt"/></h2>
Modified:
struts/sandbox/trunk/mailreader-course/struts2/migrating/src/main/webapp/Hello_input.jsp
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/migrating/src/main/webapp/Hello_input.jsp?view=diff&rev=498503&r1=498502&r2=498503
==============================================================================
---
struts/sandbox/trunk/mailreader-course/struts2/migrating/src/main/webapp/Hello_input.jsp
(original)
+++
struts/sandbox/trunk/mailreader-course/struts2/migrating/src/main/webapp/Hello_input.jsp
Sun Jan 21 17:31:09 2007
@@ -1,13 +1,15 @@
<%@ taglib prefix="s" uri="/struts-tags" %>
<html>
-<head><title><s:text name="prompt"/></title></head>
+<head>
+ <title><s:text name="prompt"/></title>
+</head>
<body>
<h2><s:text name="prompt"/></h2>
<p>
<s:form action="Hello">
- <s:textfield name="message" label="%{getText('message')}"/>
+ <s:textfield key="message"/>
<s:submit/>
</s:form>
</p>
Modified:
struts/sandbox/trunk/mailreader-course/struts2/profile/src/java/struts.xml
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/profile/src/java/struts.xml?view=diff&rev=498503&r1=498502&r2=498503
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/profile/src/java/struts.xml
(original)
+++ struts/sandbox/trunk/mailreader-course/struts2/profile/src/java/struts.xml
Sun Jan 21 17:31:09 2007
@@ -7,8 +7,6 @@
<constant name="struts.devMode" value="true" />
<constant name="struts.enable.DynamicMethodInvocation" value="false" />
- <include file="struts-default.xml"/>
-
<package name="default" extends="struts-default">
<default-action-ref name="Missing"/>
Modified:
struts/sandbox/trunk/mailreader-course/struts2/profile/src/webapp/pages/Login.jsp
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/profile/src/webapp/pages/Login.jsp?view=diff&rev=498503&r1=498502&r2=498503
==============================================================================
---
struts/sandbox/trunk/mailreader-course/struts2/profile/src/webapp/pages/Login.jsp
(original)
+++
struts/sandbox/trunk/mailreader-course/struts2/profile/src/webapp/pages/Login.jsp
Sun Jan 21 17:31:09 2007
@@ -11,13 +11,13 @@
<s:actionerror/>
<s:form action="Login_save" validate="true">
- <s:textfield label="%{getText('username')}" name="username"/>
+ <s:textfield key="username"/>
- <s:password label="%{getText('password')}" name="password"
showPassword="true"/>
+ <s:password key="password" showPassword="true"/>
- <s:submit value="%{getText('button.save')}" name="Save"/>
+ <s:submit key="Save"/>
- <s:submit action="Login_cancel" value="%{getText('button.cancel')}"
name="Cancel"
+ <s:submit action="Login_cancel" key="button.cancel"
onclick="form.onsubmit=null"/>
</s:form>
Modified:
struts/sandbox/trunk/mailreader-course/struts2/profile/src/webapp/pages/Register.jsp
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/profile/src/webapp/pages/Register.jsp?view=diff&rev=498503&r1=498502&r2=498503
==============================================================================
---
struts/sandbox/trunk/mailreader-course/struts2/profile/src/webapp/pages/Register.jsp
(original)
+++
struts/sandbox/trunk/mailreader-course/struts2/profile/src/webapp/pages/Register.jsp
Sun Jan 21 17:31:09 2007
@@ -18,40 +18,37 @@
<s:form action="Register_save" validate="true">
<s:hidden name="task"/>
<s:if test="task == 'Create'">
- <s:textfield label="%{getText('username')}" name="username"/>
+ <s:textfield key="username"/>
</s:if>
<s:else>
- <s:label label="%{getText('username')}" name="username"/>
+ <s:label key="username"/>
<s:hidden name="username"/>
</s:else>
- <s:password label="%{getText('password')}" name="password"/>
+ <s:password key="password"/>
- <s:password label="%{getText('password2')}" name="password2"/>
+ <s:password key="password2"/>
- <s:textfield label="%{getText('fullName')}"
- name="fullName"/>
+ <s:textfield key="fullName"/>
- <s:textfield label="%{getText('fromAddress')}"
- name="fromAddress"/>
+ <s:textfield key="fromAddress"/>
- <s:textfield label="%{getText('replyToAddress')}"
- name="replyToAddress"/>
+ <s:textfield key="replyToAddress"/>
<s:if test="task == 'Create'">
- <s:submit value="%{getText('button.save')}" action="Register_create"/>
+ <s:submit key="button.save" action="Register_create"/>
- <s:reset value="%{getText('button.reset')}"/>
+ <s:reset key="button.reset"/>
- <s:submit action="Welcome" value="%{getText('button.cancel')}"
+ <s:submit action="Welcome" key="button.cancel"
onclick="form.onsubmit=null"/>
</s:if>
<s:else>
- <s:submit value="%{getText('button.save')}"/>
+ <s:submit key="button.save"/>
- <s:reset value="%{getText('button.reset')}"/>
+ <s:reset key="button.reset"/>
- <s:submit action="Menu" value="%{getText('button.cancel')}"
+ <s:submit action="Menu" key="button.cancel"
onclick="form.onsubmit=null"/>
</s:else>
Modified:
struts/sandbox/trunk/mailreader-course/struts2/register/src/java/struts.xml
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/register/src/java/struts.xml?view=diff&rev=498503&r1=498502&r2=498503
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/register/src/java/struts.xml
(original)
+++ struts/sandbox/trunk/mailreader-course/struts2/register/src/java/struts.xml
Sun Jan 21 17:31:09 2007
@@ -7,8 +7,6 @@
<constant name="struts.devMode" value="true" />
<constant name="struts.enable.DynamicMethodInvocation" value="false" />
- <include file="struts-default.xml"/>
-
<package name="default" extends="struts-default">
<default-action-ref name="Missing"/>
Modified:
struts/sandbox/trunk/mailreader-course/struts2/register2/src/java/struts.xml
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/register2/src/java/struts.xml?view=diff&rev=498503&r1=498502&r2=498503
==============================================================================
---
struts/sandbox/trunk/mailreader-course/struts2/register2/src/java/struts.xml
(original)
+++
struts/sandbox/trunk/mailreader-course/struts2/register2/src/java/struts.xml
Sun Jan 21 17:31:09 2007
@@ -7,8 +7,6 @@
<constant name="struts.devMode" value="true" />
<constant name="struts.enable.DynamicMethodInvocation" value="false" />
- <include file="struts-default.xml"/>
-
<package name="default" extends="struts-default">
<default-action-ref name="Missing"/>
Modified:
struts/sandbox/trunk/mailreader-course/struts2/retain/src/java/struts.xml
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/retain/src/java/struts.xml?view=diff&rev=498503&r1=498502&r2=498503
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/retain/src/java/struts.xml
(original)
+++ struts/sandbox/trunk/mailreader-course/struts2/retain/src/java/struts.xml
Sun Jan 21 17:31:09 2007
@@ -7,8 +7,6 @@
<constant name="struts.devMode" value="true" />
<constant name="struts.enable.DynamicMethodInvocation" value="false" />
- <include file="struts-default.xml"/>
-
<package name="default" extends="struts-default">
<default-action-ref name="Missing"/>
Modified:
struts/sandbox/trunk/mailreader-course/struts2/subscribe/src/java/struts.xml
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/subscribe/src/java/struts.xml?view=diff&rev=498503&r1=498502&r2=498503
==============================================================================
---
struts/sandbox/trunk/mailreader-course/struts2/subscribe/src/java/struts.xml
(original)
+++
struts/sandbox/trunk/mailreader-course/struts2/subscribe/src/java/struts.xml
Sun Jan 21 17:31:09 2007
@@ -7,8 +7,6 @@
<constant name="struts.devMode" value="true" />
<constant name="struts.enable.DynamicMethodInvocation" value="false" />
- <include file="struts-default.xml"/>
-
<package name="default" extends="struts-default">
<default-action-ref name="Missing"/>
Modified:
struts/sandbox/trunk/mailreader-course/struts2/subscribe/src/webapp/pages/Login.jsp
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/subscribe/src/webapp/pages/Login.jsp?view=diff&rev=498503&r1=498502&r2=498503
==============================================================================
---
struts/sandbox/trunk/mailreader-course/struts2/subscribe/src/webapp/pages/Login.jsp
(original)
+++
struts/sandbox/trunk/mailreader-course/struts2/subscribe/src/webapp/pages/Login.jsp
Sun Jan 21 17:31:09 2007
@@ -11,13 +11,13 @@
<s:actionerror/>
<s:form action="Login_save" validate="true">
- <s:textfield label="%{getText('username')}" name="username"/>
+ <s:textfield key="username"/>
- <s:password label="%{getText('password')}" name="password"
showPassword="true"/>
+ <s:password key="password" showPassword="true"/>
- <s:submit value="%{getText('button.save')}" name="Save"/>
+ <s:submit key="button.save"/>
- <s:submit action="Login_cancel" value="%{getText('button.cancel')}"
name="Cancel"
+ <s:submit action="Login_cancel" key="button.cancel"
onclick="form.onsubmit=null"/>
</s:form>
Modified:
struts/sandbox/trunk/mailreader-course/struts2/subscribe/src/webapp/pages/Register.jsp
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/subscribe/src/webapp/pages/Register.jsp?view=diff&rev=498503&r1=498502&r2=498503
==============================================================================
---
struts/sandbox/trunk/mailreader-course/struts2/subscribe/src/webapp/pages/Register.jsp
(original)
+++
struts/sandbox/trunk/mailreader-course/struts2/subscribe/src/webapp/pages/Register.jsp
Sun Jan 21 17:31:09 2007
@@ -18,40 +18,37 @@
<s:form action="Register_save" validate="true">
<s:hidden name="task"/>
<s:if test="task == 'Create'">
- <s:textfield label="%{getText('username')}" name="username"/>
+ <s:textfield key="username"/>
</s:if>
<s:else>
- <s:label label="%{getText('username')}" name="username"/>
+ <s:label key="username"/>
<s:hidden name="username"/>
</s:else>
- <s:password label="%{getText('password')}" name="password"/>
+ <s:password key="password"/>
- <s:password label="%{getText('password2')}" name="password2"/>
+ <s:password key="password2"/>
- <s:textfield label="%{getText('fullName')}"
- name="fullName"/>
+ <s:textfield key="fullName"/>
- <s:textfield label="%{getText('fromAddress')}"
- name="fromAddress"/>
+ <s:textfield key="fromAddress"/>
- <s:textfield label="%{getText('replyToAddress')}"
- name="replyToAddress"/>
+ <s:textfield key="replyToAddress"/>
<s:if test="task == 'Create'">
- <s:submit value="%{getText('button.save')}" action="Register_create"/>
+ <s:submit key="button.save" action="Register_create"/>
- <s:reset value="%{getText('button.reset')}"/>
+ <s:reset key="button.reset"/>
- <s:submit action="Welcome" value="%{getText('button.cancel')}"
+ <s:submit action="Welcome" key="button.cancel"
onclick="form.onsubmit=null"/>
</s:if>
<s:else>
- <s:submit value="%{getText('button.save')}"/>
+ <s:submit key="button.save"/>
- <s:reset value="%{getText('button.reset')}"/>
+ <s:reset key="button.reset"/>
- <s:submit action="Menu" value="%{getText('button.cancel')}"
+ <s:submit action="Menu" key="button.cancel"
onclick="form.onsubmit=null"/>
</s:else>
Modified:
struts/sandbox/trunk/mailreader-course/struts2/subscribe/src/webapp/pages/Subscribe.jsp
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/subscribe/src/webapp/pages/Subscribe.jsp?view=diff&rev=498503&r1=498502&r2=498503
==============================================================================
---
struts/sandbox/trunk/mailreader-course/struts2/subscribe/src/webapp/pages/Subscribe.jsp
(original)
+++
struts/sandbox/trunk/mailreader-course/struts2/subscribe/src/webapp/pages/Subscribe.jsp
Sun Jan 21 17:31:09 2007
@@ -20,42 +20,42 @@
<s:actionerror/>
<s:form action="Subscribe_save" validate="true">
<s:hidden name="task"/>
- <s:label label="%{getText('username')}" name="user.username"/>
+ <s:label key="user.username"/>
<s:if test="task == 'Create'">
- <s:textfield label="%{getText('mailHostname')}" name="host"/>
+ <s:textfield key="mailHostname" name="host"/>
</s:if>
<s:else>
- <s:label label="%{getText('mailHostname')}" name="host"/>
+ <s:label key="mailHostname" name="host"/>
<s:hidden name="host"/>
</s:else>
<s:if test="task == 'Delete'">
- <s:label label="%{getText('mailUsername')}"
+ <s:label key="mailUsername"
name="subscription.username"/>
- <s:label label="%{getText('mailPassword')}"
+ <s:label key="mailPassword"
name="subscription.password"/>
- <s:label label="%{getText('mailServerType')}"
+ <s:label key="mailServerType"
name="subscription.type"/>
- <s:label label="%{getText('autoConnect')}"
+ <s:label key="autoConnect"
name="subscription.autoConnect"/>
- <s:submit value="%{getText('button.confirm')}"/>
+ <s:submit key="button.confirm"/>
</s:if>
<s:else>
- <s:textfield label="%{getText('mailUsername')}"
+ <s:textfield key="mailUsername"
name="subscription.username"/>
- <s:textfield label="%{getText('mailPassword')}"
+ <s:textfield key="mailPassword"
name="subscription.password"/>
- <s:select label="%{getText('mailServerType')}"
+ <s:select key="mailServerType"
name="subscription.type" list="types"/>
- <s:checkbox label="%{getText('autoConnect')}"
+ <s:checkbox key="autoConnect"
name="subscription.autoConnect"/>
- <s:submit value="%{getText('button.save')}"/>
- <s:reset value="%{getText('button.reset')}"/>
+ <s:submit key="button.save"/>
+ <s:reset key="button.reset"/>
</s:else>
<s:submit action="Register"
- value="%{getText('button.cancel')}"
+ key="button.cancel"
onclick="form.onsubmit=null"/>
</s:form>
Modified:
struts/sandbox/trunk/mailreader-course/struts2/theme/src/java/struts.xml
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/theme/src/java/struts.xml?view=diff&rev=498503&r1=498502&r2=498503
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/theme/src/java/struts.xml
(original)
+++ struts/sandbox/trunk/mailreader-course/struts2/theme/src/java/struts.xml
Sun Jan 21 17:31:09 2007
@@ -7,8 +7,6 @@
<constant name="struts.devMode" value="true" />
<constant name="struts.enable.DynamicMethodInvocation" value="false" />
- <include file="struts-default.xml"/>
-
<package name="default" extends="struts-default">
<interceptors>
Modified:
struts/sandbox/trunk/mailreader-course/struts2/theme/src/webapp/pages/Login.jsp
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/theme/src/webapp/pages/Login.jsp?view=diff&rev=498503&r1=498502&r2=498503
==============================================================================
---
struts/sandbox/trunk/mailreader-course/struts2/theme/src/webapp/pages/Login.jsp
(original)
+++
struts/sandbox/trunk/mailreader-course/struts2/theme/src/webapp/pages/Login.jsp
Sun Jan 21 17:31:09 2007
@@ -7,18 +7,18 @@
<title><s:text name="login.title"/></title>
</head>
-<body onLoad="self.focus();document.Login.username.focus()">
+<body onLoad="self.focus();document.Login_save.username.focus()">
<s:actionerror/>
-<s:form method="POST" validate="true">
- <s:textfield label="%{getText('username')}" name="username"/>
+<s:form action="Login_save" validate="true">
+ <s:textfield key="username"/>
- <s:password label="%{getText('password')}" name="password"
showPassword="true"/>
+ <s:password key="password" showPassword="true"/>
- <s:submit value="%{getText('button.save')}" name="Save"/>
+ <s:submit key="button.save"/>
- <s:submit action="Login!cancel" value="%{getText('button.cancel')}"
name="Cancel"
- onclick="form.onsubmit=null"/>
+ <s:submit action="Login_cancel" key="button.cancel"
+ onclick="form.onsubmit=null"/>
</s:form>
</body>
Modified:
struts/sandbox/trunk/mailreader-course/struts2/theme/src/webapp/pages/Register.jsp
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/theme/src/webapp/pages/Register.jsp?view=diff&rev=498503&r1=498502&r2=498503
==============================================================================
---
struts/sandbox/trunk/mailreader-course/struts2/theme/src/webapp/pages/Register.jsp
(original)
+++
struts/sandbox/trunk/mailreader-course/struts2/theme/src/webapp/pages/Register.jsp
Sun Jan 21 17:31:09 2007
@@ -12,48 +12,44 @@
</s:if>
</head>
-<body>
+<body onLoad="self.focus();document.Register_save.username.focus()">
<s:actionerror/>
-<s:form method="POST" validate="true">
- <s:token/>
+<s:form action="Register_save" validate="true">
<s:hidden name="task"/>
<s:if test="task == 'Create'">
- <s:textfield label="%{getText('username')}" name="username"/>
+ <s:textfield key="username"/>
</s:if>
<s:else>
- <s:label label="%{getText('username')}" name="username"/>
+ <s:label key="username"/>
<s:hidden name="username"/>
</s:else>
- <s:password label="%{getText('password')}" name="password"/>
+ <s:password key="password"/>
- <s:password label="%{getText('password2')}" name="password2"/>
+ <s:password key="password2"/>
- <s:textfield label="%{getText('fullName')}"
- name="fullName"/>
+ <s:textfield key="fullName"/>
- <s:textfield label="%{getText('fromAddress')}"
- name="fromAddress"/>
+ <s:textfield key="fromAddress"/>
- <s:textfield label="%{getText('replyToAddress')}"
- name="replyToAddress"/>
+ <s:textfield key="replyToAddress"/>
<s:if test="task == 'Create'">
- <s:submit value="%{getText('button.save')}" action="RegisterCreate"/>
+ <s:submit key="button.save" action="Register_create"/>
- <s:reset value="%{getText('button.reset')}"/>
+ <s:reset key="button.reset"/>
- <s:submit action="Welcome" value="%{getText('button.cancel')}"
- onclick="form.onsubmit=null"/>
+ <s:submit action="Welcome" key="button.cancel"
+ onclick="form.onsubmit=null"/>
</s:if>
<s:else>
- <s:submit value="%{getText('button.save')}" action="Register"/>
+ <s:submit key="button.save"/>
- <s:reset value="%{getText('button.reset')}"/>
+ <s:reset key="button.reset"/>
- <s:submit action="Menu" value="%{getText('button.cancel')}"
- onclick="form.onsubmit=null"/>
+ <s:submit action="Menu" key="button.cancel"
+ onclick="form.onsubmit=null"/>
</s:else>
</s:form>
@@ -99,11 +95,11 @@
</td>
<td align="center">
- <a href="<s:url action="Subscribe!delete"><s:param
name="host" value="host"/></s:url>">
+ <a href="<s:url action="Subscribe_delete"><s:param
name="host" value="host"/></s:url>">
<s:text name="registration.deleteSubscription"/>
</a>
- <a href="<s:url action="Subscribe!edit"><s:param
name="host" value="host"/></s:url>">
+ <a href="<s:url action="Subscribe_edit"><s:param
name="host" value="host"/></s:url>">
<s:text name="registration.editSubscription"/>
</a>
@@ -113,7 +109,7 @@
</table>
- <a href="<s:url action="Subscribe!input"/>"><s:text
+ <a href="<s:url action="Subscribe"/>"><s:text
name="registration.addSubscription"/></a>
</s:if>
Modified:
struts/sandbox/trunk/mailreader-course/struts2/theme/src/webapp/pages/Subscribe.jsp
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/theme/src/webapp/pages/Subscribe.jsp?view=diff&rev=498503&r1=498502&r2=498503
==============================================================================
---
struts/sandbox/trunk/mailreader-course/struts2/theme/src/webapp/pages/Subscribe.jsp
(original)
+++
struts/sandbox/trunk/mailreader-course/struts2/theme/src/webapp/pages/Subscribe.jsp
Sun Jan 21 17:31:09 2007
@@ -15,49 +15,48 @@
</s:if>
</head>
-<body onLoad="self.focus();document.Subscribe.username.focus()">
+<body onLoad="self.focus();document.Subscribe_save.username.focus()">
<s:actionerror/>
-<s:form method="POST" action="SubscribeSave" validate="true">
- <s:token/>
+<s:form action="Subscribe_save" validate="true">
<s:hidden name="task"/>
- <s:label label="%{getText('username')}" name="user.username"/>
+ <s:label key="user.username"/>
<s:if test="task == 'Create'">
- <s:textfield label="%{getText('mailHostname')}" name="host"/>
+ <s:textfield key="mailHostname" name="host"/>
</s:if>
<s:else>
- <s:label label="%{getText('mailHostname')}" name="host"/>
+ <s:label key="mailHostname" name="host"/>
<s:hidden name="host"/>
</s:else>
<s:if test="task == 'Delete'">
- <s:label label="%{getText('mailUsername')}"
- name="subscription.username"/>
- <s:label label="%{getText('mailPassword')}"
- name="subscription.password"/>
- <s:label label="%{getText('mailServerType')}"
- name="subscription.type"/>
- <s:label label="%{getText('autoConnect')}"
- name="subscription.autoConnect"/>
- <s:submit value="%{getText('button.confirm')}"/>
+ <s:label key="mailUsername"
+ name="subscription.username"/>
+ <s:label key="mailPassword"
+ name="subscription.password"/>
+ <s:label key="mailServerType"
+ name="subscription.type"/>
+ <s:label key="autoConnect"
+ name="subscription.autoConnect"/>
+ <s:submit key="button.confirm"/>
</s:if>
<s:else>
- <s:textfield label="%{getText('mailUsername')}"
- name="subscription.username"/>
- <s:textfield label="%{getText('mailPassword')}"
- name="subscription.password"/>
- <s:select label="%{getText('mailServerType')}"
- name="subscription.type" list="types"/>
- <s:checkbox label="%{getText('autoConnect')}"
- name="subscription.autoConnect"/>
- <s:submit value="%{getText('button.save')}"/>
- <s:reset value="%{getText('button.reset')}"/>
+ <s:textfield key="mailUsername"
+ name="subscription.username"/>
+ <s:textfield key="mailPassword"
+ name="subscription.password"/>
+ <s:select key="mailServerType"
+ name="subscription.type" list="types"/>
+ <s:checkbox key="autoConnect"
+ name="subscription.autoConnect"/>
+ <s:submit key="button.save"/>
+ <s:reset key="button.reset"/>
</s:else>
- <s:submit action="Register!input"
- value="%{getText('button.cancel')}"
- onclick="form.onsubmit=null"/>
+ <s:submit action="Register"
+ key="button.cancel"
+ onclick="form.onsubmit=null"/>
</s:form>
</body>
Modified:
struts/sandbox/trunk/mailreader-course/struts2/welcome/src/java/struts.xml
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/welcome/src/java/struts.xml?view=diff&rev=498503&r1=498502&r2=498503
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/welcome/src/java/struts.xml
(original)
+++ struts/sandbox/trunk/mailreader-course/struts2/welcome/src/java/struts.xml
Sun Jan 21 17:31:09 2007
@@ -7,8 +7,6 @@
<constant name="struts.devMode" value="true" />
<constant name="struts.enable.DynamicMethodInvocation" value="false" />
- <include file="struts-default.xml"/>
-
<package name="default" extends="struts-default">
<default-action-ref name="Missing"/>
