From ce421cf22d45245f36929a02da9c620e49b75ca7 Mon Sep 17 00:00:00 2001
From: Cleverson Sacramento <cleverson.sacramento@gmail.com>
Date: Wed, 4 Jul 2012 14:01:32 -0300
Subject: [PATCH] Remoção das anotações @Alternative das estratégias de transação e melhorias no TransactionBootstrap (mas ainda não definitivas).

---
 impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/bootstrap/TransactionBootstrap.java | 19 +++++--------------
 impl/extension/jpa/src/main/java/br/gov/frameworkdemoiselle/transaction/JPATransaction.java     |  2 --
 impl/extension/jta/src/main/java/br/gov/frameworkdemoiselle/transaction/JTATransaction.java     |  2 --
 3 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/bootstrap/TransactionBootstrap.java b/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/bootstrap/TransactionBootstrap.java
index 25d02e5..20ab1ba 100644
--- a/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/bootstrap/TransactionBootstrap.java
+++ b/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/bootstrap/TransactionBootstrap.java
@@ -51,22 +51,13 @@ public class TransactionBootstrap extends AbstractBootstrap {
 	public <T> void processAnnotatedType(@Observes final ProcessAnnotatedType<T> event) throws ConfigurationException {
 
 		Configuration config = new PropertiesConfiguration("demoiselle.properties");
-		String selected = config.getString("frameworkdemoiselle.transaction.class");
+		String selected = config.getString("frameworkdemoiselle.transaction.class",
+				DefaultTransaction.class.getCanonicalName());
 
 		Class<?> type = event.getAnnotatedType().getJavaClass();
-		if (Transaction.class.isAssignableFrom(type) && type != Transaction.class && type != DefaultTransaction.class) {
-			if (selected != null && !selected.equals(type.getCanonicalName())) {
-				event.veto();
-			}
+		if (Transaction.class.isAssignableFrom(type) && type != Transaction.class
+				&& !type.getCanonicalName().equals(selected)) {
+			event.veto();
 		}
-
-		// final AnnotatedType<T> annotatedType = event.getAnnotatedType();
-		// for (AnnotatedMethod<?> am : annotatedType.getMethods()) {
-		// if (am.isAnnotationPresent(annotationClass)) {
-		// @SuppressWarnings("unchecked")
-		// AnnotatedMethod<T> annotatedMethod = (AnnotatedMethod<T>) am;
-		// processors.add(new StartupProcessor<T>(annotatedMethod, beanManager));
-		// }
-		// }
 	}
 }
diff --git a/impl/extension/jpa/src/main/java/br/gov/frameworkdemoiselle/transaction/JPATransaction.java b/impl/extension/jpa/src/main/java/br/gov/frameworkdemoiselle/transaction/JPATransaction.java
index d6720ab..8547131 100644
--- a/impl/extension/jpa/src/main/java/br/gov/frameworkdemoiselle/transaction/JPATransaction.java
+++ b/impl/extension/jpa/src/main/java/br/gov/frameworkdemoiselle/transaction/JPATransaction.java
@@ -39,7 +39,6 @@ package br.gov.frameworkdemoiselle.transaction;
 import java.util.Collection;
 
 import javax.enterprise.context.RequestScoped;
-import javax.enterprise.inject.Alternative;
 import javax.inject.Inject;
 import javax.persistence.EntityManager;
 import javax.persistence.EntityTransaction;
@@ -52,7 +51,6 @@ import br.gov.frameworkdemoiselle.internal.producer.EntityManagerProducer;
  * @author SERPRO
  * @see Transaction
  */
-@Alternative
 @RequestScoped
 public class JPATransaction implements Transaction {
 
diff --git a/impl/extension/jta/src/main/java/br/gov/frameworkdemoiselle/transaction/JTATransaction.java b/impl/extension/jta/src/main/java/br/gov/frameworkdemoiselle/transaction/JTATransaction.java
index 05e13df..e414c3e 100644
--- a/impl/extension/jta/src/main/java/br/gov/frameworkdemoiselle/transaction/JTATransaction.java
+++ b/impl/extension/jta/src/main/java/br/gov/frameworkdemoiselle/transaction/JTATransaction.java
@@ -37,14 +37,12 @@
 package br.gov.frameworkdemoiselle.transaction;
 
 import javax.enterprise.context.RequestScoped;
-import javax.enterprise.inject.Alternative;
 import javax.transaction.Status;
 import javax.transaction.SystemException;
 import javax.transaction.UserTransaction;
 
 import br.gov.frameworkdemoiselle.util.Beans;
 
-@Alternative
 @RequestScoped
 public class JTATransaction implements Transaction {
 
--
libgit2 0.21.2