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 d6f305e87360be9a0c32cb9837132bef00edb92a Author: Mark Thomas <ma...@apache.org> AuthorDate: Thu Nov 28 13:50:39 2019 +0000 Rename "javax.persistence.*" to "jakarta.persistence.*" --- java/{javax => jakarta}/persistence/PersistenceContext.java | 2 +- java/{javax => jakarta}/persistence/PersistenceContextType.java | 2 +- java/{javax => jakarta}/persistence/PersistenceContexts.java | 2 +- java/{javax => jakarta}/persistence/PersistenceProperty.java | 2 +- java/{javax => jakarta}/persistence/PersistenceUnit.java | 2 +- java/{javax => jakarta}/persistence/PersistenceUnits.java | 2 +- java/{javax => jakarta}/persistence/SynchronizationType.java | 2 +- java/org/apache/catalina/core/DefaultInstanceManager.java | 6 +++--- res/checkstyle/jakarta-import-control.xml | 3 +++ res/checkstyle/javax-import-control.xml | 3 --- res/checkstyle/org-import-control.xml | 8 ++++---- 11 files changed, 17 insertions(+), 17 deletions(-) diff --git a/java/javax/persistence/PersistenceContext.java b/java/jakarta/persistence/PersistenceContext.java similarity index 97% rename from java/javax/persistence/PersistenceContext.java rename to java/jakarta/persistence/PersistenceContext.java index e273953..f53b6b2 100644 --- a/java/javax/persistence/PersistenceContext.java +++ b/java/jakarta/persistence/PersistenceContext.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package javax.persistence; +package jakarta.persistence; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/java/javax/persistence/PersistenceContextType.java b/java/jakarta/persistence/PersistenceContextType.java similarity index 96% rename from java/javax/persistence/PersistenceContextType.java rename to java/jakarta/persistence/PersistenceContextType.java index 8b287fe..49e4120 100644 --- a/java/javax/persistence/PersistenceContextType.java +++ b/java/jakarta/persistence/PersistenceContextType.java @@ -16,7 +16,7 @@ */ -package javax.persistence; +package jakarta.persistence; public enum PersistenceContextType { TRANSACTION, diff --git a/java/javax/persistence/PersistenceContexts.java b/java/jakarta/persistence/PersistenceContexts.java similarity index 97% rename from java/javax/persistence/PersistenceContexts.java rename to java/jakarta/persistence/PersistenceContexts.java index cd9abf2..7e3d01f 100644 --- a/java/javax/persistence/PersistenceContexts.java +++ b/java/jakarta/persistence/PersistenceContexts.java @@ -16,7 +16,7 @@ */ -package javax.persistence; +package jakarta.persistence; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/java/javax/persistence/PersistenceProperty.java b/java/jakarta/persistence/PersistenceProperty.java similarity index 97% rename from java/javax/persistence/PersistenceProperty.java rename to java/jakarta/persistence/PersistenceProperty.java index 20a42c5..46943a5 100644 --- a/java/javax/persistence/PersistenceProperty.java +++ b/java/jakarta/persistence/PersistenceProperty.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package javax.persistence; +package jakarta.persistence; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/java/javax/persistence/PersistenceUnit.java b/java/jakarta/persistence/PersistenceUnit.java similarity index 97% rename from java/javax/persistence/PersistenceUnit.java rename to java/jakarta/persistence/PersistenceUnit.java index 9f34198..cdbee56 100644 --- a/java/javax/persistence/PersistenceUnit.java +++ b/java/jakarta/persistence/PersistenceUnit.java @@ -16,7 +16,7 @@ */ -package javax.persistence; +package jakarta.persistence; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/java/javax/persistence/PersistenceUnits.java b/java/jakarta/persistence/PersistenceUnits.java similarity index 97% rename from java/javax/persistence/PersistenceUnits.java rename to java/jakarta/persistence/PersistenceUnits.java index 34084ac..991d83f 100644 --- a/java/javax/persistence/PersistenceUnits.java +++ b/java/jakarta/persistence/PersistenceUnits.java @@ -16,7 +16,7 @@ */ -package javax.persistence; +package jakarta.persistence; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/java/javax/persistence/SynchronizationType.java b/java/jakarta/persistence/SynchronizationType.java similarity index 96% rename from java/javax/persistence/SynchronizationType.java rename to java/jakarta/persistence/SynchronizationType.java index ea55b05..b1d5c1a 100644 --- a/java/javax/persistence/SynchronizationType.java +++ b/java/jakarta/persistence/SynchronizationType.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package javax.persistence; +package jakarta.persistence; public enum SynchronizationType { SYNCHRONIZED, diff --git a/java/org/apache/catalina/core/DefaultInstanceManager.java b/java/org/apache/catalina/core/DefaultInstanceManager.java index 3f46ee1..90238c4 100644 --- a/java/org/apache/catalina/core/DefaultInstanceManager.java +++ b/java/org/apache/catalina/core/DefaultInstanceManager.java @@ -37,14 +37,14 @@ import java.util.Set; import javax.naming.Context; import javax.naming.NamingException; -import javax.persistence.PersistenceContext; -import javax.persistence.PersistenceUnit; import javax.xml.ws.WebServiceRef; import jakarta.annotation.PostConstruct; import jakarta.annotation.PreDestroy; import jakarta.annotation.Resource; import jakarta.ejb.EJB; +import jakarta.persistence.PersistenceContext; +import jakarta.persistence.PersistenceUnit; import org.apache.catalina.ContainerServlet; import org.apache.catalina.Globals; @@ -83,7 +83,7 @@ public class DefaultInstanceManager implements InstanceManager { clazz = null; try { - clazz = Class.forName("javax.persistence.PersistenceContext"); + clazz = Class.forName("jakarta.persistence.PersistenceContext"); } catch (ClassNotFoundException cnfe) { // Expected } diff --git a/res/checkstyle/jakarta-import-control.xml b/res/checkstyle/jakarta-import-control.xml index cc86b88..fb82d16 100644 --- a/res/checkstyle/jakarta-import-control.xml +++ b/res/checkstyle/jakarta-import-control.xml @@ -33,4 +33,7 @@ <subpackage name="mail"> <allow pkg="jakarta.mail"/> </subpackage> + <subpackage name="persistence"> + <allow pkg="jakarta.persistence"/> + </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 b7906af..84c64b7 100644 --- a/res/checkstyle/javax-import-control.xml +++ b/res/checkstyle/javax-import-control.xml @@ -21,9 +21,6 @@ <import-control pkg="javax"> <allow pkg="java"/> - <subpackage name="persistence"> - <allow pkg="javax.persistence"/> - </subpackage> <subpackage name="security"> <subpackage name="auth"> <subpackage name="message"> diff --git a/res/checkstyle/org-import-control.xml b/res/checkstyle/org-import-control.xml index a76bb1c..55c6cc0 100644 --- a/res/checkstyle/org-import-control.xml +++ b/res/checkstyle/org-import-control.xml @@ -38,7 +38,7 @@ <subpackage name="catalina"> <allow pkg="jakarta.annotation"/> <allow pkg="jakarta.ejb"/> - <allow pkg="javax.persistence"/> + <allow pkg="jakarta.persistence"/> <allow pkg="javax.servlet"/> <allow pkg="org.apache.catalina"/> <disallow pkg="org.apache.catalina.ha"/> @@ -52,7 +52,7 @@ <allow class="org.apache.tomcat.util.Base64"/> <disallow pkg="jakarta.annotation"/> <disallow pkg="jakarta.ejb"/> - <disallow pkg="javax.persistence"/> + <disallow pkg="jakarta.persistence"/> <disallow pkg="javax.servlet"/> <disallow pkg="org.apache.coyote"/> <disallow pkg="org.apache.juli"/> @@ -61,7 +61,7 @@ <subpackage name="ha"> <disallow pkg="jakarta.annotation"/> <disallow pkg="jakarta.ejb"/> - <disallow pkg="javax.persistence"/> + <disallow pkg="jakarta.persistence"/> <disallow pkg="org.apache.coyote"/> <disallow pkg="org.apache.naming"/> <allow pkg="org.apache.catalina.ha"/> @@ -74,7 +74,7 @@ <subpackage name="tribes"> <disallow pkg="jakarta.annotation"/> <disallow pkg="jakarta.ejb"/> - <disallow pkg="javax.persistence"/> + <disallow pkg="jakarta.persistence"/> <disallow pkg="javax.servlet"/> <disallow pkg="org\.apache\.catalina(?!\.tribes).*" regex="true"/> <disallow pkg="org.apache.coyote"/> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org