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/05/25 11:28:55 UTC
[camel] branch master updated: CAMEL-15108: Extract the
implementation of the JtaTransactionPolicy from (#3856)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 6810d85 CAMEL-15108: Extract the implementation of the JtaTransactionPolicy from (#3856)
6810d85 is described below
commit 6810d8527f3959dcc9c40f582a54206e0f7b5baf
Author: Amos Feng <zf...@redhat.com>
AuthorDate: Mon May 25 19:28:38 2020 +0800
CAMEL-15108: Extract the implementation of the JtaTransactionPolicy from (#3856)
camel-cdi to camel-jta
---
apache-camel/src/main/descriptors/common-bin.xml | 1 +
bom/camel-bom/pom.xml | 5 +++
components/camel-cdi/pom.xml | 4 ++
.../java/org/apache/camel/cdi/CdiRouteBuilder.java | 2 +-
.../TransactionalJtaTransactionPolicy.java | 9 ++++
.../org/apache/camel/cdi/xml/ErrorHandlerType.java | 2 +-
components/camel-jta/pom.xml | 51 ++++++++++++++++++++++
.../services/org/apache/camel/other.properties | 7 +++
.../camel-jta/src/generated/resources/jta.json | 14 ++++++
components/camel-jta/src/main/docs/jta.adoc | 9 ++++
.../camel/jta}/JtaTransactionErrorHandler.java | 2 +-
.../jta}/JtaTransactionErrorHandlerBuilder.java | 2 +-
.../jta}/JtaTransactionErrorHandlerReifier.java | 2 +-
.../apache/camel/jta}/JtaTransactionPolicy.java | 8 +---
.../apache/camel/jta}/TransactionErrorHandler.java | 2 +-
components/pom.xml | 1 +
parent/pom.xml | 5 +++
17 files changed, 113 insertions(+), 13 deletions(-)
diff --git a/apache-camel/src/main/descriptors/common-bin.xml b/apache-camel/src/main/descriptors/common-bin.xml
index d925cac..9a12bf0 100644
--- a/apache-camel/src/main/descriptors/common-bin.xml
+++ b/apache-camel/src/main/descriptors/common-bin.xml
@@ -237,6 +237,7 @@
<include>org.apache.camel:camel-jsonapi</include>
<include>org.apache.camel:camel-jsonpath</include>
<include>org.apache.camel:camel-jt400</include>
+ <include>org.apache.camel:camel-jta</include>
<include>org.apache.camel:camel-kafka</include>
<include>org.apache.camel:camel-kubernetes</include>
<include>org.apache.camel:camel-kudu</include>
diff --git a/bom/camel-bom/pom.xml b/bom/camel-bom/pom.xml
index 466e472..fe3aac4 100644
--- a/bom/camel-bom/pom.xml
+++ b/bom/camel-bom/pom.xml
@@ -1074,6 +1074,11 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-jta</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-kafka</artifactId>
<version>${project.version}</version>
</dependency>
diff --git a/components/camel-cdi/pom.xml b/components/camel-cdi/pom.xml
index 1eeb52d..ea15f6f 100644
--- a/components/camel-cdi/pom.xml
+++ b/components/camel-cdi/pom.xml
@@ -89,6 +89,10 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-bean</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-jta</artifactId>
+ </dependency>
<!-- DeltaSpike is only used to provide Main support thus optional -->
<dependency>
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiRouteBuilder.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiRouteBuilder.java
index c717dda..66f534b 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiRouteBuilder.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiRouteBuilder.java
@@ -17,7 +17,7 @@
package org.apache.camel.cdi;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.cdi.transaction.JtaTransactionErrorHandlerBuilder;
+import org.apache.camel.jta.JtaTransactionErrorHandlerBuilder;
/**
* An extension of the {@link RouteBuilder} to provide some additional helper
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 19a36f0..874ed1a 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,24 +16,33 @@
*/
package org.apache.camel.cdi.transaction;
+import javax.annotation.Resource;
import javax.transaction.HeuristicMixedException;
import javax.transaction.HeuristicRollbackException;
import javax.transaction.RollbackException;
import javax.transaction.Status;
import javax.transaction.SystemException;
import javax.transaction.Transaction;
+import javax.transaction.TransactionManager;
import org.apache.camel.CamelException;
+import org.apache.camel.jta.JtaTransactionPolicy;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
* Helper methods for transaction handling
+ *
+ * This class requires the resource {@link TransactionManager} to be available
+ * through JNDI url "java:/TransactionManager"
*/
public abstract class TransactionalJtaTransactionPolicy extends JtaTransactionPolicy {
private static final Logger LOG = LoggerFactory.getLogger(TransactionalJtaTransactionPolicy.class);
+ @Resource(lookup = "java:/TransactionManager")
+ protected TransactionManager transactionManager;
+
protected void runWithTransaction(final Runnable runnable, final boolean isNew) throws Throwable {
if (isNew) {
begin();
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/xml/ErrorHandlerType.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/xml/ErrorHandlerType.java
index bb3dd87..f90813e 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/xml/ErrorHandlerType.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/xml/ErrorHandlerType.java
@@ -23,7 +23,7 @@ import org.apache.camel.builder.DeadLetterChannelBuilder;
import org.apache.camel.builder.DefaultErrorHandlerBuilder;
import org.apache.camel.builder.ErrorHandlerBuilder;
import org.apache.camel.builder.NoErrorHandlerBuilder;
-import org.apache.camel.cdi.transaction.JtaTransactionErrorHandlerBuilder;
+import org.apache.camel.jta.JtaTransactionErrorHandlerBuilder;
/**
* Used to configure the errorHandler type
diff --git a/components/camel-jta/pom.xml b/components/camel-jta/pom.xml
new file mode 100644
index 0000000..2fea28e
--- /dev/null
+++ b/components/camel-jta/pom.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>components</artifactId>
+ <version>3.4.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>camel-jta</artifactId>
+ <packaging>jar</packaging>
+
+ <name>Camel :: JTA</name>
+ <description>Using Camel With JTA Transaction Manager</description>
+
+ <properties>
+ <firstVersion>3.4.0</firstVersion>
+ </properties>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-support</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-core-engine</artifactId>
+ </dependency>
+
+ </dependencies>
+</project>
diff --git a/components/camel-jta/src/generated/resources/META-INF/services/org/apache/camel/other.properties b/components/camel-jta/src/generated/resources/META-INF/services/org/apache/camel/other.properties
new file mode 100644
index 0000000..0da8971
--- /dev/null
+++ b/components/camel-jta/src/generated/resources/META-INF/services/org/apache/camel/other.properties
@@ -0,0 +1,7 @@
+# Generated by camel build tools - do NOT edit this file!
+name=jta
+groupId=org.apache.camel
+artifactId=camel-jta
+version=3.4.0-SNAPSHOT
+projectName=Camel :: JTA
+projectDescription=Using Camel With JTA Transaction Manager
diff --git a/components/camel-jta/src/generated/resources/jta.json b/components/camel-jta/src/generated/resources/jta.json
new file mode 100644
index 0000000..374f87c
--- /dev/null
+++ b/components/camel-jta/src/generated/resources/jta.json
@@ -0,0 +1,14 @@
+{
+ "other": {
+ "kind": "other",
+ "name": "jta",
+ "title": "Jta",
+ "description": "Using Camel With JTA Transaction Manager",
+ "deprecated": false,
+ "firstVersion": "3.4.0",
+ "supportLevel": "Preview",
+ "groupId": "org.apache.camel",
+ "artifactId": "camel-jta",
+ "version": "3.4.0-SNAPSHOT"
+ }
+}
diff --git a/components/camel-jta/src/main/docs/jta.adoc b/components/camel-jta/src/main/docs/jta.adoc
new file mode 100644
index 0000000..5055f0e
--- /dev/null
+++ b/components/camel-jta/src/main/docs/jta.adoc
@@ -0,0 +1,9 @@
+[[jta-component]]
+= Jta Component
+:docTitle: Jta
+:artifactId: camel-jta
+:description: Using Camel With JTA Transaction Manager
+:since: 3.4
+:supportLevel: Preview
+
+*Since Camel {since}*
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/JtaTransactionErrorHandler.java b/components/camel-jta/src/main/java/org/apache/camel/jta/JtaTransactionErrorHandler.java
similarity index 98%
rename from components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/JtaTransactionErrorHandler.java
rename to components/camel-jta/src/main/java/org/apache/camel/jta/JtaTransactionErrorHandler.java
index 5d8652d..1e86cf6 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/JtaTransactionErrorHandler.java
+++ b/components/camel-jta/src/main/java/org/apache/camel/jta/JtaTransactionErrorHandler.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.cdi.transaction;
+package org.apache.camel.jta;
import java.util.concurrent.ScheduledExecutorService;
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/JtaTransactionErrorHandlerBuilder.java b/components/camel-jta/src/main/java/org/apache/camel/jta/JtaTransactionErrorHandlerBuilder.java
similarity index 98%
rename from components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/JtaTransactionErrorHandlerBuilder.java
rename to components/camel-jta/src/main/java/org/apache/camel/jta/JtaTransactionErrorHandlerBuilder.java
index f56598a..2fd0860 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/JtaTransactionErrorHandlerBuilder.java
+++ b/components/camel-jta/src/main/java/org/apache/camel/jta/JtaTransactionErrorHandlerBuilder.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.cdi.transaction;
+package org.apache.camel.jta;
import org.apache.camel.LoggingLevel;
import org.apache.camel.builder.DefaultErrorHandlerBuilder;
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/JtaTransactionErrorHandlerReifier.java b/components/camel-jta/src/main/java/org/apache/camel/jta/JtaTransactionErrorHandlerReifier.java
similarity index 99%
rename from components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/JtaTransactionErrorHandlerReifier.java
rename to components/camel-jta/src/main/java/org/apache/camel/jta/JtaTransactionErrorHandlerReifier.java
index 40a244f..295ca03 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/JtaTransactionErrorHandlerReifier.java
+++ b/components/camel-jta/src/main/java/org/apache/camel/jta/JtaTransactionErrorHandlerReifier.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.cdi.transaction;
+package org.apache.camel.jta;
import java.util.Map;
import java.util.concurrent.ScheduledExecutorService;
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/JtaTransactionPolicy.java b/components/camel-jta/src/main/java/org/apache/camel/jta/JtaTransactionPolicy.java
similarity index 96%
rename from components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/JtaTransactionPolicy.java
rename to components/camel-jta/src/main/java/org/apache/camel/jta/JtaTransactionPolicy.java
index 5a2ed4e..0a295bc 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/JtaTransactionPolicy.java
+++ b/components/camel-jta/src/main/java/org/apache/camel/jta/JtaTransactionPolicy.java
@@ -14,10 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.cdi.transaction;
-
-import javax.annotation.Resource;
-import javax.transaction.TransactionManager;
+package org.apache.camel.jta;
import org.apache.camel.NamedNode;
import org.apache.camel.Processor;
@@ -47,9 +44,6 @@ public abstract class JtaTransactionPolicy implements TransactedPolicy {
void run() throws Throwable;
}
- @Resource(lookup = "java:/TransactionManager")
- protected TransactionManager transactionManager;
-
@Override
public void beforeWrap(Route route, NamedNode definition) {
// do not inherit since we create our own
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/TransactionErrorHandler.java b/components/camel-jta/src/main/java/org/apache/camel/jta/TransactionErrorHandler.java
similarity index 99%
rename from components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/TransactionErrorHandler.java
rename to components/camel-jta/src/main/java/org/apache/camel/jta/TransactionErrorHandler.java
index f8813c9..44adc4b 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/TransactionErrorHandler.java
+++ b/components/camel-jta/src/main/java/org/apache/camel/jta/TransactionErrorHandler.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.cdi.transaction;
+package org.apache.camel.jta;
import java.util.ArrayList;
import java.util.List;
diff --git a/components/pom.xml b/components/pom.xml
index f55fa32..ef7c60f 100644
--- a/components/pom.xml
+++ b/components/pom.xml
@@ -250,6 +250,7 @@
<module>camel-jsonapi</module>
<module>camel-jsonpath</module>
<module>camel-jt400</module>
+ <module>camel-jta</module>
<module>camel-kafka</module>
<module>camel-kubernetes</module>
<module>camel-kudu</module>
diff --git a/parent/pom.xml b/parent/pom.xml
index 7bd50c5..ad9c745 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -1698,6 +1698,11 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-jta</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-kafka</artifactId>
<version>${project.version}</version>
</dependency>