[GitHub] [camel-quarkus] github-actions[bot] closed issue #2926: [CI] - Quarkus Main Branch Build Failure
github-actions[bot] closed issue #2926: URL: https://github.com/apache/camel-quarkus/issues/2926 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-quarkus] github-actions[bot] commented on issue #2926: [CI] - Quarkus Main Branch Build Failure
github-actions[bot] commented on issue #2926: URL: https://github.com/apache/camel-quarkus/issues/2926#issuecomment-986175017 Build fixed with: * Camel Quarkus Commit: 052756c40fa4b393d64712162d4b65ba073fd295 * Quarkus Main Commit: e5bdd8227bf084a6160780c574bae7aaf71ee33a * Link to build: https://github.com/apache/camel-quarkus/actions/runs/1540264773 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-k] branch main updated: Updated CHANGELOG.md
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-k.git The following commit(s) were added to refs/heads/main by this push: new 705bde8 Updated CHANGELOG.md 705bde8 is described below commit 705bde8b3ce71cefbcbd1a79b0d960a42220b26e Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Sun Dec 5 03:09:25 2021 + Updated CHANGELOG.md --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0cca97f..484f078 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -37,6 +37,9 @@ **Merged pull requests:** +- chore\(ci\): Better GitHub Actions concurrency group [\#2811](https://github.com/apache/camel-k/pull/2811) ([astefanutti](https://github.com/astefanutti)) +- fix\(OLM\): Remove aggregated cluster roles from OLM bundle [\#2809](https://github.com/apache/camel-k/pull/2809) ([astefanutti](https://github.com/astefanutti)) +- chore: Remove custom REST client [\#2806](https://github.com/apache/camel-k/pull/2806) ([astefanutti](https://github.com/astefanutti)) - chore\(build\): Upgrade base image to ubi-quarkus-mandrel:21.3.0.0 [\#2798](https://github.com/apache/camel-k/pull/2798) ([astefanutti](https://github.com/astefanutti)) - fix\(build\): Fix OLM bundle generation on Mac OS [\#2797](https://github.com/apache/camel-k/pull/2797) ([astefanutti](https://github.com/astefanutti)) - fix\(cli\): Skip version compatibility check for builder command [\#2796](https://github.com/apache/camel-k/pull/2796) ([astefanutti](https://github.com/astefanutti))
[camel-spring-boot] branch automatic-periodic-sync updated (779a72b -> ef370a7)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch automatic-periodic-sync in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git. omit 779a72b [create-pull-request] automated change add 112bf1f [create-pull-request] automated change add b173739 Regen add 37f28b6 CAMEL-15133: camel-health - Resolve health-checks from classpath and make it friendlier to provide custom health checks. add 5952680 Regen add ef370a7 Fixed test 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 (779a72b) \ N -- N -- N refs/heads/automatic-periodic-sync (ef370a7) 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. No new revisions were added by this update. Summary of changes: .../camel/springboot/catalog/components/atlasmap.json | 1 + .../springboot/catalog/components/google-storage.json | 2 ++ .../camel/springboot/catalog/components/kafka.json| 4 +++- .../springboot/catalog/components/vertx-kafka.json| 2 +- .../src/main/docs/google-storage.json | 6 ++ .../GoogleCloudStorageComponentConfiguration.java | 18 ++ .../HystrixHierarchicalConfigurationTest.java | 2 +- core/camel-spring-boot/src/main/docs/spring-boot.json | 7 +++ .../spring/boot/CamelConfigurationProperties.java | 5 + tooling/camel-spring-boot-dependencies/pom.xml| 19 --- 10 files changed, 44 insertions(+), 22 deletions(-)
[camel-karaf] branch automatic-periodic-sync updated (8cf28d4 -> cb013de)
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a change to branch automatic-periodic-sync
in repository https://gitbox.apache.org/repos/asf/camel-karaf.git.
from 8cf28d4 Regen
add cb013de CAMEL-17272: camel-spring-xml - Classic Spring XML add
support for external route configuration XML files
No new revisions were added by this update.
Summary of changes:
.../org/apache/camel/blueprint/jaxb.index | 1 +
.../camel/blueprint/CamelContextFactoryBean.java | 12 +
...CamelRouteConfigurationContextFactoryBean.java} | 15 +++---
.../blueprint/handler/CamelNamespaceHandler.java | 62 ++
4 files changed, 73 insertions(+), 17 deletions(-)
copy
components/camel-blueprint/src/main/java/org/apache/camel/blueprint/{CamelRouteTemplateContextFactoryBean.java
=> CamelRouteConfigurationContextFactoryBean.java} (72%)
[camel] branch bind updated: CAMEL-17261: camel-yaml-dsl - Add support for loading Camel K KameletBinding file. WIP.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch bind
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/bind by this push:
new 47b37dc CAMEL-17261: camel-yaml-dsl - Add support for loading Camel K
KameletBinding file. WIP.
47b37dc is described below
commit 47b37dcdd5a4339c2a489203fb1a1a31c545eb02
Author: Claus Ibsen
AuthorDate: Sat Dec 4 23:39:10 2021 +0100
CAMEL-17261: camel-yaml-dsl - Add support for loading Camel K
KameletBinding file. WIP.
---
.../camel/dsl/yaml/YamlRoutesBuilderLoader.java| 31
.../camel/dsl/yaml/KameletBindingLoaderTest.groovy | 55 +-
2 files changed, 75 insertions(+), 11 deletions(-)
diff --git
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/main/java/org/apache/camel/dsl/yaml/YamlRoutesBuilderLoader.java
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/main/java/org/apache/camel/dsl/yaml/YamlRoutesBuilderLoader.java
index e186fb4..e61092b 100644
---
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/main/java/org/apache/camel/dsl/yaml/YamlRoutesBuilderLoader.java
+++
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/main/java/org/apache/camel/dsl/yaml/YamlRoutesBuilderLoader.java
@@ -151,15 +151,16 @@ public class YamlRoutesBuilderLoader extends
YamlRoutesBuilderLoaderSupport {
private static Object preConfigureNode(Node root) throws Exception {
Object target = root;
-// check if the yaml is a camel-k yaml with embedded routes (called
flow(s))
+// check if the yaml is a camel-k yaml with embedded binding/routes
(called flow(s))
if (Objects.equals(root.getNodeType(), NodeType.MAPPING)) {
final MappingNode mn = YamlDeserializerSupport.asMappingNode(root);
-boolean camelk = anyTupleMatches(mn.getValue(), "apiVersion",
"camel.apache.org/v1") &&
+// camel-k: integration
+boolean integration = anyTupleMatches(mn.getValue(), "apiVersion",
"camel.apache.org/v1") &&
anyTupleMatches(mn.getValue(), "kind", "Integration");
-// kamelet binding are still at v1alpha1
+// camel-k: kamelet binding are still at v1alpha1
boolean binding = anyTupleMatches(mn.getValue(), "apiVersion",
"camel.apache.org/v1alpha1") &&
anyTupleMatches(mn.getValue(), "kind", "KameletBinding");
-if (camelk) {
+if (integration) {
Node routes = nodeAt(root, "/spec/flows");
if (routes == null) {
routes = nodeAt(root, "/spec/flow");
@@ -168,13 +169,23 @@ public class YamlRoutesBuilderLoader extends
YamlRoutesBuilderLoaderSupport {
target = routes;
}
} else if (binding) {
-MappingNode source = asMappingNode(nodeAt(root,
"/spec/source/ref"));
-MappingNode sink = asMappingNode(nodeAt(root,
"/spec/sink/ref"));
+// kamelet binding is a bit more complex, so grab the source
and sink
+// and map those to Camel route definitions
+MappingNode source = asMappingNode(nodeAt(root,
"/spec/source"));
+MappingNode sink = asMappingNode(nodeAt(root, "/spec/sink"));
if (source != null && sink != null) {
-boolean sourceKamelet = anyTupleMatches(source.getValue(),
"kind", "Kamelet");
-boolean sinkKamelet = anyTupleMatches(sink.getValue(),
"kind", "Kamelet");
-String from = extractTupleValue(source.getValue(), "name");
-String to = extractTupleValue(sink.getValue(), "name");
+Node sourceRef = nodeAt(source, "/ref");
+if (sourceRef != null) {
+source = asMappingNode(sourceRef);
+}
+Node sinkRef = nodeAt(sink, "/ref");
+if (sinkRef != null) {
+sink = asMappingNode(sinkRef);
+}
+boolean sourceKamelet = sourceRef != null &&
anyTupleMatches(source.getValue(), "kind", "Kamelet");
+boolean sinkKamelet = sinkRef != null &&
anyTupleMatches(sink.getValue(), "kind", "Kamelet");
+String from = extractTupleValue(source.getValue(),
sourceKamelet ? "name" : "uri");
+String to = extractTupleValue(sink.getValue(), sinkKamelet
? "name" : "uri");
if (sourceKamelet) {
from = "kamelet:" + from;
}
diff --git
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/KameletBindingLoaderTest.groovy
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/KameletBindingLoaderTest.groovy
index f1fdb83..b975b12 100644
---
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/cam
[camel] branch bind updated: CAMEL-17261: camel-yaml-dsl - Add support for loading Camel K KameletBinding file. WIP.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch bind
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/bind by this push:
new f379a97 CAMEL-17261: camel-yaml-dsl - Add support for loading Camel K
KameletBinding file. WIP.
f379a97 is described below
commit f379a9716884d53c1aab827a08ae001281ac950b
Author: Claus Ibsen
AuthorDate: Sat Dec 4 23:03:55 2021 +0100
CAMEL-17261: camel-yaml-dsl - Add support for loading Camel K
KameletBinding file. WIP.
---
.../dsl/yaml/deserializers/ModelDeserializers.java | 37 +
.../deserializers/ModelDeserializersResolver.java | 3 +
dsl/camel-yaml-dsl/camel-yaml-dsl/pom.xml | 5 +
.../src/generated/resources/camel-yaml-dsl.json| 9 ++
.../camel/dsl/yaml/YamlRoutesBuilderLoader.java| 160 +
.../camel/dsl/yaml/KameletBindingLoaderTest.groovy | 16 +--
.../camel/dsl/yaml/support/YamlTestSupport.groovy | 12 ++
.../test/resources/kamelets/log-sink.kamelet.yaml | 61
.../resources/kamelets/timer-source.kamelet.yaml | 69 +
9 files changed, 300 insertions(+), 72 deletions(-)
diff --git
a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/ModelDeserializers.java
b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/ModelDeserializers.java
index 095eb74..d40cbeee 100644
---
a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/ModelDeserializers.java
+++
b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/ModelDeserializers.java
@@ -69,6 +69,7 @@ import
org.apache.camel.model.Resilience4jConfigurationDefinition;
import org.apache.camel.model.RestContextRefDefinition;
import org.apache.camel.model.RollbackDefinition;
import org.apache.camel.model.RouteBuilderDefinition;
+import org.apache.camel.model.RouteConfigurationContextRefDefinition;
import org.apache.camel.model.RouteContextRefDefinition;
import org.apache.camel.model.RouteDefinition;
import org.apache.camel.model.RouteTemplateParameterDefinition;
@@ -12918,6 +12919,42 @@ public final class ModelDeserializers extends
YamlDeserializerSupport {
}
@YamlType(
+types =
org.apache.camel.model.RouteConfigurationContextRefDefinition.class,
+order =
org.apache.camel.dsl.yaml.common.YamlDeserializerResolver.ORDER_LOWEST - 1,
+nodes = {
+"route-configuration-context-ref",
+"routeConfigurationContextRef"
+},
+properties = @YamlProperty(name = "ref", type = "string", required
= true)
+)
+public static class RouteConfigurationContextRefDefinitionDeserializer
extends YamlDeserializerBase {
+public RouteConfigurationContextRefDefinitionDeserializer() {
+super(RouteConfigurationContextRefDefinition.class);
+}
+
+@Override
+protected RouteConfigurationContextRefDefinition newInstance() {
+return new RouteConfigurationContextRefDefinition();
+}
+
+@Override
+protected boolean setProperty(RouteConfigurationContextRefDefinition
target,
+String propertyKey, String propertyName, Node node) {
+switch(propertyKey) {
+case "ref": {
+String val = asText(node);
+target.setRef(val);
+break;
+}
+default: {
+return false;
+}
+}
+return true;
+}
+}
+
+@YamlType(
types = org.apache.camel.model.RouteContextRefDefinition.class,
order =
org.apache.camel.dsl.yaml.common.YamlDeserializerResolver.ORDER_LOWEST - 1,
nodes = {
diff --git
a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/ModelDeserializersResolver.java
b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/ModelDeserializersResolver.java
index f5837a5..f0629b1 100644
---
a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/ModelDeserializersResolver.java
+++
b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/ModelDeserializersResolver.java
@@ -363,6 +363,9 @@ public final class ModelDeserializersResolver implements
YamlDeserializerResolve
case "route-builder": return new
ModelDeserializers.RouteBuilderDefinitionDeserializer();
case "routeBuilder": return new
ModelDeserializers.RouteBuilderDefinitionDeserializer();
case "org.apache.camel.model.RouteBuild
[GitHub] [camel-spring-boot] michaelandrepearce edited a comment on pull request #415: CAMEL-17274 - Fix regression caused by CAMEL-15560
michaelandrepearce edited a comment on pull request #415: URL: https://github.com/apache/camel-spring-boot/pull/415#issuecomment-986099604 @davsclaus i had some free time this evening, as such created JIRA: https://issues.apache.org/jira/browse/CAMEL-17274 Extracted sample application demonstrating the issue (note the app is set to 3.7.6 showing its working, but breaks when you upgrade to 3.8.0 or above), this is zipped and attached to JIRA ticket. Like wise if you apply the fix in this PR the regression is resolved. Amended commit message to new JIRA id. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-spring-boot] michaelandrepearce edited a comment on pull request #415: CAMEL-17274 - Fix regression caused by CAMEL-15560
michaelandrepearce edited a comment on pull request #415: URL: https://github.com/apache/camel-spring-boot/pull/415#issuecomment-986099604 @davsclaus i had some free time this evening, as such created JIRA: https://issues.apache.org/jira/browse/CAMEL-17274 Extracted sample application demonstrating the issue (note the app is set to 3.7.6 showing its working, but breaks when you upgrade to 3.8.0 or above), this is zipped and attached to JIRA ticket. Amended commit message to new JIRA id. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-spring-boot] michaelandrepearce commented on pull request #415: CAMEL-15560 - Fix regression
michaelandrepearce commented on pull request #415: URL: https://github.com/apache/camel-spring-boot/pull/415#issuecomment-986099604 @davsclaus i had some free time this evening, as such created JIRA: https://issues.apache.org/jira/browse/CAMEL-17274 Extracted sample application demonstrating the issue (not the app is set to 3.7.6 showing its working, but breaks when you upgrade to 3.8.0 or above), this is zipped and attached to JIRA ticket. Amended commit message to new JIRA id. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-website] branch asf-site updated (0cf760b -> d26e534)
This is an automated email from the ASF dual-hosted git repository. git-site-role pushed a change to branch asf-site in repository https://gitbox.apache.org/repos/asf/camel-website.git. discard 0cf760b Website updated to edf4924352b466056ad6bc8f00744dd199d0dfeb discard 6884fff Website updated to 325e929157412b27394080f4d4dba3d821476ddf new bff9a6e Website updated to 325e929157412b27394080f4d4dba3d821476ddf new d26e534 Website updated to edf4924352b466056ad6bc8f00744dd199d0dfeb 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 (0cf760b) \ N -- N -- N refs/heads/asf-site (d26e534) 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 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: .htaccess | 26 +- components/next/google-storage-component.html |2 +- manual/route-configuration.html | 21 +- sitemap-camel-k.xml | 822 +-- sitemap-camel-kafka-connector.xml | 2218 sitemap-camel-kamelets.xml| 558 +- sitemap-camel-karaf.xml | 70 +- sitemap-camel-quarkus.xml | 2078 sitemap-camel-spring-boot.xml | 54 +- sitemap-components.xml| 6712 - sitemap-manual.xml| 382 +- 11 files changed, 6481 insertions(+), 6462 deletions(-)
[GitHub] [camel-spring-boot] michaelandrepearce commented on pull request #415: CAMEL-15560 - Fix regression
michaelandrepearce commented on pull request #415: URL: https://github.com/apache/camel-spring-boot/pull/415#issuecomment-986055969 Ill get it done Monday when back in work -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-spring-boot] davsclaus commented on pull request #415: CAMEL-15560 - Fix regression
davsclaus commented on pull request #415: URL: https://github.com/apache/camel-spring-boot/pull/415#issuecomment-986051289 We plan to cut 3.14 by end of next week, so it would be good to have this start of next week so time to make it into the release. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch regen_bot updated (c3fc212 -> 8c5d470)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel.git. omit c3fc212 Regen for commit f6f122954698bd32c6f90c1c7bfc7fe20d685c3d add 54cdb08 CAMEL-17272: camel-spring-xml - Classic Spring XML add support for external route configuration XML files add 8c5d470 Regen for commit f6f122954698bd32c6f90c1c7bfc7fe20d685c3d 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 (c3fc212) \ N -- N -- N refs/heads/regen_bot (8c5d470) 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. No new revisions were added by this update. Summary of changes: .../modules/ROOT/pages/route-configuration.adoc| 39 ++ 1 file changed, 39 insertions(+)
[camel] branch main updated: Regen for commit f6f122954698bd32c6f90c1c7bfc7fe20d685c3d
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new 8c5d470 Regen for commit f6f122954698bd32c6f90c1c7bfc7fe20d685c3d
8c5d470 is described below
commit 8c5d470314e323156e211243734ebb45d6597cdc
Author: davsclaus
AuthorDate: Sat Dec 4 11:51:08 2021 +
Regen for commit f6f122954698bd32c6f90c1c7bfc7fe20d685c3d
Signed-off-by: GitHub
---
.../org/apache/camel/catalog/models.properties | 2 ++
.../apache/camel/catalog/models/camelContext.json | 1 +
.../catalog/models/routeConfigurationContext.json | 17 ++
.../models/routeConfigurationContextRef.json | 16 +
.../apache/camel/catalog/schemas/camel-spring.xsd | 38 ++
.../dsl/yaml/deserializers/ModelDeserializers.java | 37 +
.../deserializers/ModelDeserializersResolver.java | 3 ++
.../src/generated/resources/camel-yaml-dsl.json| 9 +
8 files changed, 123 insertions(+)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models.properties
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models.properties
index e0d7e06..b82d7d0 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models.properties
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models.properties
@@ -146,6 +146,8 @@ roundRobin
route
routeBuilder
routeConfiguration
+routeConfigurationContext
+routeConfigurationContextRef
routeConfigurations
routeContext
routeContextRef
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/camelContext.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/camelContext.json
index 42cb0b3..72f27e7 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/camelContext.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/camelContext.json
@@ -63,6 +63,7 @@
"resilience4jConfiguration": { "kind": "element", "displayName":
"Resilience4j Configuration", "required": false, "type": "array", "javaType":
"java.util.List",
"deprecated": false, "autowired": false, "secret": false, "description":
"Resilience4j Circuit Breaker EIP configurations" },
"defaultFaultToleranceConfiguration": { "kind": "element", "displayName":
"Default Fault Tolerance Configuration", "required": false, "type": "object",
"javaType": "org.apache.camel.model.FaultToleranceConfigurationDefinition",
"deprecated": false, "autowired": false, "secret": false, "description":
"MicroProfile Fault Tolerance EIP default configuration" },
"faultToleranceConfiguration": { "kind": "element", "displayName": "Fault
Tolerance Configuration", "required": false, "type": "array", "javaType":
"java.util.List",
"deprecated": false, "autowired": false, "secret": false, "description":
"MicroProfile Circuit Breaker EIP configurations" },
+"routeConfigurationContextRef": { "kind": "element", "displayName": "Route
Configuration Context Ref", "required": false, "type": "array", "javaType":
"java.util.List",
"deprecated": false, "autowired": false, "secret": false, "description":
"Refers to XML route configurations to include as route configurations in this
CamelContext." },
"routeTemplateContextRef": { "kind": "element", "displayName": "Route
Template Context Ref", "required": false, "type": "array", "javaType":
"java.util.List",
"deprecated": false, "autowired": false, "secret": false, "description":
"Refers to XML route templates to include as route templates in this
CamelContext." },
"routeBuilder": { "kind": "element", "displayName": "Route Builder",
"required": false, "type": "array", "javaType":
"java.util.List", "deprecated":
false, "autowired": false, "secret": false, "description": "Refers to Java
RouteBuilder instances to include as routes in this CamelContext." },
"routeContextRef": { "kind": "element", "displayName": "Route Context
Ref", "required": false, "type": "array", "javaType":
"java.util.List",
"deprecated": false, "autowired": false, "secret": false, "description":
"Refers to XML routes to include as routes in this CamelContext." },
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/routeConfigurationContext.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/routeConfigurationContext.json
new file mode 100644
index 000..a858ab4
--- /dev/null
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/routeConfigurationContext.json
@@ -0,0 +1,17 @@
+{
+ "model": {
+"kind": "model",
+"name": "routeConfigurationContext",
+"title": "Route Configuration Context",
+"descriptio
[GitHub] [camel] oscerd merged pull request #6501: Generated sources regen
oscerd merged pull request #6501: URL: https://github.com/apache/camel/pull/6501 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch regen_bot updated (f2c200d -> c3fc212)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel.git. from f2c200d CAMEL-17271: camel-cm-test - Fix failing CMTest add da71ccc CAMEL-17272: camel-spring-xml - Classic Spring XML add support for external route configuration XML files add 5c8713b CAMEL-17272: camel-spring-xml - Classic Spring XML add support for external route configuration XML files add b29ef69 CAMEL-17272: camel-spring-xml - Classic Spring XML add support for external route configuration XML files add f6f1229 CAMEL-17272: camel-spring-xml - Classic Spring XML add support for external route configuration XML files add c3fc212 Regen for commit f6f122954698bd32c6f90c1c7bfc7fe20d685c3d No new revisions were added by this update. Summary of changes: .../org/apache/camel/catalog/models.properties | 2 + .../apache/camel/catalog/models/camelContext.json | 1 + .../catalog/models/routeConfigurationContext.json | 17 ++ .../models/routeConfigurationContextRef.json | 16 ++ .../apache/camel/catalog/schemas/camel-spring.xsd | 38 .../resources/org/apache/camel/cdi/xml/jaxb.index | 1 + .../org/apache/camel/cdi/XmlCdiBeanFactory.java| 26 + .../cdi/xml/ApplicationContextFactoryBean.java | 11 .../camel/cdi/xml/CamelContextFactoryBean.java | 13 + .../xml/RouteConfigurationContextDefinition.java | 44 ++ .../org/apache/camel/spring/xml/camelContext.json | 1 + .../org/apache/camel/spring/xml/jaxb.index | 1 + .../spring/xml/routeConfigurationContext.json | 17 ++ .../camel/spring/xml/CamelContextFactoryBean.java | 15 + .../CamelRouteConfigurationContextFactoryBean.java | 67 ++ .../spring/xml/handler/CamelNamespaceHandler.java | 34 +++ .../SpringRoutesConfigurationExternalTest.java | 48 .../SpringRoutesConfigurationExternalTest.xml | 57 ++ .../services/org/apache/camel/model.properties | 1 + .../resources/org/apache/camel/model/jaxb.index| 1 + .../camel/model/routeConfigurationContextRef.json | 16 ++ .../RouteConfigurationContextRefDefinition.java| 62 ...uteConfigurationContextRefDefinitionHelper.java | 53 + .../core/xml/AbstractCamelContextFactoryBean.java | 17 ++ .../java/org/apache/camel/xml/in/ModelParser.java | 9 +++ .../dsl/yaml/deserializers/ModelDeserializers.java | 37 .../deserializers/ModelDeserializersResolver.java | 3 + .../src/generated/resources/camel-yaml-dsl.json| 9 +++ 28 files changed, 617 insertions(+) create mode 100644 catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/routeConfigurationContext.json create mode 100644 catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/routeConfigurationContextRef.json create mode 100644 components/camel-cdi/src/main/java/org/apache/camel/cdi/xml/RouteConfigurationContextDefinition.java create mode 100644 components/camel-spring-xml/src/generated/resources/org/apache/camel/spring/xml/routeConfigurationContext.json create mode 100644 components/camel-spring-xml/src/main/java/org/apache/camel/spring/xml/CamelRouteConfigurationContextFactoryBean.java create mode 100644 components/camel-spring-xml/src/test/java/org/apache/camel/spring/SpringRoutesConfigurationExternalTest.java create mode 100644 components/camel-spring-xml/src/test/resources/org/apache/camel/spring/SpringRoutesConfigurationExternalTest.xml create mode 100644 core/camel-core-model/src/generated/resources/org/apache/camel/model/routeConfigurationContextRef.json create mode 100644 core/camel-core-model/src/main/java/org/apache/camel/model/RouteConfigurationContextRefDefinition.java create mode 100644 core/camel-core-model/src/main/java/org/apache/camel/model/RouteConfigurationContextRefDefinitionHelper.java
[GitHub] [camel] github-actions[bot] opened a new pull request #6501: Generated sources regen
github-actions[bot] opened a new pull request #6501: URL: https://github.com/apache/camel/pull/6501 Regen bot :robot: found some uncommited changes after running build on :camel: main. Please do not delete `regen_bot` branch after merge/rebase. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-karaf] branch main updated: CAMEL-17272: camel-spring-xml - Classic Spring XML add support for external route configuration XML files
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karaf.git
The following commit(s) were added to refs/heads/main by this push:
new cb013de CAMEL-17272: camel-spring-xml - Classic Spring XML add
support for external route configuration XML files
cb013de is described below
commit cb013de8b900278617eeb2ededb97997e01f62ce
Author: Claus Ibsen
AuthorDate: Sat Dec 4 11:52:34 2021 +0100
CAMEL-17272: camel-spring-xml - Classic Spring XML add support for external
route configuration XML files
---
.../org/apache/camel/blueprint/jaxb.index | 1 +
.../camel/blueprint/CamelContextFactoryBean.java | 12 +
.../CamelRouteConfigurationContextFactoryBean.java | 39 ++
.../blueprint/handler/CamelNamespaceHandler.java | 62 ++
4 files changed, 105 insertions(+), 9 deletions(-)
diff --git
a/components/camel-blueprint/src/generated/resources/org/apache/camel/blueprint/jaxb.index
b/components/camel-blueprint/src/generated/resources/org/apache/camel/blueprint/jaxb.index
index bab0bd6..55cce40 100644
---
a/components/camel-blueprint/src/generated/resources/org/apache/camel/blueprint/jaxb.index
+++
b/components/camel-blueprint/src/generated/resources/org/apache/camel/blueprint/jaxb.index
@@ -8,6 +8,7 @@ CamelProducerTemplateFactoryBean
CamelProxyFactoryBean
CamelRedeliveryPolicyFactoryBean
CamelRestContextFactoryBean
+CamelRouteConfigurationContextFactoryBean
CamelRouteContextFactoryBean
CamelRouteTemplateContextFactoryBean
CamelThreadPoolFactoryBean
diff --git
a/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelContextFactoryBean.java
b/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelContextFactoryBean.java
index 34fec02..982e7ef 100644
---
a/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelContextFactoryBean.java
+++
b/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelContextFactoryBean.java
@@ -62,6 +62,7 @@ import org.apache.camel.model.PackageScanDefinition;
import org.apache.camel.model.Resilience4jConfigurationDefinition;
import org.apache.camel.model.RestContextRefDefinition;
import org.apache.camel.model.RouteBuilderDefinition;
+import org.apache.camel.model.RouteConfigurationContextRefDefinition;
import org.apache.camel.model.RouteConfigurationDefinition;
import org.apache.camel.model.RouteContextRefDefinition;
import org.apache.camel.model.RouteDefinition;
@@ -207,6 +208,8 @@ public class CamelContextFactoryBean extends
AbstractCamelContextFactoryBean
faultToleranceConfigurations;
+@XmlElement(name = "routeConfigurationContextRef")
+private List
routeConfigurationRefs = new ArrayList<>();
@XmlElement(name = "routeTemplateContextRef")
private List routeTemplateRefs = new
ArrayList<>();
@XmlElement(name = "routeBuilder")
@@ -621,6 +624,15 @@ public class CamelContextFactoryBean extends
AbstractCamelContextFactoryBean
getRouteConfigurationRefs() {
+return routeConfigurationRefs;
+}
+
+public void
setRouteConfigurationRefs(List
routeConfigurationRefs) {
+this.routeConfigurationRefs = routeConfigurationRefs;
+}
+
+@Override
public List getRouteTemplateRefs() {
return routeTemplateRefs;
}
diff --git
a/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelRouteConfigurationContextFactoryBean.java
b/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelRouteConfigurationContextFactoryBean.java
new file mode 100644
index 000..3f44611
--- /dev/null
+++
b/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelRouteConfigurationContextFactoryBean.java
@@ -0,0 +1,39 @@
+/*
+ * 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.blueprint;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.camel.model.Identif
[camel-spring-boot] branch main updated: Fixed test
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
The following commit(s) were added to refs/heads/main by this push:
new ef370a7 Fixed test
ef370a7 is described below
commit ef370a73ad14c4e52c992bc25e897bb34e5f3b9b
Author: Claus Ibsen
AuthorDate: Sat Dec 4 12:09:00 2021 +0100
Fixed test
---
.../hystrix/processor/HystrixHierarchicalConfigurationTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/components-starter/camel-hystrix-starter/src/test/java/org/apache/camel/component/hystrix/processor/HystrixHierarchicalConfigurationTest.java
b/components-starter/camel-hystrix-starter/src/test/java/org/apache/camel/component/hystrix/processor/HystrixHierarchicalConfigurationTest.java
index c7d5c13..6f8eb8c 100644
---
a/components-starter/camel-hystrix-starter/src/test/java/org/apache/camel/component/hystrix/processor/HystrixHierarchicalConfigurationTest.java
+++
b/components-starter/camel-hystrix-starter/src/test/java/org/apache/camel/component/hystrix/processor/HystrixHierarchicalConfigurationTest.java
@@ -60,7 +60,7 @@ public class HystrixHierarchicalConfigurationTest {
assertNotNull(hystrixDefinition);
-Route rc = new DefaultRoute(camelContext, null, null, null, null);
+Route rc = new DefaultRoute(camelContext, null, null, null, null,
null);
HystrixReifier reifier = new HystrixReifier(rc, hystrixDefinition);
HystrixConfigurationDefinition config =
reifier.buildHystrixConfiguration();
[camel] branch main updated: CAMEL-17272: camel-spring-xml - Classic Spring XML add support for external route configuration XML files
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/main by this push: new 54cdb08 CAMEL-17272: camel-spring-xml - Classic Spring XML add support for external route configuration XML files 54cdb08 is described below commit 54cdb089a60f655ab7887e82d79dd20dea32f64f Author: Claus Ibsen AuthorDate: Sat Dec 4 12:04:12 2021 +0100 CAMEL-17272: camel-spring-xml - Classic Spring XML add support for external route configuration XML files --- .../modules/ROOT/pages/route-configuration.adoc| 39 ++ 1 file changed, 39 insertions(+) diff --git a/docs/user-manual/modules/ROOT/pages/route-configuration.adoc b/docs/user-manual/modules/ROOT/pages/route-configuration.adoc index 957b921..8e8b13d 100644 --- a/docs/user-manual/modules/ROOT/pages/route-configuration.adoc +++ b/docs/user-manual/modules/ROOT/pages/route-configuration.adoc @@ -252,6 +252,45 @@ In this example the route is assigned the _yamlError_ route configuration by the Routes and route configuration are not required to use the same language. For example you can code route configurations in Java, and then use XML DSL for the routes, and they would work together. +== Route Configuration in classic Spring/Blueprint XML + +When using XML DSL with `camel-spring-xml` or `camel-blueprint` +then you can code your route configurations in `` snippets +in sepearte XML files as shown below: + +[source,xml] + +http://camel.apache.org/schema/spring";> + + +java.lang.Exception +true + + + + + + +Then from `` you can refer to these XML snippets by their ids: + +[source,xml] + +http://camel.apache.org/schema/spring";> + + + + + + + + + + + + + +In this example the route is assigned the _xmlError_ route configuration by the exact ID. + == Packaging route configurations in reusable JARs You can package common route configurations into JARs which you can then use together with
[camel] 02/04: CAMEL-17272: camel-spring-xml - Classic Spring XML add support for external route configuration XML files
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 5c8713bb6cebeb53bbac8c6d1a80edcf712eab53
Author: Claus Ibsen
AuthorDate: Sat Dec 4 11:29:02 2021 +0100
CAMEL-17272: camel-spring-xml - Classic Spring XML add support for external
route configuration XML files
---
.../org/apache/camel/spring/xml/camelContext.json | 1 +
.../camel/spring/xml/CamelContextFactoryBean.java | 15 ++
.../spring/xml/handler/CamelNamespaceHandler.java | 1 +
.../SpringRoutesConfigurationExternalTest.java | 48 +
.../SpringRoutesConfigurationExternalTest.xml | 57
.../services/org/apache/camel/model.properties | 1 +
.../resources/org/apache/camel/model/jaxb.index| 1 +
.../camel/model/routeConfigurationContextRef.json | 16 ++
.../RouteConfigurationContextRefDefinition.java| 62 ++
...uteConfigurationContextRefDefinitionHelper.java | 53 ++
.../core/xml/AbstractCamelContextFactoryBean.java | 19 +++
.../java/org/apache/camel/xml/in/ModelParser.java | 9
12 files changed, 283 insertions(+)
diff --git
a/components/camel-spring-xml/src/generated/resources/org/apache/camel/spring/xml/camelContext.json
b/components/camel-spring-xml/src/generated/resources/org/apache/camel/spring/xml/camelContext.json
index 42cb0b3..72f27e7 100644
---
a/components/camel-spring-xml/src/generated/resources/org/apache/camel/spring/xml/camelContext.json
+++
b/components/camel-spring-xml/src/generated/resources/org/apache/camel/spring/xml/camelContext.json
@@ -63,6 +63,7 @@
"resilience4jConfiguration": { "kind": "element", "displayName":
"Resilience4j Configuration", "required": false, "type": "array", "javaType":
"java.util.List",
"deprecated": false, "autowired": false, "secret": false, "description":
"Resilience4j Circuit Breaker EIP configurations" },
"defaultFaultToleranceConfiguration": { "kind": "element", "displayName":
"Default Fault Tolerance Configuration", "required": false, "type": "object",
"javaType": "org.apache.camel.model.FaultToleranceConfigurationDefinition",
"deprecated": false, "autowired": false, "secret": false, "description":
"MicroProfile Fault Tolerance EIP default configuration" },
"faultToleranceConfiguration": { "kind": "element", "displayName": "Fault
Tolerance Configuration", "required": false, "type": "array", "javaType":
"java.util.List",
"deprecated": false, "autowired": false, "secret": false, "description":
"MicroProfile Circuit Breaker EIP configurations" },
+"routeConfigurationContextRef": { "kind": "element", "displayName": "Route
Configuration Context Ref", "required": false, "type": "array", "javaType":
"java.util.List",
"deprecated": false, "autowired": false, "secret": false, "description":
"Refers to XML route configurations to include as route configurations in this
CamelContext." },
"routeTemplateContextRef": { "kind": "element", "displayName": "Route
Template Context Ref", "required": false, "type": "array", "javaType":
"java.util.List",
"deprecated": false, "autowired": false, "secret": false, "description":
"Refers to XML route templates to include as route templates in this
CamelContext." },
"routeBuilder": { "kind": "element", "displayName": "Route Builder",
"required": false, "type": "array", "javaType":
"java.util.List", "deprecated":
false, "autowired": false, "secret": false, "description": "Refers to Java
RouteBuilder instances to include as routes in this CamelContext." },
"routeContextRef": { "kind": "element", "displayName": "Route Context
Ref", "required": false, "type": "array", "javaType":
"java.util.List",
"deprecated": false, "autowired": false, "secret": false, "description":
"Refers to XML routes to include as routes in this CamelContext." },
diff --git
a/components/camel-spring-xml/src/main/java/org/apache/camel/spring/xml/CamelContextFactoryBean.java
b/components/camel-spring-xml/src/main/java/org/apache/camel/spring/xml/CamelContextFactoryBean.java
index 6c2bca3..cd47887 100644
---
a/components/camel-spring-xml/src/main/java/org/apache/camel/spring/xml/CamelContextFactoryBean.java
+++
b/components/camel-spring-xml/src/main/java/org/apache/camel/spring/xml/CamelContextFactoryBean.java
@@ -57,6 +57,7 @@ import org.apache.camel.model.PackageScanDefinition;
import org.apache.camel.model.Resilience4jConfigurationDefinition;
import org.apache.camel.model.RestContextRefDefinition;
import org.apache.camel.model.RouteBuilderDefinition;
+import org.apache.camel.model.RouteConfigurationContextRefDefinition;
import org.apache.camel.model.RouteConfigurationDefinition;
import org.apache.camel.model.RouteContextRefDefinition;
import org.apache.camel.model.RouteDefinition;
@@ -231,6 +232,8 @@ public class CamelContextFactoryBean extends
AbstractCamelContextFactoryBean
faul
[camel] branch main updated (f2c200d -> f6f1229)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel.git. from f2c200d CAMEL-17271: camel-cm-test - Fix failing CMTest new da71ccc CAMEL-17272: camel-spring-xml - Classic Spring XML add support for external route configuration XML files new 5c8713b CAMEL-17272: camel-spring-xml - Classic Spring XML add support for external route configuration XML files new b29ef69 CAMEL-17272: camel-spring-xml - Classic Spring XML add support for external route configuration XML files new f6f1229 CAMEL-17272: camel-spring-xml - Classic Spring XML add support for external route configuration XML files 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: .../resources/org/apache/camel/cdi/xml/jaxb.index | 1 + .../org/apache/camel/cdi/XmlCdiBeanFactory.java| 26 + .../cdi/xml/ApplicationContextFactoryBean.java | 11 .../camel/cdi/xml/CamelContextFactoryBean.java | 13 + .../xml/RouteConfigurationContextDefinition.java | 44 ++ .../org/apache/camel/spring/xml/camelContext.json | 1 + .../org/apache/camel/spring/xml/jaxb.index | 1 + .../spring/xml/routeConfigurationContext.json | 17 ++ .../camel/spring/xml/CamelContextFactoryBean.java | 15 + .../CamelRouteConfigurationContextFactoryBean.java | 67 ++ .../spring/xml/handler/CamelNamespaceHandler.java | 34 +++ .../SpringRoutesConfigurationExternalTest.java | 48 .../SpringRoutesConfigurationExternalTest.xml | 57 ++ .../services/org/apache/camel/model.properties | 1 + .../resources/org/apache/camel/model/jaxb.index| 1 + .../camel/model/routeConfigurationContextRef.json | 16 ++ .../RouteConfigurationContextRefDefinition.java| 62 ...uteConfigurationContextRefDefinitionHelper.java | 53 + .../core/xml/AbstractCamelContextFactoryBean.java | 17 ++ .../java/org/apache/camel/xml/in/ModelParser.java | 9 +++ 20 files changed, 494 insertions(+) create mode 100644 components/camel-cdi/src/main/java/org/apache/camel/cdi/xml/RouteConfigurationContextDefinition.java create mode 100644 components/camel-spring-xml/src/generated/resources/org/apache/camel/spring/xml/routeConfigurationContext.json create mode 100644 components/camel-spring-xml/src/main/java/org/apache/camel/spring/xml/CamelRouteConfigurationContextFactoryBean.java create mode 100644 components/camel-spring-xml/src/test/java/org/apache/camel/spring/SpringRoutesConfigurationExternalTest.java create mode 100644 components/camel-spring-xml/src/test/resources/org/apache/camel/spring/SpringRoutesConfigurationExternalTest.xml create mode 100644 core/camel-core-model/src/generated/resources/org/apache/camel/model/routeConfigurationContextRef.json create mode 100644 core/camel-core-model/src/main/java/org/apache/camel/model/RouteConfigurationContextRefDefinition.java create mode 100644 core/camel-core-model/src/main/java/org/apache/camel/model/RouteConfigurationContextRefDefinitionHelper.java
[camel] 03/04: CAMEL-17272: camel-spring-xml - Classic Spring XML add support for external route configuration XML files
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git commit b29ef69c2c0bbd8281f106b67dc25c705444e628 Author: Claus Ibsen AuthorDate: Sat Dec 4 11:37:32 2021 +0100 CAMEL-17272: camel-spring-xml - Classic Spring XML add support for external route configuration XML files --- .../org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java| 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/core/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java b/core/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java index 79d77b4..07661d1 100644 --- a/core/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java +++ b/core/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java @@ -455,10 +455,8 @@ public abstract class AbstractCamelContextFactoryBean
[camel] 04/04: CAMEL-17272: camel-spring-xml - Classic Spring XML add support for external route configuration XML files
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit f6f122954698bd32c6f90c1c7bfc7fe20d685c3d
Author: Claus Ibsen
AuthorDate: Sat Dec 4 11:45:16 2021 +0100
CAMEL-17272: camel-spring-xml - Classic Spring XML add support for external
route configuration XML files
---
.../resources/org/apache/camel/cdi/xml/jaxb.index | 1 +
.../org/apache/camel/cdi/XmlCdiBeanFactory.java| 26 +
.../cdi/xml/ApplicationContextFactoryBean.java | 11 ++
.../camel/cdi/xml/CamelContextFactoryBean.java | 13 +++
.../xml/RouteConfigurationContextDefinition.java | 44 ++
5 files changed, 95 insertions(+)
diff --git
a/components/camel-cdi/src/generated/resources/org/apache/camel/cdi/xml/jaxb.index
b/components/camel-cdi/src/generated/resources/org/apache/camel/cdi/xml/jaxb.index
index d36f889..438a9be 100644
---
a/components/camel-cdi/src/generated/resources/org/apache/camel/cdi/xml/jaxb.index
+++
b/components/camel-cdi/src/generated/resources/org/apache/camel/cdi/xml/jaxb.index
@@ -9,6 +9,7 @@ ImportDefinition
ProducerTemplateFactoryBean
RedeliveryPolicyFactoryBean
RestContextDefinition
+RouteConfigurationContextDefinition
RouteContextDefinition
RouteTemplateContextDefinition
ThreadPoolFactoryBean
diff --git
a/components/camel-cdi/src/main/java/org/apache/camel/cdi/XmlCdiBeanFactory.java
b/components/camel-cdi/src/main/java/org/apache/camel/cdi/XmlCdiBeanFactory.java
index 8cd204e..58af540 100644
---
a/components/camel-cdi/src/main/java/org/apache/camel/cdi/XmlCdiBeanFactory.java
+++
b/components/camel-cdi/src/main/java/org/apache/camel/cdi/XmlCdiBeanFactory.java
@@ -41,6 +41,7 @@ import org.apache.camel.cdi.xml.ErrorHandlerDefinition;
import org.apache.camel.cdi.xml.ErrorHandlerType;
import org.apache.camel.cdi.xml.ImportDefinition;
import org.apache.camel.cdi.xml.RestContextDefinition;
+import org.apache.camel.cdi.xml.RouteConfigurationContextDefinition;
import org.apache.camel.cdi.xml.RouteContextDefinition;
import org.apache.camel.cdi.xml.RouteTemplateContextDefinition;
import org.apache.camel.core.xml.AbstractCamelFactoryBean;
@@ -48,6 +49,7 @@ import
org.apache.camel.core.xml.CamelServiceExporterDefinition;
import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.model.IdentifiedType;
import org.apache.camel.model.OptionalIdentifiedDefinition;
+import org.apache.camel.model.RouteConfigurationDefinition;
import org.apache.camel.model.RouteDefinition;
import org.apache.camel.model.RouteTemplateDefinition;
import org.apache.camel.model.RoutesDefinition;
@@ -128,6 +130,9 @@ final class XmlCdiBeanFactory {
for (RouteContextDefinition factory : app.getRouteContexts()) {
beans.add(routeContextBean(factory, url));
}
+for (RouteConfigurationContextDefinition factory :
app.getRouteConfigurationContexts()) {
+beans.add(routeConfigurationContextBean(factory, url));
+}
for (RouteTemplateContextDefinition factory :
app.getRouteTemplateContexts()) {
beans.add(routeTemplateContextBean(factory, url));
}
@@ -346,6 +351,27 @@ final class XmlCdiBeanFactory {
+ bean.getQualifiers());
}
+private SyntheticBean
routeConfigurationContextBean(RouteConfigurationContextDefinition definition,
URL url) {
+requireNonNull(definition.getId(),
+() -> format("Missing [%s] attribute for imported bean [%s]
from resource [%s]",
+"id", "routeContext", url));
+
+return new SyntheticBean<>(
+manager,
+new SyntheticAnnotated(
+List.class,
+Stream.of(List.class, new
ListParameterizedType(RouteConfigurationDefinition.class))
+.collect(toSet()),
+ANY, NamedLiteral.of(definition.getId())),
+List.class,
+new
SyntheticInjectionTarget<>(definition::getRouteConfigurations),
+bean -> "imported route configuration context with "
++ "id [" + definition.getId() + "] "
++ "from resource [" + url + "] "
++ "with qualifiers "
++ bean.getQualifiers());
+}
+
private SyntheticBean routeContextBean(RouteContextDefinition
definition, URL url) {
requireNonNull(definition.getId(),
() -> format("Missing [%s] attribute for imported bean [%s]
from resource [%s]",
diff --git
a/components/camel-cdi/src/main/java/org/apache/camel/cdi/xml/ApplicationContextFactoryBean.java
b/components/camel-cdi/src/main/java/org/apache/camel/cdi/xml/
[camel] 01/04: CAMEL-17272: camel-spring-xml - Classic Spring XML add support for external route configuration XML files
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit da71cccd1648276e6e0d995f68e3366b751ff0f1
Author: Claus Ibsen
AuthorDate: Sat Dec 4 10:52:32 2021 +0100
CAMEL-17272: camel-spring-xml - Classic Spring XML add support for external
route configuration XML files
---
.../org/apache/camel/spring/xml/jaxb.index | 1 +
.../spring/xml/routeConfigurationContext.json | 17 ++
.../CamelRouteConfigurationContextFactoryBean.java | 67 ++
.../spring/xml/handler/CamelNamespaceHandler.java | 33 +++
4 files changed, 118 insertions(+)
diff --git
a/components/camel-spring-xml/src/generated/resources/org/apache/camel/spring/xml/jaxb.index
b/components/camel-spring-xml/src/generated/resources/org/apache/camel/spring/xml/jaxb.index
index f7926d6..ee308b7 100644
---
a/components/camel-spring-xml/src/generated/resources/org/apache/camel/spring/xml/jaxb.index
+++
b/components/camel-spring-xml/src/generated/resources/org/apache/camel/spring/xml/jaxb.index
@@ -7,6 +7,7 @@ CamelFluentProducerTemplateFactoryBean
CamelProducerTemplateFactoryBean
CamelRedeliveryPolicyFactoryBean
CamelRestContextFactoryBean
+CamelRouteConfigurationContextFactoryBean
CamelRouteContextFactoryBean
CamelRouteTemplateContextFactoryBean
CamelThreadPoolFactoryBean
diff --git
a/components/camel-spring-xml/src/generated/resources/org/apache/camel/spring/xml/routeConfigurationContext.json
b/components/camel-spring-xml/src/generated/resources/org/apache/camel/spring/xml/routeConfigurationContext.json
new file mode 100644
index 000..a858ab4
--- /dev/null
+++
b/components/camel-spring-xml/src/generated/resources/org/apache/camel/spring/xml/routeConfigurationContext.json
@@ -0,0 +1,17 @@
+{
+ "model": {
+"kind": "model",
+"name": "routeConfigurationContext",
+"title": "Route Configuration Context",
+"description": "Configuration of route configurations using XML",
+"deprecated": false,
+"label": "spring,configuration,routing",
+"javaType":
"org.apache.camel.spring.xml.CamelRouteConfigurationContextFactoryBean",
+"input": false,
+"output": false
+ },
+ "properties": {
+"routeConfiguration": { "kind": "element", "displayName": "Route
Configuration", "required": false, "type": "array", "javaType":
"java.util.List",
"deprecated": false, "autowired": false, "secret": false, "description": "Route
Configurations" },
+"id": { "kind": "attribute", "displayName": "Id", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "The id of this node" }
+ }
+}
diff --git
a/components/camel-spring-xml/src/main/java/org/apache/camel/spring/xml/CamelRouteConfigurationContextFactoryBean.java
b/components/camel-spring-xml/src/main/java/org/apache/camel/spring/xml/CamelRouteConfigurationContextFactoryBean.java
new file mode 100644
index 000..0e10ef1
--- /dev/null
+++
b/components/camel-spring-xml/src/main/java/org/apache/camel/spring/xml/CamelRouteConfigurationContextFactoryBean.java
@@ -0,0 +1,67 @@
+/*
+ * 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.spring.xml;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+
+import org.apache.camel.model.IdentifiedType;
+import org.apache.camel.model.RouteConfigurationDefinition;
+import org.apache.camel.spi.Metadata;
+import org.springframework.beans.factory.FactoryBean;
+
+/**
+ * Configuration of route configurations using XML
+ */
+@Metadata(label = "spring,configuration,routing")
+@XmlRootElement(name = "routeConfigurationContext")
+@XmlAccessorType(XmlAccessType.FIELD)
+public class CamelRouteConfigurationContextFactoryBean extends IdentifiedType
+implements FactoryBean> {
+
+@XmlElement(name = "routeConfiguration", required = true)
+@Metadata(description = "Route Configurations")
+private List routeCo
[GitHub] [camel-spring-boot] michaelandrepearce commented on pull request #415: CAMEL-15560 - Fix regression
michaelandrepearce commented on pull request #415: URL: https://github.com/apache/camel-spring-boot/pull/415#issuecomment-986003822 Will zip up a sample spring boot app to demonstrate and attach to jira -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch regen_bot updated (0795923 -> f2c200d)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel.git. from 0795923 Regen add f2c200d CAMEL-17271: camel-cm-test - Fix failing CMTest No new revisions were added by this update. Summary of changes: .../apache/camel/component/cm/CMSenderOneMessageImpl.java | 13 - .../cmresponse/NoAccountFoundForProductTokenException.java | 2 -- .../java/org/apache/camel/component/cm/test/CMTest.java | 2 +- 3 files changed, 5 insertions(+), 12 deletions(-)
[GitHub] [camel-spring-boot] michaelandrepearce edited a comment on pull request #415: CAMEL-15560 - Fix regression
michaelandrepearce edited a comment on pull request #415: URL: https://github.com/apache/camel-spring-boot/pull/415#issuecomment-986002786 No the fat jar resolver isnt picking up correctly, you have to use the spring context (as the code use to) and thus why once packaged with spring boot 3.8 it is broken. As the code overide that use to be there was just deleted not updated to the new method, which is what this pr fixes / puts back but with updated logic/method to meet new method reqs -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-spring-boot] michaelandrepearce edited a comment on pull request #415: CAMEL-15560 - Fix regression
michaelandrepearce edited a comment on pull request #415: URL: https://github.com/apache/camel-spring-boot/pull/415#issuecomment-986002786 No the fat jar resolver isnt picking up correctly, you have to use the spring context (as the code use to) and thus why once packaged with spring boot 3.8 it is broken. As the code overide that use to be there was just deleted not updated to the new method, which is what this pr fixes / puts back -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-spring-boot] michaelandrepearce edited a comment on pull request #415: CAMEL-15560 - Fix regression
michaelandrepearce edited a comment on pull request #415: URL: https://github.com/apache/camel-spring-boot/pull/415#issuecomment-986002786 No the fat jar resolver isnt picking up correctly, you have to use the spring context (as the code use to) and thus why once packaged with spring 3.8 it is broken. As the code overide that use to be there was just deleted not updated to the new method, which is what this pr fixes / puts back -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-spring-boot] michaelandrepearce commented on pull request #415: CAMEL-15560 - Fix regression
michaelandrepearce commented on pull request #415: URL: https://github.com/apache/camel-spring-boot/pull/415#issuecomment-986002786 No the fat jar resolver isnt picking up correctly, you have to use the spring context (as the code use to) and thus why once packaged with spring 3.8 is broken -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch main updated: CAMEL-17271: camel-cm-test - Fix failing CMTest
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new f2c200d CAMEL-17271: camel-cm-test - Fix failing CMTest
f2c200d is described below
commit f2c200d9e0ffbf715ed7a17c25d5436ee7298551
Author: Claus Ibsen
AuthorDate: Sat Dec 4 10:25:49 2021 +0100
CAMEL-17271: camel-cm-test - Fix failing CMTest
---
.../apache/camel/component/cm/CMSenderOneMessageImpl.java | 13 -
.../cmresponse/NoAccountFoundForProductTokenException.java | 2 --
.../java/org/apache/camel/component/cm/test/CMTest.java | 2 +-
3 files changed, 5 insertions(+), 12 deletions(-)
diff --git
a/components/camel-cm-sms/src/main/java/org/apache/camel/component/cm/CMSenderOneMessageImpl.java
b/components/camel-cm-sms/src/main/java/org/apache/camel/component/cm/CMSenderOneMessageImpl.java
index 25bee7f..e3a19e0 100644
---
a/components/camel-cm-sms/src/main/java/org/apache/camel/component/cm/CMSenderOneMessageImpl.java
+++
b/components/camel-cm-sms/src/main/java/org/apache/camel/component/cm/CMSenderOneMessageImpl.java
@@ -20,7 +20,7 @@ import java.io.BufferedReader;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStreamReader;
-import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
import java.util.UUID;
import javax.xml.XMLConstants;
@@ -181,7 +181,7 @@ public class CMSenderOneMessageImpl implements CMSender {
final HttpClient client = HttpClientBuilder.create().build();
final HttpPost post = new HttpPost(urlString);
-post.setEntity(new StringEntity(requestString,
Charset.forName("UTF-8")));
+post.setEntity(new StringEntity(requestString,
StandardCharsets.UTF_8));
try {
@@ -237,17 +237,12 @@ public class CMSenderOneMessageImpl implements CMSender {
} else if
(line.contains(CMConstants.ERROR_INVALID_PRODUCT_TOKEN)) {
throw new InvalidProductTokenException();
} else {
-
-// SO FAR i would expect other kind of ERROR.
-
-// MSISDN correctness and message validity is client
-// responsibility
-throw new CMResponseException("CHECK ME. I am not
expecting this. ");
+throw new CMResponseException(line);
}
}
// Ok. Line is EMPTY - successfully submitted
-LOG.debug("Result of the request processing: Successfully
submited");
+LOG.debug("Result of the request processing: Successfully
submitted");
}
} catch (final IOException io) {
throw new CMDirectException(io);
diff --git
a/components/camel-cm-sms/src/main/java/org/apache/camel/component/cm/exceptions/cmresponse/NoAccountFoundForProductTokenException.java
b/components/camel-cm-sms/src/main/java/org/apache/camel/component/cm/exceptions/cmresponse/NoAccountFoundForProductTokenException.java
index 84f6bbf..16a718d 100644
---
a/components/camel-cm-sms/src/main/java/org/apache/camel/component/cm/exceptions/cmresponse/NoAccountFoundForProductTokenException.java
+++
b/components/camel-cm-sms/src/main/java/org/apache/camel/component/cm/exceptions/cmresponse/NoAccountFoundForProductTokenException.java
@@ -18,8 +18,6 @@ package org.apache.camel.component.cm.exceptions.cmresponse;
/**
* No account found for the provided product token.
- *
- * @author Omar
*/
public class NoAccountFoundForProductTokenException extends
CMResponseException {
diff --git
a/components/camel-cm-sms/src/test/java/org/apache/camel/component/cm/test/CMTest.java
b/components/camel-cm-sms/src/test/java/org/apache/camel/component/cm/test/CMTest.java
index 9c244c3..a0662da 100644
---
a/components/camel-cm-sms/src/test/java/org/apache/camel/component/cm/test/CMTest.java
+++
b/components/camel-cm-sms/src/test/java/org/apache/camel/component/cm/test/CMTest.java
@@ -161,7 +161,7 @@ public class CMTest {
// Body
final SMSMessage smsMessage = new SMSMessage(generateIdAsString(),
generateUnicodeMessage(), validNumber, null);
-assertThrows(NoAccountFoundForProductTokenException.class,
+assertThrows(CMResponseException.class,
() -> cmProxy.send(smsMessage));
}
[camel] branch regen_bot updated (08e6572 -> 0795923)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel.git. from 08e6572 Update doc instructions, including website release instructions (#6497) add 3143946 CAMEL-17269: camel-splunk-hec IPv4 hostname (#6500) add 5d8f4f4 CAMEL-17267 Adding httpMethod to endpoint properties (#6499) add 5a1caa9 Polished add 0795923 Regen No new revisions were added by this update. Summary of changes: .../java/org/apache/camel/component/http/HttpComponent.java | 1 + .../org/apache/camel/component/http/HeaderFilteringTest.java | 4 ++-- .../apache/camel/component/splunkhec/SplunkHECEndpoint.java | 11 +-- .../camel/component/splunkhec/SplunkHECEndpointTest.java | 10 ++ .../java/org/apache/camel/dsl/jbang/core/commands/Run.java| 2 +- 5 files changed, 23 insertions(+), 5 deletions(-)
[camel] 01/02: Polished
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch bind
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 207e62669bcac7a3566581e76bcbbceb2632d4f2
Author: Claus Ibsen
AuthorDate: Fri Dec 3 14:31:50 2021 +0100
Polished
---
.../src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java
index 68da4c3..0c808ee 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java
@@ -79,7 +79,7 @@ class Run implements Callable {
private boolean fileLock = true;
@Option(names = { "--local-kamelet-dir" },
-description = "Load Kamelets from a local directory instead of
resolving them from the classpath or GitHub")
+description = "Local directory to load Kamelets from (take
precedence))")
private String localKameletDir;
@Override
[camel] 02/02: CAMEL-17261: camel-yaml-dsl - Add support for loading Camel K KameletBinding file. WIP.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch bind
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 2829e29b5950d2eb170d5d4e2299b283bc33196f
Author: Claus Ibsen
AuthorDate: Sat Dec 4 07:57:55 2021 +0100
CAMEL-17261: camel-yaml-dsl - Add support for loading Camel K
KameletBinding file. WIP.
---
.../camel/dsl/yaml/YamlRoutesBuilderLoader.java| 41 ++
.../camel/dsl/yaml/KameletBindingLoaderTest.groovy | 65 ++
.../camel/dsl/yaml/support/YamlTestSupport.groovy | 10
3 files changed, 116 insertions(+)
diff --git
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/main/java/org/apache/camel/dsl/yaml/YamlRoutesBuilderLoader.java
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/main/java/org/apache/camel/dsl/yaml/YamlRoutesBuilderLoader.java
index 30cd3fa..9e8b359 100644
---
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/main/java/org/apache/camel/dsl/yaml/YamlRoutesBuilderLoader.java
+++
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/main/java/org/apache/camel/dsl/yaml/YamlRoutesBuilderLoader.java
@@ -24,8 +24,10 @@ import org.apache.camel.api.management.ManagedResource;
import org.apache.camel.builder.ErrorHandlerBuilder;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.builder.RouteConfigurationBuilder;
+import org.apache.camel.dsl.yaml.common.YamlDeserializationContext;
import org.apache.camel.dsl.yaml.common.YamlDeserializerSupport;
import org.apache.camel.dsl.yaml.deserializers.OutputAwareFromDefinition;
+import org.apache.camel.model.FromDefinition;
import org.apache.camel.model.OnExceptionDefinition;
import org.apache.camel.model.RouteConfigurationDefinition;
import org.apache.camel.model.RouteDefinition;
@@ -35,11 +37,15 @@ import org.apache.camel.model.rest.RestDefinition;
import org.apache.camel.model.rest.VerbDefinition;
import org.apache.camel.spi.CamelContextCustomizer;
import org.apache.camel.spi.annotations.RoutesLoader;
+import org.snakeyaml.engine.v2.api.ConstructNode;
import org.snakeyaml.engine.v2.nodes.MappingNode;
import org.snakeyaml.engine.v2.nodes.Node;
import org.snakeyaml.engine.v2.nodes.NodeTuple;
import org.snakeyaml.engine.v2.nodes.NodeType;
+import org.snakeyaml.engine.v2.nodes.SequenceNode;
+import org.snakeyaml.engine.v2.nodes.Tag;
+import static
org.apache.camel.dsl.yaml.common.YamlDeserializerSupport.asMappingNode;
import static
org.apache.camel.dsl.yaml.common.YamlDeserializerSupport.asSequenceNode;
import static org.apache.camel.dsl.yaml.common.YamlDeserializerSupport.asText;
import static org.apache.camel.dsl.yaml.common.YamlDeserializerSupport.nodeAt;
@@ -128,6 +134,9 @@ public class YamlRoutesBuilderLoader extends
YamlRoutesBuilderLoaderSupport {
final MappingNode mn = YamlDeserializerSupport.asMappingNode(root);
boolean camelk = anyTupleMatches(mn.getValue(), "apiVersion",
"camel.apache.org/v1") &&
anyTupleMatches(mn.getValue(), "kind", "Integration");
+// kamelet binding are still at v1alpha1
+boolean binding = anyTupleMatches(mn.getValue(), "apiVersion",
"camel.apache.org/v1alpha1") &&
+anyTupleMatches(mn.getValue(), "kind", "KameletBinding");
if (camelk) {
Node routes = nodeAt(root, "/spec/flows");
if (routes == null) {
@@ -136,6 +145,27 @@ public class YamlRoutesBuilderLoader extends
YamlRoutesBuilderLoaderSupport {
if (routes != null) {
target = routes;
}
+} else if (binding) {
+MappingNode source = asMappingNode(nodeAt(root,
"/spec/source/ref"));
+MappingNode sink = asMappingNode(nodeAt(root,
"/spec/sink/ref"));
+if (source != null && sink != null) {
+boolean sourceKamelet = anyTupleMatches(source.getValue(),
"kind", "Kamelet");
+boolean sinkKamelet = anyTupleMatches(sink.getValue(),
"kind", "Kamelet");
+String from = extractTupleValue(source.getValue(), "name");
+String to = extractTupleValue(sink.getValue(), "name");
+if (sourceKamelet) {
+from = "kamelet:" + from;
+}
+if (sinkKamelet) {
+to = "kamelet:" + to;
+}
+// add directly
+System.out.println(from + " -> " + to);
+YamlDeserializationContext ydc =
YamlDeserializerSupport.getDeserializationContext(source);
+Object route =
ydc.resolve(RouteDefinition.class).construct(target);
+System.out.println(route);
+}
+
}
}
@@ -156,4 +186,15 @@ public class YamlRoutesBuilderLoader extends
YamlRoutesBuilderLoaderSupport {
return false;
}
+private static String extra
[camel] branch bind created (now 2829e29)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch bind in repository https://gitbox.apache.org/repos/asf/camel.git. at 2829e29 CAMEL-17261: camel-yaml-dsl - Add support for loading Camel K KameletBinding file. WIP. This branch includes the following new commits: new 207e626 Polished new 2829e29 CAMEL-17261: camel-yaml-dsl - Add support for loading Camel K KameletBinding file. WIP. 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.
[GitHub] [camel-spring-boot] davsclaus commented on pull request #415: CAMEL-15560 - Fix regression
davsclaus commented on pull request #415: URL: https://github.com/apache/camel-spring-boot/pull/415#issuecomment-985989066 And create a new JIRA ticket about this, and in that you can link/refer to CAMEL-15560. And update your commit message to use the new JIRA number. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-spring-boot] davsclaus commented on pull request #415: CAMEL-15560 - Fix regression
davsclaus commented on pull request #415: URL: https://github.com/apache/camel-spring-boot/pull/415#issuecomment-985988751 In other words your change may cause other problems, although it may be that spring application context can load resources inside fat-jars, which you may assume it can. And if you have a sample project that reproduces this - that would help -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-spring-boot] davsclaus commented on pull request #415: CAMEL-15560 - Fix regression
davsclaus commented on pull request #415: URL: https://github.com/apache/camel-spring-boot/pull/415#issuecomment-985988515 How are you packing your spring-boot apps - if its a fat-jar then the `FatJarPackageScanResourceResolver` should be the one that finds the files. Can you look into this. As your PR will due to code override not use that resolver. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-spring-boot] branch main updated: Regen
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
The following commit(s) were added to refs/heads/main by this push:
new 5952680 Regen
5952680 is described below
commit 5952680fc44e7c27bc4136d8109b6c3006c13803
Author: Claus Ibsen
AuthorDate: Sat Dec 4 08:58:34 2021 +0100
Regen
---
.../springboot/catalog/components/google-storage.json | 2 ++
.../camel/springboot/catalog/components/kafka.json | 4 +++-
.../springboot/catalog/components/vertx-kafka.json | 2 +-
.../src/main/docs/google-storage.json | 6 ++
.../GoogleCloudStorageComponentConfiguration.java | 18 ++
5 files changed, 30 insertions(+), 2 deletions(-)
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/google-storage.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/google-storage.json
index 825e8bb..50d579c 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/google-storage.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/google-storage.json
@@ -31,6 +31,7 @@
"bridgeErrorHandler": { "kind": "property", "displayName": "Bridge Error
Handler", "group": "consumer", "label": "consumer", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": false, "description": "Allows for bridging the
consumer to the Camel routing Error Handler, which mean any exceptions occurred
while the consumer is trying to pickup incoming messages, or the likes, will
now be processed as a me [...]
"deleteAfterRead": { "kind": "property", "displayName": "Delete After
Read", "group": "consumer", "label": "consumer", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": true, "configurationClass":
"org.apache.camel.component.google.storage.GoogleCloudStorageConfiguration",
"configurationField": "configuration", "description": "Delete objects from the
bucket after they have been retrieved. The delete [...]
"destinationBucket": { "kind": "property", "displayName": "Destination
Bucket", "group": "consumer", "label": "consumer", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "autowired":
false, "secret": false, "configurationClass":
"org.apache.camel.component.google.storage.GoogleCloudStorageConfiguration",
"configurationField": "configuration", "description": "Define the destination
bucket where an object must be moved when moveAfterRead is set [...]
+"downloadFileName": { "kind": "property", "displayName": "Download File
Name", "group": "consumer", "label": "consumer", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "autowired":
false, "secret": false, "configurationClass":
"org.apache.camel.component.google.storage.GoogleCloudStorageConfiguration",
"configurationField": "configuration", "description": "The folder or filename
to use when downloading the blob. By default, this specifies th [...]
"includeBody": { "kind": "property", "displayName": "Include Body",
"group": "consumer", "label": "consumer", "required": false, "type": "boolean",
"javaType": "boolean", "deprecated": false, "autowired": false, "secret":
false, "defaultValue": true, "configurationClass":
"org.apache.camel.component.google.storage.GoogleCloudStorageConfiguration",
"configurationField": "configuration", "description": "If it is true, the
Object exchange will be consumed and put into the body. If false [...]
"includeFolders": { "kind": "property", "displayName": "Include Folders",
"group": "consumer", "label": "consumer", "required": false, "type": "boolean",
"javaType": "boolean", "deprecated": false, "autowired": false, "secret":
false, "defaultValue": true, "configurationClass":
"org.apache.camel.component.google.storage.GoogleCloudStorageConfiguration",
"configurationField": "configuration", "description": "If it is true, the
folders\/directories will be consumed. If it is false, the [...]
"moveAfterRead": { "kind": "property", "displayName": "Move After Read",
"group": "consumer", "label": "consumer", "required": false, "type": "boolean",
"javaType": "boolean", "deprecated": false, "autowired": false, "secret":
false, "defaultValue": false, "configurationClass":
"org.apache.camel.component.google.storage.GoogleCloudStorageConfiguration",
"configurationField": "configuration", "description": "Move objects from the
origin bucket to a different bucket after they have bee [...]
@@ -49,6 +50,7 @@
"bridgeErrorHandle
[GitHub] [camel-spring-boot] michaelandrepearce commented on pull request #415: CAMEL-15560 - Fix regression
michaelandrepearce commented on pull request #415: URL: https://github.com/apache/camel-spring-boot/pull/415#issuecomment-985986992 @davsclaus anything in addition needed? This is blocking upgrading to later versions of camel. Due to the break caused in 3.8 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-spring-boot] mpoutlook removed a comment on pull request #415: CAMEL-15560 - Fix regression
mpoutlook removed a comment on pull request #415: URL: https://github.com/apache/camel-spring-boot/pull/415#issuecomment-985986842 @davsclaus anything in addition needed? This is blocking upgrading to later versions of camel. Due to the break caused in 3.8 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch main updated: Regen
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new 0795923 Regen
0795923 is described below
commit 079592364a6fb89806bc24f0e977a3449e6683e6
Author: Claus Ibsen
AuthorDate: Sat Dec 4 08:52:05 2021 +0100
Regen
---
.../java/org/apache/camel/component/splunkhec/SplunkHECEndpoint.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git
a/components/camel-splunk-hec/src/main/java/org/apache/camel/component/splunkhec/SplunkHECEndpoint.java
b/components/camel-splunk-hec/src/main/java/org/apache/camel/component/splunkhec/SplunkHECEndpoint.java
index dbc9dfc..79a5074 100644
---
a/components/camel-splunk-hec/src/main/java/org/apache/camel/component/splunkhec/SplunkHECEndpoint.java
+++
b/components/camel-splunk-hec/src/main/java/org/apache/camel/component/splunkhec/SplunkHECEndpoint.java
@@ -63,7 +63,8 @@ public class SplunkHECEndpoint extends DefaultEndpoint {
String hostname = match.group(1);
int port = Integer.parseInt(match.group(2));
-if (!DomainValidator.getInstance(true).isValid(hostname) &&
!InetAddressValidator.getInstance().isValidInet4Address(hostname)) {
+if (!DomainValidator.getInstance(true).isValid(hostname)
+&&
!InetAddressValidator.getInstance().isValidInet4Address(hostname)) {
throw new IllegalArgumentException("Invalid hostname: " +
hostname);
}
if (port < 1 || port > 65535) {
[GitHub] [camel-spring-boot] mpoutlook commented on pull request #415: CAMEL-15560 - Fix regression
mpoutlook commented on pull request #415: URL: https://github.com/apache/camel-spring-boot/pull/415#issuecomment-985986842 @davsclaus anything in addition needed? This is blocking upgrading to later versions of camel. Due to the break caused in 3.8 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
