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 aa81699d49dc3c0a4ceba614f68835c976cdd67f Author: Claus Ibsen <[email protected]> AuthorDate: Thu May 15 10:08:03 2025 +0200 CAMEL-22064: camel-xml-io - Generate XSD schema --- .../src/main/java/org/apache/camel/dsl/xml/io/XmlModelParser.java | 4 ++-- .../src/test/java/org/apache/camel/dsl/xml/io/XmlLoadAppTest.java | 2 -- .../test/java/org/apache/camel/dsl/xml/io/XmlSpringBeansLoadTest.java | 2 -- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/dsl/camel-xml-io-dsl/src/main/java/org/apache/camel/dsl/xml/io/XmlModelParser.java b/dsl/camel-xml-io-dsl/src/main/java/org/apache/camel/dsl/xml/io/XmlModelParser.java index 13c5c49c3ef..c01ef8438ab 100644 --- a/dsl/camel-xml-io-dsl/src/main/java/org/apache/camel/dsl/xml/io/XmlModelParser.java +++ b/dsl/camel-xml-io-dsl/src/main/java/org/apache/camel/dsl/xml/io/XmlModelParser.java @@ -25,7 +25,7 @@ import org.apache.camel.xml.io.XmlPullParserException; /** * XML {@link ModelParser} that supports loading: * <ul> - * <li>Standard Camel XML DSL</li> + * <li>Standard Camel XML DSL (xml-io)</li> * <li>Classic Spring XML <beans> with embedded <camelContext> (limited parsing, to discover <routes> inside * <camelContext>)</li> * <li>Legacy OSGi <blueprint> with embedded <camelContext> (limited parsing, to discover <routes> inside @@ -34,7 +34,7 @@ import org.apache.camel.xml.io.XmlPullParserException; */ public class XmlModelParser extends ModelParser { - private static final String SPRING_NS = "http://camel.apache.org/schema/xml-io";; + private static final String SPRING_NS = "http://camel.apache.org/schema/spring";; private static final String BLUEPRINT_NS = "http://camel.apache.org/schema/blueprint";; public XmlModelParser(Resource input, String namespace) throws IOException, XmlPullParserException { 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 709b2d0a43d..f93b75a7b77 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 @@ -30,7 +30,6 @@ import org.apache.camel.spi.RestConfiguration; import org.apache.camel.spi.RoutesLoader; import org.apache.camel.support.PluginHelper; import org.apache.commons.codec.binary.Base64; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -365,7 +364,6 @@ public class XmlLoadAppTest { } @Test - @Disabled("CAMEL-22066") public void testLoadAppWithDataFormatSpring() throws Exception { try (DefaultCamelContext context = new DefaultCamelContext()) { context.start(); diff --git a/dsl/camel-xml-io-dsl/src/test/java/org/apache/camel/dsl/xml/io/XmlSpringBeansLoadTest.java b/dsl/camel-xml-io-dsl/src/test/java/org/apache/camel/dsl/xml/io/XmlSpringBeansLoadTest.java index ec99a3156a4..c5f7ba6b226 100644 --- a/dsl/camel-xml-io-dsl/src/test/java/org/apache/camel/dsl/xml/io/XmlSpringBeansLoadTest.java +++ b/dsl/camel-xml-io-dsl/src/test/java/org/apache/camel/dsl/xml/io/XmlSpringBeansLoadTest.java @@ -20,13 +20,11 @@ import org.apache.camel.impl.DefaultCamelContext; import org.apache.camel.spi.Resource; import org.apache.camel.support.PluginHelper; import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; public class XmlSpringBeansLoadTest { @Test - @Disabled("CAMEL-22066") public void testLoadRoutesBuilderFromXml() throws Exception { try (DefaultCamelContext context = new DefaultCamelContext()) { // load spring XML <beans> with embedded <camelContext>
