Skip to content

Commit

Permalink
Merge pull request #172 from volosied/144-ee10-jakarta-tags
Browse files Browse the repository at this point in the history 
Update TagLib URIs to jakarta.tags.* for EE10
  • Loading branch information
@volosied
volosied authored Dec 20, 2021
2 parents 89ac9f8 + 7e85287 commit a3f6454
Show file tree
Hide file tree
Showing 8 changed files with 26 additions and 25 deletions.
10 changes: 5 additions & 5 deletions api/src/main/java/jakarta/servlet/jsp/jstl/tlv/package.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion impl/src/main/resources/META-INF/c.tld
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<display-name>JSTL core</display-name>
<tlib-version>1.2</tlib-version>
<short-name>c</short-name>
<uri>http://java.sun.com/jsp/jstl/core</uri>
<uri>jakarta.tags.core</uri>

<validator>
<description>
Expand Down
2 changes: 1 addition & 1 deletion impl/src/main/resources/META-INF/fmt.tld
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<display-name>JSTL fmt</display-name>
<tlib-version>1.1</tlib-version>
<short-name>fmt</short-name>
<uri>http://java.sun.com/jsp/jstl/fmt</uri>
<uri>jakarta.tags.fmt</uri>

<validator>
<description>
Expand Down
2 changes: 1 addition & 1 deletion impl/src/main/resources/META-INF/fn.tld
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<display-name>JSTL functions</display-name>
<tlib-version>1.1</tlib-version>
<short-name>fn</short-name>
<uri>http://java.sun.com/jsp/jstl/functions</uri>
<uri>jakarta.tags.functions</uri>

<function>
<description>
Expand Down
8 changes: 4 additions & 4 deletions impl/src/main/resources/META-INF/permittedTaglibs.tld
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,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>
Expand Down
2 changes: 1 addition & 1 deletion impl/src/main/resources/META-INF/sql.tld
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<display-name>JSTL sql</display-name>
<tlib-version>1.1</tlib-version>
<short-name>sql</short-name>
<uri>http://java.sun.com/jsp/jstl/sql</uri>
<uri>jakarta.tags.sql</uri>

<validator>
<description>
Expand Down
2 changes: 1 addition & 1 deletion impl/src/main/resources/META-INF/x.tld
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<display-name>JSTL XML</display-name>
<tlib-version>1.1</tlib-version>
<short-name>x</short-name>
<uri>http://java.sun.com/jsp/jstl/xml</uri>
<uri>jakarta.tags.xml</uri>

<validator>
<description>
Expand Down
23 changes: 12 additions & 11 deletions spec/src/main/asciidoc/jakarta-stl.adoc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -7226,8 +7226,7 @@ libraries), a developer could create the following TLD:
....
<?xml version="1.0" encoding="UTF-8" ?>
<taglib
xmlns="http://java.sun.com/xml/ns/j2ee"
<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"
Expand All @@ -7247,10 +7246,10 @@ libraries), a developer could create the following TLD:
<init-param>
<param-name>permittedTaglibs</param-name>
<param-value>
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
</param-value>
</init-param>
</validator>
Expand Down Expand Up @@ -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.
Expand Down

0 comments on commit a3f6454

Please sign in to comment.