This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-3.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 06035fa4760da1fa93a0bfc9dd9e74ad7ad0a027
Author: Claus Ibsen <claus.ib...@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 3a7fb3091ee..127c1d8cd8f 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
@@ -39,6 +39,10 @@ public class XmlRoutesBuilderLoader extends
RouteBuilderLoaderSupport {
super(EXTENSION);
}
+ XmlRoutesBuilderLoader(String extension) {
+ super(extension);
+ }
+
@Override
public RouteBuilder doLoadRouteBuilder(Resource resource) 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() {
