Jbtm 3699 merge

ArjunaJTA/README.md

@@ -14,13 +14,13 @@ These quickstarts showcase the various ways of using JTA:
 A minimal maven project which shows how to include the narayana JTA artifact
 and how to begin and end a JTA style transaction
 
-### [Javax transaction](javax_transaction/)
+### [Jakarta transaction](jakarta_transaction/)
 
 Basic example showing how to use the standard JTA APIs
 
-### [Java EE Transactional Application](jee_transactional_app/)
+### [Jakarta EE Transactional Application](jakartaee_transactional_app/)
 
-A more advanced example demonstrating how to build transactional JEE applications
+A more advanced example demonstrating how to build transactional JakartaEE applications
 
 ### [Object Store](object_store/)
 

ArjunaJTA/javax_transaction/README.md → ArjunaJTA/jakarta_transaction/README.md

@@ -19,12 +19,12 @@ MA  02110-1301, USA.
 @author JBoss Inc.
 -->
 
-## Javax transaction quickstart
+## Jakarta transaction quickstart
 
 ## Overview
 
-This example shows how to obtain a Java EE conforming transaction and how to invoke various methods
-of the `javax.transaction.Transaction` interface such as starting and ending transactions, examining
+This example shows how to obtain a Jakarta EE conforming transaction and how to invoke various methods
+of the `jakarta.transaction.Transaction` interface such as starting and ending transactions, examining
 transacton status, timeouts etc.
 
 ## Usage

ArjunaJTA/javax_transaction/pom.xml → ArjunaJTA/jakarta_transaction/pom.xml

@@ -28,12 +28,12 @@
     <relativePath>../pom.xml</relativePath>
   </parent>
   <description>
-	Examples showing how to the javax.transaction.Transaction interface. Refer to the readme file for more details.
+	Examples showing how to the jakarta.transaction.Transaction interface. Refer to the readme file for more details.
 	</description>
   <modelVersion>4.0.0</modelVersion>
-  <artifactId>javax_transaction</artifactId>
+  <artifactId>jakarta_transaction</artifactId>
   <packaging>jar</packaging>
-  <name>Javax Transaction Examples</name>
+  <name>Jakarta Transaction Examples</name>
   <build>
     <plugins>
       <!-- This plugin allows our example to be executed by maven -->

ArjunaJTA/javax_transaction/src/main/java/org/jboss/narayana/jta/quickstarts/TransactionExample.java → ArjunaJTA/jakarta_transaction/src/main/java/org/jboss/narayana/jta/quickstarts/TransactionExample.java

@@ -20,14 +20,14 @@
  */
 package org.jboss.narayana.jta.quickstarts;
 
-import javax.transaction.HeuristicMixedException;
-import javax.transaction.HeuristicRollbackException;
-import javax.transaction.NotSupportedException;
-import javax.transaction.RollbackException;
-import javax.transaction.Status;
-import javax.transaction.SystemException;
-import javax.transaction.TransactionManager;
-import javax.transaction.UserTransaction;
+import jakarta.transaction.HeuristicMixedException;
+import jakarta.transaction.HeuristicRollbackException;
+import jakarta.transaction.NotSupportedException;
+import jakarta.transaction.RollbackException;
+import jakarta.transaction.Status;
+import jakarta.transaction.SystemException;
+import jakarta.transaction.TransactionManager;
+import jakarta.transaction.UserTransaction;
 
 public class TransactionExample {
 	public static void main(String[] args) throws Exception {

ArjunaJTA/jee_transactional_app/README.md → ArjunaJTA/jakartaee_transactional_app/README.md

@@ -13,7 +13,7 @@ along with this distribution; if not, write to the Free Software Foundation,
 Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 -->
 
-# Java EE transactional application quickstart
+# Jakarta EE transactional application quickstart
 
 ## Overview
 
@@ -48,7 +48,7 @@ mvn compile wildfly:deploy -DnoArq
 ```
 
 Once the application is deployed, you can access it from a browser by:
-http://localhost:8080/jee_transactional_app/
+http://localhost:8080/jakartaee_transactional_app/
 
 
 ## Expected output

ArjunaJTA/jee_transactional_app/pom.xml → ArjunaJTA/jakartaee_transactional_app/pom.xml

@@ -19,7 +19,7 @@
         <version>6.0.0.Final-SNAPSHOT</version>
     </parent>
     <groupId>org.jboss.narayana.quickstart.jta</groupId>
-    <artifactId>jee_transactional_app</artifactId>
+    <artifactId>jakartaee_transactional_app</artifactId>
     <name>basic integration example</name>
     <description>basic integration example</description>
     <packaging>war</packaging>
@@ -83,69 +83,13 @@
             </plugin>
         </plugins>
     </build>
-    <dependencyManagement>
-        <dependencies>
-            <!-- JBoss distributes a complete set of Java EE 6 APIs including 
-                a Bill of Materials (BOM). A BOM specifies the versions of a "stack" (or 
-                a collection) of artifacts. We use this here so that we always get the correct 
-                versions of artifacts. Here we use the jboss-javaee-6.0-with-tools stack 
-                (you can read this as the JBoss stack of the Java EE 6 APIs, with some extras 
-                tools for your project, such as Arquillian for testing) and the jboss-javaee-6.0-with-hibernate 
-                stack you can read this as the JBoss stack of the Java EE 6 APIs, with extras 
-                from the Hibernate family of projects) -->
-            <dependency>
-                <groupId>org.jboss.bom</groupId>
-                <artifactId>jboss-javaee-6.0-with-tools</artifactId>
-                <version>${version.org.jboss.bom}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.jboss.bom</groupId>
-                <artifactId>jboss-javaee-6.0-with-hibernate</artifactId>
-                <version>${version.org.jboss.bom}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
     <dependencies>
-        <!-- Import the JPA API, we use provided scope as the API is included in 
-			JBoss AS 7 -->
         <dependency>
-            <groupId>org.jboss.spec.javax.transaction</groupId>
-            <artifactId>jboss-transaction-api_1.1_spec</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <!-- Import the JSF API, we use provided scope as the API is included in 
-			JBoss AS 7 -->
-        <dependency>
-            <groupId>org.jboss.spec.javax.faces</groupId>
-            <artifactId>jboss-jsf-api_2.1_spec</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <!-- Import the JPA API, we use provided scope as the API is included in 
-			JBoss AS 7 -->
-        <dependency>
-            <groupId>org.hibernate.javax.persistence</groupId>
-            <artifactId>hibernate-jpa-2.0-api</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <!-- Import the EJB API, we use provided scope as the API is included in 
-			JBoss AS 7 -->
-        <dependency>
-            <groupId>org.jboss.spec.javax.ejb</groupId>
-            <artifactId>jboss-ejb-api_3.1_spec</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <!-- Import the CDI API, we use provided scope as the API is included in 
-			JBoss AS 7 -->
-        <dependency>
-            <groupId>javax.enterprise</groupId>
-            <artifactId>cdi-api</artifactId>
-            <scope>provided</scope>
+            <groupId>jakarta.persistence</groupId>
+            <artifactId>jakarta.persistence-api</artifactId>
+            <version>${version.jakarta.persistence-api}</version>
         </dependency>
-        <!-- For the txoj -->
+        <!-- JSF dependencies -->
         <dependency>
             <groupId>org.jboss.narayana.jta</groupId>
             <artifactId>narayana-jta</artifactId>
@@ -154,9 +98,9 @@
         </dependency>
         <!-- Import the injection annotations -->
         <dependency>
-            <groupId>javax.inject</groupId>
-            <artifactId>javax.inject</artifactId>
-            <version>1</version>
+            <groupId>jakarta.inject</groupId>
+            <artifactId>jakarta.inject-api</artifactId>
+            <version>${version.jakarta.inject-api}</version>
             <scope>provided</scope>
         </dependency>
         <!-- For logging -->
@@ -166,17 +110,11 @@
            <version>${version.wildfly.logging}</version>
            <scope>provided</scope>
         </dependency>
-        <!-- We will provide some tests to check the quickstart deploys ok -->
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>${version.junit}</version>
-            <scope>test</scope>
-        </dependency>
         <!-- Arquillian allows you to test the example inside a container -->
         <dependency>
             <groupId>org.jboss.arquillian.junit</groupId>
             <artifactId>arquillian-junit-container</artifactId>
+            <version>1.7.0.Alpha12</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

ArjunaJTA/jee_transactional_app/src/main/java/org/jboss/narayana/quickstarts/ejb/CustomerManagerEJB.java → ArjunaJTA/jakartaee_transactional_app/src/main/java/org/jboss/narayana/quickstarts/ejb/CustomerManagerEJB.java

@@ -23,11 +23,11 @@
 import java.util.List;
 
 import javax.naming.NamingException;
-import javax.transaction.HeuristicMixedException;
-import javax.transaction.HeuristicRollbackException;
-import javax.transaction.NotSupportedException;
-import javax.transaction.RollbackException;
-import javax.transaction.SystemException;
+import jakarta.transaction.HeuristicMixedException;
+import jakarta.transaction.HeuristicRollbackException;
+import jakarta.transaction.NotSupportedException;
+import jakarta.transaction.RollbackException;
+import jakarta.transaction.SystemException;
 
 import org.jboss.narayana.quickstarts.jpa.Customer;
 

ArjunaJTA/jee_transactional_app/src/main/java/org/jboss/narayana/quickstarts/ejb/CustomerManagerEJBImpl.java → ArjunaJTA/jakartaee_transactional_app/src/main/java/org/jboss/narayana/quickstarts/ejb/CustomerManagerEJBImpl.java

@@ -22,18 +22,18 @@
 
 import java.util.List;
 
-import javax.ejb.Stateless;
-import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionAttributeType;
+import jakarta.ejb.Stateless;
+import jakarta.ejb.TransactionAttribute;
+import jakarta.ejb.TransactionAttributeType;
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import javax.transaction.HeuristicMixedException;
-import javax.transaction.HeuristicRollbackException;
-import javax.transaction.NotSupportedException;
-import javax.transaction.RollbackException;
-import javax.transaction.SystemException;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
+import jakarta.transaction.HeuristicMixedException;
+import jakarta.transaction.HeuristicRollbackException;
+import jakarta.transaction.NotSupportedException;
+import jakarta.transaction.RollbackException;
+import jakarta.transaction.SystemException;
 
 import org.jboss.logging.Logger;
 import org.jboss.narayana.quickstarts.jpa.Customer;

ArjunaJTA/jee_transactional_app/src/main/java/org/jboss/narayana/quickstarts/jpa/Customer.java → ArjunaJTA/jakartaee_transactional_app/src/main/java/org/jboss/narayana/quickstarts/jpa/Customer.java

@@ -22,10 +22,10 @@
 
 import java.io.Serializable;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
 
 @Entity
 public class Customer implements Serializable {

ArjunaJTA/jee_transactional_app/src/main/java/org/jboss/narayana/quickstarts/jsf/CustomerManager.java → ArjunaJTA/jakartaee_transactional_app/src/main/java/org/jboss/narayana/quickstarts/jsf/CustomerManager.java

@@ -23,11 +23,11 @@
 import java.util.List;
 
 import javax.naming.NamingException;
-import javax.transaction.HeuristicMixedException;
-import javax.transaction.HeuristicRollbackException;
-import javax.transaction.NotSupportedException;
-import javax.transaction.RollbackException;
-import javax.transaction.SystemException;
+import jakarta.transaction.HeuristicMixedException;
+import jakarta.transaction.HeuristicRollbackException;
+import jakarta.transaction.NotSupportedException;
+import jakarta.transaction.RollbackException;
+import jakarta.transaction.SystemException;
 
 import org.jboss.narayana.quickstarts.jpa.Customer;
 

ArjunaJTA/jee_transactional_app/src/main/java/org/jboss/narayana/quickstarts/jsf/CustomerManagerManagedBean.java → ArjunaJTA/jakartaee_transactional_app/src/main/java/org/jboss/narayana/quickstarts/jsf/CustomerManagerManagedBean.java

@@ -22,16 +22,16 @@
 
 import java.util.List;
 
-import javax.faces.bean.RequestScoped;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.enterprise.context.RequestScoped;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
 import javax.naming.NamingException;
-import javax.transaction.HeuristicMixedException;
-import javax.transaction.HeuristicRollbackException;
-import javax.transaction.NotSupportedException;
-import javax.transaction.RollbackException;
-import javax.transaction.SystemException;
-import javax.transaction.UserTransaction;
+import jakarta.transaction.HeuristicMixedException;
+import jakarta.transaction.HeuristicRollbackException;
+import jakarta.transaction.NotSupportedException;
+import jakarta.transaction.RollbackException;
+import jakarta.transaction.SystemException;
+import jakarta.transaction.UserTransaction;
 
 import org.jboss.logging.Logger;
 import org.jboss.narayana.quickstarts.ejb.CustomerManagerEJB;

ArjunaJTA/jee_transactional_app/src/test/java/org/jboss/narayana/quickstarts/TestManagedBeanCustomerManager.java → ArjunaJTA/jakartaee_transactional_app/src/test/java/org/jboss/narayana/quickstarts/TestManagedBeanCustomerManager.java

@@ -24,7 +24,7 @@
 
 import java.util.List;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
@@ -85,7 +85,6 @@ public void checkListCustomers() throws Exception {
 		// Check that the list size increased
 		assertTrue(firstList.size() < secondList.size());
 	}
-
 	@Test
 	public void checkCustomerCount() throws Exception {
 		int response = -1;
@@ -119,7 +118,6 @@ public void checkCustomerCount() throws Exception {
 		assertTrue("" + response, response == size + 1);
 		size = response;
 	}
-
 	@Test
 	public void testCustomerCountInPresenceOfRollback() throws Exception {
 		int response = -1;

ArjunaJTA/jee_transactional_app/src/test/resources/arquillian.xml → ArjunaJTA/jakartaee_transactional_app/src/test/resources/arquillian.xml

@@ -29,15 +29,13 @@
 	<engine>
 		<property name="deploymentExportPath">target/exploded-artifact-for-inspection</property>
 	</engine>
-	<!-- Force the use of the Servlet 3.0 protocol with all containers, as it 
-		is the most mature -->
-	<defaultProtocol type="Servlet 3.0" />
+	<defaultProtocol type="Servlet 5.0" />
 
 	<!-- Example configuration for a remote WildFly instance -->
 	<container qualifier="jboss" default="true">
 		<configuration>
 			<property name="javaVmArguments">${modular.jdk.args} -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=n</property>
-		</configuration>
+        </configuration>
 	</container>
 
 </arquillian>

ArjunaJTA/maven/src/main/java/TransactionManagerExample.java

@@ -18,7 +18,7 @@
  * (C) 2011,
  * @author JBoss, by Red Hat.
  */
-import javax.transaction.TransactionManager;
+import jakarta.transaction.TransactionManager;
 import javax.transaction.xa.XAException;
 import javax.transaction.xa.XAResource;
 import javax.transaction.xa.Xid;