From d6cce13bb489038887fcbdf6c9da2753e2a014e9 Mon Sep 17 00:00:00 2001
From: David Blevins <david.blevins@gmail.com>
Date: Fri, 28 Aug 2020 09:57:11 -0700
Subject: [PATCH] Apply javax-to-jakarta renames where still needed

Signed-off-by: David Blevins <david.blevins@gmail.com>
---
 .../jakarta/resource/AdministeredObjectDefinition.java    | 2 +-
 .../jakarta/resource/ConnectionFactoryDefinition.java     | 2 +-
 api/src/main/java/jakarta/resource/Referenceable.java     | 2 +-
 .../main/java/jakarta/resource/cci/ConnectionFactory.java | 2 +-
 api/src/main/java/jakarta/resource/cci/Interaction.java   | 2 +-
 api/src/main/java/jakarta/resource/cci/MappedRecord.java  | 2 +-
 .../jakarta/resource/cci/ResourceAdapterMetaData.java     | 2 +-
 api/src/main/java/jakarta/resource/cci/package.html       | 2 +-
 api/src/main/java/jakarta/resource/package.html           | 2 +-
 .../jakarta/resource/spi/AuthenticationMechanism.java     | 8 ++++----
 .../java/jakarta/resource/spi/ConnectionDefinition.java   | 4 ++--
 .../main/java/jakarta/resource/spi/LocalTransaction.java  | 2 +-
 .../main/java/jakarta/resource/spi/ManagedConnection.java | 6 +++---
 .../jakarta/resource/spi/ManagedConnectionFactory.java    | 4 ++--
 api/src/main/java/jakarta/resource/spi/package.html       | 2 +-
 .../jakarta/resource/spi/security/GenericCredential.java  | 2 +-
 .../main/java/jakarta/resource/spi/security/package.html  | 2 +-
 .../main/java/jakarta/resource/spi/work/HintsContext.java | 6 +++---
 18 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/api/src/main/java/jakarta/resource/AdministeredObjectDefinition.java b/api/src/main/java/jakarta/resource/AdministeredObjectDefinition.java
index ead80a1..51048c1 100644
--- a/api/src/main/java/jakarta/resource/AdministeredObjectDefinition.java
+++ b/api/src/main/java/jakarta/resource/AdministeredObjectDefinition.java
@@ -30,7 +30,7 @@
  *  by a component using the <code>lookup</code> element of the
  *  <code>Resource</code> annotation.
  *
- *  @see javax.annotation.Resource
+ *  @see jakarta.annotation.Resource
  *  @version 1.7
  *  @since 1.7
  */
diff --git a/api/src/main/java/jakarta/resource/ConnectionFactoryDefinition.java b/api/src/main/java/jakarta/resource/ConnectionFactoryDefinition.java
index 064301f..b8eecdc 100644
--- a/api/src/main/java/jakarta/resource/ConnectionFactoryDefinition.java
+++ b/api/src/main/java/jakarta/resource/ConnectionFactoryDefinition.java
@@ -31,7 +31,7 @@
  *  Once defined, a resource may be referenced by a component using the
  *  <code>lookup</code> element of the <code>Resource</code> annotation.
  *
- *  @see javax.annotation.Resource
+ *  @see jakarta.annotation.Resource
  *  @version 1.7
  *  @since 1.7
  */
diff --git a/api/src/main/java/jakarta/resource/Referenceable.java b/api/src/main/java/jakarta/resource/Referenceable.java
index edf1cb0..6369500 100644
--- a/api/src/main/java/jakarta/resource/Referenceable.java
+++ b/api/src/main/java/jakarta/resource/Referenceable.java
@@ -26,7 +26,7 @@
  *
  *  <p>The implementation class for a connection factory interface is 
  *  required to implement both java.io.Serializable and 
- *  javax.resource.Referenceable interfaces to support JNDI registration.
+ *  jakarta.resource.Referenceable interfaces to support JNDI registration.
  *
  *  @version     0.9
  *  @author      Rahul Sharma
diff --git a/api/src/main/java/jakarta/resource/cci/ConnectionFactory.java b/api/src/main/java/jakarta/resource/cci/ConnectionFactory.java
index 8f44b75..7300864 100644
--- a/api/src/main/java/jakarta/resource/cci/ConnectionFactory.java
+++ b/api/src/main/java/jakarta/resource/cci/ConnectionFactory.java
@@ -68,7 +68,7 @@ public interface ConnectionFactory
   Connection getConnection() throws ResourceException;
 
   /** Gets a connection to an EIS instance. A component should use 
-   *  the getConnection variant with javax.resource.cci.ConnectionSpec
+   *  the getConnection variant with jakarta.resource.cci.ConnectionSpec
    *  parameter, if it needs to pass any resource adapter specific 
    *  security information and connection parameters. In the component-
    *  managed sign-on case, an application component passes security 
diff --git a/api/src/main/java/jakarta/resource/cci/Interaction.java b/api/src/main/java/jakarta/resource/cci/Interaction.java
index 63a9fe7..17953d9 100644
--- a/api/src/main/java/jakarta/resource/cci/Interaction.java
+++ b/api/src/main/java/jakarta/resource/cci/Interaction.java
@@ -20,7 +20,7 @@
 import jakarta.resource.NotSupportedException;
 
 
-/** The <code>javax.resource.cci.Interaction</code> enables a component to 
+/** The <code>jakarta.resource.cci.Interaction</code> enables a component to 
  *  execute EIS functions. An Interaction instance supports the following ways 
  *  of interacting with an EIS instance:
  *  <UL>
diff --git a/api/src/main/java/jakarta/resource/cci/MappedRecord.java b/api/src/main/java/jakarta/resource/cci/MappedRecord.java
index bf7a07c..b206a99 100644
--- a/api/src/main/java/jakarta/resource/cci/MappedRecord.java
+++ b/api/src/main/java/jakarta/resource/cci/MappedRecord.java
@@ -16,7 +16,7 @@
 
 package jakarta.resource.cci;
 
-/** The interface <code>javax.resource.cci.MappedRecord</code> is 
+/** The interface <code>jakarta.resource.cci.MappedRecord</code> is 
  *  used for key-value map based representation of record elements. 
  *  The MappedRecord interface extends both <code>Record</code> and 
  *  <code>java.util.Map</code>interfaces. 
diff --git a/api/src/main/java/jakarta/resource/cci/ResourceAdapterMetaData.java b/api/src/main/java/jakarta/resource/cci/ResourceAdapterMetaData.java
index 83a29bc..035cb92 100644
--- a/api/src/main/java/jakarta/resource/cci/ResourceAdapterMetaData.java
+++ b/api/src/main/java/jakarta/resource/cci/ResourceAdapterMetaData.java
@@ -16,7 +16,7 @@
 
 package jakarta.resource.cci;
 
-/** The interface <code>javax.resource.cci.ResourceAdapterMetaData</code> 
+/** The interface <code>jakarta.resource.cci.ResourceAdapterMetaData</code> 
  *  provides information about capabilities of a resource adapter 
  *  implementation. Note that this interface does not provide information 
  *  about an EIS instance that is connected through the resource adapter.
diff --git a/api/src/main/java/jakarta/resource/cci/package.html b/api/src/main/java/jakarta/resource/cci/package.html
index 56b8a1c..b0f9cf5 100644
--- a/api/src/main/java/jakarta/resource/cci/package.html
+++ b/api/src/main/java/jakarta/resource/cci/package.html
@@ -20,7 +20,7 @@
 
 </head>
 <body>
-The javax.resource.cci package contains API specification for the Common
+The jakarta.resource.cci package contains API specification for the Common
 Client Interface (CCI).
 </body>
 </html>
diff --git a/api/src/main/java/jakarta/resource/package.html b/api/src/main/java/jakarta/resource/package.html
index 822060f..e1fc61c 100644
--- a/api/src/main/java/jakarta/resource/package.html
+++ b/api/src/main/java/jakarta/resource/package.html
@@ -20,6 +20,6 @@
 
 </head>
 <body>
-The javax.resource package is the top-level package for the Jakarta&trade; Connectors specification. 
+The jakarta.resource package is the top-level package for the Jakarta&trade; Connectors specification. 
 </body>
 </html>
diff --git a/api/src/main/java/jakarta/resource/spi/AuthenticationMechanism.java b/api/src/main/java/jakarta/resource/spi/AuthenticationMechanism.java
index 66e1f1b..ffa0d30 100644
--- a/api/src/main/java/jakarta/resource/spi/AuthenticationMechanism.java
+++ b/api/src/main/java/jakarta/resource/spi/AuthenticationMechanism.java
@@ -47,7 +47,7 @@
     public enum CredentialInterface {
         /**
          * Corresponds to 
-         * <code>javax.resource.spi.security.PasswordCredential</code>.
+         * <code>jakarta.resource.spi.security.PasswordCredential</code>.
          * This is the default credential interface
          */
         PasswordCredential, 
@@ -59,7 +59,7 @@ public enum CredentialInterface {
         
         /**
          * Corresponds to 
-         * <code>javax.resource.spi.security.GenericCredential</code>
+         * <code>jakarta.resource.spi.security.GenericCredential</code>
          */
         GenericCredential 
     }
@@ -85,10 +85,10 @@ public enum CredentialInterface {
      * supports for the representation of the credentials.
      *
      * Note that BasicPassword mechanism type should support the
-     * <code>javax.resource.spi.security.PasswordCredential</code> interface.
+     * <code>jakarta.resource.spi.security.PasswordCredential</code> interface.
      * The Kerbv5 mechanism type should support the
      * <code>org.ietf.jgss.GSSCredential</code> interface or the deprecated
-     * <code>javax.resource.spi.security.GenericCredential</code> interface.
+     * <code>jakarta.resource.spi.security.GenericCredential</code> interface.
      */
     CredentialInterface credentialInterface() 
     					default CredentialInterface.PasswordCredential;
diff --git a/api/src/main/java/jakarta/resource/spi/ConnectionDefinition.java b/api/src/main/java/jakarta/resource/spi/ConnectionDefinition.java
index 0cca5df..e8017a6 100644
--- a/api/src/main/java/jakarta/resource/spi/ConnectionDefinition.java
+++ b/api/src/main/java/jakarta/resource/spi/ConnectionDefinition.java
@@ -41,7 +41,7 @@
 
 	/**
 	 * Specifies the ConnectionFactory interface supported by the resource
-	 * adapter. Example: javax.resource.cci.ConnectionFactory or
+	 * adapter. Example: jakarta.resource.cci.ConnectionFactory or
 	 * com.wombat.ConnectionFactory
 	 */
 	Class connectionFactory();
@@ -55,7 +55,7 @@
 
 	/**
 	 * Specifies the Connection interface supported by the resource adapter.
-	 * Example: javax.resource.cci.Connection or com.wombat.Connection
+	 * Example: jakarta.resource.cci.Connection or com.wombat.Connection
 	 */
 	Class connection();
 
diff --git a/api/src/main/java/jakarta/resource/spi/LocalTransaction.java b/api/src/main/java/jakarta/resource/spi/LocalTransaction.java
index 3f7a1eb..e33073c 100644
--- a/api/src/main/java/jakarta/resource/spi/LocalTransaction.java
+++ b/api/src/main/java/jakarta/resource/spi/LocalTransaction.java
@@ -22,7 +22,7 @@
  *  are managed internal to an EIS resource manager, and do not require
  *  an external transaction manager.
  * 
- *  <p>A resource adapter implements the javax.resource.spi.LocalTransaction 
+ *  <p>A resource adapter implements the jakarta.resource.spi.LocalTransaction 
  *  interface to provide support for local transactions that are performed
  *  on the underlying resource manager.
  *
diff --git a/api/src/main/java/jakarta/resource/spi/ManagedConnection.java b/api/src/main/java/jakarta/resource/spi/ManagedConnection.java
index 08eee02..9f9d95e 100644
--- a/api/src/main/java/jakarta/resource/spi/ManagedConnection.java
+++ b/api/src/main/java/jakarta/resource/spi/ManagedConnection.java
@@ -25,7 +25,7 @@
  *
  *  <p>A ManagedConnection instance provides access to a pair of 
  *  interfaces: <code>javax.transaction.xa.XAResource</code> and 
- *  <code>javax.resource.spi.LocalTransaction</code>.
+ *  <code>jakarta.resource.spi.LocalTransaction</code>.
  *
  *  <p><code> XAResource</code> interface is used by the transaction 
  *  manager to associate and dissociate a transaction with the underlying 
@@ -62,7 +62,7 @@ public interface ManagedConnection {
    *  @return       generic Object instance representing the connection 
    *                handle. For CCI, the connection handle created by a 
    *                ManagedConnection instance is of the type 
-   *                javax.resource.cci.Connection.
+   *                jakarta.resource.cci.Connection.
    *
    *  @throws  ResourceException     generic exception if operation fails
    *  @throws  ResourceAdapterInternalException
@@ -202,7 +202,7 @@ void removeConnectionEventListener(
   public 
   XAResource getXAResource() throws ResourceException;
 
-  /** Returns an <code>javax.resource.spi.LocalTransaction</code> instance. 
+  /** Returns an <code>jakarta.resource.spi.LocalTransaction</code> instance. 
    *  The LocalTransaction interface is used by the container to manage
    *  local transactions for a RM instance.
    *
diff --git a/api/src/main/java/jakarta/resource/spi/ManagedConnectionFactory.java b/api/src/main/java/jakarta/resource/spi/ManagedConnectionFactory.java
index 789df7e..bc4564a 100644
--- a/api/src/main/java/jakarta/resource/spi/ManagedConnectionFactory.java
+++ b/api/src/main/java/jakarta/resource/spi/ManagedConnectionFactory.java
@@ -45,7 +45,7 @@ public interface ManagedConnectionFactory extends java.io.Serializable {
      *  @param    cxManager    ConnectionManager to be associated with
      *                         created EIS connection factory instance
      *  @return   EIS-specific Connection Factory instance or
-     *            javax.resource.cci.ConnectionFactory instance
+     *            jakarta.resource.cci.ConnectionFactory instance
      *   
      *  @throws   ResourceException     Generic exception
      *  @throws   ResourceAdapterInternalException
@@ -60,7 +60,7 @@ public Object createConnectionFactory(ConnectionManager cxManager)
      *  by the resource adapter.
      *
      *  @return   EIS-specific Connection Factory instance or
-     *            javax.resource.cci.ConnectionFactory instance
+     *            jakarta.resource.cci.ConnectionFactory instance
      *
      *  @throws   ResourceException     Generic exception
      *  @throws   ResourceAdapterInternalException
diff --git a/api/src/main/java/jakarta/resource/spi/package.html b/api/src/main/java/jakarta/resource/spi/package.html
index 24dd5e3..413950c 100644
--- a/api/src/main/java/jakarta/resource/spi/package.html
+++ b/api/src/main/java/jakarta/resource/spi/package.html
@@ -20,7 +20,7 @@
 
 </head>
 <body>
-The javax.resource.spi package contains APIs for the system
+The jakarta.resource.spi package contains APIs for the system
 contracts defined in the Jakarta Connectors specification.
 </body>
 </html>
diff --git a/api/src/main/java/jakarta/resource/spi/security/GenericCredential.java b/api/src/main/java/jakarta/resource/spi/security/GenericCredential.java
index 4536de6..0b1fef0 100644
--- a/api/src/main/java/jakarta/resource/spi/security/GenericCredential.java
+++ b/api/src/main/java/jakarta/resource/spi/security/GenericCredential.java
@@ -18,7 +18,7 @@
 
 import jakarta.resource.spi.SecurityException;
 
-/** The interface <code>javax.resource.spi.security.GenericCredential</code> 
+/** The interface <code>jakarta.resource.spi.security.GenericCredential</code> 
  *  defines a security mechanism independent interface for accessing 
  *  security credential of a resource principal. 
  *
diff --git a/api/src/main/java/jakarta/resource/spi/security/package.html b/api/src/main/java/jakarta/resource/spi/security/package.html
index 27c285b..33d6865 100644
--- a/api/src/main/java/jakarta/resource/spi/security/package.html
+++ b/api/src/main/java/jakarta/resource/spi/security/package.html
@@ -20,7 +20,7 @@
 
 </head>
 <body>
-The javax.resource.spi.security package contains APIs for the security
+The jakarta.resource.spi.security package contains APIs for the security
 management contract.
 </body>
 </html>
diff --git a/api/src/main/java/jakarta/resource/spi/work/HintsContext.java b/api/src/main/java/jakarta/resource/spi/work/HintsContext.java
index 6c364ac..3504b4e 100644
--- a/api/src/main/java/jakarta/resource/spi/work/HintsContext.java
+++ b/api/src/main/java/jakarta/resource/spi/work/HintsContext.java
@@ -37,8 +37,8 @@ public class HintsContext implements WorkContext {
 	 */
 	private static final long serialVersionUID = 7956353628297167255L;
 	
-	public static final String NAME_HINT = "javax.resource.Name";
-	public static final String LONGRUNNING_HINT = "javax.resource.LongRunning";
+	public static final String NAME_HINT = "jakarta.resource.Name";
+	public static final String LONGRUNNING_HINT = "jakarta.resource.LongRunning";
 
 	protected String description = "Hints Context";
 	protected String name = "HintsContext";
@@ -82,7 +82,7 @@ public void setName(String name) {
 	/**
 	 * Set a Hint and a related value. The hintName must be non-Null. Standard
 	 * HintNames are defined in the Jakarta Connectors specification. Use of
-	 * "javax.resource." prefixed hintNames are reserved for use by the
+	 * "jakarta.resource." prefixed hintNames are reserved for use by the
 	 * Jakarta Connectors specification.
 	 * 
 	 */