From: markt Date: Tue, 6 Jul 2010 16:45:23 +0000 (+0000) Subject: Side effect of fixing https://issues.apache.org/bugzilla/show_bug.cgi?id=49217 X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=70e7158880b61d651e244a2b30f31bf99e55506e;p=tomcat7.0 Side effect of fixing https://issues.apache.org/bugzilla/show_bug.cgi?id=49217 Make the examples and the unit tests spec compliant git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@960940 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/test/webapp-3.0/bug47413.jsp b/test/webapp-3.0/bug47413.jsp index adfea077b..eb79ae1e0 100644 --- a/test/webapp-3.0/bug47413.jsp +++ b/test/webapp-3.0/bug47413.jsp @@ -19,31 +19,31 @@ Bug 47413 test case - -

00-${values.string}

+ +

00-${values.stringValue}

- -

02-${values.double}

+ +

02-${values.doubleValue}

- -

04-${values.long}

+ +

04-${values.longValue}

- -

06-${values.string}

+

06-${values.stringValue}

- -

08-${values.double}

+

08-${values.doubleValue}

- -

10-${values.long}

+

10-${values.longValue}

diff --git a/webapps/examples/WEB-INF/classes/jsp2/examples/ValuesBean.java b/webapps/examples/WEB-INF/classes/jsp2/examples/ValuesBean.java index 6b481fcb1..686039c7d 100644 --- a/webapps/examples/WEB-INF/classes/jsp2/examples/ValuesBean.java +++ b/webapps/examples/WEB-INF/classes/jsp2/examples/ValuesBean.java @@ -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; } } diff --git a/webapps/examples/jsp/jsp2/el/composite.jsp b/webapps/examples/jsp/jsp2/el/composite.jsp index fb0c6fecb..cfe9fd1a0 100644 --- a/webapps/examples/jsp/jsp2/el/composite.jsp +++ b/webapps/examples/jsp/jsp2/el/composite.jsp @@ -41,7 +41,7 @@ \${'hello'} wo\${'rld'} String - ${values.string} + ${values.stringValue} \${'hello'} wo\${'rld'} @@ -51,7 +51,7 @@ \${1+2}.\${220} Double - ${values.double} + ${values.doubleValue} \${1+2}.\${220} @@ -61,7 +61,7 @@ 000\${1}\${7} Long - ${values.long} + ${values.longValue} 000\${1}\${7} @@ -75,7 +75,7 @@ \${undefinedFoo}hello world\${undefinedBar} String - ${values.string} + ${values.stringValue} \${undefinedFoo}hello world\${undefinedBar} @@ -85,7 +85,7 @@ \${undefinedFoo}\${undefinedBar} Double - ${values.double} + ${values.doubleValue} \${undefinedFoo}\${undefinedBar} @@ -95,7 +95,7 @@ \${undefinedFoo}\${undefinedBar} Long - ${values.long} + ${values.longValue} \${undefinedFoo}\${undefinedBar}