Merge pull request #140 from hasalex/jta

Merging jta/transaction-scope and jta/transactional modules

Author: arun-gupta

jta/pom.xml

@@ -16,7 +16,6 @@
 
   <modules>
     <module>transactional</module>
-    <module>transaction-scope</module>
     <module>tx-exception</module>
     <module>user-transaction</module>
   </modules>

jta/transaction-scope/pom.xml

@@ -46,7 +46,7 @@
  * @author Arun Gupta
  */
 @TransactionScoped
-public class MyBean implements Serializable {
+public class MyTransactionScopedBean implements Serializable {
 
     public String getId() {
         return this + "";

…avaee7/jta/transaction/scope/MyBean.java …ction/scope/MyTransactionScopedBean.javajta/transaction-scope/src/main/java/org/javaee7/jta/transaction/scope/MyBean.java renamed to jta/transactional/src/main/java/org/javaee7/jta/transaction/scope/MyTransactionScopedBean.java jta/transaction-scope/src/main/java/org/javaee7/jta/transaction/scope/MyBean.java renamed to jta/transactional/src/main/java/org/javaee7/jta/transaction/scope/MyTransactionScopedBean.java

@@ -39,7 +39,6 @@
  */
 package org.javaee7.jta.transaction.scope;
 
-import javax.enterprise.context.ContextNotActiveException;
 import javax.inject.Inject;
 import javax.transaction.Transactional;
 
@@ -49,10 +48,10 @@
 public class MyTransactionalBean {
 
     @Inject
-    MyBean bean1;
+    MyTransactionScopedBean bean1;
 
     @Inject
-    MyBean bean2;
+    MyTransactionScopedBean bean2;
 
     String id1;
     String id2;

…ansaction/scope/MyTransactionalBean.java …ansaction/scope/MyTransactionalBean.javajta/transaction-scope/src/main/java/org/javaee7/jta/transaction/scope/MyTransactionalBean.java renamed to jta/transactional/src/main/java/org/javaee7/jta/transaction/scope/MyTransactionalBean.java jta/transaction-scope/src/main/java/org/javaee7/jta/transaction/scope/MyTransactionalBean.java renamed to jta/transactional/src/main/java/org/javaee7/jta/transaction/scope/MyTransactionalBean.java

@@ -46,7 +46,7 @@
  * @author Arun Gupta
  */
 @RequestScoped
-public class MyBean {
+public class MyTransactionalTxTypeBean {
     @Transactional(Transactional.TxType.REQUIRED)
     public void required() {
         System.out.println(getClass().getName() + "Transactional.TxType.REQUIRED");

…rg/javaee7/jta/transactional/MyBean.java …sactional/MyTransactionalTxTypeBean.javajta/transactional/src/main/java/org/javaee7/jta/transactional/MyBean.java renamed to jta/transactional/src/main/java/org/javaee7/jta/transactional/MyTransactionalTxTypeBean.java jta/transactional/src/main/java/org/javaee7/jta/transactional/MyBean.java renamed to jta/transactional/src/main/java/org/javaee7/jta/transactional/MyTransactionalTxTypeBean.java

@@ -24,7 +24,7 @@ public class MyTransactionalBeanTest {
     @Deployment
     public static Archive<?> deploy() {
         return ShrinkWrap.create(JavaArchive.class)
-                         .addClasses(MyTransactionalBean.class, MyBean.class)
+                         .addClasses(MyTransactionalBean.class, MyTransactionScopedBean.class)
                          .addAsManifestResource("beans.xml");
     }
 

…ction/scope/MyTransactionalBeanTest.java …ction/scope/MyTransactionalBeanTest.javajta/transaction-scope/src/test/java/org/javaee7/jta/transaction/scope/MyTransactionalBeanTest.java renamed to jta/transactional/src/test/java/org/javaee7/jta/transaction/scope/MyTransactionalBeanTest.java jta/transaction-scope/src/test/java/org/javaee7/jta/transaction/scope/MyTransactionalBeanTest.java renamed to jta/transactional/src/test/java/org/javaee7/jta/transaction/scope/MyTransactionalBeanTest.java

@@ -21,11 +21,11 @@
  * @author Alexis Hassler
  */
 @RunWith(Arquillian.class)
-public class MyTransactionalWithUserTransactionTest {
+public class MyTransactionalBeanWithUserTransactionTest {
     @Deployment
     public static Archive<?> deploy() {
         return ShrinkWrap.create(JavaArchive.class)
-                         .addClasses(MyTransactionalBean.class, MyBean.class)
+                         .addClasses(MyTransactionalBean.class, MyTransactionScopedBean.class)
                          .addAsManifestResource("beans.xml");
     }
 

…ransactionalWithUserTransactionTest.java …actionalBeanWithUserTransactionTest.javajta/transaction-scope/src/test/java/org/javaee7/jta/transaction/scope/MyTransactionalWithUserTransactionTest.java renamed to jta/transactional/src/test/java/org/javaee7/jta/transaction/scope/MyTransactionalBeanWithUserTransactionTest.java jta/transaction-scope/src/test/java/org/javaee7/jta/transaction/scope/MyTransactionalWithUserTransactionTest.java renamed to jta/transactional/src/test/java/org/javaee7/jta/transaction/scope/MyTransactionalBeanWithUserTransactionTest.java

@@ -15,14 +15,14 @@
  * @author Alexis Hassler
  */
 @RunWith(Arquillian.class)
-public class MyBeanTest {
+public class MyTransactionalTxTypeBeanTest {
     @Deployment
     public static Archive<?> deploy() {
         return ShrinkWrap.create(JavaArchive.class)
-                         .addClass(MyBean.class);
+                         .addClass(MyTransactionalTxTypeBean.class);
     }
 
-    @Inject MyBean bean;
+    @Inject MyTransactionalTxTypeBean bean;
 
 
     @Test