projects / tomcat7.0 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: bc8473f)
Side effect of fixing https://issues.apache.org/bugzilla/show_bug.cgi?id=49217
authormarkt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Tue, 6 Jul 2010 16:45:23 +0000 (16:45 +0000)
committermarkt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Tue, 6 Jul 2010 16:45:23 +0000 (16:45 +0000)
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

test/webapp-3.0/bug47413.jsp patch | blob | history
webapps/examples/WEB-INF/classes/jsp2/examples/ValuesBean.java patch | blob | history
webapps/examples/jsp/jsp2/el/composite.jsp patch | blob | history

diff --git a/test/webapp-3.0/bug47413.jsp b/test/webapp-3.0/bug47413.jsp
index adfea07..eb79ae1 100644 (file)
--- a/test/webapp-3.0/bug47413.jsp
+++ b/test/webapp-3.0/bug47413.jsp
@@ -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>
diff --git a/webapps/examples/WEB-INF/classes/jsp2/examples/ValuesBean.java b/webapps/examples/WEB-INF/classes/jsp2/examples/ValuesBean.java
index 6b481fc..686039c 100644 (file)
--- 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 fb0c6fe..cfe9fd1 100644 (file)
--- a/webapps/examples/jsp/jsp2/el/composite.jsp
+++ b/webapps/examples/jsp/jsp2/el/composite.jsp
@@ -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>
Unnamed repository; edit this file to name it for gitweb.