This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push:
new 26ba86c Various JavaEE/J2EE -> Jakarta EE documentation updates
26ba86c is described below
commit 26ba86cdbd40ca718e43b82e62b3eb49d004c3d6
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon Apr 26 16:58:03 2021 +0100
Various JavaEE/J2EE -> Jakarta EE documentation updates
---
java/jakarta/servlet/jsp/tagext/VariableInfo.java | 2 +-
.../apache/catalina/core/mbeans-descriptors.xml | 2 +-
.../catalina/deploy/NamingResourcesImpl.java | 2 +-
.../apache/catalina/deploy/mbeans-descriptors.xml | 2 +-
.../tomcat/util/descriptor/web/ContextEjb.java | 2 +-
.../util/descriptor/web/ContextLocalEjb.java | 2 +-
.../util/descriptor/web/ContextResource.java | 2 +-
.../tomcat/websocket/LocalStrings.properties | 2 +-
.../docs/architecture/startup/serverStartup.txt | 2 +-
webapps/docs/class-loader-howto.xml | 4 +--
webapps/docs/config/context.xml | 5 ++--
webapps/docs/jndi-resources-howto.xml | 31 +++++++++++-----------
12 files changed, 28 insertions(+), 30 deletions(-)
diff --git a/java/jakarta/servlet/jsp/tagext/VariableInfo.java
b/java/jakarta/servlet/jsp/tagext/VariableInfo.java
index 0f50086..a1448d8 100644
--- a/java/jakarta/servlet/jsp/tagext/VariableInfo.java
+++ b/java/jakarta/servlet/jsp/tagext/VariableInfo.java
@@ -49,7 +49,7 @@ package jakarta.servlet.jsp.tagext;
* Frequently a fully qualified class name will refer to a class that is known
* to the tag library and thus, delivered in the same JAR file as the tag
* handlers. In most other remaining cases it will refer to a class that is in
- * the platform on which the JSP processor is built (like J2EE). Using fully
+ * the platform on which the JSP processor is built. Using fully
* qualified class names in this manner makes the usage relatively resistant to
* configuration errors.
* <p>
diff --git a/java/org/apache/catalina/core/mbeans-descriptors.xml
b/java/org/apache/catalina/core/mbeans-descriptors.xml
index bcef191..5a706a6 100644
--- a/java/org/apache/catalina/core/mbeans-descriptors.xml
+++ b/java/org/apache/catalina/core/mbeans-descriptors.xml
@@ -272,7 +272,7 @@
type="boolean"/>
<attribute name="server"
- description="The J2EE Server this module is deployed on"
+ description="The Jakarta EE Server this module is deployed on"
type="java.lang.String"/>
<attribute name="sessionCookieName"
diff --git a/java/org/apache/catalina/deploy/NamingResourcesImpl.java
b/java/org/apache/catalina/deploy/NamingResourcesImpl.java
index 668fa50..26179f9 100644
--- a/java/org/apache/catalina/deploy/NamingResourcesImpl.java
+++ b/java/org/apache/catalina/deploy/NamingResourcesImpl.java
@@ -60,7 +60,7 @@ import org.apache.tomcat.util.res.StringManager;
/**
- * Holds and manages the naming resources defined in the J2EE Enterprise
+ * Holds and manages the naming resources defined in the Jakarta EE
* Naming Context and their associated JNDI context.
*
* @author Remy Maucherat
diff --git a/java/org/apache/catalina/deploy/mbeans-descriptors.xml
b/java/org/apache/catalina/deploy/mbeans-descriptors.xml
index 059b610..fc64d1b 100644
--- a/java/org/apache/catalina/deploy/mbeans-descriptors.xml
+++ b/java/org/apache/catalina/deploy/mbeans-descriptors.xml
@@ -23,7 +23,7 @@
<mbean name="NamingResourcesImpl"
className="org.apache.catalina.mbeans.NamingResourcesMBean"
description="Holds and manages the naming resources defined in the
- J2EE Enterprise Naming Context and their associated
+ Jakarta EE Naming Context and their associated
JNDI context"
domain="Catalina"
group="Resources"
diff --git a/java/org/apache/tomcat/util/descriptor/web/ContextEjb.java
b/java/org/apache/tomcat/util/descriptor/web/ContextEjb.java
index 09dc8e0..00964cf 100644
--- a/java/org/apache/tomcat/util/descriptor/web/ContextEjb.java
+++ b/java/org/apache/tomcat/util/descriptor/web/ContextEjb.java
@@ -48,7 +48,7 @@ public class ContextEjb extends ResourceBase {
/**
- * The link to a J2EE EJB definition.
+ * The link to a Jakarta EE EJB definition.
*/
private String link = null;
diff --git a/java/org/apache/tomcat/util/descriptor/web/ContextLocalEjb.java
b/java/org/apache/tomcat/util/descriptor/web/ContextLocalEjb.java
index c05da4a..2f5bc74 100644
--- a/java/org/apache/tomcat/util/descriptor/web/ContextLocalEjb.java
+++ b/java/org/apache/tomcat/util/descriptor/web/ContextLocalEjb.java
@@ -47,7 +47,7 @@ public class ContextLocalEjb extends ResourceBase {
/**
- * The link to a J2EE EJB definition.
+ * The link to a Jakarta EE EJB definition.
*/
private String link = null;
diff --git a/java/org/apache/tomcat/util/descriptor/web/ContextResource.java
b/java/org/apache/tomcat/util/descriptor/web/ContextResource.java
index 1d2281b..9d1d3cf 100644
--- a/java/org/apache/tomcat/util/descriptor/web/ContextResource.java
+++ b/java/org/apache/tomcat/util/descriptor/web/ContextResource.java
@@ -64,7 +64,7 @@ public class ContextResource extends ResourceBase {
/**
* Is this resource known to be a singleton resource. The default value is
- * true since this is what users expect although the JavaEE spec implies
+ * true since this is what users expect although the Jakarta EE spec
implies
* that the default should be false.
*/
private boolean singleton = true;
diff --git a/java/org/apache/tomcat/websocket/LocalStrings.properties
b/java/org/apache/tomcat/websocket/LocalStrings.properties
index ce102ba..67630ba 100644
--- a/java/org/apache/tomcat/websocket/LocalStrings.properties
+++ b/java/org/apache/tomcat/websocket/LocalStrings.properties
@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-asyncChannelGroup.createFail=Unable to create dedicated
AsynchronousChannelGroup for WebSocket clients which is required to prevent
memory leaks in complex class loader environments like JavaEE containers
+asyncChannelGroup.createFail=Unable to create dedicated
AsynchronousChannelGroup for WebSocket clients which is required to prevent
memory leaks in complex class loader environments like Jakarta EE containers
asyncChannelWrapperSecure.check.notOk=TLS handshake returned an unexpected
status [{0}]
asyncChannelWrapperSecure.check.unwrap=Bytes were written to the output during
a read
diff --git a/webapps/docs/architecture/startup/serverStartup.txt
b/webapps/docs/architecture/startup/serverStartup.txt
index c7c8c0d..9a13d7a 100644
--- a/webapps/docs/architecture/startup/serverStartup.txt
+++ b/webapps/docs/architecture/startup/serverStartup.txt
@@ -45,7 +45,7 @@ What it does:
Configures a digester for the main server.xml elements like
org.apache.catalina.core.StandardServer (can change of course :)
org.apache.catalina.deploy.NamingResources
- Stores naming resources in the J2EE JNDI tree
+ Stores naming resources in the Jakarta EE JNDI tree
org.apache.catalina.LifecycleListener
implements events for start/stop of major components
org.apache.catalina.core.StandardService
diff --git a/webapps/docs/class-loader-howto.xml
b/webapps/docs/class-loader-howto.xml
index c65479c..8d15894 100644
--- a/webapps/docs/class-loader-howto.xml
+++ b/webapps/docs/class-loader-howto.xml
@@ -181,8 +181,8 @@ part of the JRE base classes cannot be overridden. There
are some exceptions
such as the XML parser components which can be overridden using the appropriate
JVM feature which is the endorsed standards override feature for Java <= 8
and the upgradeable modules feature for Java 9+.
-Lastly, the web application class loader will always delegate first for JavaEE
-API classes for the specifications implemented by Tomcat
+Lastly, the web application class loader will always delegate first for Jakarta
+EE API classes for the specifications implemented by Tomcat
(Servlet, JSP, EL, WebSocket). All other class loaders in Tomcat follow the
usual delegation pattern.</p>
diff --git a/webapps/docs/config/context.xml b/webapps/docs/config/context.xml
index 9f8d2b1..0f210df 100644
--- a/webapps/docs/config/context.xml
+++ b/webapps/docs/config/context.xml
@@ -858,7 +858,7 @@
provided JNDI context with a call to bind(), unbind(),
createSubContext(), destroySubContext() or close() will trigger a
<code>javax.naming.OperationNotSupportedException</code> as required by
- section EE.5.3.4 of the Java EE specification. This exception can be
+ section EE.5.3.4 of the Jakarta EE specification. This exception can be
disabled by setting this attribute to false in which case any calls to
modify the JNDI context will return <b>without</b> making any changes
and methods that return values will return <code>null</code>. If not
@@ -900,8 +900,7 @@
<attribute name="useNaming" required="false">
<p>Set to <code>true</code> (the default) to have Catalina enable a
JNDI <code>InitialContext</code> for this web application that is
- compatible with Java2 Enterprise Edition (J2EE) platform
- conventions.</p>
+ compatible with Jakarta EE platform conventions.</p>
</attribute>
<attribute name="workDir" required="false">
diff --git a/webapps/docs/jndi-resources-howto.xml
b/webapps/docs/jndi-resources-howto.xml
index ff03cd4..3888eaa 100644
--- a/webapps/docs/jndi-resources-howto.xml
+++ b/webapps/docs/jndi-resources-howto.xml
@@ -39,19 +39,18 @@
<p>Tomcat provides a JNDI <strong>InitialContext</strong> implementation
instance for each web application running under it, in a manner that is
compatible with those provided by a
-<a href="http://www.oracle.com/technetwork/java/javaee/overview/index.html";>
-Java Enterprise Edition</a> application server. The Java EE standard provides
-a standard set of elements in the <code>/WEB-INF/web.xml</code> file to
-reference/define resources.</p>
+<a href="https://jakarta.ee/";>Jakarta EE</a> application server. The Jakarta EE
+standard provides a standard set of elements in the
+<code>/WEB-INF/web.xml</code> file to reference/define resources.</p>
<p>See the following Specifications for more information about programming APIs
-for JNDI, and for the features supported by Java Enterprise Edition (Java EE)
-servers, which Tomcat emulates for the services that it provides:</p>
+for JNDI, and for the features supported by Jakarta EE servers, which Tomcat
+emulates for the services that it provides:</p>
<ul>
<li><a
href="http://docs.oracle.com/javase/7/docs/technotes/guides/jndi/index.html";>
Java Naming and Directory Interface</a> (included in JDK 1.4 onwards)</li>
-<li><a
href="http://www.oracle.com/technetwork/java/javaee/documentation/index.html";>
- Java EE Platform Specification</a> (in particular, see Chapter 5 on
<em>Naming</em>)</li>
+<li><a href="https://jakarta.ee/specifications/platform/9/";> Jakarta EE
Platform
+ Specification</a> (in particular, see Chapter 5 on <em>Naming</em>)</li>
</ul>
</section>
@@ -215,7 +214,7 @@ conn.close();]]></source>
<p><em>NOTE</em> - Of the standard resource factories, only the
"JDBC Data Source" and "User Transaction" factories are mandated to
be available on other platforms, and then they are required only if
- the platform implements the Java Enterprise Edition (Java EE) specs.
+ the platform implements the Jakarta EE specs.
All other standard resource factories, plus custom resource factories
that you write yourself, are specific to Tomcat and cannot be assumed
to be available on other containers.</p>
@@ -644,12 +643,12 @@ Transport.send(message);]]></source>
<h5>0. Introduction</h5>
<p>Many web applications need to access a database via a JDBC driver,
- to support the functionality required by that application. The Java EE
- Platform Specification requires Java EE Application Servers to make
+ to support the functionality required by that application. The Jakarta EE
+ Platform Specification requires Jakarta EE Application Servers to make
available a <em>DataSource</em> implementation (that is, a connection
pool for JDBC connections) for this purpose. Tomcat offers exactly
the same support, so that database-based applications you develop on
- Tomcat using this service will run unchanged on any Java EE server.</p>
+ Tomcat using this service will run unchanged on any Jakarta EE server.</p>
<p>For information about JDBC, you should consult the following:</p>
<ul>
@@ -662,10 +661,10 @@ Transport.send(message);]]></source>
The JDBC 2.0 Standard Extension API (including the
<code>javax.sql.DataSource</code> API). This package is now known
as the "JDBC Optional Package".</li>
- <li><a
href="http://www.oracle.com/technetwork/java/javaee/overview/index.htm";>
- http://www.oracle.com/technetwork/java/javaee/overview/index.htm</a> -
- The Java EE Platform Specification (covers the JDBC facilities that
- all Java EE platforms must provide to applications).</li>
+ <li><a href="https://jakarta.ee/specifications/platform/9/";>
+ https://jakarta.ee/specifications/platform/9/</a> -
+ The Jakarta EE Platform Specification (covers the JDBC facilities that
+ all Jakarta EE platforms must provide to applications).</li>
</ul>
<p><strong>NOTE</strong> - The default data source support in Tomcat
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
