This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch xmlio in repository https://gitbox.apache.org/repos/asf/camel.git
commit c20d3f2daeb6a1de2e8926a958b48b1ce184dac8 Author: Claus Ibsen <[email protected]> AuthorDate: Wed May 14 16:11:28 2025 +0200 CAMEL-22064: camel-xml-io - Generate XSD schema --- .../camel/util/DumpModelAsXmlPlaceholdersTest.java | 2 +- .../NestedChoiceWithEndChoiceIssueTest.xml | 2 +- .../resources/org/apache/camel/util/transform3.xml | 2 +- .../org/apache/camel/xml/LwModelToXMLDumper.java | 5 +- .../java/org/apache/camel/xml/in/BaseParser.java | 18 ++++-- .../java/org/apache/camel/xml/out/BaseWriter.java | 2 +- .../org/apache/camel/xml/in/ModelParserTest.java | 2 +- .../apache/camel/xml/in/SpringModelParserTest.java | 70 ++++++++++++++++++++++ .../org/apache/camel/xml/out/ModelWriterTest.java | 2 +- .../src/test/resources/barInterceptorRoute.xml | 2 +- .../src/test/resources/barOnExceptionRoute.xml | 2 +- .../src/test/resources/barPolicyRoute.xml | 2 +- core/camel-xml-io/src/test/resources/barRest.xml | 2 +- .../src/test/resources/barRestConfiguration.xml | 2 +- core/camel-xml-io/src/test/resources/barRoute.xml | 2 +- .../src/test/resources/barTemplate.xml | 2 +- .../src/test/resources/barTemplatedRoute.xml | 2 +- .../src/test/resources/barUpdatedRoute.xml | 2 +- .../camel-xml-io/src/test/resources/beansEmpty.xml | 2 +- .../src/test/resources/beansWithConstructors.xml | 2 +- .../src/test/resources/beansWithFactoryMethod.xml | 2 +- .../src/test/resources/beansWithProperties.xml | 2 +- .../src/test/resources/beansWithSpringNS.xml | 2 +- .../src/test/resources/convertBody.xml | 2 +- .../src/test/resources/dynamicRecipientList.xml | 2 +- .../test/resources/errorHandlerConfiguration.xml | 2 +- ...rrorHandlerConfigurationRedeliveryPolicyRef.xml | 2 +- .../resources/invalid/convertBodyParseError.xml | 2 +- core/camel-xml-io/src/test/resources/loop.xml | 2 +- core/camel-xml-io/src/test/resources/multiline.xml | 2 +- core/camel-xml-io/src/test/resources/processor.xml | 2 +- .../src/test/resources/processorWithFilter.xml | 2 +- .../test/resources/processorWithGroovyFilter.xml | 2 +- .../test/resources/processorWithHeaderFilter.xml | 2 +- .../test/resources/processorWithSimpleFilter.xml | 2 +- .../src/test/resources/resequencerBatch.xml | 2 +- .../src/test/resources/resequencerStream.xml | 2 +- .../src/test/resources/restAllowedValues.xml | 2 +- .../camel-xml-io/src/test/resources/routeGroup.xml | 2 +- .../test/resources/routeInlinedErrorHandler.xml | 2 +- .../src/test/resources/routeProperties.xml | 2 +- .../src/test/resources/routeProperty.xml | 2 +- .../test/resources/routeWithBindyDataFormat.xml | 2 +- .../src/test/resources/routeWithChoice.xml | 2 +- .../src/test/resources/routeWithCircuitBreaker.xml | 2 +- .../src/test/resources/routeWithCvsDataFormat.xml | 2 +- .../resources/routeWithFailoverLoadBalance.xml | 2 +- .../test/resources/routeWithFlatpackDataFormat.xml | 2 +- .../src/test/resources/routeWithHL7DataFormat.xml | 2 +- .../src/test/resources/routeWithJSonDataFormat.xml | 2 +- .../src/test/resources/routeWithJaxbDataFormat.xml | 2 +- .../src/test/resources/routeWithLoadBalance.xml | 2 +- .../src/test/resources/routeWithNamespace.xml | 2 +- .../src/test/resources/routeWithRSSDataFormat.xml | 2 +- .../test/resources/routeWithRandomLoadBalance.xml | 2 +- .../src/test/resources/routeWithSetHeaders.xml | 2 +- .../src/test/resources/routeWithSetVariables.xml | 2 +- .../test/resources/routeWithStickyLoadBalance.xml | 2 +- .../resources/routeWithTidyMarkupDataFormat.xml | 2 +- .../test/resources/routeWithTopicLoadBalance.xml | 2 +- .../resources/routeWithXMLSecurityDataFormat.xml | 2 +- .../test/resources/routeWithZipFileDataFormat.xml | 2 +- .../test/resources/routeXPathAndXmlNamespaces.xml | 2 +- .../src/test/resources/routingSlip.xml | 2 +- .../resources/routingSlipHeaderAndDelimiterSet.xml | 2 +- .../src/test/resources/routingSlipHeaderSet.xml | 2 +- core/camel-xml-io/src/test/resources/saga.xml | 2 +- .../camel-xml-io/src/test/resources/scan-route.xml | 2 +- core/camel-xml-io/src/test/resources/script.xml | 2 +- core/camel-xml-io/src/test/resources/setBody.xml | 2 +- core/camel-xml-io/src/test/resources/setHeader.xml | 2 +- .../src/test/resources/setHeaderToConstant.xml | 2 +- .../camel-xml-io/src/test/resources/simpleRest.xml | 2 +- .../src/test/resources/simpleRoute.xml | 2 +- core/camel-xml-io/src/test/resources/splitter.xml | 2 +- .../spring-convertBody.xml} | 0 .../src/test/resources/staticRecipientList.xml | 2 +- core/camel-xml-io/src/test/resources/transform.xml | 2 +- 78 files changed, 161 insertions(+), 80 deletions(-) diff --git a/core/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlPlaceholdersTest.java b/core/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlPlaceholdersTest.java index 29d73d4f0b6..22346e42369 100644 --- a/core/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlPlaceholdersTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlPlaceholdersTest.java @@ -32,7 +32,7 @@ public class DumpModelAsXmlPlaceholdersTest extends ContextTestSupport { String xml = PluginHelper.getModelToXMLDumper(context).dumpModelAsXml(context, context.getRouteDefinition("Gouda")); assertNotNull(xml); log.info(xml); - assertTrue(xml.contains("<route xmlns=\"http://camel.apache.org/schema/spring\"; id=\"Gouda\">")); + assertTrue(xml.contains("<route xmlns=\"http://camel.apache.org/schema/xml-io\"; id=\"Gouda\">")); assertTrue(xml.contains("uri=\"direct:start-{{cheese.type}}\"")); assertTrue(xml.contains("uri=\"direct:end-{{cheese.type}}\"")); } diff --git a/core/camel-core/src/test/resources/org/apache/camel/processor/NestedChoiceWithEndChoiceIssueTest.xml b/core/camel-core/src/test/resources/org/apache/camel/processor/NestedChoiceWithEndChoiceIssueTest.xml index c5456a70b89..45cdee551d5 100644 --- a/core/camel-core/src/test/resources/org/apache/camel/processor/NestedChoiceWithEndChoiceIssueTest.xml +++ b/core/camel-core/src/test/resources/org/apache/camel/processor/NestedChoiceWithEndChoiceIssueTest.xml @@ -19,7 +19,7 @@ --> -<route xmlns="http://camel.apache.org/schema/spring"; id="myRoute"> +<route xmlns="http://camel.apache.org/schema/xml-io"; id="myRoute"> <from id="from" uri="direct:test"/> <choice id="choice"> <when id="when"> diff --git a/core/camel-core/src/test/resources/org/apache/camel/util/transform3.xml b/core/camel-core/src/test/resources/org/apache/camel/util/transform3.xml index 0fc9d63de7c..e7f6a2043c8 100644 --- a/core/camel-core/src/test/resources/org/apache/camel/util/transform3.xml +++ b/core/camel-core/src/test/resources/org/apache/camel/util/transform3.xml @@ -17,7 +17,7 @@ limitations under the License. --> -<route xmlns="http://camel.apache.org/schema/spring"; id="myRoute"> +<route xmlns="http://camel.apache.org/schema/xml-io"; id="myRoute"> <from id="from" uri="timer:java?period={{time:1000}}"/> <setBody id="setBody"> <simple>Hello Camel from ${routeId}</simple> diff --git a/core/camel-xml-io/src/main/java/org/apache/camel/xml/LwModelToXMLDumper.java b/core/camel-xml-io/src/main/java/org/apache/camel/xml/LwModelToXMLDumper.java index e82825497a1..fcda4f7985e 100644 --- a/core/camel-xml-io/src/main/java/org/apache/camel/xml/LwModelToXMLDumper.java +++ b/core/camel-xml-io/src/main/java/org/apache/camel/xml/LwModelToXMLDumper.java @@ -49,6 +49,7 @@ import org.apache.camel.spi.ModelToXMLDumper; import org.apache.camel.spi.NamespaceAware; import org.apache.camel.spi.annotations.JdkService; import org.apache.camel.util.KeyValueHolder; +import org.apache.camel.xml.out.BaseWriter; import org.apache.camel.xml.out.ModelWriter; import static org.apache.camel.model.ProcessorDefinitionHelper.filterTypeInOutputs; @@ -87,7 +88,7 @@ public class LwModelToXMLDumper implements ModelToXMLDumper { }; StringWriter buffer = new StringWriter(); - ModelWriter writer = new ModelWriter(buffer, "http://camel.apache.org/schema/spring";) { + ModelWriter writer = new ModelWriter(buffer, BaseWriter.DEFAULT_NAMESPACE) { @Override protected void doWriteOptionalIdentifiedDefinitionAttributes(OptionalIdentifiedDefinition<?> def) throws IOException { @@ -459,7 +460,7 @@ public class LwModelToXMLDumper implements ModelToXMLDumper { def.setDataFormats(new ArrayList<>(dataFormats.values())); StringWriter tmp = new StringWriter(); - ModelWriter writer = new ModelWriter(tmp, null); + ModelWriter writer = new ModelWriter(tmp, BaseWriter.DEFAULT_NAMESPACE); writer.writeDataFormatsDefinition(def); // output with 4 space indent diff --git a/core/camel-xml-io/src/main/java/org/apache/camel/xml/in/BaseParser.java b/core/camel-xml-io/src/main/java/org/apache/camel/xml/in/BaseParser.java index ba2620e2742..1a063d583d0 100644 --- a/core/camel-xml-io/src/main/java/org/apache/camel/xml/in/BaseParser.java +++ b/core/camel-xml-io/src/main/java/org/apache/camel/xml/in/BaseParser.java @@ -53,7 +53,8 @@ import org.apache.camel.xml.io.XmlPullParserLocationException; public class BaseParser { - public static final String DEFAULT_NAMESPACE = "http://camel.apache.org/schema/spring";; + public static final String DEFAULT_NAMESPACE = "http://camel.apache.org/schema/xml-io";; + public static final String SPRING_NAMESPACE = "http://camel.apache.org/schema/spring";; protected final MXParser parser; protected String namespace; @@ -388,7 +389,8 @@ public class BaseParser { throw new XmlPullParserException("Expected starting tag"); } - if (!Objects.equals(name, parser.getName()) || !matchNamespace(namespace, parser.getNamespace(), null, false)) { + if (!Objects.equals(name, parser.getName()) + || !matchNamespace(namespace, parser.getNamespace(), secondaryNamespaces, false)) { return false; } @@ -402,7 +404,7 @@ public class BaseParser { String pn = parser.getName(); boolean match = Objects.equals(name, pn) || Objects.equals(name2, pn); - if (!match || !matchNamespace(namespace, parser.getNamespace(), null, false)) { + if (!match || !matchNamespace(namespace, parser.getNamespace(), secondaryNamespaces, false)) { return ""; // empty tag } @@ -416,7 +418,7 @@ public class BaseParser { String pn = parser.getName(); boolean match = Objects.equals(name, pn) || Objects.equals(name2, pn) || Objects.equals(name3, pn); - if (!match || !matchNamespace(namespace, parser.getNamespace(), null, false)) { + if (!match || !matchNamespace(namespace, parser.getNamespace(), secondaryNamespaces, false)) { return ""; // empty tag } @@ -536,6 +538,13 @@ public class BaseParser { if (DEFAULT_NAMESPACE.equals(namespace) && ns.isEmpty()) { return true; } + // xml-io should be backwards compatible with spring namespace + if (DEFAULT_NAMESPACE.equals(ns) && namespace.equals(SPRING_NAMESPACE)) { + return true; + } + if (SPRING_NAMESPACE.equals(ns) && namespace.equals(DEFAULT_NAMESPACE)) { + return true; + } if (secondaryNamespaces != null) { for (String second : secondaryNamespaces) { if (Objects.equals(ns, second)) { @@ -543,6 +552,7 @@ public class BaseParser { } } } + return false; } diff --git a/core/camel-xml-io/src/main/java/org/apache/camel/xml/out/BaseWriter.java b/core/camel-xml-io/src/main/java/org/apache/camel/xml/out/BaseWriter.java index cfd9db0434f..4f1e559f9da 100644 --- a/core/camel-xml-io/src/main/java/org/apache/camel/xml/out/BaseWriter.java +++ b/core/camel-xml-io/src/main/java/org/apache/camel/xml/out/BaseWriter.java @@ -33,7 +33,7 @@ import org.apache.camel.xml.io.XMLWriter; public class BaseWriter { - public static final String DEFAULT_NAMESPACE = "http://camel.apache.org/schema/spring";; + public static final String DEFAULT_NAMESPACE = "http://camel.apache.org/schema/xml-io";; protected final XMLWriter writer; protected final Deque<String> namespacesStack = new LinkedList<>(); diff --git a/core/camel-xml-io/src/test/java/org/apache/camel/xml/in/ModelParserTest.java b/core/camel-xml-io/src/test/java/org/apache/camel/xml/in/ModelParserTest.java index c311c5b2ade..e2d9dd65a28 100644 --- a/core/camel-xml-io/src/test/java/org/apache/camel/xml/in/ModelParserTest.java +++ b/core/camel-xml-io/src/test/java/org/apache/camel/xml/in/ModelParserTest.java @@ -68,7 +68,7 @@ import static org.junit.jupiter.api.Assertions.fail; public class ModelParserTest { - public static final String NAMESPACE = "http://camel.apache.org/schema/spring";; + public static final String NAMESPACE = "http://camel.apache.org/schema/xml-io";; private static final List<String> REST_XMLS = List.of("barRest.xml", "simpleRest.xml", "simpleRestToD.xml", "restAllowedValues.xml"); private static final List<String> TEMPLATE_XMLS = List.of("barTemplate.xml"); diff --git a/core/camel-xml-io/src/test/java/org/apache/camel/xml/in/SpringModelParserTest.java b/core/camel-xml-io/src/test/java/org/apache/camel/xml/in/SpringModelParserTest.java new file mode 100644 index 00000000000..cf7f5b9074e --- /dev/null +++ b/core/camel-xml-io/src/test/java/org/apache/camel/xml/in/SpringModelParserTest.java @@ -0,0 +1,70 @@ +/* + * 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.xml.in; + +import java.io.File; +import java.net.URL; +import java.nio.file.Files; +import java.nio.file.Path; +import java.util.List; +import java.util.stream.Stream; + +import org.apache.camel.model.RoutesDefinition; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertNotNull; + +public class SpringModelParserTest { + + public static final String SPRING_NAMESPACE = "http://camel.apache.org/schema/spring";; + + @Test + public void testSpringFiles() throws Exception { + Path dir = getResourceFolder(); + try (Stream<Path> list = Files.list(dir)) { + List<Path> files = list.sorted().filter(Files::isRegularFile) + .filter(f -> f.getFileName().toString().endsWith("xml")).toList(); + for (Path path : files) { + ModelParser parser = new ModelParser(Files.newInputStream(path), SPRING_NAMESPACE); + RoutesDefinition routes = parser.parseRoutesDefinition().orElse(null); + assertNotNull(routes); + } + } + } + + @Test + public void testSpringFilesDefault() throws Exception { + Path dir = getResourceFolder(); + try (Stream<Path> list = Files.list(dir)) { + List<Path> files = list.sorted().filter(Files::isRegularFile) + .filter(f -> f.getFileName().toString().endsWith("xml")).toList(); + for (Path path : files) { + ModelParser parser = new ModelParser(Files.newInputStream(path)); + RoutesDefinition routes = parser.parseRoutesDefinition().orElse(null); + assertNotNull(routes); + } + } + } + + private Path getResourceFolder() { + final URL resource = getClass().getClassLoader().getResource("spring/spring-convertBody.xml"); + assert resource != null : "Cannot find spring-convertBody.xml"; + String childFileString = resource.getFile(); + File parentFile = new File(childFileString).getParentFile(); + return parentFile.toPath(); + } +} diff --git a/core/camel-xml-io/src/test/java/org/apache/camel/xml/out/ModelWriterTest.java b/core/camel-xml-io/src/test/java/org/apache/camel/xml/out/ModelWriterTest.java index afdafe6dce7..d1f86d704e6 100644 --- a/core/camel-xml-io/src/test/java/org/apache/camel/xml/out/ModelWriterTest.java +++ b/core/camel-xml-io/src/test/java/org/apache/camel/xml/out/ModelWriterTest.java @@ -64,7 +64,7 @@ import static org.junit.jupiter.api.Assertions.fail; public class ModelWriterTest { - public static final String NAMESPACE = "http://camel.apache.org/schema/spring";; + public static final String NAMESPACE = ModelWriter.DEFAULT_NAMESPACE; private static final Map<Field, Boolean> TRANSIENT = new ConcurrentHashMap<>(); diff --git a/core/camel-xml-io/src/test/resources/barInterceptorRoute.xml b/core/camel-xml-io/src/test/resources/barInterceptorRoute.xml index c7dbf76bf72..7999ead0bf1 100644 --- a/core/camel-xml-io/src/test/resources/barInterceptorRoute.xml +++ b/core/camel-xml-io/src/test/resources/barInterceptorRoute.xml @@ -17,7 +17,7 @@ limitations under the License. --> -<routes xmlns="http://camel.apache.org/schema/spring";> +<routes xmlns="http://camel.apache.org/schema/xml-io";> <route id="bar"> <from uri="direct:bar"/> diff --git a/core/camel-xml-io/src/test/resources/barOnExceptionRoute.xml b/core/camel-xml-io/src/test/resources/barOnExceptionRoute.xml index 7eda5135fe7..4f62b6a6510 100644 --- a/core/camel-xml-io/src/test/resources/barOnExceptionRoute.xml +++ b/core/camel-xml-io/src/test/resources/barOnExceptionRoute.xml @@ -17,7 +17,7 @@ limitations under the License. --> -<routes xmlns="http://camel.apache.org/schema/spring";> +<routes xmlns="http://camel.apache.org/schema/xml-io";> <route id="bar"> <from uri="direct:bar"/> diff --git a/core/camel-xml-io/src/test/resources/barPolicyRoute.xml b/core/camel-xml-io/src/test/resources/barPolicyRoute.xml index f7ce1ad74e2..ee98b6a6a4a 100644 --- a/core/camel-xml-io/src/test/resources/barPolicyRoute.xml +++ b/core/camel-xml-io/src/test/resources/barPolicyRoute.xml @@ -17,7 +17,7 @@ limitations under the License. --> -<routes xmlns="http://camel.apache.org/schema/spring";> +<routes xmlns="http://camel.apache.org/schema/xml-io";> <route id="foo"> <from uri="direct:start"/> diff --git a/core/camel-xml-io/src/test/resources/barRest.xml b/core/camel-xml-io/src/test/resources/barRest.xml index e0fb9e46e62..a8291aae368 100644 --- a/core/camel-xml-io/src/test/resources/barRest.xml +++ b/core/camel-xml-io/src/test/resources/barRest.xml @@ -17,7 +17,7 @@ limitations under the License. --> -<rests xmlns="http://camel.apache.org/schema/spring";> +<rests xmlns="http://camel.apache.org/schema/xml-io";> <rest id="bar" path="/say/hello"> <get path="/bar"> <to uri="mock:bar"/> diff --git a/core/camel-xml-io/src/test/resources/barRestConfiguration.xml b/core/camel-xml-io/src/test/resources/barRestConfiguration.xml index 8f04eadb208..15d33355116 100644 --- a/core/camel-xml-io/src/test/resources/barRestConfiguration.xml +++ b/core/camel-xml-io/src/test/resources/barRestConfiguration.xml @@ -17,6 +17,6 @@ limitations under the License. --> -<camel xmlns="http://camel.apache.org/schema/spring";> +<camel xmlns="http://camel.apache.org/schema/xml-io";> <restConfiguration apiContextPath="my-api-doc"/> </camel> \ No newline at end of file diff --git a/core/camel-xml-io/src/test/resources/barRoute.xml b/core/camel-xml-io/src/test/resources/barRoute.xml index e96c1f25092..06273a79c4f 100644 --- a/core/camel-xml-io/src/test/resources/barRoute.xml +++ b/core/camel-xml-io/src/test/resources/barRoute.xml @@ -18,7 +18,7 @@ --> <!-- START SNIPPET: e1 --> -<routes xmlns="http://camel.apache.org/schema/spring";> +<routes xmlns="http://camel.apache.org/schema/xml-io";> <!-- here we define the bar route --> <route id="bar"> <from uri="direct:bar"/> diff --git a/core/camel-xml-io/src/test/resources/barTemplate.xml b/core/camel-xml-io/src/test/resources/barTemplate.xml index 724d50c88cd..932bfe3a29a 100644 --- a/core/camel-xml-io/src/test/resources/barTemplate.xml +++ b/core/camel-xml-io/src/test/resources/barTemplate.xml @@ -17,7 +17,7 @@ limitations under the License. --> -<routeTemplates xmlns="http://camel.apache.org/schema/spring";> +<routeTemplates xmlns="http://camel.apache.org/schema/xml-io";> <routeTemplate id="myTemplate"> <templateParameter name="foo"/> <templateParameter name="bar"/> diff --git a/core/camel-xml-io/src/test/resources/barTemplatedRoute.xml b/core/camel-xml-io/src/test/resources/barTemplatedRoute.xml index acc9d9f8e91..e9e8c84ead6 100644 --- a/core/camel-xml-io/src/test/resources/barTemplatedRoute.xml +++ b/core/camel-xml-io/src/test/resources/barTemplatedRoute.xml @@ -17,7 +17,7 @@ limitations under the License. --> -<templatedRoutes xmlns="http://camel.apache.org/schema/spring";> +<templatedRoutes xmlns="http://camel.apache.org/schema/xml-io";> <templatedRoute routeTemplateRef="myTemplate" routeId="my-route"> <parameter name="foo" value="fooVal"/> <parameter name="bar" value="barVal"/> diff --git a/core/camel-xml-io/src/test/resources/barUpdatedRoute.xml b/core/camel-xml-io/src/test/resources/barUpdatedRoute.xml index e7ce80556c3..a835a42a1ab 100644 --- a/core/camel-xml-io/src/test/resources/barUpdatedRoute.xml +++ b/core/camel-xml-io/src/test/resources/barUpdatedRoute.xml @@ -18,7 +18,7 @@ --> <!-- START SNIPPET: e1 --> -<routes xmlns="http://camel.apache.org/schema/spring";> +<routes xmlns="http://camel.apache.org/schema/xml-io";> <!-- here we define the bar route --> <route id="bar"> <from uri="direct:bar"/> diff --git a/core/camel-xml-io/src/test/resources/beansEmpty.xml b/core/camel-xml-io/src/test/resources/beansEmpty.xml index eaaca1e32d2..8ccc2150e40 100644 --- a/core/camel-xml-io/src/test/resources/beansEmpty.xml +++ b/core/camel-xml-io/src/test/resources/beansEmpty.xml @@ -17,5 +17,5 @@ limitations under the License. --> -<beans xmlns="http://camel.apache.org/schema/spring";> +<beans xmlns="http://camel.apache.org/schema/xml-io";> </beans> diff --git a/core/camel-xml-io/src/test/resources/beansWithConstructors.xml b/core/camel-xml-io/src/test/resources/beansWithConstructors.xml index 6c7e158c239..c3a1cf6ab18 100644 --- a/core/camel-xml-io/src/test/resources/beansWithConstructors.xml +++ b/core/camel-xml-io/src/test/resources/beansWithConstructors.xml @@ -17,7 +17,7 @@ limitations under the License. --> -<beans xmlns="http://camel.apache.org/schema/spring"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; +<beans xmlns="http://camel.apache.org/schema/xml-io"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://camel.apache.org/schema/spring file:/data/sources/github.com/apache/camel-upstream/components/camel-spring-xml/target/classes/camel-spring.xsd"> <bean name="b1" type="org.apache.camel.xml.in.ModelParserTest.MyBean"> diff --git a/core/camel-xml-io/src/test/resources/beansWithFactoryMethod.xml b/core/camel-xml-io/src/test/resources/beansWithFactoryMethod.xml index 20c1afa8242..14305cc6c06 100644 --- a/core/camel-xml-io/src/test/resources/beansWithFactoryMethod.xml +++ b/core/camel-xml-io/src/test/resources/beansWithFactoryMethod.xml @@ -17,7 +17,7 @@ limitations under the License. --> -<beans xmlns="http://camel.apache.org/schema/spring"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; +<beans xmlns="http://camel.apache.org/schema/xml-io"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://camel.apache.org/schema/spring file:/data/sources/github.com/apache/camel-upstream/components/camel-spring-xml/target/classes/camel-spring.xsd"> <bean name="b1" type="org.apache.camel.xml.in.ModelParserTest.MyBean" factoryMethod="createMyBean"> diff --git a/core/camel-xml-io/src/test/resources/beansWithProperties.xml b/core/camel-xml-io/src/test/resources/beansWithProperties.xml index e999a95fea9..4448a001ced 100644 --- a/core/camel-xml-io/src/test/resources/beansWithProperties.xml +++ b/core/camel-xml-io/src/test/resources/beansWithProperties.xml @@ -17,7 +17,7 @@ limitations under the License. --> -<beans xmlns="http://camel.apache.org/schema/spring"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; +<beans xmlns="http://camel.apache.org/schema/xml-io"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://camel.apache.org/schema/spring file:/data/sources/github.com/apache/camel-upstream/components/camel-spring-xml/target/classes/camel-spring.xsd"> <bean name="b1" type="org.apache.camel.xml.in.ModelParserTest.MyBean"> diff --git a/core/camel-xml-io/src/test/resources/beansWithSpringNS.xml b/core/camel-xml-io/src/test/resources/beansWithSpringNS.xml index 46b157f014d..88690cf4f18 100644 --- a/core/camel-xml-io/src/test/resources/beansWithSpringNS.xml +++ b/core/camel-xml-io/src/test/resources/beansWithSpringNS.xml @@ -17,7 +17,7 @@ limitations under the License. --> -<beans xmlns="http://camel.apache.org/schema/spring"; xmlns:s="http://www.springframework.org/schema/beans";> +<beans xmlns="http://camel.apache.org/schema/xml-io"; xmlns:s="http://www.springframework.org/schema/beans";> <s:bean id="s1" class="java.lang.String"> <s:description>Real Spring Bean</s:description> diff --git a/core/camel-xml-io/src/test/resources/convertBody.xml b/core/camel-xml-io/src/test/resources/convertBody.xml index 7b66154ff91..3f2191f0bbf 100644 --- a/core/camel-xml-io/src/test/resources/convertBody.xml +++ b/core/camel-xml-io/src/test/resources/convertBody.xml @@ -17,7 +17,7 @@ limitations under the License. --> -<routes id="camel" xmlns="http://camel.apache.org/schema/spring";> +<routes id="camel" xmlns="http://camel.apache.org/schema/xml-io";> <route> <from uri="seda:a"/> <convertBodyTo type="java.lang.Integer"/> diff --git a/core/camel-xml-io/src/test/resources/dynamicRecipientList.xml b/core/camel-xml-io/src/test/resources/dynamicRecipientList.xml index d924dedf5fd..c6e72a240e9 100644 --- a/core/camel-xml-io/src/test/resources/dynamicRecipientList.xml +++ b/core/camel-xml-io/src/test/resources/dynamicRecipientList.xml @@ -17,7 +17,7 @@ limitations under the License. --> -<routes id="camel" xmlns="http://camel.apache.org/schema/spring";> +<routes id="camel" xmlns="http://camel.apache.org/schema/xml-io";> <route> <from uri="seda:a"/> <recipientList> diff --git a/core/camel-xml-io/src/test/resources/errorHandlerConfiguration.xml b/core/camel-xml-io/src/test/resources/errorHandlerConfiguration.xml index 81071092a93..f940c2a98c5 100644 --- a/core/camel-xml-io/src/test/resources/errorHandlerConfiguration.xml +++ b/core/camel-xml-io/src/test/resources/errorHandlerConfiguration.xml @@ -17,7 +17,7 @@ limitations under the License. --> -<routeConfigurations xmlns="http://camel.apache.org/schema/spring";> +<routeConfigurations xmlns="http://camel.apache.org/schema/xml-io";> <routeConfiguration> <errorHandler> <deadLetterChannel deadLetterUri="mock:dead"> diff --git a/core/camel-xml-io/src/test/resources/errorHandlerConfigurationRedeliveryPolicyRef.xml b/core/camel-xml-io/src/test/resources/errorHandlerConfigurationRedeliveryPolicyRef.xml index 24b7aa36ddb..126e7a24ecf 100644 --- a/core/camel-xml-io/src/test/resources/errorHandlerConfigurationRedeliveryPolicyRef.xml +++ b/core/camel-xml-io/src/test/resources/errorHandlerConfigurationRedeliveryPolicyRef.xml @@ -17,7 +17,7 @@ limitations under the License. --> -<routeConfigurations xmlns="http://camel.apache.org/schema/spring";> +<routeConfigurations xmlns="http://camel.apache.org/schema/xml-io";> <routeConfiguration> <errorHandler> <deadLetterChannel deadLetterUri="mock:dead" redeliveryPolicyRef="myPolicy"/> diff --git a/core/camel-xml-io/src/test/resources/invalid/convertBodyParseError.xml b/core/camel-xml-io/src/test/resources/invalid/convertBodyParseError.xml index bf2c966f6bf..aec298748ac 100644 --- a/core/camel-xml-io/src/test/resources/invalid/convertBodyParseError.xml +++ b/core/camel-xml-io/src/test/resources/invalid/convertBodyParseError.xml @@ -17,7 +17,7 @@ limitations under the License. --> -<routes id="camel" xmlns="http://camel.apache.org/schema/spring";> +<routes id="camel" xmlns="http://camel.apache.org/schema/xml-io";> <route> <from ref="seda:a"/> <convertBodyTo type="java.lang.Integer"/> diff --git a/core/camel-xml-io/src/test/resources/loop.xml b/core/camel-xml-io/src/test/resources/loop.xml index 8c0e7645a5d..1c9fa0a62c6 100644 --- a/core/camel-xml-io/src/test/resources/loop.xml +++ b/core/camel-xml-io/src/test/resources/loop.xml @@ -17,7 +17,7 @@ limitations under the License. --> -<routes id="camel" xmlns="http://camel.apache.org/schema/spring";> +<routes id="camel" xmlns="http://camel.apache.org/schema/xml-io";> <route> <from uri="timer:a"/> <loop> diff --git a/core/camel-xml-io/src/test/resources/multiline.xml b/core/camel-xml-io/src/test/resources/multiline.xml index 29a1b6d09de..953fa802202 100644 --- a/core/camel-xml-io/src/test/resources/multiline.xml +++ b/core/camel-xml-io/src/test/resources/multiline.xml @@ -17,7 +17,7 @@ limitations under the License. --> -<routes id="camel" xmlns="http://camel.apache.org/schema/spring";> +<routes id="camel" xmlns="http://camel.apache.org/schema/xml-io";> <route> <from uri="direct:start"/> <log loggingLevel="WARN" diff --git a/core/camel-xml-io/src/test/resources/processor.xml b/core/camel-xml-io/src/test/resources/processor.xml index 07b319ab9e4..bd57d78ba14 100644 --- a/core/camel-xml-io/src/test/resources/processor.xml +++ b/core/camel-xml-io/src/test/resources/processor.xml @@ -17,7 +17,7 @@ limitations under the License. --> -<routes id="camel" xmlns="http://camel.apache.org/schema/spring";> +<routes id="camel" xmlns="http://camel.apache.org/schema/xml-io";> <route> <from uri="seda:a"/> <process ref="myProcessor"/> diff --git a/core/camel-xml-io/src/test/resources/processorWithFilter.xml b/core/camel-xml-io/src/test/resources/processorWithFilter.xml index 975a53d6873..20889cb6ad8 100644 --- a/core/camel-xml-io/src/test/resources/processorWithFilter.xml +++ b/core/camel-xml-io/src/test/resources/processorWithFilter.xml @@ -17,7 +17,7 @@ limitations under the License. --> -<routes id="camel" xmlns="http://camel.apache.org/schema/spring";> +<routes id="camel" xmlns="http://camel.apache.org/schema/xml-io";> <route> <from uri="seda:a"/> <filter> diff --git a/core/camel-xml-io/src/test/resources/processorWithGroovyFilter.xml b/core/camel-xml-io/src/test/resources/processorWithGroovyFilter.xml index 7edf5144e8b..838ec7cb12e 100644 --- a/core/camel-xml-io/src/test/resources/processorWithGroovyFilter.xml +++ b/core/camel-xml-io/src/test/resources/processorWithGroovyFilter.xml @@ -17,7 +17,7 @@ limitations under the License. --> -<routes id="camel" xmlns="http://camel.apache.org/schema/spring";> +<routes id="camel" xmlns="http://camel.apache.org/schema/xml-io";> <route> <from uri="seda:a"/> <filter> diff --git a/core/camel-xml-io/src/test/resources/processorWithHeaderFilter.xml b/core/camel-xml-io/src/test/resources/processorWithHeaderFilter.xml index 89d654054d9..3309becdebd 100644 --- a/core/camel-xml-io/src/test/resources/processorWithHeaderFilter.xml +++ b/core/camel-xml-io/src/test/resources/processorWithHeaderFilter.xml @@ -17,7 +17,7 @@ limitations under the License. --> -<routes id="camel" xmlns="http://camel.apache.org/schema/spring";> +<routes id="camel" xmlns="http://camel.apache.org/schema/xml-io";> <route> <from uri="seda:a"/> <filter> diff --git a/core/camel-xml-io/src/test/resources/processorWithSimpleFilter.xml b/core/camel-xml-io/src/test/resources/processorWithSimpleFilter.xml index e5d5884a7ae..07939f29d46 100644 --- a/core/camel-xml-io/src/test/resources/processorWithSimpleFilter.xml +++ b/core/camel-xml-io/src/test/resources/processorWithSimpleFilter.xml @@ -17,7 +17,7 @@ limitations under the License. --> -<routes id="camel" xmlns="http://camel.apache.org/schema/spring";> +<routes id="camel" xmlns="http://camel.apache.org/schema/xml-io";> <route> <from uri="seda:a"/> <filter> diff --git a/core/camel-xml-io/src/test/resources/resequencerBatch.xml b/core/camel-xml-io/src/test/resources/resequencerBatch.xml index 29c36aafe06..3b1b861ed64 100644 --- a/core/camel-xml-io/src/test/resources/resequencerBatch.xml +++ b/core/camel-xml-io/src/test/resources/resequencerBatch.xml @@ -17,7 +17,7 @@ limitations under the License. --> -<routes id="camel" xmlns="http://camel.apache.org/schema/spring";> +<routes id="camel" xmlns="http://camel.apache.org/schema/xml-io";> <route> <from uri="direct:start" /> <resequence> diff --git a/core/camel-xml-io/src/test/resources/resequencerStream.xml b/core/camel-xml-io/src/test/resources/resequencerStream.xml index 787a43aaa30..c96f58814c7 100644 --- a/core/camel-xml-io/src/test/resources/resequencerStream.xml +++ b/core/camel-xml-io/src/test/resources/resequencerStream.xml @@ -17,7 +17,7 @@ limitations under the License. --> -<routes id="camel" xmlns="http://camel.apache.org/schema/spring";> +<routes id="camel" xmlns="http://camel.apache.org/schema/xml-io";> <route> <from uri="direct:start" /> <resequence> diff --git a/core/camel-xml-io/src/test/resources/restAllowedValues.xml b/core/camel-xml-io/src/test/resources/restAllowedValues.xml index 2e512891a96..c515c31f64f 100644 --- a/core/camel-xml-io/src/test/resources/restAllowedValues.xml +++ b/core/camel-xml-io/src/test/resources/restAllowedValues.xml @@ -17,7 +17,7 @@ limitations under the License. --> -<rests xmlns="http://camel.apache.org/schema/spring";> +<rests xmlns="http://camel.apache.org/schema/xml-io";> <rest path="/say/bye"> <get consumes="application/json"> <param name="header_count" type="header" description="header param description1" dataType="integer" diff --git a/core/camel-xml-io/src/test/resources/routeGroup.xml b/core/camel-xml-io/src/test/resources/routeGroup.xml index 5ff347d809d..30482cb5f5d 100644 --- a/core/camel-xml-io/src/test/resources/routeGroup.xml +++ b/core/camel-xml-io/src/test/resources/routeGroup.xml @@ -17,7 +17,7 @@ limitations under the License. --> -<routes xmlns="http://camel.apache.org/schema/spring";> +<routes xmlns="http://camel.apache.org/schema/xml-io";> <!-- xsi:schemaLocation="http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd"; diff --git a/core/camel-xml-io/src/test/resources/routeInlinedErrorHandler.xml b/core/camel-xml-io/src/test/resources/routeInlinedErrorHandler.xml index 75bb0c65682..343caee33b9 100644 --- a/core/camel-xml-io/src/test/resources/routeInlinedErrorHandler.xml +++ b/core/camel-xml-io/src/test/resources/routeInlinedErrorHandler.xml @@ -17,7 +17,7 @@ limitations under the License. --> -<routes xmlns="http://camel.apache.org/schema/spring";> +<routes xmlns="http://camel.apache.org/schema/xml-io";> <route> <errorHandler> diff --git a/core/camel-xml-io/src/test/resources/routeProperties.xml b/core/camel-xml-io/src/test/resources/routeProperties.xml index 6e67e6cbfba..fbdcfc46a34 100644 --- a/core/camel-xml-io/src/test/resources/routeProperties.xml +++ b/core/camel-xml-io/src/test/resources/routeProperties.xml @@ -17,7 +17,7 @@ limitations under the License. --> -<routes xmlns="http://camel.apache.org/schema/spring";> +<routes xmlns="http://camel.apache.org/schema/xml-io";> <!-- xsi:schemaLocation="http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd"; diff --git a/core/camel-xml-io/src/test/resources/routeProperty.xml b/core/camel-xml-io/src/test/resources/routeProperty.xml index 959b4d00227..d9f438391e4 100644 --- a/core/camel-xml-io/src/test/resources/routeProperty.xml +++ b/core/camel-xml-io/src/test/resources/routeProperty.xml @@ -17,7 +17,7 @@ limitations under the License. --> -<routes xmlns="http://camel.apache.org/schema/spring";> +<routes xmlns="http://camel.apache.org/schema/xml-io";> <!-- xsi:schemaLocation="http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd"; diff --git a/core/camel-xml-io/src/test/resources/routeWithBindyDataFormat.xml b/core/camel-xml-io/src/test/resources/routeWithBindyDataFormat.xml index 6aea2769761..9cd898fa88c 100644 --- a/core/camel-xml-io/src/test/resources/routeWithBindyDataFormat.xml +++ b/core/camel-xml-io/src/test/resources/routeWithBindyDataFormat.xml @@ -17,7 +17,7 @@ limitations under the License. --> -<routes id="camel" xmlns="http://camel.apache.org/schema/spring";> +<routes id="camel" xmlns="http://camel.apache.org/schema/xml-io";> <route> <from uri="seda:a"/> <pipeline> diff --git a/core/camel-xml-io/src/test/resources/routeWithChoice.xml b/core/camel-xml-io/src/test/resources/routeWithChoice.xml index c74bcc7b206..c9617188f1d 100644 --- a/core/camel-xml-io/src/test/resources/routeWithChoice.xml +++ b/core/camel-xml-io/src/test/resources/routeWithChoice.xml @@ -17,7 +17,7 @@ limitations under the License. --> -<routes id="camel" xmlns="http://camel.apache.org/schema/spring";> +<routes id="camel" xmlns="http://camel.apache.org/schema/xml-io";> <route> <from uri="seda:a"/> <choice> diff --git a/core/camel-xml-io/src/test/resources/routeWithCircuitBreaker.xml b/core/camel-xml-io/src/test/resources/routeWithCircuitBreaker.xml index 83a04c015ac..0cd77bab26d 100644 --- a/core/camel-xml-io/src/test/resources/routeWithCircuitBreaker.xml +++ b/core/camel-xml-io/src/test/resources/routeWithCircuitBreaker.xml @@ -17,7 +17,7 @@ limitations under the License. --> -<routes id="camel" xmlns="http://camel.apache.org/schema/spring";> +<routes id="camel" xmlns="http://camel.apache.org/schema/xml-io";> <route> <from uri="direct:start"/> <circuitBreaker> diff --git a/core/camel-xml-io/src/test/resources/routeWithCvsDataFormat.xml b/core/camel-xml-io/src/test/resources/routeWithCvsDataFormat.xml index 3e94bc156b8..f52aa73c3cd 100644 --- a/core/camel-xml-io/src/test/resources/routeWithCvsDataFormat.xml +++ b/core/camel-xml-io/src/test/resources/routeWithCvsDataFormat.xml @@ -17,7 +17,7 @@ limitations under the License. --> -<routes id="camel" xmlns="http://camel.apache.org/schema/spring";> +<routes id="camel" xmlns="http://camel.apache.org/schema/xml-io";> <route> <from uri="seda:a"/> <pipeline> diff --git a/core/camel-xml-io/src/test/resources/routeWithFailoverLoadBalance.xml b/core/camel-xml-io/src/test/resources/routeWithFailoverLoadBalance.xml index b362eb50e48..a8dec238c0c 100644 --- a/core/camel-xml-io/src/test/resources/routeWithFailoverLoadBalance.xml +++ b/core/camel-xml-io/src/test/resources/routeWithFailoverLoadBalance.xml @@ -17,7 +17,7 @@ limitations under the License. --> -<routes id="camel" xmlns="http://camel.apache.org/schema/spring";> +<routes id="camel" xmlns="http://camel.apache.org/schema/xml-io";> <route> <from uri="seda:a"/> <loadBalance> diff --git a/core/camel-xml-io/src/test/resources/routeWithFlatpackDataFormat.xml b/core/camel-xml-io/src/test/resources/routeWithFlatpackDataFormat.xml index db33188ca64..1f02255f43e 100644 --- a/core/camel-xml-io/src/test/resources/routeWithFlatpackDataFormat.xml +++ b/core/camel-xml-io/src/test/resources/routeWithFlatpackDataFormat.xml @@ -17,7 +17,7 @@ limitations under the License. --> -<routes id="camel" xmlns="http://camel.apache.org/schema/spring";> +<routes id="camel" xmlns="http://camel.apache.org/schema/xml-io";> <route> <from uri="seda:a"/> <pipeline> diff --git a/core/camel-xml-io/src/test/resources/routeWithHL7DataFormat.xml b/core/camel-xml-io/src/test/resources/routeWithHL7DataFormat.xml index 1ee6503a9ca..a02d2bf677f 100644 --- a/core/camel-xml-io/src/test/resources/routeWithHL7DataFormat.xml +++ b/core/camel-xml-io/src/test/resources/routeWithHL7DataFormat.xml @@ -17,7 +17,7 @@ limitations under the License. --> -<routes id="camel" xmlns="http://camel.apache.org/schema/spring";> +<routes id="camel" xmlns="http://camel.apache.org/schema/xml-io";> <route> <from uri="seda:a"/> <pipeline> diff --git a/core/camel-xml-io/src/test/resources/routeWithJSonDataFormat.xml b/core/camel-xml-io/src/test/resources/routeWithJSonDataFormat.xml index 0f53743ae5c..a76a5e58012 100644 --- a/core/camel-xml-io/src/test/resources/routeWithJSonDataFormat.xml +++ b/core/camel-xml-io/src/test/resources/routeWithJSonDataFormat.xml @@ -17,7 +17,7 @@ limitations under the License. --> -<routes id="camel" xmlns="http://camel.apache.org/schema/spring";> +<routes id="camel" xmlns="http://camel.apache.org/schema/xml-io";> <route> <from uri="seda:a"/> <pipeline> diff --git a/core/camel-xml-io/src/test/resources/routeWithJaxbDataFormat.xml b/core/camel-xml-io/src/test/resources/routeWithJaxbDataFormat.xml index 4bc91e9d94b..cf0c5793ad2 100644 --- a/core/camel-xml-io/src/test/resources/routeWithJaxbDataFormat.xml +++ b/core/camel-xml-io/src/test/resources/routeWithJaxbDataFormat.xml @@ -17,7 +17,7 @@ limitations under the License. --> -<routes id="camel" xmlns="http://camel.apache.org/schema/spring";> +<routes id="camel" xmlns="http://camel.apache.org/schema/xml-io";> <route> <from uri="seda:a"/> <pipeline> diff --git a/core/camel-xml-io/src/test/resources/routeWithLoadBalance.xml b/core/camel-xml-io/src/test/resources/routeWithLoadBalance.xml index 5170d55f34a..d72ed07434e 100644 --- a/core/camel-xml-io/src/test/resources/routeWithLoadBalance.xml +++ b/core/camel-xml-io/src/test/resources/routeWithLoadBalance.xml @@ -17,7 +17,7 @@ limitations under the License. --> -<routes id="camel" xmlns="http://camel.apache.org/schema/spring";> +<routes id="camel" xmlns="http://camel.apache.org/schema/xml-io";> <route> <from uri="seda:a"/> <loadBalance> diff --git a/core/camel-xml-io/src/test/resources/routeWithNamespace.xml b/core/camel-xml-io/src/test/resources/routeWithNamespace.xml index 664e326f30e..42c43f821db 100644 --- a/core/camel-xml-io/src/test/resources/routeWithNamespace.xml +++ b/core/camel-xml-io/src/test/resources/routeWithNamespace.xml @@ -17,7 +17,7 @@ limitations under the License. --> -<routes xmlns="http://camel.apache.org/schema/spring"; xmlns:foo="http://foo";> +<routes xmlns="http://camel.apache.org/schema/xml-io"; xmlns:foo="http://foo";> <route id="routeWithNamespace"> <from uri="direct:foo" /> <choice> diff --git a/core/camel-xml-io/src/test/resources/routeWithRSSDataFormat.xml b/core/camel-xml-io/src/test/resources/routeWithRSSDataFormat.xml index bbb79c0328b..af9247a2c42 100644 --- a/core/camel-xml-io/src/test/resources/routeWithRSSDataFormat.xml +++ b/core/camel-xml-io/src/test/resources/routeWithRSSDataFormat.xml @@ -17,7 +17,7 @@ limitations under the License. --> -<routes id="camel" xmlns="http://camel.apache.org/schema/spring";> +<routes id="camel" xmlns="http://camel.apache.org/schema/xml-io";> <route> <from uri="seda:a"/> <pipeline> diff --git a/core/camel-xml-io/src/test/resources/routeWithRandomLoadBalance.xml b/core/camel-xml-io/src/test/resources/routeWithRandomLoadBalance.xml index 0cbe11e2f2c..023ce6258df 100644 --- a/core/camel-xml-io/src/test/resources/routeWithRandomLoadBalance.xml +++ b/core/camel-xml-io/src/test/resources/routeWithRandomLoadBalance.xml @@ -17,7 +17,7 @@ limitations under the License. --> -<routes id="camel" xmlns="http://camel.apache.org/schema/spring";> +<routes id="camel" xmlns="http://camel.apache.org/schema/xml-io";> <route> <from uri="seda:a"/> <loadBalance> diff --git a/core/camel-xml-io/src/test/resources/routeWithSetHeaders.xml b/core/camel-xml-io/src/test/resources/routeWithSetHeaders.xml index 44e3505f840..e6cbfdabbb9 100644 --- a/core/camel-xml-io/src/test/resources/routeWithSetHeaders.xml +++ b/core/camel-xml-io/src/test/resources/routeWithSetHeaders.xml @@ -17,7 +17,7 @@ limitations under the License. --> -<routes id="camel" xmlns="http://camel.apache.org/schema/spring";> +<routes id="camel" xmlns="http://camel.apache.org/schema/xml-io";> <route> <from uri="seda:a"/> <setHeaders> diff --git a/core/camel-xml-io/src/test/resources/routeWithSetVariables.xml b/core/camel-xml-io/src/test/resources/routeWithSetVariables.xml index 03d6298f2fa..ea22f699c6b 100644 --- a/core/camel-xml-io/src/test/resources/routeWithSetVariables.xml +++ b/core/camel-xml-io/src/test/resources/routeWithSetVariables.xml @@ -17,7 +17,7 @@ limitations under the License. --> -<routes id="camel" xmlns="http://camel.apache.org/schema/spring";> +<routes id="camel" xmlns="http://camel.apache.org/schema/xml-io";> <route> <from uri="seda:a"/> <setVariables> diff --git a/core/camel-xml-io/src/test/resources/routeWithStickyLoadBalance.xml b/core/camel-xml-io/src/test/resources/routeWithStickyLoadBalance.xml index df18c216fa1..6156ac34ede 100644 --- a/core/camel-xml-io/src/test/resources/routeWithStickyLoadBalance.xml +++ b/core/camel-xml-io/src/test/resources/routeWithStickyLoadBalance.xml @@ -17,7 +17,7 @@ limitations under the License. --> -<routes id="camel" xmlns="http://camel.apache.org/schema/spring";> +<routes id="camel" xmlns="http://camel.apache.org/schema/xml-io";> <route> <from uri="seda:a"/> <loadBalance> diff --git a/core/camel-xml-io/src/test/resources/routeWithTidyMarkupDataFormat.xml b/core/camel-xml-io/src/test/resources/routeWithTidyMarkupDataFormat.xml index f3939e5ecf1..cfae2c51d9b 100644 --- a/core/camel-xml-io/src/test/resources/routeWithTidyMarkupDataFormat.xml +++ b/core/camel-xml-io/src/test/resources/routeWithTidyMarkupDataFormat.xml @@ -17,7 +17,7 @@ limitations under the License. --> -<routes id="camel" xmlns="http://camel.apache.org/schema/spring";> +<routes id="camel" xmlns="http://camel.apache.org/schema/xml-io";> <route> <from uri="seda:a"/> <pipeline> diff --git a/core/camel-xml-io/src/test/resources/routeWithTopicLoadBalance.xml b/core/camel-xml-io/src/test/resources/routeWithTopicLoadBalance.xml index 0c543845e94..38919abb836 100644 --- a/core/camel-xml-io/src/test/resources/routeWithTopicLoadBalance.xml +++ b/core/camel-xml-io/src/test/resources/routeWithTopicLoadBalance.xml @@ -17,7 +17,7 @@ limitations under the License. --> -<routes id="camel" xmlns="http://camel.apache.org/schema/spring";> +<routes id="camel" xmlns="http://camel.apache.org/schema/xml-io";> <route> <from uri="seda:a"/> <loadBalance> diff --git a/core/camel-xml-io/src/test/resources/routeWithXMLSecurityDataFormat.xml b/core/camel-xml-io/src/test/resources/routeWithXMLSecurityDataFormat.xml index c546d2d0ebf..c1a3213b0d1 100644 --- a/core/camel-xml-io/src/test/resources/routeWithXMLSecurityDataFormat.xml +++ b/core/camel-xml-io/src/test/resources/routeWithXMLSecurityDataFormat.xml @@ -17,7 +17,7 @@ limitations under the License. --> -<routes id="camel" xmlns="http://camel.apache.org/schema/spring";> +<routes id="camel" xmlns="http://camel.apache.org/schema/xml-io";> <route> <from uri="seda:a"/> <pipeline> diff --git a/core/camel-xml-io/src/test/resources/routeWithZipFileDataFormat.xml b/core/camel-xml-io/src/test/resources/routeWithZipFileDataFormat.xml index c9ac39084ae..e9c18246201 100644 --- a/core/camel-xml-io/src/test/resources/routeWithZipFileDataFormat.xml +++ b/core/camel-xml-io/src/test/resources/routeWithZipFileDataFormat.xml @@ -17,7 +17,7 @@ limitations under the License. --> -<routes id="camel" xmlns="http://camel.apache.org/schema/spring";> +<routes id="camel" xmlns="http://camel.apache.org/schema/xml-io";> <route> <from uri="seda:a"/> <pipeline> diff --git a/core/camel-xml-io/src/test/resources/routeXPathAndXmlNamespaces.xml b/core/camel-xml-io/src/test/resources/routeXPathAndXmlNamespaces.xml index 74cdae56b39..f5f90d690ce 100644 --- a/core/camel-xml-io/src/test/resources/routeXPathAndXmlNamespaces.xml +++ b/core/camel-xml-io/src/test/resources/routeXPathAndXmlNamespaces.xml @@ -17,7 +17,7 @@ limitations under the License. --> -<routes xmlns="http://camel.apache.org/schema/spring"; +<routes xmlns="http://camel.apache.org/schema/xml-io"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xmlns:routes-ns-def="http://www.example.com/schema"; xsi:schemaLocation="http://camel.apache.org/schema/spring https://camel.apache.org/schema/spring/camel-spring.xsd";> diff --git a/core/camel-xml-io/src/test/resources/routingSlip.xml b/core/camel-xml-io/src/test/resources/routingSlip.xml index 23c6d2fe414..5e1fa37ad9a 100644 --- a/core/camel-xml-io/src/test/resources/routingSlip.xml +++ b/core/camel-xml-io/src/test/resources/routingSlip.xml @@ -17,7 +17,7 @@ limitations under the License. --> -<routes id="camel" xmlns="http://camel.apache.org/schema/spring";> +<routes id="camel" xmlns="http://camel.apache.org/schema/xml-io";> <route> <from uri="seda:a"/> <routingSlip> diff --git a/core/camel-xml-io/src/test/resources/routingSlipHeaderAndDelimiterSet.xml b/core/camel-xml-io/src/test/resources/routingSlipHeaderAndDelimiterSet.xml index 0a77510e0b7..23be49050d9 100644 --- a/core/camel-xml-io/src/test/resources/routingSlipHeaderAndDelimiterSet.xml +++ b/core/camel-xml-io/src/test/resources/routingSlipHeaderAndDelimiterSet.xml @@ -17,7 +17,7 @@ limitations under the License. --> -<routes id="camel" xmlns="http://camel.apache.org/schema/spring";> +<routes id="camel" xmlns="http://camel.apache.org/schema/xml-io";> <route> <from uri="seda:a"/> <routingSlip uriDelimiter="#"> diff --git a/core/camel-xml-io/src/test/resources/routingSlipHeaderSet.xml b/core/camel-xml-io/src/test/resources/routingSlipHeaderSet.xml index 1a60dc66dbb..f5c839152ad 100644 --- a/core/camel-xml-io/src/test/resources/routingSlipHeaderSet.xml +++ b/core/camel-xml-io/src/test/resources/routingSlipHeaderSet.xml @@ -17,7 +17,7 @@ limitations under the License. --> -<routes id="camel" xmlns="http://camel.apache.org/schema/spring";> +<routes id="camel" xmlns="http://camel.apache.org/schema/xml-io";> <route> <from uri="seda:a"/> <routingSlip> diff --git a/core/camel-xml-io/src/test/resources/saga.xml b/core/camel-xml-io/src/test/resources/saga.xml index 03412a85621..0ac00028695 100644 --- a/core/camel-xml-io/src/test/resources/saga.xml +++ b/core/camel-xml-io/src/test/resources/saga.xml @@ -17,7 +17,7 @@ limitations under the License. --> -<routes id="camel" xmlns="http://camel.apache.org/schema/spring";> +<routes id="camel" xmlns="http://camel.apache.org/schema/xml-io";> <route> <from uri="direct:start"/> <saga> diff --git a/core/camel-xml-io/src/test/resources/scan-route.xml b/core/camel-xml-io/src/test/resources/scan-route.xml index ccdb31c2191..8435cd00c0e 100644 --- a/core/camel-xml-io/src/test/resources/scan-route.xml +++ b/core/camel-xml-io/src/test/resources/scan-route.xml @@ -17,7 +17,7 @@ limitations under the License. --> -<routes id="camel" xmlns="http://camel.apache.org/schema/spring";> +<routes id="camel" xmlns="http://camel.apache.org/schema/xml-io";> <route> <from uri="direct:scan"/> <to uri="mock:scan"/> diff --git a/core/camel-xml-io/src/test/resources/script.xml b/core/camel-xml-io/src/test/resources/script.xml index 37b13387a3b..d9e6b2045e5 100644 --- a/core/camel-xml-io/src/test/resources/script.xml +++ b/core/camel-xml-io/src/test/resources/script.xml @@ -17,7 +17,7 @@ limitations under the License. --> -<routes id="camel" xmlns="http://camel.apache.org/schema/spring";> +<routes id="camel" xmlns="http://camel.apache.org/schema/xml-io";> <route> <from uri="direct:start"/> <script> diff --git a/core/camel-xml-io/src/test/resources/setBody.xml b/core/camel-xml-io/src/test/resources/setBody.xml index 715a9353d54..314076d9955 100644 --- a/core/camel-xml-io/src/test/resources/setBody.xml +++ b/core/camel-xml-io/src/test/resources/setBody.xml @@ -17,7 +17,7 @@ limitations under the License. --> -<routes id="camel" xmlns="http://camel.apache.org/schema/spring";> +<routes id="camel" xmlns="http://camel.apache.org/schema/xml-io";> <route> <from uri="direct:start"/> <setBody> diff --git a/core/camel-xml-io/src/test/resources/setHeader.xml b/core/camel-xml-io/src/test/resources/setHeader.xml index 6d364f49cb8..3961cc32c5f 100644 --- a/core/camel-xml-io/src/test/resources/setHeader.xml +++ b/core/camel-xml-io/src/test/resources/setHeader.xml @@ -17,7 +17,7 @@ limitations under the License. --> -<routes id="camel" xmlns="http://camel.apache.org/schema/spring";> +<routes id="camel" xmlns="http://camel.apache.org/schema/xml-io";> <route> <from uri="seda:a"/> <setHeader name="oldBodyValue"> diff --git a/core/camel-xml-io/src/test/resources/setHeaderToConstant.xml b/core/camel-xml-io/src/test/resources/setHeaderToConstant.xml index 24f5619209f..3e5a6c36f17 100644 --- a/core/camel-xml-io/src/test/resources/setHeaderToConstant.xml +++ b/core/camel-xml-io/src/test/resources/setHeaderToConstant.xml @@ -17,7 +17,7 @@ limitations under the License. --> -<routes id="camel" xmlns="http://camel.apache.org/schema/spring";> +<routes id="camel" xmlns="http://camel.apache.org/schema/xml-io";> <route> <from uri="seda:a"/> <setHeader name="theHeader"> diff --git a/core/camel-xml-io/src/test/resources/simpleRest.xml b/core/camel-xml-io/src/test/resources/simpleRest.xml index 072f611a36e..1ddd63c73c0 100644 --- a/core/camel-xml-io/src/test/resources/simpleRest.xml +++ b/core/camel-xml-io/src/test/resources/simpleRest.xml @@ -17,7 +17,7 @@ limitations under the License. --> -<rests xmlns="http://camel.apache.org/schema/spring";> +<rests xmlns="http://camel.apache.org/schema/xml-io";> <rest path="/users"> <get path="/view/{id}"> diff --git a/core/camel-xml-io/src/test/resources/simpleRoute.xml b/core/camel-xml-io/src/test/resources/simpleRoute.xml index 389ad212a9f..aafc1eccda8 100644 --- a/core/camel-xml-io/src/test/resources/simpleRoute.xml +++ b/core/camel-xml-io/src/test/resources/simpleRoute.xml @@ -17,7 +17,7 @@ limitations under the License. --> -<routes xmlns="http://camel.apache.org/schema/spring";> +<routes xmlns="http://camel.apache.org/schema/xml-io";> <!-- xsi:schemaLocation="http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd"; diff --git a/core/camel-xml-io/src/test/resources/splitter.xml b/core/camel-xml-io/src/test/resources/splitter.xml index 8165906855e..7499e43956b 100644 --- a/core/camel-xml-io/src/test/resources/splitter.xml +++ b/core/camel-xml-io/src/test/resources/splitter.xml @@ -17,7 +17,7 @@ limitations under the License. --> - <routes id="camel" xmlns="http://camel.apache.org/schema/spring";> + <routes id="camel" xmlns="http://camel.apache.org/schema/xml-io";> <route> <from uri="seda:a"/> <split> diff --git a/core/camel-xml-io/src/test/resources/convertBody.xml b/core/camel-xml-io/src/test/resources/spring/spring-convertBody.xml similarity index 100% copy from core/camel-xml-io/src/test/resources/convertBody.xml copy to core/camel-xml-io/src/test/resources/spring/spring-convertBody.xml diff --git a/core/camel-xml-io/src/test/resources/staticRecipientList.xml b/core/camel-xml-io/src/test/resources/staticRecipientList.xml index 6834b9ed019..2ca431e61c6 100644 --- a/core/camel-xml-io/src/test/resources/staticRecipientList.xml +++ b/core/camel-xml-io/src/test/resources/staticRecipientList.xml @@ -17,7 +17,7 @@ limitations under the License. --> -<routes id="camel" xmlns="http://camel.apache.org/schema/spring";> +<routes id="camel" xmlns="http://camel.apache.org/schema/xml-io";> <route> <from uri="seda:a"/> <to uri="seda:b"/> diff --git a/core/camel-xml-io/src/test/resources/transform.xml b/core/camel-xml-io/src/test/resources/transform.xml index 04bb16689b0..f986e382595 100644 --- a/core/camel-xml-io/src/test/resources/transform.xml +++ b/core/camel-xml-io/src/test/resources/transform.xml @@ -17,7 +17,7 @@ limitations under the License. --> -<routes id="camel" xmlns="http://camel.apache.org/schema/spring";> +<routes id="camel" xmlns="http://camel.apache.org/schema/xml-io";> <route> <from uri="direct:start"/> <transform>
