You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by lb...@apache.org on 2019/10/21 17:21:25 UTC
[camel-quarkus] branch master updated (cf932ee -> 64cbae2)
This is an automated email from the ASF dual-hosted git repository.
lburgazzoli pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git.
from cf932ee Enable PlatformHttpTest.invalidMethod() https://github.com/quarkusio/quarkus/issues/4408 seems to be fixed as of Quarkus 0.25
new d261750 Rename xml-common extension to core-xml #292
new f9b20ba Add a support/xml artifact for common substrate support #294
new 11636be chore: re-organize support extensions
new 64cbae2 chore: delete wrong extension metadata file
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../pages/list-of-camel-quarkus-extensions.adoc | 4 +-
extensions/aws-eks/deployment/pom.xml | 2 +-
extensions/aws-eks/runtime/pom.xml | 2 +-
extensions/aws-s3/deployment/pom.xml | 2 +-
extensions/aws-s3/runtime/pom.xml | 2 +-
extensions/aws-sns/deployment/pom.xml | 2 +-
extensions/aws-sns/runtime/pom.xml | 2 +-
extensions/aws-sqs/deployment/pom.xml | 2 +-
extensions/aws-sqs/runtime/pom.xml | 2 +-
.../{xml-common => core-xml}/deployment/pom.xml | 16 ++++---
.../component/xml/deployment/XmlProcessor.java | 22 ---------
extensions/{aws-sns => core-xml}/pom.xml | 10 ++--
.../{xml-common => core-xml}/runtime/pom.xml | 16 +++----
.../quarkus/component/xml/DefaultXmlLoader.java | 0
.../camel/quarkus/component/xml/XmlRecorder.java | 0
.../main/resources/META-INF/quarkus-extension.json | 0
.../core/DisabledModelJAXBContextFactory.java | 2 +-
.../core/DisabledPredicateValidatorReifier.java | 2 +-
.../quarkus/core/DisabledValidateReifier.java | 2 +-
.../camel/quarkus/core/DisabledXmlLoader.java | 4 +-
.../quarkus/core/DisabledXmlRoutesCollector.java | 4 +-
extensions/pom.xml | 2 +-
extensions/readme.adoc | 4 +-
.../common/deployment/CommonSupportFeature.java} | 7 ++-
.../runtime/graal/SubstituteBeansIntrospector.java | 2 +-
.../runtime/graal/SubstituteBeansWeakCache.java | 2 +-
.../jetty/deployment/JettySupportFeature.java} | 8 ++--
.../jetty/deployment/JettySupportProcessor.java} | 4 +-
extensions/support/pom.xml | 1 +
.../main/resources/META-INF/quarkus-extension.json | 1 -
.../support/{common => xml}/deployment/pom.xml | 8 ++--
.../support/xml/deployment/XmlSupportFeature.java} | 6 +--
.../xml/deployment/XmlSupportProcessor.java | 53 ++++++++++++++++++++++
extensions/support/{jetty => xml}/pom.xml | 4 +-
extensions/support/{common => xml}/runtime/pom.xml | 14 +++---
.../xstream/deployment/XStreamSupportFeature.java} | 6 +--
.../deployment/XStreamSupportProcessor.java} | 4 +-
extensions/xml-common/pom.xml | 37 ---------------
integration-tests/core-main/test/pom.xml | 2 +-
pom.xml | 2 +-
poms/bom-deployment/pom.xml | 15 ++++--
poms/bom/pom.xml | 9 +++-
.../quarkus/maven/PrepareCatalogQuarkusMojo.java | 2 +-
43 files changed, 148 insertions(+), 143 deletions(-)
rename extensions/{xml-common => core-xml}/deployment/pom.xml (86%)
rename extensions/{xml-common => core-xml}/deployment/src/main/java/org/apache/camel/quarkus/component/xml/deployment/XmlProcessor.java (70%)
copy extensions/{aws-sns => core-xml}/pom.xml (93%)
rename extensions/{xml-common => core-xml}/runtime/pom.xml (90%)
rename extensions/{xml-common => core-xml}/runtime/src/main/java/org/apache/camel/quarkus/component/xml/DefaultXmlLoader.java (100%)
rename extensions/{xml-common => core-xml}/runtime/src/main/java/org/apache/camel/quarkus/component/xml/XmlRecorder.java (100%)
rename extensions/{xml-common => core-xml}/runtime/src/main/resources/META-INF/quarkus-extension.json (100%)
copy extensions/{netty-http/deployment/src/main/java/org/apache/camel/quarkus/component/netty/http/deployment/NettyHTTPProcessor.java => support/common/deployment/src/main/java/org/apache/camel/quarkus/support/common/deployment/CommonSupportFeature.java} (86%)
rename extensions/support/common/runtime/src/main/java/org/apache/camel/quarkus/{ => support}/common/runtime/graal/SubstituteBeansIntrospector.java (95%)
rename extensions/support/common/runtime/src/main/java/org/apache/camel/quarkus/{ => support}/common/runtime/graal/SubstituteBeansWeakCache.java (96%)
copy extensions/{direct/deployment/src/main/java/org/apache/camel/quarkus/component/direct/deployment/DirectProcessor.java => support/jetty/deployment/src/main/java/org/apache/camel/quarkus/support/jetty/deployment/JettySupportFeature.java} (86%)
rename extensions/support/jetty/deployment/src/main/java/org/apache/camel/quarkus/{jetty/common/deployment/JettyProcessor.java => support/jetty/deployment/JettySupportProcessor.java} (94%)
delete mode 100644 extensions/support/runtime/src/main/resources/META-INF/quarkus-extension.json
copy extensions/support/{common => xml}/deployment/pom.xml (90%)
copy extensions/{core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/Feature.java => support/xml/deployment/src/main/java/org/apache/camel/quarkus/support/xml/deployment/XmlSupportFeature.java} (86%)
create mode 100644 extensions/support/xml/deployment/src/main/java/org/apache/camel/quarkus/support/xml/deployment/XmlSupportProcessor.java
copy extensions/support/{jetty => xml}/pom.xml (92%)
copy extensions/support/{common => xml}/runtime/pom.xml (87%)
copy extensions/{core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/Feature.java => support/xstream/deployment/src/main/java/org/apache/camel/quarkus/support/xstream/deployment/XStreamSupportFeature.java} (86%)
rename extensions/support/xstream/deployment/src/main/java/org/apache/camel/quarkus/{xstream/common/deployment/XStreamProcessor.java => support/xstream/deployment/XStreamSupportProcessor.java} (99%)
delete mode 100644 extensions/xml-common/pom.xml
[camel-quarkus] 01/04: Rename xml-common extension to core-xml #292
Posted by lb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lburgazzoli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit d26175001188d07b49c50da02337bf379891fc7f
Author: lburgazzoli <lb...@gmail.com>
AuthorDate: Mon Oct 21 12:42:05 2019 +0200
Rename xml-common extension to core-xml #292
---
.../ROOT/pages/list-of-camel-quarkus-extensions.adoc | 4 +++-
extensions/aws-eks/deployment/pom.xml | 2 +-
extensions/aws-eks/runtime/pom.xml | 2 +-
extensions/aws-s3/deployment/pom.xml | 2 +-
extensions/aws-s3/runtime/pom.xml | 2 +-
extensions/aws-sns/deployment/pom.xml | 2 +-
extensions/aws-sns/runtime/pom.xml | 2 +-
extensions/aws-sqs/deployment/pom.xml | 2 +-
extensions/aws-sqs/runtime/pom.xml | 2 +-
extensions/{xml-common => core-xml}/deployment/pom.xml | 14 +++++++-------
.../quarkus/component/xml/deployment/XmlProcessor.java | 0
extensions/{xml-common => core-xml}/pom.xml | 4 ++--
extensions/{xml-common => core-xml}/runtime/pom.xml | 12 +++---------
.../camel/quarkus/component/xml/DefaultXmlLoader.java | 0
.../apache/camel/quarkus/component/xml/XmlRecorder.java | 0
.../src/main/resources/META-INF/quarkus-extension.json | 0
.../quarkus/core/DisabledModelJAXBContextFactory.java | 2 +-
.../quarkus/core/DisabledPredicateValidatorReifier.java | 2 +-
.../apache/camel/quarkus/core/DisabledValidateReifier.java | 2 +-
.../org/apache/camel/quarkus/core/DisabledXmlLoader.java | 4 ++--
.../camel/quarkus/core/DisabledXmlRoutesCollector.java | 4 ++--
extensions/pom.xml | 2 +-
extensions/readme.adoc | 4 +++-
integration-tests/core-main/test/pom.xml | 2 +-
pom.xml | 2 +-
poms/bom-deployment/pom.xml | 10 +++++-----
poms/bom/pom.xml | 4 ++--
.../camel/quarkus/maven/PrepareCatalogQuarkusMojo.java | 2 +-
28 files changed, 44 insertions(+), 46 deletions(-)
diff --git a/docs/modules/ROOT/pages/list-of-camel-quarkus-extensions.adoc b/docs/modules/ROOT/pages/list-of-camel-quarkus-extensions.adoc
index a72534c..389e8b7 100644
--- a/docs/modules/ROOT/pages/list-of-camel-quarkus-extensions.adoc
+++ b/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
diff --git a/extensions/aws-eks/deployment/pom.xml b/extensions/aws-eks/deployment/pom.xml
index 4dd6824..6e53b8f 100644
--- a/extensions/aws-eks/deployment/pom.xml
+++ b/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-core-xml-deployment</artifactId>
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
diff --git a/extensions/aws-eks/runtime/pom.xml b/extensions/aws-eks/runtime/pom.xml
index 7835957..49e22c5 100644
--- a/extensions/aws-eks/runtime/pom.xml
+++ b/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-core-xml</artifactId>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
diff --git a/extensions/aws-s3/deployment/pom.xml b/extensions/aws-s3/deployment/pom.xml
index 3810b81..4ab1b6c 100644
--- a/extensions/aws-s3/deployment/pom.xml
+++ b/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-core-xml-deployment</artifactId>
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
diff --git a/extensions/aws-s3/runtime/pom.xml b/extensions/aws-s3/runtime/pom.xml
index cab552b..d759998 100644
--- a/extensions/aws-s3/runtime/pom.xml
+++ b/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-core-xml</artifactId>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
diff --git a/extensions/aws-sns/deployment/pom.xml b/extensions/aws-sns/deployment/pom.xml
index f7a0b56..4b40f6b 100644
--- a/extensions/aws-sns/deployment/pom.xml
+++ b/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-core-xml-deployment</artifactId>
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
diff --git a/extensions/aws-sns/runtime/pom.xml b/extensions/aws-sns/runtime/pom.xml
index 8ddffaa..226100d 100644
--- a/extensions/aws-sns/runtime/pom.xml
+++ b/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-core-xml</artifactId>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
diff --git a/extensions/aws-sqs/deployment/pom.xml b/extensions/aws-sqs/deployment/pom.xml
index 521a2ba..301a76e 100644
--- a/extensions/aws-sqs/deployment/pom.xml
+++ b/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-core-xml-deployment</artifactId>
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
diff --git a/extensions/aws-sqs/runtime/pom.xml b/extensions/aws-sqs/runtime/pom.xml
index f8e1f69..310ff38 100644
--- a/extensions/aws-sqs/runtime/pom.xml
+++ b/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-core-xml</artifactId>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
diff --git a/extensions/xml-common/deployment/pom.xml b/extensions/core-xml/deployment/pom.xml
similarity index 91%
rename from extensions/xml-common/deployment/pom.xml
rename to extensions/core-xml/deployment/pom.xml
index 21b69ba..2c2c45c 100644
--- a/extensions/xml-common/deployment/pom.xml
+++ b/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,12 @@
<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>
+ <groupId>io.quarkus</groupId>
+ <artifactId>quarkus-jaxb-deployment</artifactId>
</dependency>
</dependencies>
diff --git a/extensions/xml-common/deployment/src/main/java/org/apache/camel/quarkus/component/xml/deployment/XmlProcessor.java b/extensions/core-xml/deployment/src/main/java/org/apache/camel/quarkus/component/xml/deployment/XmlProcessor.java
similarity index 100%
rename from extensions/xml-common/deployment/src/main/java/org/apache/camel/quarkus/component/xml/deployment/XmlProcessor.java
rename to extensions/core-xml/deployment/src/main/java/org/apache/camel/quarkus/component/xml/deployment/XmlProcessor.java
diff --git a/extensions/xml-common/pom.xml b/extensions/core-xml/pom.xml
similarity index 93%
rename from extensions/xml-common/pom.xml
rename to extensions/core-xml/pom.xml
index 6dadbee..2de316a 100644
--- a/extensions/xml-common/pom.xml
+++ b/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>
diff --git a/extensions/xml-common/runtime/pom.xml b/extensions/core-xml/runtime/pom.xml
similarity index 89%
rename from extensions/xml-common/runtime/pom.xml
rename to extensions/core-xml/runtime/pom.xml
index 6f04ead..543cf9c 100644
--- a/extensions/xml-common/runtime/pom.xml
+++ b/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>
@@ -50,12 +50,6 @@
<groupId>io.quarkus</groupId>
<artifactId>quarkus-jaxb</artifactId>
</dependency>
-
- <!-- camel -->
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-jaxp</artifactId>
- </dependency>
</dependencies>
<build>
diff --git a/extensions/xml-common/runtime/src/main/java/org/apache/camel/quarkus/component/xml/DefaultXmlLoader.java b/extensions/core-xml/runtime/src/main/java/org/apache/camel/quarkus/component/xml/DefaultXmlLoader.java
similarity index 100%
rename from extensions/xml-common/runtime/src/main/java/org/apache/camel/quarkus/component/xml/DefaultXmlLoader.java
rename to extensions/core-xml/runtime/src/main/java/org/apache/camel/quarkus/component/xml/DefaultXmlLoader.java
diff --git a/extensions/xml-common/runtime/src/main/java/org/apache/camel/quarkus/component/xml/XmlRecorder.java b/extensions/core-xml/runtime/src/main/java/org/apache/camel/quarkus/component/xml/XmlRecorder.java
similarity index 100%
rename from extensions/xml-common/runtime/src/main/java/org/apache/camel/quarkus/component/xml/XmlRecorder.java
rename to extensions/core-xml/runtime/src/main/java/org/apache/camel/quarkus/component/xml/XmlRecorder.java
diff --git a/extensions/xml-common/runtime/src/main/resources/META-INF/quarkus-extension.json b/extensions/core-xml/runtime/src/main/resources/META-INF/quarkus-extension.json
similarity index 100%
rename from extensions/xml-common/runtime/src/main/resources/META-INF/quarkus-extension.json
rename to extensions/core-xml/runtime/src/main/resources/META-INF/quarkus-extension.json
diff --git a/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/DisabledModelJAXBContextFactory.java b/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/DisabledModelJAXBContextFactory.java
index 3b58e02..56b3788 100644
--- a/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/DisabledModelJAXBContextFactory.java
+++ b/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");
}
}
diff --git a/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/DisabledPredicateValidatorReifier.java b/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/DisabledPredicateValidatorReifier.java
index 1fd838e..ee6347f 100644
--- a/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/DisabledPredicateValidatorReifier.java
+++ b/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/DisabledPredicateValidatorReifier.java
@@ -30,7 +30,7 @@ public class DisabledPredicateValidatorReifier extends ValidatorReifier<Predicat
@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");
}
}
diff --git a/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/DisabledValidateReifier.java b/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/DisabledValidateReifier.java
index d7d2aa6..6eb8f75 100644
--- a/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/DisabledValidateReifier.java
+++ b/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/DisabledValidateReifier.java
@@ -30,6 +30,6 @@ public class DisabledValidateReifier extends ProcessorReifier<ValidateDefinition
@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");
}
}
diff --git a/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/DisabledXmlLoader.java b/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/DisabledXmlLoader.java
index 2944cfc..3b2e4de 100644
--- a/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/DisabledXmlLoader.java
+++ b/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");
}
}
diff --git a/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/DisabledXmlRoutesCollector.java b/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/DisabledXmlRoutesCollector.java
index 408aeee..7cd582c 100644
--- a/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/DisabledXmlRoutesCollector.java
+++ b/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");
}
}
diff --git a/extensions/pom.xml b/extensions/pom.xml
index f2e2049..70b88a2 100644
--- a/extensions/pom.xml
+++ b/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>
diff --git a/extensions/readme.adoc b/extensions/readme.adoc
index e5a6ea0..0068d10 100644
--- a/extensions/readme.adoc
+++ b/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
diff --git a/integration-tests/core-main/test/pom.xml b/integration-tests/core-main/test/pom.xml
index 41f897d..8e624ea 100644
--- a/integration-tests/core-main/test/pom.xml
+++ b/integration-tests/core-main/test/pom.xml
@@ -32,7 +32,7 @@
<dependencies>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-xml-common</artifactId>
+ <artifactId>camel-quarkus-core-xml</artifactId>
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
diff --git a/pom.xml b/pom.xml
index 2dfefbb..e8a1673 100644
--- a/pom.xml
+++ b/pom.xml
@@ -71,7 +71,7 @@
<mvnd.builder.rules>
camel-quarkus-core-deployment,camel-quarkus-aws-*-deployment,camel-quarkus-log-deployment,camel-quarkus-timer-deployment -> camel-quarkus-integration-test-aws
camel-quarkus-core-deployment,camel-quarkus-bean-deployment,camel-quarkus-direct-deployment,camel-quarkus-log-deployment -> camel-quarkus-integration-test-bean
- camel-quarkus-core-deployment,camel-quarkus-direct-deployment,camel-quarkus-xml-common-deployment -> camel-quarkus-integration-test-core-cdi
+ camel-quarkus-core-deployment,camel-quarkus-direct-deployment,camel-quarkus-core-xml-deployment -> camel-quarkus-integration-test-core-cdi
camel-quarkus-core-deployment,camel-quarkus-core-cloud-deployment -> camel-quarkus-integration-test-core-impl
camel-quarkus-core-deployment,camel-quarkus-csv-deployment,camel-quarkus-direct-deployment -> camel-quarkus-integration-test-csv
camel-quarkus-core-deployment,camel-quarkus-infinispan-deployment,camel-quarkus-log-deployment,camel-quarkus-netty-http-deployment -> camel-quarkus-integration-test-infinispan
diff --git a/poms/bom-deployment/pom.xml b/poms/bom-deployment/pom.xml
index 89b0f58..f88f300 100644
--- a/poms/bom-deployment/pom.xml
+++ b/poms/bom-deployment/pom.xml
@@ -112,6 +112,11 @@
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
+ <artifactId>camel-quarkus-core-xml-deployment</artifactId>
+ <version>${camel-quarkus.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-core-deployment</artifactId>
<version>${camel-quarkus.version}</version>
</dependency>
@@ -212,11 +217,6 @@
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-xml-common-deployment</artifactId>
- <version>${camel-quarkus.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-xstream-common-deployment</artifactId>
<version>${camel-quarkus.version}</version>
</dependency>
diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml
index c5c9906..bd4c620 100644
--- a/poms/bom/pom.xml
+++ b/poms/bom/pom.xml
@@ -282,12 +282,12 @@
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-http-common</artifactId>
+ <artifactId>camel-quarkus-core-xml</artifactId>
<version>${camel-quarkus.version}</version>
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-xml-common</artifactId>
+ <artifactId>camel-quarkus-http-common</artifactId>
<version>${camel-quarkus.version}</version>
</dependency>
diff --git a/tooling/maven/package-maven-plugin/src/main/java/org/apache/camel/quarkus/maven/PrepareCatalogQuarkusMojo.java b/tooling/maven/package-maven-plugin/src/main/java/org/apache/camel/quarkus/maven/PrepareCatalogQuarkusMojo.java
index b59ccdd..e167d1b 100644
--- a/tooling/maven/package-maven-plugin/src/main/java/org/apache/camel/quarkus/maven/PrepareCatalogQuarkusMojo.java
+++ b/tooling/maven/package-maven-plugin/src/main/java/org/apache/camel/quarkus/maven/PrepareCatalogQuarkusMojo.java
@@ -63,7 +63,7 @@ public class PrepareCatalogQuarkusMojo extends AbstractMojo {
private static final String DEFAULT_FIRST_VERSION = "0.2.0";
private static final String[] EXCLUDE_EXTENSIONS = {
- "http-common", "jetty-common", "support", "xml-common", "xstream-common"
+ "http-common", "support"
};
private static final Pattern SCHEME_PATTERN = Pattern.compile("\"scheme\": \"(.*)\"");
[camel-quarkus] 03/04: chore: re-organize support extensions
Posted by lb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lburgazzoli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 11636be01711ba65c6cd3b7229ddeac0be304722
Author: lburgazzoli <lb...@gmail.com>
AuthorDate: Mon Oct 21 13:40:32 2019 +0200
chore: re-organize support extensions
---
.../common/deployment/CommonSupportFeature.java} | 19 +++++++++----------
.../runtime/graal/SubstituteBeansIntrospector.java | 2 +-
.../runtime/graal/SubstituteBeansWeakCache.java | 2 +-
.../jetty/deployment/JettySupportFeature.java} | 19 +++++++++----------
.../jetty/deployment/JettySupportProcessor.java} | 4 ++--
.../xstream/deployment/XStreamSupportFeature.java} | 19 +++++++++----------
.../xstream/deployment/XStreamSupportProcessor.java} | 4 ++--
7 files changed, 33 insertions(+), 36 deletions(-)
diff --git a/extensions/support/common/runtime/src/main/java/org/apache/camel/quarkus/common/runtime/graal/SubstituteBeansIntrospector.java b/extensions/support/common/deployment/src/main/java/org/apache/camel/quarkus/support/common/deployment/CommonSupportFeature.java
similarity index 60%
copy from extensions/support/common/runtime/src/main/java/org/apache/camel/quarkus/common/runtime/graal/SubstituteBeansIntrospector.java
copy to extensions/support/common/deployment/src/main/java/org/apache/camel/quarkus/support/common/deployment/CommonSupportFeature.java
index 22bbee7..939842d 100644
--- a/extensions/support/common/runtime/src/main/java/org/apache/camel/quarkus/common/runtime/graal/SubstituteBeansIntrospector.java
+++ b/extensions/support/common/deployment/src/main/java/org/apache/camel/quarkus/support/common/deployment/CommonSupportFeature.java
@@ -14,17 +14,16 @@
* 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.deployment;
-import java.lang.reflect.Method;
+import io.quarkus.deployment.annotations.BuildStep;
+import io.quarkus.deployment.builditem.FeatureBuildItem;
-import com.oracle.svm.core.annotate.Alias;
-import com.oracle.svm.core.annotate.RecomputeFieldValue;
-import com.oracle.svm.core.annotate.TargetClass;
+public class CommonSupportFeature {
+ private static final String FEATURE = "camel-support-common";
-@TargetClass(className = "java.beans.Introspector")
-final class SubstituteBeansIntrospector {
- @Alias
- @RecomputeFieldValue(kind = RecomputeFieldValue.Kind.FromAlias)
- private static SubstituteBeansWeakCache<Class<?>, Method[]> declaredMethodCache = new SubstituteBeansWeakCache<>();
+ @BuildStep
+ FeatureBuildItem feature() {
+ return new FeatureBuildItem(FEATURE);
+ }
}
diff --git a/extensions/support/common/runtime/src/main/java/org/apache/camel/quarkus/common/runtime/graal/SubstituteBeansIntrospector.java b/extensions/support/common/runtime/src/main/java/org/apache/camel/quarkus/support/common/runtime/graal/SubstituteBeansIntrospector.java
similarity index 95%
copy from extensions/support/common/runtime/src/main/java/org/apache/camel/quarkus/common/runtime/graal/SubstituteBeansIntrospector.java
copy to extensions/support/common/runtime/src/main/java/org/apache/camel/quarkus/support/common/runtime/graal/SubstituteBeansIntrospector.java
index 22bbee7..5f7351c 100644
--- a/extensions/support/common/runtime/src/main/java/org/apache/camel/quarkus/common/runtime/graal/SubstituteBeansIntrospector.java
+++ b/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;
diff --git a/extensions/support/common/runtime/src/main/java/org/apache/camel/quarkus/common/runtime/graal/SubstituteBeansWeakCache.java b/extensions/support/common/runtime/src/main/java/org/apache/camel/quarkus/support/common/runtime/graal/SubstituteBeansWeakCache.java
similarity index 96%
rename from extensions/support/common/runtime/src/main/java/org/apache/camel/quarkus/common/runtime/graal/SubstituteBeansWeakCache.java
rename to extensions/support/common/runtime/src/main/java/org/apache/camel/quarkus/support/common/runtime/graal/SubstituteBeansWeakCache.java
index 3698656..a89955c 100644
--- a/extensions/support/common/runtime/src/main/java/org/apache/camel/quarkus/common/runtime/graal/SubstituteBeansWeakCache.java
+++ b/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;
diff --git a/extensions/support/common/runtime/src/main/java/org/apache/camel/quarkus/common/runtime/graal/SubstituteBeansIntrospector.java b/extensions/support/jetty/deployment/src/main/java/org/apache/camel/quarkus/support/jetty/deployment/JettySupportFeature.java
similarity index 60%
copy from extensions/support/common/runtime/src/main/java/org/apache/camel/quarkus/common/runtime/graal/SubstituteBeansIntrospector.java
copy to extensions/support/jetty/deployment/src/main/java/org/apache/camel/quarkus/support/jetty/deployment/JettySupportFeature.java
index 22bbee7..e0860f7 100644
--- a/extensions/support/common/runtime/src/main/java/org/apache/camel/quarkus/common/runtime/graal/SubstituteBeansIntrospector.java
+++ b/extensions/support/jetty/deployment/src/main/java/org/apache/camel/quarkus/support/jetty/deployment/JettySupportFeature.java
@@ -14,17 +14,16 @@
* 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.jetty.deployment;
-import java.lang.reflect.Method;
+import io.quarkus.deployment.annotations.BuildStep;
+import io.quarkus.deployment.builditem.FeatureBuildItem;
-import com.oracle.svm.core.annotate.Alias;
-import com.oracle.svm.core.annotate.RecomputeFieldValue;
-import com.oracle.svm.core.annotate.TargetClass;
+public class JettySupportFeature {
+ private static final String FEATURE = "camel-support-jetty";
-@TargetClass(className = "java.beans.Introspector")
-final class SubstituteBeansIntrospector {
- @Alias
- @RecomputeFieldValue(kind = RecomputeFieldValue.Kind.FromAlias)
- private static SubstituteBeansWeakCache<Class<?>, Method[]> declaredMethodCache = new SubstituteBeansWeakCache<>();
+ @BuildStep
+ FeatureBuildItem feature() {
+ return new FeatureBuildItem(FEATURE);
+ }
}
diff --git a/extensions/support/jetty/deployment/src/main/java/org/apache/camel/quarkus/jetty/common/deployment/JettyProcessor.java b/extensions/support/jetty/deployment/src/main/java/org/apache/camel/quarkus/support/jetty/deployment/JettySupportProcessor.java
similarity index 94%
rename from extensions/support/jetty/deployment/src/main/java/org/apache/camel/quarkus/jetty/common/deployment/JettyProcessor.java
rename to extensions/support/jetty/deployment/src/main/java/org/apache/camel/quarkus/support/jetty/deployment/JettySupportProcessor.java
index 584f1ce..434978d 100644
--- a/extensions/support/jetty/deployment/src/main/java/org/apache/camel/quarkus/jetty/common/deployment/JettyProcessor.java
+++ b/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 io.quarkus.deployment.builditem.substrate.ReflectiveClassBuildItem;
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
diff --git a/extensions/support/common/runtime/src/main/java/org/apache/camel/quarkus/common/runtime/graal/SubstituteBeansIntrospector.java b/extensions/support/xstream/deployment/src/main/java/org/apache/camel/quarkus/support/xstream/deployment/XStreamSupportFeature.java
similarity index 60%
rename from extensions/support/common/runtime/src/main/java/org/apache/camel/quarkus/common/runtime/graal/SubstituteBeansIntrospector.java
rename to extensions/support/xstream/deployment/src/main/java/org/apache/camel/quarkus/support/xstream/deployment/XStreamSupportFeature.java
index 22bbee7..c4dda34 100644
--- a/extensions/support/common/runtime/src/main/java/org/apache/camel/quarkus/common/runtime/graal/SubstituteBeansIntrospector.java
+++ b/extensions/support/xstream/deployment/src/main/java/org/apache/camel/quarkus/support/xstream/deployment/XStreamSupportFeature.java
@@ -14,17 +14,16 @@
* 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.xstream.deployment;
-import java.lang.reflect.Method;
+import io.quarkus.deployment.annotations.BuildStep;
+import io.quarkus.deployment.builditem.FeatureBuildItem;
-import com.oracle.svm.core.annotate.Alias;
-import com.oracle.svm.core.annotate.RecomputeFieldValue;
-import com.oracle.svm.core.annotate.TargetClass;
+public class XStreamSupportFeature {
+ private static final String FEATURE = "camel-support-xstream";
-@TargetClass(className = "java.beans.Introspector")
-final class SubstituteBeansIntrospector {
- @Alias
- @RecomputeFieldValue(kind = RecomputeFieldValue.Kind.FromAlias)
- private static SubstituteBeansWeakCache<Class<?>, Method[]> declaredMethodCache = new SubstituteBeansWeakCache<>();
+ @BuildStep
+ FeatureBuildItem feature() {
+ return new FeatureBuildItem(FEATURE);
+ }
}
diff --git a/extensions/support/xstream/deployment/src/main/java/org/apache/camel/quarkus/xstream/common/deployment/XStreamProcessor.java b/extensions/support/xstream/deployment/src/main/java/org/apache/camel/quarkus/support/xstream/deployment/XStreamSupportProcessor.java
similarity index 99%
rename from extensions/support/xstream/deployment/src/main/java/org/apache/camel/quarkus/xstream/common/deployment/XStreamProcessor.java
rename to extensions/support/xstream/deployment/src/main/java/org/apache/camel/quarkus/support/xstream/deployment/XStreamSupportProcessor.java
index 434d6c4..08a9c9c 100644
--- a/extensions/support/xstream/deployment/src/main/java/org/apache/camel/quarkus/xstream/common/deployment/XStreamProcessor.java
+++ b/extensions/support/xstream/deployment/src/main/java/org/apache/camel/quarkus/support/xstream/deployment/XStreamSupportProcessor.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.quarkus.xstream.common.deployment;
+package org.apache.camel.quarkus.support.xstream.deployment;
import java.util.Arrays;
import java.util.List;
@@ -35,7 +35,7 @@ import org.jboss.jandex.ClassInfo;
import org.jboss.jandex.DotName;
-public class XStreamProcessor {
+public class XStreamSupportProcessor {
private static final List<String> INTERFACES_TO_REGISTER = Arrays.asList(
Converter.class.getName(),
[camel-quarkus] 02/04: Add a support/xml artifact for common
substrate support #294
Posted by lb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lburgazzoli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit f9b20ba5cf3a0cd9c168b0576409837838eac08e
Author: lburgazzoli <lb...@gmail.com>
AuthorDate: Mon Oct 21 13:39:41 2019 +0200
Add a support/xml artifact for common substrate support #294
---
extensions/aws-eks/deployment/pom.xml | 2 +-
extensions/aws-eks/runtime/pom.xml | 2 +-
extensions/aws-s3/deployment/pom.xml | 2 +-
extensions/aws-s3/runtime/pom.xml | 2 +-
extensions/aws-sns/deployment/pom.xml | 2 +-
extensions/aws-sns/runtime/pom.xml | 2 +-
extensions/aws-sqs/deployment/pom.xml | 2 +-
extensions/aws-sqs/runtime/pom.xml | 2 +-
extensions/core-xml/deployment/pom.xml | 4 ++
.../component/xml/deployment/XmlProcessor.java | 22 ---------
extensions/core-xml/runtime/pom.xml | 4 ++
extensions/support/pom.xml | 1 +
.../{aws-eks => support/xml}/deployment/pom.xml | 16 +++----
.../support/xml/deployment/XmlSupportFeature.java | 29 ++++++++++++
.../xml/deployment/XmlSupportProcessor.java | 53 ++++++++++++++++++++++
extensions/support/{ => xml}/pom.xml | 14 +++---
.../{core-xml => support/xml}/runtime/pom.xml | 19 ++++----
poms/bom-deployment/pom.xml | 5 ++
poms/bom/pom.xml | 5 ++
19 files changed, 133 insertions(+), 55 deletions(-)
diff --git a/extensions/aws-eks/deployment/pom.xml b/extensions/aws-eks/deployment/pom.xml
index 6e53b8f..6fc237c 100644
--- a/extensions/aws-eks/deployment/pom.xml
+++ b/extensions/aws-eks/deployment/pom.xml
@@ -47,7 +47,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-core-xml-deployment</artifactId>
+ <artifactId>camel-quarkus-support-xml-deployment</artifactId>
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
diff --git a/extensions/aws-eks/runtime/pom.xml b/extensions/aws-eks/runtime/pom.xml
index 49e22c5..6f2897a 100644
--- a/extensions/aws-eks/runtime/pom.xml
+++ b/extensions/aws-eks/runtime/pom.xml
@@ -51,7 +51,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-core-xml</artifactId>
+ <artifactId>camel-quarkus-support-xml</artifactId>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
diff --git a/extensions/aws-s3/deployment/pom.xml b/extensions/aws-s3/deployment/pom.xml
index 4ab1b6c..22e5250 100644
--- a/extensions/aws-s3/deployment/pom.xml
+++ b/extensions/aws-s3/deployment/pom.xml
@@ -47,7 +47,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-core-xml-deployment</artifactId>
+ <artifactId>camel-quarkus-support-xml-deployment</artifactId>
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
diff --git a/extensions/aws-s3/runtime/pom.xml b/extensions/aws-s3/runtime/pom.xml
index d759998..eef491e 100644
--- a/extensions/aws-s3/runtime/pom.xml
+++ b/extensions/aws-s3/runtime/pom.xml
@@ -51,7 +51,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-core-xml</artifactId>
+ <artifactId>camel-quarkus-support-xml</artifactId>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
diff --git a/extensions/aws-sns/deployment/pom.xml b/extensions/aws-sns/deployment/pom.xml
index 4b40f6b..6471939 100644
--- a/extensions/aws-sns/deployment/pom.xml
+++ b/extensions/aws-sns/deployment/pom.xml
@@ -47,7 +47,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-core-xml-deployment</artifactId>
+ <artifactId>camel-quarkus-support-xml-deployment</artifactId>
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
diff --git a/extensions/aws-sns/runtime/pom.xml b/extensions/aws-sns/runtime/pom.xml
index 226100d..ef4da88 100644
--- a/extensions/aws-sns/runtime/pom.xml
+++ b/extensions/aws-sns/runtime/pom.xml
@@ -51,7 +51,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-core-xml</artifactId>
+ <artifactId>camel-quarkus-support-xml</artifactId>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
diff --git a/extensions/aws-sqs/deployment/pom.xml b/extensions/aws-sqs/deployment/pom.xml
index 301a76e..f54524c 100644
--- a/extensions/aws-sqs/deployment/pom.xml
+++ b/extensions/aws-sqs/deployment/pom.xml
@@ -47,7 +47,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-core-xml-deployment</artifactId>
+ <artifactId>camel-quarkus-support-xml-deployment</artifactId>
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
diff --git a/extensions/aws-sqs/runtime/pom.xml b/extensions/aws-sqs/runtime/pom.xml
index 310ff38..89555a9 100644
--- a/extensions/aws-sqs/runtime/pom.xml
+++ b/extensions/aws-sqs/runtime/pom.xml
@@ -51,7 +51,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-core-xml</artifactId>
+ <artifactId>camel-quarkus-support-xml</artifactId>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
diff --git a/extensions/core-xml/deployment/pom.xml b/extensions/core-xml/deployment/pom.xml
index 2c2c45c..edb0606 100644
--- a/extensions/core-xml/deployment/pom.xml
+++ b/extensions/core-xml/deployment/pom.xml
@@ -51,6 +51,10 @@
<artifactId>camel-quarkus-core-xml</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.camel.quarkus</groupId>
+ <artifactId>camel-quarkus-support-xml-deployment</artifactId>
+ </dependency>
+ <dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-jaxb-deployment</artifactId>
</dependency>
diff --git a/extensions/core-xml/deployment/src/main/java/org/apache/camel/quarkus/component/xml/deployment/XmlProcessor.java b/extensions/core-xml/deployment/src/main/java/org/apache/camel/quarkus/component/xml/deployment/XmlProcessor.java
index c412bbf..233c10a 100644
--- a/extensions/core-xml/deployment/src/main/java/org/apache/camel/quarkus/component/xml/deployment/XmlProcessor.java
+++ b/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 @@ class XmlProcessor {
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")
- );
- }
-
}
diff --git a/extensions/core-xml/runtime/pom.xml b/extensions/core-xml/runtime/pom.xml
index 543cf9c..eedcb81 100644
--- a/extensions/core-xml/runtime/pom.xml
+++ b/extensions/core-xml/runtime/pom.xml
@@ -47,6 +47,10 @@
<artifactId>camel-quarkus-core</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.camel.quarkus</groupId>
+ <artifactId>camel-quarkus-support-xml</artifactId>
+ </dependency>
+ <dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-jaxb</artifactId>
</dependency>
diff --git a/extensions/support/pom.xml b/extensions/support/pom.xml
index 22c9143..8c8d509 100644
--- a/extensions/support/pom.xml
+++ b/extensions/support/pom.xml
@@ -35,5 +35,6 @@
<module>common</module>
<module>jetty</module>
<module>xstream</module>
+ <module>xml</module>
</modules>
</project>
diff --git a/extensions/aws-eks/deployment/pom.xml b/extensions/support/xml/deployment/pom.xml
similarity index 81%
copy from extensions/aws-eks/deployment/pom.xml
copy to extensions/support/xml/deployment/pom.xml
index 6e53b8f..c203da3 100644
--- a/extensions/aws-eks/deployment/pom.xml
+++ b/extensions/support/xml/deployment/pom.xml
@@ -20,13 +20,13 @@
<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">
<parent>
<groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-aws-eks-parent</artifactId>
+ <artifactId>camel-quarkus-support-xml-parent</artifactId>
<version>0.2.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>camel-quarkus-aws-eks-deployment</artifactId>
- <name>Camel Quarkus :: AWS EKS :: Deployment</name>
+ <artifactId>camel-quarkus-support-xml-deployment</artifactId>
+ <name>Camel Quarkus :: Support :: XML :: Deployment</name>
<dependencyManagement>
<dependencies>
@@ -42,16 +42,12 @@
<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-core-xml-deployment</artifactId>
+ <groupId>io.quarkus</groupId>
+ <artifactId>quarkus-core-deployment</artifactId>
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-aws-eks</artifactId>
+ <artifactId>camel-quarkus-support-xml</artifactId>
</dependency>
</dependencies>
diff --git a/extensions/support/xml/deployment/src/main/java/org/apache/camel/quarkus/support/xml/deployment/XmlSupportFeature.java b/extensions/support/xml/deployment/src/main/java/org/apache/camel/quarkus/support/xml/deployment/XmlSupportFeature.java
new file mode 100644
index 0000000..0a4030d
--- /dev/null
+++ b/extensions/support/xml/deployment/src/main/java/org/apache/camel/quarkus/support/xml/deployment/XmlSupportFeature.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.xml.deployment;
+
+import io.quarkus.deployment.annotations.BuildStep;
+import io.quarkus.deployment.builditem.FeatureBuildItem;
+
+public class XmlSupportFeature {
+ private static final String FEATURE = "camel-support-xml";
+
+ @BuildStep
+ FeatureBuildItem feature() {
+ return new FeatureBuildItem(FEATURE);
+ }
+}
diff --git a/extensions/support/xml/deployment/src/main/java/org/apache/camel/quarkus/support/xml/deployment/XmlSupportProcessor.java b/extensions/support/xml/deployment/src/main/java/org/apache/camel/quarkus/support/xml/deployment/XmlSupportProcessor.java
new file mode 100644
index 0000000..633c1fa
--- /dev/null
+++ b/extensions/support/xml/deployment/src/main/java/org/apache/camel/quarkus/support/xml/deployment/XmlSupportProcessor.java
@@ -0,0 +1,53 @@
+/*
+ * 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.xml.deployment;
+
+import io.quarkus.deployment.annotations.BuildProducer;
+import io.quarkus.deployment.annotations.BuildStep;
+import io.quarkus.deployment.builditem.substrate.ReflectiveClassBuildItem;
+
+public class XmlSupportProcessor {
+ @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"
+ )
+ );
+
+ reflectiveClass.produce(
+ new ReflectiveClassBuildItem(
+ false,
+ false,
+ "org.apache.camel.converter.jaxp.XmlConverter"
+ )
+ );
+
+ // 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")
+ );
+ }
+}
diff --git a/extensions/support/pom.xml b/extensions/support/xml/pom.xml
similarity index 80%
copy from extensions/support/pom.xml
copy to extensions/support/xml/pom.xml
index 22c9143..f28cd65 100644
--- a/extensions/support/pom.xml
+++ b/extensions/support/xml/pom.xml
@@ -21,19 +21,19 @@
<parent>
<groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-extensions</artifactId>
+ <artifactId>camel-quarkus-build-parent</artifactId>
<version>0.2.1-SNAPSHOT</version>
+ <relativePath>../../../poms/build-parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>camel-quarkus-extensions-support</artifactId>
- <name>Camel Quarkus :: Support</name>
+ <artifactId>camel-quarkus-support-xml-parent</artifactId>
+ <name>Camel Quarkus :: Support :: XML</name>
<packaging>pom</packaging>
-
<modules>
- <module>common</module>
- <module>jetty</module>
- <module>xstream</module>
+ <module>deployment</module>
+ <module>runtime</module>
</modules>
+
</project>
diff --git a/extensions/core-xml/runtime/pom.xml b/extensions/support/xml/runtime/pom.xml
similarity index 86%
copy from extensions/core-xml/runtime/pom.xml
copy to extensions/support/xml/runtime/pom.xml
index 543cf9c..f554f86 100644
--- a/extensions/core-xml/runtime/pom.xml
+++ b/extensions/support/xml/runtime/pom.xml
@@ -18,16 +18,15 @@
-->
<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-core-xml-parent</artifactId>
+ <artifactId>camel-quarkus-support-xml-parent</artifactId>
<version>0.2.1-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
</parent>
+ <modelVersion>4.0.0</modelVersion>
- <artifactId>camel-quarkus-core-xml</artifactId>
- <name>Camel Quarkus :: Core :: XML :: Runtime</name>
+ <artifactId>camel-quarkus-support-xml</artifactId>
+ <name>Camel Quarkus :: Support :: XML :: Runtime</name>
<dependencyManagement>
<dependencies>
@@ -43,13 +42,18 @@
<dependencies>
<dependency>
- <groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-core</artifactId>
+ <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-jaxp</artifactId>
+ </dependency>
</dependencies>
<build>
@@ -59,7 +63,6 @@
<artifactId>quarkus-bootstrap-maven-plugin</artifactId>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<annotationProcessorPaths>
diff --git a/poms/bom-deployment/pom.xml b/poms/bom-deployment/pom.xml
index f88f300..d39f8ec 100644
--- a/poms/bom-deployment/pom.xml
+++ b/poms/bom-deployment/pom.xml
@@ -78,6 +78,11 @@
<artifactId>camel-quarkus-support-xstream-deployment</artifactId>
<version>${camel-quarkus.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.camel.quarkus</groupId>
+ <artifactId>camel-quarkus-support-xml-deployment</artifactId>
+ <version>${camel-quarkus.version}</version>
+ </dependency>
<!-- Camel Quarkus deployment modules, in alphabetical order -->
<dependency>
diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml
index bd4c620..b1c9442 100644
--- a/poms/bom/pom.xml
+++ b/poms/bom/pom.xml
@@ -268,6 +268,11 @@
<artifactId>camel-quarkus-support-xstream</artifactId>
<version>${camel-quarkus.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.camel.quarkus</groupId>
+ <artifactId>camel-quarkus-support-xml</artifactId>
+ <version>${camel-quarkus.version}</version>
+ </dependency>
<!-- Camel Quarkus Common (in alphabetical order) -->
<dependency>
[camel-quarkus] 04/04: chore: delete wrong extension metadata file
Posted by lb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lburgazzoli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 64cbae287b6f873f76e785fa406dc43fb22c9ddc
Author: lburgazzoli <lb...@gmail.com>
AuthorDate: Mon Oct 21 13:40:55 2019 +0200
chore: delete wrong extension metadata file
---
.../support/runtime/src/main/resources/META-INF/quarkus-extension.json | 1 -
1 file changed, 1 deletion(-)
diff --git a/extensions/support/runtime/src/main/resources/META-INF/quarkus-extension.json b/extensions/support/runtime/src/main/resources/META-INF/quarkus-extension.json
deleted file mode 100644
index 0967ef4..0000000
--- a/extensions/support/runtime/src/main/resources/META-INF/quarkus-extension.json
+++ /dev/null
@@ -1 +0,0 @@
-{}