[camel-website] branch master updated: refactor: responsive blog design fixes
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 23281d2 refactor: responsive blog design fixes
23281d2 is described below
commit 23281d2281289dca04515098bdc079ade7d9417b
Author: Zoran Regvart
AuthorDate: Tue Sep 17 08:54:04 2019 +0200
refactor: responsive blog design fixes
---
antora-ui-camel/src/css/blog.css | 83
layouts/blog/list.html | 4 +-
2 files changed, 52 insertions(+), 35 deletions(-)
diff --git a/antora-ui-camel/src/css/blog.css b/antora-ui-camel/src/css/blog.css
index b9f70e1..0e3dea7 100644
--- a/antora-ui-camel/src/css/blog.css
+++ b/antora-ui-camel/src/css/blog.css
@@ -3,41 +3,21 @@
margin: var(--static-margin);
}
-.list {
+.blog.list {
display: flex;
+ flex-direction: column-reverse;
}
-.list aside {
+.blog.list aside {
margin-top: 2.5rem;
padding-right: 2rem;
line-height: 2rem;
}
-@media screen and (min-width: 1024px) {
- .blog {
-max-width: var(--static-max-width--desktop);
- }
-
- .blog .post {
-flex-direction: column;
- }
-
- .blog a.arrow {
-font-size: 1rem;
- }
-
- .blog a.arrow.prev::after {
-content: "\00A0previous";
- }
-
- .blog a.arrow.next::before {
-content: "next\00A0";
- }
-
- .blog .post .post-content {
-margin-left: 0;
-width: auto;
- }
+.blog.list aside ul {
+ list-style: none;
+ padding: 0;
+ margin-top: 1rem;
}
article.blog:first-child {
@@ -64,7 +44,7 @@ article.blog p {
.blog .post {
margin-top: 1rem;
display: flex;
- flex-direction: row;
+ flex-direction: column;
}
.blog .post aside .summary {
@@ -82,28 +62,63 @@ article.blog p {
}
.blog .post aside {
- width: 30rem;
+ width: 100%;
}
.blog a.arrow {
- font-size: 3rem;
+ font-size: 1rem;
text-decoration: none;
}
.blog a.arrow.prev::after {
- content: "";
+ content: "\00A0previous";
}
.blog a.arrow.next::before {
- content: "";
+ content: "next\00A0";
}
.blog .post .post-content {
- margin-left: 2rem;
- width: 100%;
+ margin-left: 0;
+ width: auto;
}
.blog .post-content img.featured {
width: 100%;
height: auto;
}
+
+@media screen and (min-width: 1024px) {
+ .blog {
+max-width: var(--static-max-width--desktop);
+ }
+
+ .blog .post {
+flex-direction: row;
+ }
+
+ .blog .post aside {
+width: 30rem;
+ }
+
+ .blog a.arrow {
+font-size: 3rem;
+ }
+
+ .blog a.arrow.prev::after {
+content: "";
+ }
+
+ .blog a.arrow.next::before {
+content: "";
+ }
+
+ .blog .post .post-content {
+margin-left: 2rem;
+width: 100%;
+ }
+
+ .blog.list {
+flex-direction: row;
+ }
+}
diff --git a/layouts/blog/list.html b/layouts/blog/list.html
index 9175e92..e5a0425 100644
--- a/layouts/blog/list.html
+++ b/layouts/blog/list.html
@@ -4,9 +4,11 @@
Categories
+
{{ range .Site.Taxonomies.categories.Alphabetical }}
-{{ .Name | upper }}{{ .Count }}
+{{ .Name | upper }}{{ .Count }}
{{ end }}
+
{{ $pages := ($.Paginator 3).Pages }}
[camel] branch master updated: Fixed CS for apt
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new b81c9b8 Fixed CS for apt
b81c9b8 is described below
commit b81c9b83e0cf317ad8971e15a591503e28cfd4a8
Author: Andrea Cosentino
AuthorDate: Tue Sep 17 08:32:50 2019 +0200
Fixed CS for apt
---
.../java/org/apache/camel/tools/apt/ModelAnnotationProcessor.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git
a/tooling/apt/src/main/java/org/apache/camel/tools/apt/ModelAnnotationProcessor.java
b/tooling/apt/src/main/java/org/apache/camel/tools/apt/ModelAnnotationProcessor.java
index 131b781..0995240 100644
---
a/tooling/apt/src/main/java/org/apache/camel/tools/apt/ModelAnnotationProcessor.java
+++
b/tooling/apt/src/main/java/org/apache/camel/tools/apt/ModelAnnotationProcessor.java
@@ -96,10 +96,10 @@ public class ModelAnnotationProcessor extends
AbstractCamelAnnotationProcessor {
springProcessor.processModelClass(processingEnv, roundEnv,
classElement);
}
-if (! propertyPlaceholderDefinitions.isEmpty()) {
+if (!propertyPlaceholderDefinitions.isEmpty()) {
messager.printMessage(Kind.WARNING, String.format("Generating
placeholder definitions helper for %d definitions",
propertyPlaceholderDefinitions.size()));
PropertyPlaceholderGenerator.generatePropertyPlaceholderDefinitionsHelper(processingEnv,
roundEnv, propertyPlaceholderDefinitions);
}
}
-}
\ No newline at end of file
+}
[camel] branch CAMEL-13939 created (now 97d73ee)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch CAMEL-13939 in repository https://gitbox.apache.org/repos/asf/camel.git. at 97d73ee CAMEL-13939: camel3 - Rename camel-management-impl to camel-management This branch includes the following new commits: new aac6808 CAMEL-13939: camel3 - Rename camel-management-impl to camel-management new 97d73ee CAMEL-13939: camel3 - Rename camel-management-impl to camel-management 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.
[camel] 02/02: CAMEL-13939: camel3 - Rename camel-management-impl to camel-management
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch CAMEL-13939
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 97d73ee68c96c3fa2d74094bc500517a2e82746f
Author: Claus Ibsen
AuthorDate: Tue Sep 17 06:50:31 2019 +0200
CAMEL-13939: camel3 - Rename camel-management-impl to camel-management
---
bom/camel-bom/pom.xml | 6 +++---
.../org/apache/camel/management/ManagedCustomProcessorTest.java | 0
.../spring-boot-dm/camel-spring-boot-dependencies/pom.xml | 6 +++---
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/bom/camel-bom/pom.xml b/bom/camel-bom/pom.xml
index 4040f5a..dd4d1a1 100644
--- a/bom/camel-bom/pom.xml
+++ b/bom/camel-bom/pom.xml
@@ -1854,19 +1854,19 @@
org.apache.camel
-camel-management-api
+camel-management
${project.version}
org.apache.camel
camel-management
${project.version}
+test-jar
org.apache.camel
-camel-management
+camel-management-api
${project.version}
-test-jar
org.apache.camel
diff --git
a/docs/user-manual/modules/ROOT/examples/core/camel-management-impl/src/test/java/org/apache/camel/management/ManagedCustomProcessorTest.java
b/docs/user-manual/modules/ROOT/examples/core/camel-management/src/test/java/org/apache/camel/management/ManagedCustomProcessorTest.java
similarity index 100%
rename from
docs/user-manual/modules/ROOT/examples/core/camel-management-impl/src/test/java/org/apache/camel/management/ManagedCustomProcessorTest.java
rename to
docs/user-manual/modules/ROOT/examples/core/camel-management/src/test/java/org/apache/camel/management/ManagedCustomProcessorTest.java
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 f860a6f..ee416ca 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
@@ -2084,19 +2084,19 @@
org.apache.camel
-camel-management-api
+camel-management
${project.version}
org.apache.camel
camel-management
${project.version}
+test-jar
org.apache.camel
-camel-management
+camel-management-api
${project.version}
-test-jar
org.apache.camel
[camel] branch master updated: CAMEL-13956: FileDataSet does not support a single file larger than 1024 bytes
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 a873180 CAMEL-13956: FileDataSet does not support a single file
larger than 1024 bytes
a873180 is described below
commit a873180d083c2606f580deb57089936e5fd793cd
Author: Claus Ibsen
AuthorDate: Tue Sep 17 06:06:06 2019 +0200
CAMEL-13956: FileDataSet does not support a single file larger than 1024
bytes
---
.../camel/component/dataset/FileDataSet.java | 24 ++
1 file changed, 16 insertions(+), 8 deletions(-)
diff --git
a/components/camel-dataset/src/main/java/org/apache/camel/component/dataset/FileDataSet.java
b/components/camel-dataset/src/main/java/org/apache/camel/component/dataset/FileDataSet.java
index 9b66788..0bcdc77 100644
---
a/components/camel-dataset/src/main/java/org/apache/camel/component/dataset/FileDataSet.java
+++
b/components/camel-dataset/src/main/java/org/apache/camel/component/dataset/FileDataSet.java
@@ -17,10 +17,12 @@
package org.apache.camel.component.dataset;
import java.io.File;
+import java.io.FileInputStream;
import java.io.IOException;
import java.util.LinkedList;
import java.util.List;
+import org.apache.camel.util.IOHelper;
import org.apache.camel.util.Scanner;
/**
@@ -30,7 +32,7 @@ import org.apache.camel.util.Scanner;
*/
public class FileDataSet extends ListDataSet {
private File sourceFile;
-private String delimiter = "\\z";
+private String delimiter;
private List defaultBodies;
@@ -39,7 +41,7 @@ public class FileDataSet extends ListDataSet {
}
public FileDataSet(File sourceFile) throws IOException {
-this(sourceFile, "\\z");
+this(sourceFile, null);
}
public FileDataSet(String sourceFileName, String delimiter) throws
IOException {
@@ -77,14 +79,20 @@ public class FileDataSet extends ListDataSet {
private void readSourceFile() throws IOException {
List bodies = new LinkedList<>();
-try (Scanner scanner = new Scanner(sourceFile, null, delimiter)) {
-while (scanner.hasNext()) {
-String nextPayload = scanner.next();
-if ((nextPayload != null) && (nextPayload.length() > 0)) {
-bodies.add(nextPayload);
+if (delimiter != null) {
+try (Scanner scanner = new Scanner(sourceFile, null, delimiter)) {
+while (scanner.hasNext()) {
+String nextPayload = scanner.next();
+if ((nextPayload != null) && (nextPayload.length() > 0)) {
+bodies.add(nextPayload);
+}
}
}
-setDefaultBodies(bodies);
+} else {
+Object data = IOHelper.loadText(new FileInputStream(sourceFile));
+bodies.add(data);
}
+
+setDefaultBodies(bodies);
}
}
[camel] 03/04: CAMEL-13964: Use camel-main instead of blocking thread manually
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 0c643c79eeb0f9f12231e2bec7af360b0f4f2c09
Author: Omar Al-Safi
AuthorDate: Mon Sep 16 12:47:30 2019 +0200
CAMEL-13964: Use camel-main instead of blocking thread manually
---
examples/camel-example-debezium/pom.xml | 4
.../debezium/DebeziumMySqlConsumerToKinesis.java| 17 -
.../example/debezium/KinesisProducerToCassandra.java| 16
3 files changed, 20 insertions(+), 17 deletions(-)
diff --git a/examples/camel-example-debezium/pom.xml
b/examples/camel-example-debezium/pom.xml
index 3930751..95abed6 100644
--- a/examples/camel-example-debezium/pom.xml
+++ b/examples/camel-example-debezium/pom.xml
@@ -45,6 +45,10 @@
org.apache.camel
+camel-main
+
+
+org.apache.camel
camel-debezium
diff --git
a/examples/camel-example-debezium/src/main/java/org/apache/camel/example/debezium/DebeziumMySqlConsumerToKinesis.java
b/examples/camel-example-debezium/src/main/java/org/apache/camel/example/debezium/DebeziumMySqlConsumerToKinesis.java
index 3288815..f4b9550 100644
---
a/examples/camel-example-debezium/src/main/java/org/apache/camel/example/debezium/DebeziumMySqlConsumerToKinesis.java
+++
b/examples/camel-example-debezium/src/main/java/org/apache/camel/example/debezium/DebeziumMySqlConsumerToKinesis.java
@@ -19,12 +19,11 @@ package org.apache.camel.example.debezium;
import java.util.HashMap;
import java.util.Map;
-import org.apache.camel.CamelContext;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.aws.kinesis.KinesisConstants;
import org.apache.camel.component.debezium.DebeziumConstants;
import org.apache.camel.component.properties.PropertiesComponent;
-import org.apache.camel.impl.DefaultCamelContext;
+import org.apache.camel.main.Main;
import org.apache.camel.model.dataformat.JsonLibrary;
import org.apache.kafka.connect.data.Struct;
import org.slf4j.Logger;
@@ -37,6 +36,9 @@ public final class DebeziumMySqlConsumerToKinesis {
private static final Logger LOG =
LoggerFactory.getLogger(DebeziumMySqlConsumerToKinesis.class);
+// use Camel Main to setup and run Camel
+private static Main main = new Main();
+
private DebeziumMySqlConsumerToKinesis() {
}
@@ -44,10 +46,8 @@ public final class DebeziumMySqlConsumerToKinesis {
LOG.debug("About to run Debezium integration...");
-final CamelContext camelContext = new DefaultCamelContext();
-
-
-camelContext.addRoutes(new RouteBuilder() {
+// add route
+main.addRouteBuilder(new RouteBuilder() {
public void configure() {
final PropertiesComponent pc =
getContext().getComponent("properties", PropertiesComponent.class);
pc.setLocation("classpath:application.properties");
@@ -103,10 +103,9 @@ public final class DebeziumMySqlConsumerToKinesis {
.end();
}
});
-camelContext.start();
-// We block the thread here
-Thread.sleep(Long.MAX_VALUE);
+// start and run Camel (block)
+main.run();
}
}
diff --git
a/examples/camel-example-debezium/src/main/java/org/apache/camel/example/debezium/KinesisProducerToCassandra.java
b/examples/camel-example-debezium/src/main/java/org/apache/camel/example/debezium/KinesisProducerToCassandra.java
index 007b598..846f3d7 100644
---
a/examples/camel-example-debezium/src/main/java/org/apache/camel/example/debezium/KinesisProducerToCassandra.java
+++
b/examples/camel-example-debezium/src/main/java/org/apache/camel/example/debezium/KinesisProducerToCassandra.java
@@ -20,10 +20,9 @@ import java.util.Arrays;
import java.util.Collections;
import java.util.Map;
-import org.apache.camel.CamelContext;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.properties.PropertiesComponent;
-import org.apache.camel.impl.DefaultCamelContext;
+import org.apache.camel.main.Main;
import org.apache.camel.model.dataformat.JsonLibrary;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -35,6 +34,9 @@ public final class KinesisProducerToCassandra {
private static final Logger LOG =
LoggerFactory.getLogger(KinesisProducerToCassandra.class);
+// use Camel Main to setup and run Camel
+private static Main main = new Main();
+
private KinesisProducerToCassandra() {
}
@@ -42,9 +44,8 @@ public final class KinesisProducerToCassandra {
LOG.debug("About to run Kinesis to Cassandra integration...");
-final CamelContext camelContext = new DefaultCamelContext();
-
-camelContext.addRoutes(new RouteBuilder() {
+// add route
+main.addRouteBuilder(new RouteBuilder(
[camel] branch master updated (d6c7fb0 -> b855fca)
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 d6c7fb0 Regen
new 73e52e1 CAMEL-13964: Add debezium example using Cassandra with MySQL
new 2f3aea6 CAMEL-13964: Add example to parent pom and change some
logging to debug
new 0c643c7 CAMEL-13964: Use camel-main instead of blocking thread
manually
new b855fca CAMEL-13964: Remove the invocation of PropertiesComponent
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
examples/camel-example-debezium/.gitignore | 1 +
examples/camel-example-debezium/README.adoc| 91 +
.../pom.xml| 38 +---
.../debezium/DebeziumMySqlConsumerToKinesis.java | 108 +
.../debezium/KinesisProducerToCassandra.java | 107
.../src/main/resources/META-INF/LICENSE.txt| 0
.../src/main/resources/META-INF/NOTICE.txt | 0
.../src/main/resources/application.properties | 24 -
.../src/main}/resources/log4j2.properties | 0
examples/pom.xml | 1 +
10 files changed, 352 insertions(+), 18 deletions(-)
create mode 100644 examples/camel-example-debezium/.gitignore
create mode 100644 examples/camel-example-debezium/README.adoc
copy examples/{camel-example-google-pubsub => camel-example-debezium}/pom.xml
(73%)
create mode 100644
examples/camel-example-debezium/src/main/java/org/apache/camel/example/debezium/DebeziumMySqlConsumerToKinesis.java
create mode 100644
examples/camel-example-debezium/src/main/java/org/apache/camel/example/debezium/KinesisProducerToCassandra.java
copy {tooling/maven/camel-package-maven-plugin =>
examples/camel-example-debezium}/src/main/resources/META-INF/LICENSE.txt (100%)
copy {tooling/maven/camel-package-maven-plugin =>
examples/camel-example-debezium}/src/main/resources/META-INF/NOTICE.txt (100%)
copy
platforms/spring-boot/components-starter/camel-lucene-starter/src/main/resources/META-INF/spring.factories
=> examples/camel-example-debezium/src/main/resources/application.properties
(59%)
copy {tests/camel-itest-osgi/src/test =>
examples/camel-example-debezium/src/main}/resources/log4j2.properties (100%)
[camel] 02/04: CAMEL-13964: Add example to parent pom and change some logging to debug
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 2f3aea687c0cfb2182f10996d7421947ea494bec
Author: Omar Al-Safi
AuthorDate: Fri Sep 13 17:07:43 2019 +0200
CAMEL-13964: Add example to parent pom and change some logging to debug
---
examples/camel-example-debezium/pom.xml | 2 +-
.../apache/camel/example/debezium/DebeziumMySqlConsumerToKinesis.java | 2 +-
.../org/apache/camel/example/debezium/KinesisProducerToCassandra.java | 2 +-
examples/pom.xml| 1 +
4 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/examples/camel-example-debezium/pom.xml
b/examples/camel-example-debezium/pom.xml
index dda4aaf..3930751 100644
--- a/examples/camel-example-debezium/pom.xml
+++ b/examples/camel-example-debezium/pom.xml
@@ -33,7 +33,7 @@
An example for Debezium Component
-Change Data Capture
+Database
diff --git
a/examples/camel-example-debezium/src/main/java/org/apache/camel/example/debezium/DebeziumMySqlConsumerToKinesis.java
b/examples/camel-example-debezium/src/main/java/org/apache/camel/example/debezium/DebeziumMySqlConsumerToKinesis.java
index 2e9513f..3288815 100644
---
a/examples/camel-example-debezium/src/main/java/org/apache/camel/example/debezium/DebeziumMySqlConsumerToKinesis.java
+++
b/examples/camel-example-debezium/src/main/java/org/apache/camel/example/debezium/DebeziumMySqlConsumerToKinesis.java
@@ -42,7 +42,7 @@ public final class DebeziumMySqlConsumerToKinesis {
public static void main(String[] args) throws Exception {
-LOG.info("About to run Debezium integration...");
+LOG.debug("About to run Debezium integration...");
final CamelContext camelContext = new DefaultCamelContext();
diff --git
a/examples/camel-example-debezium/src/main/java/org/apache/camel/example/debezium/KinesisProducerToCassandra.java
b/examples/camel-example-debezium/src/main/java/org/apache/camel/example/debezium/KinesisProducerToCassandra.java
index d0b85be..007b598 100644
---
a/examples/camel-example-debezium/src/main/java/org/apache/camel/example/debezium/KinesisProducerToCassandra.java
+++
b/examples/camel-example-debezium/src/main/java/org/apache/camel/example/debezium/KinesisProducerToCassandra.java
@@ -40,7 +40,7 @@ public final class KinesisProducerToCassandra {
public static void main(String[] args) throws Exception {
-LOG.info("About to run Kinesis to Cassandra integration...");
+LOG.debug("About to run Kinesis to Cassandra integration...");
final CamelContext camelContext = new DefaultCamelContext();
diff --git a/examples/pom.xml b/examples/pom.xml
index b9b8b04..53254b2 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -67,6 +67,7 @@
camel-example-cxf-tomcat
camel-example-cxf-ws-security-signature
camel-example-console
+camel-example-debezium
camel-example-ehcache-blueprint
camel-example-ftp
camel-example-google-pubsub
[camel] 04/04: CAMEL-13964: Remove the invocation of PropertiesComponent
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 b855fca5ee7d1e702a64ea57028250e1c98a7a3a
Author: Omar Al-Safi
AuthorDate: Mon Sep 16 14:44:32 2019 +0200
CAMEL-13964: Remove the invocation of PropertiesComponent
---
.../apache/camel/example/debezium/DebeziumMySqlConsumerToKinesis.java | 3 ---
.../org/apache/camel/example/debezium/KinesisProducerToCassandra.java | 3 ---
2 files changed, 6 deletions(-)
diff --git
a/examples/camel-example-debezium/src/main/java/org/apache/camel/example/debezium/DebeziumMySqlConsumerToKinesis.java
b/examples/camel-example-debezium/src/main/java/org/apache/camel/example/debezium/DebeziumMySqlConsumerToKinesis.java
index f4b9550..86335ea 100644
---
a/examples/camel-example-debezium/src/main/java/org/apache/camel/example/debezium/DebeziumMySqlConsumerToKinesis.java
+++
b/examples/camel-example-debezium/src/main/java/org/apache/camel/example/debezium/DebeziumMySqlConsumerToKinesis.java
@@ -49,9 +49,6 @@ public final class DebeziumMySqlConsumerToKinesis {
// add route
main.addRouteBuilder(new RouteBuilder() {
public void configure() {
-final PropertiesComponent pc =
getContext().getComponent("properties", PropertiesComponent.class);
-pc.setLocation("classpath:application.properties");
-
// Initial Debezium route that will run and listens to the
changes,
// first it will perform an initial snapshot using (select *
from) in case there are no offsets
// exists for the connector and then it will listens to MySQL
binlogs for any DB events such as (UPDATE, INSERT and DELETE)
diff --git
a/examples/camel-example-debezium/src/main/java/org/apache/camel/example/debezium/KinesisProducerToCassandra.java
b/examples/camel-example-debezium/src/main/java/org/apache/camel/example/debezium/KinesisProducerToCassandra.java
index 846f3d7..a31b093 100644
---
a/examples/camel-example-debezium/src/main/java/org/apache/camel/example/debezium/KinesisProducerToCassandra.java
+++
b/examples/camel-example-debezium/src/main/java/org/apache/camel/example/debezium/KinesisProducerToCassandra.java
@@ -47,9 +47,6 @@ public final class KinesisProducerToCassandra {
// add route
main.addRouteBuilder(new RouteBuilder() {
public void configure() {
-final PropertiesComponent pc =
getContext().getComponent("properties", PropertiesComponent.class);
-pc.setLocation("classpath:application.properties");
-
// We set the CQL templates we need, note that an UPDATE in
Cassandra means an UPSERT which is what we need
final String cqlUpdate = "update products set name = ?,
description = ?, weight = ? where id = ?";
final String cqlDelete = "delete from products where id = ?";
[camel] 01/04: CAMEL-13964: Add debezium example using Cassandra with MySQL
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 73e52e128e33b1c93219130af6d8b807d1d3f891
Author: Omar Al-Safi
AuthorDate: Thu Sep 12 14:51:45 2019 +0200
CAMEL-13964: Add debezium example using Cassandra with MySQL
---
examples/camel-example-debezium/.gitignore | 1 +
examples/camel-example-debezium/README.adoc| 91 +
examples/camel-example-debezium/pom.xml| 113
.../debezium/DebeziumMySqlConsumerToKinesis.java | 112
.../debezium/KinesisProducerToCassandra.java | 110 +++
.../src/main/resources/META-INF/LICENSE.txt| 203 +
.../src/main/resources/META-INF/NOTICE.txt | 11 ++
.../src/main/resources/application.properties | 38
.../src/main/resources/log4j2.properties | 23 +++
9 files changed, 702 insertions(+)
diff --git a/examples/camel-example-debezium/.gitignore
b/examples/camel-example-debezium/.gitignore
new file mode 100644
index 000..a293713
--- /dev/null
+++ b/examples/camel-example-debezium/.gitignore
@@ -0,0 +1 @@
+*.data
\ No newline at end of file
diff --git a/examples/camel-example-debezium/README.adoc
b/examples/camel-example-debezium/README.adoc
new file mode 100644
index 000..62c43c1
--- /dev/null
+++ b/examples/camel-example-debezium/README.adoc
@@ -0,0 +1,91 @@
+= Camel Debezium example
+
+=== Introduction
+
+An example which shows how to integrate Camel with Debezium and sink
everything into a target database.
+
+This project consists of the following examples:
+
+ 1. Send events using Debezium component to Kinesis .
+ 2. Example how data can be sinked into Cassandra that produced by Debezium.
+
+== Prerequisites
+=== MySQL
+In order to stream changes from MySQL, you will need to have
https://debezium.io/documentation/reference/0.9/connectors/mysql.html#enabling-the-binlog[_row-level_]
binary binlog enabled. However,
+for the sake of this example, we will use the following docker image which is
setup with row enabled binary logs and some sample data:
+```
+docker run -it --rm --name mysql -p 3306:3306 -e MYSQL_ROOT_PASSWORD=debezium
-e MYSQL_USER=mysqluser -e MYSQL_PASSWORD=mysqlpw debezium/example-mysql:0.9
+```
+The above docker image will start a MySQL server exposed to port `3306` with
root password set.
+
+=== Amazon Kinesis
+Since we will use Kinesis to stream changes from Debezium as an example, you
need to create a stream called `camel-debezium-example` in `eu-central-1`. As
well, you will need to create AWS access and secret keys, once you are done
from creating the keys, update the following properties in
`src/main/resources/application.properties`:
+```
+kinesis.accessKey ={{generated-access-key}}
+kinesis.secretKey = {{generated-secret-key}}
+```
+
+
+=== Cassandra
+In this example, we will use Cassandra to sink the events into, you will need
to either to download and run Cassandra on your machine or you can simply use
the following docker image that exposes a Cassandra instance on port 9042:
+```
+docker run -p 9042:9042 --rm --name cassandra -d cassandra
+```
+Once you have your Cassandra instance, using your favorite CQL gui or even
https://docs.datastax.com/en/archived/cql/3.3/cql/cql_reference/cqlsh.html[cqlsh],
you will need to execute the following CQL commands to prepare the necessary
keyspace and table for our example:
+```
+CREATE KEYSPACE dbzSink WITH replication = {'class':'SimpleStrategy',
'replication_factor' : 1};
+
+USE dbzSink;
+
+ CREATE TABLE products (
+ id int PRIMARY KEY,
+ name varchar,
+ description varchar,
+ weight float
+);
+```
+*Note:* We will stream a table called `product` from MySQL docker image which
is already set. Most of the configurations that will get you started with this
example are already set in `application.properties`.
+
+
+=== Build
+
+You will need to compile this example first:
+
+$ mvn clean compile
+
+=== Run
+
+Run the Kinesis producer first
+
+$ mvn compile exec:java -Pkinesis-producer
+
+Run the Debezium consumer in the seperate shell
+
+$ mvn compile exec:java -Pdebezium-consumer
+
+Initially, you will Debezium will perform a snapshot of the whitelisted tables
per `application.properties`, hence you should expect
+the data to be replicated into Cassandra. Once the snapshot mode is done, you
can try to insert a new row, update fields, delete .. etc on MySQL whitelisted
table(s), you should see
+the changes reflecting on Cassandra as well, you can verify that by running
the following query on cqlsh:
+```
+select * from dbzSink.products;
+```
+
+
+=== Configuration
+
+You can configure the details in the file:
+ `src/main/resources/application.properties`
+
+You can enable verbose logging by adjusting the
`src/main/resources/log4j2.properties`
+ file as documented in the file.
+
+=== Forum, Help, etc
[camel] branch master updated (a8078c1 -> d6c7fb0)
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 a8078c1 CAMEL-13981: make sure there are definitions to... add d6c7fb0 Regen No new revisions were added by this update. Summary of changes: .../spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[camel-quarkus] branch master updated: Upgrade to Quarkus 0.22.0
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git The following commit(s) were added to refs/heads/master by this push: new 243e322 Upgrade to Quarkus 0.22.0 new b1a6eb9 Merge pull request #202 from ppalaga/190916-quarkus-0.22.0 243e322 is described below commit 243e3223d05d6aeb64ff983571c4bd5aaa3631de Author: Peter Palaga AuthorDate: Mon Sep 16 16:03:03 2019 +0200 Upgrade to Quarkus 0.22.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ce024fb..59aff4b 100644 --- a/pom.xml +++ b/pom.xml @@ -41,7 +41,7 @@ UTF-8 3.0.0-RC1 -0.21.2 +0.22.0 9.4.18.v20190429 1.4.11
[camel] branch master updated: CAMEL-13981: make sure there are definitions to...
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
The following commit(s) were added to refs/heads/master by this push:
new a8078c1 CAMEL-13981: make sure there are definitions to...
a8078c1 is described below
commit a8078c137880ade9d42ae13aa431e3c5c19c3e2e
Author: Zoran Regvart
AuthorDate: Mon Sep 16 17:09:17 2019 +0200
CAMEL-13981: make sure there are definitions to...
... process
---
.../java/org/apache/camel/tools/apt/ModelAnnotationProcessor.java | 6 --
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git
a/tooling/apt/src/main/java/org/apache/camel/tools/apt/ModelAnnotationProcessor.java
b/tooling/apt/src/main/java/org/apache/camel/tools/apt/ModelAnnotationProcessor.java
index b92cdba..131b781 100644
---
a/tooling/apt/src/main/java/org/apache/camel/tools/apt/ModelAnnotationProcessor.java
+++
b/tooling/apt/src/main/java/org/apache/camel/tools/apt/ModelAnnotationProcessor.java
@@ -96,8 +96,10 @@ public class ModelAnnotationProcessor extends
AbstractCamelAnnotationProcessor {
springProcessor.processModelClass(processingEnv, roundEnv,
classElement);
}
-messager.printMessage(Kind.WARNING, String.format("Generating
placeholder definitions helper for %d definitions",
propertyPlaceholderDefinitions.size()));
-
PropertyPlaceholderGenerator.generatePropertyPlaceholderDefinitionsHelper(processingEnv,
roundEnv, propertyPlaceholderDefinitions);
+if (! propertyPlaceholderDefinitions.isEmpty()) {
+messager.printMessage(Kind.WARNING, String.format("Generating
placeholder definitions helper for %d definitions",
propertyPlaceholderDefinitions.size()));
+
PropertyPlaceholderGenerator.generatePropertyPlaceholderDefinitionsHelper(processingEnv,
roundEnv, propertyPlaceholderDefinitions);
+}
}
}
\ No newline at end of file
[camel] branch master updated: CAMEL-13981: make sure that the property helper...
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
The following commit(s) were added to refs/heads/master by this push:
new 6e8691c CAMEL-13981: make sure that the property helper...
6e8691c is described below
commit 6e8691c908875f64942f7c97321bf3028b8f5a81
Author: Zoran Regvart
AuthorDate: Mon Sep 16 16:57:44 2019 +0200
CAMEL-13981: make sure that the property helper...
... class is generated
The helper class would be generated if the `last` boolean flag was set
and the conditions in the helper did not prevent further execution of
the `processModelClass` method.
For example if the last processed element is abstract, and it might be
depending on the order of the elements in the `Set` of processed
elements the `DefinitionPropertiesPlaceholderProviderHelper.java` would
not be generated.
---
.../camel/tools/apt/CoreEipAnnotationProcessorHelper.java | 10 +-
.../org/apache/camel/tools/apt/ModelAnnotationProcessor.java | 7 +--
.../camel/tools/apt/SpringAnnotationProcessorHelper.java | 2 +-
3 files changed, 7 insertions(+), 12 deletions(-)
diff --git
a/tooling/apt/src/main/java/org/apache/camel/tools/apt/CoreEipAnnotationProcessorHelper.java
b/tooling/apt/src/main/java/org/apache/camel/tools/apt/CoreEipAnnotationProcessorHelper.java
index fa0be2b..b53d63b 100644
---
a/tooling/apt/src/main/java/org/apache/camel/tools/apt/CoreEipAnnotationProcessorHelper.java
+++
b/tooling/apt/src/main/java/org/apache/camel/tools/apt/CoreEipAnnotationProcessorHelper.java
@@ -54,7 +54,6 @@ import static
org.apache.camel.tools.apt.AnnotationProcessorHelper.findTypeEleme
import static
org.apache.camel.tools.apt.AnnotationProcessorHelper.hasSuperClass;
import static
org.apache.camel.tools.apt.AnnotationProcessorHelper.implementsInterface;
import static org.apache.camel.tools.apt.AnnotationProcessorHelper.processFile;
-import static
org.apache.camel.tools.apt.PropertyPlaceholderGenerator.generatePropertyPlaceholderDefinitionsHelper;
import static
org.apache.camel.tools.apt.helper.JsonSchemaHelper.sanitizeDescription;
import static org.apache.camel.tools.apt.helper.Strings.canonicalClassName;
import static org.apache.camel.tools.apt.helper.Strings.isNullOrEmpty;
@@ -89,7 +88,7 @@ public class CoreEipAnnotationProcessorHelper {
private boolean skipUnwanted = true;
protected void processModelClass(final ProcessingEnvironment
processingEnv, final RoundEnvironment roundEnv,
- final TypeElement classElement,
Set propertyPlaceholderDefinitions, final boolean last) {
+ final TypeElement classElement,
Set propertyPlaceholderDefinitions) {
final String javaTypeName =
canonicalClassName(classElement.getQualifiedName().toString());
String packageName = javaTypeName.substring(0,
javaTypeName.lastIndexOf("."));
@@ -128,13 +127,6 @@ public class CoreEipAnnotationProcessorHelper {
// write json schema and property placeholder provider
processFile(processingEnv, packageName, fileName, writer ->
writeJSonSchemeAndPropertyPlaceholderProvider(processingEnv, writer,
roundEnv, classElement, rootElement, javaTypeName, name,
propertyPlaceholderDefinitions));
-
-// if last then generate source code for helper that contains all the
generated property placeholder providers
-// (this allows fast property placeholders at runtime without
reflection overhead)
-if (last) {
-processingEnv.getMessager().printMessage(Kind.WARNING,
String.format("Generating placeholder definitions helper for %d definitions",
propertyPlaceholderDefinitions.size()));
-generatePropertyPlaceholderDefinitionsHelper(processingEnv,
roundEnv, propertyPlaceholderDefinitions);
-}
}
protected void
writeJSonSchemeAndPropertyPlaceholderProvider(ProcessingEnvironment
processingEnv, PrintWriter writer, RoundEnvironment roundEnv, TypeElement
classElement,
diff --git
a/tooling/apt/src/main/java/org/apache/camel/tools/apt/ModelAnnotationProcessor.java
b/tooling/apt/src/main/java/org/apache/camel/tools/apt/ModelAnnotationProcessor.java
index d312ca8..b92cdba 100644
---
a/tooling/apt/src/main/java/org/apache/camel/tools/apt/ModelAnnotationProcessor.java
+++
b/tooling/apt/src/main/java/org/apache/camel/tools/apt/ModelAnnotationProcessor.java
@@ -87,14 +87,17 @@ public class ModelAnnotationProcessor extends
AbstractCamelAnnotationProcessor {
Iterator it = coreElements.iterator();
while (it.hasNext()) {
TypeElement classElement = (TypeElement) it.next();
-coreProcessor.processModelClass(processingEnv, roundEnv,
classElement, propertyPlaceholderDefinitions, !it.hasNext());
+coreProcessor.processModelClass(p
[camel] 03/03: CAMEL-13978 - Fixed CS
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch camel-2.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 7cb8856444a1c7c050323d3789d18bf5b0ca32bf
Author: Andrea Cosentino
AuthorDate: Mon Sep 16 16:45:18 2019 +0200
CAMEL-13978 - Fixed CS
---
.../kubernetes/config_maps/KubernetesConfigMapsConsumer.java | 9 -
.../camel/component/kubernetes/KubernetesTestSupport.java | 2 +-
.../kubernetes/consumer/KubernetesConfigMapsConsumerTest.java | 10 --
3 files changed, 9 insertions(+), 12 deletions(-)
diff --git
a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/config_maps/KubernetesConfigMapsConsumer.java
b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/config_maps/KubernetesConfigMapsConsumer.java
index 1b7128d..956cfdc 100644
---
a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/config_maps/KubernetesConfigMapsConsumer.java
+++
b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/config_maps/KubernetesConfigMapsConsumer.java
@@ -20,13 +20,10 @@ import java.util.concurrent.ExecutorService;
import io.fabric8.kubernetes.api.model.ConfigMap;
import io.fabric8.kubernetes.api.model.ConfigMapList;
-import io.fabric8.kubernetes.api.model.DoneableConfigMap;
import io.fabric8.kubernetes.client.KubernetesClientException;
import io.fabric8.kubernetes.client.Watch;
import io.fabric8.kubernetes.client.Watcher;
import io.fabric8.kubernetes.client.dsl.FilterWatchListDeletable;
-import io.fabric8.kubernetes.client.dsl.NonNamespaceOperation;
-import io.fabric8.kubernetes.client.dsl.Resource;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
@@ -91,10 +88,12 @@ public class KubernetesConfigMapsConsumer extends
DefaultConsumer {
FilterWatchListDeletable> w = null;
if
(ObjectHelper.isNotEmpty(getEndpoint().getKubernetesConfiguration().getLabelKey())
&&
ObjectHelper.isNotEmpty(getEndpoint().getKubernetesConfiguration().getLabelValue()))
{
-w =
getEndpoint().getKubernetesClient().configMaps().withLabel(getEndpoint().getKubernetesConfiguration().getLabelKey(),
getEndpoint().getKubernetesConfiguration().getLabelValue());
+w =
getEndpoint().getKubernetesClient().configMaps().withLabel(getEndpoint().getKubernetesConfiguration().getLabelKey(),
+
getEndpoint().getKubernetesConfiguration().getLabelValue());
}
if
(ObjectHelper.isNotEmpty(getEndpoint().getKubernetesConfiguration().getResourceName()))
{
- w = (FilterWatchListDeletable>)
getEndpoint().getKubernetesClient().configMaps().withName(getEndpoint().getKubernetesConfiguration().getResourceName());
+w = (FilterWatchListDeletable>)getEndpoint().getKubernetesClient().configMaps()
+
.withName(getEndpoint().getKubernetesConfiguration().getResourceName());
}
watch = w.watch(new Watcher() {
diff --git
a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/KubernetesTestSupport.java
b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/KubernetesTestSupport.java
index 8cf45f9..0f17738 100644
---
a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/KubernetesTestSupport.java
+++
b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/KubernetesTestSupport.java
@@ -31,7 +31,7 @@ public class KubernetesTestSupport extends CamelTestSupport {
@Override
public void setUp() throws Exception {
// INSERT credentials and host here
-authToken = "IVStwJAV_7p26ifo1NX1R3cjNDLkGFUaU0R6VW6dbwo";
+authToken = "";
host = "https://192.168.99.100:8443";;
super.setUp();
}
diff --git
a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/KubernetesConfigMapsConsumerTest.java
b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/KubernetesConfigMapsConsumerTest.java
index a9e01c5..9ed6575 100644
---
a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/KubernetesConfigMapsConsumerTest.java
+++
b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/KubernetesConfigMapsConsumerTest.java
@@ -61,12 +61,12 @@ public class KubernetesConfigMapsConsumerTest extends
KubernetesTestSupport {
exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_CONFIGMAP_DATA,
configMapData);
}
});
-
+
ex = template.request("direct:createConfigmap", new Processor() {
@Override
public void process(Exchange
[camel] 01/03: Camel-Kubernetes: Use the same namespace in the configmap consumer test
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch camel-2.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit fcd4fe130e42d39dea2f5b20f31f8b75302dd450
Author: Andrea Cosentino
AuthorDate: Mon Sep 16 15:47:20 2019 +0200
Camel-Kubernetes: Use the same namespace in the configmap consumer test
---
.../component/kubernetes/consumer/KubernetesConfigMapsConsumerTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/KubernetesConfigMapsConsumerTest.java
b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/KubernetesConfigMapsConsumerTest.java
index 60ce676..5b62438 100644
---
a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/KubernetesConfigMapsConsumerTest.java
+++
b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/KubernetesConfigMapsConsumerTest.java
@@ -87,7 +87,7 @@ public class KubernetesConfigMapsConsumerTest extends
KubernetesTestSupport {
public void configure() throws Exception {
from("direct:createConfigmap").toF("kubernetes-config-maps://%s?oauthToken=%s&operation=createConfigMap",
host, authToken);
from("direct:deleteConfigmap").toF("kubernetes-config-maps://%s?oauthToken=%s&operation=deleteConfigMap",
host, authToken);
-
fromF("kubernetes-config-maps://%s?oauthToken=%s&namespace=myproject&labelKey=this&labelValue=rocks",
host, authToken).process(new KubernertesProcessor())
+
fromF("kubernetes-config-maps://%s?oauthToken=%s&namespace=default&labelKey=this&labelValue=rocks",
host, authToken).process(new KubernertesProcessor())
.to(mockResultEndpoint);
}
};
[camel] 02/03: CAMEL-13978 - Create ConfigMap Watch feature in Kubernetes Component, fixed the resourceName usage
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch camel-2.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 4a9702a89fb394421ec8e967217d64ac7e3b04c3
Author: Andrea Cosentino
AuthorDate: Mon Sep 16 16:42:05 2019 +0200
CAMEL-13978 - Create ConfigMap Watch feature in Kubernetes Component, fixed
the resourceName usage
---
.../config_maps/KubernetesConfigMapsConsumer.java | 7 +++---
.../kubernetes/KubernetesTestSupport.java | 2 +-
.../consumer/KubernetesConfigMapsConsumerTest.java | 27 --
3 files changed, 30 insertions(+), 6 deletions(-)
diff --git
a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/config_maps/KubernetesConfigMapsConsumer.java
b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/config_maps/KubernetesConfigMapsConsumer.java
index c93a708..1b7128d 100644
---
a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/config_maps/KubernetesConfigMapsConsumer.java
+++
b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/config_maps/KubernetesConfigMapsConsumer.java
@@ -24,6 +24,7 @@ import io.fabric8.kubernetes.api.model.DoneableConfigMap;
import io.fabric8.kubernetes.client.KubernetesClientException;
import io.fabric8.kubernetes.client.Watch;
import io.fabric8.kubernetes.client.Watcher;
+import io.fabric8.kubernetes.client.dsl.FilterWatchListDeletable;
import io.fabric8.kubernetes.client.dsl.NonNamespaceOperation;
import io.fabric8.kubernetes.client.dsl.Resource;
@@ -87,13 +88,13 @@ public class KubernetesConfigMapsConsumer extends
DefaultConsumer {
@Override
public void run() {
-NonNamespaceOperation> w =
getEndpoint().getKubernetesClient().configMaps();
+FilterWatchListDeletable> w = null;
if
(ObjectHelper.isNotEmpty(getEndpoint().getKubernetesConfiguration().getLabelKey())
&&
ObjectHelper.isNotEmpty(getEndpoint().getKubernetesConfiguration().getLabelValue()))
{
-
w.withLabel(getEndpoint().getKubernetesConfiguration().getLabelKey(),
getEndpoint().getKubernetesConfiguration().getLabelValue());
+w =
getEndpoint().getKubernetesClient().configMaps().withLabel(getEndpoint().getKubernetesConfiguration().getLabelKey(),
getEndpoint().getKubernetesConfiguration().getLabelValue());
}
if
(ObjectHelper.isNotEmpty(getEndpoint().getKubernetesConfiguration().getResourceName()))
{
-
w.withName(getEndpoint().getKubernetesConfiguration().getResourceName());
+ w = (FilterWatchListDeletable>)
getEndpoint().getKubernetesClient().configMaps().withName(getEndpoint().getKubernetesConfiguration().getResourceName());
}
watch = w.watch(new Watcher() {
diff --git
a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/KubernetesTestSupport.java
b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/KubernetesTestSupport.java
index 0f17738..8cf45f9 100644
---
a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/KubernetesTestSupport.java
+++
b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/KubernetesTestSupport.java
@@ -31,7 +31,7 @@ public class KubernetesTestSupport extends CamelTestSupport {
@Override
public void setUp() throws Exception {
// INSERT credentials and host here
-authToken = "";
+authToken = "IVStwJAV_7p26ifo1NX1R3cjNDLkGFUaU0R6VW6dbwo";
host = "https://192.168.99.100:8443";;
super.setUp();
}
diff --git
a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/KubernetesConfigMapsConsumerTest.java
b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/KubernetesConfigMapsConsumerTest.java
index 5b62438..a9e01c5 100644
---
a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/KubernetesConfigMapsConsumerTest.java
+++
b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/KubernetesConfigMapsConsumerTest.java
@@ -61,6 +61,19 @@ public class KubernetesConfigMapsConsumerTest extends
KubernetesTestSupport {
exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_CONFIGMAP_DATA,
configMapData);
}
});
+
+ex = template.request("direct:createConfigmap", new Processor() {
+
+@Override
+public void process(Exchange exchange) throws Exception {
+
exchange.getIn().removeHeader(KubernetesConstants.KUBERNETES_CONFIGMAPS_LABELS);
+
exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_NAMESPACE_NAME,
"default");
+
exchange.getIn().set
[camel] branch camel-2.x updated (65a3370 -> 7cb8856)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch camel-2.x in repository https://gitbox.apache.org/repos/asf/camel.git. from 65a3370 Cleanup duplicate "Available from..." and fix h... new fcd4fe1 Camel-Kubernetes: Use the same namespace in the configmap consumer test new 4a9702a CAMEL-13978 - Create ConfigMap Watch feature in Kubernetes Component, fixed the resourceName usage new 7cb8856 CAMEL-13978 - Fixed CS The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../config_maps/KubernetesConfigMapsConsumer.java | 12 +- .../consumer/KubernetesConfigMapsConsumerTest.java | 27 +++--- 2 files changed, 30 insertions(+), 9 deletions(-)
[camel] branch master updated (7c59319 -> 2e0135f)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel.git. from 7c59319 CAMEL-13981: logging in the annotation processor add 45f0aa5 CAMEL-13978 - Create ConfigMap Watch feature in Kubernetes Component, fixed the resourceName usage add 2e0135f CAMEL-13978 - Fixed CS No new revisions were added by this update. Summary of changes: .../config_maps/KubernetesConfigMapsConsumer.java | 12 +- .../consumer/KubernetesConfigMapsConsumerTest.java | 27 +++--- 2 files changed, 30 insertions(+), 9 deletions(-)
[camel-website] branch master updated: fix: news to blog redirect (3)
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 daade67 fix: news to blog redirect (3) daade67 is described below commit daade67c762cd3f0618f02acaa85ca2d3a2eed33 Author: Zoran Regvart AuthorDate: Mon Sep 16 16:36:47 2019 +0200 fix: news to blog redirect (3) --- static/.htaccess | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/static/.htaccess b/static/.htaccess index 27e7f21..cf12705 100644 --- a/static/.htaccess +++ b/static/.htaccess @@ -8,7 +8,7 @@ RewriteRule "security-advisories.data/(.+)$" "security/$1" [R=permanent,L] ErrorDocument 404 /404.html # Redirect /news/... to /blog/... -RewriteRule "news(/.*)$" "blog$1" [R=permanent] +RewriteRule "news(/.*)$" "/blog$1" [R=permanent,L] # Redirect known links from old website. Not mapped links are commented out. Feel free to edit, if you find something missing. # Redirect 301 /EclipseMilo
[camel-website] 01/01: try quick fix (will be overwrite by build)
This is an automated email from the ASF dual-hosted git repository. zregvart pushed a commit to branch asf-site in repository https://gitbox.apache.org/repos/asf/camel-website.git commit aeeefe556bac0215f31a4a9ed28ecf57a71faaa7 Author: Zoran Regvart AuthorDate: Mon Sep 16 16:33:51 2019 +0200 try quick fix (will be overwrite by build) --- .htaccess | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.htaccess b/.htaccess index 27e7f21..cf12705 100644 --- a/.htaccess +++ b/.htaccess @@ -8,7 +8,7 @@ RewriteRule "security-advisories.data/(.+)$" "security/$1" [R=permanent,L] ErrorDocument 404 /404.html # Redirect /news/... to /blog/... -RewriteRule "news(/.*)$" "blog$1" [R=permanent] +RewriteRule "news(/.*)$" "/blog$1" [R=permanent,L] # Redirect known links from old website. Not mapped links are commented out. Feel free to edit, if you find something missing. # Redirect 301 /EclipseMilo
[camel-website] branch asf-site updated (d40f65f -> aeeefe5)
This is an automated email from the ASF dual-hosted git repository. zregvart pushed a change to branch asf-site in repository https://gitbox.apache.org/repos/asf/camel-website.git. discard d40f65f try quick fix (will be overwrite by build) new aeeefe5 try quick fix (will be overwrite by build) This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (d40f65f) \ N -- N -- N refs/heads/asf-site (aeeefe5) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 1 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: .htaccess | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[camel-website] branch asf-site updated: try quick fix (will be overwrite by build)
This is an automated email from the ASF dual-hosted git repository. zregvart pushed a commit to branch asf-site in repository https://gitbox.apache.org/repos/asf/camel-website.git The following commit(s) were added to refs/heads/asf-site by this push: new d40f65f try quick fix (will be overwrite by build) d40f65f is described below commit d40f65f5fb5eac9c1f07fb7dc4c5cad38fa15bf2 Author: Zoran Regvart AuthorDate: Mon Sep 16 16:33:51 2019 +0200 try quick fix (will be overwrite by build) --- .htaccess | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.htaccess b/.htaccess index 27e7f21..c818fd7 100644 --- a/.htaccess +++ b/.htaccess @@ -8,7 +8,7 @@ RewriteRule "security-advisories.data/(.+)$" "security/$1" [R=permanent,L] ErrorDocument 404 /404.html # Redirect /news/... to /blog/... -RewriteRule "news(/.*)$" "blog$1" [R=permanent] +RewriteRule "^/news(/.*)$" "/blog$1" [R=permanent,L] # Redirect known links from old website. Not mapped links are commented out. Feel free to edit, if you find something missing. # Redirect 301 /EclipseMilo
[camel-website] branch master updated: fix: news to blog redirect (2)
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 0de0a57 fix: news to blog redirect (2) 0de0a57 is described below commit 0de0a570129ce2a2e70345fae08759972003199c Author: Zoran Regvart AuthorDate: Mon Sep 16 16:23:27 2019 +0200 fix: news to blog redirect (2) --- static/.htaccess | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/static/.htaccess b/static/.htaccess index f16693a..27e7f21 100644 --- a/static/.htaccess +++ b/static/.htaccess @@ -8,7 +8,7 @@ RewriteRule "security-advisories.data/(.+)$" "security/$1" [R=permanent,L] ErrorDocument 404 /404.html # Redirect /news/... to /blog/... -RewriteRule "news/(.*)$" "blog/$1" [R=permanent,L] +RewriteRule "news(/.*)$" "blog$1" [R=permanent] # Redirect known links from old website. Not mapped links are commented out. Feel free to edit, if you find something missing. # Redirect 301 /EclipseMilo
[camel-website] branch master updated: fix: news to blog redirect
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 56551ed fix: news to blog redirect 56551ed is described below commit 56551ed13df06ad8f6968cb13c0e945f6b8e34fd Author: Zoran Regvart AuthorDate: Mon Sep 16 16:08:43 2019 +0200 fix: news to blog redirect --- static/.htaccess | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/static/.htaccess b/static/.htaccess index be3934a..f16693a 100644 --- a/static/.htaccess +++ b/static/.htaccess @@ -8,7 +8,7 @@ RewriteRule "security-advisories.data/(.+)$" "security/$1" [R=permanent,L] ErrorDocument 404 /404.html # Redirect /news/... to /blog/... -RewriteRule "^news/(.*)$" "blog/$1" [R=permanent,L] +RewriteRule "news/(.*)$" "blog/$1" [R=permanent,L] # Redirect known links from old website. Not mapped links are commented out. Feel free to edit, if you find something missing. # Redirect 301 /EclipseMilo
[camel] branch master updated: CAMEL-13981: logging in the annotation processor
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
The following commit(s) were added to refs/heads/master by this push:
new 7c59319 CAMEL-13981: logging in the annotation processor
7c59319 is described below
commit 7c593199ebbec2ff4f17165c667e457362213ff9
Author: Zoran Regvart
AuthorDate: Mon Sep 16 15:59:49 2019 +0200
CAMEL-13981: logging in the annotation processor
This adds logging to the ModelAnnotationProcessor that ends up invoking
the CoreEipAnnotationProcessorHelper that should generate the
DefinitionPropertiesPlaceholderProviderHelper class.
The only way to see those messages is if their level is set to WARNING,
so this might trigger some tools to consider these as warnings.
With MCOMPILER-224[1] we should be also able to see the NOTICE output,
this is not the case in practice.
[1] https://issues.apache.org/jira/browse/MCOMPILER-224
---
parent/pom.xml| 2 ++
.../camel/tools/apt/CoreEipAnnotationProcessorHelper.java | 2 ++
.../apache/camel/tools/apt/ModelAnnotationProcessor.java | 15 ---
3 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 1f0f245..db5f000 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -5407,6 +5407,8 @@
${jdk.version}
512M
${compiler.fork}
+true
+true
-parameters
diff --git
a/tooling/apt/src/main/java/org/apache/camel/tools/apt/CoreEipAnnotationProcessorHelper.java
b/tooling/apt/src/main/java/org/apache/camel/tools/apt/CoreEipAnnotationProcessorHelper.java
index 06b2d79..fa0be2b 100644
---
a/tooling/apt/src/main/java/org/apache/camel/tools/apt/CoreEipAnnotationProcessorHelper.java
+++
b/tooling/apt/src/main/java/org/apache/camel/tools/apt/CoreEipAnnotationProcessorHelper.java
@@ -34,6 +34,7 @@ import javax.lang.model.element.VariableElement;
import javax.lang.model.type.TypeMirror;
import javax.lang.model.util.ElementFilter;
import javax.lang.model.util.Elements;
+import javax.tools.Diagnostic.Kind;
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlElementRef;
@@ -131,6 +132,7 @@ public class CoreEipAnnotationProcessorHelper {
// if last then generate source code for helper that contains all the
generated property placeholder providers
// (this allows fast property placeholders at runtime without
reflection overhead)
if (last) {
+processingEnv.getMessager().printMessage(Kind.WARNING,
String.format("Generating placeholder definitions helper for %d definitions",
propertyPlaceholderDefinitions.size()));
generatePropertyPlaceholderDefinitionsHelper(processingEnv,
roundEnv, propertyPlaceholderDefinitions);
}
}
diff --git
a/tooling/apt/src/main/java/org/apache/camel/tools/apt/ModelAnnotationProcessor.java
b/tooling/apt/src/main/java/org/apache/camel/tools/apt/ModelAnnotationProcessor.java
index 5d1e380..d312ca8 100644
---
a/tooling/apt/src/main/java/org/apache/camel/tools/apt/ModelAnnotationProcessor.java
+++
b/tooling/apt/src/main/java/org/apache/camel/tools/apt/ModelAnnotationProcessor.java
@@ -16,17 +16,18 @@
*/
package org.apache.camel.tools.apt;
-import java.util.ArrayList;
import java.util.Iterator;
-import java.util.List;
import java.util.Set;
import java.util.TreeSet;
import java.util.function.Predicate;
import java.util.stream.Collectors;
+
+import javax.annotation.processing.Messager;
import javax.annotation.processing.RoundEnvironment;
import javax.annotation.processing.SupportedAnnotationTypes;
import javax.lang.model.element.Element;
import javax.lang.model.element.TypeElement;
+import javax.tools.Diagnostic.Kind;
import javax.xml.bind.annotation.XmlRootElement;
import static org.apache.camel.tools.apt.helper.Strings.canonicalClassName;
@@ -44,6 +45,10 @@ public class ModelAnnotationProcessor extends
AbstractCamelAnnotationProcessor {
protected void doProcess(Set annotations,
RoundEnvironment roundEnv) throws Exception {
Set elements =
roundEnv.getElementsAnnotatedWith(XmlRootElement.class);
+final Messager messager = processingEnv.getMessager();
+
+messager.printMessage(Kind.WARNING, String.format("Found %d elements
annotated with XmlRootElement", elements.size()));
+
Set coreElements = elements.stream()
.filter(new Predicate() {
@Override
@@ -58,6 +63,8 @@ public class ModelAnnotationProcessor extends
AbstractCamelAnnotationProcessor {
}
}).collect(Collectors.toSet());
[camel] 01/01: CAMEL-13965: Added links in the documentation
This is an automated email from the ASF dual-hosted git repository.
aldettinger pushed a commit to branch CAMEL-13965
in repository https://gitbox.apache.org/repos/asf/camel.git
commit c1e9435dbb276cd031b15ab084eefac12557e2dd
Author: aldettinger
AuthorDate: Mon Sep 16 15:44:40 2019 +0200
CAMEL-13965: Added links in the documentation
---
.../camel-test-spring-junit5/src/main/docs/test-spring-junit5.adoc | 4 ++--
docs/components/modules/ROOT/nav.adoc| 1 +
.../components/modules/ROOT/pages}/test-spring-junit5.adoc | 5 +++--
3 files changed, 6 insertions(+), 4 deletions(-)
diff --git
a/components/camel-test-spring-junit5/src/main/docs/test-spring-junit5.adoc
b/components/camel-test-spring-junit5/src/main/docs/test-spring-junit5.adoc
index 62c92ad..58717f0 100644
--- a/components/camel-test-spring-junit5/src/main/docs/test-spring-junit5.adoc
+++ b/components/camel-test-spring-junit5/src/main/docs/test-spring-junit5.adoc
@@ -34,7 +34,7 @@ public class SimpleMockTest extends CamelSpringTestSupport {
}
-This approach provides feature parity with
`org.apache.camel.test.junit5.CamelTestSupport` from `camel-test-junit5` but
does not support Spring annotations on the test class such as `@Autowired`,
`@DirtiesContext`, and `@ContextConfiguration`.
+This approach provides feature parity with
`org.apache.camel.test.junit5.CamelTestSupport` from
xref:components::test-junit5.adoc[camel-test-junit5] but does not support
Spring annotations on the test class such as `@Autowired`, `@DirtiesContext`,
and `@ContextConfiguration`.
Instead of instantiating the `CamelContext` and routes programmatically, this
class relies on a Spring context to wire the needed components together. If
your test extends this class, you must provide the Spring context by
implementing the following method.
[source,java]
@@ -134,7 +134,7 @@ Tips: It's possible to run JUnit 4 & JUnit 5 based Camel
Spring tests side by si
`camel-test-spring-junit5` and `junit-vintage-engine`. This configuration
allows to migrate a Camel Spring test at once.
=== Typical migration steps linked to JUnit 5 support in Camel Test Spring
-* Migration steps linked to JUnit 5 support in Camel Test itself should have
been applied first
+* Migration steps linked to xref:components::test-junit5.adoc[JUnit 5 support
in Camel Test itself] should have been applied first
* Imports of `org.apache.camel.test.spring.\*` should be replaced with
`org.apache.camel.test.spring.junit5.*`
* Usage of `@RunWith(CamelSpringRunner.class)` should be replaced with
`@CamelSpringTest`
* Usage of `@BootstrapWith(CamelTestContextBootstrapper.class)` should be
replaced with `@CamelSpringTest`
diff --git a/docs/components/modules/ROOT/nav.adoc
b/docs/components/modules/ROOT/nav.adoc
index d983783..4389777 100644
--- a/docs/components/modules/ROOT/nav.adoc
+++ b/docs/components/modules/ROOT/nav.adoc
@@ -349,6 +349,7 @@
* xref:test-cdi.adoc[CDI Testing]
* xref:test-junit5.adoc[Test Module]
* xref:test-karaf.adoc[Test Karaf]
+* xref:test-spring-junit5.adoc[Camel Test Spring JUnit 5]
* xref:test-spring.adoc[Test Spring]
* xref:test.adoc[Test Module]
* xref:testcontainers-spring.adoc[Testcontainers Spring]
diff --git
a/components/camel-test-spring-junit5/src/main/docs/test-spring-junit5.adoc
b/docs/components/modules/ROOT/pages/test-spring-junit5.adoc
similarity index 92%
copy from
components/camel-test-spring-junit5/src/main/docs/test-spring-junit5.adoc
copy to docs/components/modules/ROOT/pages/test-spring-junit5.adoc
index 62c92ad..dcf5242 100644
--- a/components/camel-test-spring-junit5/src/main/docs/test-spring-junit5.adoc
+++ b/docs/components/modules/ROOT/pages/test-spring-junit5.adoc
@@ -1,4 +1,5 @@
= Camel Test Spring JUnit 5
+:page-source:
components/camel-test-spring-junit5/src/main/docs/test-spring-junit5.adoc
*Available since 3.0*
@@ -34,7 +35,7 @@ public class SimpleMockTest extends CamelSpringTestSupport {
}
-This approach provides feature parity with
`org.apache.camel.test.junit5.CamelTestSupport` from `camel-test-junit5` but
does not support Spring annotations on the test class such as `@Autowired`,
`@DirtiesContext`, and `@ContextConfiguration`.
+This approach provides feature parity with
`org.apache.camel.test.junit5.CamelTestSupport` from
xref:components::test-junit5.adoc[camel-test-junit5] but does not support
Spring annotations on the test class such as `@Autowired`, `@DirtiesContext`,
and `@ContextConfiguration`.
Instead of instantiating the `CamelContext` and routes programmatically, this
class relies on a Spring context to wire the needed components together. If
your test extends this class, you must provide the Spring context by
implementing the following method.
[source,java]
@@ -134,7 +135,7 @@ Tips: It's possible to run JUnit 4 & JUnit 5 based Camel
Spring tests side by si
`camel-test-spring-junit5` and `junit-vintage-engine`. This configuration
al
[camel] branch CAMEL-13965 updated (a4d8cfe -> c1e9435)
This is an automated email from the ASF dual-hosted git repository.
aldettinger pushed a change to branch CAMEL-13965
in repository https://gitbox.apache.org/repos/asf/camel.git.
discard a4d8cfe CAMEL-13965: Added links in the documentation
new c1e9435 CAMEL-13965: Added links in the documentation
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (a4d8cfe)
\
N -- N -- N refs/heads/CAMEL-13965 (c1e9435)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 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:
.../docs => docs/components/modules/ROOT/pages}/test-spring-junit5.adoc | 1 +
1 file changed, 1 insertion(+)
copy {components/camel-test-spring-junit5/src/main/docs =>
docs/components/modules/ROOT/pages}/test-spring-junit5.adoc (98%)
[camel] branch master updated: Camel-Kubernetes: Use the same namespace in the configmap consumer test
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 7b5b4b1 Camel-Kubernetes: Use the same namespace in the configmap
consumer test
7b5b4b1 is described below
commit 7b5b4b17c3982a72e0ac626ad6f4244b04becb40
Author: Andrea Cosentino
AuthorDate: Mon Sep 16 15:47:20 2019 +0200
Camel-Kubernetes: Use the same namespace in the configmap consumer test
---
.../component/kubernetes/consumer/KubernetesConfigMapsConsumerTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/KubernetesConfigMapsConsumerTest.java
b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/KubernetesConfigMapsConsumerTest.java
index 0a53a0e..a13fd95 100644
---
a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/KubernetesConfigMapsConsumerTest.java
+++
b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/KubernetesConfigMapsConsumerTest.java
@@ -87,7 +87,7 @@ public class KubernetesConfigMapsConsumerTest extends
KubernetesTestSupport {
public void configure() throws Exception {
from("direct:createConfigmap").toF("kubernetes-config-maps://%s?oauthToken=%s&operation=createConfigMap",
host, authToken);
from("direct:deleteConfigmap").toF("kubernetes-config-maps://%s?oauthToken=%s&operation=deleteConfigMap",
host, authToken);
-
fromF("kubernetes-config-maps://%s?oauthToken=%s&namespace=myproject&labelKey=this&labelValue=rocks",
host, authToken).process(new KubernertesProcessor())
+
fromF("kubernetes-config-maps://%s?oauthToken=%s&namespace=default&labelKey=this&labelValue=rocks",
host, authToken).process(new KubernertesProcessor())
.to(mockResultEndpoint);
}
};
[camel] branch CAMEL-13965 updated: CAMEL-13965: Added links in the documentation
This is an automated email from the ASF dual-hosted git repository.
aldettinger pushed a commit to branch CAMEL-13965
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/CAMEL-13965 by this push:
new a4d8cfe CAMEL-13965: Added links in the documentation
a4d8cfe is described below
commit a4d8cfe37c05edc2d1e6ca32a6d898d42afcd201
Author: aldettinger
AuthorDate: Mon Sep 16 15:44:40 2019 +0200
CAMEL-13965: Added links in the documentation
---
.../camel-test-spring-junit5/src/main/docs/test-spring-junit5.adoc| 4 ++--
docs/components/modules/ROOT/nav.adoc | 1 +
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git
a/components/camel-test-spring-junit5/src/main/docs/test-spring-junit5.adoc
b/components/camel-test-spring-junit5/src/main/docs/test-spring-junit5.adoc
index 62c92ad..58717f0 100644
--- a/components/camel-test-spring-junit5/src/main/docs/test-spring-junit5.adoc
+++ b/components/camel-test-spring-junit5/src/main/docs/test-spring-junit5.adoc
@@ -34,7 +34,7 @@ public class SimpleMockTest extends CamelSpringTestSupport {
}
-This approach provides feature parity with
`org.apache.camel.test.junit5.CamelTestSupport` from `camel-test-junit5` but
does not support Spring annotations on the test class such as `@Autowired`,
`@DirtiesContext`, and `@ContextConfiguration`.
+This approach provides feature parity with
`org.apache.camel.test.junit5.CamelTestSupport` from
xref:components::test-junit5.adoc[camel-test-junit5] but does not support
Spring annotations on the test class such as `@Autowired`, `@DirtiesContext`,
and `@ContextConfiguration`.
Instead of instantiating the `CamelContext` and routes programmatically, this
class relies on a Spring context to wire the needed components together. If
your test extends this class, you must provide the Spring context by
implementing the following method.
[source,java]
@@ -134,7 +134,7 @@ Tips: It's possible to run JUnit 4 & JUnit 5 based Camel
Spring tests side by si
`camel-test-spring-junit5` and `junit-vintage-engine`. This configuration
allows to migrate a Camel Spring test at once.
=== Typical migration steps linked to JUnit 5 support in Camel Test Spring
-* Migration steps linked to JUnit 5 support in Camel Test itself should have
been applied first
+* Migration steps linked to xref:components::test-junit5.adoc[JUnit 5 support
in Camel Test itself] should have been applied first
* Imports of `org.apache.camel.test.spring.\*` should be replaced with
`org.apache.camel.test.spring.junit5.*`
* Usage of `@RunWith(CamelSpringRunner.class)` should be replaced with
`@CamelSpringTest`
* Usage of `@BootstrapWith(CamelTestContextBootstrapper.class)` should be
replaced with `@CamelSpringTest`
diff --git a/docs/components/modules/ROOT/nav.adoc
b/docs/components/modules/ROOT/nav.adoc
index d983783..4389777 100644
--- a/docs/components/modules/ROOT/nav.adoc
+++ b/docs/components/modules/ROOT/nav.adoc
@@ -349,6 +349,7 @@
* xref:test-cdi.adoc[CDI Testing]
* xref:test-junit5.adoc[Test Module]
* xref:test-karaf.adoc[Test Karaf]
+* xref:test-spring-junit5.adoc[Camel Test Spring JUnit 5]
* xref:test-spring.adoc[Test Spring]
* xref:test.adoc[Test Module]
* xref:testcontainers-spring.adoc[Testcontainers Spring]
[camel] branch master updated (e66c5bc -> 769ad6b)
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.
from e66c5bc Added Apt profile to Karaf daily build
add 769ad6b CAMEL-13982: Support standard Gauge metric in MicroProfile
metrics component
No new revisions were added by this update.
Summary of changes:
.../main/docs/microprofile-metrics-component.adoc | 52 ++--
.../AbstractMicroProfileMetricsProducer.java | 5 ++
...ion.java => MicroProfileMetricsCamelGauge.java} | 16 +--
...icroProfileMetricsConcurrentGaugeProducer.java} | 4 +-
.../metrics/MicroProfileMetricsConstants.java | 1 +
.../metrics/MicroProfileMetricsEndpoint.java | 21 ++--
.../metrics/MicroProfileMetricsGaugeProducer.java | 22 -
...=> MicroProfileMetricsConcurrentGaugeTest.java} | 2 +-
.../metrics/MicroProfileMetricsEndpointTest.java | 13 ++---
.../metrics/MicroProfileMetricsGaugeTest.java | 56 +++---
.../metrics/MicroProfileMetricsTestSupport.java| 4 ++
.../MicroProfileMetricsEndpointBuilderFactory.java | 30 ++--
.../ROOT/pages/microprofile-metrics-component.adoc | 52 ++--
13 files changed, 201 insertions(+), 77 deletions(-)
copy
components/camel-microprofile-metrics/src/main/java/org/apache/camel/component/microprofile/metrics/{TimerAction.java
=> MicroProfileMetricsCamelGauge.java} (74%)
copy
components/camel-microprofile-metrics/src/main/java/org/apache/camel/component/microprofile/metrics/{MicroProfileMetricsGaugeProducer.java
=> MicroProfileMetricsConcurrentGaugeProducer.java} (91%)
copy
components/camel-microprofile-metrics/src/test/java/org/apache/camel/component/microprofile/metrics/{MicroProfileMetricsGaugeTest.java
=> MicroProfileMetricsConcurrentGaugeTest.java} (97%)
[camel-website] branch master updated: CAMEL-13818: design of the blog section
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 ddd596d CAMEL-13818: design of the blog section
ddd596d is described below
commit ddd596dc1b38debdcb1aa9c86d67bbe4c358aba8
Author: Zoran Regvart
AuthorDate: Fri Sep 13 18:10:50 2019 +0200
CAMEL-13818: design of the blog section
Summary of changes:
- news section renamed to blog
- blog section revamped with featured images
- headings are now bold (previously normal)
- minification removed from Hugo build (random issues, done by
htmlminify in gulp anyhow)
- taxonomy for categories enabled and initial design added
---
.gitignore | 1 +
.yarnrc| 2 +-
antora-ui-camel/src/css/blog.css | 109 +
antora-ui-camel/src/css/category.css | 27 +
antora-ui-camel/src/css/pagination.css | 37 +++
antora-ui-camel/src/css/site.css | 3 +
antora-ui-camel/src/css/vars.css | 2 +-
antora-ui-camel/src/partials/footer-content.hbs| 2 +-
config.toml| 8 +-
content/blog/ApacheConNA-2019/acna19-featured.jpg | Bin 0 -> 243107 bytes
.../ApacheConNA-2019/index.md} | 1 +
content/blog/RELEASE-2.24.0/camel-featured.jpg | Bin 0 -> 122153 bytes
.../RELEASE-2.24.0/index.md} | 4 +-
content/blog/RELEASE-2.24.2/camel-featured.jpg | Bin 0 -> 771987 bytes
.../RELEASE-2.24.2/index.md} | 4 +-
content/blog/RELEASE-3.0.0-RC1/camel-featured.jpg | Bin 0 -> 1541883 bytes
.../RELEASE-3.0.0-RC1/index.md}| 4 +-
content/blog/_index.md | 3 +
layouts/_default/taxonomy.html | 11 +++
layouts/blog/list.html | 21
layouts/blog/post.html | 33 +++
layouts/blog/single.html | 9 ++
layouts/blog/summary.html | 15 +++
layouts/news-entry/single.html | 22 -
layouts/news/list.html | 42
layouts/partials/footer.html | 2 +-
package.json | 2 +-
static/.htaccess | 3 +
28 files changed, 288 insertions(+), 79 deletions(-)
diff --git a/.gitignore b/.gitignore
index 8168eb1..4065fb0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@ target
node_modules
public
documentation
+resources
.idea
*.iml
diff --git a/.yarnrc b/.yarnrc
index 96c0e67..020a4bc 100644
--- a/.yarnrc
+++ b/.yarnrc
@@ -6,5 +6,5 @@ lastUpdateCheck 1564482372108
yarn-path ".yarn/releases/yarn-1.17.3.js"
env:
- HUGO_VERSION "0.56.3"
+ HUGO_VERSION "0.58.2"
diff --git a/antora-ui-camel/src/css/blog.css b/antora-ui-camel/src/css/blog.css
new file mode 100644
index 000..b9f70e1
--- /dev/null
+++ b/antora-ui-camel/src/css/blog.css
@@ -0,0 +1,109 @@
+.blog {
+ max-width: var(--static-max-width);
+ margin: var(--static-margin);
+}
+
+.list {
+ display: flex;
+}
+
+.list aside {
+ margin-top: 2.5rem;
+ padding-right: 2rem;
+ line-height: 2rem;
+}
+
+@media screen and (min-width: 1024px) {
+ .blog {
+max-width: var(--static-max-width--desktop);
+ }
+
+ .blog .post {
+flex-direction: column;
+ }
+
+ .blog a.arrow {
+font-size: 1rem;
+ }
+
+ .blog a.arrow.prev::after {
+content: "\00A0previous";
+ }
+
+ .blog a.arrow.next::before {
+content: "next\00A0";
+ }
+
+ .blog .post .post-content {
+margin-left: 0;
+width: auto;
+ }
+}
+
+article.blog:first-child {
+ margin-top: 3rem;
+}
+
+article.blog {
+ padding-bottom: 1rem;
+}
+
+article.blog p {
+ padding-bottom: 1rem;
+}
+
+.blog a.continue {
+ font-weight: bold;
+}
+
+.blog header h1 {
+ font-size: 2rem;
+ font-weight: bold;
+}
+
+.blog .post {
+ margin-top: 1rem;
+ display: flex;
+ flex-direction: row;
+}
+
+.blog .post aside .summary {
+ font-size: 1.2rem;
+ font-style: italic;
+}
+
+.blog .post aside time {
+ color: var(--color-gray-50);
+}
+
+.blog .post aside p {
+ line-height: 3rem;
+ color: var(--color-gray-50);
+}
+
+.blog .post aside {
+ width: 30rem;
+}
+
+.blog a.arrow {
+ font-size: 3rem;
+ text-decoration: none;
+}
+
+.blog a.arrow.prev::after {
+ content: "";
+}
+
+.blog a.arrow.next::before {
+ content: "";
+}
+
+.blog .post .post-content {
+ margin-left: 2rem;
+ width: 100%;
+}
+
+.blog .post-content img.featured {
+ width: 100%;
+ height: auto;
+}
diff --git a/antora-ui-camel/src/css/category.css
b/antora-ui-camel/src/css/category.css
new file mode 100644
index 000..
[camel-website] branch master updated: CAMEL-13889: website - Tab title should be just Apache Camel
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 ea6cccf CAMEL-13889: website - Tab title should be just Apache Camel ea6cccf is described below commit ea6cccff5a20dc945168fcfcbf0e7f57d7352ec2 Author: Alexandre Kieling AuthorDate: Mon Sep 16 09:25:30 2019 -0300 CAMEL-13889: website - Tab title should be just Apache Camel --- content/_index.md | 2 +- content/news/_index.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/content/_index.md b/content/_index.md index 50b3c65..0a8f23c 100644 --- a/content/_index.md +++ b/content/_index.md @@ -1,5 +1,5 @@ --- -title: Home page +title: Home description: Camel is an open source integration framework that empowers you to quickly and easily integrate various systems consuming or producing data. --- diff --git a/content/news/_index.md b/content/news/_index.md index 39ba0d4..a33c2b7 100644 --- a/content/news/_index.md +++ b/content/news/_index.md @@ -1,5 +1,5 @@ --- -title: "Apache Camel News" +title: "News" --- # Apache Camel news
[camel] branch camel-2.x updated: Cleanup duplicate "Available from..." and fix h...
This is an automated email from the ASF dual-hosted git repository.
zregvart pushed a commit to branch camel-2.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-2.x by this push:
new 65a3370 Cleanup duplicate "Available from..." and fix h...
65a3370 is described below
commit 65a337033a9b9bd3d3bb91a81e1b298630c265f2
Author: Zoran Regvart
AuthorDate: Mon Sep 16 14:11:03 2019 +0200
Cleanup duplicate "Available from..." and fix h...
...eadings
---
.../src/main/docs/kubernetes-component.adoc| 11 ---
.../src/main/docs/kubernetes-config-maps-component.adoc| 10 --
.../src/main/docs/kubernetes-deployments-component.adoc| 11 ---
.../src/main/docs/kubernetes-hpa-component.adoc| 11 ---
.../src/main/docs/kubernetes-job-component.adoc| 11 ---
.../src/main/docs/kubernetes-namespaces-component.adoc | 13 +
.../src/main/docs/kubernetes-nodes-component.adoc | 11 ---
.../kubernetes-persistent-volumes-claims-component.adoc| 11 ---
.../main/docs/kubernetes-persistent-volumes-component.adoc | 13 +
.../src/main/docs/kubernetes-pods-component.adoc | 11 ---
.../docs/kubernetes-replication-controllers-component.adoc | 11 ---
.../main/docs/kubernetes-resources-quota-component.adoc| 11 ---
.../src/main/docs/kubernetes-secrets-component.adoc| 13 +
.../main/docs/kubernetes-service-accounts-component.adoc | 11 ---
.../src/main/docs/kubernetes-services-component.adoc | 11 ---
.../src/main/docs/openshift-build-configs-component.adoc | 11 ---
.../src/main/docs/openshift-builds-component.adoc | 11 ---
.../modules/ROOT/pages/kubernetes-component.adoc | 12 +---
.../ROOT/pages/kubernetes-config-maps-component.adoc | 11 +--
.../ROOT/pages/kubernetes-deployments-component.adoc | 12 +---
.../modules/ROOT/pages/kubernetes-hpa-component.adoc | 12 +---
.../modules/ROOT/pages/kubernetes-job-component.adoc | 12 +---
.../ROOT/pages/kubernetes-namespaces-component.adoc| 14 ++
.../modules/ROOT/pages/kubernetes-nodes-component.adoc | 12 +---
.../kubernetes-persistent-volumes-claims-component.adoc| 12 +---
.../pages/kubernetes-persistent-volumes-component.adoc | 14 ++
.../modules/ROOT/pages/kubernetes-pods-component.adoc | 12 +---
.../kubernetes-replication-controllers-component.adoc | 12 +---
.../ROOT/pages/kubernetes-resources-quota-component.adoc | 12 +---
.../modules/ROOT/pages/kubernetes-secrets-component.adoc | 14 ++
.../ROOT/pages/kubernetes-service-accounts-component.adoc | 12 +---
.../modules/ROOT/pages/kubernetes-services-component.adoc | 12 +---
.../ROOT/pages/openshift-build-configs-component.adoc | 12 +---
.../modules/ROOT/pages/openshift-builds-component.adoc | 12 +---
34 files changed, 159 insertions(+), 242 deletions(-)
diff --git
a/components/camel-kubernetes/src/main/docs/kubernetes-component.adoc
b/components/camel-kubernetes/src/main/docs/kubernetes-component.adoc
index 200740f..8631049 100644
--- a/components/camel-kubernetes/src/main/docs/kubernetes-component.adoc
+++ b/components/camel-kubernetes/src/main/docs/kubernetes-component.adoc
@@ -1,10 +1,7 @@
[[kubernetes-component]]
-== Kubernetes Component (deprecated)
+= Kubernetes Component (deprecated)
*Available as of Camel version 2.17*
-*Available as of Camel version 2.17*
-
-
[IMPORTANT]
@@ -76,7 +73,7 @@ kubernetes:masterUrl
with the following path and query parameters:
- Path Parameters (1 parameters):
+=== Path Parameters (1 parameters):
[width="100%",cols="2,5,^1,2",options="header"]
@@ -86,7 +83,7 @@ with the following path and query parameters:
|===
- Query Parameters (29 parameters):
+=== Query Parameters (29 parameters):
[width="100%",cols="2,5,^1,2",options="header"]
@@ -301,4 +298,4 @@ from("direct:createPod")
.toF("kubernetes://%s?oauthToken=%s&category=pods&operation=deletePod",
host, authToken);
-
-By using the KubernetesConstants.KUBERNETES_POD_NAME header you can specify
your Pod name and pass it to this operation.
+By using the KubernetesConstants.KUBERNETES_POD_NAME header you can specify
your Pod name and pass it to this operation.
\ No newline at end of file
diff --git
a/components/camel-kubernetes/src/main/docs/kubernetes-config-maps-component.adoc
b/components/camel-kubernetes/src/main/docs/kubernetes-config-maps-component.adoc
index d1d58ce..a921225 100644
---
a/compon
[camel] branch master updated: Added Apt profile to Karaf daily build
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new e66c5bc Added Apt profile to Karaf daily build
e66c5bc is described below
commit e66c5bc74fddbe20aa8126a254c43f3f716984bf
Author: Andrea Cosentino
AuthorDate: Mon Sep 16 12:47:11 2019 +0200
Added Apt profile to Karaf daily build
---
Jenkinsfile.karaf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Jenkinsfile.karaf b/Jenkinsfile.karaf
index fe06631..30f9ffc 100644
--- a/Jenkinsfile.karaf
+++ b/Jenkinsfile.karaf
@@ -54,7 +54,7 @@ pipeline {
stage('Build') {
steps {
-sh "./mvnw $MAVEN_PARAMS -Dmaven.test.skip.exec=true clean
install"
+sh "./mvnw $MAVEN_PARAMS -Papt -Dmaven.test.skip.exec=true
clean install"
}
}
[camel] 01/02: Fixed Kubernetes documentation
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch camel-2.x in repository https://gitbox.apache.org/repos/asf/camel.git commit 277db43afa53115c847964bcdcf5b2c696c67383 Author: Andrea Cosentino AuthorDate: Mon Sep 16 12:26:45 2019 +0200 Fixed Kubernetes documentation --- components/camel-kubernetes/src/main/docs/kubernetes-component.adoc | 1 + .../camel-kubernetes/src/main/docs/kubernetes-config-maps-component.adoc | 1 + .../camel-kubernetes/src/main/docs/kubernetes-deployments-component.adoc | 1 + components/camel-kubernetes/src/main/docs/kubernetes-hpa-component.adoc | 1 + components/camel-kubernetes/src/main/docs/kubernetes-job-component.adoc | 1 + .../camel-kubernetes/src/main/docs/kubernetes-namespaces-component.adoc | 1 + .../camel-kubernetes/src/main/docs/kubernetes-nodes-component.adoc | 1 + .../src/main/docs/kubernetes-persistent-volumes-claims-component.adoc| 1 + .../src/main/docs/kubernetes-persistent-volumes-component.adoc | 1 + components/camel-kubernetes/src/main/docs/kubernetes-pods-component.adoc | 1 + .../src/main/docs/kubernetes-replication-controllers-component.adoc | 1 + .../src/main/docs/kubernetes-resources-quota-component.adoc | 1 + .../camel-kubernetes/src/main/docs/kubernetes-secrets-component.adoc | 1 + .../src/main/docs/kubernetes-service-accounts-component.adoc | 1 + .../camel-kubernetes/src/main/docs/kubernetes-services-component.adoc| 1 + .../src/main/docs/openshift-build-configs-component.adoc | 1 + .../camel-kubernetes/src/main/docs/openshift-builds-component.adoc | 1 + 17 files changed, 17 insertions(+) diff --git a/components/camel-kubernetes/src/main/docs/kubernetes-component.adoc b/components/camel-kubernetes/src/main/docs/kubernetes-component.adoc index 7f3db07..200740f 100644 --- a/components/camel-kubernetes/src/main/docs/kubernetes-component.adoc +++ b/components/camel-kubernetes/src/main/docs/kubernetes-component.adoc @@ -1,3 +1,4 @@ +[[kubernetes-component]] == Kubernetes Component (deprecated) *Available as of Camel version 2.17* diff --git a/components/camel-kubernetes/src/main/docs/kubernetes-config-maps-component.adoc b/components/camel-kubernetes/src/main/docs/kubernetes-config-maps-component.adoc index 3274ac5..d1d58ce 100644 --- a/components/camel-kubernetes/src/main/docs/kubernetes-config-maps-component.adoc +++ b/components/camel-kubernetes/src/main/docs/kubernetes-config-maps-component.adoc @@ -1,3 +1,4 @@ +[[kubernetes-config-maps-component]] == Kubernetes ConfigMap Component *Available as of Camel version 2.17* diff --git a/components/camel-kubernetes/src/main/docs/kubernetes-deployments-component.adoc b/components/camel-kubernetes/src/main/docs/kubernetes-deployments-component.adoc index b1b97b4..a756d6d 100644 --- a/components/camel-kubernetes/src/main/docs/kubernetes-deployments-component.adoc +++ b/components/camel-kubernetes/src/main/docs/kubernetes-deployments-component.adoc @@ -1,3 +1,4 @@ +[[kubernetes-deployments-component]] == Kubernetes Deployments Component *Available as of Camel version 2.20* diff --git a/components/camel-kubernetes/src/main/docs/kubernetes-hpa-component.adoc b/components/camel-kubernetes/src/main/docs/kubernetes-hpa-component.adoc index 03b0636..f48d84a 100644 --- a/components/camel-kubernetes/src/main/docs/kubernetes-hpa-component.adoc +++ b/components/camel-kubernetes/src/main/docs/kubernetes-hpa-component.adoc @@ -1,3 +1,4 @@ +[[kubernetes-hpa-component]] == Kubernetes HPA Component *Available as of Camel version 2.23* diff --git a/components/camel-kubernetes/src/main/docs/kubernetes-job-component.adoc b/components/camel-kubernetes/src/main/docs/kubernetes-job-component.adoc index beca5ca..fb353ee 100644 --- a/components/camel-kubernetes/src/main/docs/kubernetes-job-component.adoc +++ b/components/camel-kubernetes/src/main/docs/kubernetes-job-component.adoc @@ -1,3 +1,4 @@ +[[kubernetes-job-component]] == Kubernetes Job Component *Available as of Camel version 2.23* diff --git a/components/camel-kubernetes/src/main/docs/kubernetes-namespaces-component.adoc b/components/camel-kubernetes/src/main/docs/kubernetes-namespaces-component.adoc index b419929..64ce21a 100644 --- a/components/camel-kubernetes/src/main/docs/kubernetes-namespaces-component.adoc +++ b/components/camel-kubernetes/src/main/docs/kubernetes-namespaces-component.adoc @@ -1,3 +1,4 @@ +[[kubernetes-namespace-component]] == Kubernetes Namespaces Component *Available as of Camel version 2.17* diff --git a/components/camel-kubernetes/src/main/docs/kubernetes-nodes-component.adoc b/components/camel-kubernetes/src/main/docs/kubernetes-nodes-component.adoc index e427260..6554fe6 100644 --- a/components/camel-kubernetes/src/main/docs/kubernetes-nodes-component.adoc +++ b/components/camel-kubernetes/src/main/docs/kubernetes-nodes-component.adoc @@ -1,3
[camel] branch camel-2.x updated (f7d57ba -> 0e39d12)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch camel-2.x in repository https://gitbox.apache.org/repos/asf/camel.git. from f7d57ba Regen docs new 277db43 Fixed Kubernetes documentation new 0e39d12 Regen docs The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: components/camel-kubernetes/src/main/docs/kubernetes-component.adoc | 1 + .../camel-kubernetes/src/main/docs/kubernetes-config-maps-component.adoc | 1 + .../camel-kubernetes/src/main/docs/kubernetes-deployments-component.adoc | 1 + components/camel-kubernetes/src/main/docs/kubernetes-hpa-component.adoc | 1 + components/camel-kubernetes/src/main/docs/kubernetes-job-component.adoc | 1 + .../camel-kubernetes/src/main/docs/kubernetes-namespaces-component.adoc | 1 + .../camel-kubernetes/src/main/docs/kubernetes-nodes-component.adoc | 1 + .../src/main/docs/kubernetes-persistent-volumes-claims-component.adoc| 1 + .../src/main/docs/kubernetes-persistent-volumes-component.adoc | 1 + components/camel-kubernetes/src/main/docs/kubernetes-pods-component.adoc | 1 + .../src/main/docs/kubernetes-replication-controllers-component.adoc | 1 + .../src/main/docs/kubernetes-resources-quota-component.adoc | 1 + .../camel-kubernetes/src/main/docs/kubernetes-secrets-component.adoc | 1 + .../src/main/docs/kubernetes-service-accounts-component.adoc | 1 + .../camel-kubernetes/src/main/docs/kubernetes-services-component.adoc| 1 + .../src/main/docs/openshift-build-configs-component.adoc | 1 + .../camel-kubernetes/src/main/docs/openshift-builds-component.adoc | 1 + docs/components/modules/ROOT/pages/kubernetes-component.adoc | 1 + docs/components/modules/ROOT/pages/kubernetes-config-maps-component.adoc | 1 + docs/components/modules/ROOT/pages/kubernetes-deployments-component.adoc | 1 + docs/components/modules/ROOT/pages/kubernetes-hpa-component.adoc | 1 + docs/components/modules/ROOT/pages/kubernetes-job-component.adoc | 1 + docs/components/modules/ROOT/pages/kubernetes-namespaces-component.adoc | 1 + docs/components/modules/ROOT/pages/kubernetes-nodes-component.adoc | 1 + .../ROOT/pages/kubernetes-persistent-volumes-claims-component.adoc | 1 + .../modules/ROOT/pages/kubernetes-persistent-volumes-component.adoc | 1 + docs/components/modules/ROOT/pages/kubernetes-pods-component.adoc| 1 + .../modules/ROOT/pages/kubernetes-replication-controllers-component.adoc | 1 + .../modules/ROOT/pages/kubernetes-resources-quota-component.adoc | 1 + docs/components/modules/ROOT/pages/kubernetes-secrets-component.adoc | 1 + .../modules/ROOT/pages/kubernetes-service-accounts-component.adoc| 1 + docs/components/modules/ROOT/pages/kubernetes-services-component.adoc| 1 + .../components/modules/ROOT/pages/openshift-build-configs-component.adoc | 1 + docs/components/modules/ROOT/pages/openshift-builds-component.adoc | 1 + 34 files changed, 34 insertions(+)
[camel] 02/02: Regen docs
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch camel-2.x in repository https://gitbox.apache.org/repos/asf/camel.git commit 0e39d1261620ad8b7fbd353df330e344a67ae3a6 Author: Andrea Cosentino AuthorDate: Mon Sep 16 12:27:45 2019 +0200 Regen docs --- docs/components/modules/ROOT/pages/kubernetes-component.adoc | 1 + docs/components/modules/ROOT/pages/kubernetes-config-maps-component.adoc | 1 + docs/components/modules/ROOT/pages/kubernetes-deployments-component.adoc | 1 + docs/components/modules/ROOT/pages/kubernetes-hpa-component.adoc | 1 + docs/components/modules/ROOT/pages/kubernetes-job-component.adoc | 1 + docs/components/modules/ROOT/pages/kubernetes-namespaces-component.adoc | 1 + docs/components/modules/ROOT/pages/kubernetes-nodes-component.adoc | 1 + .../ROOT/pages/kubernetes-persistent-volumes-claims-component.adoc | 1 + .../modules/ROOT/pages/kubernetes-persistent-volumes-component.adoc | 1 + docs/components/modules/ROOT/pages/kubernetes-pods-component.adoc| 1 + .../modules/ROOT/pages/kubernetes-replication-controllers-component.adoc | 1 + .../modules/ROOT/pages/kubernetes-resources-quota-component.adoc | 1 + docs/components/modules/ROOT/pages/kubernetes-secrets-component.adoc | 1 + .../modules/ROOT/pages/kubernetes-service-accounts-component.adoc| 1 + docs/components/modules/ROOT/pages/kubernetes-services-component.adoc| 1 + .../components/modules/ROOT/pages/openshift-build-configs-component.adoc | 1 + docs/components/modules/ROOT/pages/openshift-builds-component.adoc | 1 + 17 files changed, 17 insertions(+) diff --git a/docs/components/modules/ROOT/pages/kubernetes-component.adoc b/docs/components/modules/ROOT/pages/kubernetes-component.adoc index 7f3db07..200740f 100644 --- a/docs/components/modules/ROOT/pages/kubernetes-component.adoc +++ b/docs/components/modules/ROOT/pages/kubernetes-component.adoc @@ -1,3 +1,4 @@ +[[kubernetes-component]] == Kubernetes Component (deprecated) *Available as of Camel version 2.17* diff --git a/docs/components/modules/ROOT/pages/kubernetes-config-maps-component.adoc b/docs/components/modules/ROOT/pages/kubernetes-config-maps-component.adoc index 3274ac5..d1d58ce 100644 --- a/docs/components/modules/ROOT/pages/kubernetes-config-maps-component.adoc +++ b/docs/components/modules/ROOT/pages/kubernetes-config-maps-component.adoc @@ -1,3 +1,4 @@ +[[kubernetes-config-maps-component]] == Kubernetes ConfigMap Component *Available as of Camel version 2.17* diff --git a/docs/components/modules/ROOT/pages/kubernetes-deployments-component.adoc b/docs/components/modules/ROOT/pages/kubernetes-deployments-component.adoc index b1b97b4..a756d6d 100644 --- a/docs/components/modules/ROOT/pages/kubernetes-deployments-component.adoc +++ b/docs/components/modules/ROOT/pages/kubernetes-deployments-component.adoc @@ -1,3 +1,4 @@ +[[kubernetes-deployments-component]] == Kubernetes Deployments Component *Available as of Camel version 2.20* diff --git a/docs/components/modules/ROOT/pages/kubernetes-hpa-component.adoc b/docs/components/modules/ROOT/pages/kubernetes-hpa-component.adoc index 03b0636..f48d84a 100644 --- a/docs/components/modules/ROOT/pages/kubernetes-hpa-component.adoc +++ b/docs/components/modules/ROOT/pages/kubernetes-hpa-component.adoc @@ -1,3 +1,4 @@ +[[kubernetes-hpa-component]] == Kubernetes HPA Component *Available as of Camel version 2.23* diff --git a/docs/components/modules/ROOT/pages/kubernetes-job-component.adoc b/docs/components/modules/ROOT/pages/kubernetes-job-component.adoc index beca5ca..fb353ee 100644 --- a/docs/components/modules/ROOT/pages/kubernetes-job-component.adoc +++ b/docs/components/modules/ROOT/pages/kubernetes-job-component.adoc @@ -1,3 +1,4 @@ +[[kubernetes-job-component]] == Kubernetes Job Component *Available as of Camel version 2.23* diff --git a/docs/components/modules/ROOT/pages/kubernetes-namespaces-component.adoc b/docs/components/modules/ROOT/pages/kubernetes-namespaces-component.adoc index b419929..64ce21a 100644 --- a/docs/components/modules/ROOT/pages/kubernetes-namespaces-component.adoc +++ b/docs/components/modules/ROOT/pages/kubernetes-namespaces-component.adoc @@ -1,3 +1,4 @@ +[[kubernetes-namespace-component]] == Kubernetes Namespaces Component *Available as of Camel version 2.17* diff --git a/docs/components/modules/ROOT/pages/kubernetes-nodes-component.adoc b/docs/components/modules/ROOT/pages/kubernetes-nodes-component.adoc index e427260..6554fe6 100644 --- a/docs/components/modules/ROOT/pages/kubernetes-nodes-component.adoc +++ b/docs/components/modules/ROOT/pages/kubernetes-nodes-component.adoc @@ -1,3 +1,4 @@ +[[kubernetes-nodes-component]] == Kubernetes Nodes Component *Available as of Camel version 2.17* diff --git a/docs/components/modules/ROOT/pages/kubernetes-persistent-volumes-claims-component.adoc b/docs/componen
[camel] branch master updated: Regen docs
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/master by this push: new c618e91 Regen docs c618e91 is described below commit c618e913c4821c67818a7532368f053b04a7fb80 Author: Andrea Cosentino AuthorDate: Mon Sep 16 09:16:17 2019 +0200 Regen docs --- .../components/modules/ROOT/pages/kubernetes-config-maps-component.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/components/modules/ROOT/pages/kubernetes-config-maps-component.adoc b/docs/components/modules/ROOT/pages/kubernetes-config-maps-component.adoc index b3f07e5..05437b1 100644 --- a/docs/components/modules/ROOT/pages/kubernetes-config-maps-component.adoc +++ b/docs/components/modules/ROOT/pages/kubernetes-config-maps-component.adoc @@ -5,7 +5,7 @@ *Available as of Camel version 2.17* The Kubernetes ConfigMap component is one of xref:kubernetes.adoc[Kubernetes Components] which -provides a producer to execute kubernetes ConfigMap operations. +provides a producer to execute kubernetes ConfigMap operations and a consumer to consume events related to Config maps. == Component Options
[camel] branch camel-2.x updated (d11e46e -> f7d57ba)
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a change to branch camel-2.x
in repository https://gitbox.apache.org/repos/asf/camel.git.
from d11e46e CAMEL-13886: Add integration test to camel-servlet-starter
new 9b1b0cc CAMEL-13978 - Create ConfigMap Watch feature in Kubernetes
Component
new a608abd CAMEL-13978 - Create ConfigMap Watch feature in Kubernetes
Component, added test
new c18c06e CAMEL-13978 - Docs
new 20a6b71 CAMEL-13978 - Fixed CS
new 3e1fdd2 CAMEL-13978 - Fixed backport and doc regen
new f7d57ba Regen docs
The 6 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../src/main/docs/kubernetes-component.adoc| 9 +--
.../docs/kubernetes-config-maps-component.adoc | 12 ++--
.../docs/kubernetes-deployments-component.adoc | 11 +--
.../src/main/docs/kubernetes-hpa-component.adoc| 11 +--
.../src/main/docs/kubernetes-job-component.adoc| 11 +--
.../main/docs/kubernetes-namespaces-component.adoc | 11 +--
.../src/main/docs/kubernetes-nodes-component.adoc | 11 +--
...rnetes-persistent-volumes-claims-component.adoc | 11 +--
.../kubernetes-persistent-volumes-component.adoc | 11 +--
.../src/main/docs/kubernetes-pods-component.adoc | 11 +--
...bernetes-replication-controllers-component.adoc | 11 +--
.../docs/kubernetes-resources-quota-component.adoc | 11 +--
.../main/docs/kubernetes-secrets-component.adoc| 11 +--
.../kubernetes-service-accounts-component.adoc | 11 +--
.../main/docs/kubernetes-services-component.adoc | 11 +--
.../docs/openshift-build-configs-component.adoc| 9 +--
.../src/main/docs/openshift-builds-component.adoc | 11 +--
.../KubernetesConfigMapsConsumer.java} | 65 +-
.../config_maps/KubernetesConfigMapsEndpoint.java | 2 +-
.../{ServiceEvent.java => ConfigMapEvent.java} | 20 +++---
java => KubernetesConfigMapsConsumerTest.java} | 78 ++
.../modules/ROOT/pages/kubernetes-component.adoc | 10 +--
.../pages/kubernetes-config-maps-component.adoc| 13 ++--
.../pages/kubernetes-deployments-component.adoc| 12 ++--
.../ROOT/pages/kubernetes-hpa-component.adoc | 12 ++--
.../ROOT/pages/kubernetes-job-component.adoc | 12 ++--
.../pages/kubernetes-namespaces-component.adoc | 12 ++--
.../ROOT/pages/kubernetes-nodes-component.adoc | 12 ++--
...rnetes-persistent-volumes-claims-component.adoc | 12 ++--
.../kubernetes-persistent-volumes-component.adoc | 12 ++--
.../ROOT/pages/kubernetes-pods-component.adoc | 12 ++--
...bernetes-replication-controllers-component.adoc | 12 ++--
.../kubernetes-resources-quota-component.adoc | 12 ++--
.../ROOT/pages/kubernetes-secrets-component.adoc | 12 ++--
.../kubernetes-service-accounts-component.adoc | 12 ++--
.../ROOT/pages/kubernetes-services-component.adoc | 12 ++--
.../pages/openshift-build-configs-component.adoc | 10 +--
.../ROOT/pages/openshift-builds-component.adoc | 12 ++--
.../modules/ROOT/pages/sql-component.adoc | 48 -
39 files changed, 309 insertions(+), 289 deletions(-)
copy
components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/{nodes/KubernetesNodesConsumer.java
=> config_maps/KubernetesConfigMapsConsumer.java} (69%)
copy
components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/consumer/common/{ServiceEvent.java
=> ConfigMapEvent.java} (77%)
copy
components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/{KubernetesPodsConsumerTest.java
=> KubernetesConfigMapsConsumerTest.java} (52%)
[camel] 03/06: CAMEL-13978 - Docs
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch camel-2.x in repository https://gitbox.apache.org/repos/asf/camel.git commit c18c06e48e800e1da7cbc338d26e8c6a1344084b Author: Andrea Cosentino AuthorDate: Mon Sep 16 08:51:55 2019 +0200 CAMEL-13978 - Docs --- .../src/main/docs/kubernetes-config-maps-component.adoc | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/components/camel-kubernetes/src/main/docs/kubernetes-config-maps-component.adoc b/components/camel-kubernetes/src/main/docs/kubernetes-config-maps-component.adoc index a665668..2b782da 100644 --- a/components/camel-kubernetes/src/main/docs/kubernetes-config-maps-component.adoc +++ b/components/camel-kubernetes/src/main/docs/kubernetes-config-maps-component.adoc @@ -3,9 +3,8 @@ *Available as of Camel version 2.17* - The *Kubernetes ConfigMap* component is one of xref:kubernetes-component.adoc[Kubernetes Components] which -provides a producer to execute kubernetes ConfigMap operations. +provides a producer to execute kubernetes ConfigMap operations and a consumer to consume events related to Config maps. == Component Options @@ -90,4 +89,4 @@ The component supports 2 options, which are listed below. | *camel.component.kubernetes-config-maps.enabled* | Whether to enable auto configuration of the kubernetes-config-maps component. This is enabled by default. | | Boolean | *camel.component.kubernetes-config-maps.resolve-property-placeholders* | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | Boolean |=== -// spring-boot-auto-configure options: END \ No newline at end of file +// spring-boot-auto-configure options: END
[camel] 01/06: CAMEL-13978 - Create ConfigMap Watch feature in Kubernetes Component
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch camel-2.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 9b1b0ccd0dd5cfd10001d7da2fe6a6691945a9d2
Author: Andrea Cosentino
AuthorDate: Mon Sep 16 08:49:26 2019 +0200
CAMEL-13978 - Create ConfigMap Watch feature in Kubernetes Component
---
.../config_maps/KubernetesConfigMapsConsumer.java | 132 +
.../config_maps/KubernetesConfigMapsEndpoint.java | 2 +-
.../kubernetes/consumer/common/ConfigMapEvent.java | 47
3 files changed, 180 insertions(+), 1 deletion(-)
diff --git
a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/config_maps/KubernetesConfigMapsConsumer.java
b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/config_maps/KubernetesConfigMapsConsumer.java
new file mode 100644
index 000..bbc489e
--- /dev/null
+++
b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/config_maps/KubernetesConfigMapsConsumer.java
@@ -0,0 +1,132 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.kubernetes.config_maps;
+
+import java.util.concurrent.ExecutorService;
+
+import org.apache.camel.Exchange;
+import org.apache.camel.Processor;
+import org.apache.camel.component.kubernetes.AbstractKubernetesEndpoint;
+import org.apache.camel.component.kubernetes.KubernetesConstants;
+import org.apache.camel.component.kubernetes.consumer.common.ConfigMapEvent;
+import org.apache.camel.support.DefaultConsumer;
+import org.apache.camel.util.ObjectHelper;
+
+import io.fabric8.kubernetes.api.model.ConfigMap;
+import io.fabric8.kubernetes.api.model.ConfigMapList;
+import io.fabric8.kubernetes.api.model.DoneableConfigMap;
+import io.fabric8.kubernetes.client.KubernetesClientException;
+import io.fabric8.kubernetes.client.Watch;
+import io.fabric8.kubernetes.client.Watcher;
+import io.fabric8.kubernetes.client.dsl.NonNamespaceOperation;
+import io.fabric8.kubernetes.client.dsl.Resource;
+
+public class KubernetesConfigMapsConsumer extends DefaultConsumer {
+
+private final Processor processor;
+private ExecutorService executor;
+private ConfigMapsConsumerTask configMapWatcher;
+
+public KubernetesConfigMapsConsumer(AbstractKubernetesEndpoint endpoint,
Processor processor) {
+super(endpoint, processor);
+this.processor = processor;
+}
+
+@Override
+public AbstractKubernetesEndpoint getEndpoint() {
+return (AbstractKubernetesEndpoint)super.getEndpoint();
+}
+
+@Override
+protected void doStart() throws Exception {
+super.doStart();
+executor = getEndpoint().createExecutor();
+
+configMapWatcher = new ConfigMapsConsumerTask();
+executor.submit(configMapWatcher);
+}
+
+@Override
+protected void doStop() throws Exception {
+super.doStop();
+
+log.debug("Stopping Kubernetes ConfigMap Consumer");
+if (executor != null) {
+if (getEndpoint() != null && getEndpoint().getCamelContext() !=
null) {
+if (configMapWatcher != null) {
+configMapWatcher.getWatch().close();
+}
+
getEndpoint().getCamelContext().getExecutorServiceManager().shutdownNow(executor);
+} else {
+if (configMapWatcher != null) {
+configMapWatcher.getWatch().close();
+}
+executor.shutdownNow();
+}
+}
+executor = null;
+}
+
+class ConfigMapsConsumerTask implements Runnable {
+
+private Watch watch;
+
+@Override
+public void run() {
+NonNamespaceOperation> w =
getEndpoint().getKubernetesClient().configMaps();
+if
(ObjectHelper.isNotEmpty(getEndpoint().getKubernetesConfiguration().getLabelKey())
+&&
ObjectHelper.isNotEmpty(getEndpoint().getKubernetesConfiguration().getLabelValue()))
{
+
w.withLabel(getEndpoint().getKubernetesConfiguration().getLabelKey(),
getEndpoint().getKubernetesConfiguration().getLabelValue());
+
[camel] 04/06: CAMEL-13978 - Fixed CS
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch camel-2.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 20a6b710efc4f5b2c0a7003bbfac7d4f7ad0b000
Author: Andrea Cosentino
AuthorDate: Mon Sep 16 08:55:46 2019 +0200
CAMEL-13978 - Fixed CS
---
.../config_maps/KubernetesConfigMapsConsumer.java| 16
.../consumer/KubernetesConfigMapsConsumerTest.java | 4 ++--
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git
a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/config_maps/KubernetesConfigMapsConsumer.java
b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/config_maps/KubernetesConfigMapsConsumer.java
index bbc489e..f8b4e80 100644
---
a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/config_maps/KubernetesConfigMapsConsumer.java
+++
b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/config_maps/KubernetesConfigMapsConsumer.java
@@ -18,14 +18,6 @@ package org.apache.camel.component.kubernetes.config_maps;
import java.util.concurrent.ExecutorService;
-import org.apache.camel.Exchange;
-import org.apache.camel.Processor;
-import org.apache.camel.component.kubernetes.AbstractKubernetesEndpoint;
-import org.apache.camel.component.kubernetes.KubernetesConstants;
-import org.apache.camel.component.kubernetes.consumer.common.ConfigMapEvent;
-import org.apache.camel.support.DefaultConsumer;
-import org.apache.camel.util.ObjectHelper;
-
import io.fabric8.kubernetes.api.model.ConfigMap;
import io.fabric8.kubernetes.api.model.ConfigMapList;
import io.fabric8.kubernetes.api.model.DoneableConfigMap;
@@ -35,6 +27,14 @@ import io.fabric8.kubernetes.client.Watcher;
import io.fabric8.kubernetes.client.dsl.NonNamespaceOperation;
import io.fabric8.kubernetes.client.dsl.Resource;
+import org.apache.camel.Exchange;
+import org.apache.camel.Processor;
+import org.apache.camel.component.kubernetes.AbstractKubernetesEndpoint;
+import org.apache.camel.component.kubernetes.KubernetesConstants;
+import org.apache.camel.component.kubernetes.consumer.common.ConfigMapEvent;
+import org.apache.camel.support.DefaultConsumer;
+import org.apache.camel.util.ObjectHelper;
+
public class KubernetesConfigMapsConsumer extends DefaultConsumer {
private final Processor processor;
diff --git
a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/KubernetesConfigMapsConsumerTest.java
b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/KubernetesConfigMapsConsumerTest.java
index 3bd59af..0a53a0e 100644
---
a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/KubernetesConfigMapsConsumerTest.java
+++
b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/KubernetesConfigMapsConsumerTest.java
@@ -19,6 +19,8 @@ package org.apache.camel.component.kubernetes.consumer;
import java.util.HashMap;
import java.util.Map;
+import io.fabric8.kubernetes.api.model.ConfigMap;
+
import org.apache.camel.EndpointInject;
import org.apache.camel.Exchange;
import org.apache.camel.Message;
@@ -31,8 +33,6 @@ import org.apache.camel.util.ObjectHelper;
import org.junit.Ignore;
import org.junit.Test;
-import io.fabric8.kubernetes.api.model.ConfigMap;
-
@Ignore("Requires a running Kubernetes Cluster")
public class KubernetesConfigMapsConsumerTest extends KubernetesTestSupport {
[camel] 05/06: CAMEL-13978 - Fixed backport and doc regen
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch camel-2.x in repository https://gitbox.apache.org/repos/asf/camel.git commit 3e1fdd2fa58da3422ef4f4764b186e347d02dfbb Author: Andrea Cosentino AuthorDate: Mon Sep 16 09:04:17 2019 +0200 CAMEL-13978 - Fixed backport and doc regen --- .../camel-kubernetes/src/main/docs/kubernetes-component.adoc | 9 + .../src/main/docs/kubernetes-config-maps-component.adoc | 9 + .../src/main/docs/kubernetes-deployments-component.adoc | 11 ++- .../src/main/docs/kubernetes-hpa-component.adoc | 11 ++- .../src/main/docs/kubernetes-job-component.adoc | 11 ++- .../src/main/docs/kubernetes-namespaces-component.adoc| 11 ++- .../src/main/docs/kubernetes-nodes-component.adoc | 11 ++- .../docs/kubernetes-persistent-volumes-claims-component.adoc | 11 ++- .../main/docs/kubernetes-persistent-volumes-component.adoc| 11 ++- .../src/main/docs/kubernetes-pods-component.adoc | 11 ++- .../docs/kubernetes-replication-controllers-component.adoc| 11 ++- .../src/main/docs/kubernetes-resources-quota-component.adoc | 11 ++- .../src/main/docs/kubernetes-secrets-component.adoc | 11 ++- .../src/main/docs/kubernetes-service-accounts-component.adoc | 11 ++- .../src/main/docs/kubernetes-services-component.adoc | 11 ++- .../src/main/docs/openshift-build-configs-component.adoc | 9 + .../src/main/docs/openshift-builds-component.adoc | 11 ++- .../kubernetes/config_maps/KubernetesConfigMapsConsumer.java | 2 +- .../kubernetes/consumer/KubernetesConfigMapsConsumerTest.java | 2 +- 19 files changed, 101 insertions(+), 84 deletions(-) diff --git a/components/camel-kubernetes/src/main/docs/kubernetes-component.adoc b/components/camel-kubernetes/src/main/docs/kubernetes-component.adoc index b1a6fcb..7f3db07 100644 --- a/components/camel-kubernetes/src/main/docs/kubernetes-component.adoc +++ b/components/camel-kubernetes/src/main/docs/kubernetes-component.adoc @@ -1,7 +1,8 @@ -[[kubernetes-component]] -= Kubernetes Component (deprecated) +== Kubernetes Component (deprecated) *Available as of Camel version 2.17* +*Available as of Camel version 2.17* + [IMPORTANT] @@ -74,7 +75,7 @@ kubernetes:masterUrl with the following path and query parameters: -=== Path Parameters (1 parameters): + Path Parameters (1 parameters): [width="100%",cols="2,5,^1,2",options="header"] @@ -84,7 +85,7 @@ with the following path and query parameters: |=== -=== Query Parameters (29 parameters): + Query Parameters (29 parameters): [width="100%",cols="2,5,^1,2",options="header"] diff --git a/components/camel-kubernetes/src/main/docs/kubernetes-config-maps-component.adoc b/components/camel-kubernetes/src/main/docs/kubernetes-config-maps-component.adoc index 2b782da..3274ac5 100644 --- a/components/camel-kubernetes/src/main/docs/kubernetes-config-maps-component.adoc +++ b/components/camel-kubernetes/src/main/docs/kubernetes-config-maps-component.adoc @@ -1,7 +1,8 @@ -[[kubernetes-config-maps-component]] -= Kubernetes ConfigMap Component +== Kubernetes ConfigMap Component *Available as of Camel version 2.17* +*Available as of Camel version 2.17* + The *Kubernetes ConfigMap* component is one of xref:kubernetes-component.adoc[Kubernetes Components] which provides a producer to execute kubernetes ConfigMap operations and a consumer to consume events related to Config maps. @@ -25,7 +26,7 @@ kubernetes-config-maps:masterUrl with the following path and query parameters: -=== Path Parameters (1 parameters): + Path Parameters (1 parameters): [width="100%",cols="2,5,^1,2",options="header"] @@ -35,7 +36,7 @@ with the following path and query parameters: |=== -=== Query Parameters (20 parameters): + Query Parameters (20 parameters): [width="100%",cols="2,5,^1,2",options="header"] diff --git a/components/camel-kubernetes/src/main/docs/kubernetes-deployments-component.adoc b/components/camel-kubernetes/src/main/docs/kubernetes-deployments-component.adoc index d8b91f0..b1b97b4 100644 --- a/components/camel-kubernetes/src/main/docs/kubernetes-deployments-component.adoc +++ b/components/camel-kubernetes/src/main/docs/kubernetes-deployments-component.adoc @@ -1,7 +1,8 @@ -[[kubernetes-deployments-component]] -= Kubernetes Deployments Component +== Kubernetes Deployments Component *Available as of Camel version 2.20* +*Available as of Camel version 2.20* + The *Kubernetes Deployments* component is one of xref:kubernetes-component.adoc[Kubernetes Components] which @@ -27,7 +28,7 @@ kubernetes-deployments:masterUrl with the following path and query parameters: -=== Path Parameters (1 parameters): + Path Parameters (1 parameters)
[camel] 02/06: CAMEL-13978 - Create ConfigMap Watch feature in Kubernetes Component, added test
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch camel-2.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit a608abdd7bb976888fccabb33728b941ade94814
Author: Andrea Cosentino
AuthorDate: Mon Sep 16 08:48:32 2019 +0200
CAMEL-13978 - Create ConfigMap Watch feature in Kubernetes Component, added
test
---
.../consumer/KubernetesConfigMapsConsumerTest.java | 104 +
1 file changed, 104 insertions(+)
diff --git
a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/KubernetesConfigMapsConsumerTest.java
b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/KubernetesConfigMapsConsumerTest.java
new file mode 100644
index 000..3bd59af
--- /dev/null
+++
b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/KubernetesConfigMapsConsumerTest.java
@@ -0,0 +1,104 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.kubernetes.consumer;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.camel.EndpointInject;
+import org.apache.camel.Exchange;
+import org.apache.camel.Message;
+import org.apache.camel.Processor;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.kubernetes.KubernetesConstants;
+import org.apache.camel.component.kubernetes.KubernetesTestSupport;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.util.ObjectHelper;
+import org.junit.Ignore;
+import org.junit.Test;
+
+import io.fabric8.kubernetes.api.model.ConfigMap;
+
+@Ignore("Requires a running Kubernetes Cluster")
+public class KubernetesConfigMapsConsumerTest extends KubernetesTestSupport {
+
+@EndpointInject("mock:result")
+protected MockEndpoint mockResultEndpoint;
+
+@Test
+public void createAndDeleteConfigMap() throws Exception {
+if (ObjectHelper.isEmpty(authToken)) {
+return;
+}
+
+mockResultEndpoint.expectedMessageCount(3);
+
mockResultEndpoint.expectedHeaderValuesReceivedInAnyOrder(KubernetesConstants.KUBERNETES_EVENT_ACTION,
"ADDED", "MODIFIED", "MODIFIED");
+Exchange ex = template.request("direct:createConfigmap", new
Processor() {
+
+@Override
+public void process(Exchange exchange) throws Exception {
+
exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_NAMESPACE_NAME,
"default");
+
exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_CONFIGMAP_NAME,
"test");
+Map labels = new HashMap<>();
+labels.put("this", "rocks");
+
exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_CONFIGMAPS_LABELS,
labels);
+HashMap configMapData = new HashMap<>();
+configMapData.put("test", "test");
+
exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_CONFIGMAP_DATA,
configMapData);
+}
+});
+
+ex = template.request("direct:deleteConfigmap", new Processor() {
+
+@Override
+public void process(Exchange exchange) throws Exception {
+
exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_NAMESPACE_NAME,
"default");
+
exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_CONFIGMAP_NAME,
"test");
+}
+});
+
+boolean cmDeleted = ex.getOut().getBody(Boolean.class);
+
+assertTrue(cmDeleted);
+
+Thread.sleep(3000);
+
+mockResultEndpoint.assertIsSatisfied();
+}
+
+@Override
+protected RouteBuilder createRouteBuilder() throws Exception {
+return new RouteBuilder() {
+@Override
+public void configure() throws Exception {
+
from("direct:createConfigmap").toF("kubernetes-config-maps://%s?oauthToken=%s&operation=createConfigMap",
host, authToken);
+
from("direct:deleteConfigmap").toF("kubernetes-config-maps://%s?oauthToken=%s&operation=deleteConfigMap",
host, authToken);
+
fromF("kubernetes-config-maps://%s?oauthToke
[camel] 06/06: Regen docs
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch camel-2.x in repository https://gitbox.apache.org/repos/asf/camel.git commit f7d57badd9b57375c13ecd391318d705239542ed Author: Andrea Cosentino AuthorDate: Mon Sep 16 09:07:02 2019 +0200 Regen docs --- .../modules/ROOT/pages/kubernetes-component.adoc | 10 ++--- .../pages/kubernetes-config-maps-component.adoc| 13 +++--- .../pages/kubernetes-deployments-component.adoc| 12 +++--- .../ROOT/pages/kubernetes-hpa-component.adoc | 12 +++--- .../ROOT/pages/kubernetes-job-component.adoc | 12 +++--- .../pages/kubernetes-namespaces-component.adoc | 12 +++--- .../ROOT/pages/kubernetes-nodes-component.adoc | 12 +++--- ...rnetes-persistent-volumes-claims-component.adoc | 12 +++--- .../kubernetes-persistent-volumes-component.adoc | 12 +++--- .../ROOT/pages/kubernetes-pods-component.adoc | 12 +++--- ...bernetes-replication-controllers-component.adoc | 12 +++--- .../kubernetes-resources-quota-component.adoc | 12 +++--- .../ROOT/pages/kubernetes-secrets-component.adoc | 12 +++--- .../kubernetes-service-accounts-component.adoc | 12 +++--- .../ROOT/pages/kubernetes-services-component.adoc | 12 +++--- .../pages/openshift-build-configs-component.adoc | 10 ++--- .../ROOT/pages/openshift-builds-component.adoc | 12 +++--- .../modules/ROOT/pages/sql-component.adoc | 48 +- 18 files changed, 146 insertions(+), 103 deletions(-) diff --git a/docs/components/modules/ROOT/pages/kubernetes-component.adoc b/docs/components/modules/ROOT/pages/kubernetes-component.adoc index f57c21d..7f3db07 100644 --- a/docs/components/modules/ROOT/pages/kubernetes-component.adoc +++ b/docs/components/modules/ROOT/pages/kubernetes-component.adoc @@ -1,8 +1,8 @@ -[[kubernetes-component]] -= Kubernetes Component (deprecated) -:page-source: components/camel-kubernetes/src/main/docs/kubernetes-component.adoc +== Kubernetes Component (deprecated) *Available as of Camel version 2.17* +*Available as of Camel version 2.17* + [IMPORTANT] @@ -75,7 +75,7 @@ kubernetes:masterUrl with the following path and query parameters: -=== Path Parameters (1 parameters): + Path Parameters (1 parameters): [width="100%",cols="2,5,^1,2",options="header"] @@ -85,7 +85,7 @@ with the following path and query parameters: |=== -=== Query Parameters (29 parameters): + Query Parameters (29 parameters): [width="100%",cols="2,5,^1,2",options="header"] diff --git a/docs/components/modules/ROOT/pages/kubernetes-config-maps-component.adoc b/docs/components/modules/ROOT/pages/kubernetes-config-maps-component.adoc index 303b9fb..3274ac5 100644 --- a/docs/components/modules/ROOT/pages/kubernetes-config-maps-component.adoc +++ b/docs/components/modules/ROOT/pages/kubernetes-config-maps-component.adoc @@ -1,12 +1,11 @@ -[[kubernetes-config-maps-component]] -= Kubernetes ConfigMap Component -:page-source: components/camel-kubernetes/src/main/docs/kubernetes-config-maps-component.adoc +== Kubernetes ConfigMap Component *Available as of Camel version 2.17* +*Available as of Camel version 2.17* The *Kubernetes ConfigMap* component is one of xref:kubernetes-component.adoc[Kubernetes Components] which -provides a producer to execute kubernetes ConfigMap operations. +provides a producer to execute kubernetes ConfigMap operations and a consumer to consume events related to Config maps. == Component Options @@ -27,7 +26,7 @@ kubernetes-config-maps:masterUrl with the following path and query parameters: -=== Path Parameters (1 parameters): + Path Parameters (1 parameters): [width="100%",cols="2,5,^1,2",options="header"] @@ -37,7 +36,7 @@ with the following path and query parameters: |=== -=== Query Parameters (20 parameters): + Query Parameters (20 parameters): [width="100%",cols="2,5,^1,2",options="header"] @@ -91,4 +90,4 @@ The component supports 2 options, which are listed below. | *camel.component.kubernetes-config-maps.enabled* | Whether to enable auto configuration of the kubernetes-config-maps component. This is enabled by default. | | Boolean | *camel.component.kubernetes-config-maps.resolve-property-placeholders* | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | Boolean |=== -// spring-boot-auto-configure options: END \ No newline at end of file +// spring-boot-auto-configure options: END diff --git a/docs/components/modules/ROOT/pages/kubernetes-deployments-component.adoc b/docs/components/modules/ROOT/pages/kubernetes-deployments-component.adoc index 9dc2f7c..b1b97b4 100644 --- a/docs/components/modules/ROOT/pages/kubernetes-deployments-component.adoc +++ b/docs/components/modules/ROOT/pages/kubernetes-deployments-component.adoc @@ -1,8 +1,8 @@ -[[kubernetes-deployments-component
