You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@struts.apache.org by jm...@apache.org on 2003/09/30 03:14:48 UTC
cvs commit: jakarta-struts/web/test/test/org/apache/struts/taglib/html TestMessagesTag1.jsp TestMessagesTag2.jsp TestMessagesTag3.jsp TestMessagesTag4.jsp TestMessagesTag5.jsp TestMessagesTag6.jsp TestMessagesTag7.jsp TestMessagesTag8.jsp
jmitchell 2003/09/29 18:14:48
Modified: web/test/test/org/apache/struts/taglib/html
TestMessagesTag1.jsp TestMessagesTag2.jsp
TestMessagesTag3.jsp TestMessagesTag4.jsp
TestMessagesTag5.jsp TestMessagesTag6.jsp
TestMessagesTag7.jsp TestMessagesTag8.jsp
Log:
Update taglib tests so that they pass.
Revision Changes Path
1.2 +11 -11 jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestMessagesTag1.jsp
Index: TestMessagesTag1.jsp
===================================================================
RCS file: /home/cvs/jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestMessagesTag1.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestMessagesTag1.jsp 3 Apr 2003 04:24:50 -0000 1.1
+++ TestMessagesTag1.jsp 30 Sep 2003 01:14:48 -0000 1.2
@@ -2,7 +2,7 @@
<%@page import="junit.framework.Assert"%>
<%@page import="java.util.HashMap"%>
<%@page import="org.apache.struts.util.MessageResources"%>
-<%@page import="org.apache.struts.action.Action"%>
+<%@page import="org.apache.struts.Globals"%>
<%@page import="org.apache.struts.action.ActionError"%>
<%@page import="org.apache.struts.action.ActionMessage"%>
<%@page import="org.apache.struts.action.ActionMessages"%>
@@ -23,13 +23,13 @@
* will be rendered.
*
* The tests are setup to test all possible scenarios with each ojbect listed.
- * Using Action.ERROR_KEY in the request
+ * 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
*
- * Using Action.MESSAGE_KEY in the request
+ * 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
@@ -58,7 +58,7 @@
</bean:define>
<%
ActionMessages messages = new ActionMessages();
- request.setAttribute(Action.ERROR_KEY, messages);
+ request.setAttribute(Globals.ERROR_KEY, messages);
%>
<bean:define id="TEST_RESULTS" toScope="page">
Messages:
@@ -82,7 +82,7 @@
ActionMessages messages = new ActionMessages();
messages.add("myproperty1", new ActionMessage("default.bundle.message"));
messages.add("myproperty2", new ActionMessage("default.bundle.message"));
- request.setAttribute(Action.ERROR_KEY, messages);
+ request.setAttribute(Globals.ERROR_KEY, messages);
%>
<bean:define id="TEST_RESULTS" toScope="page">
Messages:
@@ -106,7 +106,7 @@
ActionMessages messages = new ActionMessages();
messages.add("myproperty1", new ActionMessage("default.bundle.message"));
messages.add("myproperty2", new ActionMessage("default.bundle.message"));
- request.setAttribute(Action.ERROR_KEY, messages);
+ request.setAttribute(Globals.ERROR_KEY, messages);
%>
<bean:define id="TEST_RESULTS" toScope="page">
Messages:
@@ -131,7 +131,7 @@
ActionMessages messages = new ActionMessages();
messages.add("myproperty1", new ActionMessage("default.bundle.message"));
messages.add("myproperty2", new ActionMessage("default.bundle.message"));
- request.setAttribute(Action.ERROR_KEY, messages);
+ request.setAttribute(Globals.ERROR_KEY, messages);
%>
<bean:define id="TEST_RESULTS" toScope="page">
Messages:
@@ -332,7 +332,7 @@
<%
ActionMessages messages = new ActionMessages();
- request.setAttribute(Action.ERROR_KEY, messages);
+ request.setAttribute(Globals.ERROR_KEY, messages);
%>
<bean:define id="TEST_RESULTS" toScope="page">
Messages:
@@ -356,7 +356,7 @@
ActionMessages messages = new ActionMessages();
messages.add("myproperty1", new ActionMessage("alternate.bundle.message"));
messages.add("myproperty2", new ActionMessage("alternate.bundle.message"));
- request.setAttribute(Action.ERROR_KEY, messages);
+ request.setAttribute(Globals.ERROR_KEY, messages);
%>
<bean:define id="TEST_RESULTS" toScope="page">
Messages:
@@ -380,7 +380,7 @@
ActionMessages messages = new ActionMessages();
messages.add("myproperty1", new ActionMessage("alternate.bundle.message"));
messages.add("myproperty2", new ActionMessage("alternate.bundle.message"));
- request.setAttribute(Action.ERROR_KEY, messages);
+ request.setAttribute(Globals.ERROR_KEY, messages);
%>
<bean:define id="TEST_RESULTS" toScope="page">
Messages:
@@ -405,7 +405,7 @@
ActionMessages messages = new ActionMessages();
messages.add("myproperty1", new ActionMessage("alternate.bundle.message"));
messages.add("myproperty2", new ActionMessage("alternate.bundle.message"));
- request.setAttribute(Action.ERROR_KEY, messages);
+ request.setAttribute(Globals.ERROR_KEY, messages);
%>
<bean:define id="TEST_RESULTS" toScope="page">
Messages:
1.2 +9 -9 jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestMessagesTag2.jsp
Index: TestMessagesTag2.jsp
===================================================================
RCS file: /home/cvs/jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestMessagesTag2.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestMessagesTag2.jsp 3 Apr 2003 04:24:50 -0000 1.1
+++ TestMessagesTag2.jsp 30 Sep 2003 01:14:48 -0000 1.2
@@ -2,7 +2,7 @@
<%@page import="junit.framework.Assert"%>
<%@page import="java.util.HashMap"%>
<%@page import="org.apache.struts.util.MessageResources"%>
-<%@page import="org.apache.struts.action.Action"%>
+<%@page import="org.apache.struts.Globals"%>
<%@page import="org.apache.struts.action.ActionError"%>
<%@page import="org.apache.struts.action.ActionMessage"%>
<%@page import="org.apache.struts.action.ActionMessages"%>
@@ -23,13 +23,13 @@
* will be rendered.
*
* The tests are setup to test all possible scenarios with each ojbect listed.
- * Using Action.ERROR_KEY in the request
+ * 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
*
- * Using Action.MESSAGE_KEY in the request
+ * 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
@@ -73,7 +73,7 @@
</bean:define>
<%
- request.setAttribute(Action.ERROR_KEY, "default.bundle.message");
+ request.setAttribute(Globals.ERROR_KEY, "default.bundle.message");
%>
<bean:define id="TEST_RESULTS" toScope="page">
Messages:
@@ -92,7 +92,7 @@
</bean:define>
<%
- request.setAttribute(Action.ERROR_KEY, "default.bundle.message");
+ request.setAttribute(Globals.ERROR_KEY, "default.bundle.message");
%>
<bean:define id="TEST_RESULTS" toScope="page">
Messages:
@@ -112,7 +112,7 @@
</bean:define>
<%
- request.setAttribute(Action.ERROR_KEY, "default.bundle.message");
+ request.setAttribute(Globals.ERROR_KEY, "default.bundle.message");
%>
<bean:define id="TEST_RESULTS" toScope="page">
Messages:
@@ -291,7 +291,7 @@
</bean:define>
<%
- request.setAttribute(Action.ERROR_KEY, "alternate.bundle.message");
+ request.setAttribute(Globals.ERROR_KEY, "alternate.bundle.message");
%>
<bean:define id="TEST_RESULTS" toScope="page">
Messages:
@@ -310,7 +310,7 @@
</bean:define>
<%
- request.setAttribute(Action.ERROR_KEY, "alternate.bundle.message");
+ request.setAttribute(Globals.ERROR_KEY, "alternate.bundle.message");
%>
<bean:define id="TEST_RESULTS" toScope="page">
Messages:
@@ -330,7 +330,7 @@
</bean:define>
<%
- request.setAttribute(Action.ERROR_KEY, "alternate.bundle.message");
+ request.setAttribute(Globals.ERROR_KEY, "alternate.bundle.message");
%>
<bean:define id="TEST_RESULTS" toScope="page">
Messages:
1.2 +9 -9 jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestMessagesTag3.jsp
Index: TestMessagesTag3.jsp
===================================================================
RCS file: /home/cvs/jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestMessagesTag3.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestMessagesTag3.jsp 3 Apr 2003 04:24:50 -0000 1.1
+++ TestMessagesTag3.jsp 30 Sep 2003 01:14:48 -0000 1.2
@@ -2,7 +2,7 @@
<%@page import="junit.framework.Assert"%>
<%@page import="java.util.HashMap"%>
<%@page import="org.apache.struts.util.MessageResources"%>
-<%@page import="org.apache.struts.action.Action"%>
+<%@page import="org.apache.struts.Globals"%>
<%@page import="org.apache.struts.action.ActionError"%>
<%@page import="org.apache.struts.action.ActionMessage"%>
<%@page import="org.apache.struts.action.ActionMessages"%>
@@ -23,13 +23,13 @@
* will be rendered.
*
* The tests are setup to test all possible scenarios with each ojbect listed.
- * Using Action.ERROR_KEY in the request
+ * 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
*
- * Using Action.MESSAGE_KEY in the request
+ * 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
@@ -79,7 +79,7 @@
String[] messages = new String[2];
messages[0] = "default.bundle.message";
messages[1] = "default.bundle.message";
- request.setAttribute(Action.ERROR_KEY, messages);
+ request.setAttribute(Globals.ERROR_KEY, messages);
%>
<bean:define id="TEST_RESULTS" toScope="page">
Messages:
@@ -103,7 +103,7 @@
String[] messages = new String[2];
messages[0] = "default.bundle.message";
messages[1] = "default.bundle.message";
- request.setAttribute(Action.ERROR_KEY, messages);
+ request.setAttribute(Globals.ERROR_KEY, messages);
%>
<bean:define id="TEST_RESULTS" toScope="page">
Messages:
@@ -128,7 +128,7 @@
String[] messages = new String[2];
messages[0] = "default.bundle.message";
messages[1] = "default.bundle.message";
- request.setAttribute(Action.ERROR_KEY, messages);
+ request.setAttribute(Globals.ERROR_KEY, messages);
%>
<bean:define id="TEST_RESULTS" toScope="page">
Messages:
@@ -334,7 +334,7 @@
String[] messages = new String[2];
messages[0] = "alternate.bundle.message";
messages[1] = "alternate.bundle.message";
- request.setAttribute(Action.ERROR_KEY, messages);
+ request.setAttribute(Globals.ERROR_KEY, messages);
%>
<bean:define id="TEST_RESULTS" toScope="page">
Messages:
@@ -358,7 +358,7 @@
String[] messages = new String[2];
messages[0] = "alternate.bundle.message";
messages[1] = "alternate.bundle.message";
- request.setAttribute(Action.ERROR_KEY, messages);
+ request.setAttribute(Globals.ERROR_KEY, messages);
%>
<bean:define id="TEST_RESULTS" toScope="page">
Messages:
@@ -383,7 +383,7 @@
String[] messages = new String[2];
messages[0] = "alternate.bundle.message";
messages[1] = "alternate.bundle.message";
- request.setAttribute(Action.ERROR_KEY, messages);
+ request.setAttribute(Globals.ERROR_KEY, messages);
%>
<bean:define id="TEST_RESULTS" toScope="page">
Messages:
1.2 +11 -11 jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestMessagesTag4.jsp
Index: TestMessagesTag4.jsp
===================================================================
RCS file: /home/cvs/jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestMessagesTag4.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestMessagesTag4.jsp 3 Apr 2003 04:24:50 -0000 1.1
+++ TestMessagesTag4.jsp 30 Sep 2003 01:14:48 -0000 1.2
@@ -2,7 +2,7 @@
<%@page import="junit.framework.Assert"%>
<%@page import="java.util.HashMap"%>
<%@page import="org.apache.struts.util.MessageResources"%>
-<%@page import="org.apache.struts.action.Action"%>
+<%@page import="org.apache.struts.Globals"%>
<%@page import="org.apache.struts.action.ActionError"%>
<%@page import="org.apache.struts.action.ActionMessage"%>
<%@page import="org.apache.struts.action.ActionMessages"%>
@@ -23,13 +23,13 @@
* will be rendered.
*
* The tests are setup to test all possible scenarios with each ojbect listed.
- * Using Action.ERROR_KEY in the request
+ * 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
*
- * Using Action.MESSAGE_KEY in the request
+ * 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
@@ -58,7 +58,7 @@
</bean:define>
<%
ActionMessages messages = new ActionMessages();
- request.setAttribute(Action.ERROR_KEY, messages);
+ request.setAttribute(Globals.ERROR_KEY, messages);
%>
<bean:define id="TEST_RESULTS" toScope="page">
Messages:
@@ -82,7 +82,7 @@
ActionMessages messages = new ActionMessages();
messages.add("myproperty1", new ActionMessage("default.bundle.message"));
messages.add("myproperty2", new ActionMessage("default.bundle.message"));
- request.setAttribute(Action.ERROR_KEY, messages);
+ request.setAttribute(Globals.ERROR_KEY, messages);
%>
<bean:define id="TEST_RESULTS" toScope="page">
Messages:
@@ -106,7 +106,7 @@
ActionMessages messages = new ActionMessages();
messages.add("myproperty1", new ActionMessage("default.bundle.message"));
messages.add("myproperty2", new ActionMessage("default.bundle.message"));
- request.setAttribute(Action.ERROR_KEY, messages);
+ request.setAttribute(Globals.ERROR_KEY, messages);
%>
<bean:define id="TEST_RESULTS" toScope="page">
Messages:
@@ -131,7 +131,7 @@
ActionMessages messages = new ActionMessages();
messages.add("myproperty1", new ActionMessage("default.bundle.message"));
messages.add("myproperty2", new ActionMessage("default.bundle.message"));
- request.setAttribute(Action.ERROR_KEY, messages);
+ request.setAttribute(Globals.ERROR_KEY, messages);
%>
<bean:define id="TEST_RESULTS" toScope="page">
Messages:
@@ -332,7 +332,7 @@
<%
ActionMessages messages = new ActionMessages();
- request.setAttribute(Action.ERROR_KEY, messages);
+ request.setAttribute(Globals.ERROR_KEY, messages);
%>
<bean:define id="TEST_RESULTS" toScope="page">
Messages:
@@ -356,7 +356,7 @@
ActionMessages messages = new ActionMessages();
messages.add("myproperty1", new ActionMessage("alternate.bundle.message"));
messages.add("myproperty2", new ActionMessage("alternate.bundle.message"));
- request.setAttribute(Action.ERROR_KEY, messages);
+ request.setAttribute(Globals.ERROR_KEY, messages);
%>
<bean:define id="TEST_RESULTS" toScope="page">
Messages:
@@ -380,7 +380,7 @@
ActionMessages messages = new ActionMessages();
messages.add("myproperty1", new ActionMessage("alternate.bundle.message"));
messages.add("myproperty2", new ActionMessage("alternate.bundle.message"));
- request.setAttribute(Action.ERROR_KEY, messages);
+ request.setAttribute(Globals.ERROR_KEY, messages);
%>
<bean:define id="TEST_RESULTS" toScope="page">
Messages:
@@ -405,7 +405,7 @@
ActionMessages messages = new ActionMessages();
messages.add("myproperty1", new ActionMessage("alternate.bundle.message"));
messages.add("myproperty2", new ActionMessage("alternate.bundle.message"));
- request.setAttribute(Action.ERROR_KEY, messages);
+ request.setAttribute(Globals.ERROR_KEY, messages);
%>
<bean:define id="TEST_RESULTS" toScope="page">
Messages:
1.2 +11 -11 jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestMessagesTag5.jsp
Index: TestMessagesTag5.jsp
===================================================================
RCS file: /home/cvs/jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestMessagesTag5.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestMessagesTag5.jsp 3 Apr 2003 04:24:50 -0000 1.1
+++ TestMessagesTag5.jsp 30 Sep 2003 01:14:48 -0000 1.2
@@ -2,7 +2,7 @@
<%@page import="junit.framework.Assert"%>
<%@page import="java.util.HashMap"%>
<%@page import="org.apache.struts.util.MessageResources"%>
-<%@page import="org.apache.struts.action.Action"%>
+<%@page import="org.apache.struts.Globals"%>
<%@page import="org.apache.struts.action.ActionError"%>
<%@page import="org.apache.struts.action.ActionMessage"%>
<%@page import="org.apache.struts.action.ActionMessages"%>
@@ -23,13 +23,13 @@
* will be rendered.
*
* The tests are setup to test all possible scenarios with each ojbect listed.
- * Using Action.ERROR_KEY in the request
+ * 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
*
- * Using Action.MESSAGE_KEY in the request
+ * 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
@@ -58,7 +58,7 @@
</bean:define>
<%
ActionMessages messages = new ActionMessages();
- request.setAttribute(Action.MESSAGE_KEY, messages);
+ request.setAttribute(Globals.MESSAGE_KEY, messages);
%>
<bean:define id="TEST_RESULTS" toScope="page">
Messages:
@@ -82,7 +82,7 @@
ActionMessages messages = new ActionMessages();
messages.add("myproperty1", new ActionMessage("default.bundle.message"));
messages.add("myproperty2", new ActionMessage("default.bundle.message"));
- request.setAttribute(Action.MESSAGE_KEY, messages);
+ request.setAttribute(Globals.MESSAGE_KEY, messages);
%>
<bean:define id="TEST_RESULTS" toScope="page">
Messages:
@@ -106,7 +106,7 @@
ActionMessages messages = new ActionMessages();
messages.add("myproperty1", new ActionMessage("default.bundle.message"));
messages.add("myproperty2", new ActionMessage("default.bundle.message"));
- request.setAttribute(Action.MESSAGE_KEY, messages);
+ request.setAttribute(Globals.MESSAGE_KEY, messages);
%>
<bean:define id="TEST_RESULTS" toScope="page">
Messages:
@@ -131,7 +131,7 @@
ActionMessages messages = new ActionMessages();
messages.add("myproperty1", new ActionMessage("default.bundle.message"));
messages.add("myproperty2", new ActionMessage("default.bundle.message"));
- request.setAttribute(Action.MESSAGE_KEY, messages);
+ request.setAttribute(Globals.MESSAGE_KEY, messages);
%>
<bean:define id="TEST_RESULTS" toScope="page">
Messages:
@@ -313,7 +313,7 @@
<%
ActionMessages messages = new ActionMessages();
- request.setAttribute(Action.MESSAGE_KEY, messages);
+ request.setAttribute(Globals.MESSAGE_KEY, messages);
%>
<bean:define id="TEST_RESULTS" toScope="page">
Messages:
@@ -337,7 +337,7 @@
ActionMessages messages = new ActionMessages();
messages.add("myproperty1", new ActionMessage("alternate.bundle.message"));
messages.add("myproperty2", new ActionMessage("alternate.bundle.message"));
- request.setAttribute(Action.MESSAGE_KEY, messages);
+ request.setAttribute(Globals.MESSAGE_KEY, messages);
%>
<bean:define id="TEST_RESULTS" toScope="page">
Messages:
@@ -361,7 +361,7 @@
ActionMessages messages = new ActionMessages();
messages.add("myproperty1", new ActionMessage("alternate.bundle.message"));
messages.add("myproperty2", new ActionMessage("alternate.bundle.message"));
- request.setAttribute(Action.MESSAGE_KEY, messages);
+ request.setAttribute(Globals.MESSAGE_KEY, messages);
%>
<bean:define id="TEST_RESULTS" toScope="page">
Messages:
@@ -386,7 +386,7 @@
ActionMessages messages = new ActionMessages();
messages.add("myproperty1", new ActionMessage("alternate.bundle.message"));
messages.add("myproperty2", new ActionMessage("alternate.bundle.message"));
- request.setAttribute(Action.MESSAGE_KEY, messages);
+ request.setAttribute(Globals.MESSAGE_KEY, messages);
%>
<bean:define id="TEST_RESULTS" toScope="page">
Messages:
1.2 +9 -9 jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestMessagesTag6.jsp
Index: TestMessagesTag6.jsp
===================================================================
RCS file: /home/cvs/jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestMessagesTag6.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestMessagesTag6.jsp 3 Apr 2003 04:24:50 -0000 1.1
+++ TestMessagesTag6.jsp 30 Sep 2003 01:14:48 -0000 1.2
@@ -2,7 +2,7 @@
<%@page import="junit.framework.Assert"%>
<%@page import="java.util.HashMap"%>
<%@page import="org.apache.struts.util.MessageResources"%>
-<%@page import="org.apache.struts.action.Action"%>
+<%@page import="org.apache.struts.Globals"%>
<%@page import="org.apache.struts.action.ActionError"%>
<%@page import="org.apache.struts.action.ActionMessage"%>
<%@page import="org.apache.struts.action.ActionMessages"%>
@@ -23,13 +23,13 @@
* will be rendered.
*
* The tests are setup to test all possible scenarios with each ojbect listed.
- * Using Action.ERROR_KEY in the request
+ * 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
*
- * Using Action.MESSAGE_KEY in the request
+ * 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
@@ -73,7 +73,7 @@
</bean:define>
<%
- request.setAttribute(Action.MESSAGE_KEY, "default.bundle.message");
+ request.setAttribute(Globals.MESSAGE_KEY, "default.bundle.message");
%>
<bean:define id="TEST_RESULTS" toScope="page">
Messages:
@@ -92,7 +92,7 @@
</bean:define>
<%
- request.setAttribute(Action.MESSAGE_KEY, "default.bundle.message");
+ request.setAttribute(Globals.MESSAGE_KEY, "default.bundle.message");
%>
<bean:define id="TEST_RESULTS" toScope="page">
Messages:
@@ -112,7 +112,7 @@
</bean:define>
<%
- request.setAttribute(Action.MESSAGE_KEY, "default.bundle.message");
+ request.setAttribute(Globals.MESSAGE_KEY, "default.bundle.message");
%>
<bean:define id="TEST_RESULTS" toScope="page">
Messages:
@@ -284,7 +284,7 @@
</bean:define>
<%
- request.setAttribute(Action.MESSAGE_KEY, "alternate.bundle.message");
+ request.setAttribute(Globals.MESSAGE_KEY, "alternate.bundle.message");
%>
<bean:define id="TEST_RESULTS" toScope="page">
Messages:
@@ -303,7 +303,7 @@
</bean:define>
<%
- request.setAttribute(Action.MESSAGE_KEY, "alternate.bundle.message");
+ request.setAttribute(Globals.MESSAGE_KEY, "alternate.bundle.message");
%>
<bean:define id="TEST_RESULTS" toScope="page">
Messages:
@@ -323,7 +323,7 @@
</bean:define>
<%
- request.setAttribute(Action.MESSAGE_KEY, "alternate.bundle.message");
+ request.setAttribute(Globals.MESSAGE_KEY, "alternate.bundle.message");
%>
<bean:define id="TEST_RESULTS" toScope="page">
Messages:
1.2 +9 -9 jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestMessagesTag7.jsp
Index: TestMessagesTag7.jsp
===================================================================
RCS file: /home/cvs/jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestMessagesTag7.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestMessagesTag7.jsp 3 Apr 2003 04:24:50 -0000 1.1
+++ TestMessagesTag7.jsp 30 Sep 2003 01:14:48 -0000 1.2
@@ -2,7 +2,7 @@
<%@page import="junit.framework.Assert"%>
<%@page import="java.util.HashMap"%>
<%@page import="org.apache.struts.util.MessageResources"%>
-<%@page import="org.apache.struts.action.Action"%>
+<%@page import="org.apache.struts.Globals"%>
<%@page import="org.apache.struts.action.ActionError"%>
<%@page import="org.apache.struts.action.ActionMessage"%>
<%@page import="org.apache.struts.action.ActionMessages"%>
@@ -23,13 +23,13 @@
* will be rendered.
*
* The tests are setup to test all possible scenarios with each ojbect listed.
- * Using Action.ERROR_KEY in the request
+ * 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
*
- * Using Action.MESSAGE_KEY in the request
+ * 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
@@ -79,7 +79,7 @@
String[] messages = new String[2];
messages[0] = "default.bundle.message";
messages[1] = "default.bundle.message";
- request.setAttribute(Action.MESSAGE_KEY, messages);
+ request.setAttribute(Globals.MESSAGE_KEY, messages);
%>
<bean:define id="TEST_RESULTS" toScope="page">
Messages:
@@ -103,7 +103,7 @@
String[] messages = new String[2];
messages[0] = "default.bundle.message";
messages[1] = "default.bundle.message";
- request.setAttribute(Action.MESSAGE_KEY, messages);
+ request.setAttribute(Globals.MESSAGE_KEY, messages);
%>
<bean:define id="TEST_RESULTS" toScope="page">
Messages:
@@ -128,7 +128,7 @@
String[] messages = new String[2];
messages[0] = "default.bundle.message";
messages[1] = "default.bundle.message";
- request.setAttribute(Action.MESSAGE_KEY, messages);
+ request.setAttribute(Globals.MESSAGE_KEY, messages);
%>
<bean:define id="TEST_RESULTS" toScope="page">
Messages:
@@ -321,7 +321,7 @@
String[] messages = new String[2];
messages[0] = "alternate.bundle.message";
messages[1] = "alternate.bundle.message";
- request.setAttribute(Action.MESSAGE_KEY, messages);
+ request.setAttribute(Globals.MESSAGE_KEY, messages);
%>
<bean:define id="TEST_RESULTS" toScope="page">
Messages:
@@ -345,7 +345,7 @@
String[] messages = new String[2];
messages[0] = "alternate.bundle.message";
messages[1] = "alternate.bundle.message";
- request.setAttribute(Action.MESSAGE_KEY, messages);
+ request.setAttribute(Globals.MESSAGE_KEY, messages);
%>
<bean:define id="TEST_RESULTS" toScope="page">
Messages:
@@ -370,7 +370,7 @@
String[] messages = new String[2];
messages[0] = "alternate.bundle.message";
messages[1] = "alternate.bundle.message";
- request.setAttribute(Action.MESSAGE_KEY, messages);
+ request.setAttribute(Globals.MESSAGE_KEY, messages);
%>
<bean:define id="TEST_RESULTS" toScope="page">
Messages:
1.2 +11 -11 jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestMessagesTag8.jsp
Index: TestMessagesTag8.jsp
===================================================================
RCS file: /home/cvs/jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestMessagesTag8.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestMessagesTag8.jsp 3 Apr 2003 04:24:50 -0000 1.1
+++ TestMessagesTag8.jsp 30 Sep 2003 01:14:48 -0000 1.2
@@ -2,7 +2,7 @@
<%@page import="junit.framework.Assert"%>
<%@page import="java.util.HashMap"%>
<%@page import="org.apache.struts.util.MessageResources"%>
-<%@page import="org.apache.struts.action.Action"%>
+<%@page import="org.apache.struts.Globals"%>
<%@page import="org.apache.struts.action.ActionError"%>
<%@page import="org.apache.struts.action.ActionMessage"%>
<%@page import="org.apache.struts.action.ActionMessages"%>
@@ -23,13 +23,13 @@
* will be rendered.
*
* The tests are setup to test all possible scenarios with each ojbect listed.
- * Using Action.ERROR_KEY in the request
+ * 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
*
- * Using Action.MESSAGE_KEY in the request
+ * 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
@@ -58,7 +58,7 @@
</bean:define>
<%
ActionMessages messages = new ActionMessages();
- request.setAttribute(Action.MESSAGE_KEY, messages);
+ request.setAttribute(Globals.MESSAGE_KEY, messages);
%>
<bean:define id="TEST_RESULTS" toScope="page">
Messages:
@@ -82,7 +82,7 @@
ActionMessages messages = new ActionMessages();
messages.add("myproperty1", new ActionMessage("default.bundle.message"));
messages.add("myproperty2", new ActionMessage("default.bundle.message"));
- request.setAttribute(Action.MESSAGE_KEY, messages);
+ request.setAttribute(Globals.MESSAGE_KEY, messages);
%>
<bean:define id="TEST_RESULTS" toScope="page">
Messages:
@@ -106,7 +106,7 @@
ActionMessages messages = new ActionMessages();
messages.add("myproperty1", new ActionMessage("default.bundle.message"));
messages.add("myproperty2", new ActionMessage("default.bundle.message"));
- request.setAttribute(Action.MESSAGE_KEY, messages);
+ request.setAttribute(Globals.MESSAGE_KEY, messages);
%>
<bean:define id="TEST_RESULTS" toScope="page">
Messages:
@@ -131,7 +131,7 @@
ActionMessages messages = new ActionMessages();
messages.add("myproperty1", new ActionMessage("default.bundle.message"));
messages.add("myproperty2", new ActionMessage("default.bundle.message"));
- request.setAttribute(Action.MESSAGE_KEY, messages);
+ request.setAttribute(Globals.MESSAGE_KEY, messages);
%>
<bean:define id="TEST_RESULTS" toScope="page">
Messages:
@@ -313,7 +313,7 @@
<%
ActionMessages messages = new ActionMessages();
- request.setAttribute(Action.MESSAGE_KEY, messages);
+ request.setAttribute(Globals.MESSAGE_KEY, messages);
%>
<bean:define id="TEST_RESULTS" toScope="page">
Messages:
@@ -337,7 +337,7 @@
ActionMessages messages = new ActionMessages();
messages.add("myproperty1", new ActionMessage("alternate.bundle.message"));
messages.add("myproperty2", new ActionMessage("alternate.bundle.message"));
- request.setAttribute(Action.MESSAGE_KEY, messages);
+ request.setAttribute(Globals.MESSAGE_KEY, messages);
%>
<bean:define id="TEST_RESULTS" toScope="page">
Messages:
@@ -361,7 +361,7 @@
ActionMessages messages = new ActionMessages();
messages.add("myproperty1", new ActionMessage("alternate.bundle.message"));
messages.add("myproperty2", new ActionMessage("alternate.bundle.message"));
- request.setAttribute(Action.MESSAGE_KEY, messages);
+ request.setAttribute(Globals.MESSAGE_KEY, messages);
%>
<bean:define id="TEST_RESULTS" toScope="page">
Messages:
@@ -386,7 +386,7 @@
ActionMessages messages = new ActionMessages();
messages.add("myproperty1", new ActionMessage("alternate.bundle.message"));
messages.add("myproperty2", new ActionMessage("alternate.bundle.message"));
- request.setAttribute(Action.MESSAGE_KEY, messages);
+ request.setAttribute(Globals.MESSAGE_KEY, messages);
%>
<bean:define id="TEST_RESULTS" toScope="page">
Messages:
---------------------------------------------------------------------
To unsubscribe, e-mail: struts-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: struts-dev-help@jakarta.apache.org