Author: violetagg
Date: Mon Jul 8 04:48:38 2013
New Revision: 1500578
URL: http://svn.apache.org/r1500578
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=55211
Merged revision 1500577 from tomcat/trunk:
Fix namespace.
Rename "tagclass" to "tag-class" in various tests tld files so that they become
valid against the dtd/schema.
Patch provided by Jeremy Boynes.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/test/webapp-2.3/WEB-INF/tags12.tld
tomcat/tc7.0.x/trunk/test/webapp-2.3/WEB-INF/tags20.tld
tomcat/tc7.0.x/trunk/test/webapp-2.3/WEB-INF/tags21.tld
tomcat/tc7.0.x/trunk/test/webapp-2.4/WEB-INF/tags20.tld
tomcat/tc7.0.x/trunk/test/webapp-2.4/WEB-INF/tags21.tld
tomcat/tc7.0.x/trunk/test/webapp-2.5/WEB-INF/tags20.tld
tomcat/tc7.0.x/trunk/test/webapp-2.5/WEB-INF/tags21.tld
tomcat/tc7.0.x/trunk/test/webapp-3.0/WEB-INF/tags20.tld
tomcat/tc7.0.x/trunk/test/webapp-3.0/WEB-INF/tags21.tld
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1500577
Modified: tomcat/tc7.0.x/trunk/test/webapp-2.3/WEB-INF/tags12.tld
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/webapp-2.3/WEB-INF/tags12.tld?rev=1500578&r1=1500577&r2=1500578&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/test/webapp-2.3/WEB-INF/tags12.tld (original)
+++ tomcat/tc7.0.x/trunk/test/webapp-2.3/WEB-INF/tags12.tld Mon Jul 8 04:48:38
2013
@@ -25,7 +25,7 @@
<tag>
<name>Echo</name>
- <tagclass>org.apache.jasper.compiler.TestValidator$Echo</tagclass>
+ <tag-class>org.apache.jasper.compiler.TestValidator$Echo</tag-class>
<body-content>empty</body-content>
<attribute>
<name>echo</name>
Modified: tomcat/tc7.0.x/trunk/test/webapp-2.3/WEB-INF/tags20.tld
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/webapp-2.3/WEB-INF/tags20.tld?rev=1500578&r1=1500577&r2=1500578&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/test/webapp-2.3/WEB-INF/tags20.tld (original)
+++ tomcat/tc7.0.x/trunk/test/webapp-2.3/WEB-INF/tags20.tld Mon Jul 8 04:48:38
2013
@@ -14,10 +14,10 @@
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
---><taglib xmlns="http://java.sun.com/xml/ns/javaee";
+--><taglib xmlns="http://java.sun.com/xml/ns/j2ee";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
- http://java.sun.com/xml/ns/javaee/web-jsptaglibrary_2_0.xsd";
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
+ http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd";
version="2.0">
<tlib-version>1.0</tlib-version>
<short-name>Tags20</short-name>
@@ -25,7 +25,7 @@
<tag>
<name>Echo</name>
- <tagclass>org.apache.jasper.compiler.TestValidator$Echo</tagclass>
+ <tag-class>org.apache.jasper.compiler.TestValidator$Echo</tag-class>
<body-content>empty</body-content>
<attribute>
<name>echo</name>
Modified: tomcat/tc7.0.x/trunk/test/webapp-2.3/WEB-INF/tags21.tld
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/webapp-2.3/WEB-INF/tags21.tld?rev=1500578&r1=1500577&r2=1500578&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/test/webapp-2.3/WEB-INF/tags21.tld (original)
+++ tomcat/tc7.0.x/trunk/test/webapp-2.3/WEB-INF/tags21.tld Mon Jul 8 04:48:38
2013
@@ -25,7 +25,7 @@
<tag>
<name>Echo</name>
- <tagclass>org.apache.jasper.compiler.TestValidator$Echo</tagclass>
+ <tag-class>org.apache.jasper.compiler.TestValidator$Echo</tag-class>
<body-content>empty</body-content>
<attribute>
<name>echo</name>
Modified: tomcat/tc7.0.x/trunk/test/webapp-2.4/WEB-INF/tags20.tld
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/webapp-2.4/WEB-INF/tags20.tld?rev=1500578&r1=1500577&r2=1500578&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/test/webapp-2.4/WEB-INF/tags20.tld (original)
+++ tomcat/tc7.0.x/trunk/test/webapp-2.4/WEB-INF/tags20.tld Mon Jul 8 04:48:38
2013
@@ -14,10 +14,10 @@
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
---><taglib xmlns="http://java.sun.com/xml/ns/javaee";
+--><taglib xmlns="http://java.sun.com/xml/ns/j2ee";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
- http://java.sun.com/xml/ns/javaee/web-jsptaglibrary_2_0.xsd";
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
+ http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd";
version="2.0">
<tlib-version>1.0</tlib-version>
<short-name>Tags20</short-name>
@@ -25,7 +25,7 @@
<tag>
<name>Echo</name>
- <tagclass>org.apache.jasper.compiler.TestValidator$Echo</tagclass>
+ <tag-class>org.apache.jasper.compiler.TestValidator$Echo</tag-class>
<body-content>empty</body-content>
<attribute>
<name>echo</name>
Modified: tomcat/tc7.0.x/trunk/test/webapp-2.4/WEB-INF/tags21.tld
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/webapp-2.4/WEB-INF/tags21.tld?rev=1500578&r1=1500577&r2=1500578&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/test/webapp-2.4/WEB-INF/tags21.tld (original)
+++ tomcat/tc7.0.x/trunk/test/webapp-2.4/WEB-INF/tags21.tld Mon Jul 8 04:48:38
2013
@@ -25,7 +25,7 @@
<tag>
<name>Echo</name>
- <tagclass>org.apache.jasper.compiler.TestValidator$Echo</tagclass>
+ <tag-class>org.apache.jasper.compiler.TestValidator$Echo</tag-class>
<body-content>empty</body-content>
<attribute>
<name>echo</name>
Modified: tomcat/tc7.0.x/trunk/test/webapp-2.5/WEB-INF/tags20.tld
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/webapp-2.5/WEB-INF/tags20.tld?rev=1500578&r1=1500577&r2=1500578&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/test/webapp-2.5/WEB-INF/tags20.tld (original)
+++ tomcat/tc7.0.x/trunk/test/webapp-2.5/WEB-INF/tags20.tld Mon Jul 8 04:48:38
2013
@@ -14,10 +14,10 @@
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
---><taglib xmlns="http://java.sun.com/xml/ns/javaee";
+--><taglib xmlns="http://java.sun.com/xml/ns/j2ee";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
- http://java.sun.com/xml/ns/javaee/web-jsptaglibrary_2_0.xsd";
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
+ http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd";
version="2.0">
<tlib-version>1.0</tlib-version>
<short-name>Tags20</short-name>
@@ -25,7 +25,7 @@
<tag>
<name>Echo</name>
- <tagclass>org.apache.jasper.compiler.TestValidator$Echo</tagclass>
+ <tag-class>org.apache.jasper.compiler.TestValidator$Echo</tag-class>
<body-content>empty</body-content>
<attribute>
<name>echo</name>
Modified: tomcat/tc7.0.x/trunk/test/webapp-2.5/WEB-INF/tags21.tld
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/webapp-2.5/WEB-INF/tags21.tld?rev=1500578&r1=1500577&r2=1500578&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/test/webapp-2.5/WEB-INF/tags21.tld (original)
+++ tomcat/tc7.0.x/trunk/test/webapp-2.5/WEB-INF/tags21.tld Mon Jul 8 04:48:38
2013
@@ -25,7 +25,7 @@
<tag>
<name>Echo</name>
- <tagclass>org.apache.jasper.compiler.TestValidator$Echo</tagclass>
+ <tag-class>org.apache.jasper.compiler.TestValidator$Echo</tag-class>
<body-content>empty</body-content>
<attribute>
<name>echo</name>
Modified: tomcat/tc7.0.x/trunk/test/webapp-3.0/WEB-INF/tags20.tld
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/webapp-3.0/WEB-INF/tags20.tld?rev=1500578&r1=1500577&r2=1500578&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/test/webapp-3.0/WEB-INF/tags20.tld (original)
+++ tomcat/tc7.0.x/trunk/test/webapp-3.0/WEB-INF/tags20.tld Mon Jul 8 04:48:38
2013
@@ -14,10 +14,10 @@
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
---><taglib xmlns="http://java.sun.com/xml/ns/javaee";
+--><taglib xmlns="http://java.sun.com/xml/ns/j2ee";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
- http://java.sun.com/xml/ns/javaee/web-jsptaglibrary_2_0.xsd";
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
+ http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd";
version="2.0">
<tlib-version>1.0</tlib-version>
<short-name>Tags20</short-name>
@@ -25,7 +25,7 @@
<tag>
<name>Echo</name>
- <tagclass>org.apache.jasper.compiler.TestValidator$Echo</tagclass>
+ <tag-class>org.apache.jasper.compiler.TestValidator$Echo</tag-class>
<body-content>empty</body-content>
<attribute>
<name>echo</name>
Modified: tomcat/tc7.0.x/trunk/test/webapp-3.0/WEB-INF/tags21.tld
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/webapp-3.0/WEB-INF/tags21.tld?rev=1500578&r1=1500577&r2=1500578&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/test/webapp-3.0/WEB-INF/tags21.tld (original)
+++ tomcat/tc7.0.x/trunk/test/webapp-3.0/WEB-INF/tags21.tld Mon Jul 8 04:48:38
2013
@@ -25,7 +25,7 @@
<tag>
<name>Echo</name>
- <tagclass>org.apache.jasper.compiler.TestValidator$Echo</tagclass>
+ <tag-class>org.apache.jasper.compiler.TestValidator$Echo</tag-class>
<body-content>empty</body-content>
<attribute>
<name>echo</name>
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1500578&r1=1500577&r2=1500578&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Mon Jul 8 04:48:38 2013
@@ -100,6 +100,12 @@
Servlet 3.0 test web application. Patch provided by Jeremy Boynes.
(markt)
</fix>
+ <fix>
+ <bug>55211</bug>: Correct namespace in TLD files used in test web
+ applications. Rename elements <code>tagclass</code> to
+ <code>tag-class</code> so TLD files complies with DTD/schema. Patch
+ provided by Jeremy Boynes. (violetagg)
+ </fix>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
