You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2023/04/26 09:00:37 UTC
[camel] branch main updated (c8f9dbc2151 -> 32d1e01ad51)
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 c8f9dbc2151 Enable component consul on ppc64le
new 539fdbedc08 CAMEL-19296: xml loader to also support camel.xml as file extension like yaml can do
new 32d1e01ad51 CAMEL-19296: xml loader to also support camel.xml as file extension like yaml can do
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:
.../java/org/apache/camel/dsl/jbang/core/commands/Init.java | 4 ++--
.../main/download/DependencyDownloaderRoutesLoader.java | 3 ++-
.../services/org/apache/camel/routes-loader/camel.xml | 2 ++
.../camel/dsl/xml/io/CamelXmlRoutesBuilderLoader.java} | 13 +++++++------
.../org/apache/camel/dsl/xml/io/XmlRoutesBuilderLoader.java | 4 ++++
.../services/org/apache/camel/routes-loader/camel.xml | 2 ++
.../dsl/xml/jaxb/CamelJaxbXmlRoutesBuilderLoader.java} | 13 ++++++-------
.../camel/dsl/xml/jaxb/JaxbXmlRoutesBuilderLoader.java | 4 ++++
8 files changed, 29 insertions(+), 16 deletions(-)
create mode 100644 dsl/camel-xml-io-dsl/src/generated/resources/META-INF/services/org/apache/camel/routes-loader/camel.xml
copy dsl/{camel-yaml-dsl/camel-yaml-dsl/src/main/java/org/apache/camel/dsl/yaml/CamelYamlRoutesBuilderLoader.java => camel-xml-io-dsl/src/main/java/org/apache/camel/dsl/xml/io/CamelXmlRoutesBuilderLoader.java} (73%)
create mode 100644 dsl/camel-xml-jaxb-dsl/src/generated/resources/META-INF/services/org/apache/camel/routes-loader/camel.xml
copy dsl/{camel-yaml-dsl/camel-yaml-dsl/src/main/java/org/apache/camel/dsl/yaml/CamelKYamlRoutesBuilderLoader.java => camel-xml-jaxb-dsl/src/main/java/org/apache/camel/dsl/xml/jaxb/CamelJaxbXmlRoutesBuilderLoader.java} (72%)
[camel] 01/02: CAMEL-19296: xml loader to also support camel.xml as file extension like yaml can do
Posted by da...@apache.org.
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 539fdbedc08ae85a548417494a7dcfbf964d91ee
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Wed Apr 26 10:57:05 2023 +0200
CAMEL-19296: xml loader to also support camel.xml as file extension like yaml can do
---
.../org/apache/camel/routes-loader/camel.xml | 2 ++
.../dsl/xml/io/CamelXmlRoutesBuilderLoader.java | 32 ++++++++++++++++++++++
.../camel/dsl/xml/io/XmlRoutesBuilderLoader.java | 4 +++
.../org/apache/camel/routes-loader/camel.xml | 2 ++
.../xml/jaxb/CamelJaxbXmlRoutesBuilderLoader.java | 30 ++++++++++++++++++++
.../dsl/xml/jaxb/JaxbXmlRoutesBuilderLoader.java | 4 +++
6 files changed, 74 insertions(+)
diff --git a/dsl/camel-xml-io-dsl/src/generated/resources/META-INF/services/org/apache/camel/routes-loader/camel.xml b/dsl/camel-xml-io-dsl/src/generated/resources/META-INF/services/org/apache/camel/routes-loader/camel.xml
new file mode 100644
index 00000000000..dee32dcdfd3
--- /dev/null
+++ b/dsl/camel-xml-io-dsl/src/generated/resources/META-INF/services/org/apache/camel/routes-loader/camel.xml
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.dsl.xml.io.CamelXmlRoutesBuilderLoader
diff --git a/dsl/camel-xml-io-dsl/src/main/java/org/apache/camel/dsl/xml/io/CamelXmlRoutesBuilderLoader.java b/dsl/camel-xml-io-dsl/src/main/java/org/apache/camel/dsl/xml/io/CamelXmlRoutesBuilderLoader.java
new file mode 100644
index 00000000000..faff80a986b
--- /dev/null
+++ b/dsl/camel-xml-io-dsl/src/main/java/org/apache/camel/dsl/xml/io/CamelXmlRoutesBuilderLoader.java
@@ -0,0 +1,32 @@
+/*
+ * 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.dsl.xml.io;
+
+import org.apache.camel.api.management.ManagedResource;
+import org.apache.camel.spi.annotations.RoutesLoader;
+
+@ManagedResource(description = "Managed Camel XML RoutesBuilderLoader")
+@RoutesLoader(CamelXmlRoutesBuilderLoader.EXTENSION)
+public class CamelXmlRoutesBuilderLoader extends XmlRoutesBuilderLoader {
+
+ public static final String EXTENSION = "camel.xml";
+
+ public CamelXmlRoutesBuilderLoader() {
+ super(EXTENSION);
+ }
+
+}
diff --git a/dsl/camel-xml-io-dsl/src/main/java/org/apache/camel/dsl/xml/io/XmlRoutesBuilderLoader.java b/dsl/camel-xml-io-dsl/src/main/java/org/apache/camel/dsl/xml/io/XmlRoutesBuilderLoader.java
index 01068b81bee..6de5c7185b6 100644
--- a/dsl/camel-xml-io-dsl/src/main/java/org/apache/camel/dsl/xml/io/XmlRoutesBuilderLoader.java
+++ b/dsl/camel-xml-io-dsl/src/main/java/org/apache/camel/dsl/xml/io/XmlRoutesBuilderLoader.java
@@ -43,6 +43,10 @@ public class XmlRoutesBuilderLoader extends RouteBuilderLoaderSupport {
super(EXTENSION);
}
+ XmlRoutesBuilderLoader(String extension) {
+ super(extension);
+ }
+
@Override
public RouteBuilder doLoadRouteBuilder(Resource input) throws Exception {
return new RouteConfigurationBuilder() {
diff --git a/dsl/camel-xml-jaxb-dsl/src/generated/resources/META-INF/services/org/apache/camel/routes-loader/camel.xml b/dsl/camel-xml-jaxb-dsl/src/generated/resources/META-INF/services/org/apache/camel/routes-loader/camel.xml
new file mode 100644
index 00000000000..54ee6432597
--- /dev/null
+++ b/dsl/camel-xml-jaxb-dsl/src/generated/resources/META-INF/services/org/apache/camel/routes-loader/camel.xml
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.dsl.xml.jaxb.CamelJaxbXmlRoutesBuilderLoader
diff --git a/dsl/camel-xml-jaxb-dsl/src/main/java/org/apache/camel/dsl/xml/jaxb/CamelJaxbXmlRoutesBuilderLoader.java b/dsl/camel-xml-jaxb-dsl/src/main/java/org/apache/camel/dsl/xml/jaxb/CamelJaxbXmlRoutesBuilderLoader.java
new file mode 100644
index 00000000000..1e5749eb01b
--- /dev/null
+++ b/dsl/camel-xml-jaxb-dsl/src/main/java/org/apache/camel/dsl/xml/jaxb/CamelJaxbXmlRoutesBuilderLoader.java
@@ -0,0 +1,30 @@
+/*
+ * 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.dsl.xml.jaxb;
+
+import org.apache.camel.api.management.ManagedResource;
+import org.apache.camel.spi.annotations.RoutesLoader;
+
+@ManagedResource(description = "Managed JAXB Camel XML RoutesBuilderLoader")
+@RoutesLoader(CamelJaxbXmlRoutesBuilderLoader.EXTENSION)
+public class CamelJaxbXmlRoutesBuilderLoader extends JaxbXmlRoutesBuilderLoader {
+ public static final String EXTENSION = "camel.xml";
+
+ public CamelJaxbXmlRoutesBuilderLoader() {
+ super(EXTENSION);
+ }
+}
diff --git a/dsl/camel-xml-jaxb-dsl/src/main/java/org/apache/camel/dsl/xml/jaxb/JaxbXmlRoutesBuilderLoader.java b/dsl/camel-xml-jaxb-dsl/src/main/java/org/apache/camel/dsl/xml/jaxb/JaxbXmlRoutesBuilderLoader.java
index cc3c9828676..ae9ccc5adf0 100644
--- a/dsl/camel-xml-jaxb-dsl/src/main/java/org/apache/camel/dsl/xml/jaxb/JaxbXmlRoutesBuilderLoader.java
+++ b/dsl/camel-xml-jaxb-dsl/src/main/java/org/apache/camel/dsl/xml/jaxb/JaxbXmlRoutesBuilderLoader.java
@@ -48,6 +48,10 @@ public class JaxbXmlRoutesBuilderLoader extends RouteBuilderLoaderSupport {
super(EXTENSION);
}
+ JaxbXmlRoutesBuilderLoader(String extension) {
+ super(extension);
+ }
+
@Override
public RouteBuilder doLoadRouteBuilder(Resource resource) throws Exception {
return new RouteConfigurationBuilder() {
[camel] 02/02: CAMEL-19296: xml loader to also support camel.xml as file extension like yaml can do
Posted by da...@apache.org.
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 32d1e01ad51a433ebb5bc69f8f7a440a46a1c249
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Wed Apr 26 11:00:14 2023 +0200
CAMEL-19296: xml loader to also support camel.xml as file extension like yaml can do
---
.../src/main/java/org/apache/camel/dsl/jbang/core/commands/Init.java | 4 ++--
.../apache/camel/main/download/DependencyDownloaderRoutesLoader.java | 3 ++-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Init.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Init.java
index 1dcfa364866..7a811cb8717 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Init.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Init.java
@@ -104,8 +104,8 @@ public class Init extends CamelCommand {
} else {
ext = "kamelet-action.yaml";
}
- } else if (ext != null && ext.startsWith("camel.yaml")) {
- // we allow xxx.camel.yaml
+ } else if (ext != null && (ext.startsWith("camel.yaml") || ext.startsWith("camel.xml"))) {
+ // we allow xxx.camel.yaml / xxx.camel.xml
ext = ext.substring(6);
}
diff --git a/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/download/DependencyDownloaderRoutesLoader.java b/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/download/DependencyDownloaderRoutesLoader.java
index 1238f82ca4f..a4cdd2ac87c 100644
--- a/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/download/DependencyDownloaderRoutesLoader.java
+++ b/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/download/DependencyDownloaderRoutesLoader.java
@@ -52,7 +52,8 @@ public class DependencyDownloaderRoutesLoader extends DefaultRoutesLoader {
downloadLoader("camel-jsh-dsl");
} else if ("kts".equals(extension)) {
downloadLoader("camel-kotlin-dsl");
- } else if ("xml".equals(extension)) {
+ } else if ("xml".equals(extension)
+ || "camel.xml".equals(extension)) {
downloadLoader("camel-xml-io-dsl");
} else if ("yaml".equals(extension)
|| "kamelet.yaml".equals(extension)