Support for camel-xml-io apache#847

lburgazzoli · Mar 5, 2020 · 8e667b4 · 8e667b4
1 parent 014697f
commit 8e667b4
Show file tree

Hide file tree

Showing 57 changed files with 1,029 additions and 120 deletions.
diff --git a/.github/workflows/pr-build.yaml b/.github/workflows/pr-build.yaml
@@ -113,7 +113,8 @@ jobs:
             -pl :camel-quarkus-integration-test-core-impl \
             -pl :camel-quarkus-integration-test-core-main \
             -pl :camel-quarkus-integration-test-core-main-collector \
-            -pl :camel-quarkus-integration-test-core-main-xml
+            -pl :camel-quarkus-integration-test-core-main-xml-jaxb \
+            -pl :camel-quarkus-integration-test-core-main-xml-io \
   foundation:
     runs-on: ubuntu-latest
     needs: build

diff --git a/docs/modules/ROOT/pages/list-of-camel-quarkus-extensions.adoc b/docs/modules/ROOT/pages/list-of-camel-quarkus-extensions.adoc
@@ -292,7 +292,7 @@ Number of Camel data formats: 19 in 15 JAR artifacts (0 deprecated)
 == Camel Languages
 
 // languages: START
-Number of Camel languages: 10 in 4 JAR artifacts (0 deprecated)
+Number of Camel languages: 11 in 5 JAR artifacts (0 deprecated)
 
 [width="100%",cols="4,1,5",options="header"]
 |===
@@ -316,14 +316,16 @@ Number of Camel languages: 10 in 4 JAR artifacts (0 deprecated)
 
 | link:https://camel.apache.org/components/latest/tokenize-language.html[Tokenize] (camel-quarkus-core) | 0.2.0 | To use Camel message body or header with a tokenizer in Camel expressions or predicates.
 
+| link:https://camel.apache.org/components/latest/xtokenize-language.html[XML Tokenize] (camel-quarkus-xml-jaxp) | 0.3.0 | To use Camel message body or header with a XML tokenizer in Camel expressions or predicates.
+
 | link:https://camel.apache.org/components/latest/xpath-language.html[XPath] (camel-quarkus-xpath) | 1.0.0-M4 | To use XPath (XML) in Camel expressions or predicates.
 |===
 // languages: END
 
 == Miscellaneous Extensions
 
 // others: START
-Number of miscellaneous extensions: 9 in 9 JAR artifacts (0 deprecated)
+Number of miscellaneous extensions: 10 in 10 JAR artifacts (0 deprecated)
 
 [width="100%",cols="4,1,5",options="header"]
 |===
@@ -333,8 +335,6 @@ Number of miscellaneous extensions: 9 in 9 JAR artifacts (0 deprecated)
 
 | (camel-quarkus-core-cloud) | 0.2.0 | The Camel Quarkus core cloud module
 
-| (camel-quarkus-core-xml) | 0.3.0 | Includes implementations of Java Architecture for XML Binding (JAXB) and Java API for XML Processing (JAXP)
-
 | (camel-quarkus-endpointdsl) | 1.0.0-M3 | camel-quarkus-endpointdsl
 
 | (camel-quarkus-hystrix) | 1.0.0-M1 | Circuit Breaker EIP using Netflix Hystrix
@@ -346,5 +346,9 @@ Number of miscellaneous extensions: 9 in 9 JAR artifacts (0 deprecated)
 | xref:extensions/opentracing.adoc[camel-quarkus-opentracing]  | 0.3.0 | Distributed tracing using OpenTracing
 
 | (camel-quarkus-reactive-executor) | 0.3.0 | Reactive Executor for camel-core using Vert.x
+
+| (camel-quarkus-xml-io) | 0.3.0 | Includes implementations of Camel's fast and lightweight XML parse
+
+| (camel-quarkus-xml-jaxb) | 0.3.0 | Includes implementations of Java Architecture for XML Binding (JAXB)
 |===
 // others: END
diff --git a/examples/file-split-log-xml/pom.xml b/examples/file-split-log-xml/pom.xml
@@ -26,14 +26,14 @@
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
- 
-   
+
+
 
     <artifactId>camel-quarkus-examples-file-log-xml</artifactId>
     <name>Camel Quarkus :: Examples :: File To Log XML DSL</name>
     <description>Camel Quarkus Example :: File To Log XML DSL</description>
 
-    
+
 
     <properties>
         <!-- mvnd, a.k.a. Maven Daemon: https://github.com/gnodet/mvnd -->
@@ -42,7 +42,7 @@
         <!-- explicit dependencies of this module in the Maven sense, although they are required by the Quarkus Maven plugin. -->
         <!-- Please update rule whenever you change the dependencies of this module by running -->
         <!--     mvn process-resources -Pformat    from the root directory -->
-        <mvnd.builder.rule>camel-quarkus-core-xml-deployment,camel-quarkus-file-deployment,camel-quarkus-log-deployment,camel-quarkus-support-policy-deployment,camel-quarkus-timer-deployment</mvnd.builder.rule>
+        <mvnd.builder.rule>camel-quarkus-xml-jaxb-deployment,camel-quarkus-file-deployment,camel-quarkus-log-deployment,camel-quarkus-support-policy-deployment,camel-quarkus-timer-deployment</mvnd.builder.rule>
     </properties>
 
     <dependencies>
@@ -56,7 +56,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.camel.quarkus</groupId>
-            <artifactId>camel-quarkus-core-xml</artifactId>
+            <artifactId>camel-quarkus-xml-jaxb</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.camel.quarkus</groupId>

diff --git a/examples/timer-log-xml/pom.xml b/examples/timer-log-xml/pom.xml
@@ -38,7 +38,7 @@
         <!-- explicit dependencies of this module in the Maven sense, although they are required by the Quarkus Maven plugin. -->
         <!-- Please update rule whenever you change the dependencies of this module by running -->
         <!--     mvn process-resources -Pformat    from the root directory -->
-        <mvnd.builder.rule>camel-quarkus-core-xml-deployment,camel-quarkus-log-deployment,camel-quarkus-support-policy-deployment,camel-quarkus-timer-deployment</mvnd.builder.rule>
+        <mvnd.builder.rule>camel-quarkus-xml-io-deployment,camel-quarkus-log-deployment,camel-quarkus-support-policy-deployment,camel-quarkus-timer-deployment</mvnd.builder.rule>
     </properties>
 
     <dependencies>
@@ -52,7 +52,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.camel.quarkus</groupId>
-            <artifactId>camel-quarkus-core-xml</artifactId>
+            <artifactId>camel-quarkus-xml-io</artifactId>
         </dependency>
     </dependencies>
 

diff --git a/examples/timer-log/pom.xml b/examples/timer-log/pom.xml
@@ -38,7 +38,7 @@
         <!-- explicit dependencies of this module in the Maven sense, although they are required by the Quarkus Maven plugin. -->
         <!-- Please update rule whenever you change the dependencies of this module by running -->
         <!--     mvn process-resources -Pformat    from the root directory -->
-        <mvnd.builder.rule>camel-quarkus-core-xml-deployment,camel-quarkus-log-deployment,camel-quarkus-support-policy-deployment,camel-quarkus-timer-deployment</mvnd.builder.rule>
+        <mvnd.builder.rule>camel-quarkus-xml-jaxb-deployment,camel-quarkus-log-deployment,camel-quarkus-support-policy-deployment,camel-quarkus-timer-deployment</mvnd.builder.rule>
     </properties>
 
     <dependencies>
@@ -52,7 +52,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.camel.quarkus</groupId>
-            <artifactId>camel-quarkus-core-xml</artifactId>
+            <artifactId>camel-quarkus-xml-jaxb</artifactId>
         </dependency>
 
     </dependencies>

diff --git a/.../runtime/src/main/java/org/apache/camel/quarkus/core/DisabledModelJAXBContextFactory.java b/.../runtime/src/main/java/org/apache/camel/quarkus/core/DisabledModelJAXBContextFactory.java
@@ -25,7 +25,7 @@ public class DisabledModelJAXBContextFactory implements ModelJAXBContextFactory
 
     @Override
     public JAXBContext newJAXBContext() throws JAXBException {
-        throw new UnsupportedOperationException("Please add a dependency to camel-quarkus-core-xml");
+        throw new UnsupportedOperationException("Please add a dependency to camel-quarkus-xml-jaxb");
     }
 
 }
diff --git a/...ns/core/runtime/src/main/java/org/apache/camel/quarkus/core/DisabledModelToXMLDumper.java b/...ns/core/runtime/src/main/java/org/apache/camel/quarkus/core/DisabledModelToXMLDumper.java
@@ -23,12 +23,12 @@
 public class DisabledModelToXMLDumper implements ModelToXMLDumper {
     @Override
     public String dumpModelAsXml(CamelContext context, NamedNode definition) throws Exception {
-        throw new UnsupportedOperationException("Please add a dependency to camel-quarkus-core-xml");
+        throw new UnsupportedOperationException("Please add a dependency to camel-quarkus-xml-jaxb");
     }
 
     @Override
     public String dumpModelAsXml(CamelContext context, NamedNode definition, boolean resolvePlaceholders,
             boolean resolveDelegateEndpoints) throws Exception {
-        throw new UnsupportedOperationException("Please add a dependency to camel-quarkus-core-xml");
+        throw new UnsupportedOperationException("Please add a dependency to camel-quarkus-xml-jaxb or camel-quarkus-xml-io");
     }
 }
diff --git a/...untime/src/main/java/org/apache/camel/quarkus/core/DisabledPredicateValidatorReifier.java b/...untime/src/main/java/org/apache/camel/quarkus/core/DisabledPredicateValidatorReifier.java
@@ -30,7 +30,7 @@ public DisabledPredicateValidatorReifier(CamelContext camelContext, ValidatorDef
 
     @Override
     protected Validator doCreateValidator() {
-        throw new UnsupportedOperationException("Please add a dependency to camel-quarkus-core-xml");
+        throw new UnsupportedOperationException("Please add a dependency to camel-quarkus-xml-jaxb or camel-quarkus-xml-io");
     }
 
 }
diff --git a/...ons/core/runtime/src/main/java/org/apache/camel/quarkus/core/DisabledValidateReifier.java b/...ons/core/runtime/src/main/java/org/apache/camel/quarkus/core/DisabledValidateReifier.java
@@ -30,6 +30,6 @@ public DisabledValidateReifier(RouteContext routeContext, ProcessorDefinition<?>
 
     @Override
     public Processor createProcessor() throws Exception {
-        throw new UnsupportedOperationException("Please add a dependency to camel-quarkus-core-xml");
+        throw new UnsupportedOperationException("Please add a dependency to camel-quarkus-xml-jaxb or camel-quarkus-xml-io");
     }
 }
diff --git a/...untime/src/main/java/org/apache/camel/quarkus/core/DisabledXMLRoutesDefinitionLoader.java b/...untime/src/main/java/org/apache/camel/quarkus/core/DisabledXMLRoutesDefinitionLoader.java
@@ -25,16 +25,16 @@
 public class DisabledXMLRoutesDefinitionLoader implements XMLRoutesDefinitionLoader {
     @Override
     public Object loadRoutesDefinition(CamelContext context, InputStream inputStream) throws Exception {
-        throw new UnsupportedOperationException("Please add a dependency to camel-quarkus-core-xml");
+        throw new UnsupportedOperationException("Please add a dependency to camel-quarkus-xml-jaxb or camel-quarkus-xml-io");
     }
 
     @Override
     public Object loadRestsDefinition(CamelContext context, InputStream inputStream) throws Exception {
-        throw new UnsupportedOperationException("Please add a dependency to camel-quarkus-core-xml");
+        throw new UnsupportedOperationException("Please add a dependency to camel-quarkus-xml-jaxb or camel-quarkus-xml-io");
     }
 
     @Override
     public <T extends NamedNode> T createModelFromXml(CamelContext context, String xml, Class<T> type) throws Exception {
-        throw new UnsupportedOperationException("Please add a dependency to camel-quarkus-core-xml");
+        throw new UnsupportedOperationException("Please add a dependency to camel-quarkus-xml-jaxb or camel-quarkus-xml-io");
     }
 }
diff --git a/extensions/jackson/deployment/pom.xml b/extensions/jackson/deployment/pom.xml
@@ -51,7 +51,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.camel.quarkus</groupId>
-            <artifactId>camel-quarkus-core-xml-deployment</artifactId>
+            <artifactId>camel-quarkus-xml-jaxb-deployment</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.camel.quarkus</groupId>

diff --git a/extensions/jackson/runtime/pom.xml b/extensions/jackson/runtime/pom.xml
@@ -51,7 +51,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.camel.quarkus</groupId>
-            <artifactId>camel-quarkus-core-xml</artifactId>
+            <artifactId>camel-quarkus-xml-jaxb</artifactId>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>

diff --git a/extensions/pom.xml b/extensions/pom.xml
@@ -38,9 +38,11 @@
         <!-- common/shared extensions -->
         <module>core</module>
         <module>core-cloud</module>
-        <module>core-xml</module>
         <module>http-common</module>
         <module>reactive-executor</module>
+        <module>xml-io</module>
+        <module>xml-jaxb</module>
+        <module>xml-jaxp</module>
 
         <!-- extensions a..z; do not remove this comment, it is important when sorting via  mvn process-resources -Pformat -->
         <module>ahc</module>

diff --git a/extensions/readme.adoc b/extensions/readme.adoc
@@ -281,7 +281,7 @@ Number of Camel data formats: 19 in 15 JAR artifacts (0 deprecated)
 == Camel Languages
 
 // languages: START
-Number of Camel languages: 10 in 4 JAR artifacts (0 deprecated)
+Number of Camel languages: 11 in 5 JAR artifacts (0 deprecated)
 
 [width="100%",cols="4,1,5",options="header"]
 |===
@@ -305,6 +305,8 @@ Number of Camel languages: 10 in 4 JAR artifacts (0 deprecated)
 
 | link:https://camel.apache.org/components/latest/tokenize-language.html[Tokenize] (camel-quarkus-core) | 0.2.0 | To use Camel message body or header with a tokenizer in Camel expressions or predicates.
 
+| link:https://camel.apache.org/components/latest/xtokenize-language.html[XML Tokenize] (camel-quarkus-xml-jaxp) | 0.3.0 | To use Camel message body or header with a XML tokenizer in Camel expressions or predicates.
+
 | link:https://camel.apache.org/components/latest/xpath-language.html[XPath] (camel-quarkus-xpath) | 1.0.0-M4 | To use XPath (XML) in Camel expressions or predicates.
 |===
 // languages: END
@@ -313,7 +315,7 @@ Number of Camel languages: 10 in 4 JAR artifacts (0 deprecated)
 == Miscellaneous Extensions
 
 // others: START
-Number of miscellaneous extensions: 9 in 9 JAR artifacts (0 deprecated)
+Number of miscellaneous extensions: 10 in 10 JAR artifacts (0 deprecated)
 
 [width="100%",cols="4,1,5",options="header"]
 |===
@@ -323,8 +325,6 @@ Number of miscellaneous extensions: 9 in 9 JAR artifacts (0 deprecated)
 
 | (camel-quarkus-core-cloud) | 0.2.0 | The Camel Quarkus core cloud module
 
-| (camel-quarkus-core-xml) | 0.3.0 | Includes implementations of Java Architecture for XML Binding (JAXB) and Java API for XML Processing (JAXP)
-
 | (camel-quarkus-endpointdsl) | 1.0.0-M3 | camel-quarkus-endpointdsl
 
 | (camel-quarkus-hystrix) | 1.0.0-M1 | Circuit Breaker EIP using Netflix Hystrix
@@ -336,6 +336,10 @@ Number of miscellaneous extensions: 9 in 9 JAR artifacts (0 deprecated)
 | xref:extensions/opentracing.adoc[camel-quarkus-opentracing]  | 0.3.0 | Distributed tracing using OpenTracing
 
 | (camel-quarkus-reactive-executor) | 0.3.0 | Reactive Executor for camel-core using Vert.x
+
+| (camel-quarkus-xml-io) | 0.3.0 | Includes implementations of Camel's fast and lightweight XML parse
+
+| (camel-quarkus-xml-jaxb) | 0.3.0 | Includes implementations of Java Architecture for XML Binding (JAXB)
 |===
 // others: END
 
diff --git a/extensions/support/xml/deployment/pom.xml b/extensions/support/xml/deployment/pom.xml
@@ -45,10 +45,6 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-core-deployment</artifactId>
         </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-jaxb-deployment</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.apache.camel.quarkus</groupId>
             <artifactId>camel-quarkus-support-xml</artifactId>

diff --git a/extensions/support/xml/runtime/pom.xml b/extensions/support/xml/runtime/pom.xml
@@ -45,15 +45,6 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-core</artifactId>
         </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-jaxb</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.camel</groupId>
-            <artifactId>camel-xml-jaxp</artifactId>
-        </dependency>
     </dependencies>
 
     <build>

diff --git a/extensions/tagsoup/deployment/pom.xml b/extensions/tagsoup/deployment/pom.xml
@@ -48,7 +48,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.camel.quarkus</groupId>
-            <artifactId>camel-quarkus-core-xml-deployment</artifactId>
+            <artifactId>camel-quarkus-xml-jaxb-deployment</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.camel.quarkus</groupId>

diff --git a/extensions/tagsoup/runtime/pom.xml b/extensions/tagsoup/runtime/pom.xml
@@ -52,7 +52,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.camel.quarkus</groupId>
-            <artifactId>camel-quarkus-core-xml</artifactId>
+            <artifactId>camel-quarkus-xml-jaxb</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.camel.quarkus</groupId>

diff --git a/extensions/xml-io/deployment/pom.xml b/extensions/xml-io/deployment/pom.xml
@@ -0,0 +1,73 @@
+<?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.
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.camel.quarkus</groupId>
+        <artifactId>camel-quarkus-xml-io-parent</artifactId>
+        <version>1.1.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>camel-quarkus-xml-io-deployment</artifactId>
+    <name>Camel Quarkus :: XML :: Io :: Deployment</name>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.apache.camel.quarkus</groupId>
+                <artifactId>camel-quarkus-bom-deployment</artifactId>
+                <version>${project.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.camel.quarkus</groupId>
+            <artifactId>camel-quarkus-core-deployment</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.camel.quarkus</groupId>
+            <artifactId>camel-quarkus-xml-io</artifactId>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>io.quarkus</groupId>
+                            <artifactId>quarkus-extension-processor</artifactId>
+                            <version>${quarkus.version}</version>
+                        </path>
+                    </annotationProcessorPaths>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>