Author: hrabago
Date: Sat Aug 6 14:30:38 2005
New Revision: 230593
URL: http://svn.apache.org/viewcvs?rev=230593&view=rev
Log:
Replace references to ActionError with ActionMessage.
Replace most references to ActionErrors with ActionMessages.
Modified:
struts/taglib/trunk/src/java/org/apache/struts/taglib/html/package.html
struts/taglib/trunk/src/test/org/apache/struts/taglib/TestTagUtils.java
struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestErrorsTag1.jsp
struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestErrorsTag2.jsp
struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestErrorsTag3.jsp
struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestErrorsTag4.jsp
struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestMessagesTag1.jsp
struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestMessagesTag2.jsp
struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestMessagesTag3.jsp
struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestMessagesTag4.jsp
struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestMessagesTag5.jsp
struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestMessagesTag6.jsp
struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestMessagesTag7.jsp
struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestMessagesTag8.jsp
Modified:
struts/taglib/trunk/src/java/org/apache/struts/taglib/html/package.html
URL:
http://svn.apache.org/viewcvs/struts/taglib/trunk/src/java/org/apache/struts/taglib/html/package.html?rev=230593&r1=230592&r2=230593&view=diff
==============================================================================
--- struts/taglib/trunk/src/java/org/apache/struts/taglib/html/package.html
(original)
+++ struts/taglib/trunk/src/java/org/apache/struts/taglib/html/package.html Sat
Aug 6 14:30:38 2005
@@ -404,7 +404,7 @@
<p>Error messages are often queued in the ActionForm validate method. Here's
a snippet from the Struts Example application:</p>
-<pre> ActionErrors errors = new ActionErrors();<br> if ((username == null)
|| (username.length() < 1))<br> errors.add("username", new
ActionError("error.username.required"));<br> if ((password == null) ||
(password.length() < 1))<br> errors.add("password",<br> new
ActionError("error.password.required"));<br></pre>
+<pre> ActionErrors errors = new ActionErrors();<br> if ((username == null)
|| (username.length() < 1))<br> errors.add("username", new
ActionMessage("error.username.required"));<br> if ((password == null) ||
(password.length() < 1))<br> errors.add("password",<br> new
ActionMessage("error.password.required"));<br></pre>
<p>This queues two error messages, one for the "username" field and another
for the "password" field. To print all the messages together, simply place
Modified:
struts/taglib/trunk/src/test/org/apache/struts/taglib/TestTagUtils.java
URL:
http://svn.apache.org/viewcvs/struts/taglib/trunk/src/test/org/apache/struts/taglib/TestTagUtils.java?rev=230593&r1=230592&r2=230593&view=diff
==============================================================================
--- struts/taglib/trunk/src/test/org/apache/struts/taglib/TestTagUtils.java
(original)
+++ struts/taglib/trunk/src/test/org/apache/struts/taglib/TestTagUtils.java Sat
Aug 6 14:30:38 2005
@@ -31,8 +31,6 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.struts.Globals;
-import org.apache.struts.action.ActionError;
-import org.apache.struts.action.ActionErrors;
import org.apache.struts.action.ActionMessage;
import org.apache.struts.action.ActionMessages;
import org.apache.struts.config.ActionConfig;
@@ -1456,7 +1454,6 @@
* @param href The href specified
* @param pageString The pageString specified
* @param action The action specified
- * @param module The module specified
*/
private void verifyBadSetOfSpecifiers(String forward, String href,
String pageString, String action) {
@@ -1504,12 +1501,12 @@
// ActionErrors
public void testGetActionErrors1a() {
- ActionErrors actionErrors = new ActionErrors();
- actionErrors.add("prop", new ActionError("key.key"));
+ ActionMessages actionErrors = new ActionMessages();
+ actionErrors.add("prop", new ActionMessage("key.key"));
request.setAttribute("errors", actionErrors);
try {
- ActionErrors errors = tagutils.getActionErrors(pageContext,
"errors");
+ ActionMessages errors = tagutils.getActionMessages(pageContext,
"errors");
assertNotNull("errors should not be null",
errors);
assertNotNull("errors prop should not be null",
@@ -1517,7 +1514,7 @@
String val = null;
int i = 0;
for (Iterator iter = errors.get("prop"); iter.hasNext();) {
- ActionError error = (ActionError) iter.next();
+ ActionMessage error = (ActionMessage) iter.next();
val = error.getKey();
i++;
}
@@ -1537,7 +1534,7 @@
request.setAttribute("foo", "bar");
try {
- ActionErrors errors = tagutils.getActionErrors(pageContext, "foo");
+ ActionMessages errors = tagutils.getActionMessages(pageContext,
"foo");
assertNotNull("errors should not be null",
errors);
assertNotNull("errors prop should not be null",
@@ -1567,7 +1564,7 @@
request.setAttribute("foo", vals);
try {
- ActionErrors errors = tagutils.getActionErrors(pageContext, "foo");
+ ActionMessages errors = tagutils.getActionMessages(pageContext,
"foo");
assertNotNull("errors should not be null",
errors);
assertNotNull("errors prop should not be null",
@@ -1596,9 +1593,9 @@
public void testGetActionErrors1d() {
request.setAttribute("foo", new MockFormBean());
- ActionErrors errors = null;
+ ActionMessages errors = null;
try {
- errors = tagutils.getActionErrors(pageContext, "foo");
+ errors = tagutils.getActionMessages(pageContext, "foo");
fail("should have thrown JspException");
} catch (JspException e) {
assertNull("errors should be null", errors);
@@ -1609,12 +1606,12 @@
// ActionErrors (thrown Exception)
// TODO -- currently this does not hit the line for caught Exception
public void testGetActionErrors1e() {
- ActionErrors actionErrors = new ActionErrors();
- actionErrors.add("prop", new ActionError("key.key"));
+ ActionMessages actionErrors = new ActionMessages();
+ actionErrors.add("prop", new ActionMessage("key.key"));
request.setAttribute("errors", actionErrors);
try {
- ActionErrors errors = tagutils.getActionErrors(pageContext,
"does-not-exist");
+ ActionMessages errors = tagutils.getActionMessages(pageContext,
"does-not-exist");
assertNotNull("errors should not be null",
errors);
assertNotNull("errors prop should not be null",
@@ -1857,7 +1854,7 @@
// -- using ActionErrors
public void testActionMessages_getActionMessages_PageContext_String2(){
- ActionErrors actionMessages = new ActionErrors();
+ ActionMessages actionMessages = new ActionMessages();
actionMessages.add("prop", new ActionMessage("key.key"));
request.setAttribute("messages", actionMessages);
Modified:
struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestErrorsTag1.jsp
URL:
http://svn.apache.org/viewcvs/struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestErrorsTag1.jsp?rev=230593&r1=230592&r2=230593&view=diff
==============================================================================
---
struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestErrorsTag1.jsp
(original)
+++
struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestErrorsTag1.jsp
Sat Aug 6 14:30:38 2005
@@ -1,8 +1,8 @@
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<[EMAIL PROTECTED] import="junit.framework.Assert"%>
<[EMAIL PROTECTED] import="org.apache.struts.Globals"%>
-<[EMAIL PROTECTED] import="org.apache.struts.action.ActionError"%>
-<[EMAIL PROTECTED] import="org.apache.struts.action.ActionErrors"%>
+<[EMAIL PROTECTED] import="org.apache.struts.action.ActionMessage"%>
+<[EMAIL PROTECTED] import="org.apache.struts.action.ActionMessages"%>
<%@ taglib uri="http://struts.apache.org/tags-logic"; prefix="logic" %>
<%@ taglib uri="http://struts.apache.org/tags-bean"; prefix="bean" %>
@@ -23,11 +23,11 @@
<logic:equal name="runTest" value="testErrorsDefaultBundle2Errors">
<%
//This should be done in your action. I do it here to keep the tests simple.
- ActionErrors errors = new ActionErrors();
- errors.add(ActionErrors.GLOBAL_ERROR,
- new ActionError("default.testing.errors.tag"));
- errors.add(ActionErrors.GLOBAL_ERROR,
- new ActionError("default.testing.errors.tag2"));
+ ActionMessages errors = new ActionMessages();
+ errors.add(ActionMessages.GLOBAL_MESSAGE,
+ new ActionMessage("default.testing.errors.tag"));
+ errors.add(ActionMessages.GLOBAL_MESSAGE,
+ new ActionMessage("default.testing.errors.tag2"));
request.setAttribute(Globals.ERROR_KEY, errors);
%>
<bean:define id="EXPECTED_RESULTS" toScope="page">
@@ -54,11 +54,11 @@
<logic:equal name="runTest" value="testErrorsAlternateBundle2Errors">
<%
//This should be done in your action. I do it here to keep the tests simple.
- ActionErrors errors = new ActionErrors();
- errors.add(ActionErrors.GLOBAL_ERROR,
- new ActionError("alternate.testing.errors.tag"));
- errors.add(ActionErrors.GLOBAL_ERROR,
- new ActionError("alternate.testing.errors.tag2"));
+ ActionMessages errors = new ActionMessages();
+ errors.add(ActionMessages.GLOBAL_MESSAGE,
+ new ActionMessage("alternate.testing.errors.tag"));
+ errors.add(ActionMessages.GLOBAL_MESSAGE,
+ new ActionMessage("alternate.testing.errors.tag2"));
request.setAttribute(Globals.ERROR_KEY, errors);
%>
<bean:define id="EXPECTED_RESULTS" toScope="page">
@@ -84,11 +84,11 @@
<logic:equal name="runTest" value="testErrorsDefaultBundle2Errors_fr">
<%
//This should be done in your action. I do it here to keep the tests simple.
- ActionErrors errors = new ActionErrors();
- errors.add(ActionErrors.GLOBAL_ERROR,
- new ActionError("default.testing.errors.tag"));
- errors.add(ActionErrors.GLOBAL_ERROR,
- new ActionError("default.testing.errors.tag2"));
+ ActionMessages errors = new ActionMessages();
+ errors.add(ActionMessages.GLOBAL_MESSAGE,
+ new ActionMessage("default.testing.errors.tag"));
+ errors.add(ActionMessages.GLOBAL_MESSAGE,
+ new ActionMessage("default.testing.errors.tag2"));
request.setAttribute(Globals.ERROR_KEY, errors);
%>
<bean:define id="EXPECTED_RESULTS" toScope="page">
@@ -112,11 +112,11 @@
<logic:equal name="runTest" value="testErrorsAlternateBundle2Errors_fr">
<%
//This should be done in your action. I do it here to keep the tests simple.
- ActionErrors errors = new ActionErrors();
- errors.add(ActionErrors.GLOBAL_ERROR,
- new ActionError("alternate.testing.errors.tag"));
- errors.add(ActionErrors.GLOBAL_ERROR,
- new ActionError("alternate.testing.errors.tag2"));
+ ActionMessages errors = new ActionMessages();
+ errors.add(ActionMessages.GLOBAL_MESSAGE,
+ new ActionMessage("alternate.testing.errors.tag"));
+ errors.add(ActionMessages.GLOBAL_MESSAGE,
+ new ActionMessage("alternate.testing.errors.tag2"));
request.setAttribute(Globals.ERROR_KEY, errors);
%>
<bean:define id="EXPECTED_RESULTS" toScope="page">
@@ -143,11 +143,11 @@
<logic:equal name="runTest" value="testErrorsDefaultBundle2ErrorsLocale">
<%
//This should be done in your action. I do it here to keep the tests simple.
- ActionErrors errors = new ActionErrors();
- errors.add(ActionErrors.GLOBAL_ERROR,
- new ActionError("default.testing.errors.tag"));
- errors.add(ActionErrors.GLOBAL_ERROR,
- new ActionError("default.testing.errors.tag2"));
+ ActionMessages errors = new ActionMessages();
+ errors.add(ActionMessages.GLOBAL_MESSAGE,
+ new ActionMessage("default.testing.errors.tag"));
+ errors.add(ActionMessages.GLOBAL_MESSAGE,
+ new ActionMessage("default.testing.errors.tag2"));
request.setAttribute(Globals.ERROR_KEY, errors);
%>
<bean:define id="EXPECTED_RESULTS" toScope="page">
@@ -170,11 +170,11 @@
<logic:equal name="runTest" value="testErrorsAlternateBundle2ErrorsLocale">
<%
//This should be done in your action. I do it here to keep the tests simple.
- ActionErrors errors = new ActionErrors();
- errors.add(ActionErrors.GLOBAL_ERROR,
- new ActionError("alternate.testing.errors.tag"));
- errors.add(ActionErrors.GLOBAL_ERROR,
- new ActionError("alternate.testing.errors.tag2"));
+ ActionMessages errors = new ActionMessages();
+ errors.add(ActionMessages.GLOBAL_MESSAGE,
+ new ActionMessage("alternate.testing.errors.tag"));
+ errors.add(ActionMessages.GLOBAL_MESSAGE,
+ new ActionMessage("alternate.testing.errors.tag2"));
request.setAttribute(Globals.ERROR_KEY, errors);
%>
<bean:define id="EXPECTED_RESULTS" toScope="page">
@@ -197,11 +197,11 @@
<logic:equal name="runTest" value="testErrorsDefaultBundle2ErrorsLocale_fr">
<%
//This should be done in your action. I do it here to keep the tests simple.
- ActionErrors errors = new ActionErrors();
- errors.add(ActionErrors.GLOBAL_ERROR,
- new ActionError("default.testing.errors.tag"));
- errors.add(ActionErrors.GLOBAL_ERROR,
- new ActionError("default.testing.errors.tag2"));
+ ActionMessages errors = new ActionMessages();
+ errors.add(ActionMessages.GLOBAL_MESSAGE,
+ new ActionMessage("default.testing.errors.tag"));
+ errors.add(ActionMessages.GLOBAL_MESSAGE,
+ new ActionMessage("default.testing.errors.tag2"));
request.setAttribute(Globals.ERROR_KEY, errors);
%>
<bean:define id="EXPECTED_RESULTS" toScope="page">
@@ -225,11 +225,11 @@
<logic:equal name="runTest" value="testErrorsAlternateBundle2ErrorsLocale_fr">
<%
//This should be done in your action. I do it here to keep the tests simple.
- ActionErrors errors = new ActionErrors();
- errors.add(ActionErrors.GLOBAL_ERROR,
- new ActionError("alternate.testing.errors.tag"));
- errors.add(ActionErrors.GLOBAL_ERROR,
- new ActionError("alternate.testing.errors.tag2"));
+ ActionMessages errors = new ActionMessages();
+ errors.add(ActionMessages.GLOBAL_MESSAGE,
+ new ActionMessage("alternate.testing.errors.tag"));
+ errors.add(ActionMessages.GLOBAL_MESSAGE,
+ new ActionMessage("alternate.testing.errors.tag2"));
request.setAttribute(Globals.ERROR_KEY, errors);
%>
<bean:define id="EXPECTED_RESULTS" toScope="page">
Modified:
struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestErrorsTag2.jsp
URL:
http://svn.apache.org/viewcvs/struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestErrorsTag2.jsp?rev=230593&r1=230592&r2=230593&view=diff
==============================================================================
---
struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestErrorsTag2.jsp
(original)
+++
struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestErrorsTag2.jsp
Sat Aug 6 14:30:38 2005
@@ -1,8 +1,8 @@
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<[EMAIL PROTECTED] import="junit.framework.Assert"%>
+<[EMAIL PROTECTED] import="org.apache.struts.action.ActionMessage"%>
<[EMAIL PROTECTED] import="org.apache.struts.Globals"%>
-<[EMAIL PROTECTED] import="org.apache.struts.action.ActionError"%>
-<[EMAIL PROTECTED] import="org.apache.struts.action.ActionErrors"%>
+<[EMAIL PROTECTED] import="org.apache.struts.action.ActionMessages"%>
<%@ taglib uri="http://struts.apache.org/tags-logic"; prefix="logic" %>
<%@ taglib uri="http://struts.apache.org/tags-bean"; prefix="bean" %>
@@ -24,11 +24,11 @@
<logic:equal name="runTest" value="testErrorsDefaultBundle2ErrorsProperty">
<%
//This should be done in your action. I do it here to keep the tests simple.
- ActionErrors errors = new ActionErrors();
+ ActionMessages errors = new ActionMessages();
errors.add("someProperty",
- new ActionError("default.testing.errors.tag"));
+ new ActionMessage("default.testing.errors.tag"));
errors.add("someProperty",
- new ActionError("default.testing.errors.tag2"));
+ new ActionMessage("default.testing.errors.tag2"));
request.setAttribute(Globals.ERROR_KEY, errors);
%>
<bean:define id="EXPECTED_RESULTS" toScope="page">
@@ -55,11 +55,11 @@
<logic:equal name="runTest" value="testErrorsAlternateBundle2ErrorsProperty">
<%
//This should be done in your action. I do it here to keep the tests simple.
- ActionErrors errors = new ActionErrors();
+ ActionMessages errors = new ActionMessages();
errors.add("someProperty",
- new ActionError("alternate.testing.errors.tag"));
+ new ActionMessage("alternate.testing.errors.tag"));
errors.add("someProperty",
- new ActionError("alternate.testing.errors.tag2"));
+ new ActionMessage("alternate.testing.errors.tag2"));
request.setAttribute(Globals.ERROR_KEY, errors);
%>
<bean:define id="EXPECTED_RESULTS" toScope="page">
@@ -85,11 +85,11 @@
<logic:equal name="runTest" value="testErrorsDefaultBundle2ErrorsProperty_fr">
<%
//This should be done in your action. I do it here to keep the tests simple.
- ActionErrors errors = new ActionErrors();
+ ActionMessages errors = new ActionMessages();
errors.add("someProperty",
- new ActionError("default.testing.errors.tag"));
+ new ActionMessage("default.testing.errors.tag"));
errors.add("someProperty",
- new ActionError("default.testing.errors.tag2"));
+ new ActionMessage("default.testing.errors.tag2"));
request.setAttribute(Globals.ERROR_KEY, errors);
%>
<bean:define id="EXPECTED_RESULTS" toScope="page">
@@ -113,11 +113,11 @@
<logic:equal name="runTest"
value="testErrorsAlternateBundle2ErrorsProperty_fr">
<%
//This should be done in your action. I do it here to keep the tests simple.
- ActionErrors errors = new ActionErrors();
+ ActionMessages errors = new ActionMessages();
errors.add("someProperty",
- new ActionError("alternate.testing.errors.tag"));
+ new ActionMessage("alternate.testing.errors.tag"));
errors.add("someProperty",
- new ActionError("alternate.testing.errors.tag2"));
+ new ActionMessage("alternate.testing.errors.tag2"));
request.setAttribute(Globals.ERROR_KEY, errors);
%>
<bean:define id="EXPECTED_RESULTS" toScope="page">
@@ -144,11 +144,11 @@
<logic:equal name="runTest"
value="testErrorsDefaultBundle2ErrorsLocaleProperty">
<%
//This should be done in your action. I do it here to keep the tests simple.
- ActionErrors errors = new ActionErrors();
+ ActionMessages errors = new ActionMessages();
errors.add("someProperty",
- new ActionError("default.testing.errors.tag"));
+ new ActionMessage("default.testing.errors.tag"));
errors.add("someProperty",
- new ActionError("default.testing.errors.tag2"));
+ new ActionMessage("default.testing.errors.tag2"));
request.setAttribute(Globals.ERROR_KEY, errors);
%>
<bean:define id="EXPECTED_RESULTS" toScope="page">
@@ -171,11 +171,11 @@
<logic:equal name="runTest"
value="testErrorsAlternateBundle2ErrorsLocaleProperty">
<%
//This should be done in your action. I do it here to keep the tests simple.
- ActionErrors errors = new ActionErrors();
+ ActionMessages errors = new ActionMessages();
errors.add("someProperty",
- new ActionError("alternate.testing.errors.tag"));
+ new ActionMessage("alternate.testing.errors.tag"));
errors.add("someProperty",
- new ActionError("alternate.testing.errors.tag2"));
+ new ActionMessage("alternate.testing.errors.tag2"));
request.setAttribute(Globals.ERROR_KEY, errors);
%>
<bean:define id="EXPECTED_RESULTS" toScope="page">
@@ -198,11 +198,11 @@
<logic:equal name="runTest"
value="testErrorsDefaultBundle2ErrorsLocaleProperty_fr">
<%
//This should be done in your action. I do it here to keep the tests simple.
- ActionErrors errors = new ActionErrors();
+ ActionMessages errors = new ActionMessages();
errors.add("someProperty",
- new ActionError("default.testing.errors.tag"));
+ new ActionMessage("default.testing.errors.tag"));
errors.add("someProperty",
- new ActionError("default.testing.errors.tag2"));
+ new ActionMessage("default.testing.errors.tag2"));
request.setAttribute(Globals.ERROR_KEY, errors);
%>
<bean:define id="EXPECTED_RESULTS" toScope="page">
@@ -226,11 +226,11 @@
<logic:equal name="runTest"
value="testErrorsAlternateBundle2ErrorsLocaleProperty_fr">
<%
//This should be done in your action. I do it here to keep the tests simple.
- ActionErrors errors = new ActionErrors();
+ ActionMessages errors = new ActionMessages();
errors.add("someProperty",
- new ActionError("alternate.testing.errors.tag"));
+ new ActionMessage("alternate.testing.errors.tag"));
errors.add("someProperty",
- new ActionError("alternate.testing.errors.tag2"));
+ new ActionMessage("alternate.testing.errors.tag2"));
request.setAttribute(Globals.ERROR_KEY, errors);
%>
<bean:define id="EXPECTED_RESULTS" toScope="page">
Modified:
struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestErrorsTag3.jsp
URL:
http://svn.apache.org/viewcvs/struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestErrorsTag3.jsp?rev=230593&r1=230592&r2=230593&view=diff
==============================================================================
---
struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestErrorsTag3.jsp
(original)
+++
struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestErrorsTag3.jsp
Sat Aug 6 14:30:38 2005
@@ -1,8 +1,8 @@
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<[EMAIL PROTECTED] import="junit.framework.Assert"%>
+<[EMAIL PROTECTED] import="org.apache.struts.action.ActionMessage"%>
+<[EMAIL PROTECTED] import="org.apache.struts.action.ActionMessages"%>
<[EMAIL PROTECTED] import="org.apache.struts.Globals"%>
-<[EMAIL PROTECTED] import="org.apache.struts.action.ActionError"%>
-<[EMAIL PROTECTED] import="org.apache.struts.action.ActionErrors"%>
<%@ taglib uri="http://struts.apache.org/tags-logic"; prefix="logic" %>
<%@ taglib uri="http://struts.apache.org/tags-bean"; prefix="bean" %>
@@ -22,11 +22,11 @@
<logic:equal name="runTest" value="testErrorsDefaultBundle2ErrorsName">
<%
//This should be done in your action. I do it here to keep the tests simple.
- ActionErrors errors = new ActionErrors();
- errors.add(ActionErrors.GLOBAL_ERROR,
- new ActionError("default.testing.errors.tag"));
- errors.add(ActionErrors.GLOBAL_ERROR,
- new ActionError("default.testing.errors.tag2"));
+ ActionMessages errors = new ActionMessages();
+ errors.add(ActionMessages.GLOBAL_MESSAGE,
+ new ActionMessage("default.testing.errors.tag"));
+ errors.add(ActionMessages.GLOBAL_MESSAGE,
+ new ActionMessage("default.testing.errors.tag2"));
request.setAttribute("MY_ERRORS_KEY", errors);
%>
<bean:define id="EXPECTED_RESULTS" toScope="page">
@@ -49,11 +49,11 @@
<logic:equal name="runTest" value="testErrorsAlternateBundle2ErrorsName">
<%
//This should be done in your action. I do it here to keep the tests simple.
- ActionErrors errors = new ActionErrors();
- errors.add(ActionErrors.GLOBAL_ERROR,
- new ActionError("alternate.testing.errors.tag"));
- errors.add(ActionErrors.GLOBAL_ERROR,
- new ActionError("alternate.testing.errors.tag2"));
+ ActionMessages errors = new ActionMessages();
+ errors.add(ActionMessages.GLOBAL_MESSAGE,
+ new ActionMessage("alternate.testing.errors.tag"));
+ errors.add(ActionMessages.GLOBAL_MESSAGE,
+ new ActionMessage("alternate.testing.errors.tag2"));
request.setAttribute("MY_ERRORS_KEY", errors);
%>
<bean:define id="EXPECTED_RESULTS" toScope="page">
@@ -76,11 +76,11 @@
<logic:equal name="runTest" value="testErrorsDefaultBundle2ErrorsName_fr">
<%
//This should be done in your action. I do it here to keep the tests simple.
- ActionErrors errors = new ActionErrors();
- errors.add(ActionErrors.GLOBAL_ERROR,
- new ActionError("default.testing.errors.tag"));
- errors.add(ActionErrors.GLOBAL_ERROR,
- new ActionError("default.testing.errors.tag2"));
+ ActionMessages errors = new ActionMessages();
+ errors.add(ActionMessages.GLOBAL_MESSAGE,
+ new ActionMessage("default.testing.errors.tag"));
+ errors.add(ActionMessages.GLOBAL_MESSAGE,
+ new ActionMessage("default.testing.errors.tag2"));
request.setAttribute("MY_ERRORS_KEY", errors);
%>
<bean:define id="EXPECTED_RESULTS" toScope="page">
@@ -104,11 +104,11 @@
<logic:equal name="runTest" value="testErrorsAlternateBundle2ErrorsName_fr">
<%
//This should be done in your action. I do it here to keep the tests simple.
- ActionErrors errors = new ActionErrors();
- errors.add(ActionErrors.GLOBAL_ERROR,
- new ActionError("alternate.testing.errors.tag"));
- errors.add(ActionErrors.GLOBAL_ERROR,
- new ActionError("alternate.testing.errors.tag2"));
+ ActionMessages errors = new ActionMessages();
+ errors.add(ActionMessages.GLOBAL_MESSAGE,
+ new ActionMessage("alternate.testing.errors.tag"));
+ errors.add(ActionMessages.GLOBAL_MESSAGE,
+ new ActionMessage("alternate.testing.errors.tag2"));
request.setAttribute("MY_ERRORS_KEY", errors);
%>
<bean:define id="EXPECTED_RESULTS" toScope="page">
@@ -141,11 +141,11 @@
<logic:equal name="runTest" value="testErrorsDefaultBundle2ErrorsLocaleName">
<%
//This should be done in your action. I do it here to keep the tests simple.
- ActionErrors errors = new ActionErrors();
- errors.add(ActionErrors.GLOBAL_ERROR,
- new ActionError("default.testing.errors.tag"));
- errors.add(ActionErrors.GLOBAL_ERROR,
- new ActionError("default.testing.errors.tag2"));
+ ActionMessages errors = new ActionMessages();
+ errors.add(ActionMessages.GLOBAL_MESSAGE,
+ new ActionMessage("default.testing.errors.tag"));
+ errors.add(ActionMessages.GLOBAL_MESSAGE,
+ new ActionMessage("default.testing.errors.tag2"));
request.setAttribute("MY_ERRORS_KEY", errors);
%>
<bean:define id="EXPECTED_RESULTS" toScope="page">
@@ -168,11 +168,11 @@
<logic:equal name="runTest" value="testErrorsAlternateBundle2ErrorsLocaleName">
<%
//This should be done in your action. I do it here to keep the tests simple.
- ActionErrors errors = new ActionErrors();
- errors.add(ActionErrors.GLOBAL_ERROR,
- new ActionError("alternate.testing.errors.tag"));
- errors.add(ActionErrors.GLOBAL_ERROR,
- new ActionError("alternate.testing.errors.tag2"));
+ ActionMessages errors = new ActionMessages();
+ errors.add(ActionMessages.GLOBAL_MESSAGE,
+ new ActionMessage("alternate.testing.errors.tag"));
+ errors.add(ActionMessages.GLOBAL_MESSAGE,
+ new ActionMessage("alternate.testing.errors.tag2"));
request.setAttribute("MY_ERRORS_KEY", errors);
%>
<bean:define id="EXPECTED_RESULTS" toScope="page">
@@ -195,11 +195,11 @@
<logic:equal name="runTest"
value="testErrorsDefaultBundle2ErrorsLocaleName_fr">
<%
//This should be done in your action. I do it here to keep the tests simple.
- ActionErrors errors = new ActionErrors();
- errors.add(ActionErrors.GLOBAL_ERROR,
- new ActionError("default.testing.errors.tag"));
- errors.add(ActionErrors.GLOBAL_ERROR,
- new ActionError("default.testing.errors.tag2"));
+ ActionMessages errors = new ActionMessages();
+ errors.add(ActionMessages.GLOBAL_MESSAGE,
+ new ActionMessage("default.testing.errors.tag"));
+ errors.add(ActionMessages.GLOBAL_MESSAGE,
+ new ActionMessage("default.testing.errors.tag2"));
request.setAttribute("MY_ERRORS_KEY", errors);
%>
<bean:define id="EXPECTED_RESULTS" toScope="page">
@@ -223,11 +223,11 @@
<logic:equal name="runTest"
value="testErrorsAlternateBundle2ErrorsLocaleName_fr">
<%
//This should be done in your action. I do it here to keep the tests simple.
- ActionErrors errors = new ActionErrors();
- errors.add(ActionErrors.GLOBAL_ERROR,
- new ActionError("alternate.testing.errors.tag"));
- errors.add(ActionErrors.GLOBAL_ERROR,
- new ActionError("alternate.testing.errors.tag2"));
+ ActionMessages errors = new ActionMessages();
+ errors.add(ActionMessages.GLOBAL_MESSAGE,
+ new ActionMessage("alternate.testing.errors.tag"));
+ errors.add(ActionMessages.GLOBAL_MESSAGE,
+ new ActionMessage("alternate.testing.errors.tag2"));
request.setAttribute("MY_ERRORS_KEY", errors);
%>
<bean:define id="EXPECTED_RESULTS" toScope="page">
Modified:
struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestErrorsTag4.jsp
URL:
http://svn.apache.org/viewcvs/struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestErrorsTag4.jsp?rev=230593&r1=230592&r2=230593&view=diff
==============================================================================
---
struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestErrorsTag4.jsp
(original)
+++
struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestErrorsTag4.jsp
Sat Aug 6 14:30:38 2005
@@ -1,8 +1,8 @@
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<[EMAIL PROTECTED] import="junit.framework.Assert"%>
+<[EMAIL PROTECTED] import="org.apache.struts.action.ActionMessage"%>
+<[EMAIL PROTECTED] import="org.apache.struts.action.ActionMessages"%>
<[EMAIL PROTECTED] import="org.apache.struts.Globals"%>
-<[EMAIL PROTECTED] import="org.apache.struts.action.ActionError"%>
-<[EMAIL PROTECTED] import="org.apache.struts.action.ActionErrors"%>
<%@ taglib uri="http://struts.apache.org/tags-logic"; prefix="logic" %>
<%@ taglib uri="http://struts.apache.org/tags-bean"; prefix="bean" %>
@@ -27,11 +27,11 @@
<logic:equal name="runTest" value="testErrorsDefaultBundle2ErrorsNameProperty">
<%
//This should be done in your action. I do it here to keep the tests simple.
- ActionErrors errors = new ActionErrors();
+ ActionMessages errors = new ActionMessages();
errors.add("someProperty",
- new ActionError("default.testing.errors.tag"));
+ new ActionMessage("default.testing.errors.tag"));
errors.add("someProperty",
- new ActionError("default.testing.errors.tag2"));
+ new ActionMessage("default.testing.errors.tag2"));
request.setAttribute("MY_ERRORS_KEY", errors);
%>
<bean:define id="EXPECTED_RESULTS" toScope="page">
@@ -54,11 +54,11 @@
<logic:equal name="runTest"
value="testErrorsAlternateBundle2ErrorsNameProperty">
<%
//This should be done in your action. I do it here to keep the tests simple.
- ActionErrors errors = new ActionErrors();
+ ActionMessages errors = new ActionMessages();
errors.add("someProperty",
- new ActionError("alternate.testing.errors.tag"));
+ new ActionMessage("alternate.testing.errors.tag"));
errors.add("someProperty",
- new ActionError("alternate.testing.errors.tag2"));
+ new ActionMessage("alternate.testing.errors.tag2"));
request.setAttribute("MY_ERRORS_KEY", errors);
%>
<bean:define id="EXPECTED_RESULTS" toScope="page">
@@ -81,11 +81,11 @@
<logic:equal name="runTest"
value="testErrorsDefaultBundle2ErrorsNameProperty_fr">
<%
//This should be done in your action. I do it here to keep the tests simple.
- ActionErrors errors = new ActionErrors();
+ ActionMessages errors = new ActionMessages();
errors.add("someProperty",
- new ActionError("default.testing.errors.tag"));
+ new ActionMessage("default.testing.errors.tag"));
errors.add("someProperty",
- new ActionError("default.testing.errors.tag2"));
+ new ActionMessage("default.testing.errors.tag2"));
request.setAttribute("MY_ERRORS_KEY", errors);
%>
<bean:define id="EXPECTED_RESULTS" toScope="page">
@@ -109,11 +109,11 @@
<logic:equal name="runTest"
value="testErrorsAlternateBundle2ErrorsNameProperty_fr">
<%
//This should be done in your action. I do it here to keep the tests simple.
- ActionErrors errors = new ActionErrors();
+ ActionMessages errors = new ActionMessages();
errors.add("someProperty",
- new ActionError("alternate.testing.errors.tag"));
+ new ActionMessage("alternate.testing.errors.tag"));
errors.add("someProperty",
- new ActionError("alternate.testing.errors.tag2"));
+ new ActionMessage("alternate.testing.errors.tag2"));
request.setAttribute("MY_ERRORS_KEY", errors);
%>
<bean:define id="EXPECTED_RESULTS" toScope="page">
@@ -146,11 +146,11 @@
<logic:equal name="runTest"
value="testErrorsDefaultBundle2ErrorsLocaleNameProperty">
<%
//This should be done in your action. I do it here to keep the tests simple.
- ActionErrors errors = new ActionErrors();
+ ActionMessages errors = new ActionMessages();
errors.add("someProperty",
- new ActionError("default.testing.errors.tag"));
+ new ActionMessage("default.testing.errors.tag"));
errors.add("someProperty",
- new ActionError("default.testing.errors.tag2"));
+ new ActionMessage("default.testing.errors.tag2"));
request.setAttribute("MY_ERRORS_KEY", errors);
%>
<bean:define id="EXPECTED_RESULTS" toScope="page">
@@ -173,11 +173,11 @@
<logic:equal name="runTest"
value="testErrorsAlternateBundle2ErrorsLocaleNameProperty">
<%
//This should be done in your action. I do it here to keep the tests simple.
- ActionErrors errors = new ActionErrors();
+ ActionMessages errors = new ActionMessages();
errors.add("someProperty",
- new ActionError("alternate.testing.errors.tag"));
+ new ActionMessage("alternate.testing.errors.tag"));
errors.add("someProperty",
- new ActionError("alternate.testing.errors.tag2"));
+ new ActionMessage("alternate.testing.errors.tag2"));
request.setAttribute("MY_ERRORS_KEY", errors);
%>
<bean:define id="EXPECTED_RESULTS" toScope="page">
@@ -200,11 +200,11 @@
<logic:equal name="runTest"
value="testErrorsDefaultBundle2ErrorsLocaleNameProperty_fr">
<%
//This should be done in your action. I do it here to keep the tests simple.
- ActionErrors errors = new ActionErrors();
+ ActionMessages errors = new ActionMessages();
errors.add("someProperty",
- new ActionError("default.testing.errors.tag"));
+ new ActionMessage("default.testing.errors.tag"));
errors.add("someProperty",
- new ActionError("default.testing.errors.tag2"));
+ new ActionMessage("default.testing.errors.tag2"));
request.setAttribute("MY_ERRORS_KEY", errors);
%>
<bean:define id="EXPECTED_RESULTS" toScope="page">
@@ -228,11 +228,11 @@
<logic:equal name="runTest"
value="testErrorsAlternateBundle2ErrorsLocaleNameProperty_fr">
<%
//This should be done in your action. I do it here to keep the tests simple.
- ActionErrors errors = new ActionErrors();
+ ActionMessages errors = new ActionMessages();
errors.add("someProperty",
- new ActionError("alternate.testing.errors.tag"));
+ new ActionMessage("alternate.testing.errors.tag"));
errors.add("someProperty",
- new ActionError("alternate.testing.errors.tag2"));
+ new ActionMessage("alternate.testing.errors.tag2"));
request.setAttribute("MY_ERRORS_KEY", errors);
%>
<bean:define id="EXPECTED_RESULTS" toScope="page">
@@ -248,11 +248,11 @@
<logic:equal name="runTest" value="testErrorsCustomResources">
<%
//This should be done in your action. I do it here to keep the tests simple.
- ActionErrors errors = new ActionErrors();
- errors.add(ActionErrors.GLOBAL_ERROR,
- new ActionError("default.testing.errors.tag"));
- errors.add(ActionErrors.GLOBAL_ERROR,
- new ActionError("default.testing.errors.tag2"));
+ ActionMessages errors = new ActionMessages();
+ errors.add(ActionMessages.GLOBAL_MESSAGE,
+ new ActionMessage("default.testing.errors.tag"));
+ errors.add(ActionMessages.GLOBAL_MESSAGE,
+ new ActionMessage("default.testing.errors.tag2"));
request.setAttribute(Globals.ERROR_KEY, errors);
%>
<bean:define id="EXPECTED_RESULTS" toScope="page">
@@ -266,11 +266,11 @@
<logic:equal name="runTest" value="testErrorsCustomResourcesAltBundle">
<%
//This should be done in your action. I do it here to keep the tests simple.
- ActionErrors errors = new ActionErrors();
- errors.add(ActionErrors.GLOBAL_ERROR,
- new ActionError("alternate.testing.errors.tag"));
- errors.add(ActionErrors.GLOBAL_ERROR,
- new ActionError("alternate.testing.errors.tag2"));
+ ActionMessages errors = new ActionMessages();
+ errors.add(ActionMessages.GLOBAL_MESSAGE,
+ new ActionMessage("alternate.testing.errors.tag"));
+ errors.add(ActionMessages.GLOBAL_MESSAGE,
+ new ActionMessage("alternate.testing.errors.tag2"));
request.setAttribute(Globals.ERROR_KEY, errors);
%>
<bean:define id="EXPECTED_RESULTS" toScope="page">
Modified:
struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestMessagesTag1.jsp
URL:
http://svn.apache.org/viewcvs/struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestMessagesTag1.jsp?rev=230593&r1=230592&r2=230593&view=diff
==============================================================================
---
struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestMessagesTag1.jsp
(original)
+++
struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestMessagesTag1.jsp
Sat Aug 6 14:30:38 2005
@@ -3,10 +3,8 @@
<[EMAIL PROTECTED] import="java.util.HashMap"%>
<[EMAIL PROTECTED] import="org.apache.struts.util.MessageResources"%>
<[EMAIL PROTECTED] import="org.apache.struts.Globals"%>
-<[EMAIL PROTECTED] import="org.apache.struts.action.ActionError"%>
<[EMAIL PROTECTED] import="org.apache.struts.action.ActionMessage"%>
<[EMAIL PROTECTED] import="org.apache.struts.action.ActionMessages"%>
-<[EMAIL PROTECTED] import="org.apache.struts.Globals"%>
<%@ taglib uri="http://struts.apache.org/tags-logic"; prefix="logic" %>
<%@ taglib uri="http://struts.apache.org/tags-bean"; prefix="bean" %>
@@ -18,22 +16,21 @@
*
* <html:message>
* Displays a set of messages prepared by a business logic component and
- * stored as an ActionMessages object, ActionErrors object, a String,
- * or a String array in request scope. If such a bean is not found, nothing
- * will be rendered.
+ * stored as an ActionMessages object, a String, or a String array in request
+ * scope. If such a bean is not found, nothing will be rendered.
*
* The tests are setup to test all possible scenarios with each ojbect listed.
* Using Globals.ERROR_KEY in the request
* TestMessagesTag1.jsp - uses ActionMessages to store any keys for testing
* TestMessagesTag2.jsp - uses a String to store any keys for testing
* TestMessagesTag3.jsp - uses a String Array to store any keys for testing
- * TestMessagesTag4.jsp - uses ActionErrors to store any keys for testing
+ * TestMessagesTag4.jsp - uses ActionMessages to store any keys for testing
*
* Using Globals.MESSAGE_KEY in the request
* TestMessagesTag5.jsp - uses ActionMessages to store any keys for testing
* TestMessagesTag6.jsp - uses a String to store any keys for testing
* TestMessagesTag7.jsp - uses a String Array to store any keys for testing
- * TestMessagesTag8.jsp - uses ActionErrors to store any keys for testing
+ * TestMessagesTag8.jsp - uses ActionMessages to store any keys for testing
*
**/
%>
Modified:
struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestMessagesTag2.jsp
URL:
http://svn.apache.org/viewcvs/struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestMessagesTag2.jsp?rev=230593&r1=230592&r2=230593&view=diff
==============================================================================
---
struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestMessagesTag2.jsp
(original)
+++
struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestMessagesTag2.jsp
Sat Aug 6 14:30:38 2005
@@ -3,7 +3,6 @@
<[EMAIL PROTECTED] import="java.util.HashMap"%>
<[EMAIL PROTECTED] import="org.apache.struts.util.MessageResources"%>
<[EMAIL PROTECTED] import="org.apache.struts.Globals"%>
-<[EMAIL PROTECTED] import="org.apache.struts.action.ActionError"%>
<[EMAIL PROTECTED] import="org.apache.struts.action.ActionMessage"%>
<[EMAIL PROTECTED] import="org.apache.struts.action.ActionMessages"%>
<[EMAIL PROTECTED] import="org.apache.struts.Globals"%>
@@ -18,22 +17,21 @@
*
* <html:message>
* Displays a set of messages prepared by a business logic component and
- * stored as an ActionMessages object, ActionErrors object, a String,
- * or a String array in request scope. If such a bean is not found, nothing
- * will be rendered.
+ * stored as an ActionMessages object, a String, or a String array in
request
+ * scope. If such a bean is not found, nothing will be rendered.
*
* The tests are setup to test all possible scenarios with each ojbect listed.
* Using Globals.ERROR_KEY in the request
* TestMessagesTag1.jsp - uses ActionMessages to store any keys for testing
* TestMessagesTag2.jsp - uses a String to store any keys for testing
* TestMessagesTag3.jsp - uses a String Array to store any keys for testing
- * TestMessagesTag4.jsp - uses ActionErrors to store any keys for testing
+ * TestMessagesTag4.jsp - uses ActionMessages to store any keys for testing
*
* Using Globals.MESSAGE_KEY in the request
* TestMessagesTag5.jsp - uses ActionMessages to store any keys for testing
* TestMessagesTag6.jsp - uses a String to store any keys for testing
* TestMessagesTag7.jsp - uses a String Array to store any keys for testing
- * TestMessagesTag8.jsp - uses ActionErrors to store any keys for testing
+ * TestMessagesTag8.jsp - uses ActionMessages to store any keys for testing
*
**/
%>
Modified:
struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestMessagesTag3.jsp
URL:
http://svn.apache.org/viewcvs/struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestMessagesTag3.jsp?rev=230593&r1=230592&r2=230593&view=diff
==============================================================================
---
struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestMessagesTag3.jsp
(original)
+++
struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestMessagesTag3.jsp
Sat Aug 6 14:30:38 2005
@@ -3,7 +3,6 @@
<[EMAIL PROTECTED] import="java.util.HashMap"%>
<[EMAIL PROTECTED] import="org.apache.struts.util.MessageResources"%>
<[EMAIL PROTECTED] import="org.apache.struts.Globals"%>
-<[EMAIL PROTECTED] import="org.apache.struts.action.ActionError"%>
<[EMAIL PROTECTED] import="org.apache.struts.action.ActionMessage"%>
<[EMAIL PROTECTED] import="org.apache.struts.action.ActionMessages"%>
<[EMAIL PROTECTED] import="org.apache.struts.Globals"%>
@@ -18,22 +17,21 @@
*
* <html:message>
* Displays a set of messages prepared by a business logic component and
- * stored as an ActionMessages object, ActionErrors object, a String,
- * or a String array in request scope. If such a bean is not found, nothing
- * will be rendered.
+ * stored as an ActionMessages object, a String, or a String array in
request
+ * scope. If such a bean is not found, nothing will be rendered.
*
* The tests are setup to test all possible scenarios with each ojbect listed.
* Using Globals.ERROR_KEY in the request
* TestMessagesTag1.jsp - uses ActionMessages to store any keys for testing
* TestMessagesTag2.jsp - uses a String to store any keys for testing
* TestMessagesTag3.jsp - uses a String Array to store any keys for testing
- * TestMessagesTag4.jsp - uses ActionErrors to store any keys for testing
+ * TestMessagesTag4.jsp - uses ActionMessages to store any keys for testing
*
* Using Globals.MESSAGE_KEY in the request
* TestMessagesTag5.jsp - uses ActionMessages to store any keys for testing
* TestMessagesTag6.jsp - uses a String to store any keys for testing
* TestMessagesTag7.jsp - uses a String Array to store any keys for testing
- * TestMessagesTag8.jsp - uses ActionErrors to store any keys for testing
+ * TestMessagesTag8.jsp - uses ActionMessages to store any keys for testing
*
**/
%>
Modified:
struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestMessagesTag4.jsp
URL:
http://svn.apache.org/viewcvs/struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestMessagesTag4.jsp?rev=230593&r1=230592&r2=230593&view=diff
==============================================================================
---
struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestMessagesTag4.jsp
(original)
+++
struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestMessagesTag4.jsp
Sat Aug 6 14:30:38 2005
@@ -3,7 +3,6 @@
<[EMAIL PROTECTED] import="java.util.HashMap"%>
<[EMAIL PROTECTED] import="org.apache.struts.util.MessageResources"%>
<[EMAIL PROTECTED] import="org.apache.struts.Globals"%>
-<[EMAIL PROTECTED] import="org.apache.struts.action.ActionError"%>
<[EMAIL PROTECTED] import="org.apache.struts.action.ActionMessage"%>
<[EMAIL PROTECTED] import="org.apache.struts.action.ActionMessages"%>
<[EMAIL PROTECTED] import="org.apache.struts.Globals"%>
@@ -18,22 +17,21 @@
*
* <html:message>
* Displays a set of messages prepared by a business logic component and
- * stored as an ActionMessages object, ActionErrors object, a String,
- * or a String array in request scope. If such a bean is not found, nothing
- * will be rendered.
+ * stored as an ActionMessages object, a String, or a String array in request
+ * scope. If such a bean is not found, nothing will be rendered.
*
* The tests are setup to test all possible scenarios with each ojbect listed.
* Using Globals.ERROR_KEY in the request
* TestMessagesTag1.jsp - uses ActionMessages to store any keys for testing
* TestMessagesTag2.jsp - uses a String to store any keys for testing
* TestMessagesTag3.jsp - uses a String Array to store any keys for testing
- * TestMessagesTag4.jsp - uses ActionErrors to store any keys for testing
+ * TestMessagesTag4.jsp - uses ActionMessages to store any keys for testing
*
* Using Globals.MESSAGE_KEY in the request
* TestMessagesTag5.jsp - uses ActionMessages to store any keys for testing
* TestMessagesTag6.jsp - uses a String to store any keys for testing
* TestMessagesTag7.jsp - uses a String Array to store any keys for testing
- * TestMessagesTag8.jsp - uses ActionErrors to store any keys for testing
+ * TestMessagesTag8.jsp - uses ActionMessages to store any keys for testing
*
**/
%>
Modified:
struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestMessagesTag5.jsp
URL:
http://svn.apache.org/viewcvs/struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestMessagesTag5.jsp?rev=230593&r1=230592&r2=230593&view=diff
==============================================================================
---
struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestMessagesTag5.jsp
(original)
+++
struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestMessagesTag5.jsp
Sat Aug 6 14:30:38 2005
@@ -3,7 +3,6 @@
<[EMAIL PROTECTED] import="java.util.HashMap"%>
<[EMAIL PROTECTED] import="org.apache.struts.util.MessageResources"%>
<[EMAIL PROTECTED] import="org.apache.struts.Globals"%>
-<[EMAIL PROTECTED] import="org.apache.struts.action.ActionError"%>
<[EMAIL PROTECTED] import="org.apache.struts.action.ActionMessage"%>
<[EMAIL PROTECTED] import="org.apache.struts.action.ActionMessages"%>
<[EMAIL PROTECTED] import="org.apache.struts.Globals"%>
@@ -18,22 +17,21 @@
*
* <html:message>
* Displays a set of messages prepared by a business logic component and
- * stored as an ActionMessages object, ActionErrors object, a String,
- * or a String array in request scope. If such a bean is not found, nothing
- * will be rendered.
+ * stored as an ActionMessages object, a String, or a String array in
request
+ * scope. If such a bean is not found, nothing will be rendered.
*
* The tests are setup to test all possible scenarios with each ojbect listed.
* Using Globals.ERROR_KEY in the request
* TestMessagesTag1.jsp - uses ActionMessages to store any keys for testing
* TestMessagesTag2.jsp - uses a String to store any keys for testing
* TestMessagesTag3.jsp - uses a String Array to store any keys for testing
- * TestMessagesTag4.jsp - uses ActionErrors to store any keys for testing
+ * TestMessagesTag4.jsp - uses ActionMessages to store any keys for testing
*
* Using Globals.MESSAGE_KEY in the request
* TestMessagesTag5.jsp - uses ActionMessages to store any keys for testing
* TestMessagesTag6.jsp - uses a String to store any keys for testing
* TestMessagesTag7.jsp - uses a String Array to store any keys for testing
- * TestMessagesTag8.jsp - uses ActionErrors to store any keys for testing
+ * TestMessagesTag8.jsp - uses ActionMessages to store any keys for testing
*
**/
%>
Modified:
struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestMessagesTag6.jsp
URL:
http://svn.apache.org/viewcvs/struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestMessagesTag6.jsp?rev=230593&r1=230592&r2=230593&view=diff
==============================================================================
---
struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestMessagesTag6.jsp
(original)
+++
struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestMessagesTag6.jsp
Sat Aug 6 14:30:38 2005
@@ -3,7 +3,6 @@
<[EMAIL PROTECTED] import="java.util.HashMap"%>
<[EMAIL PROTECTED] import="org.apache.struts.util.MessageResources"%>
<[EMAIL PROTECTED] import="org.apache.struts.Globals"%>
-<[EMAIL PROTECTED] import="org.apache.struts.action.ActionError"%>
<[EMAIL PROTECTED] import="org.apache.struts.action.ActionMessage"%>
<[EMAIL PROTECTED] import="org.apache.struts.action.ActionMessages"%>
<[EMAIL PROTECTED] import="org.apache.struts.Globals"%>
@@ -18,22 +17,21 @@
*
* <html:message>
* Displays a set of messages prepared by a business logic component and
- * stored as an ActionMessages object, ActionErrors object, a String,
- * or a String array in request scope. If such a bean is not found, nothing
- * will be rendered.
+ * stored as an ActionMessages object, a String, or a String array in
request
+ * scope. If such a bean is not found, nothing will be rendered.
*
* The tests are setup to test all possible scenarios with each ojbect listed.
* Using Globals.ERROR_KEY in the request
* TestMessagesTag1.jsp - uses ActionMessages to store any keys for testing
* TestMessagesTag2.jsp - uses a String to store any keys for testing
* TestMessagesTag3.jsp - uses a String Array to store any keys for testing
- * TestMessagesTag4.jsp - uses ActionErrors to store any keys for testing
+ * TestMessagesTag4.jsp - uses ActionMessages to store any keys for testing
*
* Using Globals.MESSAGE_KEY in the request
* TestMessagesTag5.jsp - uses ActionMessages to store any keys for testing
* TestMessagesTag6.jsp - uses a String to store any keys for testing
* TestMessagesTag7.jsp - uses a String Array to store any keys for testing
- * TestMessagesTag8.jsp - uses ActionErrors to store any keys for testing
+ * TestMessagesTag8.jsp - uses ActionMessages to store any keys for testing
*
**/
%>
Modified:
struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestMessagesTag7.jsp
URL:
http://svn.apache.org/viewcvs/struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestMessagesTag7.jsp?rev=230593&r1=230592&r2=230593&view=diff
==============================================================================
---
struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestMessagesTag7.jsp
(original)
+++
struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestMessagesTag7.jsp
Sat Aug 6 14:30:38 2005
@@ -3,7 +3,6 @@
<[EMAIL PROTECTED] import="java.util.HashMap"%>
<[EMAIL PROTECTED] import="org.apache.struts.util.MessageResources"%>
<[EMAIL PROTECTED] import="org.apache.struts.Globals"%>
-<[EMAIL PROTECTED] import="org.apache.struts.action.ActionError"%>
<[EMAIL PROTECTED] import="org.apache.struts.action.ActionMessage"%>
<[EMAIL PROTECTED] import="org.apache.struts.action.ActionMessages"%>
<[EMAIL PROTECTED] import="org.apache.struts.Globals"%>
@@ -18,22 +17,21 @@
*
* <html:message>
* Displays a set of messages prepared by a business logic component and
- * stored as an ActionMessages object, ActionErrors object, a String,
- * or a String array in request scope. If such a bean is not found, nothing
- * will be rendered.
+ * stored as an ActionMessages object, a String, or a String array in
request
+ * scope. If such a bean is not found, nothing will be rendered.
*
* The tests are setup to test all possible scenarios with each ojbect listed.
* Using Globals.ERROR_KEY in the request
* TestMessagesTag1.jsp - uses ActionMessages to store any keys for testing
* TestMessagesTag2.jsp - uses a String to store any keys for testing
* TestMessagesTag3.jsp - uses a String Array to store any keys for testing
- * TestMessagesTag4.jsp - uses ActionErrors to store any keys for testing
+ * TestMessagesTag4.jsp - uses ActionMessages to store any keys for testing
*
* Using Globals.MESSAGE_KEY in the request
* TestMessagesTag5.jsp - uses ActionMessages to store any keys for testing
* TestMessagesTag6.jsp - uses a String to store any keys for testing
* TestMessagesTag7.jsp - uses a String Array to store any keys for testing
- * TestMessagesTag8.jsp - uses ActionErrors to store any keys for testing
+ * TestMessagesTag8.jsp - uses ActionMessages to store any keys for testing
*
**/
%>
Modified:
struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestMessagesTag8.jsp
URL:
http://svn.apache.org/viewcvs/struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestMessagesTag8.jsp?rev=230593&r1=230592&r2=230593&view=diff
==============================================================================
---
struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestMessagesTag8.jsp
(original)
+++
struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestMessagesTag8.jsp
Sat Aug 6 14:30:38 2005
@@ -3,7 +3,6 @@
<[EMAIL PROTECTED] import="java.util.HashMap"%>
<[EMAIL PROTECTED] import="org.apache.struts.util.MessageResources"%>
<[EMAIL PROTECTED] import="org.apache.struts.Globals"%>
-<[EMAIL PROTECTED] import="org.apache.struts.action.ActionError"%>
<[EMAIL PROTECTED] import="org.apache.struts.action.ActionMessage"%>
<[EMAIL PROTECTED] import="org.apache.struts.action.ActionMessages"%>
<[EMAIL PROTECTED] import="org.apache.struts.Globals"%>
@@ -18,22 +17,21 @@
*
* <html:message>
* Displays a set of messages prepared by a business logic component and
- * stored as an ActionMessages object, ActionErrors object, a String,
- * or a String array in request scope. If such a bean is not found, nothing
- * will be rendered.
+ * stored as an ActionMessages object, a String, or a String array in
request
+ * scope. If such a bean is not found, nothing will be rendered.
*
* The tests are setup to test all possible scenarios with each ojbect listed.
* Using Globals.ERROR_KEY in the request
* TestMessagesTag1.jsp - uses ActionMessages to store any keys for testing
* TestMessagesTag2.jsp - uses a String to store any keys for testing
* TestMessagesTag3.jsp - uses a String Array to store any keys for testing
- * TestMessagesTag4.jsp - uses ActionErrors to store any keys for testing
+ * TestMessagesTag4.jsp - uses ActionMessages to store any keys for testing
*
* Using Globals.MESSAGE_KEY in the request
* TestMessagesTag5.jsp - uses ActionMessages to store any keys for testing
* TestMessagesTag6.jsp - uses a String to store any keys for testing
* TestMessagesTag7.jsp - uses a String Array to store any keys for testing
- * TestMessagesTag8.jsp - uses ActionErrors to store any keys for testing
+ * TestMessagesTag8.jsp - uses ActionMessages to store any keys for testing
*
**/
%>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
