Echo tags are not expected to have bodies. Has the happy side-effect of providing...

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@918651 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/test/webapp/WEB-INF/tags/echo-deferred.tag b/test/webapp/WEB-INF/tags/echo-deferred.tag
index caa6e61..27530fa 100644 (file)
--- a/test/webapp/WEB-INF/tags/echo-deferred.tag
+++ b/test/webapp/WEB-INF/tags/echo-deferred.tag
@@ -14,4 +14,5 @@
   See the License for the specific language governing permissions and\r
   limitations under the License.\r
 --%>\r
-<%@ tag %><%@ attribute name="echo" deferredValue="true" %><p>${echo}</p>
\ No newline at end of file
+<%@ tag %><%@ attribute name="echo" deferredValue="true" %><%@\r
+tag body-content="empty" %><p>${echo}</p>
\ No newline at end of file

diff --git a/test/webapp/WEB-INF/tags/echo-double.tag b/test/webapp/WEB-INF/tags/echo-double.tag
index 1dc7c86..460a9d4 100644 (file)
--- a/test/webapp/WEB-INF/tags/echo-double.tag
+++ b/test/webapp/WEB-INF/tags/echo-double.tag
@@ -16,4 +16,5 @@
 --%>\r
 <%@ tag %><%@\r
 attribute name="echo" type="java.lang.Double"%><%@\r
-attribute name="index" type="java.lang.String" %><p>${index}-${echo}</p>
\ No newline at end of file
+attribute name="index" type="java.lang.String" %><%@\r
+tag body-content="empty" %><p>${index}-${echo}</p>
\ No newline at end of file

diff --git a/test/webapp/WEB-INF/tags/echo-long.tag b/test/webapp/WEB-INF/tags/echo-long.tag
index be405f8..78151b7 100644 (file)
--- a/test/webapp/WEB-INF/tags/echo-long.tag
+++ b/test/webapp/WEB-INF/tags/echo-long.tag
@@ -16,4 +16,5 @@
 --%>\r
 <%@ tag %><%@\r
 attribute name="echo" type="java.lang.Long"%><%@\r
-attribute name="index" type="java.lang.String" %><p>${index}-${echo}</p>
\ No newline at end of file
+attribute name="index" type="java.lang.String" %><%@\r
+tag body-content="empty" %><p>${index}-${echo}</p>
\ No newline at end of file

diff --git a/test/webapp/WEB-INF/tags/echo-noel.tag b/test/webapp/WEB-INF/tags/echo-noel.tag
index 582f7cc..edb174a 100644 (file)
--- a/test/webapp/WEB-INF/tags/echo-noel.tag
+++ b/test/webapp/WEB-INF/tags/echo-noel.tag
@@ -16,4 +16,4 @@
 --%>
 <%@ tag%><%@
 attribute name="echo" type="java.lang.String" rtexprvalue="false"
-%><p>${echo}</p>
\ No newline at end of file
+%><%@ tag body-content="empty" %><p>${echo}</p>
\ No newline at end of file

diff --git a/test/webapp/WEB-INF/tags/echo.tag b/test/webapp/WEB-INF/tags/echo.tag
index 4e50d11..40a7acb 100644 (file)
--- a/test/webapp/WEB-INF/tags/echo.tag
+++ b/test/webapp/WEB-INF/tags/echo.tag
@@ -14,4 +14,6 @@
   See the License for the specific language governing permissions and\r
   limitations under the License.\r
 --%>\r
-<%@ tag %><%@ attribute name="echo" type="java.lang.String"%><p>${echo}</p>
\ No newline at end of file
+<%@ tag %><%@\r
+attribute name="echo" type="java.lang.String"%><%@\r
+tag body-content="empty" %><p>${echo}</p>
\ No newline at end of file