You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by vi...@apache.org on 2013/07/08 06:20:38 UTC
svn commit: r1500577 - in /tomcat/trunk/test: webapp-2.3/WEB-INF/
webapp-2.4/WEB-INF/ webapp-2.5/WEB-INF/ webapp-3.0/WEB-INF/
webapp-3.1/WEB-INF/
Author: violetagg
Date: Mon Jul 8 04:20:38 2013
New Revision: 1500577
URL: http://svn.apache.org/r1500577
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=55211
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/trunk/test/webapp-2.3/WEB-INF/tags12.tld
tomcat/trunk/test/webapp-2.3/WEB-INF/tags20.tld
tomcat/trunk/test/webapp-2.3/WEB-INF/tags21.tld
tomcat/trunk/test/webapp-2.4/WEB-INF/tags20.tld
tomcat/trunk/test/webapp-2.4/WEB-INF/tags21.tld
tomcat/trunk/test/webapp-2.5/WEB-INF/tags20.tld
tomcat/trunk/test/webapp-2.5/WEB-INF/tags21.tld
tomcat/trunk/test/webapp-3.0/WEB-INF/tags20.tld
tomcat/trunk/test/webapp-3.0/WEB-INF/tags21.tld
tomcat/trunk/test/webapp-3.1/WEB-INF/tags20.tld
tomcat/trunk/test/webapp-3.1/WEB-INF/tags21.tld
Modified: tomcat/trunk/test/webapp-2.3/WEB-INF/tags12.tld
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/webapp-2.3/WEB-INF/tags12.tld?rev=1500577&r1=1500576&r2=1500577&view=diff
==============================================================================
--- tomcat/trunk/test/webapp-2.3/WEB-INF/tags12.tld (original)
+++ tomcat/trunk/test/webapp-2.3/WEB-INF/tags12.tld Mon Jul 8 04:20: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/trunk/test/webapp-2.3/WEB-INF/tags20.tld
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/webapp-2.3/WEB-INF/tags20.tld?rev=1500577&r1=1500576&r2=1500577&view=diff
==============================================================================
--- tomcat/trunk/test/webapp-2.3/WEB-INF/tags20.tld (original)
+++ tomcat/trunk/test/webapp-2.3/WEB-INF/tags20.tld Mon Jul 8 04:20: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/trunk/test/webapp-2.3/WEB-INF/tags21.tld
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/webapp-2.3/WEB-INF/tags21.tld?rev=1500577&r1=1500576&r2=1500577&view=diff
==============================================================================
--- tomcat/trunk/test/webapp-2.3/WEB-INF/tags21.tld (original)
+++ tomcat/trunk/test/webapp-2.3/WEB-INF/tags21.tld Mon Jul 8 04:20: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/trunk/test/webapp-2.4/WEB-INF/tags20.tld
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/webapp-2.4/WEB-INF/tags20.tld?rev=1500577&r1=1500576&r2=1500577&view=diff
==============================================================================
--- tomcat/trunk/test/webapp-2.4/WEB-INF/tags20.tld (original)
+++ tomcat/trunk/test/webapp-2.4/WEB-INF/tags20.tld Mon Jul 8 04:20: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/trunk/test/webapp-2.4/WEB-INF/tags21.tld
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/webapp-2.4/WEB-INF/tags21.tld?rev=1500577&r1=1500576&r2=1500577&view=diff
==============================================================================
--- tomcat/trunk/test/webapp-2.4/WEB-INF/tags21.tld (original)
+++ tomcat/trunk/test/webapp-2.4/WEB-INF/tags21.tld Mon Jul 8 04:20: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/trunk/test/webapp-2.5/WEB-INF/tags20.tld
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/webapp-2.5/WEB-INF/tags20.tld?rev=1500577&r1=1500576&r2=1500577&view=diff
==============================================================================
--- tomcat/trunk/test/webapp-2.5/WEB-INF/tags20.tld (original)
+++ tomcat/trunk/test/webapp-2.5/WEB-INF/tags20.tld Mon Jul 8 04:20: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/trunk/test/webapp-2.5/WEB-INF/tags21.tld
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/webapp-2.5/WEB-INF/tags21.tld?rev=1500577&r1=1500576&r2=1500577&view=diff
==============================================================================
--- tomcat/trunk/test/webapp-2.5/WEB-INF/tags21.tld (original)
+++ tomcat/trunk/test/webapp-2.5/WEB-INF/tags21.tld Mon Jul 8 04:20: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/trunk/test/webapp-3.0/WEB-INF/tags20.tld
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/webapp-3.0/WEB-INF/tags20.tld?rev=1500577&r1=1500576&r2=1500577&view=diff
==============================================================================
--- tomcat/trunk/test/webapp-3.0/WEB-INF/tags20.tld (original)
+++ tomcat/trunk/test/webapp-3.0/WEB-INF/tags20.tld Mon Jul 8 04:20: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/trunk/test/webapp-3.0/WEB-INF/tags21.tld
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/webapp-3.0/WEB-INF/tags21.tld?rev=1500577&r1=1500576&r2=1500577&view=diff
==============================================================================
--- tomcat/trunk/test/webapp-3.0/WEB-INF/tags21.tld (original)
+++ tomcat/trunk/test/webapp-3.0/WEB-INF/tags21.tld Mon Jul 8 04:20: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/trunk/test/webapp-3.1/WEB-INF/tags20.tld
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/webapp-3.1/WEB-INF/tags20.tld?rev=1500577&r1=1500576&r2=1500577&view=diff
==============================================================================
--- tomcat/trunk/test/webapp-3.1/WEB-INF/tags20.tld (original)
+++ tomcat/trunk/test/webapp-3.1/WEB-INF/tags20.tld Mon Jul 8 04:20: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/trunk/test/webapp-3.1/WEB-INF/tags21.tld
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/webapp-3.1/WEB-INF/tags21.tld?rev=1500577&r1=1500576&r2=1500577&view=diff
==============================================================================
--- tomcat/trunk/test/webapp-3.1/WEB-INF/tags21.tld (original)
+++ tomcat/trunk/test/webapp-3.1/WEB-INF/tags21.tld Mon Jul 8 04:20: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>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org