You are viewing a plain text version of this content. The canonical link for it is here.
Posted to taglibs-dev@jakarta.apache.org by pi...@apache.org on 2003/05/23 01:17:08 UTC
cvs commit: jakarta-taglibs/standard/conf scriptfree.tld permittedTaglibs.tld
pierred 2003/05/22 16:17:08
Modified: standard/conf scriptfree.tld permittedTaglibs.tld
Log:
TLDs now in JSP 2.0 format.
Revision Changes Path
1.7 +11 -18 jakarta-taglibs/standard/conf/scriptfree.tld
Index: scriptfree.tld
===================================================================
RCS file: /home/cvs/jakarta-taglibs/standard/conf/scriptfree.tld,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- scriptfree.tld 14 Oct 2002 00:00:37 -0000 1.6
+++ scriptfree.tld 22 May 2003 23:17:08 -0000 1.7
@@ -1,15 +1,17 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE taglib
- PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN"
- "http://java.sun.com/dtd/web-jsptaglibrary_1_2.dtd">
-<taglib>
- <tlib-version>1.0</tlib-version>
- <jsp-version>1.2</jsp-version>
- <short-name>scriptfree</short-name>
- <uri>http://jakarta.apache.org/taglibs/standard/scriptfree</uri>
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<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/j2ee web jsptaglibrary_2_0.xsd"
+ version="2.0">
<description>
Validates JSP pages to prohibit use of scripting elements.
</description>
+ <tlib-version>1.0</tlib-version>
+ <jsp-version>2.0</jsp-version>
+ <short-name>scriptfree</short-name>
+ <uri>http://jakarta.apache.org/taglibs/standard/scriptfree</uri>
<validator>
<validator-class>
@@ -48,13 +50,4 @@
Validates prohibitions against scripting elements.
</description>
</validator>
-
- <!-- Every TLD needs at least one 'tag' element. We happily oblige. -->
-
- <tag>
- <name>noop</name>
- <tag-class>javax.servlet.jsp.tagext.TagSupport</tag-class>
- <body-content>empty</body-content>
- <description>Does nothing.</description>
- </tag>
</taglib>
1.7 +14 -20 jakarta-taglibs/standard/conf/permittedTaglibs.tld
Index: permittedTaglibs.tld
===================================================================
RCS file: /home/cvs/jakarta-taglibs/standard/conf/permittedTaglibs.tld,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- permittedTaglibs.tld 25 Mar 2003 19:43:21 -0000 1.6
+++ permittedTaglibs.tld 22 May 2003 23:17:08 -0000 1.7
@@ -1,20 +1,23 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE taglib
- PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN"
- "http://java.sun.com/dtd/web-jsptaglibrary_1_2.dtd">
-<taglib>
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<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/j2ee web jsptaglibrary_2_0.xsd"
+ version="2.0">
+ <description>
+ Restricts JSP pages to the JSTL tag libraries
+ </description>
<tlib-version>1.0</tlib-version>
- <jsp-version>1.2</jsp-version>
+ <jsp-version>2.0</jsp-version>
<short-name>permittedTaglibs</short-name>
<uri>http://jakarta.apache.org/taglibs/standard/permittedTaglibs</uri>
- <description>
- Validates JSP pages to restrict 'taglib' directives
- </description>
+ <display-name>permittedTaglibs</display-name>
<validator>
<validator-class>
javax.servlet.jsp.jstl.tlv.PermittedTaglibsTLV
- </validator-class>
+ </validator-class>
<init-param>
<param-name>permittedTaglibs</param-name>
<param-value>
@@ -27,16 +30,7 @@
Whitespace-separated list of taglib URIs to permit. This example
TLD for the Standard Taglib allows only JSTL 'el' taglibs to be
imported.
- </description>
+ </description>
</init-param>
</validator>
-
- <!-- Every TLD needs at least one 'tag' element. We happily oblige. -->
-
- <tag>
- <name>noop</name>
- <tag-class>javax.servlet.jsp.tagext.TagSupport</tag-class>
- <body-content>empty</body-content>
- <description>Does nothing.</description>
- </tag>
</taglib>
---------------------------------------------------------------------
To unsubscribe, e-mail: taglibs-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: taglibs-dev-help@jakarta.apache.org