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 2018/11/30 10:09:21 UTC
[camel] branch sandbox/camel-3.x updated (1ae6c35 -> d0f6a19)
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a change to branch sandbox/camel-3.x
in repository https://gitbox.apache.org/repos/asf/camel.git.
from 1ae6c35 Fix broken build
new 905176f CAMEL-12925 - Camel-Slack: Consumer must be able to use a different server than the default one
new 65aeebf renamed apiProperties to apiProperty in camel-core/src/main/docs/rest-dsl.adoc fix CAMEL-12929 (#2608)
new d5344de Explicited the servlet-api dependency version brought by spring-boot-starter-undertow so that its no more overridden by camel-parent
new 31f1a7d Update Groovy to version 2.5.4
new cab62ff Parent POM: Remove unused backport-util-concurrent-version property
new f816134 Parent POM: Remove unused commons-digester-1x-version property
new 2ef9cbd Parent POM: Remove pdfbox18-version property and dependency management of jempbox, because jempbox is not used by pdfbox 2
new 4fd7940 CAMEL-12931 - Upgrade jBPM component to use 7 series with consumer capability to react to produced events by jBPM
new 52865d8 Upgrade Atmosphere Websocket to version 2.5.2
new 6d418af Upgrade Joda Time to version 2.10.1
new 4623f87 upgrade versions of optaplanner and kie as they are from same release cycle
new c5090e5 Added link in Summary about REST DSL
new 9c219bb Added languages.adoc to Summary
new 1eda41e Fixed typos
new c4bbc59 CAMEL-12933 override populateHeaders considering backward compatibility
new d0f6a19 Regen
The 16 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
camel-core/src/main/docs/rest-dsl.adoc | 2 +-
.../component/file/GenericFileOperations.java | 2 +-
.../camel-cxf/src/main/docs/cxf-component.adoc | 4 +-
.../camel/component/cxf/CxfProducerTest.java | 2 +-
.../camel/component/file/remote/RemoteFile.java | 5 +
.../src/test/resources/hdfs-default.xml | 4 +-
.../camel-hdfs2/src/test/resources/hdfs-test.xml | 4 +-
components/camel-jbpm/pom.xml | 71 +++--
.../camel-jbpm/src/main/docs/jbpm-component.adoc | 175 +++++++++--
...MComponent.java => JBPMCamelConsumerAware.java} | 24 +-
.../apache/camel/component/jbpm/JBPMComponent.java | 6 +-
.../camel/component/jbpm/JBPMConfiguration.java | 73 ++++-
.../apache/camel/component/jbpm/JBPMConstants.java | 11 +-
.../apache/camel/component/jbpm/JBPMConsumer.java | 208 +++++++++++++
.../apache/camel/component/jbpm/JBPMEndpoint.java | 44 ++-
.../apache/camel/component/jbpm/JBPMProducer.java | 291 ++++++++++---------
.../component/jbpm/emitters/CamelEventEmitter.java | 75 +++++
.../emitters/ServiceRegistryBoundEventEmitter.java | 62 ++++
.../jbpm/listeners/CamelCaseEventListener.java | 286 ++++++++++++++++++
.../jbpm/listeners/CamelProcessEventListener.java | 138 +++++++++
.../jbpm/listeners/CamelTaskEventListener.java | 321 +++++++++++++++++++++
.../jbpm/server/CamelKieServerExtension.java | 225 +++++++++++++++
.../org.kie.server.services.api.KieServerExtension | 1 +
.../jbpm/JBPMComponentIntegrationTest.java | 65 ++++-
.../internal/client/DefaultCompositeApiClient.java | 4 +-
.../component/salesforce/LoginConfigHelper.java | 2 +-
.../api/dto/approval/ApprovalRequestTest.java | 6 +-
.../iso_schematron_skeleton_for_saxon.xsl | 2 +-
.../camel-slack/src/main/docs/slack-component.adoc | 3 +-
.../slack/SlackComponentVerifierExtension.java | 2 +-
.../camel/component/slack/SlackConsumer.java | 4 +-
.../camel/component/slack/SlackEndpoint.java | 13 +
.../apache/camel/component/smpp/SmppSplitter.java | 8 +-
...upervisingRouteControllerAutoConfiguration.java | 2 +-
.../addressing/ProducerParamsPrecedenceTest.java | 2 +-
.../xmlsecurity/api/XAdESSignatureProperties.java | 14 +-
.../xmlsecurity/XAdESSignaturePropertiesTest.java | 14 +-
docs/user-manual/en/SUMMARY.md | 4 +-
docs/user-manual/en/languages.adoc | 5 +-
docs/user-manual/en/scala-dsl-eip.adoc | 2 +-
docs/user-manual/en/servicepool.adoc | 2 +-
.../example/micrometer/ScrapeRouteBuilder.java | 2 +-
examples/camel-example-rest-producer/pom.xml | 5 +
parent/pom.xml | 20 +-
.../karaf/features/src/main/resources/features.xml | 61 ++--
.../camel-spring-boot-dependencies/pom.xml | 152 +++++-----
pom.xml | 2 +-
.../camel/itest/greeter/JmsToCxfInOutTest.java | 2 +-
48 files changed, 2033 insertions(+), 399 deletions(-)
copy components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/{JBPMComponent.java => JBPMCamelConsumerAware.java} (60%)
create mode 100644 components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/JBPMConsumer.java
create mode 100644 components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/emitters/CamelEventEmitter.java
create mode 100644 components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/emitters/ServiceRegistryBoundEventEmitter.java
create mode 100644 components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/listeners/CamelCaseEventListener.java
create mode 100644 components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/listeners/CamelProcessEventListener.java
create mode 100644 components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/listeners/CamelTaskEventListener.java
create mode 100644 components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/server/CamelKieServerExtension.java
create mode 100644 components/camel-jbpm/src/main/resources/META-INF/services/org.kie.server.services.api.KieServerExtension
[camel] 05/16: Parent POM: Remove unused
backport-util-concurrent-version property
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch sandbox/camel-3.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit cab62ffad646846ac7c9fe4980a5b0bf5bec3ce0
Author: Pascal Schumacher <pa...@gmx.net>
AuthorDate: Mon Nov 12 21:46:28 2018 +0100
Parent POM: Remove unused backport-util-concurrent-version property
---
parent/pom.xml | 1 -
1 file changed, 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 50f5fa1..bee1fc3 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -88,7 +88,6 @@
<azure-storage-java-sdk-version>8.0.0</azure-storage-java-sdk-version>
<azure-storage-java-sdk-bundle-version>8.0.0_1</azure-storage-java-sdk-bundle-version>
<azure-guava-version>20.0</azure-guava-version>
- <backport-util-concurrent-version>3.1</backport-util-concurrent-version>
<bcel-bundle-version>5.2_4</bcel-bundle-version>
<beanio-version>2.1.0</beanio-version>
<beanstalkd-client-version>1.4.6</beanstalkd-client-version>
[camel] 01/16: CAMEL-12925 - Camel-Slack: Consumer must be able to
use a different server than the default one
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch sandbox/camel-3.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 905176f1a7c4f0a37b46d16ecdc940d6715cb423
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Nov 12 14:16:16 2018 +0100
CAMEL-12925 - Camel-Slack: Consumer must be able to use a different server than the default one
---
components/camel-slack/src/main/docs/slack-component.adoc | 3 ++-
.../component/slack/SlackComponentVerifierExtension.java | 2 +-
.../org/apache/camel/component/slack/SlackConsumer.java | 4 ++--
.../org/apache/camel/component/slack/SlackEndpoint.java | 13 +++++++++++++
4 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/components/camel-slack/src/main/docs/slack-component.adoc b/components/camel-slack/src/main/docs/slack-component.adoc
index a7c5699..329fd2d 100644
--- a/components/camel-slack/src/main/docs/slack-component.adoc
+++ b/components/camel-slack/src/main/docs/slack-component.adoc
@@ -77,7 +77,7 @@ with the following path and query parameters:
|===
-==== Query Parameters (25 parameters):
+==== Query Parameters (26 parameters):
[width="100%",cols="2,5,^1,2",options="header"]
@@ -86,6 +86,7 @@ with the following path and query parameters:
| *bridgeErrorHandler* (consumer) | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | boolean
| *maxResults* (consumer) | The Max Result for the poll | 10 | String
| *sendEmptyMessageWhenIdle* (consumer) | If the polling consumer did not poll any files, you can enable this option to send an empty message (no body) instead. | false | boolean
+| *serverUrl* (consumer) | The Server URL of the Slack instance | https://slack.com | String
| *token* (consumer) | The token to use | | String
| *exceptionHandler* (consumer) | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. | | ExceptionHandler
| *exchangePattern* (consumer) | Sets the exchange pattern when the consumer creates an exchange. | | ExchangePattern
diff --git a/components/camel-slack/src/main/java/org/apache/camel/component/slack/SlackComponentVerifierExtension.java b/components/camel-slack/src/main/java/org/apache/camel/component/slack/SlackComponentVerifierExtension.java
index b4b0d5f..b8c10fc 100644
--- a/components/camel-slack/src/main/java/org/apache/camel/component/slack/SlackComponentVerifierExtension.java
+++ b/components/camel-slack/src/main/java/org/apache/camel/component/slack/SlackComponentVerifierExtension.java
@@ -111,7 +111,7 @@ public class SlackComponentVerifierExtension extends DefaultComponentVerifierExt
try {
HttpClient client = HttpClientBuilder.create().useSystemProperties().build();
- HttpPost httpPost = new HttpPost("https://slack.com/api/channels.list");
+ HttpPost httpPost = new HttpPost(parameters.get("serverUrl") + "/api/channels.list");
List<BasicNameValuePair> params = new ArrayList<BasicNameValuePair>();
params.add(new BasicNameValuePair("token", token));
diff --git a/components/camel-slack/src/main/java/org/apache/camel/component/slack/SlackConsumer.java b/components/camel-slack/src/main/java/org/apache/camel/component/slack/SlackConsumer.java
index a78dfe8..0295779 100644
--- a/components/camel-slack/src/main/java/org/apache/camel/component/slack/SlackConsumer.java
+++ b/components/camel-slack/src/main/java/org/apache/camel/component/slack/SlackConsumer.java
@@ -61,7 +61,7 @@ public class SlackConsumer extends ScheduledBatchPollingConsumer {
Queue<Exchange> exchanges;
HttpClient client = HttpClientBuilder.create().useSystemProperties().build();
- HttpPost httpPost = new HttpPost("https://slack.com/api/channels.history");
+ HttpPost httpPost = new HttpPost(slackEndpoint.getServerUrl() + "/api/channels.history");
List<BasicNameValuePair> params = new ArrayList<BasicNameValuePair>();
params.add(new BasicNameValuePair("channel", channelId));
if (ObjectHelper.isNotEmpty(timestamp)) {
@@ -129,7 +129,7 @@ public class SlackConsumer extends ScheduledBatchPollingConsumer {
private String getChannelId(String channel) throws IOException, DeserializationException {
HttpClient client = HttpClientBuilder.create().useSystemProperties().build();
- HttpPost httpPost = new HttpPost("https://slack.com/api/channels.list");
+ HttpPost httpPost = new HttpPost(slackEndpoint.getServerUrl() + "/api/channels.list");
List<BasicNameValuePair> params = new ArrayList<BasicNameValuePair>();
params.add(new BasicNameValuePair("token", slackEndpoint.getToken()));
diff --git a/components/camel-slack/src/main/java/org/apache/camel/component/slack/SlackEndpoint.java b/components/camel-slack/src/main/java/org/apache/camel/component/slack/SlackEndpoint.java
index e36096f..8bec47f 100644
--- a/components/camel-slack/src/main/java/org/apache/camel/component/slack/SlackEndpoint.java
+++ b/components/camel-slack/src/main/java/org/apache/camel/component/slack/SlackEndpoint.java
@@ -53,6 +53,8 @@ public class SlackEndpoint extends ScheduledPollEndpoint {
private String token;
@UriParam(label = "consumer", defaultValue = "10")
private String maxResults = "10";
+ @UriParam(label = "consumer", defaultValue = "https://slack.com")
+ private String serverUrl = "https://slack.com";
/**
* Constructor for SlackEndpoint
@@ -168,6 +170,17 @@ public class SlackEndpoint extends ScheduledPollEndpoint {
this.maxResults = maxResult;
}
+ public String getServerUrl() {
+ return serverUrl;
+ }
+
+ /**
+ * The Server URL of the Slack instance
+ */
+ public void setServerUrl(String serverUrl) {
+ this.serverUrl = serverUrl;
+ }
+
public Exchange createExchange(JSONObject object) {
return createExchange(getExchangePattern(), object);
}
[camel] 09/16: Upgrade Atmosphere Websocket to version 2.5.2
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch sandbox/camel-3.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 52865d867499e1798af54bdd50fd9c39474172ba
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Tue Nov 13 08:30:52 2018 +0100
Upgrade Atmosphere Websocket to version 2.5.2
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index fb3cf63..7820d23 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -69,7 +69,7 @@
<asterisk-java-version>1.0.0-final</asterisk-java-version>
<asterisk-java-bundle-version>1.0.0-final_1</asterisk-java-bundle-version>
<atmos-client-version>2.2.2</atmos-client-version>
- <atmosphere-version>2.5.1</atmosphere-version>
+ <atmosphere-version>2.5.2</atmosphere-version>
<atmosphere-version-range>[2.5,3.0)</atmosphere-version-range>
<atomix-version>1.0.8</atomix-version>
<atomix-catalyst-version>1.2.1</atomix-catalyst-version>
[camel] 11/16: upgrade versions of optaplanner and kie as they are
from same release cycle
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch sandbox/camel-3.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 4623f872489eb3245068ce89a9e3558e2dbcb2d3
Author: Maciej Swiderski <sw...@gmail.com>
AuthorDate: Tue Nov 13 10:28:34 2018 +0100
upgrade versions of optaplanner and kie as they are from same release cycle
---
parent/pom.xml | 6 +++---
platforms/karaf/features/src/main/resources/features.xml | 11 +++++++++--
2 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index d70e18d..9e2590c 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -184,7 +184,7 @@
<docker-java-bundle-version>3.0.14_1</docker-java-bundle-version>
<dom4j-bundle-version>1.6.1_5</dom4j-bundle-version>
<dozer-version>6.4.1</dozer-version>
- <drools-version>7.3.0.Final</drools-version>
+ <drools-version>7.14.0.Final</drools-version>
<dropbox-version>3.0.10</dropbox-version>
<eclipse-equinox-common-version>3.3.0-v20070426</eclipse-equinox-common-version>
<egit-github-core-version>2.1.5</egit-github-core-version>
@@ -441,7 +441,7 @@
<kafka-bundle-version>2.0.0_1</kafka-bundle-version>
<karaf2-version>2.4.4</karaf2-version>
<karaf4-version>4.2.1</karaf4-version>
- <kie-version>7.3.0.Final</kie-version>
+ <kie-version>7.14.0.Final</kie-version>
<krati-version>0.4.9</krati-version>
<kubernetes-client-version>4.1.0</kubernetes-client-version>
<kubernetes-model-version>4.1.0</kubernetes-model-version>
@@ -549,7 +549,7 @@
<opentracing-version>0.31.0</opentracing-version>
<opentracing-tracerresolver-version>0.1.4</opentracing-tracerresolver-version>
<ops4j-base-version>1.5.0</ops4j-base-version>
- <optaplanner-version>7.3.0.Final</optaplanner-version>
+ <optaplanner-version>7.14.0.Final</optaplanner-version>
<oro-bundle-version>2.0.8_6</oro-bundle-version>
<os-maven-plugin-version>1.6.0</os-maven-plugin-version>
<oscache-bundle-version>2.4_5</oscache-bundle-version>
diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml
index 0b6cb7d..2e07d63 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -1731,7 +1731,14 @@
<bundle dependency='true'>mvn:commons-io/commons-io/${commons-io-version}</bundle>
<bundle dependency='true'>mvn:commons-collections/commons-collections/${commons-collections-version}</bundle>
<bundle dependency='true'>mvn:org.optaplanner/optaplanner-core/${optaplanner-version}</bundle>
- <bundle dependency='true'>mvn:org.uberfire/uberfire-maven-support/${uberfire-maven-support-version}</bundle>
+ <bundle dependency='true'>mvn:org.optaplanner/optaplanner-persistence-common/${optaplanner-version}</bundle>
+ <bundle dependency='true'>mvn:org.optaplanner/optaplanner-persistence-jaxb/${optaplanner-version}</bundle>
+ <bundle dependency='true'>mvn:org.optaplanner/optaplanner-persistence-jackson/${optaplanner-version}</bundle>
+ <bundle dependency='true'>mvn:org.optaplanner/optaplanner-persistence-xstream/${optaplanner-version}</bundle>
+ <bundle dependency='true'>mvn:org.kie.soup/kie-soup-maven-support/${kie-version}</bundle>
+ <bundle dependency='true'>mvn:org.kie.soup/kie-soup-project-datamodel-api/${kie-version}</bundle>
+ <bundle dependency='true'>mvn:org.kie.soup/kie-soup-project-datamodel-commons/${kie-version}</bundle>
+ <bundle dependency='true'>mvn:org.kie.soup/kie-soup-commons/${kie-version}</bundle>
<bundle dependency='true'>mvn:org.kie/kie-api/${kie-version}</bundle>
<bundle dependency='true'>mvn:org.kie/kie-internal/${kie-version}</bundle>
<bundle dependency='true'>mvn:org.drools/drools-core/${drools-version}</bundle>
@@ -1743,7 +1750,7 @@
<bundle dependency='true'>mvn:com.google.protobuf/protobuf-java/${protobuf-version}</bundle>
<bundle dependency='true'>mvn:com.google.guava/guava/${google-guava-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.javax-inject/${javax-inject-bundle-version}</bundle>
- <bundle>mvn:org.apache.camel/camel-optaplanner/${project.version}</bundle>
+ <bundle>mvn:org.apache.camel/camel-optaplanner/${project.version}</bundle>
</feature>
<feature name='camel-openstack' version='${project.version}' resolver='(obr)' start-level='50'>
<feature version='${project.version}'>camel-core</feature>
[camel] 16/16: Regen
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch sandbox/camel-3.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit d0f6a195efc065c52b696cf7b0b8f2ecd373f265
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Fri Nov 30 11:08:36 2018 +0100
Regen
---
.../camel-spring-boot-dependencies/pom.xml | 147 ++++++++++++---------
1 file changed, 82 insertions(+), 65 deletions(-)
diff --git a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
index 27f68d2..eb19d4b 100644
--- a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
+++ b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
@@ -3430,342 +3430,359 @@
<dependency>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-benchmark</artifactId>
- <version>7.3.0.Final</version>
+ <version>7.14.0.Final</version>
</dependency>
<dependency>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-benchmark</artifactId>
- <version>7.3.0.Final</version>
+ <version>7.14.0.Final</version>
<classifier>sources</classifier>
</dependency>
<dependency>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-benchmark</artifactId>
- <version>7.3.0.Final</version>
+ <version>7.14.0.Final</version>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-benchmark</artifactId>
- <version>7.3.0.Final</version>
+ <version>7.14.0.Final</version>
<classifier>javadoc</classifier>
</dependency>
<dependency>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-core</artifactId>
- <version>7.3.0.Final</version>
+ <version>7.14.0.Final</version>
</dependency>
<dependency>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-core</artifactId>
- <version>7.3.0.Final</version>
+ <version>7.14.0.Final</version>
<classifier>sources</classifier>
</dependency>
<dependency>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-core</artifactId>
- <version>7.3.0.Final</version>
+ <version>7.14.0.Final</version>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-core</artifactId>
- <version>7.3.0.Final</version>
+ <version>7.14.0.Final</version>
<classifier>javadoc</classifier>
</dependency>
<dependency>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-core-gwt</artifactId>
- <version>7.3.0.Final</version>
+ <version>7.14.0.Final</version>
<type>gwt-lib</type>
</dependency>
<dependency>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-distribution</artifactId>
- <version>7.3.0.Final</version>
+ <version>7.14.0.Final</version>
<type>zip</type>
</dependency>
<dependency>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-docs</artifactId>
- <version>7.3.0.Final</version>
+ <version>7.14.0.Final</version>
<type>zip</type>
</dependency>
<dependency>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-examples</artifactId>
- <version>7.3.0.Final</version>
+ <version>7.14.0.Final</version>
</dependency>
<dependency>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-examples</artifactId>
- <version>7.3.0.Final</version>
+ <version>7.14.0.Final</version>
<classifier>sources</classifier>
</dependency>
<dependency>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-examples</artifactId>
- <version>7.3.0.Final</version>
+ <version>7.14.0.Final</version>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-persistence-common</artifactId>
- <version>7.3.0.Final</version>
+ <version>7.14.0.Final</version>
</dependency>
<dependency>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-persistence-common</artifactId>
- <version>7.3.0.Final</version>
+ <version>7.14.0.Final</version>
<classifier>sources</classifier>
</dependency>
<dependency>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-persistence-common</artifactId>
- <version>7.3.0.Final</version>
+ <version>7.14.0.Final</version>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-persistence-common</artifactId>
- <version>7.3.0.Final</version>
+ <version>7.14.0.Final</version>
<classifier>javadoc</classifier>
</dependency>
<dependency>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-persistence-jackson</artifactId>
- <version>7.3.0.Final</version>
+ <version>7.14.0.Final</version>
</dependency>
<dependency>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-persistence-jackson</artifactId>
- <version>7.3.0.Final</version>
+ <version>7.14.0.Final</version>
<classifier>sources</classifier>
</dependency>
<dependency>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-persistence-jackson</artifactId>
- <version>7.3.0.Final</version>
+ <version>7.14.0.Final</version>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-persistence-jackson</artifactId>
- <version>7.3.0.Final</version>
+ <version>7.14.0.Final</version>
<classifier>javadoc</classifier>
</dependency>
<dependency>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-persistence-jaxb</artifactId>
- <version>7.3.0.Final</version>
+ <version>7.14.0.Final</version>
</dependency>
<dependency>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-persistence-jaxb</artifactId>
- <version>7.3.0.Final</version>
+ <version>7.14.0.Final</version>
<classifier>sources</classifier>
</dependency>
<dependency>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-persistence-jaxb</artifactId>
- <version>7.3.0.Final</version>
+ <version>7.14.0.Final</version>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-persistence-jaxb</artifactId>
- <version>7.3.0.Final</version>
+ <version>7.14.0.Final</version>
<classifier>javadoc</classifier>
</dependency>
<dependency>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-persistence-jpa</artifactId>
- <version>7.3.0.Final</version>
+ <version>7.14.0.Final</version>
</dependency>
<dependency>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-persistence-jpa</artifactId>
- <version>7.3.0.Final</version>
+ <version>7.14.0.Final</version>
<classifier>sources</classifier>
</dependency>
<dependency>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-persistence-jpa</artifactId>
- <version>7.3.0.Final</version>
+ <version>7.14.0.Final</version>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-persistence-jpa</artifactId>
- <version>7.3.0.Final</version>
+ <version>7.14.0.Final</version>
<classifier>javadoc</classifier>
</dependency>
<dependency>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-persistence-xstream</artifactId>
- <version>7.3.0.Final</version>
+ <version>7.14.0.Final</version>
</dependency>
<dependency>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-persistence-xstream</artifactId>
- <version>7.3.0.Final</version>
+ <version>7.14.0.Final</version>
<classifier>sources</classifier>
</dependency>
<dependency>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-persistence-xstream</artifactId>
- <version>7.3.0.Final</version>
+ <version>7.14.0.Final</version>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-persistence-xstream</artifactId>
- <version>7.3.0.Final</version>
+ <version>7.14.0.Final</version>
<classifier>javadoc</classifier>
</dependency>
<dependency>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-test</artifactId>
- <version>7.3.0.Final</version>
+ <version>7.14.0.Final</version>
</dependency>
<dependency>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-test</artifactId>
- <version>7.3.0.Final</version>
+ <version>7.14.0.Final</version>
<classifier>sources</classifier>
</dependency>
<dependency>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-test</artifactId>
- <version>7.3.0.Final</version>
+ <version>7.14.0.Final</version>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-test</artifactId>
- <version>7.3.0.Final</version>
+ <version>7.14.0.Final</version>
<classifier>javadoc</classifier>
</dependency>
<dependency>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-wb-domain-editor-api</artifactId>
- <version>7.3.0.Final</version>
+ <version>7.14.0.Final</version>
</dependency>
<dependency>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-wb-domain-editor-api</artifactId>
- <version>7.3.0.Final</version>
+ <version>7.14.0.Final</version>
<classifier>sources</classifier>
</dependency>
<dependency>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-wb-domain-editor-backend</artifactId>
- <version>7.3.0.Final</version>
+ <version>7.14.0.Final</version>
</dependency>
<dependency>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-wb-domain-editor-backend</artifactId>
- <version>7.3.0.Final</version>
+ <version>7.14.0.Final</version>
<classifier>sources</classifier>
</dependency>
<dependency>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-wb-domain-editor-client</artifactId>
- <version>7.3.0.Final</version>
+ <version>7.14.0.Final</version>
</dependency>
<dependency>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-wb-domain-editor-client</artifactId>
- <version>7.3.0.Final</version>
+ <version>7.14.0.Final</version>
<classifier>sources</classifier>
</dependency>
<dependency>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-wb-guided-rule-editor-api</artifactId>
- <version>7.3.0.Final</version>
+ <version>7.14.0.Final</version>
</dependency>
<dependency>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-wb-guided-rule-editor-api</artifactId>
- <version>7.3.0.Final</version>
+ <version>7.14.0.Final</version>
<classifier>sources</classifier>
</dependency>
<dependency>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-wb-guided-rule-editor-backend</artifactId>
- <version>7.3.0.Final</version>
+ <version>7.14.0.Final</version>
</dependency>
<dependency>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-wb-guided-rule-editor-backend</artifactId>
- <version>7.3.0.Final</version>
+ <version>7.14.0.Final</version>
<classifier>sources</classifier>
</dependency>
<dependency>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-wb-guided-rule-editor-client</artifactId>
- <version>7.3.0.Final</version>
+ <version>7.14.0.Final</version>
</dependency>
<dependency>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-wb-guided-rule-editor-client</artifactId>
- <version>7.3.0.Final</version>
+ <version>7.14.0.Final</version>
<classifier>sources</classifier>
</dependency>
<dependency>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-wb-solver-editor-api</artifactId>
- <version>7.3.0.Final</version>
+ <version>7.14.0.Final</version>
</dependency>
<dependency>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-wb-solver-editor-api</artifactId>
- <version>7.3.0.Final</version>
+ <version>7.14.0.Final</version>
<classifier>sources</classifier>
</dependency>
<dependency>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-wb-solver-editor-backend</artifactId>
- <version>7.3.0.Final</version>
+ <version>7.14.0.Final</version>
</dependency>
<dependency>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-wb-solver-editor-backend</artifactId>
- <version>7.3.0.Final</version>
+ <version>7.14.0.Final</version>
<classifier>sources</classifier>
</dependency>
<dependency>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-wb-solver-editor-client</artifactId>
- <version>7.3.0.Final</version>
+ <version>7.14.0.Final</version>
</dependency>
<dependency>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-wb-solver-editor-client</artifactId>
- <version>7.3.0.Final</version>
+ <version>7.14.0.Final</version>
<classifier>sources</classifier>
</dependency>
<dependency>
<groupId>org.optaplanner</groupId>
- <artifactId>optaplanner-wb-upstream-model</artifactId>
- <version>7.3.0.Final</version>
+ <artifactId>optaplanner-wb-ui</artifactId>
+ <version>7.14.0.Final</version>
+ <type>war</type>
</dependency>
<dependency>
<groupId>org.optaplanner</groupId>
- <artifactId>optaplanner-wb-upstream-model</artifactId>
- <version>7.3.0.Final</version>
- <classifier>sources</classifier>
+ <artifactId>optaplanner-webexamples</artifactId>
+ <version>7.14.0.Final</version>
+ <type>war</type>
</dependency>
<dependency>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-webexamples</artifactId>
- <version>7.3.0.Final</version>
- <type>war</type>
+ <version>7.14.0.Final</version>
+ <classifier>sources</classifier>
</dependency>
<dependency>
<groupId>org.optaplanner</groupId>
- <artifactId>optaplanner-webexamples</artifactId>
- <version>7.3.0.Final</version>
+ <artifactId>optaplanner-workbench-models-core</artifactId>
+ <version>7.14.0.Final</version>
+ </dependency>
+ <dependency>
+ <groupId>org.optaplanner</groupId>
+ <artifactId>optaplanner-workbench-models-core</artifactId>
+ <version>7.14.0.Final</version>
+ <classifier>sources</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.optaplanner</groupId>
+ <artifactId>optaplanner-workbench-models-datamodel-api</artifactId>
+ <version>7.14.0.Final</version>
+ </dependency>
+ <dependency>
+ <groupId>org.optaplanner</groupId>
+ <artifactId>optaplanner-workbench-models-datamodel-api</artifactId>
+ <version>7.14.0.Final</version>
<classifier>sources</classifier>
</dependency>
<dependency>
[camel] 06/16: Parent POM: Remove unused
commons-digester-1x-version property
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch sandbox/camel-3.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit f81613481d2dd595fa96d6dd9239211c377c3301
Author: Pascal Schumacher <pa...@gmx.net>
AuthorDate: Mon Nov 12 21:50:55 2018 +0100
Parent POM: Remove unused commons-digester-1x-version property
---
parent/pom.xml | 1 -
1 file changed, 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index bee1fc3..4e1ef77 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -145,7 +145,6 @@
<commons-daemon-version>1.0.15</commons-daemon-version>
<commons-dbcp-version>1.4</commons-dbcp-version>
<commons-dbcp2-version>2.5.0</commons-dbcp2-version>
- <commons-digester-1x-version>1.8.1</commons-digester-1x-version>
<commons-digester-version>2.1</commons-digester-version>
<commons-exec-version>1.3</commons-exec-version>
<commons-httpclient-bundle-version>3.1_7</commons-httpclient-bundle-version>
[camel] 14/16: Fixed typos
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch sandbox/camel-3.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 1eda41e2caf2531c1d49625e2b95952c1b88bde6
Author: aldettinger <al...@gmail.com>
AuthorDate: Tue Nov 13 22:19:42 2018 +0100
Fixed typos
Conflicts:
camel-core/src/main/java/org/apache/camel/spi/Policy.java
camel-core/src/test/java/org/apache/camel/impl/ComponentConfigurationTest.java
components/camel-scala/src/main/docs/scala-eip.adoc
components/camel-urlrewrite/src/test/resources/urlrewrite.xml
---
.../apache/camel/component/file/GenericFileOperations.java | 2 +-
components/camel-cxf/src/main/docs/cxf-component.adoc | 4 ++--
.../org/apache/camel/component/cxf/CxfProducerTest.java | 2 +-
components/camel-hdfs2/src/test/resources/hdfs-default.xml | 4 ++--
components/camel-hdfs2/src/test/resources/hdfs-test.xml | 4 ++--
.../internal/client/DefaultCompositeApiClient.java | 4 ++--
.../camel/component/salesforce/LoginConfigHelper.java | 2 +-
.../salesforce/api/dto/approval/ApprovalRequestTest.java | 6 +++---
.../iso_schematron_skeleton_for_saxon.xsl | 2 +-
.../java/org/apache/camel/component/smpp/SmppSplitter.java | 8 ++++----
.../boot/SupervisingRouteControllerAutoConfiguration.java | 2 +-
.../spring/ws/addressing/ProducerParamsPrecedenceTest.java | 2 +-
.../xmlsecurity/api/XAdESSignatureProperties.java | 14 +++++++-------
.../xmlsecurity/XAdESSignaturePropertiesTest.java | 14 +++++++-------
docs/user-manual/en/scala-dsl-eip.adoc | 2 +-
docs/user-manual/en/servicepool.adoc | 2 +-
.../camel/example/micrometer/ScrapeRouteBuilder.java | 2 +-
.../org/apache/camel/itest/greeter/JmsToCxfInOutTest.java | 2 +-
18 files changed, 39 insertions(+), 39 deletions(-)
diff --git a/camel-core/src/main/java/org/apache/camel/component/file/GenericFileOperations.java b/camel-core/src/main/java/org/apache/camel/component/file/GenericFileOperations.java
index 9d1b3c8..aaeb3df 100644
--- a/camel-core/src/main/java/org/apache/camel/component/file/GenericFileOperations.java
+++ b/camel-core/src/main/java/org/apache/camel/component/file/GenericFileOperations.java
@@ -62,7 +62,7 @@ public interface GenericFileOperations<T> {
* folder already exists.
*
* @param directory the directory path to build as a relative string name
- * @param absolute wether the directory is an absolute or relative path
+ * @param absolute whether the directory is an absolute or relative path
* @return true if build or already exists, false if not possible (could be lack of permissions)
* @throws GenericFileOperationFailedException can be thrown
*/
diff --git a/components/camel-cxf/src/main/docs/cxf-component.adoc b/components/camel-cxf/src/main/docs/cxf-component.adoc
index 63d25bc..5e96d44 100644
--- a/components/camel-cxf/src/main/docs/cxf-component.adoc
+++ b/components/camel-cxf/src/main/docs/cxf-component.adoc
@@ -812,7 +812,7 @@ response context with the following code:
// Get the response context form outMessage
Map<String, Object> responseContext = CastUtils.cast((Map)out.getHeader(Client.RESPONSE_CONTEXT));
assertNotNull(responseContext);
- assertEquals("Get the wrong wsdl opertion name", "{http://apache.org/hello_world_soap_http}greetMe",
+ assertEquals("Get the wrong wsdl operation name", "{http://apache.org/hello_world_soap_http}greetMe",
responseContext.get("javax.xml.ws.wsdl.operation").toString());
-------------------------------------------------------------------------------------------------------------
@@ -824,7 +824,7 @@ Attachment is not tested. Since attachments are marshalled and
unmarshalled into POJOs, users typically do not need to deal with the
attachment themself. Attachments are propagated to Camel message's
attachments if the MTOM is not enabled, since Camel 2.12.3. So, it is
-possible to retreive attachments by Camel Message API
+possible to retrieve attachments by Camel Message API
[source,java]
--------------------------------------------
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerTest.java
index 5830a87..c18ec11 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerTest.java
@@ -152,7 +152,7 @@ public class CxfProducerTest extends Assert {
LOG.info("Received output text: " + result);
Map<String, Object> responseContext = CastUtils.cast((Map<?, ?>)out.getHeader(Client.RESPONSE_CONTEXT));
assertNotNull(responseContext);
- assertEquals("Get the wrong wsdl opertion name", "{http://apache.org/hello_world_soap_http}greetMe", responseContext.get("javax.xml.ws.wsdl.operation").toString());
+ assertEquals("Get the wrong wsdl operation name", "{http://apache.org/hello_world_soap_http}greetMe", responseContext.get("javax.xml.ws.wsdl.operation").toString());
assertEquals("reply body on Camel", "Hello " + TEST_MESSAGE, result);
// check the other camel header copying
diff --git a/components/camel-hdfs2/src/test/resources/hdfs-default.xml b/components/camel-hdfs2/src/test/resources/hdfs-default.xml
index 4143e08..53af074 100644
--- a/components/camel-hdfs2/src/test/resources/hdfs-default.xml
+++ b/components/camel-hdfs2/src/test/resources/hdfs-default.xml
@@ -690,8 +690,8 @@
<value>${dfs.namenode.checkpoint.dir}</value>
<description>Determines where on the local filesystem the DFS secondary
name node should store the temporary edits to merge.
- If this is a comma-delimited list of directoires then teh edits is
- replicated in all of the directoires for redundancy.
+ If this is a comma-delimited list of directories then the edits is
+ replicated in all of the directories for redundancy.
Default value is same as dfs.namenode.checkpoint.dir
</description>
</property>
diff --git a/components/camel-hdfs2/src/test/resources/hdfs-test.xml b/components/camel-hdfs2/src/test/resources/hdfs-test.xml
index 5462dbe..931556e 100644
--- a/components/camel-hdfs2/src/test/resources/hdfs-test.xml
+++ b/components/camel-hdfs2/src/test/resources/hdfs-test.xml
@@ -690,8 +690,8 @@
<value>${dfs.namenode.checkpoint.dir}</value>
<description>Determines where on the local filesystem the DFS secondary
name node should store the temporary edits to merge.
- If this is a comma-delimited list of directoires then teh edits is
- replicated in all of the directoires for redundancy.
+ If this is a comma-delimited list of directories then the edits is
+ replicated in all of the directories for redundancy.
Default value is same as dfs.namenode.checkpoint.dir
</description>
</property>
diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/DefaultCompositeApiClient.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/DefaultCompositeApiClient.java
index 19fd84f..3bed532 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/DefaultCompositeApiClient.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/DefaultCompositeApiClient.java
@@ -72,7 +72,7 @@ public class DefaultCompositeApiClient extends AbstractClientBase implements Com
private final Map<Class<?>, ObjectReader> readers = new HashMap<>();
- private final Map<Class<?>, ObjectWriter> writters = new HashMap<>();
+ private final Map<Class<?>, ObjectWriter> writers = new HashMap<>();
private final XStream xStreamCompositeBatch;
@@ -181,7 +181,7 @@ public class DefaultCompositeApiClient extends AbstractClientBase implements Com
ObjectWriter jsonWriterFor(final Object obj) {
final Class<?> type = obj.getClass();
- return Optional.ofNullable(writters.get(type)).orElseGet(() -> mapper.writerFor(type));
+ return Optional.ofNullable(writers.get(type)).orElseGet(() -> mapper.writerFor(type));
}
ContentProvider serialize(final XStream xstream, final Object body, final Class<?>... additionalTypes)
diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/LoginConfigHelper.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/LoginConfigHelper.java
index ac4e04f..e0cd862 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/LoginConfigHelper.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/LoginConfigHelper.java
@@ -112,7 +112,7 @@ public final class LoginConfigHelper {
System.out.println("| salesforce.keystore.password | SALESFORCE_KEYSTORE_PASSWORD | JWT |");
System.out.println("| salesforce.login.url | SALESFORCE_LOGIN_URL | ALL |");
System.out.println();
- System.out.println("* ALL - required allways");
+ System.out.println("* ALL - required always");
System.out.println("* UP - when using username and password authentication");
System.out.println("* RT - when using refresh token flow");
System.out.println("* JWT - when using JWT flow");
diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/api/dto/approval/ApprovalRequestTest.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/api/dto/approval/ApprovalRequestTest.java
index ddc7d7b..b264645 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/api/dto/approval/ApprovalRequestTest.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/api/dto/approval/ApprovalRequestTest.java
@@ -67,9 +67,9 @@ public class ApprovalRequestTest {
assertThat("Combined approval request should be a new instance", combined,
both(not(sameInstance(request))).and(not(sameInstance(template))));
- assertEquals("Action type should not be overwriten", request.getActionType(), combined.getActionType());
- assertEquals("Comment should not be overwriten", request.getComments(), combined.getComments());
- assertEquals("Context id should not be overwriten", request.getContextId(), combined.getContextId());
+ assertEquals("Action type should not be overwritten", request.getActionType(), combined.getActionType());
+ assertEquals("Comment should not be overwritten", request.getComments(), combined.getComments());
+ assertEquals("Context id should not be overwritten", request.getContextId(), combined.getContextId());
assertEquals("Next approver id should be taken from template", template.getNextApproverIds(),
combined.getNextApproverIds());
}
diff --git a/components/camel-schematron/src/main/resources/iso-schematron-xslt2/iso_schematron_skeleton_for_saxon.xsl b/components/camel-schematron/src/main/resources/iso-schematron-xslt2/iso_schematron_skeleton_for_saxon.xsl
index 3142878..6dbbe5b 100644
--- a/components/camel-schematron/src/main/resources/iso-schematron-xslt2/iso_schematron_skeleton_for_saxon.xsl
+++ b/components/camel-schematron/src/main/resources/iso-schematron-xslt2/iso_schematron_skeleton_for_saxon.xsl
@@ -2207,7 +2207,7 @@ which require a preprocess.
message text is taken from the strings below. We use XHTML, to provide
the namespace.
- If the $langCode is somethign else, then the XSLT engine will try to
+ If the $langCode is something else, then the XSLT engine will try to
find a file called sch-messages-$langCode.xhtml in the same directory
as this stylesheet. Expect a fatal error if the file does not exist.
diff --git a/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppSplitter.java b/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppSplitter.java
index 3c79eee..89bce93 100644
--- a/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppSplitter.java
+++ b/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppSplitter.java
@@ -49,9 +49,9 @@ public class SmppSplitter {
/**
* The value that identifier length of the SAR fragment.
* <p/>
- * {@code 0x00} value must be used if the legnth of the reference number is
+ * {@code 0x00} value must be used if the length of the reference number is
* 1 byte.<br/>
- * {@code 0x08} value must be used if the legnth of the reference number is
+ * {@code 0x08} value must be used if the length of the reference number is
* 2 bytes.
*/
protected static final byte UDHIE_IDENTIFIER_SAR = 0x00;
@@ -59,9 +59,9 @@ public class SmppSplitter {
/**
* The length of the SAR fragment.
* <p/>
- * {@code 0x03} value must be used if the legnth of the reference number is
+ * {@code 0x03} value must be used if the length of the reference number is
* 1 byte.<br/>
- * {@code 0x04} value must be used if the legnth of the reference number is
+ * {@code 0x04} value must be used if the length of the reference number is
* 2 bytes.
*/
protected static final byte UDHIE_SAR_LENGTH = 0x03;
diff --git a/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/SupervisingRouteControllerAutoConfiguration.java b/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/SupervisingRouteControllerAutoConfiguration.java
index 0ac9994..9d56820 100644
--- a/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/SupervisingRouteControllerAutoConfiguration.java
+++ b/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/SupervisingRouteControllerAutoConfiguration.java
@@ -71,7 +71,7 @@ public class SupervisingRouteControllerAutoConfiguration {
// Mark this route as excluded from supervisor
controller.addFilter(new SupervisingRouteControllerFilters.BlackList(entry.getKey()));
} else {
- // configure teh route
+ // configure the route
controller.setBackOff(entry.getKey(), configureBackOff(defaultBackOff, cfg.getBackOff()));
}
}
diff --git a/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/addressing/ProducerParamsPrecedenceTest.java b/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/addressing/ProducerParamsPrecedenceTest.java
index 7e91369..8d3df0c 100644
--- a/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/addressing/ProducerParamsPrecedenceTest.java
+++ b/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/addressing/ProducerParamsPrecedenceTest.java
@@ -149,7 +149,7 @@ public class ProducerParamsPrecedenceTest extends CamelSpringTestSupport {
Assertions.assertThat(wsaProperties).isNotNull();
Assertions.assertThat(wsaProperties.getFaultTo().getAddress()).isEqualTo(new URI("http://faultPrecedence.to"));
// /we set in sample data all precendence fields for simplier tests
- // otherwise it woudl be here annonymous
+ // otherwise it would be here anonymous
Assertions.assertThat(wsaProperties.getReplyTo().getAddress()).isEqualTo(new URI("http://replyPrecedence.to"));
}
diff --git a/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/api/XAdESSignatureProperties.java b/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/api/XAdESSignatureProperties.java
index a83b39e..594dbdb 100644
--- a/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/api/XAdESSignatureProperties.java
+++ b/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/api/XAdESSignatureProperties.java
@@ -721,7 +721,7 @@ public class XAdESSignatureProperties implements XmlSignatureProperties {
if (!qualifiers.isEmpty()) {
Element qualifiersEl = createElement("CommitmentTypeQualifiers", doc, input);
commitmentTypeIndication.appendChild(qualifiersEl);
- String errorMessage = "The XAdES confguration is invalid. The list of the commitment type qualifiers contains the invalid entry '%s'. An entry must either be a text or an XML fragment "
+ String errorMessage = "The XAdES configuration is invalid. The list of the commitment type qualifiers contains the invalid entry '%s'. An entry must either be a text or an XML fragment "
+ "with the root element '%s' with the namespace '%s'.";
for (String qualifier : getCommitmentTypeQualifiers()) {
Element qualifierEl = createChildFromXmlFragmentOrText(doc, input, "CommitmentTypeQualifier", errorMessage, qualifier);
@@ -868,7 +868,7 @@ public class XAdESSignatureProperties implements XmlSignatureProperties {
LOG.debug("Adding claimed roles");
Element claimedRolesEl = createElement("ClaimedRoles", doc, input);
signerRole.appendChild(claimedRolesEl);
- String errorMessage = "The XAdES confguration is invalid. The list of the claimed roles contains the invalid entry '%s'."
+ String errorMessage = "The XAdES configuration is invalid. The list of the claimed roles contains the invalid entry '%s'."
+ " An entry must either be a text or an XML fragment with the root element '%s' with the namespace '%s'.";
for (String claimedRole : claimedRoles) {
Element claimedRoleEl = createChildFromXmlFragmentOrText(doc, input, "ClaimedRole", errorMessage, claimedRole);
@@ -916,7 +916,7 @@ public class XAdESSignatureProperties implements XmlSignatureProperties {
Element identifier = createElement("Identifier", doc, input);
sigPolicyId.appendChild(identifier);
if (getSigPolicyId() == null || getSigPolicyId().isEmpty()) {
- throw new XmlSignatureException("The XAdES-EPES confguration is invalid. The signature policy identifier is missing.");
+ throw new XmlSignatureException("The XAdES-EPES configuration is invalid. The signature policy identifier is missing.");
}
identifier.setTextContent(getSigPolicyId());
if (getSigPolicyIdQualifier() != null && !getSigPolicyIdQualifier().isEmpty()) {
@@ -942,14 +942,14 @@ public class XAdESSignatureProperties implements XmlSignatureProperties {
id.appendChild(sigPolicyHash);
if (getSignaturePolicyDigestAlgorithm() == null || getSignaturePolicyDigestAlgorithm().isEmpty()) {
throw new XmlSignatureException(
- "The XAdES-EPES confguration is invalid. The digest algorithm for the signature policy is missing.");
+ "The XAdES-EPES configuration is invalid. The digest algorithm for the signature policy is missing.");
}
Element digestMethod = createDigSigElement("DigestMethod", doc, input.getPrefixForXmlSignatureNamespace());
sigPolicyHash.appendChild(digestMethod);
setAttribute(digestMethod, "Algorithm", getSignaturePolicyDigestAlgorithm());
if (getSignaturePolicyDigestValue() == null || getSignaturePolicyDigestValue().isEmpty()) {
throw new XmlSignatureException(
- "The XAdES-EPES confguration is invalid. The digest value for the signature policy is missing.");
+ "The XAdES-EPES configuration is invalid. The digest value for the signature policy is missing.");
}
Element digestValue = createDigSigElement("DigestValue", doc, input.getPrefixForXmlSignatureNamespace());
sigPolicyHash.appendChild(digestValue);
@@ -959,7 +959,7 @@ public class XAdESSignatureProperties implements XmlSignatureProperties {
if (!qualifiers.isEmpty()) {
Element qualifiersEl = createElement("SigPolicyQualifiers", doc, input);
id.appendChild(qualifiersEl);
- String errorMessage = "The XAdES confguration is invalid. The list of the signatue policy qualifiers contains the invalid entry '%s'."
+ String errorMessage = "The XAdES configuration is invalid. The list of the signatue policy qualifiers contains the invalid entry '%s'."
+ " An entry must either be a text or an XML fragment with the root element '%s' with the namespace '%s'.";
for (String elementOrText : getSigPolicyQualifiers()) {
Element child = createChildFromXmlFragmentOrText(doc, input, "SigPolicyQualifier", errorMessage, elementOrText);
@@ -992,7 +992,7 @@ public class XAdESSignatureProperties implements XmlSignatureProperties {
if (!ns.equals(child.getNamespaceURI())) {
throw new XmlSignatureException(
String.format(
- "The XAdES confguration is invalid. The root element '%s' of the provided XML fragment '%s' has the invalid namespace '%s'. The correct namespace is '%s'.",
+ "The XAdES configuration is invalid. The root element '%s' of the provided XML fragment '%s' has the invalid namespace '%s'. The correct namespace is '%s'.",
child.getLocalName(), elementOrText, child.getNamespaceURI(), ns));
}
} catch (SAXException e) {
diff --git a/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/XAdESSignaturePropertiesTest.java b/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/XAdESSignaturePropertiesTest.java
index c4eceb4..7ba603b 100644
--- a/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/XAdESSignaturePropertiesTest.java
+++ b/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/XAdESSignaturePropertiesTest.java
@@ -505,7 +505,7 @@ public class XAdESSignaturePropertiesTest extends CamelTestSupport {
sendBody("direct:enveloping", payload, Collections.<String, Object> emptyMap());
assertMockEndpointsSatisfied();
checkThrownException(mock, XmlSignatureException.class,
- "The XAdES-EPES confguration is invalid. The signature policy identifier is missing.", null);
+ "The XAdES-EPES configuration is invalid. The signature policy identifier is missing.", null);
}
@Test
@@ -527,7 +527,7 @@ public class XAdESSignaturePropertiesTest extends CamelTestSupport {
sendBody("direct:enveloping", payload, Collections.<String, Object> emptyMap());
assertMockEndpointsSatisfied();
checkThrownException(mock, XmlSignatureException.class,
- "The XAdES-EPES confguration is invalid. The digest value for the signature policy is missing.", null);
+ "The XAdES-EPES configuration is invalid. The digest value for the signature policy is missing.", null);
}
@Test
@@ -549,7 +549,7 @@ public class XAdESSignaturePropertiesTest extends CamelTestSupport {
sendBody("direct:enveloping", payload, Collections.<String, Object> emptyMap());
assertMockEndpointsSatisfied();
checkThrownException(mock, XmlSignatureException.class,
- "The XAdES-EPES confguration is invalid. The digest algorithm for the signature policy is missing.", null);
+ "The XAdES-EPES configuration is invalid. The digest algorithm for the signature policy is missing.", null);
}
@Test
@@ -564,7 +564,7 @@ public class XAdESSignaturePropertiesTest extends CamelTestSupport {
checkThrownException(
mock,
XmlSignatureException.class,
- "The XAdES confguration is invalid. The list of the claimed roles contains the invalid entry '<ClaimedRole>wrong XML fragment<ClaimedRole>'. An entry must either be a text or"
+ "The XAdES configuration is invalid. The list of the claimed roles contains the invalid entry '<ClaimedRole>wrong XML fragment<ClaimedRole>'. An entry must either be a text or"
+ " an XML fragment with the root element 'ClaimedRole' with the namespace 'http://uri.etsi.org/01903/v1.3.2#'.",
null);
}
@@ -581,7 +581,7 @@ public class XAdESSignaturePropertiesTest extends CamelTestSupport {
checkThrownException(
mock,
XmlSignatureException.class,
- "The XAdES confguration is invalid. The list of the commitment type qualifiers contains the invalid entry '<CommitmentTypeQualifier>wrong XML fragment<CommitmentTypeQualifier>'."
+ "The XAdES configuration is invalid. The list of the commitment type qualifiers contains the invalid entry '<CommitmentTypeQualifier>wrong XML fragment<CommitmentTypeQualifier>'."
+ " An entry must either be a text or an XML fragment with the root element 'CommitmentTypeQualifier' with the namespace 'http://uri.etsi.org/01903/v1.3.2#'.",
null);
}
@@ -598,7 +598,7 @@ public class XAdESSignaturePropertiesTest extends CamelTestSupport {
checkThrownException(
mock,
XmlSignatureException.class,
- "The XAdES confguration is invalid. The list of the signatue policy qualifiers contains the invalid entry '<SigPolicyQualifier>wrong XML fragment<SigPolicyQualifier>'."
+ "The XAdES configuration is invalid. The list of the signatue policy qualifiers contains the invalid entry '<SigPolicyQualifier>wrong XML fragment<SigPolicyQualifier>'."
+ " An entry must either be a text or an XML fragment with the root element 'SigPolicyQualifier' with the namespace 'http://uri.etsi.org/01903/v1.3.2#'.",
null);
}
@@ -616,7 +616,7 @@ public class XAdESSignaturePropertiesTest extends CamelTestSupport {
checkThrownException(
mock,
XmlSignatureException.class,
- "The XAdES confguration is invalid. The root element 'SigPolicyQualifier' of the provided XML fragment "
+ "The XAdES configuration is invalid. The root element 'SigPolicyQualifier' of the provided XML fragment "
+ "'<SigPolicyQualifier xmlns=\"http://invalid.com\">XML fragment with wrong namespace for root element</SigPolicyQualifier>' has the invalid namespace 'http://invalid.com'."
+ " The correct namespace is 'http://uri.etsi.org/01903/v1.3.2#'.", null);
}
diff --git a/docs/user-manual/en/scala-dsl-eip.adoc b/docs/user-manual/en/scala-dsl-eip.adoc
index 2c52016..c6297dd 100644
--- a/docs/user-manual/en/scala-dsl-eip.adoc
+++ b/docs/user-manual/en/scala-dsl-eip.adoc
@@ -174,7 +174,7 @@ Delayer
+++++++
Unlike a throttler, which only slows down messages if the rate exceeds a
-treshold, a delayer delays every messages with a fixed amount of time.
+threshold, a delayer delays every messages with a fixed amount of time.
An example: to delay every message going from `seda:a` to `mock:a` with
1 second, you write...
diff --git a/docs/user-manual/en/servicepool.adoc b/docs/user-manual/en/servicepool.adoc
index 675c053..a9b36e2 100644
--- a/docs/user-manual/en/servicepool.adoc
+++ b/docs/user-manual/en/servicepool.adoc
@@ -48,7 +48,7 @@ Then set your custom pooling on the `CamelContext` with the
The producer service pool identify a producer as being pool capable if
the producer implements the marker interface
-`org.apache.camel.SerivcePoolAware`. +
+`org.apache.camel.ServicePoolAware`. +
As the producer will be pooled and thus long lived, your producer
should be able to automatic safely recover lost connection. Usually you
implement logic that re connects if needed.
diff --git a/examples/camel-example-micrometer/src/main/java/org/apache/camel/example/micrometer/ScrapeRouteBuilder.java b/examples/camel-example-micrometer/src/main/java/org/apache/camel/example/micrometer/ScrapeRouteBuilder.java
index 2fd3eb4..c4a53ab 100644
--- a/examples/camel-example-micrometer/src/main/java/org/apache/camel/example/micrometer/ScrapeRouteBuilder.java
+++ b/examples/camel-example-micrometer/src/main/java/org/apache/camel/example/micrometer/ScrapeRouteBuilder.java
@@ -23,7 +23,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
/**
- * Route Builder that exposes teh endpoint used by Prometheus to scrape
+ * Route Builder that exposes the endpoint used by Prometheus to scrape
* monitoring data from the Camel application. When running in a Spring
* Boot 2.x environment, this is not required as Spring Boot already exposes
* this endpoint by default.
diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/JmsToCxfInOutTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/JmsToCxfInOutTest.java
index 6ae765d..c2666a9 100644
--- a/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/JmsToCxfInOutTest.java
+++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/JmsToCxfInOutTest.java
@@ -47,7 +47,7 @@ public class JmsToCxfInOutTest extends AbstractJUnit4SpringContextTests {
String out = template.requestBodyAndHeader("jms:queue:bridge.cxf", "Willem", CxfConstants.OPERATION_NAME, "greetMe", String.class);
assertEquals("Hello Willem", out);
- // call for the other opertion
+ // call for the other operation
out = template.requestBodyAndHeader("jms:queue:bridge.cxf", new Object[0], CxfConstants.OPERATION_NAME, "sayHi", String.class);
assertEquals("Bonjour", out);
}
[camel] 15/16: CAMEL-12933 override populateHeaders considering
backward compatibility
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch sandbox/camel-3.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit c4bbc59c4fbe4de7c0db27100d8a8e6ec7945908
Author: onders <on...@apache.org>
AuthorDate: Wed Nov 14 04:11:23 2018 +0300
CAMEL-12933 override populateHeaders considering backward compatibility
---
.../main/java/org/apache/camel/component/file/remote/RemoteFile.java | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFile.java b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFile.java
index cd1d18e..e29c248 100644
--- a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFile.java
+++ b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFile.java
@@ -42,6 +42,11 @@ public class RemoteFile<T> extends GenericFile<T> implements Cloneable {
message.setHeader("CamelFileHost", getHostname());
}
}
+
+ @Override
+ public void populateHeaders(GenericFileMessage<T> message, boolean isProbeContentTypeFromEndpoint) {
+ populateHeaders(message);
+ }
public String getHostname() {
return hostname;
[camel] 12/16: Added link in Summary about REST DSL
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch sandbox/camel-3.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit c5090e52d66a31d9a12c13aea33dc292e6f2a7d6
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Tue Nov 13 15:00:45 2018 +0100
Added link in Summary about REST DSL
---
docs/user-manual/en/SUMMARY.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/docs/user-manual/en/SUMMARY.md b/docs/user-manual/en/SUMMARY.md
index de4d687..b88bab5 100644
--- a/docs/user-manual/en/SUMMARY.md
+++ b/docs/user-manual/en/SUMMARY.md
@@ -128,7 +128,7 @@
* [Java DSL](java-dsl.adoc)
* [Spring DSL](spring.adoc)
* [Blueprint DSL](using-osgi-blueprint-with-camel.adoc)
-* Rest DSL
+* [Rest DSL](../../../camel-core/src/main/docs/rest-dsl.adoc)
* [Groovy DSL](groovy-dsl.adoc)
* [Scala DSL](scala-dsl.adoc)
* [Annotation DSL](bean-integration.adoc)
[camel] 07/16: Parent POM: Remove pdfbox18-version property and
dependency management of jempbox, because jempbox is not used by pdfbox 2
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch sandbox/camel-3.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 2ef9cbd960c0211f52c9db6324d73e7cbcc42ccd
Author: Pascal Schumacher <pa...@gmx.net>
AuthorDate: Mon Nov 12 22:13:06 2018 +0100
Parent POM: Remove pdfbox18-version property and dependency management of jempbox, because jempbox is not used by pdfbox 2
---
parent/pom.xml | 6 ------
.../spring-boot-dm/camel-spring-boot-dependencies/pom.xml | 5 -----
2 files changed, 11 deletions(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 4e1ef77..33c7461 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -560,7 +560,6 @@
<pax-exam-version>4.12.0</pax-exam-version>
<pax-tiny-bundle-version>1.3.2</pax-tiny-bundle-version>
<pax-logging-version>1.8.6</pax-logging-version>
- <pdfbox18-version>1.8.16</pdfbox18-version>
<pdfbox-version>2.0.12</pdfbox-version>
<pgjdbc-ng-driver-version>0.7.1</pgjdbc-ng-driver-version>
<protobuf-version>3.5.1</protobuf-version>
@@ -4868,11 +4867,6 @@
<!-- pdfbox -->
<dependency>
<groupId>org.apache.pdfbox</groupId>
- <artifactId>jempbox</artifactId>
- <version>${pdfbox18-version}</version><!-- because of Tika -->
- </dependency>
- <dependency>
- <groupId>org.apache.pdfbox</groupId>
<artifactId>fontbox</artifactId>
<version>${pdfbox-version}</version>
</dependency>
diff --git a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
index 09fde21..27f68d2 100644
--- a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
+++ b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
@@ -3307,11 +3307,6 @@
</dependency>
<dependency>
<groupId>org.apache.pdfbox</groupId>
- <artifactId>jempbox</artifactId>
- <version>1.8.16</version>
- </dependency>
- <dependency>
- <groupId>org.apache.pdfbox</groupId>
<artifactId>pdfbox</artifactId>
<version>2.0.12</version>
</dependency>
[camel] 08/16: CAMEL-12931 - Upgrade jBPM component to use 7 series
with consumer capability to react to produced events by jBPM
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch sandbox/camel-3.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 4fd794085d6b8e83f97b5df92baedb11a5d89f52
Author: Maciej Swiderski <sw...@gmail.com>
AuthorDate: Wed Nov 7 14:33:49 2018 +0100
CAMEL-12931 - Upgrade jBPM component to use 7 series with consumer capability to react to produced events by jBPM
Conflicts:
components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/JBPMProducer.java
---
components/camel-jbpm/pom.xml | 71 +++--
.../camel-jbpm/src/main/docs/jbpm-component.adoc | 175 +++++++++--
...MComponent.java => JBPMCamelConsumerAware.java} | 24 +-
.../apache/camel/component/jbpm/JBPMComponent.java | 6 +-
.../camel/component/jbpm/JBPMConfiguration.java | 73 ++++-
.../apache/camel/component/jbpm/JBPMConstants.java | 11 +-
.../apache/camel/component/jbpm/JBPMConsumer.java | 208 +++++++++++++
.../apache/camel/component/jbpm/JBPMEndpoint.java | 44 ++-
.../apache/camel/component/jbpm/JBPMProducer.java | 291 ++++++++++---------
.../component/jbpm/emitters/CamelEventEmitter.java | 75 +++++
.../emitters/ServiceRegistryBoundEventEmitter.java | 62 ++++
.../jbpm/listeners/CamelCaseEventListener.java | 286 ++++++++++++++++++
.../jbpm/listeners/CamelProcessEventListener.java | 138 +++++++++
.../jbpm/listeners/CamelTaskEventListener.java | 321 +++++++++++++++++++++
.../jbpm/server/CamelKieServerExtension.java | 225 +++++++++++++++
.../org.kie.server.services.api.KieServerExtension | 1 +
.../jbpm/JBPMComponentIntegrationTest.java | 65 ++++-
parent/pom.xml | 2 +-
.../karaf/features/src/main/resources/features.xml | 50 ++--
19 files changed, 1864 insertions(+), 264 deletions(-)
diff --git a/components/camel-jbpm/pom.xml b/components/camel-jbpm/pom.xml
index 28a6ce0..100bf63 100644
--- a/components/camel-jbpm/pom.xml
+++ b/components/camel-jbpm/pom.xml
@@ -43,32 +43,55 @@
<artifactId>camel-core</artifactId>
</dependency>
<dependency>
- <groupId>org.kie.remote</groupId>
- <artifactId>kie-remote-client</artifactId>
+ <groupId>org.kie.server</groupId>
+ <artifactId>kie-server-client</artifactId>
<version>${jbpm-version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.hornetq</groupId>
- <artifactId>hornetq-core-client</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.hornetq</groupId>
- <artifactId>hornetq-jms-client</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.spec.javax.jms</groupId>
- <artifactId>jboss-jms-api_1.1_spec</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.spec.javax.xml.ws</groupId>
- <artifactId>jboss-jaxws-api_2.2_spec</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging</artifactId>
- </exclusion>
- </exclusions>
</dependency>
+
+ <!-- jBPM consumer -->
+ <dependency>
+ <groupId>org.kie</groupId>
+ <artifactId>kie-api</artifactId>
+ <version>${jbpm-version}</version>
+ <scope>provided</scope>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.kie</groupId>
+ <artifactId>kie-internal</artifactId>
+ <version>${jbpm-version}</version>
+ <scope>provided</scope>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.jbpm</groupId>
+ <artifactId>jbpm-services-api</artifactId>
+ <version>${jbpm-version}</version>
+ <scope>provided</scope>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.jbpm</groupId>
+ <artifactId>jbpm-case-mgmt-api</artifactId>
+ <version>${jbpm-version}</version>
+ <scope>provided</scope>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.kie.server</groupId>
+ <artifactId>kie-server-services-common</artifactId>
+ <version>${jbpm-version}</version>
+ <scope>provided</scope>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.jbpm</groupId>
+ <artifactId>jbpm-persistence-api</artifactId>
+ <version>${jbpm-version}</version>
+ <scope>provided</scope>
+ <optional>true</optional>
+ </dependency>
+
<dependency>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging</artifactId>
diff --git a/components/camel-jbpm/src/main/docs/jbpm-component.adoc b/components/camel-jbpm/src/main/docs/jbpm-component.adoc
index 70e7796..46928d2 100644
--- a/components/camel-jbpm/src/main/docs/jbpm-component.adoc
+++ b/components/camel-jbpm/src/main/docs/jbpm-component.adoc
@@ -4,9 +4,9 @@
*Available as of Camel version 2.6*
The *jbpm* component provides integration with Business Process
-Management (BPM) Suit http://www.jbpm.org/[jBPM]. It uses
-kie-remote-client API to interact with jBPM instance over REST. The
-component supports only producer.
+Management http://www.jbpm.org/[jBPM]. It uses
+kie-server-client API to interact with jBPM instance over REST. The
+component supports both producer and consumer.
Maven users will need to add the following dependency to their `pom.xml`
for this component:
@@ -20,6 +20,111 @@ for this component:
</dependency>
------------------------------------------------------------------------------------
+## Consumer
+
+jBPM Consumer allows to attach routes to
+
+* ProcessEventListeners
+* TaskEventListners
+* CaseEventListeners
+
+### URI format
+
+[source,java]
+---------------------------------------------
+jbpm::events:type:[classifier][?options]
+---------------------------------------------
+
+==== Path Parameters (3 parameters):
+
+
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *events* | Classifier for the consumer to know which type of data it should attach to | | URL
+| *type* | Type of event listener - supports: process, task, case | | String
+| *classifier* | Used to distinguish routes for same event type| | String
+|===
+
+Each route would then receive events when they are being produced by jBPM engine.
+
+Routes can be defined either in global way - on application level or deployed
+together with business assets projects also knows as KJARs.
+
+Consumers are configured via KieServerExtension that is a pluggable interface to enhance
+jBPM with additional capabilities. It reacts to different life cycle phases of the KIE Server
+and by that is able to configure individual endpoints properly.
+
+### KJAR routes
+
+Create file named `camel-routes.xml` in the root folder of your KJAR (src/main/resources) so it will be automatically
+discovered and Camel Context for given KJAR will be created.
+
+### Global routes
+
+Create file name `global-camel-routes` in the root of the class path of KIE Server. It will be automatically found and registered
+on every KJAR deployed to KIE Server.
+
+
+Example camel-routes.xml file that can be placed in the KJAR
+
+[source, xml]
+----
+<routes xmlns="http://camel.apache.org/schema/spring">
+
+ <route id="processes">
+ <from uri="jbpm:events:process:test"/>
+ <filter>
+ <simple>${in.header.EventType} == 'beforeProcessStarted'</simple>
+ <to uri="log:kjar.processes?level=INFO&showBody=true&showHeaders=true"/>
+ </filter>
+ </route>
+
+ <route id="tasks">
+ <from uri="jbpm:events:task:test"/>
+ <filter>
+ <simple>${in.header.EventType} starts with 'before'</simple>
+ <to uri="log:kjar.tasks?level=INFO&showBody=true&showHeaders=true"/>
+ </filter>
+ </route>
+</routes>
+----
+
+
+### Use of jBPM Component in KIE Server
+
+To make use of camel-jbpm component in a KIE Server it is as simple as just adding two jars into KIE Server application
+
+* camel-core
+* camel-jbpm
+
+then start KIE Server and you will see once booted following information in logs
+
+[source, plain]
+----
+Camel KIE Server extension has been successfully registered as server extension
+....
+
+Route: tasks started and consuming from: jbpm://events:task:test?deploymentId=form-rendering_1.0.0
+Total 2 routes, of which 2 are started
+Apache Camel 2.23.0-SNAPSHOT (CamelContext: KIE Server Camel context for container evaluation_1.0.0) started in 0.378 seconds
+o.k.server.services.impl.KieServerImpl : Container evaluation_1.0.0 (for release id evaluation:evaluation:1.0.0) successfully started
+----
+
+To make use of jBPM Consumer jBPM deployment descriptor must also define camel specific event listeners of following types
+
+* `new org.apache.camel.component.jbpm.listeners.CamelProcessEventListener()`
+* `new org.apache.camel.component.jbpm.listeners.CamelTaskEventListener()`
+* `new org.apache.camel.component.jbpm.listeners.CamelCaseEventListener()`
+
+These must be set in either server level of kjar deployment descriptor (use MVEL as resolver type) - see jbpm docs for more details about
+deployment descriptors.
+
+## Producer
+
+Producer is dedicated to interact with jBPM via kie-server-client that uses exposed REST api of
+jBPM (KIE Server).
+
### URI format
[source,java]
@@ -47,40 +152,46 @@ jbpm:connectionURL
with the following path and query parameters:
-==== Path Parameters (1 parameters):
+==== Path Parameters (2 parameters):
[width="100%",cols="2,5,^1,2",options="header"]
|===
| Name | Description | Default | Type
| *connectionURL* | *Required* The URL to the jBPM server. | | URL
+| *eventListenerType* | Sets the event listener type to attach to | | String
|===
-==== Query Parameters (25 parameters):
+==== Query Parameters (30 parameters):
[width="100%",cols="2,5,^1,2",options="header"]
|===
| Name | Description | Default | Type
-| *attachmentId* (producer) | attachId to use when retrieving attachments | | Long
-| *contentId* (producer) | contentId to use when retrieving attachments | | Long
-| *deploymentId* (producer) | *Required* The id of the deployment | | String
-| *event* (producer) | the data associated with this event when signalEvent operation is performed | | Object
-| *eventType* (producer) | the type of event to use when signalEvent operation is performed | | String
-| *identifier* (producer) | identifier the global identifier | | String
-| *language* (producer) | The language to use when filtering user tasks | | String
-| *maxNumber* (producer) | the maximum number of rules that should be fired | | Integer
+| *attachmentId* (common) | attachId to use when retrieving attachments | | Long
+| *contentId* (common) | contentId to use when retrieving attachments | | Long
+| *deploymentId* (common) | *Required* The id of the deployment | | String
+| *emitterSendItems* (common) | Sets if event produced by emitter should be sent as single items or complete collection | | Boolean
+| *event* (common) | the data associated with this event when signalEvent operation is performed | | Object
+| *eventType* (common) | the type of event to use when signalEvent operation is performed | | String
+| *identifier* (common) | identifier the global identifier | | String
+| *maxNumber* (common) | the maximum number of rules that should be fired | | Integer
+| *page* (common) | The page to use when retrieving user tasks | | Integer
+| *pageSize* (common) | The page size to use when retrieving user tasks | | Integer
+| *processId* (common) | the id of the process that should be acted upon | | String
+| *processInstanceId* (common) | the id of the process instance | | Long
+| *targetUserId* (common) | The targetUserId used when delegating a task | | String
+| *task* (common) | The task instance to use with task operations | | Task
+| *taskId* (common) | the id of the task | | Long
+| *timeout* (common) | A timeout value | | Integer
+| *userId* (common) | userId to use with task operations | | String
+| *value* (common) | the value to assign to the global identifier | | Object
+| *workItemId* (common) | the id of the work item | | Long
+| *bridgeErrorHandler* (consumer) | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | boolean
+| *exceptionHandler* (consumer) | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. | | ExceptionHandler
+| *exchangePattern* (consumer) | Sets the exchange pattern when the consumer creates an exchange. | | ExchangePattern
| *operation* (producer) | The operation to perform | startProcess | String
-| *processId* (producer) | the id of the process that should be acted upon | | String
-| *processInstanceId* (producer) | the id of the process instance | | Long
-| *targetUserId* (producer) | The targetUserId used when delegating a task | | String
-| *task* (producer) | The task instance to use with task operations | | Task
-| *taskId* (producer) | the id of the task | | Long
-| *timeout* (producer) | A timeout value | | Integer
-| *userId* (producer) | userId to use with task operations | | String
-| *value* (producer) | the value to assign to the global identifier | | Object
-| *workItemId* (producer) | the id of the work item | | Long
| *entities* (advanced) | The potentialOwners when nominateTask operation is performed | | List
| *extraJaxbClasses* (advanced) | To load additional classes when working with XML | | Class[]
| *parameters* (advanced) | the variables that should be set for various operations | | Map
@@ -153,23 +264,29 @@ org.infinispan.notifications.cachelistener.event.Event.Type
|CamelJBPMContentId |0 |Long |contentId to use when retrieving attachments
-|CamelJBPMEntityList |null |List<OrganizationalEntity> |The potentialOwners when nominateTask operation is performed
+|CamelJBPMEntityList |null |List<String> |The potentialOwners when nominateTask operation is performed
-|CamelJBPMStatusList |null |List<Status> |The list of status to use when filtering tasks
+|CamelJBPMStatusList |null |List<String> |The list of status to use when filtering tasks
|=======================================================================
### Example
Below is an example route that starts a business process with id
-project1.integration-test and deploymentId
-org.kie.example:project1:1.0.0-SNAPSHOT
+evaluation. To run this example you need jBPM to run locally, easiest is to use single zip
+distribution - downloaded from jbpm.org. Next, start it and import Evaluation sample project, build and deploy.
+Once done this test can be ran out of the box.
[source,java]
----------------------------------------------------------------------------------------------
+Map<String, Object> params = new HashMap<>();
+params.put("employee", "wbadmin");
+params.put("reason", "Camel asks for it");
+
from("direct:start")
- .setHeader(JBPMConstants.PROCESS_ID, constant("project1.integration-test"))
- .to("jbpm:http://localhost:8080/business-central?userName=bpmsAdmin&password=pa$word1"
- + "&deploymentId=org.kie.example:project1:1.0.0-SNAPSHOT");
+ .setHeader(JBPMConstants.PROCESS_ID, constant("evaluation"))
+ .setHeader((JBPMConstants.PARAMETERS, params))
+ .to("jbpm:http://localhost:8080/kie-server/services/rest/server?userName=wbadmin&password=wbadmin
+ &deploymentId=evaluation");
----------------------------------------------------------------------------------------------
### See Also
diff --git a/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/JBPMComponent.java b/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/JBPMCamelConsumerAware.java
similarity index 60%
copy from components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/JBPMComponent.java
copy to components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/JBPMCamelConsumerAware.java
index e580df2..85b4df2 100644
--- a/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/JBPMComponent.java
+++ b/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/JBPMCamelConsumerAware.java
@@ -14,20 +14,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.jbpm;
-
-import java.net.URL;
-import java.util.Map;
-import org.apache.camel.Endpoint;
-import org.apache.camel.support.DefaultComponent;
+package org.apache.camel.component.jbpm;
-public class JBPMComponent extends DefaultComponent {
+/**
+ * Indicates that class implementing this interface should receive (at some point)
+ * JBPMConsumer instance that is required to operate.
+ */
+public interface JBPMCamelConsumerAware {
- protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception {
- JBPMConfiguration configuration = new JBPMConfiguration();
- configuration.setConnectionURL(new URL(remaining));
- setProperties(configuration, parameters);
- return new JBPMEndpoint(uri, this, configuration);
- }
-}
\ No newline at end of file
+ void addConsumer(JBPMConsumer consumer);
+
+ void removeConsumer(JBPMConsumer consumer);
+}
diff --git a/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/JBPMComponent.java b/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/JBPMComponent.java
index e580df2..2db6797 100644
--- a/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/JBPMComponent.java
+++ b/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/JBPMComponent.java
@@ -26,7 +26,11 @@ public class JBPMComponent extends DefaultComponent {
protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception {
JBPMConfiguration configuration = new JBPMConfiguration();
- configuration.setConnectionURL(new URL(remaining));
+ if (remaining.startsWith("events")) {
+ configuration.setEventListenerType(remaining.split(":")[1]);
+ } else {
+ configuration.setConnectionURL(new URL(remaining));
+ }
setProperties(configuration, parameters);
return new JBPMEndpoint(uri, this, configuration);
}
diff --git a/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/JBPMConfiguration.java b/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/JBPMConfiguration.java
index c4a30c7..9633aaa 100644
--- a/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/JBPMConfiguration.java
+++ b/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/JBPMConfiguration.java
@@ -17,6 +17,7 @@
package org.apache.camel.component.jbpm;
import java.net.URL;
+import java.util.Arrays;
import java.util.List;
import java.util.Map;
@@ -24,8 +25,6 @@ import org.apache.camel.spi.Metadata;
import org.apache.camel.spi.UriParam;
import org.apache.camel.spi.UriParams;
import org.apache.camel.spi.UriPath;
-import org.kie.api.task.model.OrganizationalEntity;
-import org.kie.api.task.model.Status;
import org.kie.api.task.model.Task;
@UriParams
@@ -58,7 +57,9 @@ public class JBPMConfiguration {
@UriParam
private String userId;
@UriParam
- private String language;
+ private Integer page = 0;
+ @UriParam
+ private Integer pageSize = 10;
@UriParam
private String targetUserId;
@UriParam
@@ -68,9 +69,9 @@ public class JBPMConfiguration {
@UriParam
private Task task;
@UriParam(label = "advanced")
- private List<OrganizationalEntity> entities;
+ private List<String> entities;
@UriParam(label = "filter")
- private List<Status> statuses;
+ private List<String> statuses;
@UriParam(label = "security", secret = true)
private String userName;
@UriParam(label = "security", secret = true)
@@ -81,6 +82,11 @@ public class JBPMConfiguration {
private Map<String, Object> parameters;
@UriParam(label = "advanced")
private Class[] extraJaxbClasses;
+ @UriParam
+ private Boolean emitterSendItems;
+
+ @UriPath
+ private String eventListenerType;
public String getOperation() {
return operation;
@@ -225,15 +231,26 @@ public class JBPMConfiguration {
this.task = task;
}
- public String getLanguage() {
- return language;
+ public Integer getPage() {
+ return page;
+ }
+
+ /**
+ * The page to use when retrieving user tasks
+ */
+ public void setPage(Integer page) {
+ this.page = page;
+ }
+
+ public Integer getPageSize() {
+ return pageSize;
}
/**
- * The language to use when filtering user tasks
+ * The page size to use when retrieving user tasks
*/
- public void setLanguage(String language) {
- this.language = language;
+ public void setPageSize(Integer pageSize) {
+ this.pageSize = pageSize;
}
public String getTargetUserId() {
@@ -269,25 +286,25 @@ public class JBPMConfiguration {
this.contentId = contentId;
}
- public List<OrganizationalEntity> getEntities() {
+ public List<String> getEntities() {
return entities;
}
/**
* The potentialOwners when nominateTask operation is performed
*/
- public void setEntities(List<OrganizationalEntity> entities) {
+ public void setEntities(List<String> entities) {
this.entities = entities;
}
- public List<Status> getStatuses() {
+ public List<String> getStatuses() {
return statuses;
}
/**
* The list of status to use when filtering tasks
*/
- public void setStatuses(List<Status> statuses) {
+ public void setStatuses(List<String> statuses) {
this.statuses = statuses;
}
@@ -356,4 +373,32 @@ public class JBPMConfiguration {
public void setExtraJaxbClasses(Class[] extraJaxbClasses) {
this.extraJaxbClasses = extraJaxbClasses;
}
+
+
+ public String getEventListenerType() {
+ return eventListenerType;
+ }
+
+ /**
+ * Sets the event listener type to attach to
+ */
+ public void setEventListenerType(String eventListenerType) {
+ this.eventListenerType = eventListenerType;
+ }
+
+ public Boolean getEmitterSendItems() {
+ return emitterSendItems;
+ }
+
+ /**
+ * Sets if event produced by emitter should be sent as single items or complete collection
+ */
+ public void setEmitterSendItems(Boolean emiterSendItems) {
+ this.emitterSendItems = emiterSendItems;
+ }
+
+ @Override
+ public String toString() {
+ return "JBPMConfiguration [connectionURL=" + connectionURL + ", operation=" + operation + ", deploymentId=" + deploymentId + ", processInstanceId=" + processInstanceId + ", value=" + value + ", processId=" + processId + ", eventType=" + eventType + ", event=" + event + ", maxNumber=" + maxNumber + ", identifier=" + identifier + ", workItemId=" + workItemId + ", taskId=" + taskId + ", userId=" + userId + ", page=" + page + ", pageSize=" + pageSize + ", targetUserId=" + targetUserI [...]
+ }
}
diff --git a/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/JBPMConstants.java b/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/JBPMConstants.java
index 6b00d02..8341cfd 100644
--- a/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/JBPMConstants.java
+++ b/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/JBPMConstants.java
@@ -30,10 +30,17 @@ public interface JBPMConstants {
String TASK_ID = "CamelJBPMTaskId";
String TASK = "CamelJBPMTask";
String USER_ID = "CamelJBPMUserId";
- String TARGET_USER_ID = "CamelJBPMTargetUserId";
- String LANGUAGE = "CamelJBPMLanguage";
+ String TARGET_USER_ID = "CamelJBPMTargetUserId";
String ATTACHMENT_ID = "CamelJBPMAttachmentId";
String CONTENT_ID = "CamelJBPMContentId";
String ENTITY_LIST = "CamelJBPMEntityList";
String STATUS_LIST = "CamelJBPMStatusList";
+ String RESULT_PAGE = "CamelJBPMResultPage";
+ String RESULT_PAGE_SIZE = "CamelJBPMResultPageSize";
+
+
+ String JBPM_PROCESS_EVENT_LISTENER = "process";
+ String JBPM_TASK_EVENT_LISTENER = "task";
+ String JBPM_CASE_EVENT_LISTENER = "case";
+ String JBPM_EVENT_EMITTER = "emitter";
}
diff --git a/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/JBPMConsumer.java b/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/JBPMConsumer.java
new file mode 100644
index 0000000..844736f
--- /dev/null
+++ b/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/JBPMConsumer.java
@@ -0,0 +1,208 @@
+/**
+ * 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.
+ */
+
+package org.apache.camel.component.jbpm;
+
+import org.apache.camel.AsyncCallback;
+import org.apache.camel.Endpoint;
+import org.apache.camel.Exchange;
+import org.apache.camel.ExchangePattern;
+import org.apache.camel.Processor;
+import org.apache.camel.component.jbpm.emitters.CamelEventEmitter;
+import org.apache.camel.component.jbpm.listeners.CamelCaseEventListener;
+import org.apache.camel.component.jbpm.listeners.CamelProcessEventListener;
+import org.apache.camel.component.jbpm.listeners.CamelTaskEventListener;
+import org.apache.camel.support.DefaultConsumer;
+import org.jbpm.services.api.DeploymentEvent;
+import org.jbpm.services.api.DeploymentEventListener;
+import org.jbpm.services.api.DeploymentService;
+import org.jbpm.services.api.ListenerSupport;
+import org.jbpm.services.api.model.DeployedUnit;
+import org.jbpm.services.api.service.ServiceRegistry;
+import org.kie.internal.runtime.manager.CacheManager;
+import org.kie.internal.runtime.manager.InternalRuntimeManager;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+public class JBPMConsumer extends DefaultConsumer implements DeploymentEventListener {
+
+ private static final transient Logger LOGGER = LoggerFactory.getLogger(JBPMConsumer.class);
+
+ private JBPMEndpoint endpoint;
+ private JBPMConfiguration configuration;
+
+ public JBPMConsumer(Endpoint endpoint, Processor processor) {
+ super(endpoint, processor);
+
+ this.endpoint = (JBPMEndpoint) endpoint;
+ this.configuration = ((JBPMEndpoint) getEndpoint()).getConfiguration();
+ }
+
+ @Override
+ protected void doStart() throws Exception {
+ super.doStart();
+
+ DeploymentService deploymentService = (DeploymentService) ServiceRegistry.get().service(ServiceRegistry.DEPLOYMENT_SERVICE);
+
+ if (configuration.getDeploymentId() != null) {
+ InternalRuntimeManager manager = (InternalRuntimeManager) deploymentService.getRuntimeManager(configuration.getDeploymentId());
+ configure(manager, this);
+
+ LOGGER.debug("JBPM Camel Consumer configured and started for deployment id {}", configuration.getDeploymentId());
+ } else {
+
+ ((ListenerSupport) deploymentService).addListener(this);
+
+ for (DeployedUnit deployed : deploymentService.getDeployedUnits()) {
+ InternalRuntimeManager manager = (InternalRuntimeManager) deployed.getRuntimeManager();
+ configure(manager, this);
+ }
+
+ LOGGER.debug("JBPM Camel Consumer configured and started on all available deployments");
+ }
+
+
+ }
+
+ @Override
+ protected void doStop() throws Exception {
+ super.doStop();
+ DeploymentService deploymentService = (DeploymentService) ServiceRegistry.get().service(ServiceRegistry.DEPLOYMENT_SERVICE);
+ if (configuration.getDeploymentId() != null) {
+ LOGGER.debug("JBPM Camel Consumer unconfigured and stopped for deployment id {}", configuration.getDeploymentId());
+ } else {
+ ((ListenerSupport) deploymentService).removeListener(this);
+
+ LOGGER.debug("JBPM Camel Consumer unconfigured and stopped on all available deployments");
+ }
+
+ if (JBPMConstants.JBPM_EVENT_EMITTER.equals(configuration.getEventListenerType())) {
+ ServiceRegistry.get().remove("CamelEventEmitter");
+ }
+
+ }
+
+ public void sendMessage(String eventType, Object body) {
+ Exchange exchange = getEndpoint().createExchange(ExchangePattern.InOnly);
+ exchange.getIn().setHeader("EventType", eventType);
+
+ exchange.getIn().setBody(body);
+
+ if (!endpoint.isSynchronous()) {
+ getAsyncProcessor().process(exchange, new AsyncCallback() {
+ @Override
+ public void done(boolean doneSync) {
+ // handle any thrown exception
+ if (exchange.getException() != null) {
+ getExceptionHandler().handleException("Error processing exchange", exchange, exchange.getException());
+ }
+ }
+ });
+ } else {
+ try {
+ getProcessor().process(exchange);
+ } catch (Exception e) {
+ exchange.setException(e);
+ }
+
+ // handle any thrown exception
+ if (exchange.getException() != null) {
+ getExceptionHandler().handleException("Error processing exchange", exchange, exchange.getException());
+ }
+ }
+ }
+
+ @Override
+ public void onDeploy(DeploymentEvent event) {
+ InternalRuntimeManager manager = (InternalRuntimeManager) event.getDeployedUnit().getRuntimeManager();
+ configure(manager, this);
+
+ }
+
+ @Override
+ public void onUnDeploy(DeploymentEvent event) {
+ // no-op
+ }
+
+ @Override
+ public void onActivate(DeploymentEvent event) {
+ // no-op
+
+ }
+
+ @Override
+ public void onDeactivate(DeploymentEvent event) {
+ // no-op
+
+ }
+
+
+ protected void configure(InternalRuntimeManager manager, JBPMConsumer consumer) {
+ String eventListenerType = configuration.getEventListenerType();
+ if (eventListenerType == null) {
+ return;
+ }
+
+
+ configureConsumer(eventListenerType, manager, consumer);
+
+ }
+
+ protected void configureConsumer(String eventListenerType, InternalRuntimeManager manager, JBPMConsumer consumer) {
+ LOGGER.debug("Configuring Camel JBPM Consumer for {} on runtime manager {}", eventListenerType, manager);
+
+ CacheManager cacheManager = manager.getCacheManager();
+ JBPMCamelConsumerAware consumerAware = null;
+ if (JBPMConstants.JBPM_PROCESS_EVENT_LISTENER.equals(eventListenerType)) {
+ consumerAware = (JBPMCamelConsumerAware) cacheManager.get("new org.apache.camel.component.jbpm.listeners.CamelProcessEventListener()");
+ if (consumerAware == null) {
+ consumerAware = new CamelProcessEventListener();
+ cacheManager.add("new org.apache.camel.component.jbpm.listeners.CamelProcessEventListener()", consumerAware);
+ }
+ LOGGER.debug("Configuring JBPMConsumer on process event listener {}", consumerAware);
+ } else if (JBPMConstants.JBPM_TASK_EVENT_LISTENER.equals(eventListenerType)) {
+ consumerAware = (JBPMCamelConsumerAware) cacheManager.get("new org.apache.camel.component.jbpm.listeners.CamelTaskEventListener()");
+ if (consumerAware == null) {
+ consumerAware = new CamelTaskEventListener();
+ cacheManager.add("new org.apache.camel.component.jbpm.listeners.CamelTaskEventListener()", consumerAware);
+ }
+ LOGGER.debug("Configuring JBPMConsumer on task event listener {}", consumerAware);
+ } else if (JBPMConstants.JBPM_CASE_EVENT_LISTENER.equals(eventListenerType)) {
+ consumerAware = (JBPMCamelConsumerAware) cacheManager.get("new org.apache.camel.component.jbpm.listeners.CamelCaseEventListener()");
+ if (consumerAware == null) {
+ consumerAware = new CamelCaseEventListener();
+ cacheManager.add("new org.apache.camel.component.jbpm.listeners.CamelCaseEventListener()", consumerAware);
+ }
+ LOGGER.debug("Configuring JBPMConsumer on case event listener {}", consumerAware);
+ } else if (JBPMConstants.JBPM_EVENT_EMITTER.equals(eventListenerType)) {
+ LOGGER.debug("Configuring JBPMConsumer for event emitter");
+ ServiceRegistry.get().register("CamelEventEmitter", new CamelEventEmitter(this, configuration.getEmitterSendItems()));
+
+ return;
+ }
+
+ LOGGER.debug("Adding consumer {} on {}", consumer, consumerAware);
+ consumerAware.addConsumer(consumer);
+
+ }
+
+ @Override
+ public String toString() {
+ return "JBPMConsumer [endpoint=" + endpoint + ", configuration=" + configuration + "]";
+ }
+}
diff --git a/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/JBPMEndpoint.java b/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/JBPMEndpoint.java
index 224b65e..4796336 100644
--- a/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/JBPMEndpoint.java
+++ b/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/JBPMEndpoint.java
@@ -18,6 +18,9 @@ package org.apache.camel.component.jbpm;
import java.net.MalformedURLException;
import java.net.URISyntaxException;
+import java.util.Arrays;
+import java.util.LinkedHashSet;
+import java.util.List;
import org.apache.camel.Consumer;
import org.apache.camel.Processor;
@@ -25,16 +28,16 @@ import org.apache.camel.Producer;
import org.apache.camel.support.DefaultEndpoint;
import org.apache.camel.spi.UriEndpoint;
import org.apache.camel.spi.UriParam;
-import org.kie.api.runtime.manager.RuntimeEngine;
-import org.kie.remote.client.api.RemoteRestRuntimeEngineBuilder;
-import org.kie.services.client.api.RemoteRuntimeEngineFactory;
+import org.kie.server.client.KieServicesClient;
+import org.kie.server.client.KieServicesConfiguration;
+import org.kie.server.client.KieServicesFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
* The jbpm component provides integration with jBPM (Business Process Management).
*/
-@UriEndpoint(firstVersion = "2.6.0", scheme = "jbpm", title = "JBPM", syntax = "jbpm:connectionURL", producerOnly = true, label = "process")
+@UriEndpoint(firstVersion = "2.6.0", scheme = "jbpm", title = "JBPM", syntax = "jbpm:connectionURL", label = "process")
public class JBPMEndpoint extends DefaultEndpoint {
private static final transient Logger LOGGER = LoggerFactory.getLogger(JBPMEndpoint.class);
@@ -47,35 +50,24 @@ public class JBPMEndpoint extends DefaultEndpoint {
}
public Producer createProducer() throws Exception {
- RemoteRestRuntimeEngineBuilder engineBuilder = RemoteRuntimeEngineFactory.newRestBuilder();
- if (configuration.getUserName() != null) {
- engineBuilder.addUserName(configuration.getUserName());
- }
- if (configuration.getPassword() != null) {
- engineBuilder.addPassword(configuration.getPassword());
- }
- if (configuration.getDeploymentId() != null) {
- engineBuilder.addDeploymentId(configuration.getDeploymentId());
- }
- if (configuration.getConnectionURL() != null) {
- engineBuilder.addUrl(configuration.getConnectionURL());
- }
- if (configuration.getProcessInstanceId() != null) {
- engineBuilder.addProcessInstanceId(configuration.getProcessInstanceId());
- }
+ KieServicesConfiguration kieConfiguration = KieServicesFactory.newRestConfiguration(configuration.getConnectionURL().toExternalForm(), configuration.getUserName(), configuration.getPassword());
+
if (configuration.getTimeout() != null) {
- engineBuilder.addTimeout(configuration.getTimeout());
+ kieConfiguration.setTimeout(configuration.getTimeout());
}
if (configuration.getExtraJaxbClasses() != null) {
- engineBuilder.addExtraJaxbClasses(configuration.getExtraJaxbClasses());
+ List<Class<?>> classes = Arrays.asList(configuration.getExtraJaxbClasses());
+ kieConfiguration.addExtraClasses(new LinkedHashSet<>(classes));
}
- RuntimeEngine runtimeEngine = engineBuilder.build();
-
- return new JBPMProducer(this, runtimeEngine);
+
+ KieServicesClient kieServerClient = KieServicesFactory.newKieServicesClient(kieConfiguration);
+ LOGGER.debug("JBPM Producer created with KieServerClient configured for {}", configuration.getConnectionURL());
+ return new JBPMProducer(this, kieServerClient);
}
public Consumer createConsumer(Processor processor) throws Exception {
- throw new UnsupportedOperationException("Consumer not supported for " + getClass().getSimpleName() + " endpoint");
+ LOGGER.debug("JBPM Consumer created and configured for deployment {}", configuration.getDeploymentId());
+ return new JBPMConsumer(this, processor);
}
public boolean isSingleton() {
diff --git a/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/JBPMProducer.java b/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/JBPMProducer.java
index 2870ef8..86571c9 100644
--- a/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/JBPMProducer.java
+++ b/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/JBPMProducer.java
@@ -16,7 +16,9 @@
*/
package org.apache.camel.component.jbpm;
+import java.util.ArrayList;
import java.util.Collection;
+import java.util.Collections;
import java.util.List;
import java.util.Map;
@@ -24,55 +26,54 @@ import org.apache.camel.Exchange;
import org.apache.camel.Message;
import org.apache.camel.support.DefaultProducer;
import org.apache.camel.support.ExchangeHelper;
-import org.kie.api.runtime.KieSession;
-import org.kie.api.runtime.manager.RuntimeEngine;
-import org.kie.api.runtime.process.ProcessInstance;
-import org.kie.api.task.TaskService;
-import org.kie.api.task.model.Attachment;
-import org.kie.api.task.model.Content;
-import org.kie.api.task.model.OrganizationalEntity;
-import org.kie.api.task.model.Status;
+import org.kie.api.KieServices;
+import org.kie.api.command.BatchExecutionCommand;
+import org.kie.api.command.Command;
+import org.kie.api.command.KieCommands;
+import org.kie.api.runtime.ExecutionResults;
import org.kie.api.task.model.Task;
-import org.kie.api.task.model.TaskSummary;
+import org.kie.server.api.model.ServiceResponse;
+import org.kie.server.api.model.instance.ProcessInstance;
+import org.kie.server.api.model.instance.TaskAttachment;
+import org.kie.server.api.model.instance.TaskInstance;
+import org.kie.server.api.model.instance.TaskSummary;
+import org.kie.server.client.KieServicesClient;
+import org.kie.server.client.ProcessServicesClient;
+import org.kie.server.client.QueryServicesClient;
+import org.kie.server.client.RuleServicesClient;
+import org.kie.server.client.UserTaskServicesClient;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class JBPMProducer extends DefaultProducer {
private static final transient Logger LOGGER = LoggerFactory.getLogger(JBPMProducer.class);
- private KieSession kieSession;
- private TaskService taskService;
+
+ private static KieCommands commandsFactory = KieServices.get().getCommands();
+
private JBPMConfiguration configuration;
- private RuntimeEngine runtimeEngine;
+ private KieServicesClient kieServicesClient;
+
- public JBPMProducer(JBPMEndpoint endpoint, RuntimeEngine runtimeEngine) {
+ public JBPMProducer(JBPMEndpoint endpoint, KieServicesClient kieServicesClient) {
super(endpoint);
this.configuration = endpoint.getConfiguration();
- this.runtimeEngine = runtimeEngine;
+ this.kieServicesClient = kieServicesClient;
}
@Override
protected void doStart() throws Exception {
LOGGER.trace("starting producer");
- kieSession = runtimeEngine.getKieSession();
- taskService = runtimeEngine.getTaskService();
super.doStart();
LOGGER.trace("started producer");
}
@Override
protected void doStop() throws Exception {
- super.doStop();
- if (kieSession != null) {
- kieSession = null;
- }
-
- if (taskService != null) {
- taskService = null;
- }
+ super.doStop();
}
public void process(Exchange exchange) throws Exception {
- getOperation(exchange).execute(kieSession, taskService, configuration, exchange);
+ getOperation(exchange).execute(kieServicesClient, configuration, exchange);
}
Operation getOperation(Exchange exchange) {
@@ -92,35 +93,40 @@ public class JBPMProducer extends DefaultProducer {
//PROCESS OPERATIONS
startProcess {
@Override
- void execute(KieSession kieSession, TaskService taskService, JBPMConfiguration configuration, Exchange exchange) {
- ProcessInstance processInstance = kieSession.startProcess(getProcessId(configuration, exchange), getParameters(configuration, exchange));
+ void execute(KieServicesClient kieServicesClient, JBPMConfiguration configuration, Exchange exchange) {
+ ProcessServicesClient processClient = kieServicesClient.getServicesClient(ProcessServicesClient.class);
+ Long processInstance = processClient.startProcess(configuration.getDeploymentId(), getProcessId(configuration, exchange), getParameters(configuration, exchange));
setResult(exchange, processInstance);
}
}, abortProcessInstance {
@Override
- void execute(KieSession kieSession, TaskService taskService, JBPMConfiguration configuration, Exchange exchange) {
- kieSession.abortProcessInstance(safe(getProcessInstanceId(configuration, exchange)));
+ void execute(KieServicesClient kieServicesClient, JBPMConfiguration configuration, Exchange exchange) {
+ ProcessServicesClient processClient = kieServicesClient.getServicesClient(ProcessServicesClient.class);
+ processClient.abortProcessInstance(configuration.getDeploymentId(), safe(getProcessInstanceId(configuration, exchange)));
}
}, signalEvent {
@Override
- void execute(KieSession kieSession, TaskService taskService, JBPMConfiguration configuration, Exchange exchange) {
+ void execute(KieServicesClient kieServicesClient, JBPMConfiguration configuration, Exchange exchange) {
+ ProcessServicesClient processClient = kieServicesClient.getServicesClient(ProcessServicesClient.class);
Long processInstanceId = getProcessInstanceId(configuration, exchange);
if (processInstanceId != null) {
- kieSession.signalEvent(getEventType(configuration, exchange), getEvent(configuration, exchange), processInstanceId);
+ processClient.signalProcessInstance(configuration.getDeploymentId(), processInstanceId, getEventType(configuration, exchange), getEvent(configuration, exchange));
} else {
- kieSession.signalEvent(getEventType(configuration, exchange), getEvent(configuration, exchange));
+ processClient.signal(configuration.getDeploymentId(), getEventType(configuration, exchange), getEvent(configuration, exchange));
}
}
}, getProcessInstance {
@Override
- void execute(KieSession kieSession, TaskService taskService, JBPMConfiguration configuration, Exchange exchange) {
- ProcessInstance processInstance = kieSession.getProcessInstance(safe(getProcessInstanceId(configuration, exchange)));
+ void execute(KieServicesClient kieServicesClient, JBPMConfiguration configuration, Exchange exchange) {
+ ProcessServicesClient processClient = kieServicesClient.getServicesClient(ProcessServicesClient.class);
+ ProcessInstance processInstance = processClient.getProcessInstance(configuration.getDeploymentId(), safe(getProcessInstanceId(configuration, exchange)));
setResult(exchange, processInstance);
}
}, getProcessInstances {
@Override
- void execute(KieSession kieSession, TaskService taskService, JBPMConfiguration configuration, Exchange exchange) {
- Collection<ProcessInstance> processInstances = kieSession.getProcessInstances();
+ void execute(KieServicesClient kieServicesClient, JBPMConfiguration configuration, Exchange exchange) {
+ QueryServicesClient queryClient = kieServicesClient.getServicesClient(QueryServicesClient.class);
+ Collection<ProcessInstance> processInstances = queryClient.findProcessInstances(getPage(configuration, exchange), getPageSize(configuration, exchange));
setResult(exchange, processInstances);
}
},
@@ -128,198 +134,217 @@ public class JBPMProducer extends DefaultProducer {
//RULE OPERATIONS
fireAllRules {
@Override
- void execute(KieSession kieSession, TaskService taskService, JBPMConfiguration configuration, Exchange exchange) {
+ void execute(KieServicesClient kieServicesClient, JBPMConfiguration configuration, Exchange exchange) {
+ RuleServicesClient ruleClient = kieServicesClient.getServicesClient(RuleServicesClient.class);
+ List<Command<?>> commands = new ArrayList<Command<?>>();
+ BatchExecutionCommand executionCommand = commandsFactory.newBatchExecution(commands);
+
Integer max = getMaxNumber(configuration, exchange);
- int rulesFired;
if (max != null) {
- rulesFired = kieSession.fireAllRules(max);
+ commands.add(commandsFactory.newFireAllRules(max));
} else {
- rulesFired = kieSession.fireAllRules();
+ commands.add(commandsFactory.newFireAllRules());
}
- setResult(exchange, rulesFired);
- }
- }, getFactCount {
- @Override
- void execute(KieSession kieSession, TaskService taskService, JBPMConfiguration configuration, Exchange exchange) {
- long factCount = kieSession.getFactCount();
- setResult(exchange, factCount);
+ ServiceResponse<ExecutionResults> reply = ruleClient.executeCommandsWithResults(configuration.getDeploymentId(), executionCommand);
+ setResult(exchange, reply.getResult());
}
}, getGlobal {
@Override
- void execute(KieSession kieSession, TaskService taskService, JBPMConfiguration configuration, Exchange exchange) {
- Object global = kieSession.getGlobal(getIdentifier(configuration, exchange));
- setResult(exchange, global);
+ void execute(KieServicesClient kieServicesClient, JBPMConfiguration configuration, Exchange exchange) {
+ RuleServicesClient ruleClient = kieServicesClient.getServicesClient(RuleServicesClient.class);
+ List<Command<?>> commands = new ArrayList<Command<?>>();
+ BatchExecutionCommand executionCommand = commandsFactory.newBatchExecution(commands);
+ String identifier = getIdentifier(configuration, exchange);
+ commands.add(commandsFactory.newGetGlobal(identifier, identifier));
+
+ ServiceResponse<ExecutionResults> reply = ruleClient.executeCommandsWithResults(configuration.getDeploymentId(), executionCommand);
+ setResult(exchange, reply.getResult().getValue(identifier));
}
}, setGlobal {
@Override
- void execute(KieSession kieSession, TaskService taskService, JBPMConfiguration configuration, Exchange exchange) {
- kieSession.setGlobal(getIdentifier(configuration, exchange), getValue(configuration, exchange));
+ void execute(KieServicesClient kieServicesClient, JBPMConfiguration configuration, Exchange exchange) {
+ RuleServicesClient ruleClient = kieServicesClient.getServicesClient(RuleServicesClient.class);
+ List<Command<?>> commands = new ArrayList<Command<?>>();
+ BatchExecutionCommand executionCommand = commandsFactory.newBatchExecution(commands);
+
+ commands.add(commandsFactory.newSetGlobal(getIdentifier(configuration, exchange), getValue(configuration, exchange)));
+
+ ruleClient.executeCommandsWithResults(configuration.getDeploymentId(), executionCommand);
}
},
//WORK ITEM OPERATIONS
abortWorkItem {
@Override
- void execute(KieSession kieSession, TaskService taskService, JBPMConfiguration configuration, Exchange exchange) {
- kieSession.getWorkItemManager().abortWorkItem(safe(getWorkItemId(configuration, exchange)));
+ void execute(KieServicesClient kieServicesClient, JBPMConfiguration configuration, Exchange exchange) {
+ ProcessServicesClient processClient = kieServicesClient.getServicesClient(ProcessServicesClient.class);
+ processClient.abortWorkItem(configuration.getDeploymentId(), safe(getProcessInstanceId(configuration, exchange)), safe(getWorkItemId(configuration, exchange)));
}
}, completeWorkItem {
@Override
- void execute(KieSession kieSession, TaskService taskService, JBPMConfiguration configuration, Exchange exchange) {
- kieSession.getWorkItemManager().completeWorkItem(safe(getWorkItemId(configuration, exchange)), getParameters(configuration, exchange));
+ void execute(KieServicesClient kieServicesClient, JBPMConfiguration configuration, Exchange exchange) {
+ ProcessServicesClient processClient = kieServicesClient.getServicesClient(ProcessServicesClient.class);
+ processClient.completeWorkItem(configuration.getDeploymentId(), safe(getProcessInstanceId(configuration, exchange)), safe(getWorkItemId(configuration, exchange)), getParameters(configuration, exchange));
}
},
//TASK OPERATIONS
activateTask {
@Override
- void execute(KieSession kieSession, TaskService taskService, JBPMConfiguration configuration, Exchange exchange) {
- taskService.activate(safe(getTaskId(configuration, exchange)), getUserId(configuration, exchange));
- }
- }, addTask {
- @Override
- void execute(KieSession kieSession, TaskService taskService, JBPMConfiguration configuration, Exchange exchange) {
- long taskId = taskService.addTask(getTask(configuration, exchange), getParameters(configuration, exchange));
- setResult(exchange, taskId);
- }
- }, claimNextAvailableTask {
- @Override
- void execute(KieSession kieSession, TaskService taskService, JBPMConfiguration configuration, Exchange exchange) {
- taskService.claimNextAvailable(getUserId(configuration, exchange), getLanguage(configuration, exchange));
+ void execute(KieServicesClient kieServicesClient, JBPMConfiguration configuration, Exchange exchange) {
+ UserTaskServicesClient taskClient = kieServicesClient.getServicesClient(UserTaskServicesClient.class);
+ taskClient.activateTask(configuration.getDeploymentId(), safe(getTaskId(configuration, exchange)), getUserId(configuration, exchange));
}
}, claimTask {
@Override
- void execute(KieSession kieSession, TaskService taskService, JBPMConfiguration configuration, Exchange exchange) {
- taskService.claim(safe(getTaskId(configuration, exchange)), getUserId(configuration, exchange));
+ void execute(KieServicesClient kieServicesClient, JBPMConfiguration configuration, Exchange exchange) {
+ UserTaskServicesClient taskClient = kieServicesClient.getServicesClient(UserTaskServicesClient.class);
+ taskClient.claimTask(configuration.getDeploymentId(), safe(getTaskId(configuration, exchange)), getUserId(configuration, exchange));
}
}, completeTask {
@Override
- void execute(KieSession kieSession, TaskService taskService, JBPMConfiguration configuration, Exchange exchange) {
- taskService.complete(safe(getTaskId(configuration, exchange)), getUserId(configuration, exchange), getParameters(configuration, exchange));
+ void execute(KieServicesClient kieServicesClient, JBPMConfiguration configuration, Exchange exchange) {
+ UserTaskServicesClient taskClient = kieServicesClient.getServicesClient(UserTaskServicesClient.class);
+ taskClient.completeAutoProgress(configuration.getDeploymentId(), safe(getTaskId(configuration, exchange)), getUserId(configuration, exchange), getParameters(configuration, exchange));
}
}, delegateTask {
@Override
- void execute(KieSession kieSession, TaskService taskService, JBPMConfiguration configuration, Exchange exchange) {
- taskService.delegate(safe(getTaskId(configuration, exchange)), getUserId(configuration, exchange), getTargetUserId(configuration, exchange));
+ void execute(KieServicesClient kieServicesClient, JBPMConfiguration configuration, Exchange exchange) {
+ UserTaskServicesClient taskClient = kieServicesClient.getServicesClient(UserTaskServicesClient.class);
+ taskClient.delegateTask(configuration.getDeploymentId(), safe(getTaskId(configuration, exchange)), getUserId(configuration, exchange), getTargetUserId(configuration, exchange));
}
}, exitTask {
@Override
- void execute(KieSession kieSession, TaskService taskService, JBPMConfiguration configuration, Exchange exchange) {
- taskService.exit(safe(getTaskId(configuration, exchange)), getUserId(configuration, exchange));
+ void execute(KieServicesClient kieServicesClient, JBPMConfiguration configuration, Exchange exchange) {
+ UserTaskServicesClient taskClient = kieServicesClient.getServicesClient(UserTaskServicesClient.class);
+ taskClient.exitTask(configuration.getDeploymentId(), safe(getTaskId(configuration, exchange)), getUserId(configuration, exchange));
}
}, failTask {
@Override
- void execute(KieSession kieSession, TaskService taskService, JBPMConfiguration configuration, Exchange exchange) {
- taskService.fail(safe(getTaskId(configuration, exchange)), getUserId(configuration, exchange), getParameters(configuration, exchange));
+ void execute(KieServicesClient kieServicesClient, JBPMConfiguration configuration, Exchange exchange) {
+ UserTaskServicesClient taskClient = kieServicesClient.getServicesClient(UserTaskServicesClient.class);
+ taskClient.failTask(configuration.getDeploymentId(), safe(getTaskId(configuration, exchange)), getUserId(configuration, exchange), getParameters(configuration, exchange));
}
}, getAttachment {
@Override
- void execute(KieSession kieSession, TaskService taskService, JBPMConfiguration configuration, Exchange exchange) {
- Attachment attachment = taskService.getAttachmentById(safe(getAttachmentId(configuration, exchange)));
+ void execute(KieServicesClient kieServicesClient, JBPMConfiguration configuration, Exchange exchange) {
+ UserTaskServicesClient taskClient = kieServicesClient.getServicesClient(UserTaskServicesClient.class);
+ TaskAttachment attachment = taskClient.getTaskAttachmentById(configuration.getDeploymentId(), safe(getTaskId(configuration, exchange)), safe(getAttachmentId(configuration, exchange)));
setResult(exchange, attachment);
}
- }, getContent {
- @Override
- void execute(KieSession kieSession, TaskService taskService, JBPMConfiguration configuration, Exchange exchange) {
- Content content = taskService.getContentById(safe(getContentId(configuration, exchange)));
- setResult(exchange, content);
- }
}, getTasksAssignedAsBusinessAdministrator {
@Override
- void execute(KieSession kieSession, TaskService taskService, JBPMConfiguration configuration, Exchange exchange) {
- List<TaskSummary> taskSummaries = taskService.getTasksAssignedAsBusinessAdministrator(getUserId(configuration, exchange), getLanguage(configuration, exchange));
+ void execute(KieServicesClient kieServicesClient, JBPMConfiguration configuration, Exchange exchange) {
+ UserTaskServicesClient taskClient = kieServicesClient.getServicesClient(UserTaskServicesClient.class);
+ List<TaskSummary> taskSummaries = taskClient.findTasksAssignedAsBusinessAdministrator(getUserId(configuration, exchange), getPage(configuration, exchange), getPageSize(configuration, exchange));
setResult(exchange, taskSummaries);
}
}, getTasksAssignedAsPotentialOwnerByStatus {
@Override
- void execute(KieSession kieSession, TaskService taskService, JBPMConfiguration configuration, Exchange exchange) {
- taskService.getTasksAssignedAsPotentialOwnerByStatus(getUserId(configuration, exchange), getStatuses(configuration, exchange), getLanguage(configuration, exchange));
+ void execute(KieServicesClient kieServicesClient, JBPMConfiguration configuration, Exchange exchange) {
+ UserTaskServicesClient taskClient = kieServicesClient.getServicesClient(UserTaskServicesClient.class);
+ List<TaskSummary> taskSummaries = taskClient.findTasksAssignedAsPotentialOwner(getUserId(configuration, exchange), getStatuses(configuration, exchange), getPage(configuration, exchange), getPageSize(configuration, exchange));
+ setResult(exchange, taskSummaries);
}
}, getTaskByWorkItem {
@Override
- void execute(KieSession kieSession, TaskService taskService, JBPMConfiguration configuration, Exchange exchange) {
- Task task = taskService.getTaskByWorkItemId(safe(getWorkItemId(configuration, exchange)));
+ void execute(KieServicesClient kieServicesClient, JBPMConfiguration configuration, Exchange exchange) {
+ UserTaskServicesClient taskClient = kieServicesClient.getServicesClient(UserTaskServicesClient.class);
+ TaskInstance task = taskClient.findTaskByWorkItemId(safe(getWorkItemId(configuration, exchange)));
setResult(exchange, task);
}
}, getTaskBy {
@Override
- void execute(KieSession kieSession, TaskService taskService, JBPMConfiguration configuration, Exchange exchange) {
- Task task = taskService.getTaskById(safe(getTaskId(configuration, exchange)));
+ void execute(KieServicesClient kieServicesClient, JBPMConfiguration configuration, Exchange exchange) {
+ UserTaskServicesClient taskClient = kieServicesClient.getServicesClient(UserTaskServicesClient.class);
+ TaskInstance task = taskClient.findTaskById(safe(getTaskId(configuration, exchange)));
setResult(exchange, task);
}
}, getTaskContent {
@Override
- void execute(KieSession kieSession, TaskService taskService, JBPMConfiguration configuration, Exchange exchange) {
- Map<String, Object> taskContent = taskService.getTaskContent(safe(getTaskId(configuration, exchange)));
- setResult(exchange, taskContent);
+ void execute(KieServicesClient kieServicesClient, JBPMConfiguration configuration, Exchange exchange) {
+ UserTaskServicesClient taskClient = kieServicesClient.getServicesClient(UserTaskServicesClient.class);
+ Map<String, Object> content = taskClient.getTaskOutputContentByTaskId(configuration.getDeploymentId(), safe(getTaskId(configuration, exchange)));
+ setResult(exchange, content);
}
}, getTasksByProcessInstance {
@Override
- void execute(KieSession kieSession, TaskService taskService, JBPMConfiguration configuration, Exchange exchange) {
- List<Long> processInstanceIds = taskService.getTasksByProcessInstanceId(safe(getProcessInstanceId(configuration, exchange)));
+ void execute(KieServicesClient kieServicesClient, JBPMConfiguration configuration, Exchange exchange) {
+ UserTaskServicesClient taskClient = kieServicesClient.getServicesClient(UserTaskServicesClient.class);
+ List<TaskSummary> processInstanceIds = taskClient.findTasksByStatusByProcessInstanceId(safe(getProcessInstanceId(configuration, exchange)), Collections.emptyList(),
+ getPage(configuration, exchange), getPageSize(configuration, exchange));
setResult(exchange, processInstanceIds);
}
}, getTasksByStatusByProcessInstance {
@Override
- void execute(KieSession kieSession, TaskService taskService, JBPMConfiguration configuration, Exchange exchange) {
- List<TaskSummary> taskSummaryList = taskService.getTasksByStatusByProcessInstanceId(
+ void execute(KieServicesClient kieServicesClient, JBPMConfiguration configuration, Exchange exchange) {
+ UserTaskServicesClient taskClient = kieServicesClient.getServicesClient(UserTaskServicesClient.class);
+ List<TaskSummary> taskSummaryList = taskClient.findTasksByStatusByProcessInstanceId(
safe(getProcessInstanceId(configuration, exchange)), getStatuses(configuration, exchange),
- getLanguage(configuration, exchange));
+ getPage(configuration, exchange), getPageSize(configuration, exchange));
setResult(exchange, taskSummaryList);
}
}, getTasksOwned {
@Override
- void execute(KieSession kieSession, TaskService taskService, JBPMConfiguration configuration, Exchange exchange) {
- List<TaskSummary> summaryList = taskService.getTasksOwned(getUserId(configuration, exchange), getLanguage(configuration, exchange));
+ void execute(KieServicesClient kieServicesClient, JBPMConfiguration configuration, Exchange exchange) {
+ UserTaskServicesClient taskClient = kieServicesClient.getServicesClient(UserTaskServicesClient.class);
+ List<TaskSummary> summaryList = taskClient.findTasksOwned(getUserId(configuration, exchange), getPage(configuration, exchange), getPageSize(configuration, exchange));
setResult(exchange, summaryList);
}
}, nominateTask {
@Override
- void execute(KieSession kieSession, TaskService taskService, JBPMConfiguration configuration, Exchange exchange) {
- taskService.nominate(safe(getTaskId(configuration, exchange)), getUserId(configuration, exchange), getEntities(configuration, exchange));
+ void execute(KieServicesClient kieServicesClient, JBPMConfiguration configuration, Exchange exchange) {
+ UserTaskServicesClient taskClient = kieServicesClient.getServicesClient(UserTaskServicesClient.class);
+ taskClient.nominateTask(configuration.getDeploymentId(), safe(getTaskId(configuration, exchange)), getUserId(configuration, exchange), getEntities(configuration, exchange));
}
}, releaseTask {
@Override
- void execute(KieSession kieSession, TaskService taskService, JBPMConfiguration configuration, Exchange exchange) {
- taskService.release(safe(getTaskId(configuration, exchange)), getUserId(configuration, exchange));
+ void execute(KieServicesClient kieServicesClient, JBPMConfiguration configuration, Exchange exchange) {
+ UserTaskServicesClient taskClient = kieServicesClient.getServicesClient(UserTaskServicesClient.class);
+ taskClient.releaseTask(configuration.getDeploymentId(), safe(getTaskId(configuration, exchange)), getUserId(configuration, exchange));
}
}, resumeTask {
@Override
- void execute(KieSession kieSession, TaskService taskService, JBPMConfiguration configuration, Exchange exchange) {
- taskService.resume(safe(getTaskId(configuration, exchange)), getUserId(configuration, exchange));
+ void execute(KieServicesClient kieServicesClient, JBPMConfiguration configuration, Exchange exchange) {
+ UserTaskServicesClient taskClient = kieServicesClient.getServicesClient(UserTaskServicesClient.class);
+ taskClient.resumeTask(configuration.getDeploymentId(), safe(getTaskId(configuration, exchange)), getUserId(configuration, exchange));
}
}, skipTask {
@Override
- void execute(KieSession kieSession, TaskService taskService, JBPMConfiguration configuration, Exchange exchange) {
- taskService.skip(safe(getTaskId(configuration, exchange)), getUserId(configuration, exchange));
+ void execute(KieServicesClient kieServicesClient, JBPMConfiguration configuration, Exchange exchange) {
+ UserTaskServicesClient taskClient = kieServicesClient.getServicesClient(UserTaskServicesClient.class);
+ taskClient.skipTask(configuration.getDeploymentId(), safe(getTaskId(configuration, exchange)), getUserId(configuration, exchange));
}
}, startTask {
@Override
- void execute(KieSession kieSession, TaskService taskService, JBPMConfiguration configuration, Exchange exchange) {
- taskService.start(safe(getTaskId(configuration, exchange)), getUserId(configuration, exchange));
+ void execute(KieServicesClient kieServicesClient, JBPMConfiguration configuration, Exchange exchange) {
+ UserTaskServicesClient taskClient = kieServicesClient.getServicesClient(UserTaskServicesClient.class);
+ taskClient.startTask(configuration.getDeploymentId(), safe(getTaskId(configuration, exchange)), getUserId(configuration, exchange));
}
}, stopTask {
@Override
- void execute(KieSession kieSession, TaskService taskService, JBPMConfiguration configuration, Exchange exchange) {
- taskService.stop(safe(getTaskId(configuration, exchange)), getUserId(configuration, exchange));
+ void execute(KieServicesClient kieServicesClient, JBPMConfiguration configuration, Exchange exchange) {
+ UserTaskServicesClient taskClient = kieServicesClient.getServicesClient(UserTaskServicesClient.class);
+ taskClient.stopTask(configuration.getDeploymentId(), safe(getTaskId(configuration, exchange)), getUserId(configuration, exchange));
}
}, suspendTask {
@Override
- void execute(KieSession kieSession, TaskService taskService, JBPMConfiguration configuration, Exchange exchange) {
- taskService.suspend(safe(getTaskId(configuration, exchange)), getUserId(configuration, exchange));
+ void execute(KieServicesClient kieServicesClient, JBPMConfiguration configuration, Exchange exchange) {
+ UserTaskServicesClient taskClient = kieServicesClient.getServicesClient(UserTaskServicesClient.class);
+ taskClient.suspendTask(configuration.getDeploymentId(), safe(getTaskId(configuration, exchange)), getUserId(configuration, exchange));
}
};
- List<Status> getStatuses(JBPMConfiguration configuration, Exchange exchange) {
- List<Status> statusList = exchange.getIn().getHeader(JBPMConstants.STATUS_LIST, List.class);
+ List<String> getStatuses(JBPMConfiguration configuration, Exchange exchange) {
+ List<String> statusList = exchange.getIn().getHeader(JBPMConstants.STATUS_LIST, List.class);
if (statusList == null) {
statusList = configuration.getStatuses();
}
return statusList;
}
- List<OrganizationalEntity> getEntities(JBPMConfiguration configuration, Exchange exchange) {
- List<OrganizationalEntity> entityList = exchange.getIn().getHeader(JBPMConstants.ENTITY_LIST, List.class);
+ List<String> getEntities(JBPMConfiguration configuration, Exchange exchange) {
+ List<String> entityList = exchange.getIn().getHeader(JBPMConstants.ENTITY_LIST, List.class);
if (entityList == null) {
entityList = configuration.getEntities();
}
@@ -350,12 +375,20 @@ public class JBPMProducer extends DefaultProducer {
return userId;
}
- String getLanguage(JBPMConfiguration configuration, Exchange exchange) {
- String language = exchange.getIn().getHeader(JBPMConstants.LANGUAGE, String.class);
- if (language == null) {
- language = configuration.getLanguage();
+ Integer getPage(JBPMConfiguration configuration, Exchange exchange) {
+ Integer page = exchange.getIn().getHeader(JBPMConstants.RESULT_PAGE, Integer.class);
+ if (page == null) {
+ page = configuration.getPage();
+ }
+ return page;
+ }
+
+ Integer getPageSize(JBPMConfiguration configuration, Exchange exchange) {
+ Integer pageSize = exchange.getIn().getHeader(JBPMConstants.RESULT_PAGE_SIZE, Integer.class);
+ if (pageSize == null) {
+ pageSize = configuration.getPageSize();
}
- return language;
+ return pageSize;
}
Task getTask(JBPMConfiguration configuration, Exchange exchange) {
@@ -466,7 +499,7 @@ public class JBPMProducer extends DefaultProducer {
getResultMessage(exchange).setBody(result);
}
- abstract void execute(KieSession kieSession, TaskService taskService, JBPMConfiguration configuration, Exchange exchange);
+ abstract void execute(KieServicesClient kieServicesClient, JBPMConfiguration configuration, Exchange exchange);
}
}
diff --git a/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/emitters/CamelEventEmitter.java b/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/emitters/CamelEventEmitter.java
new file mode 100644
index 0000000..0886466
--- /dev/null
+++ b/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/emitters/CamelEventEmitter.java
@@ -0,0 +1,75 @@
+/**
+ * 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.
+ */
+
+package org.apache.camel.component.jbpm.emitters;
+
+import java.util.Collection;
+
+import org.apache.camel.component.jbpm.JBPMConsumer;
+import org.jbpm.persistence.api.integration.EventCollection;
+import org.jbpm.persistence.api.integration.EventEmitter;
+import org.jbpm.persistence.api.integration.InstanceView;
+import org.jbpm.persistence.api.integration.base.BaseEventCollection;
+
+public class CamelEventEmitter implements EventEmitter {
+
+ private JBPMConsumer consumer;
+ private boolean sendItems;
+
+ public CamelEventEmitter(JBPMConsumer consumer, boolean sendItems) {
+ this.consumer = consumer;
+ this.sendItems = sendItems;
+ }
+
+ @Override
+ public void deliver(Collection<InstanceView<?>> data) {
+ // no-op
+
+ }
+
+ @Override
+ public void apply(Collection<InstanceView<?>> data) {
+ if (consumer == null || data.isEmpty()) {
+ return;
+ }
+
+ if (sendItems) {
+
+ data.forEach(item -> consumer.sendMessage("Emitter", item));
+ } else {
+
+ consumer.sendMessage("Emitter", data);
+ }
+ }
+
+ @Override
+ public void drop(Collection<InstanceView<?>> data) {
+ // no-op
+
+ }
+
+ @Override
+ public EventCollection newCollection() {
+ return new BaseEventCollection();
+ }
+
+ @Override
+ public void close() {
+
+ }
+
+}
diff --git a/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/emitters/ServiceRegistryBoundEventEmitter.java b/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/emitters/ServiceRegistryBoundEventEmitter.java
new file mode 100644
index 0000000..c531aa7
--- /dev/null
+++ b/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/emitters/ServiceRegistryBoundEventEmitter.java
@@ -0,0 +1,62 @@
+/**
+ * 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.
+ */
+
+package org.apache.camel.component.jbpm.emitters;
+
+import java.util.Collection;
+
+import org.jbpm.persistence.api.integration.EventCollection;
+import org.jbpm.persistence.api.integration.EventEmitter;
+import org.jbpm.persistence.api.integration.InstanceView;
+import org.jbpm.services.api.service.ServiceRegistry;
+
+public class ServiceRegistryBoundEventEmitter implements EventEmitter {
+
+ private EventEmitter delegate;
+
+ public ServiceRegistryBoundEventEmitter() {
+ this.delegate = (EventEmitter) ServiceRegistry.get().service("CamelEventEmitter");
+ }
+
+ @Override
+ public void deliver(Collection<InstanceView<?>> data) {
+ delegate.deliver(data);
+
+ }
+
+ @Override
+ public void apply(Collection<InstanceView<?>> data) {
+ delegate.apply(data);
+ }
+
+ @Override
+ public void drop(Collection<InstanceView<?>> data) {
+ delegate.drop(data);
+
+ }
+
+ @Override
+ public EventCollection newCollection() {
+ return delegate.newCollection();
+ }
+
+ @Override
+ public void close() {
+
+ }
+
+}
diff --git a/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/listeners/CamelCaseEventListener.java b/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/listeners/CamelCaseEventListener.java
new file mode 100644
index 0000000..4906b5b
--- /dev/null
+++ b/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/listeners/CamelCaseEventListener.java
@@ -0,0 +1,286 @@
+/**
+ * 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.
+ */
+
+package org.apache.camel.component.jbpm.listeners;
+
+import java.util.LinkedHashSet;
+import java.util.Set;
+
+import org.apache.camel.component.jbpm.JBPMCamelConsumerAware;
+import org.apache.camel.component.jbpm.JBPMConsumer;
+import org.jbpm.casemgmt.api.event.CaseCancelEvent;
+import org.jbpm.casemgmt.api.event.CaseCloseEvent;
+import org.jbpm.casemgmt.api.event.CaseCommentEvent;
+import org.jbpm.casemgmt.api.event.CaseDataEvent;
+import org.jbpm.casemgmt.api.event.CaseDestroyEvent;
+import org.jbpm.casemgmt.api.event.CaseDynamicSubprocessEvent;
+import org.jbpm.casemgmt.api.event.CaseDynamicTaskEvent;
+import org.jbpm.casemgmt.api.event.CaseEventListener;
+import org.jbpm.casemgmt.api.event.CaseReopenEvent;
+import org.jbpm.casemgmt.api.event.CaseRoleAssignmentEvent;
+import org.jbpm.casemgmt.api.event.CaseStartEvent;
+import org.kie.internal.runtime.Cacheable;
+
+
+public class CamelCaseEventListener implements CaseEventListener, Cacheable, JBPMCamelConsumerAware {
+
+ private Set<JBPMConsumer> consumers = new LinkedHashSet<>();
+
+ @Override
+ public void beforeCaseStarted(CaseStartEvent event) {
+ if (consumers.isEmpty()) {
+ return;
+ }
+ sendMessage("beforeCaseStarted", event);
+ }
+
+ @Override
+ public void afterCaseStarted(CaseStartEvent event) {
+ if (consumers.isEmpty()) {
+ return;
+ }
+ sendMessage("afterCaseStarted", event);
+ }
+
+ @Override
+ public void beforeCaseClosed(CaseCloseEvent event) {
+ if (consumers.isEmpty()) {
+ return;
+ }
+ sendMessage("beforeCaseClosed", event);
+ }
+
+ @Override
+ public void afterCaseClosed(CaseCloseEvent event) {
+ if (consumers.isEmpty()) {
+ return;
+ }
+ sendMessage("afterCaseClosed", event);
+ }
+
+ @Override
+ public void beforeCaseCancelled(CaseCancelEvent event) {
+ if (consumers.isEmpty()) {
+ return;
+ }
+ sendMessage("beforeCaseCancelled", event);
+ }
+
+ @Override
+ public void afterCaseCancelled(CaseCancelEvent event) {
+ if (consumers.isEmpty()) {
+ return;
+ }
+ sendMessage("afterCaseCancelled", event);
+ }
+
+ @Override
+ public void beforeCaseDestroyed(CaseDestroyEvent event) {
+ if (consumers.isEmpty()) {
+ return;
+ }
+ sendMessage("beforeCaseDestroyed", event);
+ }
+
+ @Override
+ public void afterCaseDestroyed(CaseDestroyEvent event) {
+ if (consumers.isEmpty()) {
+ return;
+ }
+ sendMessage("afterCaseDestroyed", event);
+ }
+
+ @Override
+ public void beforeCaseReopen(CaseReopenEvent event) {
+ if (consumers.isEmpty()) {
+ return;
+ }
+ sendMessage("beforeCaseReopen", event);
+ }
+
+ @Override
+ public void afterCaseReopen(CaseReopenEvent event) {
+ if (consumers.isEmpty()) {
+ return;
+ }
+ sendMessage("afterCaseReopen", event);
+ }
+
+ @Override
+ public void beforeCaseCommentAdded(CaseCommentEvent event) {
+ if (consumers.isEmpty()) {
+ return;
+ }
+ sendMessage("beforeCaseCommentAdded", event);
+ }
+
+ @Override
+ public void afterCaseCommentAdded(CaseCommentEvent event) {
+ if (consumers.isEmpty()) {
+ return;
+ }
+ sendMessage("afterCaseCommentAdded", event);
+ }
+
+ @Override
+ public void beforeCaseCommentUpdated(CaseCommentEvent event) {
+ if (consumers.isEmpty()) {
+ return;
+ }
+ sendMessage("beforeCaseCommentUpdated", event);
+ }
+
+ @Override
+ public void afterCaseCommentUpdated(CaseCommentEvent event) {
+ if (consumers.isEmpty()) {
+ return;
+ }
+ sendMessage("afterCaseCommentUpdated", event);
+ }
+
+ @Override
+ public void beforeCaseCommentRemoved(CaseCommentEvent event) {
+ if (consumers.isEmpty()) {
+ return;
+ }
+ sendMessage("beforeCaseCommentRemoved", event);
+ }
+
+ @Override
+ public void afterCaseCommentRemoved(CaseCommentEvent event) {
+ if (consumers.isEmpty()) {
+ return;
+ }
+ sendMessage("afterCaseCommentRemoved", event);
+ }
+
+ @Override
+ public void beforeCaseRoleAssignmentAdded(CaseRoleAssignmentEvent event) {
+ if (consumers.isEmpty()) {
+ return;
+ }
+ sendMessage("beforeCaseRoleAssignmentAdded", event);
+ }
+
+ @Override
+ public void afterCaseRoleAssignmentAdded(CaseRoleAssignmentEvent event) {
+ if (consumers.isEmpty()) {
+ return;
+ }
+ sendMessage("afterCaseRoleAssignmentAdded", event);
+ }
+
+ @Override
+ public void beforeCaseRoleAssignmentRemoved(CaseRoleAssignmentEvent event) {
+ if (consumers.isEmpty()) {
+ return;
+ }
+ sendMessage("beforeCaseRoleAssignmentRemoved", event);
+ }
+
+ @Override
+ public void afterCaseRoleAssignmentRemoved(CaseRoleAssignmentEvent event) {
+ if (consumers.isEmpty()) {
+ return;
+ }
+ sendMessage("afterCaseRoleAssignmentRemoved", event);
+ }
+
+ @Override
+ public void beforeCaseDataAdded(CaseDataEvent event) {
+ if (consumers.isEmpty()) {
+ return;
+ }
+ sendMessage("beforeCaseDataAdded", event);
+ }
+
+ @Override
+ public void afterCaseDataAdded(CaseDataEvent event) {
+ if (consumers.isEmpty()) {
+ return;
+ }
+ sendMessage("afterCaseDataAdded", event);
+ }
+
+ @Override
+ public void beforeCaseDataRemoved(CaseDataEvent event) {
+ if (consumers.isEmpty()) {
+ return;
+ }
+ sendMessage("beforeCaseDataRemoved", event);
+ }
+
+ @Override
+ public void afterCaseDataRemoved(CaseDataEvent event) {
+ if (consumers.isEmpty()) {
+ return;
+ }
+ sendMessage("afterCaseDataRemoved", event);
+ }
+
+ @Override
+ public void beforeDynamicTaskAdded(CaseDynamicTaskEvent event) {
+ if (consumers.isEmpty()) {
+ return;
+ }
+ sendMessage("beforeDynamicTaskAdded", event);
+ }
+
+ @Override
+ public void afterDynamicTaskAdded(CaseDynamicTaskEvent event) {
+ if (consumers.isEmpty()) {
+ return;
+ }
+ sendMessage("afterDynamicTaskAdded", event);
+ }
+
+ @Override
+ public void beforeDynamicProcessAdded(CaseDynamicSubprocessEvent event) {
+ if (consumers.isEmpty()) {
+ return;
+ }
+ sendMessage("beforeDynamicProcessAdded", event);
+ }
+
+ @Override
+ public void afterDynamicProcessAdded(CaseDynamicSubprocessEvent event) {
+ if (consumers.isEmpty()) {
+ return;
+ }
+ sendMessage("afterDynamicProcessAdded", event);
+ }
+
+ @Override
+ public void close() {
+
+ }
+
+ @Override
+ public void addConsumer(JBPMConsumer consumer) {
+ this.consumers.add(consumer);
+ }
+
+ @Override
+ public void removeConsumer(JBPMConsumer consumer) {
+ this.consumers.remove(consumer);
+ }
+
+ protected void sendMessage(String eventType, Object event) {
+ this.consumers.stream().filter(c -> c.getStatus().isStarted()).forEach(c -> c.sendMessage(eventType, event));
+ }
+
+}
diff --git a/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/listeners/CamelProcessEventListener.java b/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/listeners/CamelProcessEventListener.java
new file mode 100644
index 0000000..2e6ff08
--- /dev/null
+++ b/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/listeners/CamelProcessEventListener.java
@@ -0,0 +1,138 @@
+/**
+ * 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.
+ */
+
+package org.apache.camel.component.jbpm.listeners;
+
+import java.util.LinkedHashSet;
+import java.util.Set;
+
+import org.apache.camel.component.jbpm.JBPMCamelConsumerAware;
+import org.apache.camel.component.jbpm.JBPMConsumer;
+import org.kie.api.event.process.ProcessCompletedEvent;
+import org.kie.api.event.process.ProcessEventListener;
+import org.kie.api.event.process.ProcessNodeLeftEvent;
+import org.kie.api.event.process.ProcessNodeTriggeredEvent;
+import org.kie.api.event.process.ProcessStartedEvent;
+import org.kie.api.event.process.ProcessVariableChangedEvent;
+import org.kie.internal.runtime.Cacheable;
+
+
+public class CamelProcessEventListener implements ProcessEventListener, Cacheable, JBPMCamelConsumerAware {
+
+ private Set<JBPMConsumer> consumers = new LinkedHashSet<>();
+
+ @Override
+ public void beforeProcessStarted(ProcessStartedEvent event) {
+ if (consumers.isEmpty()) {
+ return;
+ }
+
+ sendMessage("beforeProcessStarted", event);
+ }
+
+ @Override
+ public void afterProcessStarted(ProcessStartedEvent event) {
+ if (consumers.isEmpty()) {
+ return;
+ }
+
+ sendMessage("afterProcessStarted", event);
+ }
+
+ @Override
+ public void beforeProcessCompleted(ProcessCompletedEvent event) {
+ if (consumers.isEmpty()) {
+ return;
+ }
+ sendMessage("beforeProcessCompleted", event);
+ }
+
+ @Override
+ public void afterProcessCompleted(ProcessCompletedEvent event) {
+ if (consumers.isEmpty()) {
+ return;
+ }
+ sendMessage("afterProcessCompleted", event);
+ }
+
+ @Override
+ public void beforeNodeTriggered(ProcessNodeTriggeredEvent event) {
+ if (consumers.isEmpty()) {
+ return;
+ }
+ sendMessage("beforeNodeTriggered", event);
+ }
+
+ @Override
+ public void afterNodeTriggered(ProcessNodeTriggeredEvent event) {
+ if (consumers.isEmpty()) {
+ return;
+ }
+ sendMessage("afterNodeTriggered", event);
+ }
+
+ @Override
+ public void beforeNodeLeft(ProcessNodeLeftEvent event) {
+ if (consumers.isEmpty()) {
+ return;
+ }
+ sendMessage("beforeNodeLeft", event);
+ }
+
+ @Override
+ public void afterNodeLeft(ProcessNodeLeftEvent event) {
+ if (consumers.isEmpty()) {
+ return;
+ }
+ sendMessage("afterNodeLeft", event);
+ }
+
+ @Override
+ public void beforeVariableChanged(ProcessVariableChangedEvent event) {
+ if (consumers.isEmpty()) {
+ return;
+ }
+ sendMessage("beforeVariableChanged", event);
+ }
+
+ @Override
+ public void afterVariableChanged(ProcessVariableChangedEvent event) {
+ if (consumers.isEmpty()) {
+ return;
+ }
+ sendMessage("afterVariableChanged", event);
+ }
+
+ @Override
+ public void close() {
+
+ }
+
+ @Override
+ public void addConsumer(JBPMConsumer consumer) {
+ this.consumers.add(consumer);
+ }
+
+ @Override
+ public void removeConsumer(JBPMConsumer consumer) {
+ this.consumers.remove(consumer);
+ }
+
+ protected void sendMessage(String eventType, Object event) {
+ this.consumers.stream().filter(c -> c.getStatus().isStarted()).forEach(c -> c.sendMessage(eventType, event));
+ }
+}
diff --git a/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/listeners/CamelTaskEventListener.java b/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/listeners/CamelTaskEventListener.java
new file mode 100644
index 0000000..67a93b7
--- /dev/null
+++ b/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/listeners/CamelTaskEventListener.java
@@ -0,0 +1,321 @@
+/**
+ * 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.
+ */
+
+package org.apache.camel.component.jbpm.listeners;
+
+import java.util.LinkedHashSet;
+import java.util.Set;
+
+import org.apache.camel.component.jbpm.JBPMCamelConsumerAware;
+import org.apache.camel.component.jbpm.JBPMConsumer;
+import org.kie.api.task.TaskEvent;
+import org.kie.api.task.TaskLifeCycleEventListener;
+import org.kie.internal.runtime.Cacheable;
+
+
+public class CamelTaskEventListener implements Cacheable, TaskLifeCycleEventListener, JBPMCamelConsumerAware {
+
+ private Set<JBPMConsumer> consumers = new LinkedHashSet<>();
+
+ @Override
+ public void beforeTaskActivatedEvent(TaskEvent event) {
+ if (consumers.isEmpty()) {
+ return;
+ }
+ sendMessage("beforeTaskActivatedEvent", event);
+ }
+
+ @Override
+ public void beforeTaskClaimedEvent(TaskEvent event) {
+ if (consumers.isEmpty()) {
+ return;
+ }
+ sendMessage("beforeTaskClaimedEvent", event);
+ }
+
+ @Override
+ public void beforeTaskSkippedEvent(TaskEvent event) {
+ if (consumers.isEmpty()) {
+ return;
+ }
+ sendMessage("beforeTaskSkippedEvent", event);
+ }
+
+ @Override
+ public void beforeTaskStartedEvent(TaskEvent event) {
+ if (consumers.isEmpty()) {
+ return;
+ }
+ sendMessage("beforeTaskStartedEvent", event);
+
+ }
+
+ @Override
+ public void beforeTaskStoppedEvent(TaskEvent event) {
+ if (consumers.isEmpty()) {
+ return;
+ }
+ sendMessage("beforeTaskStoppedEvent", event);
+
+ }
+
+ @Override
+ public void beforeTaskCompletedEvent(TaskEvent event) {
+ if (consumers.isEmpty()) {
+ return;
+ }
+ sendMessage("beforeTaskCompletedEvent", event);
+
+ }
+
+ @Override
+ public void beforeTaskFailedEvent(TaskEvent event) {
+ if (consumers.isEmpty()) {
+ return;
+ }
+ sendMessage("beforeTaskFailedEvent", event);
+
+ }
+
+ @Override
+ public void beforeTaskAddedEvent(TaskEvent event) {
+ if (consumers.isEmpty()) {
+ return;
+ }
+ sendMessage("beforeTaskAddedEvent", event);
+
+ }
+
+ @Override
+ public void beforeTaskExitedEvent(TaskEvent event) {
+ if (consumers.isEmpty()) {
+ return;
+ }
+ sendMessage("beforeTaskExitedEvent", event);
+
+ }
+
+ @Override
+ public void beforeTaskReleasedEvent(TaskEvent event) {
+ if (consumers.isEmpty()) {
+ return;
+ }
+ sendMessage("beforeTaskReleasedEvent", event);
+
+ }
+
+ @Override
+ public void beforeTaskResumedEvent(TaskEvent event) {
+ if (consumers.isEmpty()) {
+ return;
+ }
+ sendMessage("beforeTaskResumedEvent", event);
+
+ }
+
+ @Override
+ public void beforeTaskSuspendedEvent(TaskEvent event) {
+ if (consumers.isEmpty()) {
+ return;
+ }
+ sendMessage("beforeTaskSuspendedEvent", event);
+
+ }
+
+ @Override
+ public void beforeTaskForwardedEvent(TaskEvent event) {
+ if (consumers.isEmpty()) {
+ return;
+ }
+ sendMessage("beforeTaskForwardedEvent", event);
+
+ }
+
+ @Override
+ public void beforeTaskDelegatedEvent(TaskEvent event) {
+ if (consumers.isEmpty()) {
+ return;
+ }
+ sendMessage("beforeTaskDelegatedEvent", event);
+
+ }
+
+ @Override
+ public void beforeTaskNominatedEvent(TaskEvent event) {
+ if (consumers.isEmpty()) {
+ return;
+ }
+ sendMessage("beforeTaskNominatedEvent", event);
+
+ }
+
+ @Override
+ public void afterTaskActivatedEvent(TaskEvent event) {
+ if (consumers.isEmpty()) {
+ return;
+ }
+ sendMessage("afterTaskActivatedEvent", event);
+
+ }
+
+ @Override
+ public void afterTaskClaimedEvent(TaskEvent event) {
+ if (consumers.isEmpty()) {
+ return;
+ }
+ sendMessage("afterTaskClaimedEvent", event);
+
+ }
+
+ @Override
+ public void afterTaskSkippedEvent(TaskEvent event) {
+ if (consumers.isEmpty()) {
+ return;
+ }
+ sendMessage("afterTaskSkippedEvent", event);
+
+ }
+
+ @Override
+ public void afterTaskStartedEvent(TaskEvent event) {
+ if (consumers.isEmpty()) {
+ return;
+ }
+ sendMessage("afterTaskStartedEvent", event);
+
+ }
+
+ @Override
+ public void afterTaskStoppedEvent(TaskEvent event) {
+ if (consumers.isEmpty()) {
+ return;
+ }
+ sendMessage("afterTaskStoppedEvent", event);
+
+ }
+
+ @Override
+ public void afterTaskCompletedEvent(TaskEvent event) {
+ if (consumers.isEmpty()) {
+ return;
+ }
+ sendMessage("afterTaskCompletedEvent", event);
+
+ }
+
+ @Override
+ public void afterTaskFailedEvent(TaskEvent event) {
+ if (consumers.isEmpty()) {
+ return;
+ }
+ sendMessage("afterTaskFailedEvent", event);
+
+ }
+
+ @Override
+ public void afterTaskAddedEvent(TaskEvent event) {
+ if (consumers.isEmpty()) {
+ return;
+ }
+ sendMessage("afterTaskAddedEvent", event);
+
+ }
+
+ @Override
+ public void afterTaskExitedEvent(TaskEvent event) {
+ if (consumers.isEmpty()) {
+ return;
+ }
+ sendMessage("afterTaskExitedEvent", event);
+
+ }
+
+ @Override
+ public void afterTaskReleasedEvent(TaskEvent event) {
+ if (consumers.isEmpty()) {
+ return;
+ }
+ sendMessage("afterTaskReleasedEvent", event);
+
+ }
+
+ @Override
+ public void afterTaskResumedEvent(TaskEvent event) {
+ if (consumers.isEmpty()) {
+ return;
+ }
+ sendMessage("afterTaskResumedEvent", event);
+
+ }
+
+ @Override
+ public void afterTaskSuspendedEvent(TaskEvent event) {
+ if (consumers.isEmpty()) {
+ return;
+ }
+ sendMessage("afterTaskSuspendedEvent", event);
+
+ }
+
+ @Override
+ public void afterTaskForwardedEvent(TaskEvent event) {
+ if (consumers.isEmpty()) {
+ return;
+ }
+ sendMessage("afterTaskForwardedEvent", event);
+
+ }
+
+ @Override
+ public void afterTaskDelegatedEvent(TaskEvent event) {
+ if (consumers.isEmpty()) {
+ return;
+ }
+ sendMessage("afterTaskDelegatedEvent", event);
+
+ }
+
+ @Override
+ public void afterTaskNominatedEvent(TaskEvent event) {
+ if (consumers.isEmpty()) {
+ return;
+ }
+ sendMessage("afterTaskNominatedEvent", event);
+
+ }
+
+ @Override
+ public void close() {
+
+ }
+
+ @Override
+ public void addConsumer(JBPMConsumer consumer) {
+ this.consumers.add(consumer);
+ }
+
+ @Override
+ public void removeConsumer(JBPMConsumer consumer) {
+ this.consumers.remove(consumer);
+ }
+
+ protected void sendMessage(String eventType, Object event) {
+ this.consumers.stream().filter(c -> c.getStatus().isStarted()).forEach(c -> c.sendMessage(eventType, event));
+ }
+
+
+}
diff --git a/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/server/CamelKieServerExtension.java b/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/server/CamelKieServerExtension.java
new file mode 100644
index 0000000..3a8a0ea
--- /dev/null
+++ b/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/server/CamelKieServerExtension.java
@@ -0,0 +1,225 @@
+/**
+ * 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.
+ */
+
+package org.apache.camel.component.jbpm.server;
+
+import java.io.InputStream;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.camel.impl.DefaultCamelContext;
+import org.apache.camel.model.FromDefinition;
+import org.apache.camel.model.RouteDefinition;
+import org.apache.camel.model.RoutesDefinition;
+import org.jbpm.services.api.service.ServiceRegistry;
+import org.kie.server.services.api.KieContainerInstance;
+import org.kie.server.services.api.KieServerExtension;
+import org.kie.server.services.api.KieServerRegistry;
+import org.kie.server.services.api.SupportedTransports;
+import org.kie.server.services.impl.KieServerImpl;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+public class CamelKieServerExtension implements KieServerExtension {
+ public static final String EXTENSION_NAME = "Camel";
+
+ private static final Logger logger = LoggerFactory.getLogger(CamelKieServerExtension.class);
+
+ private static final Boolean disabled = Boolean.parseBoolean(System.getProperty("org.camel.server.ext.disabled", "false"));
+
+ protected DefaultCamelContext camel;
+
+ protected boolean managedCamel;
+
+ protected Map<String, DefaultCamelContext> camelContexts = new HashMap<>();
+
+ public CamelKieServerExtension() {
+ this.managedCamel = true;
+ }
+
+ public CamelKieServerExtension(DefaultCamelContext camel) {
+ this.camel = camel;
+ this.managedCamel = false;
+ }
+
+ @Override
+ public boolean isInitialized() {
+ return camel != null;
+ }
+
+ @Override
+ public boolean isActive() {
+ return disabled == false;
+ }
+
+ @Override
+ public void init(KieServerImpl kieServer, KieServerRegistry registry) {
+ if (this.managedCamel && this.camel == null) {
+ this.camel = new DefaultCamelContext();
+ this.camel.setName("KIE Server Camel context");
+
+ try (InputStream is = this.getClass().getResourceAsStream("/global-camel-routes.xml")) {
+ if (is != null) {
+
+ RoutesDefinition routes = camel.loadRoutesDefinition(is);
+ camel.addRouteDefinitions(routes.getRoutes());
+ }
+ } catch (Exception e) {
+ logger.error("Error while adding Camel context for KIE Server", e);
+ }
+ }
+
+ ServiceRegistry.get().register("GlobalCamelService", this.camel);
+ }
+
+ @Override
+ public void destroy(KieServerImpl kieServer, KieServerRegistry registry) {
+ ServiceRegistry.get().remove("GlobalCamelService");
+
+ if (this.managedCamel && this.camel != null) {
+ try {
+ this.camel.stop();
+ } catch (Exception e) {
+ logger.error("Failed at stopping KIE Server extension {}", EXTENSION_NAME);
+ }
+ }
+ }
+
+ @Override
+ public void createContainer(String id, KieContainerInstance kieContainerInstance, Map<String, Object> parameters) {
+
+ ClassLoader classloader = kieContainerInstance.getKieContainer().getClassLoader();
+ try (InputStream is = classloader.getResourceAsStream("camel-routes.xml")) {
+ if (is != null) {
+
+ DefaultCamelContext context = new DefaultCamelContext();
+ context.setName("KIE Server Camel context for container " + kieContainerInstance.getContainerId());
+
+ RoutesDefinition routes = context.loadRoutesDefinition(is);
+ annotateKJarRoutes(routes, id);
+ context.addRouteDefinitions(routes.getRoutes());
+ context.start();
+ camelContexts.put(id, context);
+
+ ServiceRegistry.get().register(id + "_CamelService", this.camel);
+
+ }
+ } catch (Exception e) {
+ logger.error("Error while adding Camel context for {}", kieContainerInstance.getContainerId(), e);
+ }
+ }
+
+ @Override
+ public void updateContainer(String id, KieContainerInstance kieContainerInstance, Map<String, Object> parameters) {
+ disposeContainer(id, kieContainerInstance, parameters);
+ createContainer(id, kieContainerInstance, parameters);
+ }
+
+ @Override
+ public boolean isUpdateContainerAllowed(String id, KieContainerInstance kieContainerInstance, Map<String, Object> parameters) {
+ return true;
+ }
+
+ @Override
+ public void disposeContainer(String id, KieContainerInstance kieContainerInstance, Map<String, Object> parameters) {
+ DefaultCamelContext context = camelContexts.get(id);
+
+ if (context != null) {
+
+ ServiceRegistry.get().remove(id + "_CamelService");
+ try {
+ context.stop();
+ } catch (Exception e) {
+ logger.error("Error while removing Camel context for container {}", id, e);
+ }
+ }
+ }
+
+ @Override
+ public List<Object> getAppComponents(SupportedTransports type) {
+ return Collections.emptyList();
+ }
+
+ @Override
+ public <T> T getAppComponents(Class<T> serviceType) {
+ return null;
+ }
+
+ @Override
+ public String getImplementedCapability() {
+ return "Integration";
+ }
+
+ @Override
+ public List<Object> getServices() {
+ return Collections.emptyList();
+ }
+
+ @Override
+ public String getExtensionName() {
+ return EXTENSION_NAME;
+ }
+
+ @Override
+ public Integer getStartOrder() {
+ return 50;
+ }
+
+ @Override
+ public void serverStarted() {
+ if (this.managedCamel && this.camel != null && !this.camel.isStarted()) {
+ try {
+ this.camel.start();
+ } catch (Exception e) {
+ logger.error("Failed at start Camel context", e);
+ }
+ }
+ }
+
+ @Override
+ public String toString() {
+ return EXTENSION_NAME + " KIE Server extension";
+ }
+
+ protected void annotateKJarRoutes(RoutesDefinition routes, String deploymentId) {
+ for (RouteDefinition route : routes.getRoutes()) {
+
+ for (FromDefinition from : route.getInputs()) {
+
+ if (from.getUri().startsWith("jbpm:events") && !from.getUri().contains("deploymentId")) {
+ StringBuilder uri = new StringBuilder(from.getUri());
+
+ String[] split = from.getUri().split("\\?");
+ if (split.length == 1) {
+ // no query given
+ uri.append("?");
+ } else {
+ // already query params exist
+ uri.append("&");
+ }
+ uri.append("deploymentId=").append(deploymentId);
+ from.setUri(uri.toString());
+ }
+
+ System.out.println(from.getUri());
+ }
+ }
+ }
+}
diff --git a/components/camel-jbpm/src/main/resources/META-INF/services/org.kie.server.services.api.KieServerExtension b/components/camel-jbpm/src/main/resources/META-INF/services/org.kie.server.services.api.KieServerExtension
new file mode 100644
index 0000000..a3aed9f
--- /dev/null
+++ b/components/camel-jbpm/src/main/resources/META-INF/services/org.kie.server.services.api.KieServerExtension
@@ -0,0 +1 @@
+org.apache.camel.component.jbpm.server.CamelKieServerExtension
\ No newline at end of file
diff --git a/components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/JBPMComponentIntegrationTest.java b/components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/JBPMComponentIntegrationTest.java
index 987b0a6..18e1055 100644
--- a/components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/JBPMComponentIntegrationTest.java
+++ b/components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/JBPMComponentIntegrationTest.java
@@ -17,21 +17,74 @@
package org.apache.camel.component.jbpm;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.jbpm.JBPMProducer.Operation;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Ignore;
import org.junit.Test;
+import org.kie.server.api.model.instance.TaskSummary;
-@Ignore("This is an integration test that needs BPMS running on the local machine")
+/**
+ * To run this example you need jBPM to run locally, easiest is to use single zip
+ * distribution - download from jbpm.org
+ *
+ * Next, start it and import Evaluation sample project, build and deploy.
+ * Once done this test can be ran out of the box.
+ */
+@Ignore("This is an integration test that needs jBPM running on the local machine")
public class JBPMComponentIntegrationTest extends CamelTestSupport {
+ @SuppressWarnings("unchecked")
@Test
public void interactsOverRest() throws Exception {
getMockEndpoint("mock:result").expectedMessageCount(1);
- template.sendBodyAndHeader("direct:start", null, JBPMConstants.PROCESS_ID, "project1.integration-test");
+
+ // let's start process instance for evaluation process
+ Map<String, Object> params = new HashMap<>();
+ params.put("employee", "wbadmin");
+ params.put("reason", "Camel asks for it");
+
+ Map<String, Object> headers = new HashMap<>();
+ headers.put(JBPMConstants.PROCESS_ID, "evaluation");
+ headers.put(JBPMConstants.PARAMETERS, params);
+
+ template.sendBodyAndHeaders("direct:start", null, headers);
+ assertMockEndpointsSatisfied();
+ Long processInstanceId = (Long) getMockEndpoint("mock:result").getExchanges().get(0).getIn().getBody();
+ assertNotNull(processInstanceId);
+
+ // now let's collect user tasks
+ headers = new HashMap<>();
+ headers.put(JBPMConstants.OPERATION, JBPMConstants.OPERATION + Operation.getTasksOwned);
+
+ template.sendBodyAndHeaders("direct:start", null, headers);
+ getMockEndpoint("mock:result").expectedMessageCount(2);
+ assertMockEndpointsSatisfied();
+
+ List<TaskSummary> tasks = (List<TaskSummary>) getMockEndpoint("mock:result").getExchanges().get(1).getIn().getBody();
+ assertEquals(1, tasks.size());
+
+ // let's complete first user task
+ headers = new HashMap<>();
+ headers.put(JBPMConstants.TASK_ID, tasks.get(0).getId());
+ headers.put(JBPMConstants.OPERATION, JBPMConstants.OPERATION + Operation.completeTask);
+
+ template.sendBodyAndHeaders("direct:start", null, headers);
+ getMockEndpoint("mock:result").expectedMessageCount(3);
+ assertMockEndpointsSatisfied();
+
+ // lastly let's abort process instance we just created
+ headers = new HashMap<>();
+ headers.put(JBPMConstants.PROCESS_INSTANCE_ID, processInstanceId);
+ headers.put(JBPMConstants.OPERATION, JBPMConstants.OPERATION + Operation.abortProcessInstance);
+
+ template.sendBodyAndHeaders("direct:start", null, headers);
+ getMockEndpoint("mock:result").expectedMessageCount(4);
assertMockEndpointsSatisfied();
-
- assertNotNull(getMockEndpoint("mock:result").getExchanges().get(0).getIn().getBody());
}
@Override
@@ -40,8 +93,8 @@ public class JBPMComponentIntegrationTest extends CamelTestSupport {
@Override
public void configure() {
from("direct:start")
- .to("jbpm:http://localhost:8080/business-central?userName=bpmsAdmin&password=pa$word1"
- + "&deploymentId=org.kie.example:project1:1.0.0-SNAPSHOT")
+ .to("jbpm:http://localhost:8080/kie-server/services/rest/server?userName=wbadmin&password=wbadmin"
+ + "&deploymentId=evaluation")
.to("mock:result");
}
};
diff --git a/parent/pom.xml b/parent/pom.xml
index 33c7461..fb3cf63 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -360,7 +360,7 @@
<javax.ws.rs-api-version>2.0.1</javax.ws.rs-api-version>
<jaxb-bundle-version>2.2.11_1</jaxb-bundle-version>
<jaxen-version>1.1.6</jaxen-version>
- <jbpm-version>6.5.0.Final</jbpm-version>
+ <jbpm-version>7.14.0.Final</jbpm-version>
<jboss-javaee-6-version>1.0.0.Final</jboss-javaee-6-version>
<jboss-logging-version>3.3.2.Final</jboss-logging-version>
<jboss-marshalling-version>1.4.10.Final</jboss-marshalling-version>
diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml
index 51a9988..0b6cb7d 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -1149,27 +1149,41 @@
<details>The camel-jbpm feature can only run on a SUN JVM. You need to add the package com.sun.tools.xjc to the java platform packages in the etc/jre.properties file.</details>
<feature version='${project.version}'>camel-core</feature>
<feature>transaction</feature>
- <bundle dependency='true'>mvn:org.openengsb.wrapped/com.google.protobuf/2.4.1.w1</bundle>
- <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.javax-inject/${javax-inject-bundle-version}</bundle>
- <bundle dependency='true'>mvn:org.codehaus.jackson/jackson-jaxrs/${jackson-version}</bundle>
- <bundle dependency='true'>mvn:org.codehaus.jackson/jackson-core-asl/${jackson-version}</bundle>
- <bundle dependency='true'>mvn:org.codehaus.jackson/jackson-mapper-asl/${jackson-version}</bundle>
- <bundle dependency='true'>mvn:org.codehaus.jackson/jackson-xc/${jackson-version}</bundle>
- <bundle dependency='true'>mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo-jms-spec-version}</bundle>
- <bundle dependency='true'>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxws-api-2.2/${servicemix-specs-version}</bundle>
+ <feature version='${cxf-version-range}'>cxf-jaxrs</feature>
+ <bundle dependency='true'>mvn:org.kie.server/kie-server-api/${jbpm-version}</bundle>
+ <bundle dependency='true'>mvn:org.kie.server/kie-server-common/${jbpm-version}</bundle>
+ <bundle dependency='true'>mvn:org.kie.server/kie-server-client/${jbpm-version}</bundle>
+ <bundle dependency='true'>mvn:org.kie.soup/kie-soup-maven-support/${jbpm-version}</bundle>
+ <bundle dependency='true'>mvn:org.kie.soup/kie-soup-project-datamodel-api/${jbpm-version}</bundle>
+ <bundle dependency='true'>mvn:org.kie.soup/kie-soup-project-datamodel-commons/${jbpm-version}</bundle>
+ <bundle dependency='true'>mvn:org.kie.soup/kie-soup-commons/${jbpm-version}</bundle>
+ <bundle dependency='true'>mvn:org.kie/kie-api/${jbpm-version}</bundle>
+ <bundle dependency='true'>mvn:org.kie/kie-internal/${jbpm-version}</bundle>
<bundle dependency='true'>mvn:org.drools/drools-core/${jbpm-version}</bundle>
<bundle dependency='true'>mvn:org.drools/drools-compiler/${jbpm-version}</bundle>
- <bundle dependency='true'>wrap:mvn:org.kie/kie-internal/${jbpm-version}</bundle>
- <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xstream-java8/${xstream-bundle-version}</bundle>
+ <bundle dependency='true'>mvn:org.mvel/mvel2/${mvel-version}</bundle>
+ <bundle dependency='true'>mvn:org.kie/kie-dmn-model/${jbpm-version}</bundle>
+ <bundle dependency='true'>mvn:org.kie/kie-dmn-api/${jbpm-version}</bundle>
+ <bundle dependency='true'>mvn:org.optaplanner/optaplanner-core/${jbpm-version}</bundle>
+ <bundle dependency='true'>mvn:org.optaplanner/optaplanner-persistence-common/${jbpm-version}</bundle>
+ <bundle dependency='true'>mvn:org.optaplanner/optaplanner-persistence-jaxb/${jbpm-version}</bundle>
+ <bundle dependency='true'>mvn:org.optaplanner/optaplanner-persistence-jackson/${jbpm-version}</bundle>
+ <bundle dependency='true'>mvn:org.optaplanner/optaplanner-persistence-xstream/${jbpm-version}</bundle>
+ <bundle dependency='true'>mvn:com.google.protobuf/protobuf-java/${protobuf-version}</bundle>
+ <bundle dependency='true'>mvn:com.google.guava/guava/${google-guava-version}</bundle>
+ <bundle dependency='true'>mvn:org.apache.commons/commons-math3/${commons-math3-version}</bundle>
+ <bundle dependency='true'>mvn:org.apache.commons/commons-lang3/${commons-lang3-version}</bundle>
<bundle dependency='true'>mvn:commons-codec/commons-codec/${commons-codec-version}</bundle>
- <bundle dependency='true'>mvn:org.mvel/mvel2/${mvel-version}</bundle>
- <bundle dependency='true'>wrap:mvn:org.kie/kie-api/${jbpm-version}</bundle>
- <bundle dependency='true'>wrap:mvn:org.kie.remote/kie-remote-common/${jbpm-version}</bundle>
- <bundle dependency='true'>wrap:mvn:org.kie.remote.ws/kie-remote-ws-common/${jbpm-version}</bundle>
- <bundle dependency='true'>wrap:mvn:org.kie.remote/kie-remote-jaxb/${jbpm-version}</bundle>
- <bundle dependency='true'>wrap:mvn:org.kie.remote/kie-services-client/6.1.0.Final</bundle>
- <bundle dependency='true'>wrap:mvn:org.kie.remote/kie-remote-client/${jbpm-version}</bundle>
- <bundle>mvn:org.apache.camel/camel-jbpm/${project.version}</bundle>
+ <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson2-version}</bundle>
+ <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-core/${jackson2-version}</bundle>
+ <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-databind/${jackson2-version}</bundle>
+ <bundle dependency='true'>mvn:com.fasterxml.jackson.module/jackson-module-jaxb-annotations/${jackson2-version}</bundle>
+ <bundle dependency='true'>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxws-api-2.2/${servicemix-specs-version}</bundle>
+ <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xstream-java8/${xstream-bundle-version}</bundle>
+ <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xpp3/${xpp3-bundle-version}</bundle>
+ <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.reflections/${reflections-bundle-version}</bundle>
+ <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jaxb-xjc/${jaxb-bundle-version}</bundle>
+ <bundle>mvn:org.apache.camel/camel-jbpm/${project.version}</bundle>
</feature>
<feature name='camel-jcache' version='${project.version}' resolver='(obr)' start-level='50'>
<feature version='${project.version}'>camel-core</feature>
[camel] 10/16: Upgrade Joda Time to version 2.10.1
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch sandbox/camel-3.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 6d418af414f1481413a0826b53efb625e336cb43
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Tue Nov 13 12:22:26 2018 +0100
Upgrade Joda Time to version 2.10.1
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 7820d23..d70e18d 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -396,7 +396,7 @@
<jira-rest-client-api-version>2.0.0-m30</jira-rest-client-api-version>
<jmh-version>1.21</jmh-version>
<jodatime-bundle-version>1.6.2</jodatime-bundle-version>
- <jodatime2-bundle-version>2.10</jodatime2-bundle-version>
+ <jodatime2-bundle-version>2.10.1</jodatime2-bundle-version>
<jolokia-version>1.6.0</jolokia-version>
<jolt-version>0.1.1</jolt-version>
<jolt-bundle-version>0.1.1_1</jolt-bundle-version>
[camel] 04/16: Update Groovy to version 2.5.4
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch sandbox/camel-3.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 31f1a7dca6d36f135f6c55f889abd97a41629b25
Author: Pascal Schumacher <pa...@gmx.net>
AuthorDate: Mon Nov 12 20:39:44 2018 +0100
Update Groovy to version 2.5.4
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index a2e2278..8db58e4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -63,7 +63,7 @@
<errorprone-version>2.5</errorprone-version>
<mycila-license-version>3.0</mycila-license-version>
<gmavenplus-plugin-version>1.6.2</gmavenplus-plugin-version>
- <groovy-version>2.5.3</groovy-version>
+ <groovy-version>2.5.4</groovy-version>
</properties>
<mailingLists>
[camel] 02/16: renamed apiProperties to apiProperty in
camel-core/src/main/docs/rest-dsl.adoc fix CAMEL-12929 (#2608)
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch sandbox/camel-3.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 65aeebfea2042b428910b225c33f3bc6d6cab2c5
Author: Andrea Tarocchi <an...@gmail.com>
AuthorDate: Mon Nov 12 15:58:11 2018 +0100
renamed apiProperties to apiProperty in camel-core/src/main/docs/rest-dsl.adoc fix CAMEL-12929 (#2608)
---
camel-core/src/main/docs/rest-dsl.adoc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/camel-core/src/main/docs/rest-dsl.adoc b/camel-core/src/main/docs/rest-dsl.adoc
index 570cdc0..b5e4fce 100644
--- a/camel-core/src/main/docs/rest-dsl.adoc
+++ b/camel-core/src/main/docs/rest-dsl.adoc
@@ -585,7 +585,7 @@ whether the Content-Type and Accept headers from
A key without a prefix is a common key for all situations.
From Camel 2.17: the options value can use the # notation to refer to a bean to lookup in the Registry
-|apiProperties | -|Sets additional options on api level.
+|apiProperty | -|Sets additional options on api level.
|corsHeaders | -|Allows to configure custom CORS headers.
|===
[camel] 13/16: Added languages.adoc to Summary
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch sandbox/camel-3.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 9c219bbbb849d23276d8d42f1a60718ae5a904ab
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Tue Nov 13 15:27:45 2018 +0100
Added languages.adoc to Summary
---
docs/user-manual/en/SUMMARY.md | 2 +-
docs/user-manual/en/languages.adoc | 5 ++---
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/docs/user-manual/en/SUMMARY.md b/docs/user-manual/en/SUMMARY.md
index b88bab5..2a893dc 100644
--- a/docs/user-manual/en/SUMMARY.md
+++ b/docs/user-manual/en/SUMMARY.md
@@ -102,7 +102,7 @@
* [Injector](injector.adoc)
* [Intercept](intercept.adoc)
* [Inversion of Control with Smart Defaults](inversion-of-control-with-smart-defaults.adoc)
-* Languages
+* [Languages](languages.adoc)
* [Lifecycle](lifecycle.adoc)
* [OnCompletion](oncompletion.adoc)
* Pluggable Class Resolvers
diff --git a/docs/user-manual/en/languages.adoc b/docs/user-manual/en/languages.adoc
index 453e4ae..34a7188 100644
--- a/docs/user-manual/en/languages.adoc
+++ b/docs/user-manual/en/languages.adoc
@@ -8,9 +8,8 @@ link:expression.adoc[Expression] or link:predicate.adoc[Predicate]
within either the link:dsl.adoc[Routing Domain Specific Language] or the
link:xml-configuration.adoc[XML Configuration].
-[NOTE]
-====
-**Combining Predicates**
+==== Note
+*Combining Predicates**
When creating predicates (expressions that evaluate to `true` or
`false`), you can combine several predicates -- regardless of the
[camel] 03/16: Explicited the servlet-api dependency version
brought by spring-boot-starter-undertow so that its no more overridden by
camel-parent
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch sandbox/camel-3.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit d5344de23dda48da891f656c73df8ca09c836d9d
Author: aldettinger <al...@gmail.com>
AuthorDate: Mon Nov 12 20:19:56 2018 +0100
Explicited the servlet-api dependency version brought by spring-boot-starter-undertow so that its no more overridden by camel-parent
---
examples/camel-example-rest-producer/pom.xml | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/examples/camel-example-rest-producer/pom.xml b/examples/camel-example-rest-producer/pom.xml
index 753bee3..2591351 100644
--- a/examples/camel-example-rest-producer/pom.xml
+++ b/examples/camel-example-rest-producer/pom.xml
@@ -58,6 +58,11 @@
<type>pom</type>
<scope>import</scope>
</dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>javax.servlet-api</artifactId>
+ <version>4.0.1</version>
+ </dependency>
</dependencies>
</dependencyManagement>