Skip to content

[JBMETA-460] Add support for Jakarta Server Pages 4.0 Taglibrary #190

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bstansberry merged 1 commit into from
Jul 23, 2025
Merged

[JBMETA-460] Add support for Jakarta Server Pages 4.0 Taglibrary #190

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions common/src/main/java/org/jboss/metadata/parser/util/XMLResourceResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,6 +219,7 @@ public Object run() {
registerEntity("http://xmlns.jcp.org/xml/ns/javaee/web-jsptaglibrary_2_1.xsd", "web-jsptaglibrary_2_1.xsd");
registerEntity("https://jakarta.ee/xml/ns/jakartaee/web-jsptaglibrary_3_0.xsd", "web-jsptaglibrary_3_0.xsd");
registerEntity("https://jakarta.ee/xml/ns/jakartaee/web-jsptaglibrary_3_1.xsd", "web-jsptaglibrary_3_1.xsd");
registerEntity("https://jakarta.ee/xml/ns/jakartaee/web-jsptaglibrary_4_0.xsd", "web-jsptaglibrary_4_0.xsd");
registerEntity("http://xmlns.jcp.org/xml/ns/javaee/web-partialresponse_2_2.xsd", "web-partialresponse_2_2.xsd");
registerEntity("http://xmlns.jcp.org/xml/ns/javaee/web-partialresponse_2_3.xsd", "web-partialresponse_2_3.xsd");
registerEntity("https://jakarta.ee/xml/ns/jakartaee/web-partialresponse_3_0.xsd", "web-partialresponse_3_0.xsd");
Expand Down
1 change: 1 addition & 0 deletions web/src/main/java/org/jboss/metadata/parser/jsp/Location.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ public class Location {
bindings.put("http://xmlns.jcp.org/xml/ns/javaee/web-jsptaglibrary_2_1.xsd", Version.TLD_2_1);
bindings.put("https://jakarta.ee/xml/ns/jakartaee/web-jsptaglibrary_3_0.xsd", Version.TLD_3_0);
bindings.put("https://jakarta.ee/xml/ns/jakartaee/web-jsptaglibrary_3_1.xsd", Version.TLD_3_1);
bindings.put("https://jakarta.ee/xml/ns/jakartaee/web-jsptaglibrary_4_0.xsd", Version.TLD_4_0);
}

public static Version getVersion(String location) {
Expand Down
4 changes: 3 additions & 1 deletion web/src/main/java/org/jboss/metadata/parser/jsp/TldMetaDataParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,11 +70,13 @@ public static TldMetaData parse(XMLStreamReader reader) throws XMLStreamExceptio
version = Version.TLD_3_0;
} else if ("3.1".equals(versionString)) {
version = Version.TLD_3_1;
} else if ("4.0".equals(versionString)) {
version = Version.TLD_4_0;
}
}
if (version == null) {
// It is likely an error to not have a version at this point though
version = Version.TLD_3_1;
version = Version.TLD_4_0;
}
TldMetaData tld = new TldMetaData();
// Handle attributes
Expand Down
2 changes: 1 addition & 1 deletion web/src/main/java/org/jboss/metadata/parser/jsp/Version.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@
package org.jboss.metadata.parser.jsp;

public enum Version {
TLD_1_1, TLD_1_2, TLD_2_0, TLD_2_1, TLD_3_0, TLD_3_1
TLD_1_1, TLD_1_2, TLD_2_0, TLD_2_1, TLD_3_0, TLD_3_1, TLD_4_0
}
Loading