Author: markt
Date: Tue Jul 6 16:45:23 2010
New Revision: 960940
URL: http://svn.apache.org/viewvc?rev=960940&view=rev
Log:
Side effect of fixing https://issues.apache.org/bugzilla/show_bug.cgi?id=49217
Make the examples and the unit tests spec compliant
Modified:
tomcat/trunk/test/webapp-3.0/bug47413.jsp
tomcat/trunk/webapps/examples/WEB-INF/classes/jsp2/examples/ValuesBean.java
tomcat/trunk/webapps/examples/jsp/jsp2/el/composite.jsp
Modified: tomcat/trunk/test/webapp-3.0/bug47413.jsp
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/webapp-3.0/bug47413.jsp?rev=960940&r1=960939&r2=960940&view=diff
==============================================================================
--- tomcat/trunk/test/webapp-3.0/bug47413.jsp (original)
+++ tomcat/trunk/test/webapp-3.0/bug47413.jsp Tue Jul 6 16:45:23 2010
@@ -19,31 +19,31 @@
<html>
<head><title>Bug 47413 test case</title></head>
<body>
- <jsp:setProperty name="values" property="string" value="${'hello'}
wo${'rld'}"/>
- <p>00-${values.string}</p>
+ <jsp:setProperty name="values" property="stringValue" value="${'hello'}
wo${'rld'}"/>
+ <p>00-${values.stringValue}</p>
<tags:echo echo="01-${'hello'} wo${'rld'}"/>
- <jsp:setProperty name="values" property="double" value="${1+2}.${220}"/>
- <p>02-${values.double}</p>
+ <jsp:setProperty name="values" property="doubleValue"
value="${1+2}.${220}"/>
+ <p>02-${values.doubleValue}</p>
<tags:echo-double index="03" echo="${1+2}.${220}"/>
- <jsp:setProperty name="values" property="long" value="000${1}${7}"/>
- <p>04-${values.long}</p>
+ <jsp:setProperty name="values" property="longValue" value="000${1}${7}"/>
+ <p>04-${values.longValue}</p>
<tags:echo-long index="05" echo="000${1}${7}"/>
- <jsp:setProperty name="values" property="string"
+ <jsp:setProperty name="values" property="stringValue"
value="${undefinedFoo}hello world${undefinedBar}"/>
- <p>06-${values.string}</p>
+ <p>06-${values.stringValue}</p>
<tags:echo echo="${undefinedFoo}07-hello world${undefinedBar}"/>
- <jsp:setProperty name="values" property="double"
+ <jsp:setProperty name="values" property="doubleValue"
value="${undefinedFoo}${undefinedBar}"/>
- <p>08-${values.double}</p>
+ <p>08-${values.doubleValue}</p>
<tags:echo-double index="09" echo="${undefinedFoo}${undefinedBar}"/>
- <jsp:setProperty name="values" property="long"
+ <jsp:setProperty name="values" property="longValue"
value="${undefinedFoo}${undefinedBar}"/>
- <p>10-${values.long}</p>
+ <p>10-${values.longValue}</p>
<tags:echo-long index="11" echo="${undefinedFoo}${undefinedBar}"/>
</body>
Modified:
tomcat/trunk/webapps/examples/WEB-INF/classes/jsp2/examples/ValuesBean.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/jsp2/examples/ValuesBean.java?rev=960940&r1=960939&r2=960940&view=diff
==============================================================================
--- tomcat/trunk/webapps/examples/WEB-INF/classes/jsp2/examples/ValuesBean.java
(original)
+++ tomcat/trunk/webapps/examples/WEB-INF/classes/jsp2/examples/ValuesBean.java
Tue Jul 6 16:45:23 2010
@@ -26,27 +26,27 @@ public class ValuesBean {
private double doubleValue;
private long longValue;
- public String getString() {
+ public String getStringValue() {
return this.string;
}
- public void setString(String string) {
+ public void setStringValue(String string) {
this.string = string;
}
- public double getDouble() {
+ public double getDoubleValue() {
return doubleValue;
}
- public void setDouble(double doubleValue) {
+ public void setDoubleValue(double doubleValue) {
this.doubleValue = doubleValue;
}
- public long getLong() {
+ public long getLongValue() {
return longValue;
}
- public void setLong(long longValue) {
+ public void setLongValue(long longValue) {
this.longValue = longValue;
}
}
Modified: tomcat/trunk/webapps/examples/jsp/jsp2/el/composite.jsp
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/jsp/jsp2/el/composite.jsp?rev=960940&r1=960939&r2=960940&view=diff
==============================================================================
--- tomcat/trunk/webapps/examples/jsp/jsp2/el/composite.jsp (original)
+++ tomcat/trunk/webapps/examples/jsp/jsp2/el/composite.jsp Tue Jul 6 16:45:23
2010
@@ -41,7 +41,7 @@
<tr>
<td>\${'hello'} wo\${'rld'}</td>
<td>String</td>
- <td><jsp:setProperty name="values" property="string" value="${'hello'}
wo${'rld'}"/>${values.string}</td>
+ <td><jsp:setProperty name="values" property="stringValue"
value="${'hello'} wo${'rld'}"/>${values.stringValue}</td>
</tr>
<tr>
<td>\${'hello'} wo\${'rld'}</td>
@@ -51,7 +51,7 @@
<tr>
<td>\${1+2}.\${220}</td>
<td>Double</td>
- <td><jsp:setProperty name="values" property="double"
value="${1+2}.${220}"/>${values.double}</td>
+ <td><jsp:setProperty name="values" property="doubleValue"
value="${1+2}.${220}"/>${values.doubleValue}</td>
</tr>
<tr>
<td>\${1+2}.\${220}</td>
@@ -61,7 +61,7 @@
<tr>
<td>000\${1}\${7}</td>
<td>Long</td>
- <td><jsp:setProperty name="values" property="long"
value="000${1}${7}"/>${values.long}</td>
+ <td><jsp:setProperty name="values" property="longValue"
value="000${1}${7}"/>${values.longValue}</td>
</tr>
<tr>
<td>000\${1}\${7}</td>
@@ -75,7 +75,7 @@
<tr>
<td>\${undefinedFoo}hello world\${undefinedBar}</td>
<td>String</td>
- <td><jsp:setProperty name="values" property="string"
value="${undefinedFoo}hello world${undefinedBar}"/>${values.string}</td>
+ <td><jsp:setProperty name="values" property="stringValue"
value="${undefinedFoo}hello world${undefinedBar}"/>${values.stringValue}</td>
</tr>
<tr>
<td>\${undefinedFoo}hello world\${undefinedBar}</td>
@@ -85,7 +85,7 @@
<tr>
<td>\${undefinedFoo}\${undefinedBar}</td>
<td>Double</td>
- <td><jsp:setProperty name="values" property="double"
value="${undefinedFoo}${undefinedBar}"/>${values.double}</td>
+ <td><jsp:setProperty name="values" property="doubleValue"
value="${undefinedFoo}${undefinedBar}"/>${values.doubleValue}</td>
</tr>
<tr>
<td>\${undefinedFoo}\${undefinedBar}</td>
@@ -95,7 +95,7 @@
<tr>
<td>\${undefinedFoo}\${undefinedBar}</td>
<td>Long</td>
- <td><jsp:setProperty name="values" property="long"
value="${undefinedFoo}${undefinedBar}"/>${values.long}</td>
+ <td><jsp:setProperty name="values" property="longValue"
value="${undefinedFoo}${undefinedBar}"/>${values.longValue}</td>
</tr>
<tr>
<td>\${undefinedFoo}\${undefinedBar}</td>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
