buildbot success in on camel-site-production
The Buildbot has detected a restored build on builder camel-site-production while building . Full details are available at: https://ci.apache.org/builders/camel-site-production/builds/33942 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: bb-cms-slave Build Reason: The Nightly scheduler named 'camel-site-production' triggered this build Build Source Stamp: [branch camel/website] HEAD Blamelist: Build succeeded! Sincerely, -The Buildbot
buildbot failure in on camel-site-production
The Buildbot has detected a new failure on builder camel-site-production while building . Full details are available at: https://ci.apache.org/builders/camel-site-production/builds/33941 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: bb-cms-slave Build Reason: The Nightly scheduler named 'camel-site-production' triggered this build Build Source Stamp: [branch camel/website] HEAD Blamelist: BUILD FAILED: failed compile Sincerely, -The Buildbot
buildbot success in on camel-site-production
The Buildbot has detected a restored build on builder camel-site-production while building . Full details are available at: https://ci.apache.org/builders/camel-site-production/builds/33933 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: bb-cms-slave Build Reason: The Nightly scheduler named 'camel-site-production' triggered this build Build Source Stamp: [branch camel/website] HEAD Blamelist: Build succeeded! Sincerely, -The Buildbot
buildbot failure in on camel-site-production
The Buildbot has detected a new failure on builder camel-site-production while building . Full details are available at: https://ci.apache.org/builders/camel-site-production/builds/33932 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: bb-cms-slave Build Reason: The Nightly scheduler named 'camel-site-production' triggered this build Build Source Stamp: [branch camel/website] HEAD Blamelist: BUILD FAILED: failed compile Sincerely, -The Buildbot
[camel] 02/02: Camel-Example-big-xml: updated docs
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git commit 4f70831ad8969077ec65a977c48be004cff5ceaf Author: Andrea Cosentino AuthorDate: Fri May 17 17:16:07 2019 +0200 Camel-Example-big-xml: updated docs --- examples/camel-example-bigxml-split/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/camel-example-bigxml-split/README.md b/examples/camel-example-bigxml-split/README.md index f5b35dd..45d0453 100644 --- a/examples/camel-example-bigxml-split/README.md +++ b/examples/camel-example-bigxml-split/README.md @@ -36,7 +36,7 @@ There are also a number of optional runtime settings: ### Build and run The test XML file is built once beforehand using `@BeforeClass`. ```sh -mvn clean test +mvn clean test -DskipTests=false ``` ### Test results
[camel] branch master updated (caea601 -> 4f70831)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel.git. from caea601 Camel-Soroush: Cleaned up docs a bit new 95e8288 Camel-Example-big-xml: Lets skip tests new 4f70831 Camel-Example-big-xml: updated docs The 2 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: examples/camel-example-bigxml-split/README.md | 2 +- examples/camel-example-bigxml-split/pom.xml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-)
[camel] 01/02: Camel-Example-big-xml: Lets skip tests
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git commit 95e8288a9196c40063fe2f7494ea6b4517d7860b Author: Andrea Cosentino AuthorDate: Fri May 17 17:15:40 2019 +0200 Camel-Example-big-xml: Lets skip tests --- examples/camel-example-bigxml-split/pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/examples/camel-example-bigxml-split/pom.xml b/examples/camel-example-bigxml-split/pom.xml index d5c04dd..d07987a 100644 --- a/examples/camel-example-bigxml-split/pom.xml +++ b/examples/camel-example-bigxml-split/pom.xml @@ -39,6 +39,7 @@ 1.8 UTF-8 UTF-8 +true
[camel] branch master updated: Camel-Soroush: Cleaned up docs a bit
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new caea601 Camel-Soroush: Cleaned up docs a bit
caea601 is described below
commit caea601309c3491a57c8994bbfc631eecbc948ea
Author: Andrea Cosentino
AuthorDate: Fri May 17 17:10:49 2019 +0200
Camel-Soroush: Cleaned up docs a bit
---
.../camel-soroush/src/main/docs/soroush-component.adoc | 14 +++---
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/components/camel-soroush/src/main/docs/soroush-component.adoc
b/components/camel-soroush/src/main/docs/soroush-component.adoc
index 7ab7eea..6909fb1 100644
--- a/components/camel-soroush/src/main/docs/soroush-component.adoc
+++ b/components/camel-soroush/src/main/docs/soroush-component.adoc
@@ -143,7 +143,7 @@ The component supports 3 options, which are listed below.
// spring-boot-auto-configure options: END
-=== Usage
+### Usage
Every exchange that you send to soroush endpoint must contain a
body of type `org.apache.camel.component.soroushbot.models.MessageModel`.
@@ -155,7 +155,7 @@ of `MessageModel` too.
SoroushMessage message = exchange.getIn().getBody(SoroushMessage.class)
- Receive Message
+ Receive Message
With this endpoint you can receive messages from users.
The following is a basic example of how to receive all messages that your
Soroush users are sending to the configured Bot.
@@ -177,7 +177,7 @@ and in Spring XML
- Download File
+ Download File
This endpoint is useful when you want to conditionally download the files
specified in the message.
When you send a message to this endpoint it opens a connection to Soroush
Server
for downloading the files and store `InputStream` of that connection in
@@ -203,7 +203,7 @@ from("soroush:getMessage/YourAuthorizationToken")
.bean(ProcessorBean.class)
-
- Send Message
+ Send Message
This endpoint is your primary way to send messages and upload files. You can
simply
send a message to a user by sending the message to this endpoint.
@@ -234,7 +234,7 @@ SoroushMessage.setThumbnail(InputStream thumbnailStream)
-
- Upload File
+ Upload File
This endpoint is a utility endpoint that allows you to upload a file without
sending the message.
The only thing you need to do for uploading a file is to set
`SoroushMessage.file` and `Send Message.thumbnail`
and this endpoint upload them to the Soroush server.
@@ -251,7 +251,7 @@ from("soroush:getMessage/YourAuthorizationToken")
.process(exchage->System.out.println(exchange.getIn().getBody(SoroushMessage.class).getFileUrl())
-
-=== Error Handling
+ Error Handling
There are 3 types of exceptions that can be produced in Soroush Component.
[width="100%",cols="2,5",options="header"]
|===
@@ -277,4 +277,4 @@ One way to handle these exceptions is by using
`onException` route definition:
onException(CongestionException.class).log("Failed to processing ${id}")
-
-_Developed and supported by https://www.mohaymen.ir[Mohaymen ICT]_
+_Donated by https://www.mohaymen.ir[Mohaymen ICT] to ASF_
[camel] branch master updated (d1b8ce1 -> 722a99a)
This is an automated email from the ASF dual-hosted git repository. gnodet pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel.git. from d1b8ce1 CAMEL-13390 - Fixed CS in the example new 6ca9d79 [CAMEL-13511] Use AbstractCamelContext instead of AbstractModelCamelContext new 7d0dc0b CAMEL-13528 - fix remaining textual references to spoolChiper new 722a99a [CAMEL-13371] Make xml and jaxb more optional in camel-base / camel-core The 3 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: apache-camel/pom.xml | 5 + apache-camel/src/main/descriptors/common-bin.xml | 1 + bom/camel-bom/pom.xml | 10 ++ .../blueprint/handler/CamelNamespaceHandler.java | 5 +- .../component/cxf/util/SplitterWithXqureyTest.java | 2 +- .../camel-jaxp/src/main/schema/xtokenize.json | 22 +++ ...XQueryHeaderNameResultTypeAndNamespaceTest.java | 2 +- .../saxon/XQueryWithNamespacesFilterTest.java | 2 +- .../spring/handler/CamelNamespaceHandler.java | 5 +- .../spring/LifecycleStrategyInjectionTest.java | 2 +- .../MultipleLifecycleStrategyInjectionTest.java| 2 +- .../apache/camel/swagger/RestSwaggerSupport.java | 2 +- components/camel-validator/pom.xml | 4 + components/camel-xpath/pom.xml | 5 +- .../language/xpath/MessageVariableResolver.java| 10 +- .../apache/camel/language/xpath/XPathBuilder.java | 12 +- components/camel-xslt/pom.xml | 4 + components/readme.adoc | 4 +- .../camel/impl/engine/AbstractCamelContext.java| 29 +++- .../apache/camel/impl/engine/BaseRouteService.java | 52 +++ .../impl/engine}/DefaultTransformerRegistry.java | 23 +-- .../impl/engine}/DefaultValidatorRegistry.java | 22 +-- .../impl/engine/RestRegistryFactoryResolver.java | 3 +- core/camel-core/pom.xml| 30 +++- core/camel-core/readme.adoc| 4 +- .../org/apache/camel/builder/BuilderSupport.java | 2 +- .../apache/camel/builder/ExpressionBuilder.java| 51 ++- .../org/apache/camel/builder/ExpressionClause.java | 2 +- .../camel/builder/ExpressionClauseSupport.java | 2 +- .../org/apache/camel/builder/ValueBuilder.java | 6 +- .../camel/impl/AbstractModelCamelContext.java | 32 +++- .../org/apache/camel/impl/DefaultCamelContext.java | 5 +- .../java/org/apache/camel/impl/DefaultModel.java | 7 +- .../apache/camel/impl/ReloadStrategySupport.java | 2 +- .../java/org/apache/camel/impl/RouteService.java | 8 +- .../java/org/apache/camel/model/ModelHelper.java | 2 +- .../model/language/XMLTokenizerExpression.java | 3 +- .../org/apache/camel/reifier/RouteReifier.java | 6 +- .../builder/xml/DefaultNamespaceContextTest.java | 2 +- .../builder/xml/ExtractXPathWithNamespaceTest.java | 2 +- .../XPathHeaderNameResultTypeAndNamespaceTest.java | 2 +- .../builder/xml/XPathNamespaceResultTypeTest.java | 2 +- .../camel/builder/xml/XPathNamespaceTest.java | 2 +- .../builder/xml/XPathNestedNamespaceTest.java | 2 +- .../org/apache/camel/builder/xml/XPathTest.java| 2 +- .../xml/XPathWithNamespacesFromDomTest.java| 5 +- .../camel/impl/MultipleLifecycleStrategyTest.java | 2 +- .../apache/camel/language/XMLTokenSplitTest.java | 2 +- .../tokenizer/XMLTokenizeLanguageGroupingTest.java | 2 +- .../XMLTokenizeLanguageStreamingFileTest.java | 2 +- .../XMLTokenizeLanguageStreamingTest.java | 2 +- .../tokenizer/XMLTokenizeLanguageTest.java | 2 +- .../XMLTokenizeWrapLanguageGroupingTest.java | 2 +- .../tokenizer/XMLTokenizeWrapLanguageTest.java | 2 +- .../processor/SplitGroupMultiXmlTokenTest.java | 2 +- .../SplitGroupWrappedMultiXmlTokenTest.java| 2 +- .../camel/processor/SplitterWithXqureyTest.java| 2 +- ...ithNamespaceBuilderFilterAndResultTypeTest.java | 2 +- .../XPathWithNamespaceBuilderFilterTest.java | 2 +- .../processor/XPathWithNamespacesFilterTest.java | 2 +- .../camel/util/DumpModelAsXmlNamespaceTest.java| 2 +- core/camel-jaxp/pom.xml| 167 + .../src/main/docs/xtokenize-language.adoc | 0 .../apache/camel/converter/jaxp/DomConverter.java | 0 .../apache/camel/converter/jaxp/StaxConverter.java | 0 .../converter/jaxp/StreamSourceConverter.java | 0 .../apache/camel/converter/jaxp/XMLReaderPool.java | 0 .../converter/jaxp/XMLStreamReaderInputStream.java | 0 .../converter/jaxp/XMLStreamReaderReader.java | 0
[camel] 02/03: CAMEL-13528 - fix remaining textual references to spoolChiper
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 7d0dc0bb365347da5d4358b7bfa3d03b280a583c
Author: Guillaume Nodet
AuthorDate: Thu May 16 22:35:30 2019 +0200
CAMEL-13528 - fix remaining textual references to spoolChiper
---
docs/user-manual/modules/ROOT/pages/stream-caching.adoc | 4 ++--
.../org/apache/camel/commands/AbstractLocalCamelController.java | 2 +-
.../src/main/java/org/apache/camel/commands/ContextInfoCommand.java | 6 +++---
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/docs/user-manual/modules/ROOT/pages/stream-caching.adoc
b/docs/user-manual/modules/ROOT/pages/stream-caching.adoc
index 39dd7e4..9cc3bee 100644
--- a/docs/user-manual/modules/ROOT/pages/stream-caching.adoc
+++ b/docs/user-manual/modules/ROOT/pages/stream-caching.adoc
@@ -208,7 +208,7 @@ The strategy has the following options:
| spoolDirectory | ${java.io.tmpdir}/camel/camel-tmp-\#uuid#
| Base directory where temporary files for spooled streams should be stored.
This option supports naming patterns as documented below.
-| spoolChiper | null
+| spoolCipher | null
| If set, the temporary files are encrypted using the specified cipher
transformation (i.e., a valid stream or 8-bit cipher name such as "RC4",
"AES/CTR/NoPadding". An empty name "" is treated as null).
| spoolThreshold | 128 KB
@@ -275,7 +275,7 @@
context.getStreamCachingStrategy().setSpoolDirectory"/tmp/cachedir");
context.getStreamCachingStrategy().setSpoolThreshold(64 * 1024);
context.getStreamCachingStrategy().setBufferSize(16 * 1024);
// to enable encryption using RC4
-// context.getStreamCachingStrategy().setSpoolChiper("RC4");
+// context.getStreamCachingStrategy().setSpoolCipher("RC4");
And remember to enable Stream caching on the CamelContext or on routes:
diff --git
a/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/AbstractLocalCamelController.java
b/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/AbstractLocalCamelController.java
index cadb52b..69050fa 100644
---
a/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/AbstractLocalCamelController.java
+++
b/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/AbstractLocalCamelController.java
@@ -132,7 +132,7 @@ public abstract class AbstractLocalCamelController extends
AbstractCamelControll
if (context.getStreamCachingStrategy().isEnabled()) {
answer.put("streamCachingEnabled", true);
answer.put("streamCaching.spoolDirectory",
context.getStreamCachingStrategy().getSpoolDirectory());
-answer.put("streamCaching.spoolChiper",
context.getStreamCachingStrategy().getSpoolCipher());
+answer.put("streamCaching.spoolCipher",
context.getStreamCachingStrategy().getSpoolCipher());
answer.put("streamCaching.spoolThreshold",
context.getStreamCachingStrategy().getSpoolThreshold());
answer.put("streamCaching.spoolUsedHeapMemoryThreshold",
context.getStreamCachingStrategy().getSpoolUsedHeapMemoryThreshold());
answer.put("streamCaching.spoolUsedHeapMemoryLimit",
context.getStreamCachingStrategy().getSpoolUsedHeapMemoryLimit());
diff --git
a/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/ContextInfoCommand.java
b/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/ContextInfoCommand.java
index a96dc7f..0666e03 100644
---
a/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/ContextInfoCommand.java
+++
b/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/ContextInfoCommand.java
@@ -137,7 +137,7 @@ public class ContextInfoCommand extends
AbstractContextCommand {
enabled = (boolean) row.get("streamCachingEnabled");
if (enabled) {
Object spoolDirectory =
safeNull(row.get("streamCaching.spoolDirectory"));
-Object spoolChiper =
safeNull(row.get("streamCaching.spoolChiper"));
+Object spoolCipher =
safeNull(row.get("streamCaching.spoolCipher"));
Object spoolThreshold =
safeNull(row.get("streamCaching.spoolThreshold"));
Object spoolUsedHeapMemoryThreshold =
safeNull(row.get("streamCaching.spoolUsedHeapMemoryThreshold"));
Object spoolUsedHeapMemoryLimit =
safeNull(row.get("streamCaching.spoolUsedHeapMemoryLimit"));
@@ -146,9 +146,9 @@ public class ContextInfoCommand extends
AbstractContextCommand {
Object removeSpoolDirectoryWhenStopping =
safeNull(row.get("streamCaching.removeSpoolDirectoryWhenStopping"));
boolean statisticsEnabled = (boolean)
row.get("streamCaching.statisticsEnabled");
-String text = String.format("\tStream caching:
[camel] 01/03: [CAMEL-13511] Use AbstractCamelContext instead of AbstractModelCamelContext
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 6ca9d79ee8da5d7e73c85647cf83c6ac60ff43fd
Author: Guillaume Nodet
AuthorDate: Tue May 14 10:51:30 2019 +0200
[CAMEL-13511] Use AbstractCamelContext instead of AbstractModelCamelContext
---
core/camel-core/src/main/java/org/apache/camel/impl/DefaultModel.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git
a/core/camel-core/src/main/java/org/apache/camel/impl/DefaultModel.java
b/core/camel-core/src/main/java/org/apache/camel/impl/DefaultModel.java
index ceee483..7b506d5 100644
--- a/core/camel-core/src/main/java/org/apache/camel/impl/DefaultModel.java
+++ b/core/camel-core/src/main/java/org/apache/camel/impl/DefaultModel.java
@@ -29,6 +29,7 @@ import java.util.concurrent.ConcurrentHashMap;
import org.apache.camel.CamelContext;
import org.apache.camel.FailedToStartRouteException;
import org.apache.camel.Route;
+import org.apache.camel.impl.engine.AbstractCamelContext;
import org.apache.camel.model.DataFormatDefinition;
import org.apache.camel.model.HystrixConfigurationDefinition;
import org.apache.camel.model.Model;
@@ -287,7 +288,7 @@ public class DefaultModel implements Model {
// indicate we are staring the route using this thread so
// we are able to query this if needed
-AbstractModelCamelContext mcc =
camelContext.adapt(AbstractModelCamelContext.class);
+AbstractCamelContext mcc =
camelContext.adapt(AbstractCamelContext.class);
mcc.setStartingRoutes(true);
try {
[camel] 02/03: CAMEL-13390 - Use project.version and not deprecated version in the example
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 241f97f4c1472f08b1d9a9296519a3f5c92f6958
Author: Andrea Cosentino
AuthorDate: Fri May 17 14:27:18 2019 +0200
CAMEL-13390 - Use project.version and not deprecated version in the example
---
examples/camel-example-jira/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/examples/camel-example-jira/pom.xml
b/examples/camel-example-jira/pom.xml
index 4573613..aae6cd5 100644
--- a/examples/camel-example-jira/pom.xml
+++ b/examples/camel-example-jira/pom.xml
@@ -50,7 +50,7 @@
org.apache.camel
camel-spring-boot-dependencies
-${version}
+${project.version}
pom
import
[camel] 01/03: CAMEL-13390 - Added explicit version for spring-boot-maven-plugin in the example
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit f5c1a16eead916a85552ea6465fb9fcd660d33f7
Author: Andrea Cosentino
AuthorDate: Fri May 17 14:24:26 2019 +0200
CAMEL-13390 - Added explicit version for spring-boot-maven-plugin in the
example
---
examples/camel-example-jira/pom.xml | 1 +
1 file changed, 1 insertion(+)
diff --git a/examples/camel-example-jira/pom.xml
b/examples/camel-example-jira/pom.xml
index 9077e8e..4573613 100644
--- a/examples/camel-example-jira/pom.xml
+++ b/examples/camel-example-jira/pom.xml
@@ -106,6 +106,7 @@
org.springframework.boot
spring-boot-maven-plugin
+${spring-boot-version}
[camel] branch master updated (98e3430 -> d1b8ce1)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel.git. from 98e3430 CAMEL-13390 - Added the atlassian public repository to the example too new f5c1a16 CAMEL-13390 - Added explicit version for spring-boot-maven-plugin in the example new 241f97f CAMEL-13390 - Use project.version and not deprecated version in the example new d1b8ce1 CAMEL-13390 - Fixed CS in the example The 3 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: examples/camel-example-jira/pom.xml| 3 ++- .../main/java/org/apache/camel/example/jira/AddIssueRoute.java | 8 .../java/org/apache/camel/example/jira/AttachFileRoute.java| 8 .../java/org/apache/camel/example/jira/NewCommentsRoute.java | 10 +- 4 files changed, 15 insertions(+), 14 deletions(-)
[camel] 03/03: CAMEL-13390 - Fixed CS in the example
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit d1b8ce10f97c19c1b400c1ece1aa045099046f5c
Author: Andrea Cosentino
AuthorDate: Fri May 17 14:31:53 2019 +0200
CAMEL-13390 - Fixed CS in the example
---
.../main/java/org/apache/camel/example/jira/AddIssueRoute.java | 8
.../java/org/apache/camel/example/jira/AttachFileRoute.java| 8
.../java/org/apache/camel/example/jira/NewCommentsRoute.java | 10 +-
3 files changed, 13 insertions(+), 13 deletions(-)
diff --git
a/examples/camel-example-jira/src/main/java/org/apache/camel/example/jira/AddIssueRoute.java
b/examples/camel-example-jira/src/main/java/org/apache/camel/example/jira/AddIssueRoute.java
index a0cb672..f7a0b94 100644
---
a/examples/camel-example-jira/src/main/java/org/apache/camel/example/jira/AddIssueRoute.java
+++
b/examples/camel-example-jira/src/main/java/org/apache/camel/example/jira/AddIssueRoute.java
@@ -1,4 +1,4 @@
-/**
+/*
* 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.
@@ -6,7 +6,7 @@
* (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
+ * 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,
@@ -31,12 +31,12 @@ import static
org.apache.camel.component.jira.JiraConstants.ISSUE_TYPE_NAME;
@Component
public class AddIssueRoute extends RouteBuilder {
-private static final Logger logger =
LoggerFactory.getLogger(AddIssueRoute.class);
+private static final Logger LOG =
LoggerFactory.getLogger(AddIssueRoute.class);
@Override
public void configure() {
-logger.info(" > jira example - add new issue");
+LOG.info(" > jira example - add new issue");
// change the fields accordinly to your target jira server
from("timer://foo?fixedRate=true=5")
.setHeader(ISSUE_PROJECT_KEY, () -> "COM")
diff --git
a/examples/camel-example-jira/src/main/java/org/apache/camel/example/jira/AttachFileRoute.java
b/examples/camel-example-jira/src/main/java/org/apache/camel/example/jira/AttachFileRoute.java
index 7e3df09..2b0ad52 100644
---
a/examples/camel-example-jira/src/main/java/org/apache/camel/example/jira/AttachFileRoute.java
+++
b/examples/camel-example-jira/src/main/java/org/apache/camel/example/jira/AttachFileRoute.java
@@ -1,4 +1,4 @@
-/**
+/*
* 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.
@@ -6,7 +6,7 @@
* (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
+ * 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,
@@ -26,11 +26,11 @@ import static
org.apache.camel.component.jira.JiraConstants.ISSUE_KEY;
@Component
public class AttachFileRoute extends RouteBuilder {
-private static final Logger _log =
LoggerFactory.getLogger(AttachFileRoute.class);
+private static final Logger LOG =
LoggerFactory.getLogger(AttachFileRoute.class);
@Override
public void configure() {
-_log.info(" > jira example - add attachment");
+LOG.info(" > jira example - add attachment");
// change the fields accordinly to your target jira server
from("file:///A_valid_directory?fileName=my_file.png=true=5")
.setHeader(ISSUE_KEY, () -> "MYP-13")
diff --git
a/examples/camel-example-jira/src/main/java/org/apache/camel/example/jira/NewCommentsRoute.java
b/examples/camel-example-jira/src/main/java/org/apache/camel/example/jira/NewCommentsRoute.java
index 709c625..0965764 100644
---
a/examples/camel-example-jira/src/main/java/org/apache/camel/example/jira/NewCommentsRoute.java
+++
b/examples/camel-example-jira/src/main/java/org/apache/camel/example/jira/NewCommentsRoute.java
@@ -1,4 +1,4 @@
-/**
+/*
* 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.
@@ -6,7 +6,7 @@
* (the "License"); you may not use this file except in compliance with
* the
[camel] branch master updated (b94457e -> 98e3430)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel.git. from b94457e CAMEL-13390 - Added an SB Itest add 98e3430 CAMEL-13390 - Added the atlassian public repository to the example too No new revisions were added by this update. Summary of changes: examples/camel-example-jira/pom.xml | 8 +++- 1 file changed, 7 insertions(+), 1 deletion(-)
[camel] branch master updated: CAMEL-13390 - Added an SB Itest
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new b94457e CAMEL-13390 - Added an SB Itest
b94457e is described below
commit b94457e4b25fb6343ea65bff584088b2a7e0cb5f
Author: Andrea Cosentino
AuthorDate: Fri May 17 14:14:55 2019 +0200
CAMEL-13390 - Added an SB Itest
---
.../camel/itest/springboot/CamelJiraTest.java | 49 ++
1 file changed, 49 insertions(+)
diff --git
a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelJiraTest.java
b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelJiraTest.java
new file mode 100644
index 000..c60f18f
--- /dev/null
+++
b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelJiraTest.java
@@ -0,0 +1,49 @@
+/*
+ * 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.itest.springboot;
+
+import org.apache.camel.itest.springboot.util.ArquillianPackager;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.shrinkwrap.api.Archive;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+
+@RunWith(Arquillian.class)
+public class CamelJiraTest extends AbstractSpringBootTestSupport {
+
+@Deployment
+public static Archive createSpringBootPackage() throws Exception {
+return ArquillianPackager.springBootPackage(createTestConfig());
+}
+
+public static ITestConfig createTestConfig() {
+return new ITestConfigBuilder()
+.module(inferModuleName(CamelJiraTest.class))
+.unitTestExpectedNumber(0)
+.build();
+}
+
+@Test
+public void componentTests() throws Exception {
+this.runComponentTest(config);
+this.runModuleUnitTestsIfEnabled(config);
+}
+
+
+}
[camel] 03/03: CAMEL-13390 - Regen docs
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 0b37cf589471d3e3c1e12c2c2fa4d2f887ac1aab
Author: Andrea Cosentino
AuthorDate: Fri May 17 13:56:20 2019 +0200
CAMEL-13390 - Regen docs
---
.../modules/ROOT/pages/jira-component.adoc | 284 +
1 file changed, 284 insertions(+)
diff --git a/docs/components/modules/ROOT/pages/jira-component.adoc
b/docs/components/modules/ROOT/pages/jira-component.adoc
new file mode 100644
index 000..0efb3c7
--- /dev/null
+++ b/docs/components/modules/ROOT/pages/jira-component.adoc
@@ -0,0 +1,284 @@
+[[jira-component]]
+== Jira Component
+
+*Available as of Camel version 3.0*
+
+The JIRA component interacts with the JIRA API by encapsulating
+Atlassian's
https://bitbucket.org/atlassian/jira-rest-java-client/src/master/[REST
+Java Client for JIRA]. It currently provides polling for new issues and
+new comments. It is also able to create new issues, add comments, change
issues, add/remove watchers, add attachment
+and transition the state of an issue.
+
+Rather than webhooks, this endpoint relies on simple polling. Reasons
+include:
+
+* Concern for reliability/stability
+* The types of payloads we're polling aren't typically large (plus, paging is
available in the API)
+* The need to support apps running somewhere not publicly accessible where a
webhook would fail
+
+Note that the JIRA API is fairly expansive. Therefore, this component could
be easily expanded to provide additional
+interactions.
+
+Maven users will need to add the following dependency to their pom.xml
+for this component:
+
+[source,xml]
+---
+
+org.apache.camel
+camel-jira
+${camel-version}
+
+---
+
+### URI format
+
+[source,text]
+-
+jira://type[?options]
+-
+
+### JIRA Options
+
+
+// component options: START
+The Jira component supports 2 options, which are listed below.
+
+
+
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *configuration* (advanced) | The JiraConfiguration parameters | |
JiraConfiguration
+| *resolveProperty Placeholders* (advanced) | Whether the component should
resolve property placeholders on itself when starting. Only properties which
are of String type can use property placeholders. | true | boolean
+|===
+// component options: END
+
+The Jira type accepts the following operations:
+
+For consumers:
+
+* newIssues: retrieve only new issues after the route is started
+* newComments: retrieve only new comments after the route is started
+
+For producers:
+
+* addIssue: add an issue
+* addComment: add a comment on a given issue
+* attach: add an attachment on a given issue
+* deleteIssue: delete a given issue
+* updateIssue: update fields of a given issue
+* transitionIssue: transition a status of a given issue
+* watchers: add/remove watchers of a given issue
+
+As Jira is fully customizable, you must assure the fields IDs exists for the
project and workflow, as they can change between different Jira servers.
+
+// endpoint options: START
+The Jira endpoint is configured using URI syntax:
+
+
+jira:type
+
+
+with the following path and query parameters:
+
+ Path Parameters (1 parameters):
+
+
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *type* | *Required* Operation to perform. Consumers: NewIssues, NewComments.
Producers: AddIssue, AttachFile, DeleteIssue, TransitionIssue, UpdateIssue,
Watchers. See this class javadoc description for more information. | | JiraType
+|===
+
+
+ Query Parameters (14 parameters):
+
+
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *delay* (common) | Time in milliseconds to elapse for the next poll. | 6000
| Integer
+| *jiraUrl* (common) | *Required* The Jira server url, example:
http://my_jira.com:8081 | | String
+| *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
+| *jql* (consumer) | JQL is the query language from JIRA which allows you to
retrieve the data you want. For example jql=project=MyProject Where MyProject
is the product key in Jira. It is important to use the RAW() and set the JQL
inside it to prevent camel parsing it, example: RAW(project in (MYP, COM) AND
resolution = Unresolved) | | String
+| *maxResults* (consumer) | Max number of issues to search
[camel] branch master updated (389dbf0 -> 0b37cf5)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel.git. from 389dbf0 CAMEL-13508 - Camel-Zipkin: Move to new Apache coordinates new e4e0fa8 Camel-13390 - camel-jira component based on an updated Jira Rest Java Client library https://issues.apache.org/jira/browse/CAMEL-13390 new 9dfb503 Regen new 0b37cf5 CAMEL-13390 - Regen docs The 3 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: apache-camel/pom.xml | 10 + apache-camel/src/main/descriptors/common-bin.xml | 2 + bom/camel-bom/pom.xml | 10 + components/camel-jira/pom.xml | 134 ++ .../camel-jira/src/main/docs/jira-component.adoc | 284 + .../apache/camel/component/jira/JiraComponent.java | 66 + .../camel/component/jira/JiraConfiguration.java| 140 ++ .../apache/camel/component/jira/JiraConstants.java | 42 +++ .../apache/camel/component/jira/JiraEndpoint.java | 198 ++ .../org/apache/camel/component/jira/JiraType.java | 39 +++ .../component/jira/JiraVerifierExtension.java | 102 .../jira/consumer/AbstractJiraConsumer.java| 78 ++ .../jira/consumer/NewCommentsConsumer.java | 80 ++ .../component/jira/consumer/NewIssuesConsumer.java | 73 ++ .../jira/oauth/JiraOAuthAuthenticationHandler.java | 79 ++ .../jira/oauth/JiraOAuthGetAccessToken.java| 29 +++ .../oauth/OAuthAsynchronousHttpClientFactory.java | 181 + .../OAuthAsynchronousJiraRestClientFactory.java| 35 +++ .../jira/oauth/OAuthHttpClientDecorator.java | 117 + .../jira/producer/AddCommentProducer.java | 58 + .../component/jira/producer/AddIssueProducer.java | 117 + .../jira/producer/AttachFileProducer.java | 61 + .../jira/producer/DeleteIssueProducer.java | 43 .../jira/producer/TransitionIssueProducer.java | 64 + .../jira/producer/UpdateIssueProducer.java | 87 +++ .../component/jira/producer/WatcherProducer.java | 64 + .../jira/JiraComponentConfigurationTest.java | 80 ++ .../camel/component/jira/JiraTestConstants.java| 27 ++ .../org/apache/camel/component/jira/Utils.java | 134 ++ .../jira/consumer/NewCommentsConsumerTest.java | 188 ++ .../jira/consumer/NewIssuesConsumerTest.java | 160 .../jira/producer/AddCommentProducerTest.java | 132 ++ .../jira/producer/AddIssueProducerTest.java| 191 ++ .../jira/producer/AttachFileProducerTest.java | 161 .../jira/producer/DeleteIssueProducerTest.java | 126 + .../jira/producer/TransitionIssueProducerTest.java | 136 ++ .../jira/producer/UpdateIssueProducerTest.java | 169 .../jira/producer/WatcherProducerTest.java | 214 .../src/test/resources/log4j2.properties | 32 +++ components/pom.xml | 1 + components/readme.adoc | 5 +- docs/components/modules/ROOT/nav.adoc | 1 + .../modules/ROOT/pages/jira-component.adoc | 284 + .../modules/ROOT/pages/soroush-component.adoc | 4 +- examples/camel-example-jira/README.adoc| 17 ++ examples/camel-example-jira/pom.xml| 122 + .../apache/camel/example/jira/AddIssueRoute.java | 58 + .../org/apache/camel/example/jira/Application.java | 34 +++ .../apache/camel/example/jira/AttachFileRoute.java | 43 .../camel/example/jira/NewCommentsRoute.java | 45 .../src/main/resources/application.properties | 24 ++ .../src/main/resources/logback.xml | 46 examples/pom.xml | 1 + parent/pom.xml | 13 + .../components-starter/camel-jira-starter/pom.xml | 61 + .../springboot/JiraComponentAutoConfiguration.java | 128 ++ .../springboot/JiraComponentConfiguration.java | 173 + .../src/main/resources/META-INF/LICENSE.txt| 0 .../src/main/resources/META-INF/NOTICE.txt | 0 .../src/main/resources/META-INF/spring.factories | 19 ++ .../src/main/resources/META-INF/spring.provides| 17 ++ platforms/spring-boot/components-starter/pom.xml | 1 + .../camel-spring-boot-dependencies/pom.xml | 10 + .../camel/itest/springboot/CamelJiraRestTest.java | 48 64 files changed, 5095 insertions(+), 3 deletions(-) create mode 100644
[camel] 02/03: Regen
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git commit 9dfb503e889689e83588a1f7e20cfef154bff2a3 Author: Andrea Cosentino AuthorDate: Fri May 17 13:55:42 2019 +0200 Regen --- .../camel-jira/src/main/docs/jira-component.adoc | 2 +- components/readme.adoc | 892 - docs/components/modules/ROOT/nav.adoc | 1 + .../modules/ROOT/pages/soroush-component.adoc | 4 +- 4 files changed, 892 insertions(+), 7 deletions(-) diff --git a/components/camel-jira/src/main/docs/jira-component.adoc b/components/camel-jira/src/main/docs/jira-component.adoc index e70a87f..0efb3c7 100644 --- a/components/camel-jira/src/main/docs/jira-component.adoc +++ b/components/camel-jira/src/main/docs/jira-component.adoc @@ -140,7 +140,7 @@ The component supports 10 options, which are listed below. | Name | Description | Default | Type | *camel.component.jira.configuration.access-token* | (OAuth only) The access token generated by the Jira server. | | String | *camel.component.jira.configuration.consumer-key* | (OAuth only) The consumer key from Jira settings. | | String -| *camel.component.jira.configuration.delay* | Time in milliseconds to elapse for the next poll. | | Integer +| *camel.component.jira.configuration.delay* | Time in milliseconds to elapse for the next poll. | 6000 | Integer | *camel.component.jira.configuration.jira-url* | The Jira server url, example: http://my_jira.com:8081 | | String | *camel.component.jira.configuration.password* | (Basic authentication only) The password to authenticate to the Jira server. Use only if username basic authentication is used. | | String | *camel.component.jira.configuration.private-key* | (OAuth only) The private key generated by the client to encrypt the conversation to the server. | | String diff --git a/components/readme.adoc b/components/readme.adoc index 1947674..0d68d85 100644 --- a/components/readme.adoc +++ b/components/readme.adoc @@ -1,7 +1,7 @@ Components // components: START -Number of Components: 32 in 29 JAR artifacts (0 deprecated) +Number of Components: 296 in 233 JAR artifacts (0 deprecated) [width="100%",cols="4,1,5",options="header"] |=== @@ -10,18 +10,204 @@ Number of Components: 32 in 29 JAR artifacts (0 deprecated) | link:camel-activemq/src/main/docs/activemq-component.adoc[ActiveMQ] (camel-activemq) + `activemq:destinationType:destinationName` | 1.0 | The activemq component allows messages to be sent to (or consumed from) Apache ActiveMQ. This component extends the Camel JMS component. +| link:camel-ahc/src/main/docs/ahc-component.adoc[AHC] (camel-ahc) + +`ahc:httpUri` | 2.8 | To call external HTTP services using Async Http Client. + +| link:camel-ahc-ws/src/main/docs/ahc-ws-component.adoc[AHC Websocket] (camel-ahc-ws) + +`ahc-ws:httpUri` | 2.14 | To exchange data with external Websocket servers using Async Http Client. + +| link:camel-amqp/src/main/docs/amqp-component.adoc[AMQP] (camel-amqp) + +`amqp:destinationType:destinationName` | 1.2 | Messaging with AMQP protocol using Apache QPid Client. + +| link:camel-flink/src/main/docs/flink-component.adoc[Apache Flink] (camel-flink) + +`flink:endpointType` | 2.18 | The flink component can be used to send DataSet jobs to Apache Flink cluster. + +| link:camel-pulsar/src/main/docs/pulsar-component.adoc[Apache Pulsar] (camel-pulsar) + +`pulsar:persistence://tenant/namespace/topic` | | Camel Apache Pulsar Component + +| link:camel-spark/src/main/docs/spark-component.adoc[Apache Spark] (camel-spark) + +`spark:endpointType` | 2.17 | The spark component can be used to send RDD or DataFrame jobs to Apache Spark cluster. + +| link:camel-apns/src/main/docs/apns-component.adoc[APNS] (camel-apns) + +`apns:name` | 2.8 | For sending notifications to Apple iOS devices. + +| link:camel-as2/camel-as2-component/src/main/docs/as2-component.adoc[AS2] (camel-as2) + +`as2:apiName/methodName` | 2.22 | Component used for transferring data secure and reliable over the internet using the AS2 protocol. + +| link:camel-asterisk/src/main/docs/asterisk-component.adoc[Asterisk] (camel-asterisk) + +`asterisk:name` | 2.18 | The asterisk component is used to interact with Asterisk PBX Server. + +| link:camel-atmos/src/main/docs/atmos-component.adoc[Atmos] (camel-atmos) + +`atmos:name/operation` | 2.15 | The atmos component is used for integrating with EMC's Atomos Storage. + +| link:camel-atmosphere-websocket/src/main/docs/atmosphere-websocket-component.adoc[Atmosphere Websocket] (camel-atmosphere-websocket) + +`atmosphere-websocket:servicePath` | 2.14 | To exchange data with external Websocket clients using Atmosphere. + +| link:camel-atom/src/main/docs/atom-component.adoc[Atom] (camel-atom) + +`atom:feedUri` | 1.2 | The atom component is used for consuming Atom RSS feeds. + +|
buildbot success in on camel-site-production
The Buildbot has detected a restored build on builder camel-site-production while building . Full details are available at: https://ci.apache.org/builders/camel-site-production/builds/33924 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: bb-cms-slave Build Reason: The Nightly scheduler named 'camel-site-production' triggered this build Build Source Stamp: [branch camel/website] HEAD Blamelist: Build succeeded! Sincerely, -The Buildbot
[camel] branch master updated: CAMEL-13508 - Camel-Zipkin: Move to new Apache coordinates
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 389dbf0 CAMEL-13508 - Camel-Zipkin: Move to new Apache coordinates
389dbf0 is described below
commit 389dbf07fb62ec3fda52f317015cd5ac69884e0e
Author: Andrea Cosentino
AuthorDate: Fri May 17 12:36:19 2019 +0200
CAMEL-13508 - Camel-Zipkin: Move to new Apache coordinates
---
parent/pom.xml | 2 +-
platforms/karaf/features/src/main/resources/features.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index a34e3d8..bb52355 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -723,7 +723,7 @@
1.2.5
0.6.2
2.8.2
-2.12.9
+2.13.0
0.3.0
3.4.13
16.0
diff --git a/platforms/karaf/features/src/main/resources/features.xml
b/platforms/karaf/features/src/main/resources/features.xml
index 91f6996..57e1a5a 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -2703,7 +2703,7 @@
camel-core
mvn:io.zipkin.brave/brave/${brave-zipkin-version}
wrap:mvn:io.zipkin.brave/brave-context-slf4j/${brave-zipkin-version}
-mvn:io.zipkin.zipkin2/zipkin/${zipkin-version}
+mvn:org.apache.zipkin.zipkin2/zipkin/${zipkin-version}
mvn:io.zipkin.reporter2/zipkin-reporter/${zipkin-reporter-version}
mvn:io.zipkin.reporter2/zipkin-sender-urlconnection/${zipkin-reporter-version}
mvn:io.zipkin.reporter2/zipkin-sender-libthrift/${zipkin-reporter-version}
buildbot failure in on camel-site-production
The Buildbot has detected a new failure on builder camel-site-production while building . Full details are available at: https://ci.apache.org/builders/camel-site-production/builds/33923 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: bb-cms-slave Build Reason: The Nightly scheduler named 'camel-site-production' triggered this build Build Source Stamp: [branch camel/website] HEAD Blamelist: BUILD FAILED: failed compile Sincerely, -The Buildbot
[camel] branch master updated: CAMEL-13537 - camel-soroushbot - Authorization token should not both be path and query
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 752938a CAMEL-13537 - camel-soroushbot - Authorization token should
not both be path and query
752938a is described below
commit 752938a0e6f88cb23852c69a7cf5a6100f85f380
Author: Andrea Cosentino
AuthorDate: Fri May 17 11:30:39 2019 +0200
CAMEL-13537 - camel-soroushbot - Authorization token should not both be
path and query
---
components/camel-soroush/src/main/docs/soroush-component.adoc | 4 ++--
.../camel/component/soroushbot/component/SoroushBotEndpoint.java | 4
2 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/components/camel-soroush/src/main/docs/soroush-component.adoc
b/components/camel-soroush/src/main/docs/soroush-component.adoc
index 09cb21a..7ab7eea 100644
--- a/components/camel-soroush/src/main/docs/soroush-component.adoc
+++ b/components/camel-soroush/src/main/docs/soroush-component.adoc
@@ -90,7 +90,6 @@ with the following path and query parameters:
[width="100%",cols="2,5,^1,2",options="header"]
|===
| Name | Description | Default | Type
-| *authorizationToken* (security) | The authorization token for using the bot.
if uri path does not contain authorization token, this token will be used. | |
String
| *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
| *concurrentConsumers* (consumer) | Number of Thread created by consumer in
the route. if you use this method for parallelism, it is guaranteed that
messages from same user always execute in the same thread and therefore
messages from the same user are processed sequentially. Default value notice:
using SoroushBotSingleThreadConsumer | 1 | Integer
| *queueCapacityPerThread* (consumer) | Maximum capacity of each queue when
concurrentConsumers is greater than 1. if a queue become full, every message
that should go to that queue will be dropped. If bridgeErrorHandler is set to
true, an exchange with CongestionException is directed to ErrorHandler. You can
then processed the error using onException(CongestionException.class) route.
Default value notice: infinite capacity | 0 | Integer
@@ -108,6 +107,7 @@ with the following path and query parameters:
| *retryExponentialCoefficient* (global) | Coefficient to compute back off
time when using Exponential Back Off strategy | 2 | Long
| *retryLinearIncrement* (global) | The amount of time (in millisecond) which
adds to waiting time when using Linear back off strategy | 1 | Long
| *retryWaitingTime* (global) | Waiting time before retry failed request
(Millisecond). If backOffStrategy is not Fixed this is the based value for
computing back off waiting time. the first retry is always happen immediately
after failure and retryWaitingTime do not apply to the first retry. | 1000 |
Long
+| *authorizationToken* (security) | The authorization token for using the bot.
if uri path does not contain authorization token, this token will be used. | |
String
| *autoUploadFile* (sendMessage) | Automatically upload attachments when a
message goes to the sendMessage endpoint and the SoroushMessage.file
(SoroushMessage.thumbnail) has been set and
SoroushMessage.fileUrl(SoroushMessage.thumbnailUrl) is null | true | Boolean
| *forceUpload* (uploadFile) | Force to upload
SoroushMessage.file(SoroushMessage.thumbnail) if exists, even if the
SoroushMessage.fileUrl(SoroushMessage.thumbnailUrl) is not null in the message
| false | Boolean
|===
@@ -277,4 +277,4 @@ One way to handle these exceptions is by using
`onException` route definition:
onException(CongestionException.class).log("Failed to processing ${id}")
-
-_Developed and supported by https://www.mohaymen.ir[Mohaymen ICT]_
\ No newline at end of file
+_Developed and supported by https://www.mohaymen.ir[Mohaymen ICT]_
diff --git
a/components/camel-soroush/src/main/java/org/apache/camel/component/soroushbot/component/SoroushBotEndpoint.java
b/components/camel-soroush/src/main/java/org/apache/camel/component/soroushbot/component/SoroushBotEndpoint.java
index e818887..95b9f67 100644
---
a/components/camel-soroush/src/main/java/org/apache/camel/component/soroushbot/component/SoroushBotEndpoint.java
+++
b/components/camel-soroush/src/main/java/org/apache/camel/component/soroushbot/component/SoroushBotEndpoint.java
@@ -63,10 +63,6 @@ public class SoroushBotEndpoint extends DefaultEndpoint {
@UriPath(name =
[camel] branch master updated: CAMEL-13507: Fix header resolution for LRA saga routes
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 5953a08 CAMEL-13507: Fix header resolution for LRA saga routes
5953a08 is described below
commit 5953a0825ed0c4e7d698c86959e4ed899ba3844c
Author: James Netherton
AuthorDate: Fri May 17 09:17:31 2019 +0100
CAMEL-13507: Fix header resolution for LRA saga routes
---
.../src/main/java/org/apache/camel/service/lra/LRAClient.java | 3 ---
.../src/main/java/org/apache/camel/service/lra/LRAConstants.java | 3 ---
.../main/java/org/apache/camel/service/lra/LRASagaCoordinator.java | 3 ---
.../src/main/java/org/apache/camel/service/lra/LRASagaRoutes.java | 7 ++-
.../src/main/java/org/apache/camel/service/lra/LRASagaStep.java| 3 ---
.../src/main/java/org/apache/camel/service/lra/LRAUrlBuilder.java | 3 ---
.../src/test/java/org/apache/camel/service/lra/LRAFailuresIT.java | 1 -
.../src/test/java/org/apache/camel/service/lra/LRAManualIT.java| 1 -
.../src/test/java/org/apache/camel/service/lra/LRATimeoutIT.java | 1 -
9 files changed, 2 insertions(+), 23 deletions(-)
diff --git
a/components/camel-lra/src/main/java/org/apache/camel/service/lra/LRAClient.java
b/components/camel-lra/src/main/java/org/apache/camel/service/lra/LRAClient.java
index cf05f87..ec4c3cb 100644
---
a/components/camel-lra/src/main/java/org/apache/camel/service/lra/LRAClient.java
+++
b/components/camel-lra/src/main/java/org/apache/camel/service/lra/LRAClient.java
@@ -38,9 +38,6 @@ import static
org.apache.camel.service.lra.LRAConstants.HEADER_TIME_LIMIT;
import static
org.apache.camel.service.lra.LRAConstants.PARTICIPANT_PATH_COMPENSATE;
import static
org.apache.camel.service.lra.LRAConstants.PARTICIPANT_PATH_COMPLETE;
-/**
- *
- */
public class LRAClient {
diff --git
a/components/camel-lra/src/main/java/org/apache/camel/service/lra/LRAConstants.java
b/components/camel-lra/src/main/java/org/apache/camel/service/lra/LRAConstants.java
index ad4bf88..1c3feea 100644
---
a/components/camel-lra/src/main/java/org/apache/camel/service/lra/LRAConstants.java
+++
b/components/camel-lra/src/main/java/org/apache/camel/service/lra/LRAConstants.java
@@ -16,9 +16,6 @@
*/
package org.apache.camel.service.lra;
-/**
- *
- */
public final class LRAConstants {
public static final String DEFAULT_COORDINATOR_CONTEXT_PATH =
"/lra-coordinator";
diff --git
a/components/camel-lra/src/main/java/org/apache/camel/service/lra/LRASagaCoordinator.java
b/components/camel-lra/src/main/java/org/apache/camel/service/lra/LRASagaCoordinator.java
index f534ae8..58c4063 100644
---
a/components/camel-lra/src/main/java/org/apache/camel/service/lra/LRASagaCoordinator.java
+++
b/components/camel-lra/src/main/java/org/apache/camel/service/lra/LRASagaCoordinator.java
@@ -24,9 +24,6 @@ import org.apache.camel.saga.CamelSagaCoordinator;
import org.apache.camel.saga.CamelSagaStep;
import org.apache.camel.util.ObjectHelper;
-/**
- *
- */
public class LRASagaCoordinator implements CamelSagaCoordinator {
private LRASagaService sagaService;
diff --git
a/components/camel-lra/src/main/java/org/apache/camel/service/lra/LRASagaRoutes.java
b/components/camel-lra/src/main/java/org/apache/camel/service/lra/LRASagaRoutes.java
index 3a71603..b333965 100644
---
a/components/camel-lra/src/main/java/org/apache/camel/service/lra/LRASagaRoutes.java
+++
b/components/camel-lra/src/main/java/org/apache/camel/service/lra/LRASagaRoutes.java
@@ -27,9 +27,6 @@ import static
org.apache.camel.service.lra.LRAConstants.PARTICIPANT_PATH_COMPLET
import static org.apache.camel.service.lra.LRAConstants.URL_COMPENSATION_KEY;
import static org.apache.camel.service.lra.LRAConstants.URL_COMPLETION_KEY;
-/**
- *
- */
public class LRASagaRoutes extends RouteBuilder {
private LRASagaService sagaService;
@@ -47,7 +44,7 @@ public class LRASagaRoutes extends RouteBuilder {
.process(this::verifyRequest)
.choice()
.when(header(URL_COMPENSATION_KEY).isNotNull())
-.toD("header." + URL_COMPENSATION_KEY)
+.toD("${header." + URL_COMPENSATION_KEY + "}")
.end();
rest(sagaService.getLocalParticipantContextPath())
@@ -56,7 +53,7 @@ public class LRASagaRoutes extends RouteBuilder {
.process(this::verifyRequest)
.choice()
.when(header(URL_COMPLETION_KEY).isNotNull())
-.toD("header." + URL_COMPLETION_KEY)
+.toD("${header." + URL_COMPLETION_KEY + "}")
.end();
}
diff --git
a/components/camel-lra/src/main/java/org/apache/camel/service/lra/LRASagaStep.java
b/components/camel-lra/src/main/java/org/apache/camel/service/lra/LRASagaStep.java
index 863b87b..45d4566 100644
---
[camel] 01/04: CAMEL-13538 - Camel-Avro: Upgrade to 1.9.0
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit e2b214022085fc4d227ef909e1fe1188255b82e1
Author: Andrea Cosentino
AuthorDate: Fri May 17 09:58:20 2019 +0200
CAMEL-13538 - Camel-Avro: Upgrade to 1.9.0
---
components/camel-avro/pom.xml | 46 +++---
.../camel/component/avro/AvroConfiguration.java| 2 +-
.../apache/camel/component/avro/AvroListener.java | 10 ++---
.../camel/component/avro/AvroNettyProducer.java| 2 +-
.../apache/camel/component/avro/AvroProducer.java | 3 +-
.../camel/component/avro/AvroHttpProducerTest.java | 2 +-
.../component/avro/AvroNettyConsumerTest.java | 2 +-
.../component/avro/AvroNettyProducerTest.java | 2 +-
parent/pom.xml | 2 +-
.../karaf/features/src/main/resources/features.xml | 20 +-
.../camel/itest/springboot/CamelAvroTest.java | 4 ++
11 files changed, 32 insertions(+), 63 deletions(-)
diff --git a/components/camel-avro/pom.xml b/components/camel-avro/pom.xml
index 20ee0a5..98bb1eb 100644
--- a/components/camel-avro/pom.xml
+++ b/components/camel-avro/pom.xml
@@ -68,52 +68,16 @@
org.apache.avro
avro
-
-
-org.codehaus.jackson
-jackson-core-asl
-
-
-org.codehaus.jackson
-jackson-mapper-asl
-
-
org.apache.avro
-avro-ipc
-
-
-org.codehaus.jackson
-jackson-core-asl
-
-
-org.codehaus.jackson
-jackson-mapper-asl
-
-
-io.netty
-netty
-
-
+avro-ipc-netty
+${avro-version}
-
-
-
-io.netty
-netty
-${netty3-version}
-
-
-org.codehaus.jackson
-jackson-core-asl
-${jackson-version}
-
-
-org.codehaus.jackson
-jackson-mapper-asl
-${jackson-version}
+org.apache.avro
+avro-ipc-jetty
+${avro-version}
diff --git
a/components/camel-avro/src/main/java/org/apache/camel/component/avro/AvroConfiguration.java
b/components/camel-avro/src/main/java/org/apache/camel/component/avro/AvroConfiguration.java
index 85d940c..c68a5f5 100644
---
a/components/camel-avro/src/main/java/org/apache/camel/component/avro/AvroConfiguration.java
+++
b/components/camel-avro/src/main/java/org/apache/camel/component/avro/AvroConfiguration.java
@@ -25,7 +25,7 @@ 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.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import static
org.apache.camel.component.avro.AvroConstants.AVRO_MESSAGE_NAME_SEPARATOR;
diff --git
a/components/camel-avro/src/main/java/org/apache/camel/component/avro/AvroListener.java
b/components/camel-avro/src/main/java/org/apache/camel/component/avro/AvroListener.java
index e3c5563..d259c58 100644
---
a/components/camel-avro/src/main/java/org/apache/camel/component/avro/AvroListener.java
+++
b/components/camel-avro/src/main/java/org/apache/camel/component/avro/AvroListener.java
@@ -22,15 +22,15 @@ import java.util.concurrent.ConcurrentMap;
import org.apache.avro.Protocol;
import org.apache.avro.Schema;
-import org.apache.avro.ipc.HttpServer;
-import org.apache.avro.ipc.NettyServer;
import org.apache.avro.ipc.Server;
+import org.apache.avro.ipc.jetty.HttpServer;
+import org.apache.avro.ipc.netty.NettyServer;
import org.apache.avro.ipc.specific.SpecificResponder;
import org.apache.avro.specific.SpecificData;
import org.apache.camel.Exchange;
import org.apache.camel.support.ExchangeHelper;
-import org.apache.commons.lang.StringUtils;
-import org.mortbay.log.Log;
+import org.apache.commons.lang3.StringUtils;
+import org.eclipse.jetty.util.log.Log;
import static
org.apache.camel.component.avro.AvroConstants.AVRO_HTTP_TRANSPORT;
import static
org.apache.camel.component.avro.AvroConstants.AVRO_NETTY_TRANSPORT;
@@ -113,7 +113,7 @@ public class AvroListener {
public boolean unregister(String messageName) {
if (!StringUtils.isEmpty(messageName)) {
if (consumerRegistry.remove(messageName) == null) {
-Log.warn("Consumer with message name {} was already
unregistered.", messageName);
+Log.getLog().warn("Consumer with message name {} was already
[camel] branch master updated (a802c14 -> 82ad184)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel.git. from a802c14 Upgrade kotlin new e2b2140 CAMEL-13538 - Camel-Avro: Upgrade to 1.9.0 new 7b3e5b9 CAMEL-13538 - Added property placeholders for avro-ipc-netty and avro-ipc-jetty new 8e6cfbf CAMEL-13538 - Use the correct property placeholder in the Karaf feature for Camel-Avro new 82ad184 CAMEL-13538 - Camel-Avro Karaf feature no need for Jetty range The 4 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: components/camel-avro/pom.xml | 46 +++--- .../camel/component/avro/AvroConfiguration.java| 2 +- .../apache/camel/component/avro/AvroListener.java | 10 ++--- .../camel/component/avro/AvroNettyProducer.java| 2 +- .../apache/camel/component/avro/AvroProducer.java | 3 +- .../camel/component/avro/AvroHttpProducerTest.java | 2 +- .../component/avro/AvroNettyConsumerTest.java | 2 +- .../component/avro/AvroNettyProducerTest.java | 2 +- parent/pom.xml | 5 ++- .../karaf/features/src/main/resources/features.xml | 20 +- .../camel/itest/springboot/CamelAvroTest.java | 4 ++ 11 files changed, 35 insertions(+), 63 deletions(-)
[camel] 04/04: CAMEL-13538 - Camel-Avro Karaf feature no need for Jetty range
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 82ad184d42009a0e0c1bc4281660de62b8c5271c
Author: Andrea Cosentino
AuthorDate: Fri May 17 10:10:28 2019 +0200
CAMEL-13538 - Camel-Avro Karaf feature no need for Jetty range
---
platforms/karaf/features/src/main/resources/features.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/platforms/karaf/features/src/main/resources/features.xml
b/platforms/karaf/features/src/main/resources/features.xml
index f7fe9a4..91f6996 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -229,7 +229,7 @@
camel-core
-jetty
+jetty
mvn:org.apache.avro/avro/${avro-version}
mvn:org.apache.avro/avro-ipc-jetty/${avro-ipc-jetty-version}
mvn:org.apache.avro/avro-ipc-netty/${avro-ipc-netty-version}
[camel] 03/04: CAMEL-13538 - Use the correct property placeholder in the Karaf feature for Camel-Avro
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 8e6cfbf7c509114db6b4997be00d3d6e958958cb
Author: Andrea Cosentino
AuthorDate: Fri May 17 10:09:01 2019 +0200
CAMEL-13538 - Use the correct property placeholder in the Karaf feature for
Camel-Avro
---
platforms/karaf/features/src/main/resources/features.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/platforms/karaf/features/src/main/resources/features.xml
b/platforms/karaf/features/src/main/resources/features.xml
index fd47264..f7fe9a4 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -231,8 +231,8 @@
camel-core
jetty
mvn:org.apache.avro/avro/${avro-version}
-mvn:org.apache.avro/avro-ipc-jetty/${avro-version}
-mvn:org.apache.avro/avro-ipc-netty/${avro-version}
+mvn:org.apache.avro/avro-ipc-jetty/${avro-ipc-jetty-version}
+mvn:org.apache.avro/avro-ipc-netty/${avro-ipc-netty-version}
mvn:com.fasterxml.jackson.core/jackson-core/${jackson2-version}
mvn:com.fasterxml.jackson.core/jackson-databind/${jackson2-version}
mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson2-version}
[camel] 02/04: CAMEL-13538 - Added property placeholders for avro-ipc-netty and avro-ipc-jetty
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 7b3e5b96d8a1db7a875a3d04344840a75dcfdc3c
Author: Andrea Cosentino
AuthorDate: Fri May 17 10:06:43 2019 +0200
CAMEL-13538 - Added property placeholders for avro-ipc-netty and
avro-ipc-jetty
---
components/camel-avro/pom.xml | 4 ++--
parent/pom.xml| 3 +++
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/components/camel-avro/pom.xml b/components/camel-avro/pom.xml
index 98bb1eb..7acac0f 100644
--- a/components/camel-avro/pom.xml
+++ b/components/camel-avro/pom.xml
@@ -72,12 +72,12 @@
org.apache.avro
avro-ipc-netty
-${avro-version}
+${avro-ipc-netty-version}
org.apache.avro
avro-ipc-jetty
-${avro-version}
+${avro-ipc-jetty-version}
diff --git a/parent/pom.xml b/parent/pom.xml
index cd983b0..a34e3d8 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -80,6 +80,9 @@
4.3.1_1
4.3.1
1.9.0
+1.9.0
+1.9.0
+
1.8.2_1
1.8.2_1
3.1.6
[camel] branch camel-2.22.x updated: Add flattern pom to git ignore
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch camel-2.22.x in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/camel-2.22.x by this push: new 1c8c82f Add flattern pom to git ignore 1c8c82f is described below commit 1c8c82ffb24526293d52cae3e3b63e2f15c7a4bf Author: Claus Ibsen AuthorDate: Fri May 17 08:48:53 2019 +0200 Add flattern pom to git ignore --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 0f3ebcb..f73ffaa 100644 --- a/.gitignore +++ b/.gitignore @@ -21,4 +21,4 @@ components/camel-solr/data .pmd .sts4-cache log-camel-lsp.out - +.flattened-pom.xml
[camel] branch camel-2.23.x updated: Add flattern pom to git ignore
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch camel-2.23.x in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/camel-2.23.x by this push: new bdbb366 Add flattern pom to git ignore bdbb366 is described below commit bdbb366d0ae1b6d604254a47b5e797b3b3905b84 Author: Claus Ibsen AuthorDate: Fri May 17 08:48:12 2019 +0200 Add flattern pom to git ignore --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 333193a..d328862 100644 --- a/.gitignore +++ b/.gitignore @@ -21,4 +21,4 @@ components/camel-solr/data log-camel-lsp.out .vscode *.code-workspace - +.flattened-pom.xml
[camel] branch camel-2.24.x updated: Add flattern pom to git ignore
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch camel-2.24.x in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/camel-2.24.x by this push: new e6ab8ea Add flattern pom to git ignore e6ab8ea is described below commit e6ab8eaf1dd65c3744f1dc4443102442a05fdc2e Author: Claus Ibsen AuthorDate: Fri May 17 08:46:32 2019 +0200 Add flattern pom to git ignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 3c82eb9..221f200 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,4 @@ log-camel-lsp.out .vscode *.code-workspace components/camel-cxf/activemq-data +.flattened-pom.xml \ No newline at end of file
[camel] branch master updated: Upgrade kotlin
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/master by this push: new a802c14 Upgrade kotlin a802c14 is described below commit a802c147040ffa948c59671fdc4fcf7ce49e977c Author: Claus Ibsen AuthorDate: Fri May 17 08:45:40 2019 +0200 Upgrade kotlin --- examples/camel-example-kotlin/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/camel-example-kotlin/pom.xml b/examples/camel-example-kotlin/pom.xml index db571ae..c553eb5 100644 --- a/examples/camel-example-kotlin/pom.xml +++ b/examples/camel-example-kotlin/pom.xml @@ -35,7 +35,7 @@ Other Languages -1.3.30 +1.3.31
[camel] branch camel-2.x updated: Add flattern pom to git ignore
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch camel-2.x in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/camel-2.x by this push: new 788695c Add flattern pom to git ignore 788695c is described below commit 788695c037543f5338e98ec591cf9421363f88c9 Author: Claus Ibsen AuthorDate: Fri May 17 08:46:32 2019 +0200 Add flattern pom to git ignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 3c82eb9..221f200 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,4 @@ log-camel-lsp.out .vscode *.code-workspace components/camel-cxf/activemq-data +.flattened-pom.xml \ No newline at end of file
[camel] branch master updated: Camel-Netty4-http: Don't reuse fork in tests
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/master by this push: new 10dd76a Camel-Netty4-http: Don't reuse fork in tests 10dd76a is described below commit 10dd76a6b5ac1fbd0bccc05a0c9e72594d347dc9 Author: Andrea Cosentino AuthorDate: Fri May 17 08:34:05 2019 +0200 Camel-Netty4-http: Don't reuse fork in tests --- components/camel-netty4-http/pom.xml | 12 1 file changed, 12 insertions(+) diff --git a/components/camel-netty4-http/pom.xml b/components/camel-netty4-http/pom.xml index f381f0a..629b2cd 100644 --- a/components/camel-netty4-http/pom.xml +++ b/components/camel-netty4-http/pom.xml @@ -127,4 +127,16 @@ + + + +maven-surefire-plugin + +1 +false + 5000 + + + +
[camel] 02/02: Regen
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 9f55896b624ef073cea108126373966b26710eeb
Author: Claus Ibsen
AuthorDate: Fri May 17 08:30:29 2019 +0200
Regen
---
.../camel-soroush/src/main/docs/soroush-component.adoc| 4 +++-
components/readme.adoc| 4 ++--
docs/components/modules/ROOT/nav.adoc | 2 +-
docs/components/modules/ROOT/pages/soroush-component.adoc | 15 +--
4 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/components/camel-soroush/src/main/docs/soroush-component.adoc
b/components/camel-soroush/src/main/docs/soroush-component.adoc
index 4fa1f18..09cb21a 100644
--- a/components/camel-soroush/src/main/docs/soroush-component.adoc
+++ b/components/camel-soroush/src/main/docs/soroush-component.adoc
@@ -1,6 +1,8 @@
+[[soroush-component]]
== Soroush Component
*Available as of Camel version 3.0*
+
*Available as of Camel version 3.0*
@@ -275,4 +277,4 @@ One way to handle these exceptions is by using
`onException` route definition:
onException(CongestionException.class).log("Failed to processing ${id}")
-
-_Developed and supported by https://www.mohaymen.ir[Mohaymen ICT]_
+_Developed and supported by https://www.mohaymen.ir[Mohaymen ICT]_
\ No newline at end of file
diff --git a/components/readme.adoc b/components/readme.adoc
index 927e597..0a7386d 100644
--- a/components/readme.adoc
+++ b/components/readme.adoc
@@ -760,8 +760,8 @@ Number of Components: 295 in 232 JAR artifacts (0
deprecated)
| link:camel-solr/src/main/docs/solr-component.adoc[Solr] (camel-solr) +
`solr:url` | 2.9 | The solr component allows you to interface with an Apache
Lucene Solr server.
-| link:camel-soroush/src/main/docs/soroush-component.adoc[SoroushBot]
(camel-soroush) +
-`soroush:[/authorizationToken][?options]` | 3.0 | this class
represents Soroush Endpoint, it is also a bean containing the configuration of
the Endpoint
+| link:camel-soroush/src/main/docs/soroush-component.adoc[Soroush]
(camel-soroush) +
+`soroush:endpoint/authorizationToken` | 3.0 | To integrate with the Soroush
chat bot.
| link:camel-spark-rest/src/main/docs/spark-rest-component.adoc[Spark Rest]
(camel-spark-rest) +
`spark-rest:verb:path` | 2.14 | The spark-rest component is used for hosting
REST services which has been defined using Camel rest-dsl.
diff --git a/docs/components/modules/ROOT/nav.adoc
b/docs/components/modules/ROOT/nav.adoc
index bb597ee..fb8a7cb 100644
--- a/docs/components/modules/ROOT/nav.adoc
+++ b/docs/components/modules/ROOT/nav.adoc
@@ -290,7 +290,7 @@
* xref:snmp-component.adoc[SNMP Component]
* xref:soapjaxb-dataformat.adoc[SOAP DataFormat]
* xref:solr-component.adoc[Solr Component]
-* xref:soroush-component.adoc[SoroushBot Component]
+* xref:soroush-component.adoc[Soroush Component]
* xref:spark-rest-component.adoc[Spark Rest Component]
* xref:spark-component.adoc[Apache Spark Component]
* xref:splunk-component.adoc[Splunk Component]
diff --git a/docs/components/modules/ROOT/pages/soroush-component.adoc
b/docs/components/modules/ROOT/pages/soroush-component.adoc
index a3e4078..09cb21a 100644
--- a/docs/components/modules/ROOT/pages/soroush-component.adoc
+++ b/docs/components/modules/ROOT/pages/soroush-component.adoc
@@ -1,8 +1,11 @@
[[soroush-component]]
-== SoroushBot Component
+== Soroush Component
*Available as of Camel version 3.0*
+*Available as of Camel version 3.0*
+
+
The *Soroush* component provides access to the
https://soroush-app.ir/developer.html[Soroush Bot API].
It allows a Camel-based application to send and receive messages by acting as
a Bot, i.e. participating in direct conversation with normal users and send and
receive message and files
@@ -51,7 +54,7 @@ and store the urls in the message (`SoroushMessage.fileUrl`,
`SoroushMessage.thu
// component options: START
-The SoroushBot component supports 2 options, which are listed below.
+The Soroush component supports 2 options, which are listed below.
@@ -63,10 +66,10 @@ The SoroushBot component supports 2 options, which are
listed below.
|===
// component options: END
// endpoint options: START
-The SoroushBot endpoint is configured using URI syntax:
+The Soroush endpoint is configured using URI syntax:
-soroush:[/authorizationToken][?options]
+soroush:endpoint/authorizationToken
with the following path and query parameters:
@@ -77,7 +80,7 @@ with the following path and query parameters:
[width="100%",cols="2,5,^1,2",options="header"]
|===
| Name | Description | Default | Type
-| *endpoint* | *Required* The endpoint type. it support getMessage as consumer
and sendMessage,uploadFile,downloadFile as producer | | Endpoint
+| *endpoint* | *Required* The endpoint type. Support getMessage as consumer
and sendMessage,uploadFile,downloadFile as
[camel] 01/02: Polished
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 61e5de9a3a7e0a651a31132325548c5da8fc9004
Author: Claus Ibsen
AuthorDate: Thu May 16 20:19:35 2019 +0200
Polished
---
.../src/main/docs/soroush-component.adoc | 13 ++--
.../soroushbot/component/SoroushBotEndpoint.java | 84 +-
.../SoroushBotComponentConfiguration.java | 3 +-
3 files changed, 42 insertions(+), 58 deletions(-)
diff --git a/components/camel-soroush/src/main/docs/soroush-component.adoc
b/components/camel-soroush/src/main/docs/soroush-component.adoc
index a3e4078..4fa1f18 100644
--- a/components/camel-soroush/src/main/docs/soroush-component.adoc
+++ b/components/camel-soroush/src/main/docs/soroush-component.adoc
@@ -1,7 +1,8 @@
-[[soroush-component]]
-== SoroushBot Component
+== Soroush Component
*Available as of Camel version 3.0*
+*Available as of Camel version 3.0*
+
The *Soroush* component provides access to the
https://soroush-app.ir/developer.html[Soroush Bot API].
It allows a Camel-based application to send and receive messages by acting as
a Bot, i.e. participating in direct conversation with normal users and send and
receive message and files
@@ -51,7 +52,7 @@ and store the urls in the message (`SoroushMessage.fileUrl`,
`SoroushMessage.thu
// component options: START
-The SoroushBot component supports 2 options, which are listed below.
+The Soroush component supports 2 options, which are listed below.
@@ -63,10 +64,10 @@ The SoroushBot component supports 2 options, which are
listed below.
|===
// component options: END
// endpoint options: START
-The SoroushBot endpoint is configured using URI syntax:
+The Soroush endpoint is configured using URI syntax:
-soroush:[/authorizationToken][?options]
+soroush:endpoint/authorizationToken
with the following path and query parameters:
@@ -77,7 +78,7 @@ with the following path and query parameters:
[width="100%",cols="2,5,^1,2",options="header"]
|===
| Name | Description | Default | Type
-| *endpoint* | *Required* The endpoint type. it support getMessage as consumer
and sendMessage,uploadFile,downloadFile as producer | | Endpoint
+| *endpoint* | *Required* The endpoint type. Support getMessage as consumer
and sendMessage,uploadFile,downloadFile as producer | | Endpoint
|===
diff --git
a/components/camel-soroush/src/main/java/org/apache/camel/component/soroushbot/component/SoroushBotEndpoint.java
b/components/camel-soroush/src/main/java/org/apache/camel/component/soroushbot/component/SoroushBotEndpoint.java
index 7730381..e818887 100644
---
a/components/camel-soroush/src/main/java/org/apache/camel/component/soroushbot/component/SoroushBotEndpoint.java
+++
b/components/camel-soroush/src/main/java/org/apache/camel/component/soroushbot/component/SoroushBotEndpoint.java
@@ -53,17 +53,16 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
- * this class represents Soroush Endpoint, it is also a bean containing the
configuration of the Endpoint
+ * To integrate with the Soroush chat bot.
*/
-@UriEndpoint(firstVersion = "3.0", scheme = "soroush", title = "SoroushBot",
syntax = "soroush:[/authorizationToken][?options]", label = "chat")
+@UriEndpoint(firstVersion = "3.0", scheme = "soroush", title = "Soroush",
syntax = "soroush:endpoint/authorizationToken", label = "chat")
public class SoroushBotEndpoint extends DefaultEndpoint {
-private static Logger log =
LoggerFactory.getLogger(SoroushBotEndpoint.class);
-@UriPath(name = "endpoint", enums = "Endpoint", javaType = "Endpoint",
-description = "The endpoint type. it support `getMessage` as
consumer and `sendMessage`,`uploadFile`,`downloadFile` as producer")
+private static final Logger LOG =
LoggerFactory.getLogger(SoroushBotEndpoint.class);
+
+@UriPath(name = "endpoint", description = "The endpoint type. Support
`getMessage` as consumer and `sendMessage`,`uploadFile`,`downloadFile` as
producer")
@Metadata(required = true)
Endpoint type;
-
@UriPath(label = "global,security", description = "The authorization token
for using"
+ " the bot (ask the @mrbot) e.g.
9yDv09nqKvP9CkBGKNmKQHir1dj2qLpN-YWa8hP7Rm3LK\"\n"
+ "+
\"3MqQXYdXZIA5W4e0agPiUb-3eUKX69ozUNdY9yZBMlJiwnlksslkjWjsxcARo5cYtDnKTElig0xa\"\n"
@@ -140,7 +139,6 @@ public class SoroushBotEndpoint extends DefaultEndpoint {
super(endpointUri, component);
}
-
/**
* @return supported Soroush endpoint as string to display in error.
*/
@@ -294,8 +292,6 @@ public class SoroushBotEndpoint extends DefaultEndpoint {
/**
* return the lazily created instance of {@link
SoroushBotEndpoint#uploadFileTarget} to used for uploading file to soroush.
- *
- * @return WebTarget
*/
private WebTarget
[camel] branch master updated (536ed17 -> 9f55896)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel.git. from 536ed17 Regen new 61e5de9 Polished new 9f55896 Regen The 2 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: .../src/main/docs/soroush-component.adoc | 15 ++-- .../soroushbot/component/SoroushBotEndpoint.java | 84 +- components/readme.adoc | 4 +- docs/components/modules/ROOT/nav.adoc | 2 +- .../modules/ROOT/pages/soroush-component.adoc | 15 ++-- .../SoroushBotComponentConfiguration.java | 3 +- 6 files changed, 56 insertions(+), 67 deletions(-)
