You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2020/01/13 11:56:02 UTC
[tomcat] 10/18: Rename "javax.transaction" to "jakarta.transation"
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 6c3e9285db2ca16e1a2f1e99a653916b91bd2c5a
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Nov 28 19:16:36 2019 +0000
Rename "javax.transaction" to "jakarta.transation"
---
.../transaction/HeuristicCommitException.java | 2 +-
.../transaction/HeuristicMixedException.java | 2 +-
.../transaction/HeuristicRollbackException.java | 2 +-
.../transaction/InvalidTransactionException.java | 2 +-
.../transaction/NotSupportedException.java | 2 +-
java/{javax => jakarta}/transaction/RollbackException.java | 2 +-
java/{javax => jakarta}/transaction/Status.java | 2 +-
java/{javax => jakarta}/transaction/Synchronization.java | 2 +-
java/{javax => jakarta}/transaction/SystemException.java | 2 +-
java/{javax => jakarta}/transaction/Transaction.java | 2 +-
java/{javax => jakarta}/transaction/TransactionManager.java | 2 +-
.../transaction/TransactionRequiredException.java | 2 +-
.../transaction/TransactionRolledbackException.java | 2 +-
.../transaction/TransactionSynchronizationRegistry.java | 2 +-
java/{javax => jakarta}/transaction/UserTransaction.java | 2 +-
java/org/apache/catalina/startup/WebAnnotationSet.java | 2 +-
java/org/apache/naming/TransactionRef.java | 2 +-
.../tomcat/dbcp/dbcp2/managed/BasicManagedDataSource.java | 5 +++--
.../dbcp/dbcp2/managed/DataSourceXAConnectionFactory.java | 5 +++--
.../tomcat/dbcp/dbcp2/managed/LocalXAConnectionFactory.java | 3 ++-
.../tomcat/dbcp/dbcp2/managed/TransactionContext.java | 13 +++++++------
.../tomcat/dbcp/dbcp2/managed/TransactionRegistry.java | 9 +++++----
res/checkstyle/jakarta-import-control.xml | 4 ++++
res/checkstyle/javax-import-control.xml | 3 ---
res/checkstyle/org-import-control.xml | 3 ++-
25 files changed, 43 insertions(+), 36 deletions(-)
diff --git a/java/javax/transaction/HeuristicCommitException.java b/java/jakarta/transaction/HeuristicCommitException.java
similarity index 97%
rename from java/javax/transaction/HeuristicCommitException.java
rename to java/jakarta/transaction/HeuristicCommitException.java
index e0c1294..049993a 100644
--- a/java/javax/transaction/HeuristicCommitException.java
+++ b/java/jakarta/transaction/HeuristicCommitException.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package javax.transaction;
+package jakarta.transaction;
public class HeuristicCommitException extends java.lang.Exception {
diff --git a/java/javax/transaction/HeuristicMixedException.java b/java/jakarta/transaction/HeuristicMixedException.java
similarity index 97%
rename from java/javax/transaction/HeuristicMixedException.java
rename to java/jakarta/transaction/HeuristicMixedException.java
index 0910bb7..ba2523a 100644
--- a/java/javax/transaction/HeuristicMixedException.java
+++ b/java/jakarta/transaction/HeuristicMixedException.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package javax.transaction;
+package jakarta.transaction;
public class HeuristicMixedException extends java.lang.Exception {
diff --git a/java/javax/transaction/HeuristicRollbackException.java b/java/jakarta/transaction/HeuristicRollbackException.java
similarity index 97%
rename from java/javax/transaction/HeuristicRollbackException.java
rename to java/jakarta/transaction/HeuristicRollbackException.java
index f09a700..6e059f0 100644
--- a/java/javax/transaction/HeuristicRollbackException.java
+++ b/java/jakarta/transaction/HeuristicRollbackException.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package javax.transaction;
+package jakarta.transaction;
public class HeuristicRollbackException extends java.lang.Exception {
diff --git a/java/javax/transaction/InvalidTransactionException.java b/java/jakarta/transaction/InvalidTransactionException.java
similarity index 97%
rename from java/javax/transaction/InvalidTransactionException.java
rename to java/jakarta/transaction/InvalidTransactionException.java
index d29d5aa..f75b185 100644
--- a/java/javax/transaction/InvalidTransactionException.java
+++ b/java/jakarta/transaction/InvalidTransactionException.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package javax.transaction;
+package jakarta.transaction;
public class InvalidTransactionException extends java.rmi.RemoteException {
diff --git a/java/javax/transaction/NotSupportedException.java b/java/jakarta/transaction/NotSupportedException.java
similarity index 97%
rename from java/javax/transaction/NotSupportedException.java
rename to java/jakarta/transaction/NotSupportedException.java
index bad9810..ac19336 100644
--- a/java/javax/transaction/NotSupportedException.java
+++ b/java/jakarta/transaction/NotSupportedException.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package javax.transaction;
+package jakarta.transaction;
public class NotSupportedException extends java.lang.Exception {
diff --git a/java/javax/transaction/RollbackException.java b/java/jakarta/transaction/RollbackException.java
similarity index 97%
rename from java/javax/transaction/RollbackException.java
rename to java/jakarta/transaction/RollbackException.java
index 0ff971e..1851141 100644
--- a/java/javax/transaction/RollbackException.java
+++ b/java/jakarta/transaction/RollbackException.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package javax.transaction;
+package jakarta.transaction;
public class RollbackException extends java.lang.Exception {
diff --git a/java/javax/transaction/Status.java b/java/jakarta/transaction/Status.java
similarity index 97%
rename from java/javax/transaction/Status.java
rename to java/jakarta/transaction/Status.java
index 513f9e0..9c68a50 100644
--- a/java/javax/transaction/Status.java
+++ b/java/jakarta/transaction/Status.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package javax.transaction;
+package jakarta.transaction;
public interface Status {
public static final int STATUS_ACTIVE = 0;
diff --git a/java/javax/transaction/Synchronization.java b/java/jakarta/transaction/Synchronization.java
similarity index 96%
rename from java/javax/transaction/Synchronization.java
rename to java/jakarta/transaction/Synchronization.java
index 0b5db31..2fe66d8 100644
--- a/java/javax/transaction/Synchronization.java
+++ b/java/jakarta/transaction/Synchronization.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package javax.transaction;
+package jakarta.transaction;
public interface Synchronization {
public void beforeCompletion();
diff --git a/java/javax/transaction/SystemException.java b/java/jakarta/transaction/SystemException.java
similarity index 97%
rename from java/javax/transaction/SystemException.java
rename to java/jakarta/transaction/SystemException.java
index b4b4abe..3d5a50c 100644
--- a/java/javax/transaction/SystemException.java
+++ b/java/jakarta/transaction/SystemException.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package javax.transaction;
+package jakarta.transaction;
public class SystemException extends java.lang.Exception {
diff --git a/java/javax/transaction/Transaction.java b/java/jakarta/transaction/Transaction.java
similarity index 98%
rename from java/javax/transaction/Transaction.java
rename to java/jakarta/transaction/Transaction.java
index ed1f00f..4cfced6 100644
--- a/java/javax/transaction/Transaction.java
+++ b/java/jakarta/transaction/Transaction.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package javax.transaction;
+package jakarta.transaction;
import javax.transaction.xa.XAResource;
diff --git a/java/javax/transaction/TransactionManager.java b/java/jakarta/transaction/TransactionManager.java
similarity index 98%
rename from java/javax/transaction/TransactionManager.java
rename to java/jakarta/transaction/TransactionManager.java
index b2969db..caddaab 100644
--- a/java/javax/transaction/TransactionManager.java
+++ b/java/jakarta/transaction/TransactionManager.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package javax.transaction;
+package jakarta.transaction;
public interface TransactionManager {
public void begin() throws NotSupportedException, SystemException;
diff --git a/java/javax/transaction/TransactionRequiredException.java b/java/jakarta/transaction/TransactionRequiredException.java
similarity index 97%
rename from java/javax/transaction/TransactionRequiredException.java
rename to java/jakarta/transaction/TransactionRequiredException.java
index 583a001..048ca2e 100644
--- a/java/javax/transaction/TransactionRequiredException.java
+++ b/java/jakarta/transaction/TransactionRequiredException.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package javax.transaction;
+package jakarta.transaction;
public class TransactionRequiredException extends java.rmi.RemoteException {
diff --git a/java/javax/transaction/TransactionRolledbackException.java b/java/jakarta/transaction/TransactionRolledbackException.java
similarity index 97%
rename from java/javax/transaction/TransactionRolledbackException.java
rename to java/jakarta/transaction/TransactionRolledbackException.java
index 2dfa899..f8e01db 100644
--- a/java/javax/transaction/TransactionRolledbackException.java
+++ b/java/jakarta/transaction/TransactionRolledbackException.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package javax.transaction;
+package jakarta.transaction;
public class TransactionRolledbackException extends java.rmi.RemoteException {
diff --git a/java/javax/transaction/TransactionSynchronizationRegistry.java b/java/jakarta/transaction/TransactionSynchronizationRegistry.java
similarity index 97%
rename from java/javax/transaction/TransactionSynchronizationRegistry.java
rename to java/jakarta/transaction/TransactionSynchronizationRegistry.java
index 9aa8daf..b2ac98f 100644
--- a/java/javax/transaction/TransactionSynchronizationRegistry.java
+++ b/java/jakarta/transaction/TransactionSynchronizationRegistry.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package javax.transaction;
+package jakarta.transaction;
public interface TransactionSynchronizationRegistry {
Object getTransactionKey();
diff --git a/java/javax/transaction/UserTransaction.java b/java/jakarta/transaction/UserTransaction.java
similarity index 97%
rename from java/javax/transaction/UserTransaction.java
rename to java/jakarta/transaction/UserTransaction.java
index b0cce4a..cf770a6 100644
--- a/java/javax/transaction/UserTransaction.java
+++ b/java/jakarta/transaction/UserTransaction.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package javax.transaction;
+package jakarta.transaction;
public interface UserTransaction {
void begin() throws NotSupportedException, SystemException;
diff --git a/java/org/apache/catalina/startup/WebAnnotationSet.java b/java/org/apache/catalina/startup/WebAnnotationSet.java
index 1a5b138..8d0073b 100644
--- a/java/org/apache/catalina/startup/WebAnnotationSet.java
+++ b/java/org/apache/catalina/startup/WebAnnotationSet.java
@@ -402,7 +402,7 @@ public class WebAnnotationSet {
/*
* General case. Also used for:
* - javax.resource.cci.InteractionSpec
- * - javax.transaction.UserTransaction
+ * - jakarta.transaction.UserTransaction
*/
// resource-env-ref
diff --git a/java/org/apache/naming/TransactionRef.java b/java/org/apache/naming/TransactionRef.java
index fc1e14b..d772144 100644
--- a/java/org/apache/naming/TransactionRef.java
+++ b/java/org/apache/naming/TransactionRef.java
@@ -48,7 +48,7 @@ public class TransactionRef extends AbstractRef {
* @param factoryLocation The factory location
*/
public TransactionRef(String factory, String factoryLocation) {
- super("javax.transaction.UserTransaction", factory, factoryLocation);
+ super("jakarta.transaction.UserTransaction", factory, factoryLocation);
}
diff --git a/java/org/apache/tomcat/dbcp/dbcp2/managed/BasicManagedDataSource.java b/java/org/apache/tomcat/dbcp/dbcp2/managed/BasicManagedDataSource.java
index 654edc2..0db3393 100644
--- a/java/org/apache/tomcat/dbcp/dbcp2/managed/BasicManagedDataSource.java
+++ b/java/org/apache/tomcat/dbcp/dbcp2/managed/BasicManagedDataSource.java
@@ -21,8 +21,9 @@ import java.sql.SQLException;
import javax.sql.DataSource;
import javax.sql.XADataSource;
-import javax.transaction.TransactionManager;
-import javax.transaction.TransactionSynchronizationRegistry;
+
+import jakarta.transaction.TransactionManager;
+import jakarta.transaction.TransactionSynchronizationRegistry;
import org.apache.tomcat.dbcp.dbcp2.BasicDataSource;
import org.apache.tomcat.dbcp.dbcp2.ConnectionFactory;
diff --git a/java/org/apache/tomcat/dbcp/dbcp2/managed/DataSourceXAConnectionFactory.java b/java/org/apache/tomcat/dbcp/dbcp2/managed/DataSourceXAConnectionFactory.java
index 71a3f37..fdcc68b 100644
--- a/java/org/apache/tomcat/dbcp/dbcp2/managed/DataSourceXAConnectionFactory.java
+++ b/java/org/apache/tomcat/dbcp/dbcp2/managed/DataSourceXAConnectionFactory.java
@@ -26,10 +26,11 @@ import javax.sql.ConnectionEventListener;
import javax.sql.PooledConnection;
import javax.sql.XAConnection;
import javax.sql.XADataSource;
-import javax.transaction.TransactionManager;
-import javax.transaction.TransactionSynchronizationRegistry;
import javax.transaction.xa.XAResource;
+import jakarta.transaction.TransactionManager;
+import jakarta.transaction.TransactionSynchronizationRegistry;
+
import org.apache.tomcat.dbcp.dbcp2.Utils;
/**
diff --git a/java/org/apache/tomcat/dbcp/dbcp2/managed/LocalXAConnectionFactory.java b/java/org/apache/tomcat/dbcp/dbcp2/managed/LocalXAConnectionFactory.java
index d5e176a..5eda07d 100644
--- a/java/org/apache/tomcat/dbcp/dbcp2/managed/LocalXAConnectionFactory.java
+++ b/java/org/apache/tomcat/dbcp/dbcp2/managed/LocalXAConnectionFactory.java
@@ -21,11 +21,12 @@ import java.sql.Connection;
import java.sql.SQLException;
import java.util.Objects;
-import javax.transaction.TransactionManager;
import javax.transaction.xa.XAException;
import javax.transaction.xa.XAResource;
import javax.transaction.xa.Xid;
+import jakarta.transaction.TransactionManager;
+
import org.apache.tomcat.dbcp.dbcp2.ConnectionFactory;
/**
diff --git a/java/org/apache/tomcat/dbcp/dbcp2/managed/TransactionContext.java b/java/org/apache/tomcat/dbcp/dbcp2/managed/TransactionContext.java
index 6266262..c9b5803 100644
--- a/java/org/apache/tomcat/dbcp/dbcp2/managed/TransactionContext.java
+++ b/java/org/apache/tomcat/dbcp/dbcp2/managed/TransactionContext.java
@@ -22,14 +22,15 @@ import java.sql.Connection;
import java.sql.SQLException;
import java.util.Objects;
-import javax.transaction.RollbackException;
-import javax.transaction.Status;
-import javax.transaction.Synchronization;
-import javax.transaction.SystemException;
-import javax.transaction.Transaction;
-import javax.transaction.TransactionSynchronizationRegistry;
import javax.transaction.xa.XAResource;
+import jakarta.transaction.RollbackException;
+import jakarta.transaction.Status;
+import jakarta.transaction.Synchronization;
+import jakarta.transaction.SystemException;
+import jakarta.transaction.Transaction;
+import jakarta.transaction.TransactionSynchronizationRegistry;
+
/**
* TransactionContext represents the association between a single XAConnectionFactory and a Transaction. This context
* contains a single shared connection which should be used by all ManagedConnections for the XAConnectionFactory, the
diff --git a/java/org/apache/tomcat/dbcp/dbcp2/managed/TransactionRegistry.java b/java/org/apache/tomcat/dbcp/dbcp2/managed/TransactionRegistry.java
index 6a01610..483fab6 100644
--- a/java/org/apache/tomcat/dbcp/dbcp2/managed/TransactionRegistry.java
+++ b/java/org/apache/tomcat/dbcp/dbcp2/managed/TransactionRegistry.java
@@ -23,12 +23,13 @@ import java.util.Map;
import java.util.Objects;
import java.util.WeakHashMap;
-import javax.transaction.SystemException;
-import javax.transaction.Transaction;
-import javax.transaction.TransactionManager;
-import javax.transaction.TransactionSynchronizationRegistry;
import javax.transaction.xa.XAResource;
+import jakarta.transaction.SystemException;
+import jakarta.transaction.Transaction;
+import jakarta.transaction.TransactionManager;
+import jakarta.transaction.TransactionSynchronizationRegistry;
+
import org.apache.tomcat.dbcp.dbcp2.DelegatingConnection;
/**
diff --git a/res/checkstyle/jakarta-import-control.xml b/res/checkstyle/jakarta-import-control.xml
index 78416bd..3a548f2 100644
--- a/res/checkstyle/jakarta-import-control.xml
+++ b/res/checkstyle/jakarta-import-control.xml
@@ -65,4 +65,8 @@
<allow pkg="jakarta.servlet.jsp"/>
</subpackage>
</subpackage>
+ <subpackage name="transaction">
+ <allow pkg="jakarta.transaction"/>
+ <allow pkg="javax.transaction.xa"/>
+ </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 8f68bc0..bc61d54 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="transaction">
- <allow pkg="javax.transaction"/>
- </subpackage>
<subpackage name="websocket">
<allow pkg="javax.websocket"/>
</subpackage>
diff --git a/res/checkstyle/org-import-control.xml b/res/checkstyle/org-import-control.xml
index 4ba6395..d0ad044 100644
--- a/res/checkstyle/org-import-control.xml
+++ b/res/checkstyle/org-import-control.xml
@@ -143,7 +143,8 @@
<allow pkg="org.apache.tomcat.dbcp.dbcp2"/>
<allow pkg="org.apache.tomcat.dbcp.pool2"/>
<subpackage name="managed">
- <allow pkg="javax.transaction"/>
+ <allow pkg="jakarta.transaction"/>
+ <allow pkg="javax.transaction.xa"/>
</subpackage>
</subpackage>
<subpackage name="pool2">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org