You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2020/09/02 07:10:40 UTC
[camel] branch camel-3.4.x updated: CAMEL-14918 - camel-cdi: Avoid
@Resource injection (#3971) (#4151)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-3.4.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-3.4.x by this push:
new 04a0a17 CAMEL-14918 - camel-cdi: Avoid @Resource injection (#3971) (#4151)
04a0a17 is described below
commit 04a0a17046552a7dece44786209f4b249474ec56
Author: Amos Feng <zf...@redhat.com>
AuthorDate: Wed Sep 2 15:10:17 2020 +0800
CAMEL-14918 - camel-cdi: Avoid @Resource injection (#3971) (#4151)
---
components/camel-cdi/pom.xml | 21 ---------------------
.../TransactionalJtaTransactionPolicy.java | 13 +++++++++++--
2 files changed, 11 insertions(+), 23 deletions(-)
diff --git a/components/camel-cdi/pom.xml b/components/camel-cdi/pom.xml
index c0d5396..d22cece 100644
--- a/components/camel-cdi/pom.xml
+++ b/components/camel-cdi/pom.xml
@@ -471,27 +471,6 @@
<version>2.10</version>
<executions>
<execution>
- <id>copy</id>
- <phase>validate</phase>
- <goals>
- <goal>copy</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
- <version>1.2</version>
- <type>jar</type>
- <overWrite>false</overWrite>
- <outputDirectory>${project.basedir}/target/java9</outputDirectory>
- </artifactItem>
- </artifactItems>
- <overWriteReleases>false</overWriteReleases>
- <overWriteSnapshots>true</overWriteSnapshots>
- </configuration>
- </execution>
- <execution>
<id>copy-jaxb</id>
<phase>validate</phase>
<goals>
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/TransactionalJtaTransactionPolicy.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/TransactionalJtaTransactionPolicy.java
index 874ed1a..c79b9c3 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/TransactionalJtaTransactionPolicy.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/TransactionalJtaTransactionPolicy.java
@@ -16,7 +16,8 @@
*/
package org.apache.camel.cdi.transaction;
-import javax.annotation.Resource;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
import javax.transaction.HeuristicMixedException;
import javax.transaction.HeuristicRollbackException;
import javax.transaction.RollbackException;
@@ -39,10 +40,18 @@ import org.slf4j.LoggerFactory;
public abstract class TransactionalJtaTransactionPolicy extends JtaTransactionPolicy {
private static final Logger LOG = LoggerFactory.getLogger(TransactionalJtaTransactionPolicy.class);
+ private static final String TRANSACTION_MANAGER_JNDI_NAME = "java:/TransactionManager";
- @Resource(lookup = "java:/TransactionManager")
protected TransactionManager transactionManager;
+ public TransactionalJtaTransactionPolicy() {
+ try {
+ transactionManager = InitialContext.doLookup(TRANSACTION_MANAGER_JNDI_NAME);
+ } catch (NamingException e) {
+ LOG.warn("Could not find the transaction manager through " + TRANSACTION_MANAGER_JNDI_NAME);
+ }
+ }
+
protected void runWithTransaction(final Runnable runnable, final boolean isNew) throws Throwable {
if (isNew) {
begin();