Merge pull request #210 from volosied/ee10-namespaces-and-tlddoc

Update TLDs to the Jakarta EE10 namespace (And update TLDDoc Namespace Handling)

api/src/main/java/jakarta/servlet/jsp/jstl/tlv/package.html

@@ -2,7 +2,8 @@
 
  Copyright (c) 1997-2020 Oracle and/or its affiliates. All rights reserved.
  Copyright 2004 The Apache Software Foundation
-
+ Copyright (c) 2022-2022 Contributors to the Eclipse Foundation
+ 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
  You may obtain a copy of the License at
@@ -32,17 +33,17 @@
 <pre>
 &lt;?xml version="1.0" encoding="UTF-8" ?&gt;
 
-&lt;taglib xmlns="http://java.sun.com/xml/ns/javaee"
+&lt;taglib xmlns="https://jakarta.ee/xml/ns/jakartaee"
  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_1.xsd"
- version="2.1"&gt;
+ xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-jsptaglibrary_3_0.xsd"
+ version="3.0"&gt;
  &lt;description&gt;
  Restricts JSP pages to the JSTL tag libraries
  &lt;/description&gt;
  &lt;display-name&gt;permittedTaglibs&lt;/display-name&gt;
- &lt;tlib-version&gt;1.1&lt;/tlib-version&gt;
+ &lt;tlib-version&gt;3.0&lt;/tlib-version&gt;
  &lt;short-name&gt;permittedTaglibs&lt;/short-name&gt;
- &lt;uri&gt;http://jakarta.apache.org/taglibs/standard/permittedTaglibs&lt;/uri&gt;
+ &lt;uri&gt;jakarta.tags.permittedTaglibs&lt;/uri&gt;
 
  &lt;validator&gt;
  &lt;validator-class&gt;

impl/src/main/resources/META-INF/c.tld

@@ -18,10 +18,10 @@
 
 -->
 
-<taglib xmlns="http://java.sun.com/xml/ns/javaee"
- 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_1.xsd"
- version="2.1">
+<taglib xmlns="https://jakarta.ee/xml/ns/jakartaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+ xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-jsptaglibrary_3_0.xsd"
+ version="3.0">
 
  <description>Tags 3.0 core library</description>
  <display-name>Tags core</display-name>

impl/src/main/resources/META-INF/fmt.tld

@@ -18,10 +18,10 @@
 
 -->
 
-<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 http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd"
- version="2.0">
+<taglib xmlns="https://jakarta.ee/xml/ns/jakartaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+ xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-jsptaglibrary_3_0.xsd"
+ version="3.0">
 
  <description>Tags 3.0 i18n-capable formatting library</description>
  <display-name>Tags fmt</display-name>

impl/src/main/resources/META-INF/fn.tld

@@ -18,10 +18,10 @@
 
 -->
 
-<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 http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd"
- version="2.0">
+<taglib xmlns="https://jakarta.ee/xml/ns/jakartaee"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+  xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-jsptaglibrary_3_0.xsd"
+  version="3.0">
 
  <description>Tags 3.0 functions library</description>
  <display-name>Tags functions</display-name>

impl/src/main/resources/META-INF/sql.tld

@@ -18,10 +18,10 @@
 
 -->
 
-<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 http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd"
- version="2.0">
+<taglib xmlns="https://jakarta.ee/xml/ns/jakartaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+ xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-jsptaglibrary_3_0.xsd"
+ version="3.0">
 
  <description>Tags 3.0 sql library</description>
  <display-name>Tags sql</display-name>

impl/src/main/resources/META-INF/x.tld

@@ -18,10 +18,10 @@
 
 -->
 
-<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 http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd"
- version="2.0">
+<taglib xmlns="https://jakarta.ee/xml/ns/jakartaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+ xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-jsptaglibrary_3_0.xsd"
+ version="3.0">
 
  <description>Tags 3.0 XML library</description>
  <display-name>Tags XML</display-name>

spec/src/main/asciidoc/jakarta-stl.adoc

@@ -7178,11 +7178,10 @@ developer could create the following TLD:
 ....
 <?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">
+<taglib xmlns="https://jakarta.ee/xml/ns/jakartaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+ xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-jsptaglibrary_3_0.xsd"
+ version="3.0">
  <description>
  Validates Jakarta Server Pages to prohibit use of scripting elements.
  </description>
@@ -7226,11 +7225,10 @@ libraries), a developer could create the following TLD:
 ....
 <?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">
+<taglib xmlns="https://jakarta.ee/xml/ns/jakartaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+ xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-jsptaglibrary_3_0.xsd"
+ version="3.0">
  <description>
  Restricts Jakarta Server Pages to the Jakarta Standard Tag Library tag libraries
  </description>

tagsdoc/src/main/java/com/sun/tlddoc/Constants.java

@@ -1,6 +1,7 @@
 /*
  * <license>
  * Copyright (c) 2003-2004, Sun Microsystems, Inc.
+ * Copyright (c) 2022-2022 Contributors to the Eclipse Foundation
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without 
@@ -50,11 +51,8 @@ private Constants() {
  public static final String DEFAULT_DOC_TITLE =
  "Tag Library Documentation Generator - Generated Documentation";
 
- /** Namespace for Java EE */
- public static final String NS_JAVAEE = "http://java.sun.com/xml/ns/javaee";
-
- /** Namespace for J2EE */
- public static final String NS_J2EE = "http://java.sun.com/xml/ns/j2ee";
+ /** Namespace for Jakarta EE */
+ public static final String NS_JAKARTAEE = "https://jakarta.ee/xml/ns/jakartaee";
 
  /** If true, outputs the input to the transform before generation */
  public static final boolean DEBUG_INPUT_DOCUMENT = false;

tagsdoc/src/main/java/com/sun/tlddoc/TLDDocGenerator.java

@@ -499,24 +499,24 @@ public InputSource resolveEntity (
  summaryTLD = documentBuilder.newDocument();
 
  // Create root <tlds> element:
- Element rootElement = summaryTLD.createElementNS( Constants.NS_JAVAEE, 
+ Element rootElement = summaryTLD.createElementNS( Constants.NS_JAKARTAEE, 
  "tlds" );
  summaryTLD.appendChild( rootElement );
  // JDK 1.4 does not add xmlns for some reason - add it manually:
  rootElement.setAttributeNS( "http://www.w3.org/2000/xmlns/", 
- "xmlns", Constants.NS_JAVAEE );
+ "xmlns", Constants.NS_JAKARTAEE );
 
  // Create configuration element:
- Element configElement = summaryTLD.createElementNS( Constants.NS_JAVAEE, 
+ Element configElement = summaryTLD.createElementNS( Constants.NS_JAKARTAEE, 
  "config" );
  rootElement.appendChild( configElement );
 
- Element windowTitle = summaryTLD.createElementNS( Constants.NS_JAVAEE, 
+ Element windowTitle = summaryTLD.createElementNS( Constants.NS_JAKARTAEE, 
  "window-title" );
  windowTitle.appendChild( summaryTLD.createTextNode( this.windowTitle));
  configElement.appendChild( windowTitle );
 
- Element docTitle = summaryTLD.createElementNS( Constants.NS_JAVAEE, 
+ Element docTitle = summaryTLD.createElementNS( Constants.NS_JAKARTAEE, 
  "doc-title" );
  docTitle.appendChild( summaryTLD.createTextNode( this.docTitle));
  configElement.appendChild( docTitle );
@@ -551,11 +551,10 @@ public InputSource resolveEntity (
 
  Element taglibNode = (Element)summaryTLD.importNode( 
  doc.getDocumentElement(), true );
- if( !taglibNode.getNamespaceURI().equals( Constants.NS_JAVAEE )
- && !taglibNode.getNamespaceURI().equals( Constants.NS_J2EE )) {
+ if( !taglibNode.getNamespaceURI().equals( Constants.NS_JAKARTAEE ) ) {
  throw new GeneratorException( "Error: " + 
  tagLibrary.getPathDescription() + 
- " does not have xmlns=\"" + Constants.NS_JAVAEE + "\"" );
+ " does not have xmlns=\"" + Constants.NS_JAKARTAEE + "\"" );
  }
  if( !taglibNode.getLocalName().equals( "taglib" ) ) {
  throw new GeneratorException( "Error: " + 
@@ -749,7 +748,7 @@ private void populateTagFileDetailsTagDirective(
  name.equals( "description" ) ||
  name.equals( "example" ) )
  {
- element = doc.createElementNS( Constants.NS_JAVAEE, name );
+ element = doc.createElementNS( Constants.NS_JAKARTAEE, name );
  element.appendChild( doc.createTextNode( value ) );
  tagFileNode.appendChild( element );
  }
@@ -759,13 +758,13 @@ else if( name.equals( "small-icon" ) ||
  NodeList icons = tagFileNode.getElementsByTagNameNS( "*", "icon" );
  Element icon;
  if( icons.getLength() == 0 ) {
- icon = doc.createElementNS( Constants.NS_JAVAEE, "icon" );
+ icon = doc.createElementNS( Constants.NS_JAKARTAEE, "icon" );
  tagFileNode.appendChild( icon );
  }
  else {
  icon = (Element)icons.item( 0 );
  }
- element = doc.createElementNS( Constants.NS_JAVAEE, name );
+ element = doc.createElementNS( Constants.NS_JAKARTAEE, name );
  element.appendChild( doc.createTextNode( value ) );
  icon.appendChild( element );
  }
@@ -805,7 +804,7 @@ private void populateDefault( Document doc, Element parent, String tagName,
  String defaultValue ) 
  {
  if( findElementValue( parent, tagName ) == null ) {
- Element element = doc.createElementNS( Constants.NS_JAVAEE, tagName );
+ Element element = doc.createElementNS( Constants.NS_JAKARTAEE, tagName );
  element.appendChild( doc.createTextNode( defaultValue ) );
  parent.appendChild( element );
  }
@@ -824,7 +823,7 @@ private void populateTagFileDetailsAttributeDirective(
  Element tagFileNode, Document doc, Directive directive )
  {
  Iterator attributes = directive.getAttributes();
- Element attributeNode = doc.createElementNS( Constants.NS_JAVAEE, 
+ Element attributeNode = doc.createElementNS( Constants.NS_JAKARTAEE, 
  "attribute" );
  tagFileNode.appendChild( attributeNode );
  String deferredValueType = null;
@@ -841,7 +840,7 @@ private void populateTagFileDetailsAttributeDirective(
  name.equals( "type" ) ||
  name.equals( "description" ) )
  {
- element = doc.createElementNS( Constants.NS_JAVAEE, name );
+ element = doc.createElementNS( Constants.NS_JAKARTAEE, name );
  element.appendChild( doc.createTextNode( value ) );
  attributeNode.appendChild( element );
  }
@@ -864,19 +863,19 @@ else if(name.equals("deferredMethodSignature")) {
  }
  if(deferredValueType != null) {
  Element deferredValueElement =
- doc.createElementNS(Constants.NS_JAVAEE, "deferred-value");
+ doc.createElementNS(Constants.NS_JAKARTAEE, "deferred-value");
  attributeNode.appendChild(deferredValueElement);
  Element typeElement =
- doc.createElementNS(Constants.NS_JAVAEE, "type");
+ doc.createElementNS(Constants.NS_JAKARTAEE, "type");
  typeElement.appendChild(doc.createTextNode(deferredValueType));
  deferredValueElement.appendChild(typeElement);
  }
  if(deferredMethodSignature != null) {
  Element deferredMethodElement =
- doc.createElementNS(Constants.NS_JAVAEE, "deferred-method");
+ doc.createElementNS(Constants.NS_JAKARTAEE, "deferred-method");
  attributeNode.appendChild(deferredMethodElement);
  Element methodSignatureElement =
- doc.createElementNS(Constants.NS_JAVAEE, "method-signature");
+ doc.createElementNS(Constants.NS_JAKARTAEE, "method-signature");
  methodSignatureElement.appendChild(
  doc.createTextNode(deferredMethodSignature));
  deferredMethodElement.appendChild(methodSignatureElement);
@@ -908,7 +907,7 @@ private void populateTagFileDetailsVariableDirective(
  Element tagFileNode, Document doc, Directive directive )
  {
  Iterator attributes = directive.getAttributes();
- Element variableNode = doc.createElementNS( Constants.NS_JAVAEE, 
+ Element variableNode = doc.createElementNS( Constants.NS_JAKARTAEE, 
  "variable" );
  tagFileNode.appendChild( variableNode );
  while( attributes.hasNext() ) {
@@ -923,7 +922,7 @@ private void populateTagFileDetailsVariableDirective(
  name.equals( "scope" ) ||
  name.equals( "description" ) )
  {
- element = doc.createElementNS( Constants.NS_JAVAEE, name );
+ element = doc.createElementNS( Constants.NS_JAKARTAEE, name );
  element.appendChild( doc.createTextNode( value ) );
  variableNode.appendChild( element );
  }
@@ -950,7 +949,7 @@ private void checkOrAddShortName( TagLibrary tagLibrary, Document doc,
  {
  String prefix = "prefix" + substitutePrefix;
  substitutePrefix++;
- Element shortName = doc.createElementNS( Constants.NS_JAVAEE, 
+ Element shortName = doc.createElementNS( Constants.NS_JAKARTAEE, 
  "short-name" );
  shortName.appendChild( doc.createTextNode( prefix ) );
  root.appendChild( shortName );
@@ -999,7 +998,7 @@ private void checkOrAddAttributeType( TagLibrary tagLibrary, Document doc,
 
  // Create <type> element and append to attribute
  Element typeElement = doc.createElementNS( 
- Constants.NS_JAVAEE, "type" );
+ Constants.NS_JAKARTAEE, "type" );
  typeElement.appendChild( 
  doc.createTextNode( defaultType ) );
  attributeElement.appendChild( typeElement );

tagsdoc/src/main/java/com/sun/tlddoc/TagDirImplicitTagLibrary.java

@@ -1,6 +1,7 @@
 /*
  * <license>
  * Copyright (c) 2003-2004, Sun Microsystems, Inc.
+ * Copyright (c) 2022-2022 Contributors to the Eclipse Foundation
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without 
@@ -183,16 +184,16 @@ protected static Element createRootTaglibNode( Document result,
  String path ) 
  {
  Element taglibElement = result.createElementNS(
- Constants.NS_JAVAEE, "taglib" );
+ Constants.NS_JAKARTAEE, "taglib" );
  // JDK 1.4 does not add xmlns for some reason - add it manually:
  taglibElement.setAttributeNS( "http://www.w3.org/2000/xmlns/", 
- "xmlns", Constants.NS_JAVAEE );
+ "xmlns", Constants.NS_JAKARTAEE );
  taglibElement.setAttributeNS( "http://www.w3.org/2000/xmlns/", 
  "xmlns:xsi", "http://www.w3.org/2001/XMLSchema-instance" );
  taglibElement.setAttributeNS( 
  "http://www.w3.org/2001/XMLSchema-instance",
  "xsi:schemaLocation", 
- Constants.NS_JAVAEE + 
+ Constants.NS_JAKARTAEE + 
  " http://java.sun.com/xml/ns/javaee/web-jsptaglibrary_2_1.xsd" );
  taglibElement.setAttribute( "version", "2.1" );
  result.appendChild( taglibElement );