Improve XML support

docs/modules/ROOT/pages/list-of-camel-quarkus-extensions.adoc

@@ -130,7 +130,7 @@ Number of Camel languages: 8 in 2 JAR artifacts (0 deprecated)
 == Miscellaneous Extensions
 
 // others: START
-Number of miscellaneous extensions: 5 in 5 JAR artifacts (0 deprecated)
+Number of miscellaneous extensions: 6 in 6 JAR artifacts (0 deprecated)
 
 [width="100%",cols="4,1,5",options="header"]
 |===
@@ -142,6 +142,8 @@ Number of miscellaneous extensions: 5 in 5 JAR artifacts (0 deprecated)
 
 | (camel-quarkus-reactive-executor) | 0.2.1 | To use Quarkus reactive executor with Camel
 
+| (camel-quarkus-core-xml) | 0.2 | Maven plugins configuration
+
 | xref:extensions/microprofile-health.adoc[camel-quarkus-microprofile-health]  | 0.2.1 | Integration with the Quarkus MicroProfile Health extension
 
 | xref:extensions/opentracing.adoc[camel-quarkus-opentracing]  | 0.2.1 | Distributed tracing using OpenTracing

extensions/aws-eks/deployment/pom.xml

@@ -47,7 +47,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.camel.quarkus</groupId>
-            <artifactId>camel-quarkus-xml-common-deployment</artifactId>
+            <artifactId>camel-quarkus-support-xml-deployment</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.camel.quarkus</groupId>

extensions/aws-eks/runtime/pom.xml

@@ -51,7 +51,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.camel.quarkus</groupId>
-            <artifactId>camel-quarkus-xml-common</artifactId>
+            <artifactId>camel-quarkus-support-xml</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.camel</groupId>

extensions/aws-s3/deployment/pom.xml

@@ -47,7 +47,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.camel.quarkus</groupId>
-            <artifactId>camel-quarkus-xml-common-deployment</artifactId>
+            <artifactId>camel-quarkus-support-xml-deployment</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.camel.quarkus</groupId>

extensions/aws-s3/runtime/pom.xml

@@ -51,7 +51,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.camel.quarkus</groupId>
-            <artifactId>camel-quarkus-xml-common</artifactId>
+            <artifactId>camel-quarkus-support-xml</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.camel</groupId>

extensions/aws-sns/deployment/pom.xml

@@ -47,7 +47,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.camel.quarkus</groupId>
-            <artifactId>camel-quarkus-xml-common-deployment</artifactId>
+            <artifactId>camel-quarkus-support-xml-deployment</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.camel.quarkus</groupId>

extensions/aws-sns/runtime/pom.xml

@@ -51,7 +51,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.camel.quarkus</groupId>
-            <artifactId>camel-quarkus-xml-common</artifactId>
+            <artifactId>camel-quarkus-support-xml</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.camel</groupId>

extensions/aws-sqs/deployment/pom.xml

@@ -47,7 +47,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.camel.quarkus</groupId>
-            <artifactId>camel-quarkus-xml-common-deployment</artifactId>
+            <artifactId>camel-quarkus-support-xml-deployment</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.camel.quarkus</groupId>

extensions/aws-sqs/runtime/pom.xml

@@ -51,7 +51,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.camel.quarkus</groupId>
-            <artifactId>camel-quarkus-xml-common</artifactId>
+            <artifactId>camel-quarkus-support-xml</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.camel</groupId>

extensions/xml-common/deployment/pom.xml → extensions/core-xml/deployment/pom.xml

@@ -21,13 +21,13 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.camel.quarkus</groupId>
-        <artifactId>camel-quarkus-xml-common-parent</artifactId>
+        <artifactId>camel-quarkus-core-xml-parent</artifactId>
         <version>0.2.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <artifactId>camel-quarkus-xml-common-deployment</artifactId>
-    <name>Camel Quarkus :: XML :: Common :: Deployment</name>
+    <artifactId>camel-quarkus-core-xml-deployment</artifactId>
+    <name>Camel Quarkus :: Core :: XML :: Deployment</name>
 
     <dependencyManagement>
         <dependencies>
@@ -47,12 +47,16 @@
             <artifactId>camel-quarkus-core-deployment</artifactId>
         </dependency>
         <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-jaxb-deployment</artifactId>
+            <groupId>org.apache.camel.quarkus</groupId>
+            <artifactId>camel-quarkus-core-xml</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.camel.quarkus</groupId>
-            <artifactId>camel-quarkus-xml-common</artifactId>
+            <artifactId>camel-quarkus-support-xml-deployment</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-jaxb-deployment</artifactId>
         </dependency>
     </dependencies>
 

extensions/xml-common/deployment/src/main/java/org/apache/camel/quarkus/component/xml/deployment/XmlProcessor.java → extensions/core-xml/deployment/src/main/java/org/apache/camel/quarkus/component/xml/deployment/XmlProcessor.java

@@ -16,14 +16,11 @@
  */
 package org.apache.camel.quarkus.component.xml.deployment;
 
-import io.quarkus.deployment.annotations.BuildProducer;
 import io.quarkus.deployment.annotations.BuildStep;
 import io.quarkus.deployment.annotations.ExecutionTime;
 import io.quarkus.deployment.annotations.Record;
 import io.quarkus.deployment.builditem.FeatureBuildItem;
-import io.quarkus.deployment.builditem.substrate.ReflectiveClassBuildItem;
 import io.quarkus.jaxb.deployment.JaxbFileRootBuildItem;
-import org.apache.camel.converter.jaxp.XmlConverter;
 import org.apache.camel.quarkus.component.xml.XmlRecorder;
 import org.apache.camel.quarkus.core.deployment.CamelModelJAXBContextFactoryBuildItem;
 import org.apache.camel.quarkus.core.deployment.CamelRoutesCollectorBuildItem;
@@ -67,23 +64,4 @@ public CamelRoutesCollectorBuildItem routesCollector(XmlRecorder recorder) {
     void initXmlReifiers(XmlRecorder recorder) {
         recorder.initXmlReifiers();
     }
-
-    @BuildStep
-    void reflective(BuildProducer<ReflectiveClassBuildItem> reflectiveClass) {
-        reflectiveClass.produce(new ReflectiveClassBuildItem(false, false,
-            "com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderFactoryImpl",
-            "com.sun.org.apache.xalan.internal.xsltc.trax.TransformerFactoryImpl",
-            "com.sun.org.apache.xerces.internal.jaxp.SAXParserFactoryImpl",
-            "com.sun.xml.internal.stream.XMLInputFactoryImpl",
-            "com.sun.org.apache.xerces.internal.parsers.SAXParser",
-            XmlConverter.class.getCanonicalName()));
-
-        // javax.xml.namespace.QName is needed as it is used as part of the processor
-        // definitions in the DSL and parsers like Jackson (used in camel-k YAML DSL)
-        // fails if this class is cannot be instantiated reflectively.
-        reflectiveClass.produce(
-            new ReflectiveClassBuildItem(true, false, "javax.xml.namespace.QName")
-        );
-    }
-
 }

extensions/xml-common/pom.xml → extensions/core-xml/pom.xml

@@ -26,8 +26,8 @@
         <relativePath>../../poms/build-parent/pom.xml</relativePath>
     </parent>
 
-    <artifactId>camel-quarkus-xml-common-parent</artifactId>
-    <name>Camel Quarkus :: XML :: Common</name>
+    <artifactId>camel-quarkus-core-xml-parent</artifactId>
+    <name>Camel Quarkus :: Core :: XML</name>
     <packaging>pom</packaging>
 
     <modules>

extensions/xml-common/runtime/pom.xml → extensions/core-xml/runtime/pom.xml

@@ -21,13 +21,13 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.camel.quarkus</groupId>
-        <artifactId>camel-quarkus-xml-common-parent</artifactId>
+        <artifactId>camel-quarkus-core-xml-parent</artifactId>
         <version>0.2.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <artifactId>camel-quarkus-xml-common</artifactId>
-    <name>Camel Quarkus :: XML :: Common :: Runtime</name>
+    <artifactId>camel-quarkus-core-xml</artifactId>
+    <name>Camel Quarkus :: Core :: XML :: Runtime</name>
 
     <dependencyManagement>
         <dependencies>
@@ -47,14 +47,12 @@
             <artifactId>camel-quarkus-core</artifactId>
         </dependency>
         <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-jaxb</artifactId>
+            <groupId>org.apache.camel.quarkus</groupId>
+            <artifactId>camel-quarkus-support-xml</artifactId>
         </dependency>
-
-        <!-- camel -->
         <dependency>
-            <groupId>org.apache.camel</groupId>
-            <artifactId>camel-jaxp</artifactId>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-jaxb</artifactId>
         </dependency>
     </dependencies>
 

extensions/core/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-xml-common");
+        throw new UnsupportedOperationException("Please add a dependency to camel-quarkus-core-xml");
     }
 
 }

extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/DisabledPredicateValidatorReifier.java

@@ -30,7 +30,7 @@ public DisabledPredicateValidatorReifier(ValidatorDefinition definition) {
 
     @Override
     protected Validator doCreateValidator(CamelContext context) throws Exception {
-        throw new UnsupportedOperationException("Please add a dependency to camel-quarkus-xml-common");
+        throw new UnsupportedOperationException("Please add a dependency to camel-quarkus-core-xml");
     }
 
 }

extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/DisabledValidateReifier.java

@@ -30,6 +30,6 @@ public DisabledValidateReifier(ProcessorDefinition<?> definition) {
 
     @Override
     public Processor createProcessor(RouteContext routeContext) throws Exception {
-        throw new UnsupportedOperationException("Please add a dependency to camel-quarkus-xml-common");
+        throw new UnsupportedOperationException("Please add a dependency to camel-quarkus-core-xml");
     }
 }

extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/DisabledXmlLoader.java

@@ -26,12 +26,12 @@ public class DisabledXmlLoader implements XmlLoader {
 
     @Override
     public RoutesDefinition loadRoutesDefinition(CamelContext context, InputStream inputStream) throws Exception {
-        throw new UnsupportedOperationException("Please add a dependency to camel-quarkus-xml-common");
+        throw new UnsupportedOperationException("Please add a dependency to camel-quarkus-core-xml");
     }
 
     @Override
     public RestsDefinition loadRestsDefinition(CamelContext context, InputStream is) throws Exception {
-        throw new UnsupportedOperationException("Please add a dependency to camel-quarkus-xml-common");
+        throw new UnsupportedOperationException("Please add a dependency to camel-quarkus-core-xml");
     }
 
 }

extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/DisabledXmlRoutesCollector.java

@@ -27,11 +27,11 @@ public class DisabledXmlRoutesCollector extends DefaultRoutesCollector {
 
     @Override
     public List<RoutesDefinition> collectXmlRoutesFromDirectory(CamelContext camelContext, String directory) {
-        throw new UnsupportedOperationException("Please add a dependency to camel-quarkus-xml-common");
+        throw new UnsupportedOperationException("Please add a dependency to camel-quarkus-core-xml");
     }
 
     @Override
     public List<RestsDefinition> collectXmlRestsFromDirectory(CamelContext camelContext, String directory) {
-        throw new UnsupportedOperationException("Please add a dependency to camel-quarkus-xml-common");
+        throw new UnsupportedOperationException("Please add a dependency to camel-quarkus-core-xml");
     }
 }

extensions/pom.xml

@@ -36,9 +36,9 @@
         <module>support</module>
 
         <!-- common/shared extensions -->
-        <module>xml-common</module>
         <module>core</module>
         <module>core-cloud</module>
+        <module>core-xml</module>
         <module>http-common</module>
         <module>reactive-executor</module>
 

extensions/readme.adoc

@@ -132,7 +132,7 @@ Number of Camel languages: 8 in 2 JAR artifacts (0 deprecated)
 == Miscellaneous Extensions
 
 // others: START
-Number of miscellaneous extensions: 5 in 5 JAR artifacts (0 deprecated)
+Number of miscellaneous extensions: 6 in 6 JAR artifacts (0 deprecated)
 
 [width="100%",cols="4,1,5",options="header"]
 |===
@@ -144,6 +144,8 @@ Number of miscellaneous extensions: 5 in 5 JAR artifacts (0 deprecated)
 
 | (camel-quarkus-reactive-executor) | 0.2.1 | To use Quarkus reactive executor with Camel
 
+| (camel-quarkus-core-xml) | 0.2 | Maven plugins configuration
+
 | xref:extensions/microprofile-health.adoc[camel-quarkus-microprofile-health]  | 0.2.1 | Integration with the Quarkus MicroProfile Health extension
 
 | xref:extensions/opentracing.adoc[camel-quarkus-opentracing]  | 0.2.1 | Distributed tracing using OpenTracing

extensions/support/common/deployment/src/main/java/org/apache/camel/quarkus/support/common/deployment/CommonSupportFeature.java

@@ -0,0 +1,29 @@
+/*
+ * 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.quarkus.support.common.deployment;
+
+import io.quarkus.deployment.annotations.BuildStep;
+import io.quarkus.deployment.builditem.FeatureBuildItem;
+
+public class CommonSupportFeature {
+    private static final String FEATURE = "camel-support-common";
+
+    @BuildStep
+    FeatureBuildItem feature() {
+        return new FeatureBuildItem(FEATURE);
+    }
+}

extensions/support/common/runtime/src/main/java/org/apache/camel/quarkus/common/runtime/graal/SubstituteBeansIntrospector.java → extensions/support/common/runtime/src/main/java/org/apache/camel/quarkus/support/common/runtime/graal/SubstituteBeansIntrospector.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.camel.quarkus.common.runtime.graal;
+package org.apache.camel.quarkus.support.common.runtime.graal;
 
 import java.lang.reflect.Method;
 

extensions/support/common/runtime/src/main/java/org/apache/camel/quarkus/common/runtime/graal/SubstituteBeansWeakCache.java → extensions/support/common/runtime/src/main/java/org/apache/camel/quarkus/support/common/runtime/graal/SubstituteBeansWeakCache.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.camel.quarkus.common.runtime.graal;
+package org.apache.camel.quarkus.support.common.runtime.graal;
 
 import java.lang.ref.Reference;
 import java.lang.ref.WeakReference;

extensions/support/jetty/deployment/src/main/java/org/apache/camel/quarkus/support/jetty/deployment/JettySupportFeature.java

@@ -0,0 +1,29 @@
+/*
+ * 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.quarkus.support.jetty.deployment;
+
+import io.quarkus.deployment.annotations.BuildStep;
+import io.quarkus.deployment.builditem.FeatureBuildItem;
+
+public class JettySupportFeature {
+    private static final String FEATURE = "camel-support-jetty";
+
+    @BuildStep
+    FeatureBuildItem feature() {
+        return new FeatureBuildItem(FEATURE);
+    }
+}

extensions/support/jetty/deployment/src/main/java/org/apache/camel/quarkus/jetty/common/deployment/JettyProcessor.java → extensions/support/jetty/deployment/src/main/java/org/apache/camel/quarkus/support/jetty/deployment/JettySupportProcessor.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.camel.quarkus.jetty.common.deployment;
+package org.apache.camel.quarkus.support.jetty.deployment;
 
 import java.util.Arrays;
 import java.util.List;
@@ -25,7 +25,7 @@
 import org.eclipse.jetty.client.HttpClient;
 import org.eclipse.jetty.client.ProtocolHandlers;
 
-class JettyProcessor {
+class JettySupportProcessor {
     private static final List<Class<?>> JETTY_REFLECTIVE_CLASSES = Arrays.asList(
         HttpClient.class,
         ProtocolHandlers.class

extensions/support/pom.xml

@@ -35,5 +35,6 @@
         <module>common</module>
         <module>jetty</module>
         <module>xstream</module>
+        <module>xml</module>
     </modules>
 </project>