[camel] branch master updated (6fdf7df -> 31da47e)
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 6fdf7df Updating Xbean new 163e1f4 Remove changing thread name which leads to very verbose output also, thanks to Jason Dillon for reporting on gitter chat new 31da47e CAMEL-13674: Simple language - Add bodyOneLine function 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: core/camel-base/src/main/docs/simple-language.adoc | 2 ++ .../camel/impl/engine/DefaultReactiveExecutor.java | 13 +++-- .../simple/ast/SimpleFunctionExpression.java | 2 ++ .../apache/camel/language/simple/SimpleTest.java | 8 .../camel/support/builder/ExpressionBuilder.java | 22 +- 5 files changed, 36 insertions(+), 11 deletions(-)
[camel] 02/02: CAMEL-13674: Simple language - Add bodyOneLine function
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 31da47edb3885fb83b9f0c32519ef830e28e79ff
Author: Claus Ibsen
AuthorDate: Sat Jun 22 14:52:12 2019 +0200
CAMEL-13674: Simple language - Add bodyOneLine function
---
core/camel-base/src/main/docs/simple-language.adoc | 2 ++
.../simple/ast/SimpleFunctionExpression.java | 2 ++
.../apache/camel/language/simple/SimpleTest.java | 8
.../camel/support/builder/ExpressionBuilder.java | 22 +-
4 files changed, 33 insertions(+), 1 deletion(-)
diff --git a/core/camel-base/src/main/docs/simple-language.adoc
b/core/camel-base/src/main/docs/simple-language.adoc
index fa1aff4..654b66c 100644
--- a/core/camel-base/src/main/docs/simple-language.adoc
+++ b/core/camel-base/src/main/docs/simple-language.adoc
@@ -78,6 +78,8 @@ classname. The converted body can be null.
classname and then invoke methods using a Camel OGNL expression. The
converted body can be null.
+|bodyOneLine | String | Converts the body to a String and removes all
line-breaks so the string is in one line.
+
|mandatoryBodyAs(_type_) |Type |Converts the body to the given type determined
by its
classname, and expects the body to be not null.
diff --git
a/core/camel-base/src/main/java/org/apache/camel/language/simple/ast/SimpleFunctionExpression.java
b/core/camel-base/src/main/java/org/apache/camel/language/simple/ast/SimpleFunctionExpression.java
index 641a8ca..ed4ce03 100644
---
a/core/camel-base/src/main/java/org/apache/camel/language/simple/ast/SimpleFunctionExpression.java
+++
b/core/camel-base/src/main/java/org/apache/camel/language/simple/ast/SimpleFunctionExpression.java
@@ -410,6 +410,8 @@ public class SimpleFunctionExpression extends
LiteralExpression {
return ExpressionBuilder.bodyExpression();
} else if (ObjectHelper.equal(expression, "out.body")) {
return ExpressionBuilder.outBodyExpression();
+} else if (ObjectHelper.equal(expression, "bodyOneLine")) {
+return ExpressionBuilder.bodyOneLine();
} else if (ObjectHelper.equal(expression, "id")) {
return ExpressionBuilder.messageIdExpression();
} else if (ObjectHelper.equal(expression, "exchangeId")) {
diff --git
a/core/camel-core/src/test/java/org/apache/camel/language/simple/SimpleTest.java
b/core/camel-core/src/test/java/org/apache/camel/language/simple/SimpleTest.java
index 261d18b..529f8e0 100644
---
a/core/camel-core/src/test/java/org/apache/camel/language/simple/SimpleTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/language/simple/SimpleTest.java
@@ -1898,6 +1898,14 @@ public class SimpleTest extends LanguageTestSupport {
}
@Test
+public void testBodyAsOneLine() throws Exception {
+exchange.getIn().setBody("Hello" + System.lineSeparator() + "Great" +
System.lineSeparator() + "World");
+assertExpression("${bodyOneLine}", "HelloGreatWorld");
+assertExpression("Hi ${bodyOneLine}", "Hi HelloGreatWorld");
+assertExpression("Hi ${bodyOneLine} Again", "Hi HelloGreatWorld
Again");
+}
+
+@Test
public void testNestedTypeFunction() throws Exception {
// when using type: function we need special logic to not lazy
evaluate it so its evaluated only once
// and won't fool Camel to think its a nested OGNL method call
expression instead (CAMEL-10664)
diff --git
a/core/camel-support/src/main/java/org/apache/camel/support/builder/ExpressionBuilder.java
b/core/camel-support/src/main/java/org/apache/camel/support/builder/ExpressionBuilder.java
index de302e6..f4f2744 100644
---
a/core/camel-support/src/main/java/org/apache/camel/support/builder/ExpressionBuilder.java
+++
b/core/camel-support/src/main/java/org/apache/camel/support/builder/ExpressionBuilder.java
@@ -1640,6 +1640,27 @@ public class ExpressionBuilder {
};
}
+/**
+ * Returns the expression for the message body as a one-line string
+ */
+public static Expression bodyOneLine() {
+return new ExpressionAdapter() {
+public Object evaluate(Exchange exchange) {
+String body = exchange.getIn().getBody(String.class);
+if (body == null) {
+return null;
+}
+body = StringHelper.replaceAll(body, System.lineSeparator(),
"");
+return body;
+}
+
+@Override
+public String toString() {
+return "bodyOneLine()";
+}
+};
+}
+
protected static void setProperty(CamelContext camelContext, Object bean,
String name, Object value) {
try {
IntrospectionSupport.setProperty(camelContext, bean, name, value);
@@ -1647,5 +1668,4 @@ public class ExpressionBuilder {
throw new IllegalArgumentEx
[camel] 01/02: Remove changing thread name which leads to very verbose output also, thanks to Jason Dillon for reporting on gitter chat
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 163e1f4348952a6c54ec62f1832e382d1ee9c02b
Author: Claus Ibsen
AuthorDate: Sat Jun 22 14:19:30 2019 +0200
Remove changing thread name which leads to very verbose output also, thanks
to Jason Dillon for reporting on gitter chat
---
.../apache/camel/impl/engine/DefaultReactiveExecutor.java | 13 +++--
1 file changed, 3 insertions(+), 10 deletions(-)
diff --git
a/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultReactiveExecutor.java
b/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultReactiveExecutor.java
index 17f69e7..c441e34 100644
---
a/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultReactiveExecutor.java
+++
b/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultReactiveExecutor.java
@@ -166,8 +166,6 @@ public class DefaultReactiveExecutor extends ServiceSupport
implements ReactiveE
if (!running || sync) {
running = true;
executor.runningWorkers.incrementAndGet();
-//Thread thread = Thread.currentThread();
-//String name = thread.getName();
try {
for (;;) {
final Runnable polled = queue.poll();
@@ -181,7 +179,6 @@ public class DefaultReactiveExecutor extends ServiceSupport
implements ReactiveE
}
try {
executor.pendingTasks.decrementAndGet();
-//thread.setName(name + " - " + polled.toString());
if (LOG.isTraceEnabled()) {
LOG.trace("Running: {}", runnable);
}
@@ -191,12 +188,13 @@ public class DefaultReactiveExecutor extends
ServiceSupport implements ReactiveE
}
}
} finally {
-//thread.setName(name);
running = false;
executor.runningWorkers.decrementAndGet();
}
} else {
-LOG.debug("Queuing reactive work: {}", runnable);
+if (LOG.isDebugEnabled()) {
+LOG.debug("Queuing reactive work: {}", runnable);
+}
}
}
@@ -205,11 +203,8 @@ public class DefaultReactiveExecutor extends
ServiceSupport implements ReactiveE
if (polled == null) {
return false;
}
-Thread thread = Thread.currentThread();
-String name = thread.getName();
try {
executor.pendingTasks.decrementAndGet();
-thread.setName(name + " - " + polled.toString());
if (LOG.isTraceEnabled()) {
LOG.trace("Running: {}", polled);
}
@@ -217,8 +212,6 @@ public class DefaultReactiveExecutor extends ServiceSupport
implements ReactiveE
} catch (Throwable t) {
// should not happen
LOG.warn("Error executing reactive work due to " +
t.getMessage() + ". This exception is ignored.", t);
-} finally {
-thread.setName(name);
}
return true;
}
[camel-website] branch master updated: Page not found errors fixed in link checker except footer, missing files
This is an automated email from the ASF dual-hosted git repository. zregvart pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-website.git The following commit(s) were added to refs/heads/master by this push: new 8cf0c6e Page not found errors fixed in link checker except footer,missing files 8cf0c6e is described below commit 8cf0c6eda64e3105aef6294a3a53fa5d02a888c5 Author: nayananga@acerubuntu18.04 AuthorDate: Sat Jun 22 15:32:11 2019 +0530 Page not found errors fixed in link checker except footer,missing files --- content/community/articles.md | 6 +++--- content/community/support.md | 6 +++--- content/community/team.md | 2 +- content/community/user-stories.md | 6 +++--- layouts/partials/footer.html | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/content/community/articles.md b/content/community/articles.md index ba4d1bd..b01a9bf 100644 --- a/content/community/articles.md +++ b/content/community/articles.md @@ -165,7 +165,7 @@ These examples show usage of several different components and other concepts suc * [Lessons learned from using Apache Camel, MTOM and JMS](http://blog.avisi.nl/2013/05/28/lessons-learned-from-using-apache-camel-mtom-and-jms/) - Blog post on experience using SOAP with MTOM (using Apache CXF) and JMS (using Apache ActiveMQ). * [Camel CXF Component – WSDL First Example](https://code.notsoclever.cc/camel-cxf-component-wsdl-first-example/) - A simple WSDL first Camel CXF producer and consumer. * [Camel CXFRS Component - Simple REST](http://code.notsoclever.cc/camel-cxfrs-jdbc-rest-example/) - A simple CXFRS example exposing a REST interface to a database table. -* [From inside the code: Camel RouteBuilder and Java DSL](http://www.christianposta.com/blog/?p=249) - A deep dive into the internals of Apache Camel to see how the Java [DSL](dsl.html) works +* [From inside the code: Camel RouteBuilder and Java DSL](http://www.christianposta.com/blog/?p=249) - A deep dive into the internals of Apache Camel to see how the Java [DSL](../../manual/latest/dsl.html) works * [From inside the code: Camel Routing Engine Part I](http://www.christianposta.com/blog/?p=323) - A deep dive into the internals of Apache Camel to see how Camel setup the routes * [Testing Camel JPA routes with Pax-Exam and Karaf](http://notizblog.nierbeck.de/2013/08/testing-camel-jpa-routes-with-pax-exam-and-karaf/) - This blog is about how to use JPA, CXF and ActiveMQ with Camel in Karaf and how to do the testing best * [Testing with Apache Camel](http://bushorn.com/unit-testing-apache-camel/) - Blog post from April 2014 by Gnanaguru summarizing his experience looking into unit testing with Camel and all the possible ways this can be done. @@ -173,7 +173,7 @@ These examples show usage of several different components and other concepts suc * [Parleys Rest SMS with Apache Camel](http://imranrazakh.blogspot.ae/2014/04/parlay-rest-sms-with-apache-camel.html) from April 2014 Imran Raza Khan talking about how to send SMS text messages using REST api with Apache Camel. * [Camel HTTP file upload with multipart/form-data](http://hilton.org.uk/blog/camel-multipart-form-data) from August 2014 by Peter Hilton how to send files over legacy system using HTTP built using Scala and the Scala DSL. * [Spring Boot, Docker and Websockets Integration with Apache Camel](http://blog.andyserver.com/2015/04/spring-boot-docker-websockets-camel/) from April 2015 by Andrew Block how to build a Camel web app using Spring Boot that listen for docker events in a HTML5 web app using web sockets in a micro style manner. -* [Using basic authentication and Jetty realms to protect Apache Camel REST routes](http://www.mooreds.com/wordpress/archives/2065) from June 2015 by Dan Moore writes how to use basic auth with the [Rest DSL](rest-dsl.html) and Jetty as component. +* [Using basic authentication and Jetty realms to protect Apache Camel REST routes](http://www.mooreds.com/wordpress/archives/2065) from June 2015 by Dan Moore writes how to use basic auth with the [Rest DSL](../../manual/latest/rest-dsl.html) and Jetty as component. * [Using Camel, CDI inside Kubernetes with Fabric8](http://Using Camel, CDI inside Kubernetes with Fabric8) from June 2015 by Ioanis Cannelos who writes how to build Camel microservices with CDI and have services discovery and injection with CDI for Docker containers running on Kubernetes with [fabric8](http://fabric8.io/). * [Learn Apache Camel - Indexing Tweets in Real-Time](http://kaviddiss.com/2015/09/06/learn-apache-camel/) from September 2016 by David Kiss, how to pull in tweets in real time and index those in elasticsearch and use a see the data in graphical dashboard. * [Calling Native Code with Camel](http://joshdreagan.github.io/2016/11/21/calling_native_code_with_camel/) from November 2016 by Josh Regan talking about how to call c, c
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/34790 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: Updating Xbean
This is an automated email from the ASF dual-hosted git repository.
coheigea 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 6fdf7df Updating Xbean
6fdf7df is described below
commit 6fdf7dff4013b262f0194d99a2ee927b330fcd67
Author: Colm O hEigeartaigh
AuthorDate: Sat Jun 22 12:55:13 2019 +0100
Updating Xbean
---
parent/pom.xml| 4 +---
platforms/karaf/features/src/main/resources/features.xml | 2 +-
.../spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml | 2 +-
3 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index e0b880a..25601a8 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -703,9 +703,7 @@
1.6.3
2.7.2_3
2.7.2
-4.5
-
-3.14
+4.14
4.5
4.3.19
2.12.0_1
diff --git a/platforms/karaf/features/src/main/resources/features.xml
b/platforms/karaf/features/src/main/resources/features.xml
index a7b1ea2..c468e0e 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -1539,7 +1539,7 @@
mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ant/${ant-bundle-version}
mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.serp/${serp-bundle-version}
mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo-jms-spec-version}
-mvn:org.apache.xbean/xbean-asm4-shaded/${xbean-asm4-bundle-version}
+mvn:org.apache.xbean/xbean-asm5-shaded/${xbean-asm5-shaded-version}
mvn:org.apache.camel/camel-jpa/${project.version}
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 7a48eec..f2c9775 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
@@ -3626,7 +3626,7 @@
org.apache.xbean
xbean-spring
-4.5
+4.14
org.apache.zookeeper
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/34789 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: Upgrade Apache Ignite
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 692e06d Upgrade Apache Ignite 692e06d is described below commit 692e06df606044aedf8398948adda552acf3fa4b Author: Claus Ibsen AuthorDate: Sat Jun 22 11:35:32 2019 +0200 Upgrade Apache Ignite --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index fd8f6bb..e0b880a 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -301,7 +301,7 @@ 2.3.4.726_4 2.3.4.726 1.0.7 -2.7.0 +2.7.5 9.4.15.Final 2.1.6.Final 2.15
[camel] 04/09: architecture.adoc fixed but annotation-based-expression-language.adoc missing
This is an automated email from the ASF dual-hosted git repository. zregvart pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git commit 4cdbc3144fe07dd7fa40c4b5e773a589d822daaa Author: nayananga@acerubuntu18.04 AuthorDate: Sat Jun 22 08:08:48 2019 +0530 architecture.adoc fixed but annotation-based-expression-language.adoc missing --- docs/user-manual/modules/ROOT/pages/architecture.adoc | 7 +++ 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/docs/user-manual/modules/ROOT/pages/architecture.adoc b/docs/user-manual/modules/ROOT/pages/architecture.adoc index 35beeeb..86e8370 100644 --- a/docs/user-manual/modules/ROOT/pages/architecture.adoc +++ b/docs/user-manual/modules/ROOT/pages/architecture.adoc @@ -1,13 +1,12 @@ [[Architecture-Architecture]] === Architecture -Camel uses a Java based xref:dsl.adoc[Routing Domain Specific Language -(DSL)] or an XML Configuration to configure +Camel uses a Java based xref:dsl.adoc[Routing Domain Specific Language (DSL)] +or an XML Configuration to configure routing and mediation rules which are added to a http://camel.apache.org/maven/current/camel-core/apidocs/org/apache/camel/CamelContext.html[CamelContext] to implement the various -xref:enterprise-integration-patterns.adoc[Enterprise Integration -Patterns]. +xref:enterprise-integration-patterns.adoc[Enterprise Integration Patterns]. At a high level Camel consists of a http://camel.apache.org/maven/current/camel-core/apidocs/org/apache/camel/CamelContext.html[CamelContext]
[camel] branch master updated (eb4197d3 -> ddf9c5e)
This is an automated email from the ASF dual-hosted git repository. zregvart pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel.git. from eb4197d3 CAMEL-13663: camel-main-maven-plugin to generte spring-boot tooling metadata to fool Java editors to have code completions for Camel Main application.properties files. new 4b3c9d1 9 link errors fixed because of xrefs are not being single lined website build recognize them as nav-texts not as nav-links new 5ea5f0f fixed aggregate-eip.adoc but leveldb.adoc is missing?? new 77d624b xml-configuration fixed again and architecture.adoc fixed but annotation-based-expression-language.adoc is missing new 4cdbc31 architecture.adoc fixed but annotation-based-expression-language.adoc missing new 349bb6d async.adoc fixed but asynchronous-processing.adoc missing new 4c8f122 bean.adoc,tracer.adoc missing from log-eip.adoc new 5cc9d13 index.adoc reduce lot of errors new a77fc8c link Errors fixed all by using xref: and .adoc new ddf9c5e link errors fixed in docs/component diectory The 9 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: .../modules/ROOT/pages/ahc-component.adoc | 2 +- .../modules/ROOT/pages/ahc-ws-component.adoc | 2 +- .../modules/ROOT/pages/amqp-component.adoc | 2 +- .../modules/ROOT/pages/aws-s3-component.adoc | 6 +- .../modules/ROOT/pages/beanstalk-component.adoc| 4 +- docs/components/modules/ROOT/pages/cdi.adoc| 30 +- .../modules/ROOT/pages/cometd-component.adoc | 2 +- .../modules/ROOT/pages/crypto-component.adoc | 2 +- .../modules/ROOT/pages/cxf-component.adoc | 52 +- .../modules/ROOT/pages/cxf-transport.adoc | 2 +- .../modules/ROOT/pages/cxfrs-component.adoc| 2 +- .../modules/ROOT/pages/dataformat-component.adoc | 6 +- .../modules/ROOT/pages/dataset-component.adoc | 2 +- .../modules/ROOT/pages/dataset-test-component.adoc | 2 +- .../modules/ROOT/pages/disruptor-component.adoc| 2 +- .../ROOT/pages/elasticsearch-rest-component.adoc | 2 +- .../modules/ROOT/pages/facebook-component.adoc | 2 +- .../modules/ROOT/pages/flink-component.adoc| 8 +- .../modules/ROOT/pages/grape-component.adoc| 2 +- .../modules/ROOT/pages/groovy-language.adoc| 4 +- .../modules/ROOT/pages/http4-component.adoc| 2 +- .../modules/ROOT/pages/irc-component.adoc | 2 +- .../modules/ROOT/pages/jetty-component.adoc| 4 +- .../modules/ROOT/pages/jms-component.adoc | 6 +- .../modules/ROOT/pages/jpa-component.adoc | 14 +- .../modules/ROOT/pages/language-component.adoc | 2 +- .../modules/ROOT/pages/mail-component.adoc | 2 +- .../modules/ROOT/pages/metrics-component.adoc | 10 +- .../modules/ROOT/pages/micrometer-component.adoc | 10 +- .../modules/ROOT/pages/mock-component.adoc | 2 +- .../modules/ROOT/pages/mvel-language.adoc | 2 +- .../modules/ROOT/pages/nagios-component.adoc | 2 +- .../modules/ROOT/pages/netty4-component.adoc | 2 +- .../modules/ROOT/pages/ognl-language.adoc | 2 +- .../pages/openshift-build-configs-component.adoc | 2 +- .../modules/ROOT/pages/paho-component.adoc | 2 +- .../modules/ROOT/pages/pdf-component.adoc | 8 +- .../modules/ROOT/pages/properties-component.adoc | 2 +- .../modules/ROOT/pages/quartz2-component.adoc | 2 +- docs/components/modules/ROOT/pages/ribbon.adoc | 2 +- .../modules/ROOT/pages/servlet-component.adoc | 2 +- .../modules/ROOT/pages/soroush-component.adoc | 4 +- .../modules/ROOT/pages/spel-language.adoc | 4 +- .../components/modules/ROOT/pages/spring-boot.adoc | 2 +- .../modules/ROOT/pages/spring-event-component.adoc | 4 +- .../modules/ROOT/pages/spring-security.adoc| 2 +- docs/components/modules/ROOT/pages/spring.adoc | 20 +- .../modules/ROOT/pages/sql-stored-component.adoc | 4 +- .../modules/ROOT/pages/telegram-component.adoc | 4 +- .../modules/ROOT/pages/timer-component.adoc| 2 +- docs/components/modules/ROOT/pages/twitter.adoc| 2 +- .../modules/ROOT/pages/undertow-component.adoc | 2 +- .../ROOT/pages/univocity-csv-dataformat.adoc | 2 +- .../ROOT/pages/univocity-fixed-dataformat.adoc | 2 +- .../ROOT/pages/univocity-tsv-dataformat.adoc | 2 +- .../modules/ROOT/pages/websocket-component.adoc| 2 +- .../modules/ROOT/pages/xmlsecurity-component.adoc | 2 +- .../modules/ROOT/pages/xpath-language.adoc | 4 +- .../modules/ROOT/pages/xquery-component.adoc | 4 +- .../modules/ROOT/p
[camel] 01/09: 9 link errors fixed because of xrefs are not being single lined website build recognize them as nav-texts not as nav-links
This is an automated email from the ASF dual-hosted git repository. zregvart pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git commit 4b3c9d1972bafd7b6a15d76c8a205b4d5d5a1454 Author: nayananga@acerubuntu18.04 AuthorDate: Fri Jun 21 23:50:43 2019 +0530 9 link errors fixed because of xrefs are not being single lined website build recognize them as nav-texts not as nav-links --- docs/user-manual-nav.adoc.template | 27 +-- docs/user-manual/modules/ROOT/nav.adoc | 27 +-- 2 files changed, 18 insertions(+), 36 deletions(-) diff --git a/docs/user-manual-nav.adoc.template b/docs/user-manual-nav.adoc.template index a8bb020..45dd58c 100644 --- a/docs/user-manual-nav.adoc.template +++ b/docs/user-manual-nav.adoc.template @@ -53,29 +53,20 @@ ** xref:faq/does-camel-work-on-ibms-jdk.adoc[Does Camel work on IBM's JDK?] ** xref:support.adoc[How can I get help?] ** xref:faq/how-can-i-get-the-source-code.adoc[How can I get the source code?] - ** xref:faq/how-does-camel-compare-to-mule.adoc[How does Camel compare to -Mule?] - ** xref:faq/how-does-camel-compare-to-servicemix.adoc[How does Camel compare -to ServiceMix?] - ** xref:faq/how-does-camel-compare-to-servicemix-eip.adoc[How does Camel -compare to ServiceMix EIP?] - ** xref:faq/how-does-camel-compare-to-synapse.adoc[How does Camel compare to -Synapse?] + ** xref:faq/how-does-camel-compare-to-mule.adoc[How does Camel compare to Mule?] + ** xref:faq/how-does-camel-compare-to-servicemix.adoc[How does Camel compare to ServiceMix?] + ** xref:faq/how-does-camel-compare-to-servicemix-eip.adoc[How does Camel compare to ServiceMix EIP?] + ** xref:faq/how-does-camel-compare-to-synapse.adoc[How does Camel compare to Synapse?] ** xref:faq/how-does-camel-work.adoc[How does Camel work?] - ** xref:faq/how-does-camel-work-with-activemq.adoc[How does Camel work with -ActiveMQ?] - ** xref:faq/how-does-camel-work-with-servicemix.adoc[How does Camel work with -ServiceMix?] - ** xref:faq/how-does-the-camel-api-compare-to.adoc[How does the Camel API -compare to?] + ** xref:faq/how-does-camel-work-with-activemq.adoc[How does Camel work with ActiveMQ?] + ** xref:faq/how-does-camel-work-with-servicemix.adoc[How does Camel work with ServiceMix?] + ** xref:faq/how-does-the-camel-api-compare-to.adoc[How does the Camel API compare to?] ** xref:faq/how-does-the-website-work.adoc[How does the website work?] ** xref:faq/how-do-i-become-a-committer.adoc[How do I become a committer?] ** xref:faq/how-do-i-compile-the-code.adoc[How do I compile the code?] ** xref:faq/how-do-i-edit-the-website.adoc[How do I edit the website?] - ** xref:faq/how-do-i-run-camel-using-java-webstart.adoc[How do I run Camel -using Java WebStart?] - ** xref:faq/if-i-use-servicemix-when-should-i-use-camel.adoc[If I use -ServiceMix when should I use Camel?] + ** xref:faq/how-do-i-run-camel-using-java-webstart.adoc[How do I run Camel using Java WebStart?] + ** xref:faq/if-i-use-servicemix-when-should-i-use-camel.adoc[If I use ServiceMix when should I use Camel?] ** xref:faq/is-camel-an-esb.adoc[Is Camel an ESB?] ** xref:faq/is-camel-ioc-friendly.adoc[Is Camel IoC friendly?] ** xref:faq/running-camel-standalone.adoc[Running Camel standalone] diff --git a/docs/user-manual/modules/ROOT/nav.adoc b/docs/user-manual/modules/ROOT/nav.adoc index 922b32e..cab60cb 100644 --- a/docs/user-manual/modules/ROOT/nav.adoc +++ b/docs/user-manual/modules/ROOT/nav.adoc @@ -127,29 +127,20 @@ ** xref:faq/does-camel-work-on-ibms-jdk.adoc[Does Camel work on IBM's JDK?] ** xref:support.adoc[How can I get help?] ** xref:faq/how-can-i-get-the-source-code.adoc[How can I get the source code?] - ** xref:faq/how-does-camel-compare-to-mule.adoc[How does Camel compare to -Mule?] - ** xref:faq/how-does-camel-compare-to-servicemix.adoc[How does Camel compare -to ServiceMix?] - ** xref:faq/how-does-camel-compare-to-servicemix-eip.adoc[How does Camel -compare to ServiceMix EIP?] - ** xref:faq/how-does-camel-compare-to-synapse.adoc[How does Camel compare to -Synapse?] + ** xref:faq/how-does-camel-compare-to-mule.adoc[How does Camel compare to Mule?] + ** xref:faq/how-does-camel-compare-to-servicemix.adoc[How does Camel compare to ServiceMix?] + ** xref:faq/how-does-camel-compare-to-servicemix-eip.adoc[How does Camel compare to ServiceMix EIP?] + ** xref:faq/how-does-camel-compare-to-synapse.adoc[How does Camel compare to Synapse?] ** xref:faq/how-does-camel-work.adoc[How does Camel work?] - ** xref:faq/how-does-camel-work-with-activemq.adoc[How does Camel work with -ActiveMQ?] - ** xref:faq/how-does-camel-work-with-servicemix.adoc[How does Camel work with -ServiceMix?] - ** xref:faq/how-does-the-camel-api-compare-to.adoc[How does the Camel API -compare to?] + ** xref:faq/how-does-camel-work-with-activemq.adoc[How does Camel work with ActiveMQ?] + ** xref:faq/how-does-camel-work-with-servicemix.adoc[How does Camel work
[camel] 06/09: bean.adoc,tracer.adoc missing from log-eip.adoc
This is an automated email from the ASF dual-hosted git repository. zregvart pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git commit 4c8f122a58e1bc43b8d9d22033b92d5dc1f86116 Author: nayananga@acerubuntu18.04 AuthorDate: Sat Jun 22 08:27:31 2019 +0530 bean.adoc,tracer.adoc missing from log-eip.adoc --- .../modules/ROOT/pages/asynchronous-routing-engine.adoc | 4 ++-- ...seoriginalmessage-with-error-handler-not-work-as-expected.adoc | 8 docs/user-manual/modules/ROOT/pages/log-eip.adoc | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/docs/user-manual/modules/ROOT/pages/asynchronous-routing-engine.adoc b/docs/user-manual/modules/ROOT/pages/asynchronous-routing-engine.adoc index c35bec1..da6a90c 100644 --- a/docs/user-manual/modules/ROOT/pages/asynchronous-routing-engine.adoc +++ b/docs/user-manual/modules/ROOT/pages/asynchronous-routing-engine.adoc @@ -4,8 +4,8 @@ *Available as of Camel 2.4* As of Camel 2.4 the asynchronous routing engine is back and kicking. + -All the link:enterprise-integration-patterns.adoc[Enterprise -Integration Patterns] are supported as well a selected number of +All the xref:enterprise-integration-patterns.adoc[Enterprise Integration Patterns] +are supported as well a selected number of Components: * <> *Camel 2.8:* (only producer) diff --git a/docs/user-manual/modules/ROOT/pages/faq/why-does-useoriginalmessage-with-error-handler-not-work-as-expected.adoc b/docs/user-manual/modules/ROOT/pages/faq/why-does-useoriginalmessage-with-error-handler-not-work-as-expected.adoc index d8a94dd..7f4c038 100644 --- a/docs/user-manual/modules/ROOT/pages/faq/why-does-useoriginalmessage-with-error-handler-not-work-as-expected.adoc +++ b/docs/user-manual/modules/ROOT/pages/faq/why-does-useoriginalmessage-with-error-handler-not-work-as-expected.adoc @@ -1,15 +1,15 @@ [[WhydoesuseOriginalMessagewitherrorhandlernotworkasexpected-WhydoesuseOriginalMessagewitherrorhandlernotworkasexpected]] === Why does useOriginalMessage with error handler not work as expected? -If you use the link:../exception-clause.adoc[useOriginalMessage] option -from the Camel link:../exception-clause.adoc[Error Handler] then it matters -if you use this with link:../enterprise-integration-patterns.adoc[EIP]s such as: +If you use the xref:../exception-clause.adoc[useOriginalMessage] option +from the Camel xref:../exception-clause.adoc[Error Handler] then it matters +if you use this with xref:../enterprise-integration-patterns.adoc[EIP]s such as: * <> * <> * <> -Then the option `shareUnitOfWork` on these link:../enterprise-integration-patterns.adoc[EIP]s +Then the option `shareUnitOfWork` on these xref:../enterprise-integration-patterns.adoc[EIP]s influence the message in use by the `useOriginalMessage` option. See more details at <> and further below with diff --git a/docs/user-manual/modules/ROOT/pages/log-eip.adoc b/docs/user-manual/modules/ROOT/pages/log-eip.adoc index 810823b..edf95ac 100644 --- a/docs/user-manual/modules/ROOT/pages/log-eip.adoc +++ b/docs/user-manual/modules/ROOT/pages/log-eip.adoc @@ -1,12 +1,12 @@ [[log-eip]] == Log EIP -How can I log the processing of a link:message.html[Message]? +How can I log the processing of a xref:message.adoc[Message]? Camel provides many ways to log the fact that you are processing a message. Here are just a few examples: * You can use the <> component which logs the Message content. -* You can use the link:tracer.html[Tracer] which trace logs message flow. -* You can also use a link:processor.html[Processor] or link:bean.html[Bean] and log from Java code. +* You can use the xref:tracer.adoc[Tracer] which trace logs message flow. +* You can also use a xref:processor.adoc[Processor] or xref:bean.adoc[Bean] and log from Java code. * You can use the log DSL. === Options
[camel] 09/09: link errors fixed in docs/component diectory
This is an automated email from the ASF dual-hosted git repository.
zregvart pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit ddf9c5e11991993c334d5fd9764fbf32a9513c42
Author: nayananga@acerubuntu18.04
AuthorDate: Sat Jun 22 13:04:34 2019 +0530
link errors fixed in docs/component diectory
---
.../modules/ROOT/pages/ahc-component.adoc | 2 +-
.../modules/ROOT/pages/ahc-ws-component.adoc | 2 +-
.../modules/ROOT/pages/amqp-component.adoc | 2 +-
.../modules/ROOT/pages/aws-s3-component.adoc | 6 +--
.../modules/ROOT/pages/beanstalk-component.adoc| 4 +-
docs/components/modules/ROOT/pages/cdi.adoc| 30 ++---
.../modules/ROOT/pages/cometd-component.adoc | 2 +-
.../modules/ROOT/pages/crypto-component.adoc | 2 +-
.../modules/ROOT/pages/cxf-component.adoc | 52 +++---
.../modules/ROOT/pages/cxf-transport.adoc | 2 +-
.../modules/ROOT/pages/cxfrs-component.adoc| 2 +-
.../modules/ROOT/pages/dataformat-component.adoc | 6 +--
.../modules/ROOT/pages/dataset-component.adoc | 2 +-
.../modules/ROOT/pages/dataset-test-component.adoc | 2 +-
.../modules/ROOT/pages/disruptor-component.adoc| 2 +-
.../ROOT/pages/elasticsearch-rest-component.adoc | 2 +-
.../modules/ROOT/pages/facebook-component.adoc | 2 +-
.../modules/ROOT/pages/flink-component.adoc| 8 ++--
.../modules/ROOT/pages/grape-component.adoc| 2 +-
.../modules/ROOT/pages/groovy-language.adoc| 4 +-
.../modules/ROOT/pages/http4-component.adoc| 2 +-
.../modules/ROOT/pages/irc-component.adoc | 2 +-
.../modules/ROOT/pages/jetty-component.adoc| 4 +-
.../modules/ROOT/pages/jms-component.adoc | 6 +--
.../modules/ROOT/pages/jpa-component.adoc | 14 +++---
.../modules/ROOT/pages/language-component.adoc | 2 +-
.../modules/ROOT/pages/mail-component.adoc | 2 +-
.../modules/ROOT/pages/metrics-component.adoc | 10 ++---
.../modules/ROOT/pages/micrometer-component.adoc | 10 ++---
.../modules/ROOT/pages/mock-component.adoc | 2 +-
.../modules/ROOT/pages/mvel-language.adoc | 2 +-
.../modules/ROOT/pages/nagios-component.adoc | 2 +-
.../modules/ROOT/pages/netty4-component.adoc | 2 +-
.../modules/ROOT/pages/ognl-language.adoc | 2 +-
.../pages/openshift-build-configs-component.adoc | 2 +-
.../modules/ROOT/pages/paho-component.adoc | 2 +-
.../modules/ROOT/pages/pdf-component.adoc | 8 ++--
.../modules/ROOT/pages/properties-component.adoc | 2 +-
.../modules/ROOT/pages/quartz2-component.adoc | 2 +-
docs/components/modules/ROOT/pages/ribbon.adoc | 2 +-
.../modules/ROOT/pages/servlet-component.adoc | 2 +-
.../modules/ROOT/pages/soroush-component.adoc | 4 +-
.../modules/ROOT/pages/spel-language.adoc | 4 +-
.../components/modules/ROOT/pages/spring-boot.adoc | 2 +-
.../modules/ROOT/pages/spring-event-component.adoc | 4 +-
.../modules/ROOT/pages/spring-security.adoc| 2 +-
docs/components/modules/ROOT/pages/spring.adoc | 20 -
.../modules/ROOT/pages/sql-stored-component.adoc | 4 +-
.../modules/ROOT/pages/telegram-component.adoc | 4 +-
.../modules/ROOT/pages/timer-component.adoc| 2 +-
docs/components/modules/ROOT/pages/twitter.adoc| 2 +-
.../modules/ROOT/pages/undertow-component.adoc | 2 +-
.../ROOT/pages/univocity-csv-dataformat.adoc | 2 +-
.../ROOT/pages/univocity-fixed-dataformat.adoc | 2 +-
.../ROOT/pages/univocity-tsv-dataformat.adoc | 2 +-
.../modules/ROOT/pages/websocket-component.adoc| 2 +-
.../modules/ROOT/pages/xmlsecurity-component.adoc | 2 +-
.../modules/ROOT/pages/xpath-language.adoc | 4 +-
.../modules/ROOT/pages/xquery-component.adoc | 4 +-
.../modules/ROOT/pages/xquery-language.adoc| 4 +-
.../modules/ROOT/pages/xslt-component.adoc | 2 +-
docs/components/modules/ROOT/pages/zipkin.adoc | 4 +-
62 files changed, 148 insertions(+), 148 deletions(-)
diff --git a/docs/components/modules/ROOT/pages/ahc-component.adoc
b/docs/components/modules/ROOT/pages/ahc-component.adoc
index e7cd912..bd44369 100644
--- a/docs/components/modules/ROOT/pages/ahc-component.adoc
+++ b/docs/components/modules/ROOT/pages/ahc-component.adoc
@@ -421,7 +421,7 @@ from("direct:start")
Using the JSSE Configuration Utility
The AHC component supports SSL/TLS configuration
-through the link:camel-configuration-utilities.html[Camel JSSE
+through the xref:camel-configuration-utilities.adoc[Camel JSSE
Configuration Utility]. This utility greatly decreases the amount of
component specific code you need to write and is configurable at the
endpoint and component levels. The following examples demonstrate how
diff --git a/docs/components/modules/ROOT/pages/ahc-ws-component.adoc
[camel] 02/09: fixed aggregate-eip.adoc but leveldb.adoc is missing??
This is an automated email from the ASF dual-hosted git repository.
zregvart pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 5ea5f0fb4e8cc4b270051d1b7bb620195f506acb
Author: nayananga@acerubuntu18.04
AuthorDate: Sat Jun 22 00:04:11 2019 +0530
fixed aggregate-eip.adoc but leveldb.adoc is missing??
---
.../modules/ROOT/pages/aggregate-eip.adoc | 26 +++---
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/docs/user-manual/modules/ROOT/pages/aggregate-eip.adoc
b/docs/user-manual/modules/ROOT/pages/aggregate-eip.adoc
index fe21813..1f29ed3 100644
--- a/docs/user-manual/modules/ROOT/pages/aggregate-eip.adoc
+++ b/docs/user-manual/modules/ROOT/pages/aggregate-eip.adoc
@@ -2,13 +2,13 @@
== Aggregate EIP
The
-http://www.enterpriseintegrationpatterns.com/Aggregator.html[Aggregator]
-from the link:enterprise-integration-patterns.html[EIP patterns] allows
+http://www.enterpriseintegrationpatterns.com/Aggregator.adoc[Aggregator]
+from the xref:enterprise-integration-patterns.adoc[EIP patterns] allows
you to combine a number of messages together into a single message.
image:http://www.enterpriseintegrationpatterns.com/img/Aggregator.gif[image]
-A correlation link:expression.html[Expression] is used to determine the
+A correlation xref:expression.adoc[Expression] is used to determine the
messages which should be aggregated together. If you want to aggregate
all messages into a single message, just use a constant expression. An
AggregationStrategy is used to combine all the message exchanges for a
@@ -104,7 +104,7 @@ class ArrayListAggregationStrategy implements
AggregationStrategy {
=== About completion
-When aggregation link:exchange.html[Exchange]s at some point you need to
+When aggregation xref:exchange.adoc[Exchange]s at some point you need to
indicate that the aggregated exchanges is complete, so they can be send
out of the aggregator. Camel allows you to indicate completion in
various ways as follows:
@@ -116,7 +116,7 @@ key within the period.
exchanges are completed.
* completionSize - Is a number indicating that after X aggregated
exchanges it's complete.
-* completionPredicate - Runs a link:predicate.html[Predicate] when a new
+* completionPredicate - Runs a xref:predicate.adoc[Predicate] when a new
exchange is aggregated to determine if we are complete or not. Staring
in *Camel 2.15*, the configured aggregationStrategy can implement the
Predicate interface and will be used as the completionPredicate if no
@@ -126,7 +126,7 @@ implement `PreCompletionAwareAggregationStrategy` and will
be used as
the completionPredicate in pre-complete check mode. See further below
for more details.
* completionFromBatchConsumer - Special option for
-link:batch-consumer.html[Batch Consumer] which allows you to complete
+xref:batch-consumer.adoc[Batch Consumer] which allows you to complete
when all the messages from the batch has been aggregated.
* forceCompletionOnStop - *Camel 2.9* Indicates to complete all current
aggregated exchanges when the context is stopped
@@ -148,9 +148,9 @@ aggregator. If not provided Camel will thrown an Exception
on startup.
*available as of Camel 2.16*
There can be use-cases where you want the incoming
-link:exchange.html[Exchange] to determine if the correlation group
+xref:exchange.adoc[Exchange] to determine if the correlation group
should pre-complete, and then the incoming
-link:exchange.html[Exchange] is starting a new group from scratch. To
+xref:exchange.adoc[Exchange] is starting a new group from scratch. To
determine this the `AggregationStrategy` can
implement `PreCompletionAwareAggregationStrategy` which has
a `preComplete` method:
@@ -188,7 +188,7 @@ consumer etc)
The aggregator provides a pluggable repository which you can implement
your own `org.apache.camel.spi.AggregationRepository`. +
If you need persistent repository then you can use either Camel
-link:leveldb.html[LevelDB], or <> components.
+xref:leveldb.adoc[LevelDB], or <> components.
=== Using TimeoutAwareAggregationStrategy
@@ -574,7 +574,7 @@ without using POJOs then you may have `null` as
`oldExchange` or
Aggregate EIP will invoke the
`AggregationStrategy` with `oldExchange` as null, for the first
Exchange incoming to the aggregator. And then for
-subsequent link:exchange.html[Exchange]s then `oldExchange` and
+subsequent xref:exchange.adoc[Exchange]s then `oldExchange` and
`newExchange` parameters are both not null.
Example with Content Enricher EIP and no data
@@ -630,14 +630,14 @@ public class MyBodyAppender {
}
-In the example above we use the link:content-enricher.html[Content
-Enricher] EIP using `pollEnrich`. The `newExchange` will be null in the
+In the example above we use the xref:content-enricher.adoc[Content Enricher]
+EIP using `pollEnrich`. The `newExchange` will be null in the
situation we could not get any data from the "seda:foo" endpoi
[camel] 07/09: index.adoc reduce lot of errors
This is an automated email from the ASF dual-hosted git repository.
zregvart pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 5cc9d133e80983866de947cf7c09d4d5f394aa0e
Author: nayananga@acerubuntu18.04
AuthorDate: Sat Jun 22 08:44:15 2019 +0530
index.adoc reduce lot of errors
---
.../modules/ROOT/pages/backlog-tracer.adoc | 28 +-
.../pages/faq/how-to-use-a-dynamic-uri-in-to.adoc | 6 +-
...se-when-or-otherwise-in-a-java-camel-route.adoc | 12 +-
.../user-manual/modules/ROOT/pages/filter-eip.adoc | 20 +-
docs/user-manual/modules/ROOT/pages/index.adoc | 948 ++---
5 files changed, 507 insertions(+), 507 deletions(-)
diff --git a/docs/user-manual/modules/ROOT/pages/backlog-tracer.adoc
b/docs/user-manual/modules/ROOT/pages/backlog-tracer.adoc
index a197f50..4f23dbe 100644
--- a/docs/user-manual/modules/ROOT/pages/backlog-tracer.adoc
+++ b/docs/user-manual/modules/ROOT/pages/backlog-tracer.adoc
@@ -18,16 +18,16 @@ calling the backlogTracer's `setEnabled` method.
[[BacklogTracer-BacklogTracerDifference]]
What is the difference between BacklogTracer and Tracer
-Camel also provides a link:tracer.html[Tracer] which has similar
+Camel also provides a xref:tracer.adoc[Tracer] which has similar
capabilities as this backlog tracer. The difference is that the backlog
tracer is storing +
a capture of the message in an internal backlog queue. Where as the
-link:tracer.html[Tracer] is event based and logs the messages as they
+xref:tracer.adoc[Tracer] is event based and logs the messages as they
happen (or route to another Camel destination). Also the
-link:tracer.html[Tracer] has more fine grained events where it dives
-into link:enterprise-integration-patterns.adoc[EIP]s such as the
-link:content-based-router.html[Content Based Router] and traces the
-when/otherwise(s). Though the link:tracer.html[Tracer] has much more
+xref:tracer.adoc[Tracer] has more fine grained events where it dives
+into xref:enterprise-integration-patterns.adoc[EIP]s such as the
+xref:content-based-router.adoc[Content Based Router] and traces the
+when/otherwise(s). Though the xref:tracer.adoc[Tracer] has much more
complicated logic to handle this (there is some edge-cases where this
may not work). The BacklogTracer allows you to pull the messages from
the backlog queues on demand. The BacklogTracer works better with JMX
@@ -54,11 +54,11 @@ id and route id. For example use `"to1,to2"` to match only
nodes with
either the name "to1", or "to2". You can use * for wildcards. So you can
do "to*" to match any to. Or use "route-foo*" to match any foo routes.
-|traceFilter |`null` |Allow to configure a filter as a
link:predicate.html[Predicate] using
-any of the Camel link:languages.adoc[languages]. But default the
+|traceFilter |`null` |Allow to configure a filter as a
xref:predicate.adoc[Predicate] using
+any of the Camel xref:languages.adoc[languages]. But default the
<> language is used. For example to filter on
messages with a given header, use `${header.foo} != null`. To use
-link:groovy.html[Groovy] then prefix the value with "groovy:". And
+xref:groovy.adoc[Groovy] then prefix the value with "groovy:". And
similar for the other languages.
|removeOnDump |`true` |Whether to remove the traced messages that was returned
when invoking
@@ -69,7 +69,7 @@ or negative value to use unlimited size.
|bodyIncludeStreams |`false` |Whether to include the message body of stream
based messages. If enabled
then beware the stream may not be re-readable later. See more about
-link:stream-caching.adoc[Stream Caching].
+xref:stream-caching.adoc[Stream Caching].
|bodyIncludeFiles |`true` |Whether to include the message body of file based
messages. The overhead
is that the file content has to be read from the file.
@@ -106,9 +106,9 @@ You would need to enable this using the JMX API.
[[BacklogTracer-SeeAlso]]
See Also
-* link:tracer.html[Tracer]
-* link:tracer-example.html[Tracer Example]
-* link:debugger.adoc[Debugger]
-* link:delay-interceptor.adoc[Delay Interceptor]
+* xref:tracer.adoc[Tracer]
+* xref:tracer-example.adoc[Tracer Example]
+* xref:debugger.adoc[Debugger]
+* xref:delay-interceptor.adoc[Delay Interceptor]
* <>
diff --git
a/docs/user-manual/modules/ROOT/pages/faq/how-to-use-a-dynamic-uri-in-to.adoc
b/docs/user-manual/modules/ROOT/pages/faq/how-to-use-a-dynamic-uri-in-to.adoc
index 0450360..1c91d32 100644
---
a/docs/user-manual/modules/ROOT/pages/faq/how-to-use-a-dynamic-uri-in-to.adoc
+++
b/docs/user-manual/modules/ROOT/pages/faq/how-to-use-a-dynamic-uri-in-to.adoc
@@ -31,7 +31,7 @@ This snippet is not valid code. Read on.
In this case, you must use an EIP (Enterprise Integration Pattern) that
is capable of computing a dynamic URI using
-an link:../expression.adoc[Expression], such as
+an xref:../expression.adoc[Expression], such as
the <> EIP pattern.
For example, rewriting the snippet above to use
[camel] 05/09: async.adoc fixed but asynchronous-processing.adoc missing
This is an automated email from the ASF dual-hosted git repository. zregvart pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git commit 349bb6df622c0fa56e2fe319b66fbc219b3064e0 Author: nayananga@acerubuntu18.04 AuthorDate: Sat Jun 22 08:15:39 2019 +0530 async.adoc fixed but asynchronous-processing.adoc missing --- docs/user-manual/modules/ROOT/pages/async.adoc | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/user-manual/modules/ROOT/pages/async.adoc b/docs/user-manual/modules/ROOT/pages/async.adoc index afd4d26..53b817b 100644 --- a/docs/user-manual/modules/ROOT/pages/async.adoc +++ b/docs/user-manual/modules/ROOT/pages/async.adoc @@ -121,8 +121,8 @@ application is still waiting. + 3. The message is processed completely and the control is returned to the client. -So why do you want to use synchronous link:event-message.html[Request -Only]? Well if you want to know whether the message was processed +So why do you want to use synchronous xref:event-message.adoc[Request Only]? +Well if you want to know whether the message was processed successfully or not before continuing. With synchronous it allows you to wait while the message is being processed. In case the processing was successful the control is returned to the client with no notion of error. @@ -485,8 +485,8 @@ The `threads` DSL leverages the JDK concurrency framework for multi threading. It can be used to turn a synchronous route into Async. What happens is that from the point forwards from `threads` the messages is routed asynchronous in a new thread. -Camel leverages the link:asynchronous-processing.html[asynchronous -routing engine], which was re-introduced in Camel 2.4, to continue +Camel leverages the xref:asynchronous-processing.adoc[asynchronous routing engine], +which was re-introduced in Camel 2.4, to continue routing the Exchange asynchronously. The `threads` DSL supports the following options:
[camel] 03/09: xml-configuration fixed again and architecture.adoc fixed but annotation-based-expression-language.adoc is missing
This is an automated email from the ASF dual-hosted git repository. zregvart pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git commit 77d624bc56fccadfd8b907e4a82640572942d5e4 Author: nayananga@acerubuntu18.04 AuthorDate: Sat Jun 22 00:14:29 2019 +0530 xml-configuration fixed again and architecture.adoc fixed but annotation-based-expression-language.adoc is missing --- docs/user-manual/modules/ROOT/pages/architecture.adoc| 7 +++ .../modules/ROOT/pages/xml-configuration.adoc| 16 ++-- 2 files changed, 9 insertions(+), 14 deletions(-) diff --git a/docs/user-manual/modules/ROOT/pages/architecture.adoc b/docs/user-manual/modules/ROOT/pages/architecture.adoc index f410bf0..35beeeb 100644 --- a/docs/user-manual/modules/ROOT/pages/architecture.adoc +++ b/docs/user-manual/modules/ROOT/pages/architecture.adoc @@ -1,12 +1,12 @@ [[Architecture-Architecture]] === Architecture -Camel uses a Java based link:dsl.adoc[Routing Domain Specific Language +Camel uses a Java based xref:dsl.adoc[Routing Domain Specific Language (DSL)] or an XML Configuration to configure routing and mediation rules which are added to a http://camel.apache.org/maven/current/camel-core/apidocs/org/apache/camel/CamelContext.html[CamelContext] to implement the various -link:enterprise-integration-patterns.adoc[Enterprise Integration +xref:enterprise-integration-patterns.adoc[Enterprise Integration Patterns]. At a high level Camel consists of a @@ -33,8 +33,7 @@ Expression or Predicate to make a truly powerful DSL which is extensible to the most suitable language depending on your needs. Many of the Languages are also supported as -link:annotation-based-expression-language.html[Annotation Based -Expression Language]. +xref:annotation-based-expression-language.adoc[Annotation Based Expression Language]. [[Architecture-Diagram]] Diagram diff --git a/docs/user-manual/modules/ROOT/pages/xml-configuration.adoc b/docs/user-manual/modules/ROOT/pages/xml-configuration.adoc index 06642e6..3db1384 100644 --- a/docs/user-manual/modules/ROOT/pages/xml-configuration.adoc +++ b/docs/user-manual/modules/ROOT/pages/xml-configuration.adoc @@ -1,25 +1,21 @@ [[XMLConfiguration-XMLConfiguration]] === XML Configuration -We recommend developers use the Java xref:dsl.adoc[Domain Specific -Language] when writing routing rules as this provides maximum IDE +We recommend developers use the Java xref:dsl.adoc[Domain Specific Language] when writing routing rules as this provides maximum IDE completion and functionality while being the most expressive. However if you wish to put your routing rules in XML you can via the Camel XML language. Camel XML uses xref:spring.adoc[Spring] 2 namespaces; so that you can -configure your routing rules within your xref:spring.adoc[Spring XML -configuration file]; you can also use -xref:faq/how-do-i-configure-endpoints.adoc[Java code to configure components -and endpoints]. +configure your routing rules within your +xref:spring.adoc[Spring XML configuration file]; you can also use +xref:faq/how-do-i-configure-endpoints.adoc[Java code to configure components and endpoints]. For examples on how to use Camel XML, see the -xref:enterprise-integration-patterns.adoc[Enterprise Integration -Patterns] or refer to the xref:spring.adoc[Spring Support]. +xref:enterprise-integration-patterns.adoc[Enterprise Integration Patterns] or refer to the xref:spring.adoc[Spring Support]. [[XMLConfiguration-SeeAlso]] === See Also * xref:xml-reference.adoc[XML Reference] -* xref:faq/how-do-i-use-spring-property-placeholder-with-camel-xml.adoc[How -do I use Spring Property Placeholder with Camel XML] +* xref:faq/how-do-i-use-spring-property-placeholder-with-camel-xml.adoc[How do I use Spring Property Placeholder with Camel XML]
[camel] 02/02: CAMEL-13663: camel-main-maven-plugin to generte spring-boot tooling metadata to fool Java editors to have code completions for Camel Main application.properties files.
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 eb4197d3944b096134bf5e3164737bf359df8e3b
Author: Claus Ibsen
AuthorDate: Sat Jun 22 11:20:52 2019 +0200
CAMEL-13663: camel-main-maven-plugin to generte spring-boot tooling
metadata to fool Java editors to have code completions for Camel Main
application.properties files.
---
.../main/java/org/apache/camel/maven/AbstractMainMojo.java | 6 --
.../src/main/java/org/apache/camel/maven/GenerateMojo.java | 14 ++
.../java/org/apache/camel/maven/model/SpringBootData.java | 12 +++-
.../resources/META-INF/spring-configuration-metadata.json | 4 +++-
.../resources/META-INF/spring-configuration-metadata.json | 4 +++-
5 files changed, 31 insertions(+), 9 deletions(-)
diff --git
a/catalog/camel-main-maven-plugin/src/main/java/org/apache/camel/maven/AbstractMainMojo.java
b/catalog/camel-main-maven-plugin/src/main/java/org/apache/camel/maven/AbstractMainMojo.java
index bd93300..b1f8a0d 100644
---
a/catalog/camel-main-maven-plugin/src/main/java/org/apache/camel/maven/AbstractMainMojo.java
+++
b/catalog/camel-main-maven-plugin/src/main/java/org/apache/camel/maven/AbstractMainMojo.java
@@ -98,7 +98,8 @@ public abstract class AbstractMainMojo extends
AbstractExecMojo {
@FunctionalInterface
protected interface ComponentCallback {
-void onOption(String componentName, String componentJavaType, String
name, String type, String javaType, String description, String defaultValue);
+void onOption(String componentName, String componentJavaType, String
name, String type, String javaType,
+ String description, String defaultValue, boolean
deprecated);
}
protected void doExecute(ComponentCallback callback) throws
MojoExecutionException, MojoFailureException {
@@ -173,8 +174,9 @@ public abstract class AbstractMainMojo extends
AbstractExecMojo {
String javaType = safeJavaType(row.get("javaType"));
String desc = safeValue(row.get("description"));
String defaultValue = row.get("defaultValue");
+boolean deprecated =
"true".equals(row.getOrDefault("deprecated", "false"));
-callback.onOption(componentName, componentJavaType, name,
type, javaType, desc, defaultValue);
+callback.onOption(componentName, componentJavaType, name,
type, javaType, desc, defaultValue, deprecated);
}
}
}
diff --git
a/catalog/camel-main-maven-plugin/src/main/java/org/apache/camel/maven/GenerateMojo.java
b/catalog/camel-main-maven-plugin/src/main/java/org/apache/camel/maven/GenerateMojo.java
index fe76815..a49afac 100644
---
a/catalog/camel-main-maven-plugin/src/main/java/org/apache/camel/maven/GenerateMojo.java
+++
b/catalog/camel-main-maven-plugin/src/main/java/org/apache/camel/maven/GenerateMojo.java
@@ -147,7 +147,7 @@ public class GenerateMojo extends AbstractMainMojo {
final List autowireData = new ArrayList<>();
final List springBootData = new ArrayList<>();
-ComponentCallback callback = (componentName, componentJavaType, name,
type, javaType, description, defaultValue) -> {
+ComponentCallback callback = (componentName, componentJavaType, name,
type, javaType, description, defaultValue, deprecated) -> {
// gather spring boot data
// we want to use dash in the name
String dash = camelCaseToDash(name);
@@ -155,7 +155,7 @@ public class GenerateMojo extends AbstractMainMojo {
if (springBootEnabled) {
getLog().debug("Spring Boot option: " + key);
String sourceType = componentJavaType;
-springBootData.add(new SpringBootData(key,
springBootJavaType(javaType), description, sourceType, defaultValue));
+springBootData.add(new SpringBootData(key,
springBootJavaType(javaType), description, sourceType, defaultValue,
deprecated));
}
// check if we can do automatic autowire to complex singleton
objects from classes in the classpath
@@ -216,6 +216,7 @@ public class GenerateMojo extends AbstractMainMojo {
String bootKey = "camel.component." +
componentName + "." + dash + "." + bootName;
String bootJavaType =
m.getParameterTypes()[0].getName();
String sourceType = best.getName();
+boolean bootDeprecated =
m.getAnnotation(Deprecated.class) != null;
getLog().debug("Spring Boot option: " +
bootKey);
// find the setter method and grab the
javadoc
@@ -232,7 +233,7 @@ public class GenerateMojo extends AbstractMainMojo {
}
[camel] 01/02: CAMEL-13663: camel-main-maven-plugin to generte spring-boot tooling metadata to fool Java editors to have code completions for Camel Main application.properties files.
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 59bf06ceb81629cdb3ac3b3be7411a46913b90c0
Author: Claus Ibsen
AuthorDate: Sat Jun 22 11:10:00 2019 +0200
CAMEL-13663: camel-main-maven-plugin to generte spring-boot tooling
metadata to fool Java editors to have code completions for Camel Main
application.properties files.
---
.../main/java/org/apache/camel/maven/PrepareCamelMainMojo.java | 7 ++-
.../java/org/apache/camel/main/parser/ConfigurationModel.java| 9 +
.../org/apache/camel/main/parser/MainConfigurationParser.java| 2 ++
.../test/java/org/apache/camel/main/parser/MyConfiguration.java | 1 +
.../org/apache/camel/main/parser/MyConfigurationParserTest.java | 4
5 files changed, 22 insertions(+), 1 deletion(-)
diff --git
a/tooling/maven/camel-main-package-maven-plugin/src/main/java/org/apache/camel/maven/PrepareCamelMainMojo.java
b/tooling/maven/camel-main-package-maven-plugin/src/main/java/org/apache/camel/maven/PrepareCamelMainMojo.java
index e2333b7..5ebc1a9 100644
---
a/tooling/maven/camel-main-package-maven-plugin/src/main/java/org/apache/camel/maven/PrepareCamelMainMojo.java
+++
b/tooling/maven/camel-main-package-maven-plugin/src/main/java/org/apache/camel/maven/PrepareCamelMainMojo.java
@@ -128,9 +128,14 @@ public class PrepareCamelMainMojo extends AbstractMojo {
} else {
sb.append(" \"defaultValue\": " + defaultValue +
"\n");
}
-} else {
+} else if (!row.isDeprecated()) {
sb.append("\n");
}
+if (row.isDeprecated()) {
+sb.append(",\n");
+sb.append(" \"deprecated\": true,\n");
+sb.append(" \"deprecation\": {}\n");
+}
if (i < data.size() - 1) {
sb.append("},\n");
} else {
diff --git
a/tooling/maven/camel-main-parser/src/main/java/org/apache/camel/main/parser/ConfigurationModel.java
b/tooling/maven/camel-main-parser/src/main/java/org/apache/camel/main/parser/ConfigurationModel.java
index e5970b5..d0ef86b 100644
---
a/tooling/maven/camel-main-parser/src/main/java/org/apache/camel/main/parser/ConfigurationModel.java
+++
b/tooling/maven/camel-main-parser/src/main/java/org/apache/camel/main/parser/ConfigurationModel.java
@@ -23,6 +23,7 @@ public class ConfigurationModel {
private String sourceType;
private String description;
private String defaultValue;
+private boolean deprecated;
public String getName() {
return name;
@@ -63,4 +64,12 @@ public class ConfigurationModel {
public void setDefaultValue(String defaultValue) {
this.defaultValue = defaultValue;
}
+
+public boolean isDeprecated() {
+return deprecated;
+}
+
+public void setDeprecated(boolean deprecated) {
+this.deprecated = deprecated;
+}
}
diff --git
a/tooling/maven/camel-main-parser/src/main/java/org/apache/camel/main/parser/MainConfigurationParser.java
b/tooling/maven/camel-main-parser/src/main/java/org/apache/camel/main/parser/MainConfigurationParser.java
index 04d2b30..0e169a5 100644
---
a/tooling/maven/camel-main-parser/src/main/java/org/apache/camel/main/parser/MainConfigurationParser.java
+++
b/tooling/maven/camel-main-parser/src/main/java/org/apache/camel/main/parser/MainConfigurationParser.java
@@ -57,12 +57,14 @@ public class MainConfigurationParser {
MethodSource setter = clazz.getMethod(setterName, javaType);
if (setter != null) {
String desc = setter.getJavaDoc().getFullText();
+boolean deprecated = setter.getAnnotation(Deprecated.class) !=
null;
ConfigurationModel model = new ConfigurationModel();
model.setName(name);
model.setJavaType(javaType);
model.setDescription(desc);
model.setSourceType(sourceType);
model.setDefaultValue(defaultValue);
+model.setDeprecated(deprecated);
answer.add(model);
}
});
diff --git
a/tooling/maven/camel-main-parser/src/test/java/org/apache/camel/main/parser/MyConfiguration.java
b/tooling/maven/camel-main-parser/src/test/java/org/apache/camel/main/parser/MyConfiguration.java
index 28bf4a3..4a6c260 100644
---
a/tooling/maven/camel-main-parser/src/test/java/org/apache/camel/main/parser/MyConfiguration.java
+++
b/tooling/maven/camel-main-parser/src/test/java/org/apache/camel/main/parser/MyConfiguration.java
@@ -391,6 +391,7 @@ public class MyConfiguration {
*
* Default is false.
*/
+@Deprecated
public void setTracing(boolean tracing) {
this.tracing = tracing;
}
diff --git
a/tooli
[camel] branch master updated (ef9bca0 -> eb4197d3)
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 ef9bca0 CAMEL-13663: camel-main-maven-plugin to generte spring-boot tooling metadata to fool Java editors to have code completions for Camel Main application.properties files. new 59bf06c CAMEL-13663: camel-main-maven-plugin to generte spring-boot tooling metadata to fool Java editors to have code completions for Camel Main application.properties files. new eb4197d3 CAMEL-13663: camel-main-maven-plugin to generte spring-boot tooling metadata to fool Java editors to have code completions for Camel Main application.properties files. 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: .../main/java/org/apache/camel/maven/AbstractMainMojo.java | 6 -- .../src/main/java/org/apache/camel/maven/GenerateMojo.java | 14 ++ .../java/org/apache/camel/maven/model/SpringBootData.java | 12 +++- .../resources/META-INF/spring-configuration-metadata.json | 4 +++- .../resources/META-INF/spring-configuration-metadata.json | 4 +++- .../java/org/apache/camel/maven/PrepareCamelMainMojo.java | 7 ++- .../org/apache/camel/main/parser/ConfigurationModel.java | 9 + .../apache/camel/main/parser/MainConfigurationParser.java | 2 ++ .../java/org/apache/camel/main/parser/MyConfiguration.java | 1 + .../camel/main/parser/MyConfigurationParserTest.java | 4 10 files changed, 53 insertions(+), 10 deletions(-)
[camel] branch master updated (73343ed -> ef9bca0)
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 73343ed Upgrade to OpenTracing java API 0.33 new 698b79d CAMEL-13663: camel-main-maven-plugin to generte spring-boot tooling metadata to fool Java editors to have code completions for Camel Main application.properties files. new ef9bca0 CAMEL-13663: camel-main-maven-plugin to generte spring-boot tooling metadata to fool Java editors to have code completions for Camel Main application.properties files. 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: .../camel-main-configuration-metadata.json | 560 ++--- .../META-INF/spring-configuration-metadata.json| 560 ++--- .../META-INF/spring-configuration-metadata.json| 560 ++--- .../apache/camel/maven/PrepareCamelMainMojo.java | 35 +- .../java/org/apache/camel/maven/PrepareHelper.java | 4 +- 5 files changed, 1128 insertions(+), 591 deletions(-) copy catalog/camel-main-maven-plugin/src/main/java/org/apache/camel/maven/GenerateHelper.java => tooling/maven/camel-main-package-maven-plugin/src/main/java/org/apache/camel/maven/PrepareHelper.java (98%)
[camel] 02/02: CAMEL-13663: camel-main-maven-plugin to generte spring-boot tooling metadata to fool Java editors to have code completions for Camel Main application.properties files.
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 ef9bca0dd9a27a20e12ea8410e70e28257d9c942
Author: Claus Ibsen
AuthorDate: Sat Jun 22 10:38:03 2019 +0200
CAMEL-13663: camel-main-maven-plugin to generte spring-boot tooling
metadata to fool Java editors to have code completions for Camel Main
application.properties files.
---
.../camel-main-configuration-metadata.json | 428 ++---
.../META-INF/spring-configuration-metadata.json| 428 ++---
.../META-INF/spring-configuration-metadata.json| 428 ++---
.../apache/camel/maven/PrepareCamelMainMojo.java | 22 +-
4 files changed, 657 insertions(+), 649 deletions(-)
diff --git
a/core/camel-main/src/main/resources/META-INF/camel-main-configuration-metadata.json
b/core/camel-main/src/main/resources/META-INF/camel-main-configuration-metadata.json
index 34c79b8..546d90f 100644
---
a/core/camel-main/src/main/resources/META-INF/camel-main-configuration-metadata.json
+++
b/core/camel-main/src/main/resources/META-INF/camel-main-configuration-metadata.json
@@ -1,192 +1,6 @@
{
"properties": [
{
- "name": "camel.hystrix.allow-maximum-size-to-diverge-from-core-size",
- "type": "java.lang.Boolean",
- "sourceType": "org.apache.camel.main.HystrixConfigurationProperties",
- "description": "Allows the configuration for maximumSize to take effect.
That value can then be equal to, or higher, than coreSize"
-},
-{
- "name": "camel.hystrix.circuit-breaker-enabled",
- "type": "java.lang.Boolean",
- "sourceType": "org.apache.camel.main.HystrixConfigurationProperties",
- "description": "Whether to use a HystrixCircuitBreaker or not. If false
no circuit-breaker logic will be used and all requests permitted. This is
similar in effect to circuitBreakerForceClosed() except that continues tracking
metrics and knowing whether it should be open/closed, this property results in
not even instantiating a circuit-breaker."
-},
-{
- "name": "camel.hystrix.circuit-breaker-error-threshold-percentage",
- "type": "java.lang.Integer",
- "sourceType": "org.apache.camel.main.HystrixConfigurationProperties",
- "description": "Error percentage threshold (as whole number such as 50)
at which point the circuit breaker will trip open and reject requests. It will
stay tripped for the duration defined in
circuitBreakerSleepWindowInMilliseconds; The error percentage this is compared
against comes from HystrixCommandMetrics.getHealthCounts()."
-},
-{
- "name": "camel.hystrix.circuit-breaker-force-closed",
- "type": "java.lang.Boolean",
- "sourceType": "org.apache.camel.main.HystrixConfigurationProperties",
- "description": "If true the HystrixCircuitBreaker#allowRequest() will
always return true to allow requests regardless of the error percentage from
HystrixCommandMetrics.getHealthCounts(). The circuitBreakerForceOpen() property
takes precedence so if it set to true this property does nothing."
-},
-{
- "name": "camel.hystrix.circuit-breaker-force-open",
- "type": "java.lang.Boolean",
- "sourceType": "org.apache.camel.main.HystrixConfigurationProperties",
- "description": "If true the HystrixCircuitBreaker.allowRequest() will
always return false, causing the circuit to be open (tripped) and reject all
requests. This property takes precedence over circuitBreakerForceClosed();"
-},
-{
- "name": "camel.hystrix.circuit-breaker-request-volume-threshold",
- "type": "java.lang.Integer",
- "sourceType": "org.apache.camel.main.HystrixConfigurationProperties",
- "description": "Minimum number of requests in the
metricsRollingStatisticalWindowInMilliseconds() that must exist before the
HystrixCircuitBreaker will trip. If below this number the circuit will not trip
regardless of error percentage."
-},
-{
- "name": "camel.hystrix.circuit-breaker-sleep-window-in-milliseconds",
- "type": "java.lang.Integer",
- "sourceType": "org.apache.camel.main.HystrixConfigurationProperties",
- "description": "The time in milliseconds after a HystrixCircuitBreaker
trips open that it should wait before trying requests again."
-},
-{
- "name": "camel.hystrix.core-pool-size",
- "type": "java.lang.Integer",
- "sourceType": "org.apache.camel.main.HystrixConfigurationProperties",
- "description": "Core thread-pool size that gets passed to
java.util.concurrent.ThreadPoolExecutor#setCorePoolSize(int)"
-},
-{
- "name":
"camel.hystrix.execution-isolation-semaphore-max-concurrent-requests",
- "type": "java.lang.Integer",
- "sourceType": "org.apache.camel.main.HystrixConfigurationProperties",
- "description": "Number of concurrent requests permitted to
HystrixCommand.run(). Reque
[camel] 01/02: CAMEL-13663: camel-main-maven-plugin to generte spring-boot tooling metadata to fool Java editors to have code completions for Camel Main application.properties files.
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 698b79dc30ed14f6d5273f070c3acfc065de5d1b
Author: Claus Ibsen
AuthorDate: Sat Jun 22 10:29:15 2019 +0200
CAMEL-13663: camel-main-maven-plugin to generte spring-boot tooling
metadata to fool Java editors to have code completions for Camel Main
application.properties files.
---
.../camel-main-configuration-metadata.json | 220 ++---
.../META-INF/spring-configuration-metadata.json| 220 ++---
.../META-INF/spring-configuration-metadata.json| 220 ++---
.../apache/camel/maven/PrepareCamelMainMojo.java | 15 +-
.../java/org/apache/camel/maven/PrepareHelper.java | 111 +++
5 files changed, 713 insertions(+), 73 deletions(-)
diff --git
a/core/camel-main/src/main/resources/META-INF/camel-main-configuration-metadata.json
b/core/camel-main/src/main/resources/META-INF/camel-main-configuration-metadata.json
index afb438b..34c79b8 100644
---
a/core/camel-main/src/main/resources/META-INF/camel-main-configuration-metadata.json
+++
b/core/camel-main/src/main/resources/META-INF/camel-main-configuration-metadata.json
@@ -10,31 +10,31 @@
"name": "camel.hystrix.circuit-breaker-enabled",
"type": "java.lang.Boolean",
"sourceType": "org.apache.camel.main.HystrixConfigurationProperties",
- "description": "Whether to use a HystrixCircuitBreaker or not. If false
no circuit-breaker logic will be used and all requests permitted. This is
similar in effect to circuitBreakerForceClosed() except that continues tracking
metrics and knowing whether it should be open/closed, this property results in
not even instantiating a circuit-breaker."
+ "description": "Whether to use a HystrixCircuitBreaker or not. If false
no circuit-breaker logic will be used and all requests permitted. This is
similar in effect to circuitBreakerForceClosed() except that continues tracking
metrics and knowing whether it should be open/closed, this property results in
not even instantiating a circuit-breaker."
},
{
"name": "camel.hystrix.circuit-breaker-error-threshold-percentage",
"type": "java.lang.Integer",
"sourceType": "org.apache.camel.main.HystrixConfigurationProperties",
- "description": "Error percentage threshold (as whole number such as 50)
at which point the circuit breaker will trip open and reject requests. It
will stay tripped for the duration defined in
circuitBreakerSleepWindowInMilliseconds; The error percentage this is
compared against comes from HystrixCommandMetrics.getHealthCounts()."
+ "description": "Error percentage threshold (as whole number such as 50)
at which point the circuit breaker will trip open and reject requests. It will
stay tripped for the duration defined in
circuitBreakerSleepWindowInMilliseconds; The error percentage this is compared
against comes from HystrixCommandMetrics.getHealthCounts()."
},
{
"name": "camel.hystrix.circuit-breaker-force-closed",
"type": "java.lang.Boolean",
"sourceType": "org.apache.camel.main.HystrixConfigurationProperties",
- "description": "If true the HystrixCircuitBreaker#allowRequest() will
always return true to allow requests regardless of the error percentage from
HystrixCommandMetrics.getHealthCounts(). The circuitBreakerForceOpen()
property takes precedence so if it set to true this property does nothing."
+ "description": "If true the HystrixCircuitBreaker#allowRequest() will
always return true to allow requests regardless of the error percentage from
HystrixCommandMetrics.getHealthCounts(). The circuitBreakerForceOpen() property
takes precedence so if it set to true this property does nothing."
},
{
"name": "camel.hystrix.circuit-breaker-force-open",
"type": "java.lang.Boolean",
"sourceType": "org.apache.camel.main.HystrixConfigurationProperties",
- "description": "If true the HystrixCircuitBreaker.allowRequest() will
always return false, causing the circuit to be open (tripped) and reject all
requests. This property takes precedence over circuitBreakerForceClosed();"
+ "description": "If true the HystrixCircuitBreaker.allowRequest() will
always return false, causing the circuit to be open (tripped) and reject all
requests. This property takes precedence over circuitBreakerForceClosed();"
},
{
"name": "camel.hystrix.circuit-breaker-request-volume-threshold",
"type": "java.lang.Integer",
"sourceType": "org.apache.camel.main.HystrixConfigurationProperties",
- "description": "Minimum number of requests in the
metricsRollingStatisticalWindowInMilliseconds() that must exist before the
HystrixCircuitBreaker will trip. If below this number the circuit will not
trip regardless of error percentage."
+ "descripti
[camel] branch master updated: [CAMEL-13664]ensure the auto-generated TypeConverterLoader can be used in OSGi
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 879b972 [CAMEL-13664]ensure the auto-generated TypeConverterLoader
can be used in OSGi
879b972 is described below
commit 879b97261fcd563c5ea927ad785bb062d5d30564
Author: Freeman Fang
AuthorDate: Fri Jun 21 16:18:26 2019 -0400
[CAMEL-13664]ensure the auto-generated TypeConverterLoader can be used in
OSGi
---
.../org/apache/camel/core/osgi/impl/Activator.java | 36 --
1 file changed, 34 insertions(+), 2 deletions(-)
diff --git
a/core/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/impl/Activator.java
b/core/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/impl/Activator.java
index ac1e0f5..115baa1 100644
---
a/core/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/impl/Activator.java
+++
b/core/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/impl/Activator.java
@@ -233,7 +233,35 @@ public class Activator implements BundleActivator,
BundleTrackerCustomizer> classes = new LinkedHashSet<>();
+Set packages =
getConverterPackages(bundle.getEntry(META_INF_TYPE_CONVERTER_LOADER));
+
+if (LOG.isTraceEnabled()) {
+LOG.trace("Found {} {} packages: {}", packages.size(),
META_INF_TYPE_CONVERTER_LOADER, packages);
+}
+for (String pkg : packages) {
+
+if (StringHelper.isClassName(pkg)) {
+// its a FQN class name so load it directly
+LOG.trace("Loading {} class", pkg);
+try {
+Class clazz = bundle.loadClass(pkg);
+BundleTypeConverterLoader
bundleTypeConverterLoader =
+new BundleTypeConverterLoader(bundle, url3 !=
null);
+
bundleTypeConverterLoader.setTypeConverterLoader((TypeConverterLoader)clazz.newInstance());
+resolvers.add(bundleTypeConverterLoader);
+// the class could be found and loaded so continue
to next
+continue;
+} catch (Throwable t) {
+// Ignore
+LOG.trace("Failed to load " + pkg + " class due "
+ t.getMessage() + ". This exception will be ignored.", t);
+}
+}
+}
+
+} else if (url1 != null || url3 != null) {
LOG.debug("Found TypeConverter in bundle {}",
bundle.getSymbolicName());
resolvers.add(new BundleTypeConverterLoader(bundle, url3 !=
null));
}
@@ -379,7 +407,7 @@ public class Activator implements BundleActivator,
BundleTrackerCustomizer implements TypeConverterLoader {
-private final AnnotationTypeConverterLoader loader = new Loader();
+private TypeConverterLoader loader = new Loader();
private final Bundle bundle;
private final boolean hasFallbackTypeConverter;
@@ -389,6 +417,10 @@ public class Activator implements BundleActivator,
BundleTrackerCustomizer
[camel] branch master updated: Upgrade to OpenTracing java API 0.33
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 73343ed Upgrade to OpenTracing java API 0.33
73343ed is described below
commit 73343ed3d73c70defeb0b560e3baf7df54ced47a
Author: Gary Brown
AuthorDate: Fri Jun 21 17:07:23 2019 +0100
Upgrade to OpenTracing java API 0.33
---
components/camel-opentracing/pom.xml | 64 --
.../src/main/docs/opentracing.adoc | 2 +-
examples/README.adoc | 2 +-
examples/camel-example-opentracing/README.md | 8 +-
.../camel-example-opentracing/service2/pom.xml | 99 ++
.../java/sample/camel/Service2Application.java | 28 +++---
.../src/main/java/sample/camel/Service2Route.java | 2 +
parent/pom.xml | 5 +-
8 files changed, 52 insertions(+), 158 deletions(-)
diff --git a/components/camel-opentracing/pom.xml
b/components/camel-opentracing/pom.xml
index cd99843..0420352 100644
--- a/components/camel-opentracing/pom.xml
+++ b/components/camel-opentracing/pom.xml
@@ -68,12 +68,6 @@
-io.opentracing.contrib
-opentracing-agent
-test
-${opentracing-java-agent-version}
-
-
io.opentracing
opentracing-mock
${opentracing-version}
@@ -118,64 +112,6 @@
org.apache.maven.plugins
maven-surefire-plugin
-
-
-**/agent/*Test.java
-
-
-
-
-org.apache.maven.plugins
-maven-dependency-plugin
-
-
-get-agent
-pre-integration-test
-
-copy
-
-
-
-
-io.opentracing.contrib
-opentracing-agent
-true
-
${opentracing-agent.lib}
-
opentracing-agent.jar
-
-
-
-
-
-
-
-org.apache.maven.plugins
-maven-failsafe-plugin
-
-
-
-javaagent:${opentracing-agent.lib}/opentracing-agent.jar
--Dorg.jboss.byteman.verbose
${camel.surefire.fork.vmargs}
-
-
-
-
-run-integration-tests
-
-integration-test
-
-
-
-**/agent/*Test.java
-
-
-
-
-final-verify
-
-verify
-
-
-
diff --git a/components/camel-opentracing/src/main/docs/opentracing.adoc
b/components/camel-opentracing/src/main/docs/opentracing.adoc
index 2610568..ff5ed86 100644
--- a/components/camel-opentracing/src/main/docs/opentracing.adoc
+++ b/components/camel-opentracing/src/main/docs/opentracing.adoc
@@ -4,7 +4,7 @@
*Available as of Camel 2.19*
IMPORTANT: Starting with Camel 2.21, it will be necessary to use an
OpenTracing complaint tracer that is
-compatible with OpenTracing Java API version 0.31 or higher.
+compatible with OpenTracing Java API version 0.31. From Camel 3.0.0.M4, it
will be necessary to use an OpenTracing compliant tracer that is compatible
with OpenTracing Java API version 0.32 or higher.
The camel-opentracing component is used for tracing and timing incoming and
outgoing Camel messages using http://opentracing.io/[OpenTracing].
diff --git a/examples/README.adoc b/examples/README.adoc
index 0edaf62..e519691 100644
--- a/examples/README.adoc
+++ b/examples/README.adoc
@@ -11,7 +11,7 @@ View the individual example READMEs for details.
### Examples
// examples: START
-Number of Examples: 111 (0 deprecated)
+Number of Examples: 112 (0 deprecated)
[width="100%",cols="4,2,4",options="header"]
|===
diff --git a/examples/camel-example-opentracing/README.md
b/examples/camel-example-opentracing/README.md
index 78a23a2..c5060de 100644
--- a/examples/camel-example-opentracing/README.md
+++ b/examples/c
[camel] branch master updated: 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 The following commit(s) were added to refs/heads/master by this push: new f4ae2c1 Regen f4ae2c1 is described below commit f4ae2c13db1632d069dcbe7acddadb0240020323 Author: Claus Ibsen AuthorDate: Sat Jun 22 10:00:26 2019 +0200 Regen --- .../src/main/docs/cm-sms-component.adoc| 6 +- .../modules/ROOT/pages/cm-sms-component.adoc | 6 +- .../META-INF/spring-configuration-metadata.json| 268 ++--- .../META-INF/spring-configuration-metadata.json| 268 ++--- 4 files changed, 274 insertions(+), 274 deletions(-) diff --git a/components/camel-cm-sms/src/main/docs/cm-sms-component.adoc b/components/camel-cm-sms/src/main/docs/cm-sms-component.adoc index d40ba67..4470bc5 100644 --- a/components/camel-cm-sms/src/main/docs/cm-sms-component.adoc +++ b/components/camel-cm-sms/src/main/docs/cm-sms-component.adoc @@ -71,10 +71,10 @@ with the following path and query parameters: [width="100%",cols="2,5,^1,2",options="header"] |=== | Name | Description | Default | Type -| *defaultFrom* (producer) | This is the sender name. The maximum length is 11 characters. | | String) -| *defaultMaxNumberOfParts* (producer) | If it is a multipart message forces the max number. Message can be truncated. Technically the gateway will first check if a message is larger than 160 characters, if so, the message will be cut into multiple 153 characters parts limited by these parameters. | 8 | Max(8L)::Int) +| *defaultFrom* (producer) | This is the sender name. The maximum length is 11 characters. | | String +| *defaultMaxNumberOfParts* (producer) | If it is a multipart message forces the max number. Message can be truncated. Technically the gateway will first check if a message is larger than 160 characters, if so, the message will be cut into multiple 153 characters parts limited by these parameters. | 8 | Max(8L)Int | *lazyStartProducer* (producer) | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and [...] -| *productToken* (producer) | *Required* The unique token to use | | String) +| *productToken* (producer) | *Required* The unique token to use | | String | *testConnectionOnStartup* (producer) | Whether to test the connection to the SMS Gateway on startup | false | boolean | *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean diff --git a/docs/components/modules/ROOT/pages/cm-sms-component.adoc b/docs/components/modules/ROOT/pages/cm-sms-component.adoc index d40ba67..4470bc5 100644 --- a/docs/components/modules/ROOT/pages/cm-sms-component.adoc +++ b/docs/components/modules/ROOT/pages/cm-sms-component.adoc @@ -71,10 +71,10 @@ with the following path and query parameters: [width="100%",cols="2,5,^1,2",options="header"] |=== | Name | Description | Default | Type -| *defaultFrom* (producer) | This is the sender name. The maximum length is 11 characters. | | String) -| *defaultMaxNumberOfParts* (producer) | If it is a multipart message forces the max number. Message can be truncated. Technically the gateway will first check if a message is larger than 160 characters, if so, the message will be cut into multiple 153 characters parts limited by these parameters. | 8 | Max(8L)::Int) +| *defaultFrom* (producer) | This is the sender name. The maximum length is 11 characters. | | String +| *defaultMaxNumberOfParts* (producer) | If it is a multipart message forces the max number. Message can be truncated. Technically the gateway will first check if a message is larger than 160 characters, if so, the message will be cut into multiple 153 characters parts limited by these parameters. | 8 | Max(8L)Int | *lazyStartProducer* (producer) | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is proc
