From 5b7e9dfff5b620879a062d4af8c04c109005e2d9 Mon Sep 17 00:00:00 2001
From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Wed, 3 Mar 2010 19:27:25 +0000
Subject: [PATCH] Echo tags are not expected to have bodies. Has the happy
 side-effect of providing a tag that can be used to test bug 48827.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@918651 13f79535-47bb-0310-9956-ffa450edef68
---
 test/webapp/WEB-INF/tags/echo-deferred.tag | 3 ++-
 test/webapp/WEB-INF/tags/echo-double.tag   | 3 ++-
 test/webapp/WEB-INF/tags/echo-long.tag     | 3 ++-
 test/webapp/WEB-INF/tags/echo-noel.tag     | 2 +-
 test/webapp/WEB-INF/tags/echo.tag          | 4 +++-
 5 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/test/webapp/WEB-INF/tags/echo-deferred.tag b/test/webapp/WEB-INF/tags/echo-deferred.tag
index caa6e612f..27530fac6 100644
--- 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
   limitations under the License.
 --%>
-<%@ tag %><%@ attribute name="echo" deferredValue="true" %><p>${echo}</p>
\ No newline at end of file
+<%@ tag %><%@ attribute name="echo" deferredValue="true" %><%@
+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 1dc7c86b1..460a9d4d0 100644
--- a/test/webapp/WEB-INF/tags/echo-double.tag
+++ b/test/webapp/WEB-INF/tags/echo-double.tag
@@ -16,4 +16,5 @@
 --%>
 <%@ tag %><%@
 attribute name="echo" type="java.lang.Double"%><%@
-attribute name="index" type="java.lang.String" %><p>${index}-${echo}</p>
\ No newline at end of file
+attribute name="index" type="java.lang.String" %><%@
+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 be405f89f..78151b7bb 100644
--- a/test/webapp/WEB-INF/tags/echo-long.tag
+++ b/test/webapp/WEB-INF/tags/echo-long.tag
@@ -16,4 +16,5 @@
 --%>
 <%@ tag %><%@
 attribute name="echo" type="java.lang.Long"%><%@
-attribute name="index" type="java.lang.String" %><p>${index}-${echo}</p>
\ No newline at end of file
+attribute name="index" type="java.lang.String" %><%@
+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 582f7cc09..edb174ace 100644
--- 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 4e50d11d4..40a7acb48 100644
--- 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
   limitations under the License.
 --%>
-<%@ tag %><%@ attribute name="echo" type="java.lang.String"%><p>${echo}</p>
\ No newline at end of file
+<%@ tag %><%@
+attribute name="echo" type="java.lang.String"%><%@
+tag body-content="empty" %><p>${echo}</p>
\ No newline at end of file
-- 
2.11.0