You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2020/07/27 09:30:48 UTC
[camel-kafka-connector] branch master updated: Add CORE protocol
support to SJMS2 connector
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git
The following commit(s) were added to refs/heads/master by this push:
new e6fc4fa Add CORE protocol support to SJMS2 connector
new 7cf5e9e Merge pull request #336 from fvaleri/sjms2-core
e6fc4fa is described below
commit e6fc4fafdda89c3ca0b1925ca9fd434e345dfb7b
Author: Federico Valeri <fv...@localhost>
AuthorDate: Sun Jul 26 17:28:32 2020 +0200
Add CORE protocol support to SJMS2 connector
---
...mel-kafka-connector-fix-dependencies.properties | 2 +-
connectors/camel-sjms2-kafka-connector/pom.xml | 5 ++-
docs/modules/ROOT/pages/connectors.adoc | 2 +-
.../camel-bonita-kafka-sink-connector.adoc | 37 ----------------------
examples/CamelJmsSinkConnector.properties | 4 +++
examples/CamelJmsSourceConnector.properties | 4 +++
parent/pom.xml | 6 ++++
tests/itests-sjms2/pom.xml | 6 ++++
...mel-kafka-connector-fix-dependencies.properties | 2 +-
9 files changed, 27 insertions(+), 41 deletions(-)
diff --git a/connectors/camel-kafka-connector-fix-dependencies.properties b/connectors/camel-kafka-connector-fix-dependencies.properties
index 7efa17b..cb35e16 100644
--- a/connectors/camel-kafka-connector-fix-dependencies.properties
+++ b/connectors/camel-kafka-connector-fix-dependencies.properties
@@ -22,7 +22,7 @@
global=org.apache.camel.kafkaconnector:camel-kafka-connector
# we add a default connection factory maven dependency (variables can be used as ${varname})
-camel-sjms2=org.apache.activemq:activemq-client::compile
+camel-sjms2=org.apache.activemq:activemq-client,org.apache.activemq:artemis-jms-client
exclude_camel-sjms2=
additional_properties_camel-sjms2=camel.component.sjms2.connection-factory=#class:org.apache.activemq.ActiveMQConnectionFactory,camel.component.sjms2.connection-factory.brokerURL=tcp://localhost:61616
diff --git a/connectors/camel-sjms2-kafka-connector/pom.xml b/connectors/camel-sjms2-kafka-connector/pom.xml
index 58b18f0..a19c4d9 100644
--- a/connectors/camel-sjms2-kafka-connector/pom.xml
+++ b/connectors/camel-sjms2-kafka-connector/pom.xml
@@ -48,7 +48,10 @@
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-client</artifactId>
- <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>artemis-jms-client</artifactId>
</dependency>
<dependency>
<groupId>org.apache.camel.kafkaconnector</groupId>
diff --git a/docs/modules/ROOT/pages/connectors.adoc b/docs/modules/ROOT/pages/connectors.adoc
index 3e03df8..c5e6530 100644
--- a/docs/modules/ROOT/pages/connectors.adoc
+++ b/docs/modules/ROOT/pages/connectors.adoc
@@ -2,7 +2,7 @@
= Supported connectors and documentation
// kafka-connectors list: START
-Number of Camel Kafka connectors: 351
+Number of Camel Kafka connectors: 351
[width="100%",cols="4,1,1,1,1,1,1",options="header"]
|===
diff --git a/docs/modules/ROOT/pages/connectors/camel-bonita-kafka-sink-connector.adoc b/docs/modules/ROOT/pages/connectors/camel-bonita-kafka-sink-connector.adoc
deleted file mode 100644
index 08aaf7b..0000000
--- a/docs/modules/ROOT/pages/connectors/camel-bonita-kafka-sink-connector.adoc
+++ /dev/null
@@ -1,37 +0,0 @@
-// kafka-connector options: START
-[[camel-bonita-kafka-connector-sink]]
-= camel-bonita-kafka-connector sink configuration
-
-When using camel-bonita-kafka-connector as sink make sure to use the following Maven dependency to have support for the connector:
-
-[source,xml]
-----
-<dependency>
- <groupId>org.apache.camel.kafkaconnector</groupId>
- <artifactId>camel-bonita-kafka-connector</artifactId>
- <version>x.x.x</version>
- <!-- use the same version as your Camel Kafka connector version -->
-</dependency>
-----
-
-
-The camel-bonita sink connector supports 11 options, which are listed below.
-
-
-
-[width="100%",cols="2,5,^1,2",options="header"]
-|===
-| Name | Description | Default | Priority
-| *camel.sink.path.operation* | Operation to use One of: [startCase] | null | HIGH
-| *camel.sink.endpoint.hostname* | Hostname where Bonita engine runs | "localhost" | MEDIUM
-| *camel.sink.endpoint.lazyStartProducer* | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then cre [...]
-| *camel.sink.endpoint.port* | Port of the server hosting Bonita engine | "8080" | MEDIUM
-| *camel.sink.endpoint.processName* | Name of the process involved in the operation | null | MEDIUM
-| *camel.sink.endpoint.basicPropertyBinding* | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | MEDIUM
-| *camel.sink.endpoint.synchronous* | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | MEDIUM
-| *camel.sink.endpoint.password* | Password to authenticate to Bonita engine. | null | MEDIUM
-| *camel.sink.endpoint.username* | Username to authenticate to Bonita engine. | null | MEDIUM
-| *camel.component.bonita.lazyStartProducer* | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then [...]
-| *camel.component.bonita.basicPropertyBinding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | MEDIUM
-|===
-// kafka-connector options: END
diff --git a/examples/CamelJmsSinkConnector.properties b/examples/CamelJmsSinkConnector.properties
index 1898b5b..0f18d9a 100644
--- a/examples/CamelJmsSinkConnector.properties
+++ b/examples/CamelJmsSinkConnector.properties
@@ -30,3 +30,7 @@ camel.component.sjms2.connection-factory.brokerURL=tcp://localhost:61616
# If using AMQP via QPid JMS:
# camel.component.sjms2.connection-factory=#class:org.apache.qpid.jms.JmsConnectionFactory
# camel.component.sjms2.connection-factory.remoteURI=amqp://localhost:5672
+
+# If using CORE via Artemis JMS:
+# camel.component.sjms2.connection-factory=#class:org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory
+# camel.component.sjms2.connection-factory.remoteURI=tcp://localhost:61616
diff --git a/examples/CamelJmsSourceConnector.properties b/examples/CamelJmsSourceConnector.properties
index b999e7b..0e4cda0 100644
--- a/examples/CamelJmsSourceConnector.properties
+++ b/examples/CamelJmsSourceConnector.properties
@@ -31,3 +31,7 @@ camel.component.sjms2.connection-factory.brokerURL=tcp://localhost:61616
# If using AMQP via QPid JMS:
# camel.component.sjms2.connection-factory=#class:org.apache.qpid.jms.JmsConnectionFactory
# camel.component.sjms2.connection-factory.remoteURI=amqp://localhost:5672
+
+# If using CORE via Artemis JMS:
+# camel.component.sjms2.connection-factory=#class:org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory
+# camel.component.sjms2.connection-factory.remoteURI=tcp://localhost:61616
diff --git a/parent/pom.xml b/parent/pom.xml
index 7857ab0..b11bd7d 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -287,6 +287,12 @@
<version>${activemq-version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>artemis-jms-client</artifactId>
+ <version>${activemq-artemis-version}</version>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>javax.annotation</groupId>
diff --git a/tests/itests-sjms2/pom.xml b/tests/itests-sjms2/pom.xml
index 9ade8dd..34c6e51 100644
--- a/tests/itests-sjms2/pom.xml
+++ b/tests/itests-sjms2/pom.xml
@@ -55,6 +55,12 @@
<artifactId>activemq-client</artifactId>
<scope>test</scope>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>artemis-jms-client</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
diff --git a/tooling/camel-kafka-connector-generator-maven-plugin/src/main/resources/camel-kafka-connector-fix-dependencies.properties b/tooling/camel-kafka-connector-generator-maven-plugin/src/main/resources/camel-kafka-connector-fix-dependencies.properties
index 5cac515..c5ea203 100644
--- a/tooling/camel-kafka-connector-generator-maven-plugin/src/main/resources/camel-kafka-connector-fix-dependencies.properties
+++ b/tooling/camel-kafka-connector-generator-maven-plugin/src/main/resources/camel-kafka-connector-fix-dependencies.properties
@@ -22,6 +22,6 @@
global=org.apache.camel.kafkaconnector:camel-kafka-connector
# we add a default connection factory maven variables can be used as ${varname}
-camel-sjms2=org.apache.activemq:activemq-client
+camel-sjms2=org.apache.activemq:activemq-client,org.apache.activemq:artemis-jms-client
exclude_camel-sjms2=
additional_properties_camel-sjms2=camel.component.sjms2.connection-factory=#class:org.apache.activemq.ActiveMQConnectionFactory,camel.component.sjms2.connection-factory.brokerURL=tcp://localhost:61616