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 2024/03/03 09:49:15 UTC
(camel) branch main updated: Revert "routes-loader should use marker file name as-is without the dot to dash hack"
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 d91c03781fa Revert "routes-loader should use marker file name as-is without the dot to dash hack"
d91c03781fa is described below
commit d91c03781faa70608372db15fdda2c114c09e76f
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Sun Mar 3 10:48:58 2024 +0100
Revert "routes-loader should use marker file name as-is without the dot to dash hack"
This reverts commit 495deb08129d1268fd5e115c20e13c3347fabebb.
---
.../camel/impl/engine/DefaultRoutesLoader.java | 4 +++-
.../apache/camel/dsl/xml/io/XmlLoadAppTest.java | 25 --------------------
.../apache/camel/dsl/xml/io/camel-app11.camel.xml | 27 ----------------------
.../camel/maven/packaging/SpiGeneratorMojo.java | 2 +-
4 files changed, 4 insertions(+), 54 deletions(-)
diff --git a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultRoutesLoader.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultRoutesLoader.java
index edff15a1626..3270da91b8d 100644
--- a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultRoutesLoader.java
+++ b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultRoutesLoader.java
@@ -251,8 +251,10 @@ public class DefaultRoutesLoader extends ServiceSupport implements RoutesLoader,
final CamelContext ecc = getCamelContext();
final FactoryFinder finder = ecc.getCamelContextExtension().getBootstrapFactoryFinder(RoutesBuilderLoader.FACTORY_PATH);
+ // the marker files are generated with dot as dash
+ String sanitized = extension.replace(".", "-");
RoutesBuilderLoader answer
- = ResolverHelper.resolveService(getCamelContext(), finder, extension, RoutesBuilderLoader.class).orElse(null);
+ = ResolverHelper.resolveService(getCamelContext(), finder, sanitized, RoutesBuilderLoader.class).orElse(null);
// if it's a multi-extension then fallback to parent
if (answer == null && extension.contains(".")) {
diff --git a/dsl/camel-xml-io-dsl/src/test/java/org/apache/camel/dsl/xml/io/XmlLoadAppTest.java b/dsl/camel-xml-io-dsl/src/test/java/org/apache/camel/dsl/xml/io/XmlLoadAppTest.java
index fa87d1dbfe0..83700f09df1 100644
--- a/dsl/camel-xml-io-dsl/src/test/java/org/apache/camel/dsl/xml/io/XmlLoadAppTest.java
+++ b/dsl/camel-xml-io-dsl/src/test/java/org/apache/camel/dsl/xml/io/XmlLoadAppTest.java
@@ -277,29 +277,4 @@ public class XmlLoadAppTest {
}
}
- @Test
- public void testLoadCamelAppCamelXmlExt() throws Exception {
- try (DefaultCamelContext context = new DefaultCamelContext()) {
- context.start();
-
- Resource resource = PluginHelper.getResourceLoader(context).resolveResource(
- "/org/apache/camel/dsl/xml/io/camel-app11.camel.xml");
-
- RoutesLoader routesLoader = PluginHelper.getRoutesLoader(context);
- routesLoader.preParseRoute(resource, false);
- routesLoader.loadRoutes(resource);
-
- assertNotNull(context.getRoute("r11"), "Loaded r9 route should be there");
- assertEquals(1, context.getRoutes().size());
-
- // test that loaded route works
- MockEndpoint y11 = context.getEndpoint("mock:y11", MockEndpoint.class);
- y11.expectedBodiesReceived("Hi World");
- context.createProducerTemplate().sendBody("direct:x11", "Hi World");
- y11.assertIsSatisfied();
-
- context.stop();
- }
- }
-
}
diff --git a/dsl/camel-xml-io-dsl/src/test/resources/org/apache/camel/dsl/xml/io/camel-app11.camel.xml b/dsl/camel-xml-io-dsl/src/test/resources/org/apache/camel/dsl/xml/io/camel-app11.camel.xml
deleted file mode 100644
index bfae9cb76b8..00000000000
--- a/dsl/camel-xml-io-dsl/src/test/resources/org/apache/camel/dsl/xml/io/camel-app11.camel.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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.
-
--->
-<camel xmlns:s="http://www.springframework.org/schema/beans">
-
- <route id="r11">
- <from uri="direct:x11"/>
- <to uri="mock:y11"/>
- </route>
-
-</camel>
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpiGeneratorMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpiGeneratorMojo.java
index c33a083c880..2224b044b29 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpiGeneratorMojo.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpiGeneratorMojo.java
@@ -163,7 +163,7 @@ public class SpiGeneratorMojo extends AbstractGeneratorMojo {
}
private String sanitizeFileName(String fileName) {
- return fileName.replaceAll("[^A-Za-z0-9+-/]", "-");
+ return fileName.replaceAll("[^A-Za-z0-9+-/.]", "-");
}
private boolean isLocal(String className) {