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 c91bf7fcaf3d2b94d6940687335576de33f05134
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Nov 27 23:31:41 2019 +0000
Rename javax.ejb.* to jakarta.ejb.*
---
java/{javax => jakarta}/ejb/EJB.java | 2 +-
java/{javax => jakarta}/ejb/EJBs.java | 2 +-
.../catalina/core/DefaultInstanceManager.java | 4 +-
java/org/apache/naming/factory/EjbFactory.java | 2 +-
res/checkstyle/jakarta-import-control.xml | 50 +---------------------
res/checkstyle/javax-import-control.xml | 6 ---
res/checkstyle/org-import-control.xml | 8 ++--
7 files changed, 11 insertions(+), 63 deletions(-)
diff --git a/java/javax/ejb/EJB.java b/java/jakarta/ejb/EJB.java
similarity index 98%
rename from java/javax/ejb/EJB.java
rename to java/jakarta/ejb/EJB.java
index 2b16782..65f9e8f 100644
--- a/java/javax/ejb/EJB.java
+++ b/java/jakarta/ejb/EJB.java
@@ -16,7 +16,7 @@
*/
-package javax.ejb;
+package jakarta.ejb;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
diff --git a/java/javax/ejb/EJBs.java b/java/jakarta/ejb/EJBs.java
similarity index 98%
rename from java/javax/ejb/EJBs.java
rename to java/jakarta/ejb/EJBs.java
index b716915..4a9321c 100644
--- a/java/javax/ejb/EJBs.java
+++ b/java/jakarta/ejb/EJBs.java
@@ -16,7 +16,7 @@
*/
-package javax.ejb;
+package jakarta.ejb;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
diff --git a/java/org/apache/catalina/core/DefaultInstanceManager.java
b/java/org/apache/catalina/core/DefaultInstanceManager.java
index 18c98d4..3f46ee1 100644
--- a/java/org/apache/catalina/core/DefaultInstanceManager.java
+++ b/java/org/apache/catalina/core/DefaultInstanceManager.java
@@ -35,7 +35,6 @@ import java.util.Map;
import java.util.Properties;
import java.util.Set;
-import javax.ejb.EJB;
import javax.naming.Context;
import javax.naming.NamingException;
import javax.persistence.PersistenceContext;
@@ -45,6 +44,7 @@ import javax.xml.ws.WebServiceRef;
import jakarta.annotation.PostConstruct;
import jakarta.annotation.PreDestroy;
import jakarta.annotation.Resource;
+import jakarta.ejb.EJB;
import org.apache.catalina.ContainerServlet;
import org.apache.catalina.Globals;
@@ -75,7 +75,7 @@ public class DefaultInstanceManager implements
InstanceManager {
static {
Class<?> clazz = null;
try {
- clazz = Class.forName("javax.ejb.EJB");
+ clazz = Class.forName("jakarta.ejb.EJB");
} catch (ClassNotFoundException cnfe) {
// Expected
}
diff --git a/java/org/apache/naming/factory/EjbFactory.java
b/java/org/apache/naming/factory/EjbFactory.java
index 4f593a5..0820e16 100644
--- a/java/org/apache/naming/factory/EjbFactory.java
+++ b/java/org/apache/naming/factory/EjbFactory.java
@@ -41,7 +41,7 @@ public class EjbFactory extends FactoryBase {
ObjectFactory factory;
String javaxEjbFactoryClassName = System.getProperty(
- "javax.ejb.Factory", Constants.OPENEJB_EJB_FACTORY);
+ "jakarta.ejb.Factory", Constants.OPENEJB_EJB_FACTORY);
try {
factory = (ObjectFactory)
Class.forName(javaxEjbFactoryClassName).getConstructor().newInstance();
diff --git a/res/checkstyle/jakarta-import-control.xml
b/res/checkstyle/jakarta-import-control.xml
index 26ec8b0..580ce0e 100644
--- a/res/checkstyle/jakarta-import-control.xml
+++ b/res/checkstyle/jakarta-import-control.xml
@@ -25,53 +25,7 @@
<allow pkg="jakarta.annotation"/>
</subpackage>
<subpackage name="ejb">
- <allow pkg="javax.ejb"/>
- </subpackage>
- <subpackage name="el">
- <allow pkg="javax.el"/>
- </subpackage>
- <subpackage name="mail">
- <allow pkg="javax.mail"/>
- </subpackage>
- <subpackage name="persistence">
- <allow pkg="javax.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="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"/>
- <subpackage name="jsp">
- <allow pkg="javax.el"/>
- <allow pkg="javax.servlet.jsp"/>
- </subpackage>
- </subpackage>
- <subpackage name="transaction">
- <allow pkg="javax.transaction"/>
- </subpackage>
- <subpackage name="websocket">
- <allow pkg="javax.websocket"/>
- </subpackage>
- <subpackage name="xml.ws">
- <allow pkg="javax.xwl.ws"/>
+ <allow pkg="jakarta.ejb"/>
</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 3ba050d..b6faa80 100644
--- a/res/checkstyle/javax-import-control.xml
+++ b/res/checkstyle/javax-import-control.xml
@@ -21,12 +21,6 @@
<import-control pkg="javax">
<allow pkg="java"/>
- <subpackage name="annotation">
- <allow pkg="jakarta.annotation"/>
- </subpackage>
- <subpackage name="ejb">
- <allow pkg="javax.ejb"/>
- </subpackage>
<subpackage name="el">
<allow pkg="javax.el"/>
</subpackage>
diff --git a/res/checkstyle/org-import-control.xml
b/res/checkstyle/org-import-control.xml
index 269e160..83605cd 100644
--- a/res/checkstyle/org-import-control.xml
+++ b/res/checkstyle/org-import-control.xml
@@ -37,7 +37,7 @@
<allow pkg="org.ietf.jgss"/>
<subpackage name="catalina">
<allow pkg="jakarta.annotation"/>
- <allow pkg="javax.ejb"/>
+ <allow pkg="jakarta.ejb"/>
<allow pkg="javax.persistence"/>
<allow pkg="javax.servlet"/>
<allow pkg="org.apache.catalina"/>
@@ -51,7 +51,7 @@
<allow pkg="org.apache.tools.ant"/>
<allow class="org.apache.tomcat.util.Base64"/>
<disallow pkg="jakarta.annotation"/>
- <disallow pkg="javax.ejb"/>
+ <disallow pkg="jakarta.ejb"/>
<disallow pkg="javax.persistence"/>
<disallow pkg="javax.servlet"/>
<disallow pkg="org.apache.coyote"/>
@@ -60,7 +60,7 @@
</subpackage>
<subpackage name="ha">
<disallow pkg="jakarta.annotation"/>
- <disallow pkg="javax.ejb"/>
+ <disallow pkg="jakarta.ejb"/>
<disallow pkg="javax.persistence"/>
<disallow pkg="org.apache.coyote"/>
<disallow pkg="org.apache.naming"/>
@@ -73,7 +73,7 @@
</subpackage>
<subpackage name="tribes">
<disallow pkg="jakarta.annotation"/>
- <disallow pkg="javax.ejb"/>
+ <disallow pkg="jakarta.ejb"/>
<disallow pkg="javax.persistence"/>
<disallow pkg="javax.servlet"/>
<disallow pkg="org\.apache\.catalina(?!\.tribes).*" regex="true"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
