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-quarkus.git
The following commit(s) were added to refs/heads/master by this push: new a7a5c23 Polish examples a7a5c23 is described below commit a7a5c23a7a8f4ed551f9c4819b1c2aa243a39859 Author: Claus Ibsen <claus.ib...@gmail.com> AuthorDate: Tue Apr 14 17:23:46 2020 +0200 Polish examples --- .../main/java/org/acme/filereader/package-info.java | 19 ------------------- .../src/main/resources/application.properties | 17 ++++------------- .../src/main/resources/routes/camel-routes.xml | 3 ++- .../src/main/resources/application.properties | 1 - .../src/main/resources/application.properties | 11 ++++++++++- .../src/main/resources/application.properties | 3 ++- .../src/main/resources/application.properties | 2 +- .../src/main/resources/application.properties | 6 +++--- .../src/main/resources/application.properties | 4 ++-- .../src/main/resources/application.properties | 6 +++--- .../src/main/resources/application.properties | 3 +-- 11 files changed, 28 insertions(+), 47 deletions(-) diff --git a/examples/file-split-log-xml/src/main/java/org/acme/filereader/package-info.java b/examples/file-split-log-xml/src/main/java/org/acme/filereader/package-info.java deleted file mode 100644 index 5f81d0c..0000000 --- a/examples/file-split-log-xml/src/main/java/org/acme/filereader/package-info.java +++ /dev/null @@ -1,19 +0,0 @@ -/* - * 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.acme.filereader; - -// Added to avoid quarkus-maven-plugin warning about empty source tree diff --git a/examples/file-split-log-xml/src/main/resources/application.properties b/examples/file-split-log-xml/src/main/resources/application.properties index 0ded378..75988ad 100644 --- a/examples/file-split-log-xml/src/main/resources/application.properties +++ b/examples/file-split-log-xml/src/main/resources/application.properties @@ -17,8 +17,7 @@ # # Quarkus # -quarkus.log.file.enable = false -quarkus.ssl.native=true +quarkus.banner.enabled = false quarkus.log.category."org.apache.camel.main".level = DEBUG @@ -26,15 +25,7 @@ quarkus.log.category."org.apache.camel.main".level = DEBUG # Camel # camel.context.name = camel-quarkus-xml - -# -# Camel Main -# camel.main.xml-routes = file:src/main/resources/routes/camel-routes.xml -camel.properties.prefixToken={{ -camel.properties.suffixToken=}} - - -camel.file.route.folder=src/main/resources/file -camel.file.repeat.interval=30s -camel.file.split.parallel=false \ No newline at end of file +camel.file.route.folder = src/main/resources/file +camel.file.repeat.interval = 30000 +camel.file.split.parallel = false \ No newline at end of file diff --git a/examples/file-split-log-xml/src/main/resources/routes/camel-routes.xml b/examples/file-split-log-xml/src/main/resources/routes/camel-routes.xml index 222e4b3..c98e7b6 100644 --- a/examples/file-split-log-xml/src/main/resources/routes/camel-routes.xml +++ b/examples/file-split-log-xml/src/main/resources/routes/camel-routes.xml @@ -23,8 +23,9 @@ xsi:schemaLocation=" http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd"> + <route id="file-xml-route"> - <from uri="file:{{camel.file.route.folder}}?noop=true&delay={{camel.file.repeat.interval}}&idempotent=false&initialDelay=5s"/> + <from uri="file:{{camel.file.route.folder}}?noop=true&delay={{camel.file.repeat.interval}}&idempotent=false&initialDelay=5000"/> <split parallelProcessing="{{camel.file.split.parallel}}"> <tokenize token="\n"/> <log message="line ${headers.CamelSplitIndex} contains: ${body}"/> diff --git a/examples/http-log/src/main/resources/application.properties b/examples/http-log/src/main/resources/application.properties index 9cd5741..7831c12 100644 --- a/examples/http-log/src/main/resources/application.properties +++ b/examples/http-log/src/main/resources/application.properties @@ -17,7 +17,6 @@ # # Quarkus # -quarkus.log.file.enable = false quarkus.banner.enabled = false # diff --git a/examples/observability/src/main/resources/application.properties b/examples/observability/src/main/resources/application.properties index 5768559..6337bd2 100644 --- a/examples/observability/src/main/resources/application.properties +++ b/examples/observability/src/main/resources/application.properties @@ -14,10 +14,19 @@ ## See the License for the specific language governing permissions and ## limitations under the License. ## --------------------------------------------------------------------------- -camel.context.name = camel-quarkus-observability + +# +# Quarkus +# +quarkus.banner.enabled = false # Configure Quarkus Jaeger OpenTracing support quarkus.jaeger.service-name = greetings-service quarkus.jaeger.sampler-type = const quarkus.jaeger.sampler-param = 1 quarkus.jaeger.endpoint = http://localhost:14268/api/traces + +# +# Camel +# +camel.context.name = camel-quarkus-observability diff --git a/examples/rest-json/src/main/resources/application.properties b/examples/rest-json/src/main/resources/application.properties index fb070cc..4d1d321 100644 --- a/examples/rest-json/src/main/resources/application.properties +++ b/examples/rest-json/src/main/resources/application.properties @@ -17,7 +17,8 @@ # # Quarkus # -quarkus.log.file.enable = false + +quarkus.banner.enabled = false quarkus.ssl.native=true # diff --git a/examples/timer-log-cdi/src/main/resources/application.properties b/examples/timer-log-cdi/src/main/resources/application.properties index 62be733..5500f68 100644 --- a/examples/timer-log-cdi/src/main/resources/application.properties +++ b/examples/timer-log-cdi/src/main/resources/application.properties @@ -17,7 +17,7 @@ # # Quarkus # -quarkus.log.file.enable = false +quarkus.banner.enabled = false # # Quarkus - Camel diff --git a/examples/timer-log-kotlin/src/main/resources/application.properties b/examples/timer-log-kotlin/src/main/resources/application.properties index 15ba448..16b8c20 100644 --- a/examples/timer-log-kotlin/src/main/resources/application.properties +++ b/examples/timer-log-kotlin/src/main/resources/application.properties @@ -17,10 +17,10 @@ # # Quarkus # -quarkus.log.file.enable = false -quarkus.ssl.native = true +quarkus.banner.enabled = false -quarkus.log.category."org.apache.camel.main".level = DEBUG +# to turn on DEBUG logging in camel-main +# quarkus.log.category."org.apache.camel.main".level = DEBUG # # Camel diff --git a/examples/timer-log-spring/src/main/resources/application.properties b/examples/timer-log-spring/src/main/resources/application.properties index a08b0eb..cec0f9a 100644 --- a/examples/timer-log-spring/src/main/resources/application.properties +++ b/examples/timer-log-spring/src/main/resources/application.properties @@ -17,7 +17,7 @@ # # Quarkus # -quarkus.log.file.enable = false +quarkus.banner.enabled = false # # Quarkus - Camel @@ -43,4 +43,4 @@ camel.context.name = quarkus-camel-example-timer-log-spring # Integration # -timer.period = 5s \ No newline at end of file +timer.period = 5000 \ No newline at end of file diff --git a/examples/timer-log-xml/src/main/resources/application.properties b/examples/timer-log-xml/src/main/resources/application.properties index b5d428d..a711cde 100644 --- a/examples/timer-log-xml/src/main/resources/application.properties +++ b/examples/timer-log-xml/src/main/resources/application.properties @@ -17,10 +17,10 @@ # # Quarkus # -quarkus.log.file.enable = false -quarkus.ssl.native=true +quarkus.banner.enabled = false -quarkus.log.category."org.apache.camel.main".level = DEBUG +# to turn on DEBUG logging in camel-main +# quarkus.log.category."org.apache.camel.main".level = DEBUG # # Camel diff --git a/examples/timer-log/src/main/resources/application.properties b/examples/timer-log/src/main/resources/application.properties index abf3895..261dde5 100644 --- a/examples/timer-log/src/main/resources/application.properties +++ b/examples/timer-log/src/main/resources/application.properties @@ -17,8 +17,7 @@ # # Quarkus # -quarkus.log.file.enable = false -quarkus.ssl.native=true +quarkus.banner.enabled = false # # Camel