Author: dolander
Date: Fri Apr 8 15:20:22 2005
New Revision: 160629
URL: http://svn.apache.org/viewcvs?view=rev&rev=160629
Log:
Jira 510 -- Cleanup the error message generated when the Form.method attribute
is invalid
Also added a url-config section to the netui.config xsd, it currently contains:
url-encode-params -> should we url encode the parameter values
html-amp-entity -> Should we use character entities for '&' in html
Modified:
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Form.java
incubator/beehive/trunk/netui/src/util/schema/netui-config/netui-config.xsd
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/CtFormNullBinding.xml
Modified:
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Form.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Form.java?view=diff&r1=160628&r2=160629
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Form.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Form.java
Fri Apr 8 15:20:22 2005
@@ -394,7 +394,7 @@
_state.method = method;
return;
}
- String s = Bundle.getString("Tags_ButtonTypeError", new
Object[]{method});
+ String s = Bundle.getString("Tags_FormMethodError", new
Object[]{method});
registerTagError(s, null);
}
Modified:
incubator/beehive/trunk/netui/src/util/schema/netui-config/netui-config.xsd
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/util/schema/netui-config/netui-config.xsd?view=diff&r1=160628&r2=160629
==============================================================================
--- incubator/beehive/trunk/netui/src/util/schema/netui-config/netui-config.xsd
(original)
+++ incubator/beehive/trunk/netui/src/util/schema/netui-config/netui-config.xsd
Fri Apr 8 15:20:22 2005
@@ -16,6 +16,7 @@
<xsd:element name="pageflow-config"
type="netui:pageflow-config" minOccurs="0" maxOccurs="1"/>
<xsd:element name="type-converters"
type="netui:type-converters" minOccurs="0" maxOccurs="1"/>
<xsd:element name="jsp-tag-config" type="netui:jsp-tag-config"
minOccurs="0" maxOccurs="1"/>
+ <xsd:element name="url-config" type="netui:url-config"
minOccurs="0" maxOccurs="1"/>
<xsd:element name="iterator-factories"
type="netui:iterator-factories" minOccurs="0" maxOccurs="1"/>
<xsd:element name="request-interceptors"
type="netui:request-interceptors" minOccurs="0" maxOccurs="1"/>
<xsd:element name="prefix-handlers"
type="netui:prefix-handlers" minOccurs="0" maxOccurs="1" />
@@ -173,7 +174,14 @@
<xsd:element name="tree-image-location" type="xsd:string"
minOccurs="0" maxOccurs="1"/>
</xsd:sequence>
</xsd:complexType>
-
+
+ <xsd:complexType name="url-config">
+ <xsd:sequence>
+ <xsd:element name="url-encode-params" type="xsd:boolean"
minOccurs="0" maxOccurs="1" default="false"/>
+ <xsd:element name="html-amp-entity" type="xsd:boolean"
minOccurs="0" maxOccurs="1" default="false"/>
+ </xsd:sequence>
+ </xsd:complexType>
+
<xsd:complexType name="type-converters">
<xsd:sequence>
<xsd:element name="type-converter" minOccurs="0"
maxOccurs="unbounded">
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/CtFormNullBinding.xml
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/CtFormNullBinding.xml?view=diff&r1=160628&r2=160629
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/CtFormNullBinding.xml
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/CtFormNullBinding.xml
Fri Apr 8 15:20:22 2005
@@ -2,7 +2,7 @@
<ses:recorderSession
xmlns:ses="http://beehive.apache.org/netui/tools/testrecorder/2004/session";>
<ses:sessionName>CtFormNullBinding</ses:sessionName>
<ses:tester>Daryl</ses:tester>
- <ses:startDate>09 Mar 2005, 09:45:31.050 AM MST</ses:startDate>
+ <ses:startDate>08 Apr 2005, 03:38:32.335 PM MDT</ses:startDate>
<ses:description>Daryl</ses:description>
<ses:tests>
<ses:test>
@@ -18,7 +18,7 @@
<ses:cookies>
<ses:cookie>
<ses:name>JSESSIONID</ses:name>
- <ses:value>EB7F8A314B0203FD130B68BE601686AF</ses:value>
+ <ses:value>D273272E5F119DECD90ECAD3986B6B46</ses:value>
</ses:cookie>
</ses:cookies>
<ses:headers>
@@ -40,7 +40,7 @@
</ses:header>
<ses:header>
<ses:name>cookie</ses:name>
- <ses:value>$Version=0;
JSESSIONID=EB7F8A314B0203FD130B68BE601686AF; $Path=/coreWeb</ses:value>
+ <ses:value>$Version=0;
JSESSIONID=D273272E5F119DECD90ECAD3986B6B46; $Path=/coreWeb</ses:value>
</ses:header>
<ses:header>
<ses:name>host</ses:name>
@@ -48,7 +48,7 @@
</ses:header>
<ses:header>
<ses:name>testrecorder.playback.testid</ses:name>
- <ses:value>-383a360a:1028831d8b1:-7da4</ses:value>
+ <ses:value>-3c1128be:10323bcd7f9:-7d98</ses:value>
</ses:header>
<ses:header>
<ses:name>user-agent</ses:name>
@@ -101,7 +101,7 @@
<div> <hr /><table border="1" cellspacing="0"
style="color:red;background-color:white">
<tr><th colspan="6">Page Errors</th></tr>
<tr><th>Error Number</th><th>Tag Type</th><th colspan="4">Error</th></tr>
-<tr><th>1</th><th>Form</th><th>Message</th><td>The type of a button must be
one of submit, button or reset, found ''.</td></tr>
+<tr><th>1</th><th>Form</th><th>Message</th><td>The value of a method must be
one of post or get, found ''.</td></tr>
<tr><th>2</th><th>Form</th><th>Message</th><td>Attribute 'beanScope' is
required to have a value. The value "" is illegal. This is often cause by
binding to an object with a null value.</td></tr>
<tr><th>3</th><th>Form</th><th>Message</th><td>Attribute 'action' is required
to have a value. The value "" is illegal. This is often cause by binding to
an object with a null value.</td></tr>
<tr><th>4</th><th>Form</th><th>Message</th><td>Attribute 'tagId' is required
to have a value. The value "" is illegal. This is often cause by binding to
an object with a null value.</td></tr>
@@ -117,7 +117,7 @@
</ses:testResults>
</ses:test>
</ses:tests>
- <ses:endDate>09 Mar 2005, 09:45:31.711 AM MST</ses:endDate>
+ <ses:endDate>08 Apr 2005, 03:38:33.296 PM MDT</ses:endDate>
<ses:sessionStatus>fail</ses:sessionStatus>
<ses:testCount>1</ses:testCount>
<ses:passedCount>0</ses:passedCount>
