diff --git a/api/src/main/java/jakarta/servlet/jsp/jstl/tlv/package.html b/api/src/main/java/jakarta/servlet/jsp/jstl/tlv/package.html index 2c9d218..16165ea 100644 --- a/api/src/main/java/jakarta/servlet/jsp/jstl/tlv/package.html +++ b/api/src/main/java/jakarta/servlet/jsp/jstl/tlv/package.html @@ -42,7 +42,7 @@ <display-name>permittedTaglibs</display-name> <tlib-version>1.1</tlib-version> <short-name>permittedTaglibs</short-name> - <uri>http://java.sun.com/jstl/permittedTaglibs</uri> + <uri>http://jakarta.apache.org/taglibs/standard/permittedTaglibs</uri> <validator> <validator-class> @@ -54,10 +54,10 @@ </description> <param-name>permittedTaglibs</param-name> <param-value> - http://java.sun.com/jsp/jstl/core - http://java.sun.com/jsp/jstl/fmt - http://java.sun.com/jsp/jstl/sql - http://java.sun.com/jsp/jstl/xml + jakarta.tags.core + jakarta.tags.fmt + jakarta.tags.sql + jakarta.tags.xml </param-value> </init-param> </validator> diff --git a/impl/src/main/resources/META-INF/c.tld b/impl/src/main/resources/META-INF/c.tld index 03e436b..2661efa 100644 --- a/impl/src/main/resources/META-INF/c.tld +++ b/impl/src/main/resources/META-INF/c.tld @@ -26,7 +26,7 @@ JSTL core 1.2 c - http://java.sun.com/jsp/jstl/core + jakarta.tags.core diff --git a/impl/src/main/resources/META-INF/fmt.tld b/impl/src/main/resources/META-INF/fmt.tld index 1c7f635..d80fa98 100644 --- a/impl/src/main/resources/META-INF/fmt.tld +++ b/impl/src/main/resources/META-INF/fmt.tld @@ -26,7 +26,7 @@ JSTL fmt 1.1 fmt - http://java.sun.com/jsp/jstl/fmt + jakarta.tags.fmt diff --git a/impl/src/main/resources/META-INF/fn.tld b/impl/src/main/resources/META-INF/fn.tld index 6e6b15f..94cc50d 100644 --- a/impl/src/main/resources/META-INF/fn.tld +++ b/impl/src/main/resources/META-INF/fn.tld @@ -26,7 +26,7 @@ JSTL functions 1.1 fn - http://java.sun.com/jsp/jstl/functions + jakarta.tags.functions diff --git a/impl/src/main/resources/META-INF/permittedTaglibs.tld b/impl/src/main/resources/META-INF/permittedTaglibs.tld index 55c125a..2dfd7d4 100644 --- a/impl/src/main/resources/META-INF/permittedTaglibs.tld +++ b/impl/src/main/resources/META-INF/permittedTaglibs.tld @@ -41,10 +41,10 @@ permittedTaglibs - http://java.sun.com/jsp/jstl/core - http://java.sun.com/jsp/jstl/fmt - http://java.sun.com/jsp/jstl/sql - http://java.sun.com/jsp/jstl/xml + jakarta.tags.core + jakarta.tags.fmt + jakarta.tags.sql + jakarta.tags.xml diff --git a/impl/src/main/resources/META-INF/sql.tld b/impl/src/main/resources/META-INF/sql.tld index fbbe4a1..de20b7c 100644 --- a/impl/src/main/resources/META-INF/sql.tld +++ b/impl/src/main/resources/META-INF/sql.tld @@ -26,7 +26,7 @@ JSTL sql 1.1 sql - http://java.sun.com/jsp/jstl/sql + jakarta.tags.sql diff --git a/impl/src/main/resources/META-INF/x.tld b/impl/src/main/resources/META-INF/x.tld index eca4516..3d3c948 100644 --- a/impl/src/main/resources/META-INF/x.tld +++ b/impl/src/main/resources/META-INF/x.tld @@ -26,7 +26,7 @@ JSTL XML 1.1 x - http://java.sun.com/jsp/jstl/xml + jakarta.tags.xml diff --git a/spec/src/main/asciidoc/jakarta-stl.adoc b/spec/src/main/asciidoc/jakarta-stl.adoc index 0d98526..a40f656 100644 --- a/spec/src/main/asciidoc/jakarta-stl.adoc +++ b/spec/src/main/asciidoc/jakarta-stl.adoc @@ -221,21 +221,21 @@ Jakarta Standard Tag Library Tag Libraries |Functional Area |URI |Prefix |core | -_http://java.sun.com/jsp/jstl/core_ | _c_ +_jakarta.tags.core_ | _c_ |XML processing | -_http://java.sun.com/jsp/jstl/xml_ | _x_ +_jakarta.tags.xml_ | _x_ |I18N capable formatting -| _http://java.sun.com/jsp/jstl/fmt_ +| _jakarta.tags.fmt_ | _fmt_ |relational db access (SQL) -| _http://java.sun.com/jsp/jstl/sql_ +| _jakarta.tags.sql_ | _sql_ |Functions | -_http://java.sun.com/jsp/jstl/functions_ |fn +_jakarta.tags.functions_ |fn |=== === Container Requirement @@ -7226,8 +7226,7 @@ libraries), a developer could create the following TLD: .... - permittedTaglibs - http://java.sun.com/jstl/core - http://java.sun.com/jstl/xml - http://java.sun.com/jstl/fmt - http://java.sun.com/jstl/sql + jakarta.tags.core + jakarta.tags.xml + jakarta.tags.fmt + jakarta.tags.sql @@ -8206,6 +8205,8 @@ changes in the Jakarta Standard Tag Library specification. This appendix is non- ** https://github.com/eclipse-ee4j/jstl-api/issues/157 : Add JPMS Module Info Class +** https://github.com/eclipse-ee4j/jstl-api/issues/144 : Rename Tag URIs to 'jakarta.tags.*' + === Changed between Jakarta Standard Tag Library 2.0 and JSR-52 ** The API has moved from the `javax.servlet.jsp.jstl` package to the `jakarta.servlet.jsp.jstl` package.