You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@deltaspike.apache.org by st...@apache.org on 2012/06/03 12:46:21 UTC
git commit: DELTASPIKE-175 DELTASPIKE-178 improve JavaDoc and now
unused autoDetect feature
Updated Branches:
refs/heads/master 750b593b2 -> bcb8710ef
DELTASPIKE-175 DELTASPIKE-178 improve JavaDoc and now unused autoDetect feature
The autodetect flag is not used anymore as this is now the default.
Project: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/commit/bcb8710e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/tree/bcb8710e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/diff/bcb8710e
Branch: refs/heads/master
Commit: bcb8710ef9250f43c2996d30ae1b141657717a79
Parents: 750b593
Author: Mark Struberg <st...@apache.org>
Authored: Sun Jun 3 12:45:09 2012 +0200
Committer: Mark Struberg <st...@apache.org>
Committed: Sun Jun 3 12:45:09 2012 +0200
----------------------------------------------------------------------
.../deltaspike/jpa/api/TransactionScoped.java | 2 +-
.../apache/deltaspike/jpa/api/Transactional.java | 10 --------
.../TransactionalInterceptorStrategy.java | 19 ---------------
3 files changed, 1 insertions(+), 30 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/bcb8710e/deltaspike/modules/jpa/api/src/main/java/org/apache/deltaspike/jpa/api/TransactionScoped.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jpa/api/src/main/java/org/apache/deltaspike/jpa/api/TransactionScoped.java b/deltaspike/modules/jpa/api/src/main/java/org/apache/deltaspike/jpa/api/TransactionScoped.java
index 474cdff..262559a 100644
--- a/deltaspike/modules/jpa/api/src/main/java/org/apache/deltaspike/jpa/api/TransactionScoped.java
+++ b/deltaspike/modules/jpa/api/src/main/java/org/apache/deltaspike/jpa/api/TransactionScoped.java
@@ -28,7 +28,7 @@ import java.lang.annotation.Target;
import javax.enterprise.context.NormalScope;
/**
- * <p>A @TransactionScoped contextual instance will unique for a given
+ * <p>A @TransactionScoped contextual instance will be unique for a given
* CODI-managed Transaction. The context will get started when the outermost
* {@link Transactional} method gets invoked and will get closed when
* the call chain leaves the outermost {@link Transactional} method.</p>
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/bcb8710e/deltaspike/modules/jpa/api/src/main/java/org/apache/deltaspike/jpa/api/Transactional.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jpa/api/src/main/java/org/apache/deltaspike/jpa/api/Transactional.java b/deltaspike/modules/jpa/api/src/main/java/org/apache/deltaspike/jpa/api/Transactional.java
index ebc69eb..0bdb0ae 100644
--- a/deltaspike/modules/jpa/api/src/main/java/org/apache/deltaspike/jpa/api/Transactional.java
+++ b/deltaspike/modules/jpa/api/src/main/java/org/apache/deltaspike/jpa/api/Transactional.java
@@ -51,14 +51,4 @@ public @interface Transactional
*/
@Nonbinding Class<? extends Annotation>[] qualifier() default Any.class;
- //TODO remove it if we keep Any as default qualifier
- /*
- //alternative if we keep Default as default qualifier instead of Any
- / **
- * In case of false only transactions for entity-managers listed at {@link #qualifier()} will be handled
- * @return true to use the injected entity-managers and
- * false to restrict a service call to the specified entity managers
- * /
- @Nonbinding boolean autoDetection() default true;
- */
}
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/bcb8710e/deltaspike/modules/jpa/impl/src/main/java/org/apache/deltaspike/jpa/impl/transaction/TransactionalInterceptorStrategy.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jpa/impl/src/main/java/org/apache/deltaspike/jpa/impl/transaction/TransactionalInterceptorStrategy.java b/deltaspike/modules/jpa/impl/src/main/java/org/apache/deltaspike/jpa/impl/transaction/TransactionalInterceptorStrategy.java
index 4353dd7..5d8022d 100644
--- a/deltaspike/modules/jpa/impl/src/main/java/org/apache/deltaspike/jpa/impl/transaction/TransactionalInterceptorStrategy.java
+++ b/deltaspike/modules/jpa/impl/src/main/java/org/apache/deltaspike/jpa/impl/transaction/TransactionalInterceptorStrategy.java
@@ -401,25 +401,6 @@ public class TransactionalInterceptorStrategy implements PersistenceStrategy
findAndAddInjectedEntityManagers(target, currentTransactionContext);
}
- //TODO remove it if we don't use Transactional#autoDetection
- /*
- if (transactionalAnnotation == null)
- {
- currentTransactionContext.addTransactionMetaDataEntry(Default.class);
- }
- else if (!transactionalAnnotation.autoDetection())
- {
- for (Class<? extends Annotation> qualifier : transactionalAnnotation.qualifier())
- {
- currentTransactionContext.addTransactionMetaDataEntry(qualifier);
- }
- }
- else
- {
- findAndAddInjectedEntityManagers(target, currentTransactionContext);
- }
- */
-
return currentTransactionContext;
}