You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beehive.apache.org by ri...@apache.org on 2005/10/05 19:56:14 UTC
svn commit: r295057 - in /beehive/trunk/netui:
src/tags-html/org/apache/beehive/netui/tags/html/ErrorBaseTag.java
test/webapps/drt/testRecorder/config/testRecorder-tests.xml
Author: rich
Date: Wed Oct 5 10:56:05 2005
New Revision: 295057
URL: http://svn.apache.org/viewcvs?rev=295057&view=rev
Log:
Fixed a Struts 1.1 BVT failure I caused with revision 290884. Also added a bunch of tests that had been left out of the Struts 1.1 BVT suite.
tests: bvt in netui, bvt.struts11 in netui/test/webapps/drt (WinXP)
BB: same (linux)
Modified:
beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/ErrorBaseTag.java
beehive/trunk/netui/test/webapps/drt/testRecorder/config/testRecorder-tests.xml
Modified: beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/ErrorBaseTag.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/ErrorBaseTag.java?rev=295057&r1=295056&r2=295057&view=diff
==============================================================================
--- beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/ErrorBaseTag.java (original)
+++ beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/ErrorBaseTag.java Wed Oct 5 10:56:05 2005
@@ -65,6 +65,25 @@
* This defaults to org.apache.struts.action.Action.LOCALE_KEY.
*/
protected String _locale = Globals.LOCALE_KEY;
+
+ /**
+ * The isResource method on ActionMessage isn't present in Struts 1.1.
+ */
+ private static boolean _isStruts11 = false;
+
+ static
+ {
+ try
+ {
+ ActionMessage.class.getMethod( "isResource", null );
+ }
+ catch ( NoSuchMethodException e )
+ {
+ _isStruts11 = true;
+ }
+ }
+
+
/**
* Set the name of the message bundle, as defined in the page flow's
@@ -118,10 +137,10 @@
if (key.length() == 0) {
return "";
}
- else if (!report.isResource()) {
+ else if (! _isStruts11 && !report.isResource()) {
//
// This covers the case where the validator has already used MessageResources
- // with an alternate resource bundle to formatted the message before
+ // with an alternate resource bundle to format the message before
// creating the ActionMessage. Just return the already formatted message.
//
message = report.getKey();
Modified: beehive/trunk/netui/test/webapps/drt/testRecorder/config/testRecorder-tests.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/testRecorder/config/testRecorder-tests.xml?rev=295057&r1=295056&r2=295057&view=diff
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/testRecorder/config/testRecorder-tests.xml (original)
+++ beehive/trunk/netui/test/webapps/drt/testRecorder/config/testRecorder-tests.xml Wed Oct 5 10:56:05 2005
@@ -1267,6 +1267,7 @@
<webapp>coreWeb</webapp>
<categories>
<category>bvt</category>
+ <category>bvt.struts11</category>
<category>radarBugs</category>
</categories>
<features>
@@ -1460,6 +1461,7 @@
<webapp>coreWeb</webapp>
<categories>
<category>bvt</category>
+ <category>bvt.struts11</category>
<category>qaTests</category>
</categories>
</test>
@@ -2045,6 +2047,7 @@
<webapp>coreWeb</webapp>
<categories>
<category>bvt</category>
+ <category>bvt.struts11</category>
<category>tags</category>
</categories>
<features>
@@ -2140,6 +2143,7 @@
<webapp>coreWeb</webapp>
<categories>
<category>bvt</category>
+ <category>bvt.struts11</category>
<category>tags</category>
</categories>
<features>
@@ -2153,6 +2157,7 @@
<webapp>coreWeb</webapp>
<categories>
<category>bvt</category>
+ <category>bvt.struts11</category>
<category>tags</category>
</categories>
<features>
@@ -2166,6 +2171,7 @@
<webapp>coreWeb</webapp>
<categories>
<category>bvt</category>
+ <category>bvt.struts11</category>
<category>tags</category>
</categories>
<features>
@@ -2178,6 +2184,7 @@
<webapp>coreWeb</webapp>
<categories>
<category>bvt</category>
+ <category>bvt.struts11</category>
<category>tags</category>
</categories>
<features>
@@ -2192,6 +2199,7 @@
<webapp>coreWeb</webapp>
<categories>
<category>bvt</category>
+ <category>bvt.struts11</category>
<category>tags</category>
</categories>
<features>
@@ -2204,6 +2212,7 @@
<webapp>coreWeb</webapp>
<categories>
<category>bvt</category>
+ <category>bvt.struts11</category>
<category>tags</category>
</categories>
<features>
@@ -2523,6 +2532,7 @@
<webapp>coreWeb</webapp>
<categories>
<category>bvt</category>
+ <category>bvt.struts11</category>
<category>tags</category>
</categories>
<features>
@@ -2536,6 +2546,7 @@
<webapp>coreWeb</webapp>
<categories>
<category>bvt</category>
+ <category>bvt.struts11</category>
<category>tags</category>
</categories>
<features>
@@ -2550,6 +2561,7 @@
<webapp>coreWeb</webapp>
<categories>
<category>bvt</category>
+ <category>bvt.struts11</category>
<category>tags</category>
</categories>
<features>
@@ -2562,6 +2574,7 @@
<webapp>coreWeb</webapp>
<categories>
<category>bvt</category>
+ <category>bvt.struts11</category>
<category>tags</category>
</categories>
<features>
@@ -2575,6 +2588,7 @@
<webapp>coreWeb</webapp>
<categories>
<category>bvt</category>
+ <category>bvt.struts11</category>
<category>tags</category>
</categories>
<features>
@@ -2588,6 +2602,7 @@
<webapp>coreWeb</webapp>
<categories>
<category>bvt</category>
+ <category>bvt.struts11</category>
<category>tags</category>
</categories>
<features>
@@ -2601,6 +2616,7 @@
<webapp>coreWeb</webapp>
<categories>
<category>bvt</category>
+ <category>bvt.struts11</category>
<category>tags</category>
</categories>
<features>
@@ -2614,6 +2630,7 @@
<webapp>coreWeb</webapp>
<categories>
<category>bvt</category>
+ <category>bvt.struts11</category>
<category>tags</category>
</categories>
<features>
@@ -2626,6 +2643,7 @@
<webapp>coreWeb</webapp>
<categories>
<category>bvt</category>
+ <category>bvt.struts11</category>
<category>tags</category>
</categories>
<features>
@@ -3389,6 +3407,7 @@
<webapp>coreWeb</webapp>
<categories>
<category>bvt</category>
+ <category>bvt.struts11</category>
<category>drt</category>
<category>datagrid</category>
<category>databinding</category>
@@ -4118,6 +4137,7 @@
<webapp>coreWeb</webapp>
<categories>
<category>bvt</category>
+ <category>bvt.struts11</category>
<category>tags</category>
</categories>
<features>
@@ -4132,6 +4152,7 @@
<webapp>coreWeb</webapp>
<categories>
<category>bvt</category>
+ <category>bvt.struts11</category>
<category>tags</category>
</categories>
<features>
@@ -4147,6 +4168,7 @@
<webapp>coreWeb</webapp>
<categories>
<category>bvt</category>
+ <category>bvt.struts11</category>
<category>tags</category>
</categories>
<features>
@@ -4161,6 +4183,7 @@
<webapp>coreWeb</webapp>
<categories>
<category>bvt</category>
+ <category>bvt.struts11</category>
<category>tags</category>
</categories>
<features>
@@ -4175,6 +4198,7 @@
<webapp>coreWeb</webapp>
<categories>
<category>bvt</category>
+ <category>bvt.struts11</category>
<category>tags</category>
</categories>
<features>
@@ -4189,6 +4213,7 @@
<webapp>coreWeb</webapp>
<categories>
<category>bvt</category>
+ <category>bvt.struts11</category>
<category>tags</category>
</categories>
<features>
@@ -4202,6 +4227,7 @@
<webapp>coreWeb</webapp>
<categories>
<category>bvt</category>
+ <category>bvt.struts11</category>
<category>tags</category>
</categories>
<features>
@@ -4215,6 +4241,7 @@
<webapp>coreWeb</webapp>
<categories>
<category>bvt</category>
+ <category>bvt.struts11</category>
<category>tags</category>
</categories>
<features>
@@ -4228,6 +4255,7 @@
<webapp>coreWeb</webapp>
<categories>
<category>bvt</category>
+ <category>bvt.struts11</category>
<category>tags</category>
</categories>
<features>
@@ -4241,6 +4269,7 @@
<webapp>coreWeb</webapp>
<categories>
<category>bvt</category>
+ <category>bvt.struts11</category>
<category>tags</category>
</categories>
<features>
@@ -4254,6 +4283,7 @@
<webapp>coreWeb</webapp>
<categories>
<category>bvt</category>
+ <category>bvt.struts11</category>
<category>tags</category>
</categories>
<features>
@@ -4267,6 +4297,7 @@
<webapp>coreWeb</webapp>
<categories>
<category>bvt</category>
+ <category>bvt.struts11</category>
<category>tags</category>
</categories>
<features>
@@ -4280,6 +4311,7 @@
<webapp>coreWeb</webapp>
<categories>
<category>bvt</category>
+ <category>bvt.struts11</category>
<category>tags</category>
</categories>
<features>
@@ -4293,6 +4325,7 @@
<webapp>coreWeb</webapp>
<categories>
<category>bvt</category>
+ <category>bvt.struts11</category>
<category>tags</category>
</categories>
<features>
@@ -4306,6 +4339,7 @@
<webapp>coreWeb</webapp>
<categories>
<category>bvt</category>
+ <category>bvt.struts11</category>
<category>tags</category>
</categories>
<features>
@@ -4319,6 +4353,7 @@
<webapp>coreWeb</webapp>
<categories>
<category>bvt</category>
+ <category>bvt.struts11</category>
<category>tags</category>
</categories>
<features>
@@ -4434,6 +4469,7 @@
<webapp>coreWeb</webapp>
<categories>
<category>bvt</category>
+ <category>bvt.struts11</category>
<category>jiraBugs</category>
</categories>
</test>
@@ -4443,6 +4479,7 @@
<webapp>coreWeb</webapp>
<categories>
<category>bvt</category>
+ <category>bvt.struts11</category>
<category>jiraBugs</category>
</categories>
</test>
@@ -4452,6 +4489,7 @@
<webapp>coreWeb</webapp>
<categories>
<category>bvt</category>
+ <category>bvt.struts11</category>
<category>jiraBugs</category>
</categories>
</test>
@@ -4461,6 +4499,7 @@
<webapp>coreWeb</webapp>
<categories>
<category>bvt</category>
+ <category>bvt.struts11</category>
<category>jiraBugs</category>
</categories>
</test>
@@ -4471,6 +4510,7 @@
<webapp>coreWeb</webapp>
<categories>
<category>bvt</category>
+ <category>bvt.struts11</category>
<category>jiraBugs</category>
</categories>
</test>
@@ -4480,6 +4520,7 @@
<webapp>coreWeb</webapp>
<categories>
<category>bvt</category>
+ <category>bvt.struts11</category>
<category>jiraBugs</category>
</categories>
</test>
@@ -4489,6 +4530,7 @@
<webapp>coreWeb</webapp>
<categories>
<category>bvt</category>
+ <category>bvt.struts11</category>
<category>jiraBugs</category>
</categories>
<features>
@@ -4502,6 +4544,7 @@
<webapp>coreWeb</webapp>
<categories>
<category>bvt</category>
+ <category>bvt.struts11</category>
<category>jiraBugs</category>
</categories>
</test>
@@ -4511,6 +4554,7 @@
<webapp>coreWeb</webapp>
<categories>
<category>bvt</category>
+ <category>bvt.struts11</category>
<category>jiraBugs</category>
</categories>
</test>
@@ -4520,6 +4564,7 @@
<webapp>coreWeb</webapp>
<categories>
<category>bvt</category>
+ <category>bvt.struts11</category>
<category>jiraBugs</category>
</categories>
</test>
@@ -4529,6 +4574,7 @@
<webapp>coreWeb</webapp>
<categories>
<category>bvt</category>
+ <category>bvt.struts11</category>
<category>jiraBugs</category>
</categories>
</test>
@@ -4538,6 +4584,7 @@
<webapp>coreWeb</webapp>
<categories>
<category>bvt</category>
+ <category>bvt.struts11</category>
<category>jiraBugs</category>
</categories>
</test>
@@ -4547,6 +4594,7 @@
<webapp>coreWeb</webapp>
<categories>
<category>bvt</category>
+ <category>bvt.struts11</category>
<category>jiraBugs</category>
</categories>
</test>
@@ -4556,6 +4604,7 @@
<webapp>coreWeb</webapp>
<categories>
<category>bvt</category>
+ <category>bvt.struts11</category>
<category>jiraBugs</category>
</categories>
</test>
@@ -4565,6 +4614,7 @@
<webapp>coreWeb</webapp>
<categories>
<category>bvt</category>
+ <category>bvt.struts11</category>
<category>jiraBugs</category>
</categories>
</test>
@@ -4574,6 +4624,7 @@
<webapp>coreWeb</webapp>
<categories>
<category>bvt</category>
+ <category>bvt.struts11</category>
<category>jiraBugs</category>
</categories>
</test>
@@ -4583,6 +4634,7 @@
<webapp>coreWeb</webapp>
<categories>
<category>bvt</category>
+ <category>bvt.struts11</category>
<category>jiraBugs</category>
</categories>
</test>
@@ -4592,6 +4644,7 @@
<webapp>coreWeb</webapp>
<categories>
<category>bvt</category>
+ <category>bvt.struts11</category>
<category>jiraBugs</category>
</categories>
</test>
@@ -4601,6 +4654,7 @@
<webapp>coreWeb</webapp>
<categories>
<category>bvt</category>
+ <category>bvt.struts11</category>
<category>jiraBugs</category>
</categories>
</test>
@@ -4610,6 +4664,7 @@
<webapp>coreWeb</webapp>
<categories>
<category>bvt</category>
+ <category>bvt.struts11</category>
<category>jiraBugs</category>
</categories>
</test>
@@ -4619,6 +4674,7 @@
<webapp>coreWeb</webapp>
<categories>
<category>bvt</category>
+ <category>bvt.struts11</category>
<category>jiraBugs</category>
</categories>
</test>
@@ -4628,6 +4684,7 @@
<webapp>coreWeb</webapp>
<categories>
<category>bvt</category>
+ <category>bvt.struts11</category>
<category>jiraBugs</category>
</categories>
</test>
@@ -4637,6 +4694,7 @@
<webapp>coreWeb</webapp>
<categories>
<category>bvt</category>
+ <category>bvt.struts11</category>
<category>jiraBugs</category>
</categories>
</test>
@@ -4646,6 +4704,7 @@
<webapp>coreWeb</webapp>
<categories>
<category>bvt</category>
+ <category>bvt.struts11</category>
<category>jiraBugs</category>
</categories>
</test>
@@ -4655,6 +4714,7 @@
<webapp>coreWeb</webapp>
<categories>
<category>bvt</category>
+ <category>bvt.struts11</category>
<category>jiraBugs</category>
</categories>
</test>
@@ -4664,6 +4724,7 @@
<webapp>coreWeb</webapp>
<categories>
<category>bvt</category>
+ <category>bvt.struts11</category>
<category>jiraBugs</category>
</categories>
</test>
@@ -4673,6 +4734,7 @@
<webapp>coreWeb</webapp>
<categories>
<category>bvt</category>
+ <category>bvt.struts11</category>
<category>jiraBugs</category>
</categories>
</test>
@@ -4682,6 +4744,7 @@
<webapp>coreWeb</webapp>
<categories>
<category>bvt</category>
+ <category>bvt.struts11</category>
<category>jiraBugs</category>
</categories>
</test>
@@ -4691,6 +4754,7 @@
<webapp>coreWeb</webapp>
<categories>
<category>bvt</category>
+ <category>bvt.struts11</category>
<category>jiraBugs</category>
</categories>
</test>
@@ -4711,6 +4775,7 @@
<webapp>coreWeb</webapp>
<categories>
<category>bvt</category>
+ <category>bvt.struts11</category>
<category>jiraBugs</category>
</categories>
</test>
@@ -4720,6 +4785,7 @@
<webapp>coreWeb</webapp>
<categories>
<category>bvt</category>
+ <category>bvt.struts11</category>
<category>jiraBugs</category>
</categories>
<features>
@@ -4732,6 +4798,7 @@
<webapp>coreWeb</webapp>
<categories>
<category>bvt</category>
+ <category>bvt.struts11</category>
<category>jiraBugs</category>
</categories>
</test>
@@ -4741,6 +4808,7 @@
<webapp>coreWeb</webapp>
<categories>
<category>bvt</category>
+ <category>bvt.struts11</category>
<category>jiraBugs</category>
</categories>
<features>
@@ -4917,6 +4985,7 @@
<webapp>coreWeb</webapp>
<categories>
<category>bvt</category>
+ <category>bvt.struts11</category>
<category>corePageFlow</category>
</categories>
<features>
@@ -5030,6 +5099,7 @@
<webapp>coreWeb</webapp>
<categories>
<category>bvt</category>
+ <category>bvt.struts11</category>
<category>corePageFlow</category>
</categories>
<features>
@@ -5487,6 +5557,7 @@
<webapp>coreWeb</webapp>
<categories>
<category>bvt</category>
+ <category>bvt.struts11</category>
<category>corePageFlow</category>
</categories>
<features>
@@ -5559,6 +5630,7 @@
<webapp>coreWeb</webapp>
<categories>
<category>bvt</category>
+ <category>bvt.struts11</category>
<category>qaTests</category>
</categories>
</test>
@@ -5746,6 +5818,7 @@
<webapp>coreWeb</webapp>
<categories>
<category>bvt</category>
+ <category>bvt.struts11</category>
<category>tags</category>
</categories>
<features>
@@ -6080,8 +6153,8 @@
<webapp>coreWeb</webapp>
<categories>
<category>bvt</category>
- <category>databinding</category>
<category>bvt.struts11</category>
+ <category>databinding</category>
<category>errorTests</category>
</categories>
<features>
@@ -7422,6 +7495,7 @@
<webapp>coreWeb</webapp>
<categories>
<category>bvt</category>
+ <category>bvt.struts11</category>
<category>corePageFlow</category>
</categories>
<features>
@@ -8117,6 +8191,7 @@
<webapp>coreWeb</webapp>
<categories>
<category>bvt</category>
+ <category>bvt.struts11</category>
<category>corePageFlow</category>
</categories>
<features>
@@ -8130,6 +8205,7 @@
<webapp>coreWeb</webapp>
<categories>
<category>bvt</category>
+ <category>bvt.struts11</category>
<category>corePageFlow</category>
</categories>
<features>