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/06/15 23:26:31 UTC
svn commit: r190814 - in /incubator/beehive/trunk/netui: external/struts/
src/webapp-template/default/WEB-INF/
Author: rich
Date: Wed Jun 15 14:26:30 2005
New Revision: 190814
URL: http://svn.apache.org/viewcvs?rev=190814&view=rev
Log:
Fix for http://issues.apache.org/jira/browse/BEEHIVE-307 : Struts validator support for the msg and args' bundle attribute is not working
This is simply an upgrade from Struts 1.2.4->1.2.7.
tests: bvt in netui (WinXP)
BB: self (linux)
Removed:
incubator/beehive/trunk/netui/external/struts/jdbc2_0-stdext.jar
Modified:
incubator/beehive/trunk/netui/external/struts/antlr.jar
incubator/beehive/trunk/netui/external/struts/commons-beanutils.jar
incubator/beehive/trunk/netui/external/struts/commons-digester.jar
incubator/beehive/trunk/netui/external/struts/commons-validator.jar
incubator/beehive/trunk/netui/external/struts/jakarta-oro.jar
incubator/beehive/trunk/netui/external/struts/struts-config_1_0.dtd
incubator/beehive/trunk/netui/external/struts/struts-config_1_1.dtd
incubator/beehive/trunk/netui/external/struts/struts-config_1_2.dtd
incubator/beehive/trunk/netui/external/struts/struts-html.tld
incubator/beehive/trunk/netui/external/struts/struts-nested.tld
incubator/beehive/trunk/netui/external/struts/struts.jar
incubator/beehive/trunk/netui/external/struts/tiles-config_1_1.dtd
incubator/beehive/trunk/netui/external/struts/validator-rules.xml
incubator/beehive/trunk/netui/external/struts/version.txt
incubator/beehive/trunk/netui/src/webapp-template/default/WEB-INF/validator-rules.xml
Modified: incubator/beehive/trunk/netui/external/struts/antlr.jar
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/external/struts/antlr.jar?rev=190814&r1=190813&r2=190814&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/beehive/trunk/netui/external/struts/commons-beanutils.jar
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/external/struts/commons-beanutils.jar?rev=190814&r1=190813&r2=190814&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/beehive/trunk/netui/external/struts/commons-digester.jar
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/external/struts/commons-digester.jar?rev=190814&r1=190813&r2=190814&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/beehive/trunk/netui/external/struts/commons-validator.jar
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/external/struts/commons-validator.jar?rev=190814&r1=190813&r2=190814&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/beehive/trunk/netui/external/struts/jakarta-oro.jar
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/external/struts/jakarta-oro.jar?rev=190814&r1=190813&r2=190814&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/beehive/trunk/netui/external/struts/struts-config_1_0.dtd
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/external/struts/struts-config_1_0.dtd?rev=190814&r1=190813&r2=190814&view=diff
==============================================================================
--- incubator/beehive/trunk/netui/external/struts/struts-config_1_0.dtd (original)
+++ incubator/beehive/trunk/netui/external/struts/struts-config_1_0.dtd Wed Jun 15 14:26:30 2005
@@ -11,7 +11,7 @@
"-//Apache Software Foundation//DTD Struts Configuration 1.0//EN"
"http://jakarta.apache.org/struts/dtds/struts-config_1_0.dtd">
- $Id: struts-config_1_0.dtd,v 1.5 2001/06/02 18:20:47 craigmcc Exp $
+ $Id: struts-config_1_0.dtd 48392 2001-06-02 18:20:48Z craigmcc $
-->
Modified: incubator/beehive/trunk/netui/external/struts/struts-config_1_1.dtd
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/external/struts/struts-config_1_1.dtd?rev=190814&r1=190813&r2=190814&view=diff
==============================================================================
--- incubator/beehive/trunk/netui/external/struts/struts-config_1_1.dtd (original)
+++ incubator/beehive/trunk/netui/external/struts/struts-config_1_1.dtd Wed Jun 15 14:26:30 2005
@@ -8,7 +8,7 @@
"-//Apache Software Foundation//DTD Struts Configuration 1.1//EN"
"http://jakarta.apache.org/struts/dtds/struts-config_1_1.dtd">
- $Id: struts-config_1_1.dtd,v 1.42 2004/02/17 05:51:47 martinc Exp $
+ $Id: struts-config_1_1.dtd 51429 2004-02-17 05:51:48Z martinc $
-->
Modified: incubator/beehive/trunk/netui/external/struts/struts-config_1_2.dtd
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/external/struts/struts-config_1_2.dtd?rev=190814&r1=190813&r2=190814&view=diff
==============================================================================
--- incubator/beehive/trunk/netui/external/struts/struts-config_1_2.dtd (original)
+++ incubator/beehive/trunk/netui/external/struts/struts-config_1_2.dtd Wed Jun 15 14:26:30 2005
@@ -8,7 +8,7 @@
"-//Apache Software Foundation//DTD Struts Configuration 1.2//EN"
"http://struts.apache.org/dtds/struts-config_1_2.dtd">
- $Id: struts-config_1_2.dtd,v 1.8 2004/04/06 23:30:23 husted Exp $
+ $Id: struts-config_1_2.dtd 55025 2004-10-18 17:40:29Z craigmcc $
-->
@@ -415,7 +415,7 @@
scope The context ("request" or "session") that is used to
access our ActionForm bean, if any. Optional if "name" is
- specified, else not valid.
+ specified, else not valid. [session]
suffix Suffix used to match request parameter names to ActionForm
bean property names, if any. Optional if "name" is
Modified: incubator/beehive/trunk/netui/external/struts/struts-html.tld
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/external/struts/struts-html.tld?rev=190814&r1=190813&r2=190814&view=diff
==============================================================================
--- incubator/beehive/trunk/netui/external/struts/struts-html.tld (original)
+++ incubator/beehive/trunk/netui/external/struts/struts-html.tld Wed Jun 15 14:26:30 2005
@@ -46,6 +46,11 @@
<rtexprvalue>true</rtexprvalue>
</attribute>
<attribute>
+<name>bundle</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
<name>disabled</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
@@ -180,6 +185,11 @@
<rtexprvalue>true</rtexprvalue>
</attribute>
<attribute>
+<name>bundle</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
<name>disabled</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
@@ -309,11 +319,36 @@
<rtexprvalue>true</rtexprvalue>
</attribute>
<attribute>
+<name>bundle</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
<name>disabled</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
</attribute>
<attribute>
+<name>errorKey</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
+<name>errorStyle</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
+<name>errorStyleClass</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
+<name>errorStyleId</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
<name>indexed</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
@@ -439,6 +474,16 @@
<rtexprvalue>true</rtexprvalue>
</attribute>
<attribute>
+<name>footer</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
+<name>header</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
<name>locale</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
@@ -449,10 +494,20 @@
<rtexprvalue>true</rtexprvalue>
</attribute>
<attribute>
+<name>prefix</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
<name>property</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
</attribute>
+<attribute>
+<name>suffix</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
</tag>
<tag>
<name>file</name>
@@ -478,11 +533,36 @@
<rtexprvalue>true</rtexprvalue>
</attribute>
<attribute>
+<name>bundle</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
<name>disabled</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
</attribute>
<attribute>
+<name>errorKey</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
+<name>errorStyle</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
+<name>errorStyleClass</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
+<name>errorStyleId</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
<name>indexed</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
@@ -623,6 +703,11 @@
<rtexprvalue>true</rtexprvalue>
</attribute>
<attribute>
+<name>disabled</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
<name>enctype</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
@@ -653,6 +738,11 @@
<rtexprvalue>true</rtexprvalue>
</attribute>
<attribute>
+<name>readonly</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
<name>scriptLanguage</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
@@ -682,6 +772,11 @@
<name>frame</name>
<tagclass>org.apache.struts.taglib.html.FrameTag</tagclass>
<attribute>
+<name>bundle</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
<name>action</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
@@ -832,6 +927,11 @@
<rtexprvalue>true</rtexprvalue>
</attribute>
<attribute>
+<name>bundle</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
<name>disabled</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
@@ -1420,6 +1520,11 @@
<required>false</required>
<rtexprvalue>true</rtexprvalue>
</attribute>
+<attribute>
+<name>bundle</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
</tag>
<tag>
<name>link</name>
@@ -1465,6 +1570,11 @@
<rtexprvalue>true</rtexprvalue>
</attribute>
<attribute>
+<name>bundle</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
<name>linkName</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
@@ -1680,11 +1790,36 @@
<rtexprvalue>true</rtexprvalue>
</attribute>
<attribute>
+<name>bundle</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
<name>disabled</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
</attribute>
<attribute>
+<name>errorKey</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
+<name>errorStyle</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
+<name>errorStyleClass</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
+<name>errorStyleId</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
<name>name</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
@@ -1943,11 +2078,36 @@
<rtexprvalue>true</rtexprvalue>
</attribute>
<attribute>
+<name>bundle</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
<name>disabled</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
</attribute>
<attribute>
+<name>errorKey</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
+<name>errorStyle</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
+<name>errorStyleClass</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
+<name>errorStyleId</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
<name>indexed</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
@@ -2102,11 +2262,36 @@
<rtexprvalue>true</rtexprvalue>
</attribute>
<attribute>
+<name>bundle</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
<name>disabled</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
</attribute>
<attribute>
+<name>errorKey</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
+<name>errorStyle</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
+<name>errorStyleClass</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
+<name>errorStyleId</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
<name>indexed</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
@@ -2246,6 +2431,11 @@
<rtexprvalue>true</rtexprvalue>
</attribute>
<attribute>
+<name>bundle</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
<name>disabled</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
@@ -2451,11 +2641,36 @@
<rtexprvalue>true</rtexprvalue>
</attribute>
<attribute>
+<name>bundle</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
<name>disabled</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
</attribute>
<attribute>
+<name>errorKey</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
+<name>errorStyle</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
+<name>errorStyleClass</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
+<name>errorStyleId</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
<name>indexed</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
@@ -2600,6 +2815,11 @@
<rtexprvalue>true</rtexprvalue>
</attribute>
<attribute>
+<name>bundle</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
<name>disabled</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
@@ -2734,11 +2954,36 @@
<rtexprvalue>true</rtexprvalue>
</attribute>
<attribute>
+<name>bundle</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
<name>disabled</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
</attribute>
<attribute>
+<name>errorKey</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
+<name>errorStyle</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
+<name>errorStyleClass</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
+<name>errorStyleId</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
<name>indexed</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
@@ -2888,12 +3133,37 @@
<rtexprvalue>true</rtexprvalue>
</attribute>
<attribute>
+<name>bundle</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
<name>cols</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
</attribute>
<attribute>
<name>disabled</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
+<name>errorKey</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
+<name>errorStyle</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
+<name>errorStyleClass</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
+<name>errorStyleId</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
</attribute>
Modified: incubator/beehive/trunk/netui/external/struts/struts-nested.tld
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/external/struts/struts-nested.tld?rev=190814&r1=190813&r2=190814&view=diff
==============================================================================
--- incubator/beehive/trunk/netui/external/struts/struts-nested.tld (original)
+++ incubator/beehive/trunk/netui/external/struts/struts-nested.tld Wed Jun 15 14:26:30 2005
@@ -253,11 +253,36 @@
<rtexprvalue>true</rtexprvalue>
</attribute>
<attribute>
+<name>bundle</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
<name>disabled</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
</attribute>
<attribute>
+<name>errorKey</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
+<name>errorStyle</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
+<name>errorStyleClass</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
+<name>errorStyleId</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
<name>indexed</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
@@ -383,6 +408,16 @@
<rtexprvalue>true</rtexprvalue>
</attribute>
<attribute>
+<name>footer</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
+<name>header</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
<name>locale</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
@@ -393,10 +428,20 @@
<rtexprvalue>true</rtexprvalue>
</attribute>
<attribute>
+<name>prefix</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
<name>property</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
</attribute>
+<attribute>
+<name>suffix</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
</tag>
<tag>
<name>file</name>
@@ -422,11 +467,36 @@
<rtexprvalue>true</rtexprvalue>
</attribute>
<attribute>
+<name>bundle</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
<name>disabled</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
</attribute>
<attribute>
+<name>errorKey</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
+<name>errorStyle</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
+<name>errorStyleClass</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
+<name>errorStyleId</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
<name>indexed</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
@@ -562,6 +632,16 @@
<rtexprvalue>true</rtexprvalue>
</attribute>
<attribute>
+<name>acceptCharset</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
+<name>disabled</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
<name>enctype</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
@@ -572,6 +652,11 @@
<rtexprvalue>true</rtexprvalue>
</attribute>
<attribute>
+<name>focusIndex</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
<name>method</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
@@ -587,6 +672,16 @@
<rtexprvalue>true</rtexprvalue>
</attribute>
<attribute>
+<name>readonly</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
+<name>scriptLanguage</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
<name>style</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
@@ -935,6 +1030,16 @@
<rtexprvalue>true</rtexprvalue>
</attribute>
<attribute>
+<name>action</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
+<name>module</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
<name>paramName</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
@@ -995,6 +1100,11 @@
<rtexprvalue>true</rtexprvalue>
</attribute>
<attribute>
+<name>useLocalEncoding</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
<name>usemap</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
@@ -1024,6 +1134,11 @@
<rtexprvalue>true</rtexprvalue>
</attribute>
<attribute>
+<name>module</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
<name>anchor</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
@@ -1049,6 +1164,11 @@
<rtexprvalue>true</rtexprvalue>
</attribute>
<attribute>
+<name>bundle</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
<name>linkName</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
@@ -1193,6 +1313,11 @@
<required>false</required>
<rtexprvalue>true</rtexprvalue>
</attribute>
+<attribute>
+<name>useLocalEncoding</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
</tag>
<tag>
<name>messages</name>
@@ -1259,11 +1384,36 @@
<rtexprvalue>true</rtexprvalue>
</attribute>
<attribute>
+<name>bundle</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
<name>disabled</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
</attribute>
<attribute>
+<name>errorKey</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
+<name>errorStyle</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
+<name>errorStyleClass</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
+<name>errorStyleId</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
<name>name</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
@@ -1478,11 +1628,36 @@
<rtexprvalue>true</rtexprvalue>
</attribute>
<attribute>
+<name>bundle</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
<name>disabled</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
</attribute>
<attribute>
+<name>errorKey</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
+<name>errorStyle</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
+<name>errorStyleClass</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
+<name>errorStyleId</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
<name>indexed</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
@@ -1637,11 +1812,36 @@
<rtexprvalue>true</rtexprvalue>
</attribute>
<attribute>
+<name>bundle</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
<name>disabled</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
</attribute>
<attribute>
+<name>errorKey</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
+<name>errorStyle</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
+<name>errorStyleClass</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
+<name>errorStyleId</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
<name>indexed</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
@@ -1736,6 +1936,11 @@
<required>true</required>
<rtexprvalue>true</rtexprvalue>
</attribute>
+<attribute>
+<name>idName</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
</tag>
<tag>
<name>select</name>
@@ -1757,11 +1962,36 @@
<rtexprvalue>true</rtexprvalue>
</attribute>
<attribute>
+<name>bundle</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
<name>disabled</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
</attribute>
<attribute>
+<name>errorKey</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
+<name>errorStyle</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
+<name>errorStyleClass</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
+<name>errorStyleId</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
<name>indexed</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
@@ -1906,6 +2136,11 @@
<rtexprvalue>true</rtexprvalue>
</attribute>
<attribute>
+<name>bundle</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
<name>disabled</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
@@ -2040,11 +2275,36 @@
<rtexprvalue>true</rtexprvalue>
</attribute>
<attribute>
+<name>bundle</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
<name>disabled</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
</attribute>
<attribute>
+<name>errorKey</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
+<name>errorStyle</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
+<name>errorStyleClass</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
+<name>errorStyleId</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
<name>indexed</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
@@ -2194,12 +2454,37 @@
<rtexprvalue>true</rtexprvalue>
</attribute>
<attribute>
+<name>bundle</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
<name>cols</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
</attribute>
<attribute>
<name>disabled</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
+<name>errorKey</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
+<name>errorStyle</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
+<name>errorStyleClass</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+</attribute>
+<attribute>
+<name>errorStyleId</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
</attribute>
Modified: incubator/beehive/trunk/netui/external/struts/struts.jar
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/external/struts/struts.jar?rev=190814&r1=190813&r2=190814&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/beehive/trunk/netui/external/struts/tiles-config_1_1.dtd
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/external/struts/tiles-config_1_1.dtd?rev=190814&r1=190813&r2=190814&view=diff
==============================================================================
--- incubator/beehive/trunk/netui/external/struts/tiles-config_1_1.dtd (original)
+++ incubator/beehive/trunk/netui/external/struts/tiles-config_1_1.dtd Wed Jun 15 14:26:30 2005
@@ -8,7 +8,7 @@
"-//Apache Software Foundation//DTD Tiles Configuration 1.1//EN"
"http://struts.apache.org/dtds/tiles-config_1_1.dtd">
- $Id: tiles-config_1_1.dtd,v 1.8 2004/09/01 10:41:11 niallp Exp $
+ $Id: tiles-config_1_1.dtd 51703 2004-09-01 10:41:11Z niallp $
-->
Modified: incubator/beehive/trunk/netui/external/struts/validator-rules.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/external/struts/validator-rules.xml?rev=190814&r1=190813&r2=190814&view=diff
==============================================================================
--- incubator/beehive/trunk/netui/external/struts/validator-rules.xml (original)
+++ incubator/beehive/trunk/netui/external/struts/validator-rules.xml Wed Jun 15 14:26:30 2005
@@ -2,9 +2,7 @@
"-//Apache Software Foundation//DTD Commons Validator Rules Configuration 1.1.3//EN"
"http://jakarta.apache.org/commons/dtds/validator_1_1_3.dtd">
<!--
- $Header: /home/cvs/jakarta-struts/conf/share/validator-rules.xml,v 1.52 2004/07/25 12:00:20 niallp Exp $
- $Revision: 1.52 $
- $Date: 2004/07/25 12:00:20 $
+ $Id: validator-rules.xml 159291 2005-03-28 20:19:29Z niallp $
This file contains the default Struts Validator pluggable validator
definitions. It should be placed somewhere under /WEB-INF and
@@ -58,6 +56,7 @@
org.apache.commons.validator.ValidatorAction,
org.apache.commons.validator.Field,
org.apache.struts.action.ActionMessages,
+ org.apache.commons.validator.Validator,
javax.servlet.http.HttpServletRequest"
msg="errors.required"/>
@@ -91,6 +90,7 @@
org.apache.commons.validator.ValidatorAction,
org.apache.commons.validator.Field,
org.apache.struts.action.ActionMessages,
+ org.apache.commons.validator.Validator,
javax.servlet.http.HttpServletRequest"
depends=""
msg="errors.minlength"
@@ -104,6 +104,7 @@
org.apache.commons.validator.ValidatorAction,
org.apache.commons.validator.Field,
org.apache.struts.action.ActionMessages,
+ org.apache.commons.validator.Validator,
javax.servlet.http.HttpServletRequest"
depends=""
msg="errors.maxlength"
@@ -118,6 +119,7 @@
org.apache.commons.validator.ValidatorAction,
org.apache.commons.validator.Field,
org.apache.struts.action.ActionMessages,
+ org.apache.commons.validator.Validator,
javax.servlet.http.HttpServletRequest"
depends=""
msg="errors.invalid"/>
@@ -130,6 +132,7 @@
org.apache.commons.validator.ValidatorAction,
org.apache.commons.validator.Field,
org.apache.struts.action.ActionMessages,
+ org.apache.commons.validator.Validator,
javax.servlet.http.HttpServletRequest"
depends=""
msg="errors.byte"
@@ -143,6 +146,7 @@
org.apache.commons.validator.ValidatorAction,
org.apache.commons.validator.Field,
org.apache.struts.action.ActionMessages,
+ org.apache.commons.validator.Validator,
javax.servlet.http.HttpServletRequest"
depends=""
msg="errors.short"
@@ -156,6 +160,7 @@
org.apache.commons.validator.ValidatorAction,
org.apache.commons.validator.Field,
org.apache.struts.action.ActionMessages,
+ org.apache.commons.validator.Validator,
javax.servlet.http.HttpServletRequest"
depends=""
msg="errors.integer"
@@ -170,6 +175,7 @@
org.apache.commons.validator.ValidatorAction,
org.apache.commons.validator.Field,
org.apache.struts.action.ActionMessages,
+ org.apache.commons.validator.Validator,
javax.servlet.http.HttpServletRequest"
depends=""
msg="errors.long"/>
@@ -182,6 +188,7 @@
org.apache.commons.validator.ValidatorAction,
org.apache.commons.validator.Field,
org.apache.struts.action.ActionMessages,
+ org.apache.commons.validator.Validator,
javax.servlet.http.HttpServletRequest"
depends=""
msg="errors.float"
@@ -194,6 +201,7 @@
org.apache.commons.validator.ValidatorAction,
org.apache.commons.validator.Field,
org.apache.struts.action.ActionMessages,
+ org.apache.commons.validator.Validator,
javax.servlet.http.HttpServletRequest"
depends=""
msg="errors.double"/>
@@ -206,6 +214,7 @@
org.apache.commons.validator.ValidatorAction,
org.apache.commons.validator.Field,
org.apache.struts.action.ActionMessages,
+ org.apache.commons.validator.Validator,
javax.servlet.http.HttpServletRequest"
depends=""
msg="errors.date"
@@ -219,6 +228,7 @@
org.apache.commons.validator.ValidatorAction,
org.apache.commons.validator.Field,
org.apache.struts.action.ActionMessages,
+ org.apache.commons.validator.Validator,
javax.servlet.http.HttpServletRequest"
depends="integer"
msg="errors.range"/>
@@ -231,10 +241,23 @@
org.apache.commons.validator.ValidatorAction,
org.apache.commons.validator.Field,
org.apache.struts.action.ActionMessages,
+ org.apache.commons.validator.Validator,
javax.servlet.http.HttpServletRequest"
depends="float"
msg="errors.range"/>
+ <validator name="doubleRange"
+ classname="org.apache.struts.validator.FieldChecks"
+ method="validateDoubleRange"
+ methodParams="java.lang.Object,
+ org.apache.commons.validator.ValidatorAction,
+ org.apache.commons.validator.Field,
+ org.apache.struts.action.ActionMessages,
+ org.apache.commons.validator.Validator,
+ javax.servlet.http.HttpServletRequest"
+ depends="double"
+ msg="errors.range"/>
+
<validator name="creditCard"
classname="org.apache.struts.validator.FieldChecks"
@@ -243,6 +266,7 @@
org.apache.commons.validator.ValidatorAction,
org.apache.commons.validator.Field,
org.apache.struts.action.ActionMessages,
+ org.apache.commons.validator.Validator,
javax.servlet.http.HttpServletRequest"
depends=""
msg="errors.creditcard"/>
@@ -255,6 +279,7 @@
org.apache.commons.validator.ValidatorAction,
org.apache.commons.validator.Field,
org.apache.struts.action.ActionMessages,
+ org.apache.commons.validator.Validator,
javax.servlet.http.HttpServletRequest"
depends=""
msg="errors.email"/>
@@ -266,6 +291,7 @@
org.apache.commons.validator.ValidatorAction,
org.apache.commons.validator.Field,
org.apache.struts.action.ActionMessages,
+ org.apache.commons.validator.Validator,
javax.servlet.http.HttpServletRequest"
depends=""
msg="errors.url"/>
Modified: incubator/beehive/trunk/netui/external/struts/version.txt
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/external/struts/version.txt?rev=190814&r1=190813&r2=190814&view=diff
==============================================================================
--- incubator/beehive/trunk/netui/external/struts/version.txt (original)
+++ incubator/beehive/trunk/netui/external/struts/version.txt Wed Jun 15 14:26:30 2005
@@ -1,3 +1,3 @@
-Struts 1.2.4
+Struts 1.2.7
-Downloaded: 2004-10-29
+Downloaded: 2005-06-14
Modified: incubator/beehive/trunk/netui/src/webapp-template/default/WEB-INF/validator-rules.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/webapp-template/default/WEB-INF/validator-rules.xml?rev=190814&r1=190813&r2=190814&view=diff
==============================================================================
--- incubator/beehive/trunk/netui/src/webapp-template/default/WEB-INF/validator-rules.xml (original)
+++ incubator/beehive/trunk/netui/src/webapp-template/default/WEB-INF/validator-rules.xml Wed Jun 15 14:26:30 2005
@@ -2,9 +2,7 @@
"-//Apache Software Foundation//DTD Commons Validator Rules Configuration 1.1.3//EN"
"http://jakarta.apache.org/commons/dtds/validator_1_1_3.dtd">
<!--
- $Header: /home/cvs/jakarta-struts/conf/share/validator-rules.xml,v 1.52 2004/07/25 12:00:20 niallp Exp $
- $Revision: 1.52 $
- $Date: 2004/07/25 12:00:20 $
+ $Id: validator-rules.xml 159291 2005-03-28 20:19:29Z niallp $
This file contains the default Struts Validator pluggable validator
definitions. It should be placed somewhere under /WEB-INF and
@@ -58,6 +56,7 @@
org.apache.commons.validator.ValidatorAction,
org.apache.commons.validator.Field,
org.apache.struts.action.ActionMessages,
+ org.apache.commons.validator.Validator,
javax.servlet.http.HttpServletRequest"
msg="errors.required"/>
@@ -91,6 +90,7 @@
org.apache.commons.validator.ValidatorAction,
org.apache.commons.validator.Field,
org.apache.struts.action.ActionMessages,
+ org.apache.commons.validator.Validator,
javax.servlet.http.HttpServletRequest"
depends=""
msg="errors.minlength"
@@ -104,6 +104,7 @@
org.apache.commons.validator.ValidatorAction,
org.apache.commons.validator.Field,
org.apache.struts.action.ActionMessages,
+ org.apache.commons.validator.Validator,
javax.servlet.http.HttpServletRequest"
depends=""
msg="errors.maxlength"
@@ -118,6 +119,7 @@
org.apache.commons.validator.ValidatorAction,
org.apache.commons.validator.Field,
org.apache.struts.action.ActionMessages,
+ org.apache.commons.validator.Validator,
javax.servlet.http.HttpServletRequest"
depends=""
msg="errors.invalid"/>
@@ -130,6 +132,7 @@
org.apache.commons.validator.ValidatorAction,
org.apache.commons.validator.Field,
org.apache.struts.action.ActionMessages,
+ org.apache.commons.validator.Validator,
javax.servlet.http.HttpServletRequest"
depends=""
msg="errors.byte"
@@ -143,6 +146,7 @@
org.apache.commons.validator.ValidatorAction,
org.apache.commons.validator.Field,
org.apache.struts.action.ActionMessages,
+ org.apache.commons.validator.Validator,
javax.servlet.http.HttpServletRequest"
depends=""
msg="errors.short"
@@ -156,6 +160,7 @@
org.apache.commons.validator.ValidatorAction,
org.apache.commons.validator.Field,
org.apache.struts.action.ActionMessages,
+ org.apache.commons.validator.Validator,
javax.servlet.http.HttpServletRequest"
depends=""
msg="errors.integer"
@@ -170,6 +175,7 @@
org.apache.commons.validator.ValidatorAction,
org.apache.commons.validator.Field,
org.apache.struts.action.ActionMessages,
+ org.apache.commons.validator.Validator,
javax.servlet.http.HttpServletRequest"
depends=""
msg="errors.long"/>
@@ -182,6 +188,7 @@
org.apache.commons.validator.ValidatorAction,
org.apache.commons.validator.Field,
org.apache.struts.action.ActionMessages,
+ org.apache.commons.validator.Validator,
javax.servlet.http.HttpServletRequest"
depends=""
msg="errors.float"
@@ -194,6 +201,7 @@
org.apache.commons.validator.ValidatorAction,
org.apache.commons.validator.Field,
org.apache.struts.action.ActionMessages,
+ org.apache.commons.validator.Validator,
javax.servlet.http.HttpServletRequest"
depends=""
msg="errors.double"/>
@@ -206,6 +214,7 @@
org.apache.commons.validator.ValidatorAction,
org.apache.commons.validator.Field,
org.apache.struts.action.ActionMessages,
+ org.apache.commons.validator.Validator,
javax.servlet.http.HttpServletRequest"
depends=""
msg="errors.date"
@@ -219,6 +228,7 @@
org.apache.commons.validator.ValidatorAction,
org.apache.commons.validator.Field,
org.apache.struts.action.ActionMessages,
+ org.apache.commons.validator.Validator,
javax.servlet.http.HttpServletRequest"
depends="integer"
msg="errors.range"/>
@@ -231,10 +241,23 @@
org.apache.commons.validator.ValidatorAction,
org.apache.commons.validator.Field,
org.apache.struts.action.ActionMessages,
+ org.apache.commons.validator.Validator,
javax.servlet.http.HttpServletRequest"
depends="float"
msg="errors.range"/>
+ <validator name="doubleRange"
+ classname="org.apache.struts.validator.FieldChecks"
+ method="validateDoubleRange"
+ methodParams="java.lang.Object,
+ org.apache.commons.validator.ValidatorAction,
+ org.apache.commons.validator.Field,
+ org.apache.struts.action.ActionMessages,
+ org.apache.commons.validator.Validator,
+ javax.servlet.http.HttpServletRequest"
+ depends="double"
+ msg="errors.range"/>
+
<validator name="creditCard"
classname="org.apache.struts.validator.FieldChecks"
@@ -243,6 +266,7 @@
org.apache.commons.validator.ValidatorAction,
org.apache.commons.validator.Field,
org.apache.struts.action.ActionMessages,
+ org.apache.commons.validator.Validator,
javax.servlet.http.HttpServletRequest"
depends=""
msg="errors.creditcard"/>
@@ -255,6 +279,7 @@
org.apache.commons.validator.ValidatorAction,
org.apache.commons.validator.Field,
org.apache.struts.action.ActionMessages,
+ org.apache.commons.validator.Validator,
javax.servlet.http.HttpServletRequest"
depends=""
msg="errors.email"/>
@@ -266,6 +291,7 @@
org.apache.commons.validator.ValidatorAction,
org.apache.commons.validator.Field,
org.apache.struts.action.ActionMessages,
+ org.apache.commons.validator.Validator,
javax.servlet.http.HttpServletRequest"
depends=""
msg="errors.url"/>