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

commit 35dc7b9288aad4a7d70750c157543d4ff1593c98
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Nov 28 14:03:48 2019 +0000

    Rename "javax.security.auth.message" to "jakarta.security.auth.message"
---
 build.xml                                           |  4 ++--
 .../security/auth/message/AuthException.java        |  2 +-
 .../security/auth/message/AuthStatus.java           |  2 +-
 .../security/auth/message/ClientAuth.java           |  2 +-
 .../security/auth/message/MessageInfo.java          |  2 +-
 .../security/auth/message/MessagePolicy.java        |  2 +-
 .../security/auth/message/ServerAuth.java           |  2 +-
 .../message/callback/CallerPrincipalCallback.java   |  2 +-
 .../auth/message/callback/CertStoreCallback.java    |  2 +-
 .../message/callback/GroupPrincipalCallback.java    |  2 +-
 .../callback/PasswordValidationCallback.java        |  2 +-
 .../auth/message/callback/PrivateKeyCallback.java   |  2 +-
 .../auth/message/callback/SecretKeyCallback.java    |  2 +-
 .../auth/message/callback/TrustStoreCallback.java   |  2 +-
 .../security/auth/message/config/AuthConfig.java    |  4 ++--
 .../auth/message/config/AuthConfigFactory.java      |  2 +-
 .../auth/message/config/AuthConfigProvider.java     |  5 +++--
 .../auth/message/config/ClientAuthConfig.java       |  5 +++--
 .../auth/message/config/ClientAuthContext.java      |  4 ++--
 .../auth/message/config/RegistrationListener.java   |  2 +-
 .../auth/message/config/ServerAuthConfig.java       |  5 +++--
 .../auth/message/config/ServerAuthContext.java      |  4 ++--
 .../auth/message/module/ClientAuthModule.java       |  9 +++++----
 .../auth/message/module/ServerAuthModule.java       |  9 +++++----
 .../catalina/authenticator/AuthenticatorBase.java   | 17 +++++++++--------
 .../authenticator/jaspic/AuthConfigFactoryImpl.java |  6 +++---
 .../authenticator/jaspic/CallbackHandlerImpl.java   |  5 +++--
 .../authenticator/jaspic/MessageInfoImpl.java       |  5 +++--
 .../jaspic/SimpleAuthConfigProvider.java            | 13 +++++++------
 .../jaspic/SimpleServerAuthConfig.java              | 11 ++++++-----
 .../jaspic/SimpleServerAuthContext.java             | 11 ++++++-----
 res/META-INF/jaspic-api.jar.manifest                |  6 +++---
 res/bnd/jaspic-api.jar.tmp.bnd                      |  8 ++++----
 res/bnd/tomcat-embed-core.jar.tmp.bnd               |  8 ++++----
 res/checkstyle/jakarta-import-control.xml           | 21 +++++++++++++++++++++
 res/checkstyle/javax-import-control.xml             | 21 ---------------------
 res/checkstyle/org-import-control.xml               |  2 ++
 res/maven/tomcat-jaspic-api.pom                     |  2 +-
 .../jaspic/TestAuthConfigFactoryImpl.java           |  6 +++---
 .../jaspic/TestSimpleServerAuthConfig.java          |  8 ++++----
 .../authenticator/jaspic/TesterMessageInfo.java     |  2 +-
 .../jaspic/TesterServerAuthModuleA.java             | 11 ++++++-----
 .../catalina/loader/TestWebappClassLoader.java      |  2 +-
 43 files changed, 129 insertions(+), 115 deletions(-)

diff --git a/build.xml b/build.xml
index 821ba8c..a553b56 100644
--- a/build.xml
+++ b/build.xml
@@ -352,7 +352,7 @@
   </patternset>
 
   <patternset id="files.jaspic-api">
-    <include name="javax/security/auth/message/**" />
+    <include name="jakarta/security/auth/message/**" />
   </patternset>
 
   <patternset id="files.tomcat-websocket">
@@ -1992,7 +1992,7 @@ Apache Tomcat ${version} native binaries for Win64 
AMD64/EMT64 platform.
         <path location="${ant.core.lib}"/>
       </classpath>
     </javadoc>
-    <javadoc packagenames="javax.security.auth.message.*"
+    <javadoc packagenames="jakarta.security.auth.message.*"
       sourcepath="${tomcat.dist}/src/java"
       destdir="${tomcat.dist}/webapps/docs/jaspicapi"
       version="true"
diff --git a/java/javax/security/auth/message/AuthException.java 
b/java/jakarta/security/auth/message/AuthException.java
similarity index 96%
rename from java/javax/security/auth/message/AuthException.java
rename to java/jakarta/security/auth/message/AuthException.java
index a043772..bc51ae6 100644
--- a/java/javax/security/auth/message/AuthException.java
+++ b/java/jakarta/security/auth/message/AuthException.java
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package javax.security.auth.message;
+package jakarta.security.auth.message;
 
 import javax.security.auth.login.LoginException;
 
diff --git a/java/javax/security/auth/message/AuthStatus.java 
b/java/jakarta/security/auth/message/AuthStatus.java
similarity index 97%
rename from java/javax/security/auth/message/AuthStatus.java
rename to java/jakarta/security/auth/message/AuthStatus.java
index b9ca385..2e9c10d 100644
--- a/java/javax/security/auth/message/AuthStatus.java
+++ b/java/jakarta/security/auth/message/AuthStatus.java
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package javax.security.auth.message;
+package jakarta.security.auth.message;
 
 public class AuthStatus {
 
diff --git a/java/javax/security/auth/message/ClientAuth.java 
b/java/jakarta/security/auth/message/ClientAuth.java
similarity index 96%
rename from java/javax/security/auth/message/ClientAuth.java
rename to java/jakarta/security/auth/message/ClientAuth.java
index a537ef2..c1cf471 100644
--- a/java/javax/security/auth/message/ClientAuth.java
+++ b/java/jakarta/security/auth/message/ClientAuth.java
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package javax.security.auth.message;
+package jakarta.security.auth.message;
 
 import javax.security.auth.Subject;
 
diff --git a/java/javax/security/auth/message/MessageInfo.java 
b/java/jakarta/security/auth/message/MessageInfo.java
similarity index 96%
rename from java/javax/security/auth/message/MessageInfo.java
rename to java/jakarta/security/auth/message/MessageInfo.java
index dc3d263..4d915b9 100644
--- a/java/javax/security/auth/message/MessageInfo.java
+++ b/java/jakarta/security/auth/message/MessageInfo.java
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package javax.security.auth.message;
+package jakarta.security.auth.message;
 
 import java.util.Map;
 
diff --git a/java/javax/security/auth/message/MessagePolicy.java 
b/java/jakarta/security/auth/message/MessagePolicy.java
similarity index 98%
rename from java/javax/security/auth/message/MessagePolicy.java
rename to java/jakarta/security/auth/message/MessagePolicy.java
index 39673b2..603705c 100644
--- a/java/javax/security/auth/message/MessagePolicy.java
+++ b/java/jakarta/security/auth/message/MessagePolicy.java
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package javax.security.auth.message;
+package jakarta.security.auth.message;
 
 public class MessagePolicy {
 
diff --git a/java/javax/security/auth/message/ServerAuth.java 
b/java/jakarta/security/auth/message/ServerAuth.java
similarity index 96%
rename from java/javax/security/auth/message/ServerAuth.java
rename to java/jakarta/security/auth/message/ServerAuth.java
index bb404f5..0ecff10 100644
--- a/java/javax/security/auth/message/ServerAuth.java
+++ b/java/jakarta/security/auth/message/ServerAuth.java
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package javax.security.auth.message;
+package jakarta.security.auth.message;
 
 import javax.security.auth.Subject;
 
diff --git 
a/java/javax/security/auth/message/callback/CallerPrincipalCallback.java 
b/java/jakarta/security/auth/message/callback/CallerPrincipalCallback.java
similarity index 97%
rename from 
java/javax/security/auth/message/callback/CallerPrincipalCallback.java
rename to 
java/jakarta/security/auth/message/callback/CallerPrincipalCallback.java
index 2c7010f..12ec34d 100644
--- a/java/javax/security/auth/message/callback/CallerPrincipalCallback.java
+++ b/java/jakarta/security/auth/message/callback/CallerPrincipalCallback.java
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package javax.security.auth.message.callback;
+package jakarta.security.auth.message.callback;
 
 import java.security.Principal;
 
diff --git a/java/javax/security/auth/message/callback/CertStoreCallback.java 
b/java/jakarta/security/auth/message/callback/CertStoreCallback.java
similarity index 96%
rename from java/javax/security/auth/message/callback/CertStoreCallback.java
rename to java/jakarta/security/auth/message/callback/CertStoreCallback.java
index 13734e8..fde1129 100644
--- a/java/javax/security/auth/message/callback/CertStoreCallback.java
+++ b/java/jakarta/security/auth/message/callback/CertStoreCallback.java
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package javax.security.auth.message.callback;
+package jakarta.security.auth.message.callback;
 
 import java.security.cert.CertStore;
 
diff --git 
a/java/javax/security/auth/message/callback/GroupPrincipalCallback.java 
b/java/jakarta/security/auth/message/callback/GroupPrincipalCallback.java
similarity index 96%
rename from 
java/javax/security/auth/message/callback/GroupPrincipalCallback.java
rename to 
java/jakarta/security/auth/message/callback/GroupPrincipalCallback.java
index f44c046..738878a 100644
--- a/java/javax/security/auth/message/callback/GroupPrincipalCallback.java
+++ b/java/jakarta/security/auth/message/callback/GroupPrincipalCallback.java
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package javax.security.auth.message.callback;
+package jakarta.security.auth.message.callback;
 
 import javax.security.auth.Subject;
 import javax.security.auth.callback.Callback;
diff --git 
a/java/javax/security/auth/message/callback/PasswordValidationCallback.java 
b/java/jakarta/security/auth/message/callback/PasswordValidationCallback.java
similarity index 97%
rename from 
java/javax/security/auth/message/callback/PasswordValidationCallback.java
rename to 
java/jakarta/security/auth/message/callback/PasswordValidationCallback.java
index 2eaad2d..5c8fb20 100644
--- a/java/javax/security/auth/message/callback/PasswordValidationCallback.java
+++ 
b/java/jakarta/security/auth/message/callback/PasswordValidationCallback.java
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package javax.security.auth.message.callback;
+package jakarta.security.auth.message.callback;
 
 import java.util.Arrays;
 
diff --git a/java/javax/security/auth/message/callback/PrivateKeyCallback.java 
b/java/jakarta/security/auth/message/callback/PrivateKeyCallback.java
similarity index 98%
rename from java/javax/security/auth/message/callback/PrivateKeyCallback.java
rename to java/jakarta/security/auth/message/callback/PrivateKeyCallback.java
index 76feefe..fb9d43b 100644
--- a/java/javax/security/auth/message/callback/PrivateKeyCallback.java
+++ b/java/jakarta/security/auth/message/callback/PrivateKeyCallback.java
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package javax.security.auth.message.callback;
+package jakarta.security.auth.message.callback;
 
 import java.math.BigInteger;
 import java.security.PrivateKey;
diff --git a/java/javax/security/auth/message/callback/SecretKeyCallback.java 
b/java/jakarta/security/auth/message/callback/SecretKeyCallback.java
similarity index 97%
rename from java/javax/security/auth/message/callback/SecretKeyCallback.java
rename to java/jakarta/security/auth/message/callback/SecretKeyCallback.java
index ff248fc..71c6a4d 100644
--- a/java/javax/security/auth/message/callback/SecretKeyCallback.java
+++ b/java/jakarta/security/auth/message/callback/SecretKeyCallback.java
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package javax.security.auth.message.callback;
+package jakarta.security.auth.message.callback;
 
 import javax.crypto.SecretKey;
 import javax.security.auth.callback.Callback;
diff --git a/java/javax/security/auth/message/callback/TrustStoreCallback.java 
b/java/jakarta/security/auth/message/callback/TrustStoreCallback.java
similarity index 96%
rename from java/javax/security/auth/message/callback/TrustStoreCallback.java
rename to java/jakarta/security/auth/message/callback/TrustStoreCallback.java
index 8312e44..ca35e37 100644
--- a/java/javax/security/auth/message/callback/TrustStoreCallback.java
+++ b/java/jakarta/security/auth/message/callback/TrustStoreCallback.java
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package javax.security.auth.message.callback;
+package jakarta.security.auth.message.callback;
 
 import java.security.KeyStore;
 
diff --git a/java/javax/security/auth/message/config/AuthConfig.java 
b/java/jakarta/security/auth/message/config/AuthConfig.java
similarity index 91%
rename from java/javax/security/auth/message/config/AuthConfig.java
rename to java/jakarta/security/auth/message/config/AuthConfig.java
index 701a3eb..bd9feed 100644
--- a/java/javax/security/auth/message/config/AuthConfig.java
+++ b/java/jakarta/security/auth/message/config/AuthConfig.java
@@ -14,9 +14,9 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package javax.security.auth.message.config;
+package jakarta.security.auth.message.config;
 
-import javax.security.auth.message.MessageInfo;
+import jakarta.security.auth.message.MessageInfo;
 
 public interface AuthConfig {
 
diff --git a/java/javax/security/auth/message/config/AuthConfigFactory.java 
b/java/jakarta/security/auth/message/config/AuthConfigFactory.java
similarity index 99%
rename from java/javax/security/auth/message/config/AuthConfigFactory.java
rename to java/jakarta/security/auth/message/config/AuthConfigFactory.java
index d98b2f2..d0e1cbd 100644
--- a/java/javax/security/auth/message/config/AuthConfigFactory.java
+++ b/java/jakarta/security/auth/message/config/AuthConfigFactory.java
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package javax.security.auth.message.config;
+package jakarta.security.auth.message.config;
 
 import java.security.AccessController;
 import java.security.Permission;
diff --git a/java/javax/security/auth/message/config/AuthConfigProvider.java 
b/java/jakarta/security/auth/message/config/AuthConfigProvider.java
similarity index 92%
rename from java/javax/security/auth/message/config/AuthConfigProvider.java
rename to java/jakarta/security/auth/message/config/AuthConfigProvider.java
index ddde485..99a47a3 100644
--- a/java/javax/security/auth/message/config/AuthConfigProvider.java
+++ b/java/jakarta/security/auth/message/config/AuthConfigProvider.java
@@ -14,10 +14,11 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package javax.security.auth.message.config;
+package jakarta.security.auth.message.config;
 
 import javax.security.auth.callback.CallbackHandler;
-import javax.security.auth.message.AuthException;
+
+import jakarta.security.auth.message.AuthException;
 
 public interface AuthConfigProvider {
 
diff --git a/java/javax/security/auth/message/config/ClientAuthConfig.java 
b/java/jakarta/security/auth/message/config/ClientAuthConfig.java
similarity index 91%
rename from java/javax/security/auth/message/config/ClientAuthConfig.java
rename to java/jakarta/security/auth/message/config/ClientAuthConfig.java
index 2c13584..fbb2d22 100644
--- a/java/javax/security/auth/message/config/ClientAuthConfig.java
+++ b/java/jakarta/security/auth/message/config/ClientAuthConfig.java
@@ -14,12 +14,13 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package javax.security.auth.message.config;
+package jakarta.security.auth.message.config;
 
 import java.util.Map;
 
 import javax.security.auth.Subject;
-import javax.security.auth.message.AuthException;
+
+import jakarta.security.auth.message.AuthException;
 
 public interface ClientAuthConfig extends AuthConfig {
 
diff --git a/java/javax/security/auth/message/config/ClientAuthContext.java 
b/java/jakarta/security/auth/message/config/ClientAuthContext.java
similarity index 90%
rename from java/javax/security/auth/message/config/ClientAuthContext.java
rename to java/jakarta/security/auth/message/config/ClientAuthContext.java
index dfc58a6..4321e8a 100644
--- a/java/javax/security/auth/message/config/ClientAuthContext.java
+++ b/java/jakarta/security/auth/message/config/ClientAuthContext.java
@@ -14,9 +14,9 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package javax.security.auth.message.config;
+package jakarta.security.auth.message.config;
 
-import javax.security.auth.message.ClientAuth;
+import jakarta.security.auth.message.ClientAuth;
 
 public interface ClientAuthContext extends ClientAuth {
 }
diff --git a/java/javax/security/auth/message/config/RegistrationListener.java 
b/java/jakarta/security/auth/message/config/RegistrationListener.java
similarity index 95%
rename from java/javax/security/auth/message/config/RegistrationListener.java
rename to java/jakarta/security/auth/message/config/RegistrationListener.java
index 74496fb..0d6f76d 100644
--- a/java/javax/security/auth/message/config/RegistrationListener.java
+++ b/java/jakarta/security/auth/message/config/RegistrationListener.java
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package javax.security.auth.message.config;
+package jakarta.security.auth.message.config;
 
 public interface RegistrationListener {
 
diff --git a/java/javax/security/auth/message/config/ServerAuthConfig.java 
b/java/jakarta/security/auth/message/config/ServerAuthConfig.java
similarity index 91%
rename from java/javax/security/auth/message/config/ServerAuthConfig.java
rename to java/jakarta/security/auth/message/config/ServerAuthConfig.java
index de22a51..d8aee8b 100644
--- a/java/javax/security/auth/message/config/ServerAuthConfig.java
+++ b/java/jakarta/security/auth/message/config/ServerAuthConfig.java
@@ -14,12 +14,13 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package javax.security.auth.message.config;
+package jakarta.security.auth.message.config;
 
 import java.util.Map;
 
 import javax.security.auth.Subject;
-import javax.security.auth.message.AuthException;
+
+import jakarta.security.auth.message.AuthException;
 
 public interface ServerAuthConfig extends AuthConfig {
 
diff --git a/java/javax/security/auth/message/config/ServerAuthContext.java 
b/java/jakarta/security/auth/message/config/ServerAuthContext.java
similarity index 90%
rename from java/javax/security/auth/message/config/ServerAuthContext.java
rename to java/jakarta/security/auth/message/config/ServerAuthContext.java
index 4c627ab..6f088fe 100644
--- a/java/javax/security/auth/message/config/ServerAuthContext.java
+++ b/java/jakarta/security/auth/message/config/ServerAuthContext.java
@@ -14,9 +14,9 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package javax.security.auth.message.config;
+package jakarta.security.auth.message.config;
 
-import javax.security.auth.message.ServerAuth;
+import jakarta.security.auth.message.ServerAuth;
 
 public interface ServerAuthContext extends ServerAuth {
 }
diff --git a/java/javax/security/auth/message/module/ClientAuthModule.java 
b/java/jakarta/security/auth/message/module/ClientAuthModule.java
similarity index 86%
rename from java/javax/security/auth/message/module/ClientAuthModule.java
rename to java/jakarta/security/auth/message/module/ClientAuthModule.java
index 6cb5c4e..f525500 100644
--- a/java/javax/security/auth/message/module/ClientAuthModule.java
+++ b/java/jakarta/security/auth/message/module/ClientAuthModule.java
@@ -14,14 +14,15 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package javax.security.auth.message.module;
+package jakarta.security.auth.message.module;
 
 import java.util.Map;
 
 import javax.security.auth.callback.CallbackHandler;
-import javax.security.auth.message.AuthException;
-import javax.security.auth.message.ClientAuth;
-import javax.security.auth.message.MessagePolicy;
+
+import jakarta.security.auth.message.AuthException;
+import jakarta.security.auth.message.ClientAuth;
+import jakarta.security.auth.message.MessagePolicy;
 
 public interface ClientAuthModule extends ClientAuth {
 
diff --git a/java/javax/security/auth/message/module/ServerAuthModule.java 
b/java/jakarta/security/auth/message/module/ServerAuthModule.java
similarity index 86%
rename from java/javax/security/auth/message/module/ServerAuthModule.java
rename to java/jakarta/security/auth/message/module/ServerAuthModule.java
index 4b3a6fb..e8337ae 100644
--- a/java/javax/security/auth/message/module/ServerAuthModule.java
+++ b/java/jakarta/security/auth/message/module/ServerAuthModule.java
@@ -14,14 +14,15 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package javax.security.auth.message.module;
+package jakarta.security.auth.message.module;
 
 import java.util.Map;
 
 import javax.security.auth.callback.CallbackHandler;
-import javax.security.auth.message.AuthException;
-import javax.security.auth.message.MessagePolicy;
-import javax.security.auth.message.ServerAuth;
+
+import jakarta.security.auth.message.AuthException;
+import jakarta.security.auth.message.MessagePolicy;
+import jakarta.security.auth.message.ServerAuth;
 
 public interface ServerAuthModule extends ServerAuth {
 
diff --git a/java/org/apache/catalina/authenticator/AuthenticatorBase.java 
b/java/org/apache/catalina/authenticator/AuthenticatorBase.java
index 208155f..b468fb1 100644
--- a/java/org/apache/catalina/authenticator/AuthenticatorBase.java
+++ b/java/org/apache/catalina/authenticator/AuthenticatorBase.java
@@ -26,14 +26,6 @@ import java.util.Set;
 
 import javax.security.auth.Subject;
 import javax.security.auth.callback.CallbackHandler;
-import javax.security.auth.message.AuthException;
-import javax.security.auth.message.AuthStatus;
-import javax.security.auth.message.MessageInfo;
-import javax.security.auth.message.config.AuthConfigFactory;
-import javax.security.auth.message.config.AuthConfigProvider;
-import javax.security.auth.message.config.RegistrationListener;
-import javax.security.auth.message.config.ServerAuthConfig;
-import javax.security.auth.message.config.ServerAuthContext;
 import javax.servlet.DispatcherType;
 import javax.servlet.ServletContext;
 import javax.servlet.ServletException;
@@ -41,6 +33,15 @@ import javax.servlet.http.Cookie;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import jakarta.security.auth.message.AuthException;
+import jakarta.security.auth.message.AuthStatus;
+import jakarta.security.auth.message.MessageInfo;
+import jakarta.security.auth.message.config.AuthConfigFactory;
+import jakarta.security.auth.message.config.AuthConfigProvider;
+import jakarta.security.auth.message.config.RegistrationListener;
+import jakarta.security.auth.message.config.ServerAuthConfig;
+import jakarta.security.auth.message.config.ServerAuthContext;
+
 import org.apache.catalina.Authenticator;
 import org.apache.catalina.Container;
 import org.apache.catalina.Context;
diff --git 
a/java/org/apache/catalina/authenticator/jaspic/AuthConfigFactoryImpl.java 
b/java/org/apache/catalina/authenticator/jaspic/AuthConfigFactoryImpl.java
index ee1dd5f..1750350 100644
--- a/java/org/apache/catalina/authenticator/jaspic/AuthConfigFactoryImpl.java
+++ b/java/org/apache/catalina/authenticator/jaspic/AuthConfigFactoryImpl.java
@@ -27,9 +27,9 @@ import java.util.Map.Entry;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.CopyOnWriteArrayList;
 
-import javax.security.auth.message.config.AuthConfigFactory;
-import javax.security.auth.message.config.AuthConfigProvider;
-import javax.security.auth.message.config.RegistrationListener;
+import jakarta.security.auth.message.config.AuthConfigFactory;
+import jakarta.security.auth.message.config.AuthConfigProvider;
+import jakarta.security.auth.message.config.RegistrationListener;
 
 import org.apache.catalina.Globals;
 import 
org.apache.catalina.authenticator.jaspic.PersistentProviderRegistrations.Provider;
diff --git 
a/java/org/apache/catalina/authenticator/jaspic/CallbackHandlerImpl.java 
b/java/org/apache/catalina/authenticator/jaspic/CallbackHandlerImpl.java
index 08f70c7..a43a3a5 100644
--- a/java/org/apache/catalina/authenticator/jaspic/CallbackHandlerImpl.java
+++ b/java/org/apache/catalina/authenticator/jaspic/CallbackHandlerImpl.java
@@ -26,8 +26,9 @@ import javax.security.auth.Subject;
 import javax.security.auth.callback.Callback;
 import javax.security.auth.callback.CallbackHandler;
 import javax.security.auth.callback.UnsupportedCallbackException;
-import javax.security.auth.message.callback.CallerPrincipalCallback;
-import javax.security.auth.message.callback.GroupPrincipalCallback;
+
+import jakarta.security.auth.message.callback.CallerPrincipalCallback;
+import jakarta.security.auth.message.callback.GroupPrincipalCallback;
 
 import org.apache.catalina.realm.GenericPrincipal;
 import org.apache.juli.logging.Log;
diff --git a/java/org/apache/catalina/authenticator/jaspic/MessageInfoImpl.java 
b/java/org/apache/catalina/authenticator/jaspic/MessageInfoImpl.java
index 4d0ba64..9db7d1f 100644
--- a/java/org/apache/catalina/authenticator/jaspic/MessageInfoImpl.java
+++ b/java/org/apache/catalina/authenticator/jaspic/MessageInfoImpl.java
@@ -19,16 +19,17 @@ package org.apache.catalina.authenticator.jaspic;
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.security.auth.message.MessageInfo;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import jakarta.security.auth.message.MessageInfo;
+
 import org.apache.tomcat.util.res.StringManager;
 
 public class MessageInfoImpl implements MessageInfo {
     protected static final StringManager sm = 
StringManager.getManager(MessageInfoImpl.class);
 
-    public static final String IS_MANDATORY = 
"javax.security.auth.message.MessagePolicy.isMandatory";
+    public static final String IS_MANDATORY = 
"jakarta.security.auth.message.MessagePolicy.isMandatory";
 
     private final Map<String, Object> map = new HashMap<>();
     private HttpServletRequest request;
diff --git 
a/java/org/apache/catalina/authenticator/jaspic/SimpleAuthConfigProvider.java 
b/java/org/apache/catalina/authenticator/jaspic/SimpleAuthConfigProvider.java
index 476e978..5e39d6f 100644
--- 
a/java/org/apache/catalina/authenticator/jaspic/SimpleAuthConfigProvider.java
+++ 
b/java/org/apache/catalina/authenticator/jaspic/SimpleAuthConfigProvider.java
@@ -19,15 +19,16 @@ package org.apache.catalina.authenticator.jaspic;
 import java.util.Map;
 
 import javax.security.auth.callback.CallbackHandler;
-import javax.security.auth.message.AuthException;
-import javax.security.auth.message.config.AuthConfigFactory;
-import javax.security.auth.message.config.AuthConfigProvider;
-import javax.security.auth.message.config.ClientAuthConfig;
-import javax.security.auth.message.config.ServerAuthConfig;
+
+import jakarta.security.auth.message.AuthException;
+import jakarta.security.auth.message.config.AuthConfigFactory;
+import jakarta.security.auth.message.config.AuthConfigProvider;
+import jakarta.security.auth.message.config.ClientAuthConfig;
+import jakarta.security.auth.message.config.ServerAuthConfig;
 
 /**
  * Basic implementation primarily intended for use when using third-party
- * {@link javax.security.auth.message.module.ServerAuthModule} implementations
+ * {@link jakarta.security.auth.message.module.ServerAuthModule} 
implementations
  * that only provide the module.
  */
 public class SimpleAuthConfigProvider implements AuthConfigProvider {
diff --git 
a/java/org/apache/catalina/authenticator/jaspic/SimpleServerAuthConfig.java 
b/java/org/apache/catalina/authenticator/jaspic/SimpleServerAuthConfig.java
index 15d29e1..2f1db11 100644
--- a/java/org/apache/catalina/authenticator/jaspic/SimpleServerAuthConfig.java
+++ b/java/org/apache/catalina/authenticator/jaspic/SimpleServerAuthConfig.java
@@ -23,11 +23,12 @@ import java.util.Map;
 
 import javax.security.auth.Subject;
 import javax.security.auth.callback.CallbackHandler;
-import javax.security.auth.message.AuthException;
-import javax.security.auth.message.MessageInfo;
-import javax.security.auth.message.config.ServerAuthConfig;
-import javax.security.auth.message.config.ServerAuthContext;
-import javax.security.auth.message.module.ServerAuthModule;
+
+import jakarta.security.auth.message.AuthException;
+import jakarta.security.auth.message.MessageInfo;
+import jakarta.security.auth.message.config.ServerAuthConfig;
+import jakarta.security.auth.message.config.ServerAuthContext;
+import jakarta.security.auth.message.module.ServerAuthModule;
 
 import org.apache.tomcat.util.res.StringManager;
 
diff --git 
a/java/org/apache/catalina/authenticator/jaspic/SimpleServerAuthContext.java 
b/java/org/apache/catalina/authenticator/jaspic/SimpleServerAuthContext.java
index d36cb0f..8d0a9ac 100644
--- a/java/org/apache/catalina/authenticator/jaspic/SimpleServerAuthContext.java
+++ b/java/org/apache/catalina/authenticator/jaspic/SimpleServerAuthContext.java
@@ -19,11 +19,12 @@ package org.apache.catalina.authenticator.jaspic;
 import java.util.List;
 
 import javax.security.auth.Subject;
-import javax.security.auth.message.AuthException;
-import javax.security.auth.message.AuthStatus;
-import javax.security.auth.message.MessageInfo;
-import javax.security.auth.message.config.ServerAuthContext;
-import javax.security.auth.message.module.ServerAuthModule;
+
+import jakarta.security.auth.message.AuthException;
+import jakarta.security.auth.message.AuthStatus;
+import jakarta.security.auth.message.MessageInfo;
+import jakarta.security.auth.message.config.ServerAuthContext;
+import jakarta.security.auth.message.module.ServerAuthModule;
 
 /**
  * Basic implementation primarily intended for use when using third-party
diff --git a/res/META-INF/jaspic-api.jar.manifest 
b/res/META-INF/jaspic-api.jar.manifest
index a071675..a453d16 100644
--- a/res/META-INF/jaspic-api.jar.manifest
+++ b/res/META-INF/jaspic-api.jar.manifest
@@ -2,10 +2,10 @@ Manifest-version: 1.0
 X-Compile-Source-JDK: @source.jdk@
 X-Compile-Target-JDK: @target.jdk@
 
-Name: javax/security/auth/message
-Specification-Title: Java Authentication SPI for Containers
+Name: jakarta/security/auth/message
+Specification-Title: Jakarta Authentication SPI for Containers
 Specification-Version: 1.1
 Specification-Vendor: Sun Microsystems, Inc.
-Implementation-Title: javax.security.auth.message
+Implementation-Title: jakarta.security.auth.message
 Implementation-Version: 1.1.@jaspic.revision@
 Implementation-Vendor: Apache Software Foundation
\ No newline at end of file
diff --git a/res/bnd/jaspic-api.jar.tmp.bnd b/res/bnd/jaspic-api.jar.tmp.bnd
index 1ef6cda..32e6d93 100644
--- a/res/bnd/jaspic-api.jar.tmp.bnd
+++ b/res/bnd/jaspic-api.jar.tmp.bnd
@@ -16,7 +16,7 @@ Bundle-Name: tomcat-jaspic-api
 Bundle-SymbolicName: org.apache.tomcat-jaspic-api
 Bundle-Version: @VERSION@
 Export-Package: \
-    javax.security.auth.message,\
-    javax.security.auth.message.callback,\
-    javax.security.auth.message.config,\
-    javax.security.auth.message.module
\ No newline at end of file
+    jakarta.security.auth.message,\
+    jakarta.security.auth.message.callback,\
+    jakarta.security.auth.message.config,\
+    jakarta.security.auth.message.module
\ No newline at end of file
diff --git a/res/bnd/tomcat-embed-core.jar.tmp.bnd 
b/res/bnd/tomcat-embed-core.jar.tmp.bnd
index 09a4d8f..d9dea60 100644
--- a/res/bnd/tomcat-embed-core.jar.tmp.bnd
+++ b/res/bnd/tomcat-embed-core.jar.tmp.bnd
@@ -17,10 +17,10 @@ Bundle-Name: tomcat-embed-core
 Bundle-SymbolicName: org.apache.tomcat-embed-core
 Bundle-Version: @VERSION@
 Export-Package: \
-    javax.security.auth.message,\
-    javax.security.auth.message.callback,\
-    javax.security.auth.message.config,\
-    javax.security.auth.message.module,\
+    jakarta.security.auth.message,\
+    jakarta.security.auth.message.callback,\
+    jakarta.security.auth.message.config,\
+    jakarta.security.auth.message.module,\
     javax.servlet,\
     javax.servlet.annotation,\
     javax.servlet.descriptor,\
diff --git a/res/checkstyle/jakarta-import-control.xml 
b/res/checkstyle/jakarta-import-control.xml
index fb82d16..3371221 100644
--- a/res/checkstyle/jakarta-import-control.xml
+++ b/res/checkstyle/jakarta-import-control.xml
@@ -36,4 +36,25 @@
   <subpackage name="persistence">
     <allow pkg="jakarta.persistence"/>
   </subpackage>
+  <subpackage name="security">
+    <subpackage name="auth">
+      <subpackage name="message">
+        <allow pkg="javax.crypto" />
+        <allow class="javax.security.auth.Subject"/>
+        <allow pkg="javax.security.auth.callback"/>
+        <allow pkg="javax.security.auth.login"/>
+        <allow pkg="javax.security.auth.x500"/>
+        <disallow pkg="jakarta.security.auth.message.callback" 
local-only="true"/>
+        <disallow pkg="jakarta.security.auth.message.config" 
local-only="true"/>
+        <disallow pkg="jakarta.security.auth.message.module" 
local-only="true"/>
+        <subpackage name="config">
+        <allow class="javax.security.auth.AuthPermission"/>
+          <allow pkg="jakarta.security.auth.message"/>
+        </subpackage>
+        <subpackage name="module">
+          <allow pkg="jakarta.security.auth.message"/>
+        </subpackage>
+      </subpackage>
+    </subpackage>
+  </subpackage>
 </import-control>
\ No newline at end of file
diff --git a/res/checkstyle/javax-import-control.xml 
b/res/checkstyle/javax-import-control.xml
index 84c64b7..f9c4586 100644
--- a/res/checkstyle/javax-import-control.xml
+++ b/res/checkstyle/javax-import-control.xml
@@ -21,27 +21,6 @@
 
 <import-control pkg="javax">
   <allow pkg="java"/>
-  <subpackage name="security">
-    <subpackage name="auth">
-      <subpackage name="message">
-        <allow pkg="javax.crypto" />
-        <allow class="javax.security.auth.Subject"/>
-        <allow pkg="javax.security.auth.callback"/>
-        <allow pkg="javax.security.auth.login"/>
-        <allow pkg="javax.security.auth.x500"/>
-        <disallow pkg="javax.security.auth.message.callback" 
local-only="true"/>
-        <disallow pkg="javax.security.auth.message.config" local-only="true"/>
-        <disallow pkg="javax.security.auth.message.module" local-only="true"/>
-        <subpackage name="config">
-        <allow class="javax.security.auth.AuthPermission"/>
-          <allow pkg="javax.security.auth.message"/>
-        </subpackage>
-        <subpackage name="module">
-          <allow pkg="javax.security.auth.message"/>
-        </subpackage>
-      </subpackage>
-    </subpackage>
-  </subpackage>
   <subpackage name="servlet">
     <allow pkg="javax.servlet"/>
     <disallow pkg="javax.servlet.jsp" local-only="true"/>
diff --git a/res/checkstyle/org-import-control.xml 
b/res/checkstyle/org-import-control.xml
index 55c6cc0..6c9e06a 100644
--- a/res/checkstyle/org-import-control.xml
+++ b/res/checkstyle/org-import-control.xml
@@ -30,6 +30,8 @@
   <allow pkg="javax.net"/>
   <allow pkg="javax.rmi"/>
   <allow pkg="javax.security"/>
+  <disallow pkg="javax.security.auth.message"/>
+  <allow pkg="jakarta.security.auth.message"/>
   <allow pkg="javax.sql"/>
   <allow pkg="javax.xml"/>
   <allow pkg="org.w3c.dom"/>
diff --git a/res/maven/tomcat-jaspic-api.pom b/res/maven/tomcat-jaspic-api.pom
index e7f4322..fa23a3a 100644
--- a/res/maven/tomcat-jaspic-api.pom
+++ b/res/maven/tomcat-jaspic-api.pom
@@ -23,7 +23,7 @@
   <groupId>org.apache.tomcat</groupId>
   <artifactId>tomcat-jaspic-api</artifactId>
   <version>@MAVEN.DEPLOY.VERSION@</version>
-  <description>javax.security.auth.message package</description>
+  <description>jakarta.security.auth.message package</description>
   <url>https://tomcat.apache.org/</url>
   <licenses>
     <license>
diff --git 
a/test/org/apache/catalina/authenticator/jaspic/TestAuthConfigFactoryImpl.java 
b/test/org/apache/catalina/authenticator/jaspic/TestAuthConfigFactoryImpl.java
index 38fff7b..c230b9e 100644
--- 
a/test/org/apache/catalina/authenticator/jaspic/TestAuthConfigFactoryImpl.java
+++ 
b/test/org/apache/catalina/authenticator/jaspic/TestAuthConfigFactoryImpl.java
@@ -23,9 +23,9 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
-import javax.security.auth.message.config.AuthConfigFactory;
-import javax.security.auth.message.config.AuthConfigProvider;
-import javax.security.auth.message.config.RegistrationListener;
+import jakarta.security.auth.message.config.AuthConfigFactory;
+import jakarta.security.auth.message.config.AuthConfigProvider;
+import jakarta.security.auth.message.config.RegistrationListener;
 
 import org.junit.After;
 import org.junit.Assert;
diff --git 
a/test/org/apache/catalina/authenticator/jaspic/TestSimpleServerAuthConfig.java 
b/test/org/apache/catalina/authenticator/jaspic/TestSimpleServerAuthConfig.java
index b663c87..d2bf13d 100644
--- 
a/test/org/apache/catalina/authenticator/jaspic/TestSimpleServerAuthConfig.java
+++ 
b/test/org/apache/catalina/authenticator/jaspic/TestSimpleServerAuthConfig.java
@@ -19,10 +19,10 @@ package org.apache.catalina.authenticator.jaspic;
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.security.auth.message.AuthException;
-import javax.security.auth.message.MessageInfo;
-import javax.security.auth.message.config.ServerAuthConfig;
-import javax.security.auth.message.config.ServerAuthContext;
+import jakarta.security.auth.message.AuthException;
+import jakarta.security.auth.message.MessageInfo;
+import jakarta.security.auth.message.config.ServerAuthConfig;
+import jakarta.security.auth.message.config.ServerAuthContext;
 
 import org.junit.Assert;
 import org.junit.Test;
diff --git 
a/test/org/apache/catalina/authenticator/jaspic/TesterMessageInfo.java 
b/test/org/apache/catalina/authenticator/jaspic/TesterMessageInfo.java
index ba8592e..acc02c6 100644
--- a/test/org/apache/catalina/authenticator/jaspic/TesterMessageInfo.java
+++ b/test/org/apache/catalina/authenticator/jaspic/TesterMessageInfo.java
@@ -19,7 +19,7 @@ package org.apache.catalina.authenticator.jaspic;
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.security.auth.message.MessageInfo;
+import jakarta.security.auth.message.MessageInfo;
 
 public class TesterMessageInfo implements MessageInfo {
 
diff --git 
a/test/org/apache/catalina/authenticator/jaspic/TesterServerAuthModuleA.java 
b/test/org/apache/catalina/authenticator/jaspic/TesterServerAuthModuleA.java
index e1bf7fe..457076d 100644
--- a/test/org/apache/catalina/authenticator/jaspic/TesterServerAuthModuleA.java
+++ b/test/org/apache/catalina/authenticator/jaspic/TesterServerAuthModuleA.java
@@ -20,11 +20,12 @@ import java.util.Map;
 
 import javax.security.auth.Subject;
 import javax.security.auth.callback.CallbackHandler;
-import javax.security.auth.message.AuthException;
-import javax.security.auth.message.AuthStatus;
-import javax.security.auth.message.MessageInfo;
-import javax.security.auth.message.MessagePolicy;
-import javax.security.auth.message.module.ServerAuthModule;
+
+import jakarta.security.auth.message.AuthException;
+import jakarta.security.auth.message.AuthStatus;
+import jakarta.security.auth.message.MessageInfo;
+import jakarta.security.auth.message.MessagePolicy;
+import jakarta.security.auth.message.module.ServerAuthModule;
 
 public class TesterServerAuthModuleA implements ServerAuthModule {
 
diff --git a/test/org/apache/catalina/loader/TestWebappClassLoader.java 
b/test/org/apache/catalina/loader/TestWebappClassLoader.java
index cda4df0..e658b02 100644
--- a/test/org/apache/catalina/loader/TestWebappClassLoader.java
+++ b/test/org/apache/catalina/loader/TestWebappClassLoader.java
@@ -103,7 +103,7 @@ public class TestWebappClassLoader extends TomcatBaseTest {
             "jakarta.el",
             "javax.servlet",
             "javax.websocket",
-            "javax.security.auth.message"
+            "jakarta.security.auth.message"
         };
 
         try (WebappClassLoader loader = new WebappClassLoader()) {


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Reply via email to