This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new d52ee02 CAMEL-14487: camel-jaxp - Rename to camel-xml-jaxp
d52ee02 is described below
commit d52ee029f10168a9218b043c898efd8ebec47b61
Author: Claus Ibsen <[email protected]>
AuthorDate: Wed Feb 5 10:28:33 2020 +0100
CAMEL-14487: camel-jaxp - Rename to camel-xml-jaxp
---
apache-camel/pom.xml | 2 +-
apache-camel/src/main/descriptors/common-bin.xml | 2 +-
bom/camel-bom/pom.xml | 10 +++++-----
components/camel-blueprint/pom.xml | 2 +-
components/camel-jaxb/pom.xml | 2 +-
components/camel-jclouds/pom.xml | 2 +-
components/camel-osgi-activator/src/assembly/test-bundles.xml | 2 +-
.../apache/camel/component/osgi/activator/PaxExamOptions.java | 2 +-
components/camel-spring/pom.xml | 2 +-
components/camel-validator/pom.xml | 2 +-
components/camel-xpath/pom.xml | 2 +-
components/camel-xslt/pom.xml | 2 +-
core/camel-endpointdsl/pom.xml | 2 +-
core/camel-xml-jaxb/pom.xml | 2 +-
core/{camel-jaxp => camel-xml-jaxp}/pom.xml | 2 +-
.../org/apache/camel/converter/jaxp/DomConverterLoader.java | 0
.../org/apache/camel/converter/jaxp/StaxConverterLoader.java | 0
.../camel/converter/jaxp/StreamSourceConverterLoader.java | 0
.../org/apache/camel/converter/jaxp/XmlConverterLoader.java | 0
.../org/apache/camel/util/xml/StreamSourceConverterLoader.java | 0
.../META-INF/services/org/apache/camel/TypeConverterLoader | 0
.../META-INF/services/org/apache/camel/language.properties | 2 +-
.../META-INF/services/org/apache/camel/language/xtokenize | 0
.../org/apache/camel/converter/jaxp/DomConverterLoader.java | 0
.../org/apache/camel/converter/jaxp/StaxConverterLoader.java | 0
.../camel/converter/jaxp/StreamSourceConverterLoader.java | 0
.../org/apache/camel/converter/jaxp/XmlConverterLoader.java | 0
.../org/apache/camel/language/xtokenizer/xtokenize.json | 2 +-
.../org/apache/camel/util/xml/StreamSourceConverterLoader.java | 0
.../src/main/docs/xtokenize-language.adoc | 0
.../java/org/apache/camel/converter/jaxp/DomConverter.java | 0
.../java/org/apache/camel/converter/jaxp/StaxConverter.java | 0
.../org/apache/camel/converter/jaxp/StreamSourceConverter.java | 0
.../java/org/apache/camel/converter/jaxp/XMLReaderPool.java | 0
.../camel/converter/jaxp/XMLStreamReaderInputStream.java | 0
.../org/apache/camel/converter/jaxp/XMLStreamReaderReader.java | 0
.../java/org/apache/camel/converter/jaxp/XmlConverter.java | 0
.../java/org/apache/camel/converter/jaxp/XmlErrorListener.java | 0
.../src/main/java/org/apache/camel/converter/jaxp/package.html | 0
.../org/apache/camel/language/xtokenizer/RecordableReader.java | 0
.../camel/language/xtokenizer/XMLTokenExpressionIterator.java | 0
.../apache/camel/language/xtokenizer/XMLTokenizeLanguage.java | 0
.../java/org/apache/camel/language/xtokenizer/package.html | 0
.../org/apache/camel/support/builder/xml/NamespacesHelper.java | 0
.../org/apache/camel/support/builder/xml/StAX2SAXSource.java | 0
.../apache/camel/support/builder/xml/XMLConverterHelper.java | 0
.../processor/validation/DefaultValidationErrorHandler.java | 0
.../processor/validation/NoXmlBodyValidationException.java | 0
.../processor/validation/NoXmlHeaderValidationException.java | 0
.../camel/support/processor/validation/SchemaReader.java | 0
.../processor/validation/SchemaValidationException.java | 0
.../support/processor/validation/ValidatingProcessor.java | 0
.../support/processor/validation/ValidatorErrorHandler.java | 0
.../org/apache/camel/support/processor/validation/package.html | 0
.../src/main/java/org/apache/camel/util/xml/BytesSource.java | 0
.../src/main/java/org/apache/camel/util/xml/SourceCache.java | 0
.../main/java/org/apache/camel/util/xml/StreamSourceCache.java | 0
.../java/org/apache/camel/util/xml/StreamSourceConverter.java | 0
.../src/main/java/org/apache/camel/util/xml/StringSource.java | 0
.../java/org/apache/camel/util/xml/XmlLineNumberParser.java | 0
.../apache/camel/language/xtokenizer/AttributedQNameTest.java | 0
.../xtokenizer/XMLTokenExpressionIteratorCharsetTest.java | 0
.../xtokenizer/XMLTokenExpressionIteratorGroupingTest.java | 0
.../xtokenizer/XMLTokenExpressionIteratorInvalidXMLTest.java | 0
.../language/xtokenizer/XMLTokenExpressionIteratorTest.java | 0
.../org/apache/camel/util/xml/XmlLineNumberParserTest.java | 0
.../src/test/resources/org/apache/camel/util/camel-context.xml | 0
core/pom.xml | 2 +-
docs/components/modules/ROOT/pages/index.adoc | 2 +-
docs/components/modules/ROOT/pages/xtokenize-language.adoc | 2 +-
docs/gulpfile.js | 4 ++--
.../user-manual/modules/ROOT/pages/camel-3x-upgrade-guide.adoc | 10 ++++++----
docs/user-manual/modules/ROOT/pages/xtokenize-language.adoc | 2 +-
parent/pom.xml | 2 +-
platforms/karaf/features/src/main/resources/features.xml | 2 +-
.../apache/camel/maven/packaging/PrepareCatalogKarafMojo.java | 4 ++--
.../org/apache/camel/maven/packaging/PrepareCatalogMojo.java | 4 ++--
77 files changed, 39 insertions(+), 37 deletions(-)
diff --git a/apache-camel/pom.xml b/apache-camel/pom.xml
index f7480ed..b63ad6c 100644
--- a/apache-camel/pom.xml
+++ b/apache-camel/pom.xml
@@ -98,7 +98,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-jaxp</artifactId>
+ <artifactId>camel-xml-jaxp</artifactId>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
diff --git a/apache-camel/src/main/descriptors/common-bin.xml
b/apache-camel/src/main/descriptors/common-bin.xml
index 1e7e45a..fee0561 100644
--- a/apache-camel/src/main/descriptors/common-bin.xml
+++ b/apache-camel/src/main/descriptors/common-bin.xml
@@ -38,7 +38,7 @@
<include>org.apache.camel:camel-core-osgi</include>
<include>org.apache.camel:camel-core-xml</include>
<include>org.apache.camel:camel-cloud</include>
- <include>org.apache.camel:camel-jaxp</include>
+ <include>org.apache.camel:camel-xml-jaxp</include>
<include>org.apache.camel:camel-main</include>
<include>org.apache.camel:camel-tooling-model</include>
<include>org.apache.camel:camel-tooling-util</include>
diff --git a/bom/camel-bom/pom.xml b/bom/camel-bom/pom.xml
index c569b7e..1264b49 100644
--- a/bom/camel-bom/pom.xml
+++ b/bom/camel-bom/pom.xml
@@ -894,11 +894,6 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-jaxp</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
<artifactId>camel-jbpm</artifactId>
<version>${project.version}</version>
</dependency>
@@ -1845,6 +1840,11 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-xml-jaxp</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-xmlsecurity</artifactId>
<version>${project.version}</version>
</dependency>
diff --git a/components/camel-blueprint/pom.xml
b/components/camel-blueprint/pom.xml
index 61c34fc..ac62d1e 100644
--- a/components/camel-blueprint/pom.xml
+++ b/components/camel-blueprint/pom.xml
@@ -52,7 +52,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-jaxp</artifactId>
+ <artifactId>camel-xml-jaxp</artifactId>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
diff --git a/components/camel-jaxb/pom.xml b/components/camel-jaxb/pom.xml
index 8cbd6ad..30c55cc 100644
--- a/components/camel-jaxb/pom.xml
+++ b/components/camel-jaxb/pom.xml
@@ -48,7 +48,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-jaxp</artifactId>
+ <artifactId>camel-xml-jaxp</artifactId>
</dependency>
<dependency>
diff --git a/components/camel-jclouds/pom.xml b/components/camel-jclouds/pom.xml
index 3134b8b..6d81a96 100644
--- a/components/camel-jclouds/pom.xml
+++ b/components/camel-jclouds/pom.xml
@@ -50,7 +50,7 @@
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-jaxp</artifactId>
+ <artifactId>camel-xml-jaxp</artifactId>
</dependency>
<!-- jclouds -->
diff --git a/components/camel-osgi-activator/src/assembly/test-bundles.xml
b/components/camel-osgi-activator/src/assembly/test-bundles.xml
index 905792c..bb7d4ae 100644
--- a/components/camel-osgi-activator/src/assembly/test-bundles.xml
+++ b/components/camel-osgi-activator/src/assembly/test-bundles.xml
@@ -33,7 +33,7 @@
<include>org.apache.camel:camel-core-engine</include>
<include>org.apache.camel:camel-api</include>
<include>org.apache.camel:camel-base</include>
- <include>org.apache.camel:camel-jaxp</include>
+ <include>org.apache.camel:camel-xml-jaxp</include>
<include>org.apache.camel:camel-management-api</include>
<include>org.apache.camel:camel-support</include>
<include>org.apache.camel:camel-util</include>
diff --git
a/components/camel-osgi-activator/src/test/java/org/apache/camel/component/osgi/activator/PaxExamOptions.java
b/components/camel-osgi-activator/src/test/java/org/apache/camel/component/osgi/activator/PaxExamOptions.java
index 7940d78..0f0a40c 100644
---
a/components/camel-osgi-activator/src/test/java/org/apache/camel/component/osgi/activator/PaxExamOptions.java
+++
b/components/camel-osgi-activator/src/test/java/org/apache/camel/component/osgi/activator/PaxExamOptions.java
@@ -65,7 +65,7 @@ public enum PaxExamOptions {
createStreamBundleOption("camel-core-engine.jar"),
createStreamBundleOption("camel-api.jar"),
createStreamBundleOption("camel-base.jar"),
- createStreamBundleOption("camel-jaxp.jar"),
+ createStreamBundleOption("camel-xml-jaxp.jar"),
createStreamBundleOption("camel-management-api.jar"),
createStreamBundleOption("camel-support.jar"),
createStreamBundleOption("camel-util.jar"),
diff --git a/components/camel-spring/pom.xml b/components/camel-spring/pom.xml
index 1241072..77cab95 100644
--- a/components/camel-spring/pom.xml
+++ b/components/camel-spring/pom.xml
@@ -39,7 +39,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-jaxp</artifactId>
+ <artifactId>camel-xml-jaxp</artifactId>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
diff --git a/components/camel-validator/pom.xml
b/components/camel-validator/pom.xml
index 46da8d0..2411549 100644
--- a/components/camel-validator/pom.xml
+++ b/components/camel-validator/pom.xml
@@ -40,7 +40,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-jaxp</artifactId>
+ <artifactId>camel-xml-jaxp</artifactId>
</dependency>
</dependencies>
diff --git a/components/camel-xpath/pom.xml b/components/camel-xpath/pom.xml
index 4f04cdf..0d4f1d6 100644
--- a/components/camel-xpath/pom.xml
+++ b/components/camel-xpath/pom.xml
@@ -40,7 +40,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-jaxp</artifactId>
+ <artifactId>camel-xml-jaxp</artifactId>
</dependency>
</dependencies>
diff --git a/components/camel-xslt/pom.xml b/components/camel-xslt/pom.xml
index 8ace654..c7b61ff 100644
--- a/components/camel-xslt/pom.xml
+++ b/components/camel-xslt/pom.xml
@@ -40,7 +40,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-jaxp</artifactId>
+ <artifactId>camel-xml-jaxp</artifactId>
</dependency>
</dependencies>
diff --git a/core/camel-endpointdsl/pom.xml b/core/camel-endpointdsl/pom.xml
index aacd6c5..f6a2540 100644
--- a/core/camel-endpointdsl/pom.xml
+++ b/core/camel-endpointdsl/pom.xml
@@ -65,7 +65,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-jaxp</artifactId>
+ <artifactId>camel-xml-jaxp</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
diff --git a/core/camel-xml-jaxb/pom.xml b/core/camel-xml-jaxb/pom.xml
index 0c3f919..21bc38d 100644
--- a/core/camel-xml-jaxb/pom.xml
+++ b/core/camel-xml-jaxb/pom.xml
@@ -39,7 +39,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-jaxp</artifactId>
+ <artifactId>camel-xml-jaxp</artifactId>
</dependency>
</dependencies>
diff --git a/core/camel-jaxp/pom.xml b/core/camel-xml-jaxp/pom.xml
similarity index 98%
rename from core/camel-jaxp/pom.xml
rename to core/camel-xml-jaxp/pom.xml
index 90caf61..e56132b 100644
--- a/core/camel-jaxp/pom.xml
+++ b/core/camel-xml-jaxp/pom.xml
@@ -27,7 +27,7 @@
<relativePath>..</relativePath>
</parent>
- <artifactId>camel-jaxp</artifactId>
+ <artifactId>camel-xml-jaxp</artifactId>
<packaging>jar</packaging>
<name>Camel :: JAXP</name>
<description>Camel JAXP Support</description>
diff --git
a/core/camel-jaxp/src/generated/resources/org/apache/camel/converter/jaxp/DomConverterLoader.java
b/core/camel-xml-jaxp/src/generated/java/org/apache/camel/converter/jaxp/DomConverterLoader.java
similarity index 100%
rename from
core/camel-jaxp/src/generated/resources/org/apache/camel/converter/jaxp/DomConverterLoader.java
rename to
core/camel-xml-jaxp/src/generated/java/org/apache/camel/converter/jaxp/DomConverterLoader.java
diff --git
a/core/camel-jaxp/src/generated/resources/org/apache/camel/converter/jaxp/StaxConverterLoader.java
b/core/camel-xml-jaxp/src/generated/java/org/apache/camel/converter/jaxp/StaxConverterLoader.java
similarity index 100%
rename from
core/camel-jaxp/src/generated/resources/org/apache/camel/converter/jaxp/StaxConverterLoader.java
rename to
core/camel-xml-jaxp/src/generated/java/org/apache/camel/converter/jaxp/StaxConverterLoader.java
diff --git
a/core/camel-jaxp/src/generated/resources/org/apache/camel/converter/jaxp/StreamSourceConverterLoader.java
b/core/camel-xml-jaxp/src/generated/java/org/apache/camel/converter/jaxp/StreamSourceConverterLoader.java
similarity index 100%
rename from
core/camel-jaxp/src/generated/resources/org/apache/camel/converter/jaxp/StreamSourceConverterLoader.java
rename to
core/camel-xml-jaxp/src/generated/java/org/apache/camel/converter/jaxp/StreamSourceConverterLoader.java
diff --git
a/core/camel-jaxp/src/generated/resources/org/apache/camel/converter/jaxp/XmlConverterLoader.java
b/core/camel-xml-jaxp/src/generated/java/org/apache/camel/converter/jaxp/XmlConverterLoader.java
similarity index 100%
rename from
core/camel-jaxp/src/generated/resources/org/apache/camel/converter/jaxp/XmlConverterLoader.java
rename to
core/camel-xml-jaxp/src/generated/java/org/apache/camel/converter/jaxp/XmlConverterLoader.java
diff --git
a/core/camel-jaxp/src/generated/resources/org/apache/camel/util/xml/StreamSourceConverterLoader.java
b/core/camel-xml-jaxp/src/generated/java/org/apache/camel/util/xml/StreamSourceConverterLoader.java
similarity index 100%
rename from
core/camel-jaxp/src/generated/resources/org/apache/camel/util/xml/StreamSourceConverterLoader.java
rename to
core/camel-xml-jaxp/src/generated/java/org/apache/camel/util/xml/StreamSourceConverterLoader.java
diff --git
a/core/camel-jaxp/src/generated/resources/META-INF/services/org/apache/camel/TypeConverterLoader
b/core/camel-xml-jaxp/src/generated/resources/META-INF/services/org/apache/camel/TypeConverterLoader
similarity index 100%
rename from
core/camel-jaxp/src/generated/resources/META-INF/services/org/apache/camel/TypeConverterLoader
rename to
core/camel-xml-jaxp/src/generated/resources/META-INF/services/org/apache/camel/TypeConverterLoader
diff --git
a/core/camel-jaxp/src/generated/resources/META-INF/services/org/apache/camel/language.properties
b/core/camel-xml-jaxp/src/generated/resources/META-INF/services/org/apache/camel/language.properties
similarity index 87%
rename from
core/camel-jaxp/src/generated/resources/META-INF/services/org/apache/camel/language.properties
rename to
core/camel-xml-jaxp/src/generated/resources/META-INF/services/org/apache/camel/language.properties
index 3a27a05..97de2e5 100644
---
a/core/camel-jaxp/src/generated/resources/META-INF/services/org/apache/camel/language.properties
+++
b/core/camel-xml-jaxp/src/generated/resources/META-INF/services/org/apache/camel/language.properties
@@ -1,7 +1,7 @@
# Generated by camel build tools - do NOT edit this file!
languages=xtokenize
groupId=org.apache.camel
-artifactId=camel-jaxp
+artifactId=camel-xml-jaxp
version=3.1.0-SNAPSHOT
projectName=Camel :: JAXP
projectDescription=Camel JAXP Support
diff --git
a/core/camel-jaxp/src/generated/resources/META-INF/services/org/apache/camel/language/xtokenize
b/core/camel-xml-jaxp/src/generated/resources/META-INF/services/org/apache/camel/language/xtokenize
similarity index 100%
rename from
core/camel-jaxp/src/generated/resources/META-INF/services/org/apache/camel/language/xtokenize
rename to
core/camel-xml-jaxp/src/generated/resources/META-INF/services/org/apache/camel/language/xtokenize
diff --git
a/core/camel-jaxp/src/generated/java/org/apache/camel/converter/jaxp/DomConverterLoader.java
b/core/camel-xml-jaxp/src/generated/resources/org/apache/camel/converter/jaxp/DomConverterLoader.java
similarity index 100%
rename from
core/camel-jaxp/src/generated/java/org/apache/camel/converter/jaxp/DomConverterLoader.java
rename to
core/camel-xml-jaxp/src/generated/resources/org/apache/camel/converter/jaxp/DomConverterLoader.java
diff --git
a/core/camel-jaxp/src/generated/java/org/apache/camel/converter/jaxp/StaxConverterLoader.java
b/core/camel-xml-jaxp/src/generated/resources/org/apache/camel/converter/jaxp/StaxConverterLoader.java
similarity index 100%
rename from
core/camel-jaxp/src/generated/java/org/apache/camel/converter/jaxp/StaxConverterLoader.java
rename to
core/camel-xml-jaxp/src/generated/resources/org/apache/camel/converter/jaxp/StaxConverterLoader.java
diff --git
a/core/camel-jaxp/src/generated/java/org/apache/camel/converter/jaxp/StreamSourceConverterLoader.java
b/core/camel-xml-jaxp/src/generated/resources/org/apache/camel/converter/jaxp/StreamSourceConverterLoader.java
similarity index 100%
rename from
core/camel-jaxp/src/generated/java/org/apache/camel/converter/jaxp/StreamSourceConverterLoader.java
rename to
core/camel-xml-jaxp/src/generated/resources/org/apache/camel/converter/jaxp/StreamSourceConverterLoader.java
diff --git
a/core/camel-jaxp/src/generated/java/org/apache/camel/converter/jaxp/XmlConverterLoader.java
b/core/camel-xml-jaxp/src/generated/resources/org/apache/camel/converter/jaxp/XmlConverterLoader.java
similarity index 100%
rename from
core/camel-jaxp/src/generated/java/org/apache/camel/converter/jaxp/XmlConverterLoader.java
rename to
core/camel-xml-jaxp/src/generated/resources/org/apache/camel/converter/jaxp/XmlConverterLoader.java
diff --git
a/core/camel-jaxp/src/generated/resources/org/apache/camel/language/xtokenizer/xtokenize.json
b/core/camel-xml-jaxp/src/generated/resources/org/apache/camel/language/xtokenizer/xtokenize.json
similarity index 98%
rename from
core/camel-jaxp/src/generated/resources/org/apache/camel/language/xtokenizer/xtokenize.json
rename to
core/camel-xml-jaxp/src/generated/resources/org/apache/camel/language/xtokenizer/xtokenize.json
index 128f511..ce9a323 100644
---
a/core/camel-jaxp/src/generated/resources/org/apache/camel/language/xtokenizer/xtokenize.json
+++
b/core/camel-xml-jaxp/src/generated/resources/org/apache/camel/language/xtokenizer/xtokenize.json
@@ -12,7 +12,7 @@
"javaType": "org.apache.camel.language.xtokenizer.XMLTokenizeLanguage",
"modelJavaType": "org.apache.camel.model.language.XMLTokenizerExpression",
"groupId": "org.apache.camel",
- "artifactId": "camel-jaxp",
+ "artifactId": "camel-xml-jaxp",
"version": "3.1.0-SNAPSHOT"
},
"properties": {
diff --git
a/core/camel-jaxp/src/generated/java/org/apache/camel/util/xml/StreamSourceConverterLoader.java
b/core/camel-xml-jaxp/src/generated/resources/org/apache/camel/util/xml/StreamSourceConverterLoader.java
similarity index 100%
rename from
core/camel-jaxp/src/generated/java/org/apache/camel/util/xml/StreamSourceConverterLoader.java
rename to
core/camel-xml-jaxp/src/generated/resources/org/apache/camel/util/xml/StreamSourceConverterLoader.java
diff --git a/core/camel-jaxp/src/main/docs/xtokenize-language.adoc
b/core/camel-xml-jaxp/src/main/docs/xtokenize-language.adoc
similarity index 100%
rename from core/camel-jaxp/src/main/docs/xtokenize-language.adoc
rename to core/camel-xml-jaxp/src/main/docs/xtokenize-language.adoc
diff --git
a/core/camel-jaxp/src/main/java/org/apache/camel/converter/jaxp/DomConverter.java
b/core/camel-xml-jaxp/src/main/java/org/apache/camel/converter/jaxp/DomConverter.java
similarity index 100%
rename from
core/camel-jaxp/src/main/java/org/apache/camel/converter/jaxp/DomConverter.java
rename to
core/camel-xml-jaxp/src/main/java/org/apache/camel/converter/jaxp/DomConverter.java
diff --git
a/core/camel-jaxp/src/main/java/org/apache/camel/converter/jaxp/StaxConverter.java
b/core/camel-xml-jaxp/src/main/java/org/apache/camel/converter/jaxp/StaxConverter.java
similarity index 100%
rename from
core/camel-jaxp/src/main/java/org/apache/camel/converter/jaxp/StaxConverter.java
rename to
core/camel-xml-jaxp/src/main/java/org/apache/camel/converter/jaxp/StaxConverter.java
diff --git
a/core/camel-jaxp/src/main/java/org/apache/camel/converter/jaxp/StreamSourceConverter.java
b/core/camel-xml-jaxp/src/main/java/org/apache/camel/converter/jaxp/StreamSourceConverter.java
similarity index 100%
rename from
core/camel-jaxp/src/main/java/org/apache/camel/converter/jaxp/StreamSourceConverter.java
rename to
core/camel-xml-jaxp/src/main/java/org/apache/camel/converter/jaxp/StreamSourceConverter.java
diff --git
a/core/camel-jaxp/src/main/java/org/apache/camel/converter/jaxp/XMLReaderPool.java
b/core/camel-xml-jaxp/src/main/java/org/apache/camel/converter/jaxp/XMLReaderPool.java
similarity index 100%
rename from
core/camel-jaxp/src/main/java/org/apache/camel/converter/jaxp/XMLReaderPool.java
rename to
core/camel-xml-jaxp/src/main/java/org/apache/camel/converter/jaxp/XMLReaderPool.java
diff --git
a/core/camel-jaxp/src/main/java/org/apache/camel/converter/jaxp/XMLStreamReaderInputStream.java
b/core/camel-xml-jaxp/src/main/java/org/apache/camel/converter/jaxp/XMLStreamReaderInputStream.java
similarity index 100%
rename from
core/camel-jaxp/src/main/java/org/apache/camel/converter/jaxp/XMLStreamReaderInputStream.java
rename to
core/camel-xml-jaxp/src/main/java/org/apache/camel/converter/jaxp/XMLStreamReaderInputStream.java
diff --git
a/core/camel-jaxp/src/main/java/org/apache/camel/converter/jaxp/XMLStreamReaderReader.java
b/core/camel-xml-jaxp/src/main/java/org/apache/camel/converter/jaxp/XMLStreamReaderReader.java
similarity index 100%
rename from
core/camel-jaxp/src/main/java/org/apache/camel/converter/jaxp/XMLStreamReaderReader.java
rename to
core/camel-xml-jaxp/src/main/java/org/apache/camel/converter/jaxp/XMLStreamReaderReader.java
diff --git
a/core/camel-jaxp/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java
b/core/camel-xml-jaxp/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java
similarity index 100%
rename from
core/camel-jaxp/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java
rename to
core/camel-xml-jaxp/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java
diff --git
a/core/camel-jaxp/src/main/java/org/apache/camel/converter/jaxp/XmlErrorListener.java
b/core/camel-xml-jaxp/src/main/java/org/apache/camel/converter/jaxp/XmlErrorListener.java
similarity index 100%
rename from
core/camel-jaxp/src/main/java/org/apache/camel/converter/jaxp/XmlErrorListener.java
rename to
core/camel-xml-jaxp/src/main/java/org/apache/camel/converter/jaxp/XmlErrorListener.java
diff --git
a/core/camel-jaxp/src/main/java/org/apache/camel/converter/jaxp/package.html
b/core/camel-xml-jaxp/src/main/java/org/apache/camel/converter/jaxp/package.html
similarity index 100%
rename from
core/camel-jaxp/src/main/java/org/apache/camel/converter/jaxp/package.html
rename to
core/camel-xml-jaxp/src/main/java/org/apache/camel/converter/jaxp/package.html
diff --git
a/core/camel-jaxp/src/main/java/org/apache/camel/language/xtokenizer/RecordableReader.java
b/core/camel-xml-jaxp/src/main/java/org/apache/camel/language/xtokenizer/RecordableReader.java
similarity index 100%
rename from
core/camel-jaxp/src/main/java/org/apache/camel/language/xtokenizer/RecordableReader.java
rename to
core/camel-xml-jaxp/src/main/java/org/apache/camel/language/xtokenizer/RecordableReader.java
diff --git
a/core/camel-jaxp/src/main/java/org/apache/camel/language/xtokenizer/XMLTokenExpressionIterator.java
b/core/camel-xml-jaxp/src/main/java/org/apache/camel/language/xtokenizer/XMLTokenExpressionIterator.java
similarity index 100%
rename from
core/camel-jaxp/src/main/java/org/apache/camel/language/xtokenizer/XMLTokenExpressionIterator.java
rename to
core/camel-xml-jaxp/src/main/java/org/apache/camel/language/xtokenizer/XMLTokenExpressionIterator.java
diff --git
a/core/camel-jaxp/src/main/java/org/apache/camel/language/xtokenizer/XMLTokenizeLanguage.java
b/core/camel-xml-jaxp/src/main/java/org/apache/camel/language/xtokenizer/XMLTokenizeLanguage.java
similarity index 100%
rename from
core/camel-jaxp/src/main/java/org/apache/camel/language/xtokenizer/XMLTokenizeLanguage.java
rename to
core/camel-xml-jaxp/src/main/java/org/apache/camel/language/xtokenizer/XMLTokenizeLanguage.java
diff --git
a/core/camel-jaxp/src/main/java/org/apache/camel/language/xtokenizer/package.html
b/core/camel-xml-jaxp/src/main/java/org/apache/camel/language/xtokenizer/package.html
similarity index 100%
rename from
core/camel-jaxp/src/main/java/org/apache/camel/language/xtokenizer/package.html
rename to
core/camel-xml-jaxp/src/main/java/org/apache/camel/language/xtokenizer/package.html
diff --git
a/core/camel-jaxp/src/main/java/org/apache/camel/support/builder/xml/NamespacesHelper.java
b/core/camel-xml-jaxp/src/main/java/org/apache/camel/support/builder/xml/NamespacesHelper.java
similarity index 100%
rename from
core/camel-jaxp/src/main/java/org/apache/camel/support/builder/xml/NamespacesHelper.java
rename to
core/camel-xml-jaxp/src/main/java/org/apache/camel/support/builder/xml/NamespacesHelper.java
diff --git
a/core/camel-jaxp/src/main/java/org/apache/camel/support/builder/xml/StAX2SAXSource.java
b/core/camel-xml-jaxp/src/main/java/org/apache/camel/support/builder/xml/StAX2SAXSource.java
similarity index 100%
rename from
core/camel-jaxp/src/main/java/org/apache/camel/support/builder/xml/StAX2SAXSource.java
rename to
core/camel-xml-jaxp/src/main/java/org/apache/camel/support/builder/xml/StAX2SAXSource.java
diff --git
a/core/camel-jaxp/src/main/java/org/apache/camel/support/builder/xml/XMLConverterHelper.java
b/core/camel-xml-jaxp/src/main/java/org/apache/camel/support/builder/xml/XMLConverterHelper.java
similarity index 100%
rename from
core/camel-jaxp/src/main/java/org/apache/camel/support/builder/xml/XMLConverterHelper.java
rename to
core/camel-xml-jaxp/src/main/java/org/apache/camel/support/builder/xml/XMLConverterHelper.java
diff --git
a/core/camel-jaxp/src/main/java/org/apache/camel/support/processor/validation/DefaultValidationErrorHandler.java
b/core/camel-xml-jaxp/src/main/java/org/apache/camel/support/processor/validation/DefaultValidationErrorHandler.java
similarity index 100%
rename from
core/camel-jaxp/src/main/java/org/apache/camel/support/processor/validation/DefaultValidationErrorHandler.java
rename to
core/camel-xml-jaxp/src/main/java/org/apache/camel/support/processor/validation/DefaultValidationErrorHandler.java
diff --git
a/core/camel-jaxp/src/main/java/org/apache/camel/support/processor/validation/NoXmlBodyValidationException.java
b/core/camel-xml-jaxp/src/main/java/org/apache/camel/support/processor/validation/NoXmlBodyValidationException.java
similarity index 100%
rename from
core/camel-jaxp/src/main/java/org/apache/camel/support/processor/validation/NoXmlBodyValidationException.java
rename to
core/camel-xml-jaxp/src/main/java/org/apache/camel/support/processor/validation/NoXmlBodyValidationException.java
diff --git
a/core/camel-jaxp/src/main/java/org/apache/camel/support/processor/validation/NoXmlHeaderValidationException.java
b/core/camel-xml-jaxp/src/main/java/org/apache/camel/support/processor/validation/NoXmlHeaderValidationException.java
similarity index 100%
rename from
core/camel-jaxp/src/main/java/org/apache/camel/support/processor/validation/NoXmlHeaderValidationException.java
rename to
core/camel-xml-jaxp/src/main/java/org/apache/camel/support/processor/validation/NoXmlHeaderValidationException.java
diff --git
a/core/camel-jaxp/src/main/java/org/apache/camel/support/processor/validation/SchemaReader.java
b/core/camel-xml-jaxp/src/main/java/org/apache/camel/support/processor/validation/SchemaReader.java
similarity index 100%
rename from
core/camel-jaxp/src/main/java/org/apache/camel/support/processor/validation/SchemaReader.java
rename to
core/camel-xml-jaxp/src/main/java/org/apache/camel/support/processor/validation/SchemaReader.java
diff --git
a/core/camel-jaxp/src/main/java/org/apache/camel/support/processor/validation/SchemaValidationException.java
b/core/camel-xml-jaxp/src/main/java/org/apache/camel/support/processor/validation/SchemaValidationException.java
similarity index 100%
rename from
core/camel-jaxp/src/main/java/org/apache/camel/support/processor/validation/SchemaValidationException.java
rename to
core/camel-xml-jaxp/src/main/java/org/apache/camel/support/processor/validation/SchemaValidationException.java
diff --git
a/core/camel-jaxp/src/main/java/org/apache/camel/support/processor/validation/ValidatingProcessor.java
b/core/camel-xml-jaxp/src/main/java/org/apache/camel/support/processor/validation/ValidatingProcessor.java
similarity index 100%
rename from
core/camel-jaxp/src/main/java/org/apache/camel/support/processor/validation/ValidatingProcessor.java
rename to
core/camel-xml-jaxp/src/main/java/org/apache/camel/support/processor/validation/ValidatingProcessor.java
diff --git
a/core/camel-jaxp/src/main/java/org/apache/camel/support/processor/validation/ValidatorErrorHandler.java
b/core/camel-xml-jaxp/src/main/java/org/apache/camel/support/processor/validation/ValidatorErrorHandler.java
similarity index 100%
rename from
core/camel-jaxp/src/main/java/org/apache/camel/support/processor/validation/ValidatorErrorHandler.java
rename to
core/camel-xml-jaxp/src/main/java/org/apache/camel/support/processor/validation/ValidatorErrorHandler.java
diff --git
a/core/camel-jaxp/src/main/java/org/apache/camel/support/processor/validation/package.html
b/core/camel-xml-jaxp/src/main/java/org/apache/camel/support/processor/validation/package.html
similarity index 100%
rename from
core/camel-jaxp/src/main/java/org/apache/camel/support/processor/validation/package.html
rename to
core/camel-xml-jaxp/src/main/java/org/apache/camel/support/processor/validation/package.html
diff --git
a/core/camel-jaxp/src/main/java/org/apache/camel/util/xml/BytesSource.java
b/core/camel-xml-jaxp/src/main/java/org/apache/camel/util/xml/BytesSource.java
similarity index 100%
rename from
core/camel-jaxp/src/main/java/org/apache/camel/util/xml/BytesSource.java
rename to
core/camel-xml-jaxp/src/main/java/org/apache/camel/util/xml/BytesSource.java
diff --git
a/core/camel-jaxp/src/main/java/org/apache/camel/util/xml/SourceCache.java
b/core/camel-xml-jaxp/src/main/java/org/apache/camel/util/xml/SourceCache.java
similarity index 100%
rename from
core/camel-jaxp/src/main/java/org/apache/camel/util/xml/SourceCache.java
rename to
core/camel-xml-jaxp/src/main/java/org/apache/camel/util/xml/SourceCache.java
diff --git
a/core/camel-jaxp/src/main/java/org/apache/camel/util/xml/StreamSourceCache.java
b/core/camel-xml-jaxp/src/main/java/org/apache/camel/util/xml/StreamSourceCache.java
similarity index 100%
rename from
core/camel-jaxp/src/main/java/org/apache/camel/util/xml/StreamSourceCache.java
rename to
core/camel-xml-jaxp/src/main/java/org/apache/camel/util/xml/StreamSourceCache.java
diff --git
a/core/camel-jaxp/src/main/java/org/apache/camel/util/xml/StreamSourceConverter.java
b/core/camel-xml-jaxp/src/main/java/org/apache/camel/util/xml/StreamSourceConverter.java
similarity index 100%
rename from
core/camel-jaxp/src/main/java/org/apache/camel/util/xml/StreamSourceConverter.java
rename to
core/camel-xml-jaxp/src/main/java/org/apache/camel/util/xml/StreamSourceConverter.java
diff --git
a/core/camel-jaxp/src/main/java/org/apache/camel/util/xml/StringSource.java
b/core/camel-xml-jaxp/src/main/java/org/apache/camel/util/xml/StringSource.java
similarity index 100%
rename from
core/camel-jaxp/src/main/java/org/apache/camel/util/xml/StringSource.java
rename to
core/camel-xml-jaxp/src/main/java/org/apache/camel/util/xml/StringSource.java
diff --git
a/core/camel-jaxp/src/main/java/org/apache/camel/util/xml/XmlLineNumberParser.java
b/core/camel-xml-jaxp/src/main/java/org/apache/camel/util/xml/XmlLineNumberParser.java
similarity index 100%
rename from
core/camel-jaxp/src/main/java/org/apache/camel/util/xml/XmlLineNumberParser.java
rename to
core/camel-xml-jaxp/src/main/java/org/apache/camel/util/xml/XmlLineNumberParser.java
diff --git
a/core/camel-jaxp/src/test/java/org/apache/camel/language/xtokenizer/AttributedQNameTest.java
b/core/camel-xml-jaxp/src/test/java/org/apache/camel/language/xtokenizer/AttributedQNameTest.java
similarity index 100%
rename from
core/camel-jaxp/src/test/java/org/apache/camel/language/xtokenizer/AttributedQNameTest.java
rename to
core/camel-xml-jaxp/src/test/java/org/apache/camel/language/xtokenizer/AttributedQNameTest.java
diff --git
a/core/camel-jaxp/src/test/java/org/apache/camel/language/xtokenizer/XMLTokenExpressionIteratorCharsetTest.java
b/core/camel-xml-jaxp/src/test/java/org/apache/camel/language/xtokenizer/XMLTokenExpressionIteratorCharsetTest.java
similarity index 100%
rename from
core/camel-jaxp/src/test/java/org/apache/camel/language/xtokenizer/XMLTokenExpressionIteratorCharsetTest.java
rename to
core/camel-xml-jaxp/src/test/java/org/apache/camel/language/xtokenizer/XMLTokenExpressionIteratorCharsetTest.java
diff --git
a/core/camel-jaxp/src/test/java/org/apache/camel/language/xtokenizer/XMLTokenExpressionIteratorGroupingTest.java
b/core/camel-xml-jaxp/src/test/java/org/apache/camel/language/xtokenizer/XMLTokenExpressionIteratorGroupingTest.java
similarity index 100%
rename from
core/camel-jaxp/src/test/java/org/apache/camel/language/xtokenizer/XMLTokenExpressionIteratorGroupingTest.java
rename to
core/camel-xml-jaxp/src/test/java/org/apache/camel/language/xtokenizer/XMLTokenExpressionIteratorGroupingTest.java
diff --git
a/core/camel-jaxp/src/test/java/org/apache/camel/language/xtokenizer/XMLTokenExpressionIteratorInvalidXMLTest.java
b/core/camel-xml-jaxp/src/test/java/org/apache/camel/language/xtokenizer/XMLTokenExpressionIteratorInvalidXMLTest.java
similarity index 100%
rename from
core/camel-jaxp/src/test/java/org/apache/camel/language/xtokenizer/XMLTokenExpressionIteratorInvalidXMLTest.java
rename to
core/camel-xml-jaxp/src/test/java/org/apache/camel/language/xtokenizer/XMLTokenExpressionIteratorInvalidXMLTest.java
diff --git
a/core/camel-jaxp/src/test/java/org/apache/camel/language/xtokenizer/XMLTokenExpressionIteratorTest.java
b/core/camel-xml-jaxp/src/test/java/org/apache/camel/language/xtokenizer/XMLTokenExpressionIteratorTest.java
similarity index 100%
rename from
core/camel-jaxp/src/test/java/org/apache/camel/language/xtokenizer/XMLTokenExpressionIteratorTest.java
rename to
core/camel-xml-jaxp/src/test/java/org/apache/camel/language/xtokenizer/XMLTokenExpressionIteratorTest.java
diff --git
a/core/camel-jaxp/src/test/java/org/apache/camel/util/xml/XmlLineNumberParserTest.java
b/core/camel-xml-jaxp/src/test/java/org/apache/camel/util/xml/XmlLineNumberParserTest.java
similarity index 100%
rename from
core/camel-jaxp/src/test/java/org/apache/camel/util/xml/XmlLineNumberParserTest.java
rename to
core/camel-xml-jaxp/src/test/java/org/apache/camel/util/xml/XmlLineNumberParserTest.java
diff --git
a/core/camel-jaxp/src/test/resources/org/apache/camel/util/camel-context.xml
b/core/camel-xml-jaxp/src/test/resources/org/apache/camel/util/camel-context.xml
similarity index 100%
rename from
core/camel-jaxp/src/test/resources/org/apache/camel/util/camel-context.xml
rename to
core/camel-xml-jaxp/src/test/resources/org/apache/camel/util/camel-context.xml
diff --git a/core/pom.xml b/core/pom.xml
index 03c0c7b..81fc186 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -42,7 +42,7 @@
<module>camel-management-api</module>
<module>camel-management</module>
<module>camel-base</module>
- <module>camel-jaxp</module>
+ <module>camel-xml-jaxp</module>
<module>camel-core-engine</module>
<module>camel-xml-io</module>
<module>camel-xml-jaxb</module>
diff --git a/docs/components/modules/ROOT/pages/index.adoc
b/docs/components/modules/ROOT/pages/index.adoc
index a8ea925..a026e47 100644
--- a/docs/components/modules/ROOT/pages/index.adoc
+++ b/docs/components/modules/ROOT/pages/index.adoc
@@ -787,7 +787,7 @@ Number of Languages: 17 in 11 JAR artifacts (0 deprecated)
| xref:tokenize-language.adoc[Tokenize] (camel-base) | 2.0 | To use Camel
message body or header with a tokenizer in Camel expressions or predicates.
-| xref:xtokenize-language.adoc[XML Tokenize] (camel-jaxp) | 2.14 | To use
Camel message body or header with a XML tokenizer in Camel expressions or
predicates.
+| xref:xtokenize-language.adoc[XML Tokenize] (camel-xml-jaxp) | 2.14 | To use
Camel message body or header with a XML tokenizer in Camel expressions or
predicates.
| xref:xpath-language.adoc[XPath] (camel-xpath) | 1.1 | To use XPath (XML) in
Camel expressions or predicates.
diff --git a/docs/components/modules/ROOT/pages/xtokenize-language.adoc
b/docs/components/modules/ROOT/pages/xtokenize-language.adoc
index ae10996..14b35bf 100644
--- a/docs/components/modules/ROOT/pages/xtokenize-language.adoc
+++ b/docs/components/modules/ROOT/pages/xtokenize-language.adoc
@@ -1,6 +1,6 @@
[[xtokenize-language]]
= XML Tokenize Language
-:page-source: core/camel-jaxp/src/main/docs/xtokenize-language.adoc
+:page-source: core/camel-xml-jaxp/src/main/docs/xtokenize-language.adoc
*Since Camel 2.14*
diff --git a/docs/gulpfile.js b/docs/gulpfile.js
index 3620f98..1b0bc19 100644
--- a/docs/gulpfile.js
+++ b/docs/gulpfile.js
@@ -35,7 +35,7 @@ function deleteComponentImageSymlinks() {
}
function createComponentSymlinks() {
- return src(['../core/camel-base/src/main/docs/*.adoc',
'../core/camel-jaxp/src/main/docs/*.adoc',
'../components/{*,*/*}/src/main/docs/*.adoc'])
+ return src(['../core/camel-base/src/main/docs/*.adoc',
'../core/camel-xml-jaxp/src/main/docs/*.adoc',
'../components/{*,*/*}/src/main/docs/*.adoc'])
.pipe(map((file, done) => {
// this flattens the output to just .../pages/....adoc
// instead of .../pages/camel-.../src/main/docs/....adoc
@@ -80,7 +80,7 @@ function deleteUserManualSymlinks() {
}
function createUserManualSymlinks() {
- return src(['../core/camel-base/src/main/docs/*.adoc',
'../core/camel-jaxp/src/main/docs/*.adoc',
'../core/camel-core-engine/src/main/docs/eips/*.adoc'])
+ return src(['../core/camel-base/src/main/docs/*.adoc',
'../core/camel-xml-jaxp/src/main/docs/*.adoc',
'../core/camel-core-engine/src/main/docs/eips/*.adoc'])
// Antora disabled symlinks, there is an issue open
// https://gitlab.com/antora/antora/issues/188
// to reinstate symlink support, until that's resolved
diff --git a/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide.adoc
b/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide.adoc
index 33abb55..74f73f2 100644
--- a/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide.adoc
+++ b/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide.adoc
@@ -94,11 +94,13 @@ Should be changed to
ipfs:add
----
-=== camel-core-engine
+=== camel-core-engine and camel-jaxp
XML and JAXB has been moved out of camel-base and camel-core-engine.
-The camel-jaxp JAR has XML parsers and type converters.
+The module camel-jaxp has been renamed to camel-xml-jaxp.
+
+The camel-xml-jaxp JAR has XML parsers and type converters.
The camel-xml-jaxb has support for loading XML DSL routes using JAXB.
An alternative is to use the new camel-xml-io for loading XML routes which is
more light-weight and faster than JAXB.
@@ -235,9 +237,9 @@ Should now be:
The class `org.apache.camel.model.ModelHelper` has been removed. Instead you
can use its functionality from `ExtendedCamelContext` by
the `getModelToXMLDumper` and `getXMLRoutesDefinitionLoader` methods which has
APIs similar to `ModelHelper`.
-==== camel-jaxp
+==== camel-xml-jaxp
-The class `org.apache.camel.processor.validation.PredicateValidatingProcessor`
has moved from `camel-jaxp` JAR
+The class `org.apache.camel.processor.validation.PredicateValidatingProcessor`
has moved from `camel-xml-jaxp` JAR
to `camel-support` JAR and renamed to
`org.apache.camel.support.processor.PredicateValidatingProcessor`.
==== Java DSL
diff --git a/docs/user-manual/modules/ROOT/pages/xtokenize-language.adoc
b/docs/user-manual/modules/ROOT/pages/xtokenize-language.adoc
index ae10996..14b35bf 100644
--- a/docs/user-manual/modules/ROOT/pages/xtokenize-language.adoc
+++ b/docs/user-manual/modules/ROOT/pages/xtokenize-language.adoc
@@ -1,6 +1,6 @@
[[xtokenize-language]]
= XML Tokenize Language
-:page-source: core/camel-jaxp/src/main/docs/xtokenize-language.adoc
+:page-source: core/camel-xml-jaxp/src/main/docs/xtokenize-language.adoc
*Since Camel 2.14*
diff --git a/parent/pom.xml b/parent/pom.xml
index e58b3c2..9318b23 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -764,7 +764,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-jaxp</artifactId>
+ <artifactId>camel-xml-jaxp</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
diff --git a/platforms/karaf/features/src/main/resources/features.xml
b/platforms/karaf/features/src/main/resources/features.xml
index a183476..5c3a9b5 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -59,7 +59,7 @@
<bundle>mvn:org.apache.camel/camel-core/${project.version}</bundle>
<bundle>mvn:org.apache.camel/camel-core-osgi/${project.version}</bundle>
<bundle>mvn:org.apache.camel/camel-cloud/${project.version}</bundle>
- <bundle>mvn:org.apache.camel/camel-jaxp/${project.version}</bundle>
+ <bundle>mvn:org.apache.camel/camel-xml-jaxp/${project.version}</bundle>
<bundle>mvn:org.apache.camel/camel-xml-jaxb/${project.version}</bundle>
<bundle>mvn:org.apache.camel/camel-main/${project.version}</bundle>
<bundle>mvn:org.apache.camel/camel-caffeine-lrucache/${project.version}</bundle>
diff --git
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogKarafMojo.java
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogKarafMojo.java
index b5f76ae..4b43707 100644
---
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogKarafMojo.java
+++
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogKarafMojo.java
@@ -265,8 +265,8 @@ public class PrepareCatalogKarafMojo extends AbstractMojo {
if (baseDir != null && baseDir.isDirectory()) {
File target = new File(baseDir, "target/classes");
findLanguageFilesRecursive(target, jsonFiles, languageFiles, new
CamelLanguagesFileFilter());
- // also look in camel-jaxp
- target = new File(baseDir, "../camel-jaxp/target/classes");
+ // also look in camel-xml-jaxp
+ target = new File(baseDir, "../camel-xml-jaxp/target/classes");
findLanguageFilesRecursive(target, jsonFiles, languageFiles, new
CamelLanguagesFileFilter());
}
diff --git
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogMojo.java
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogMojo.java
index 8c3d68d..2040222 100644
---
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogMojo.java
+++
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogMojo.java
@@ -161,9 +161,9 @@ public class PrepareCatalogMojo extends AbstractMojo {
protected File baseDir;
/**
- * The camel-jaxp directory
+ * The camel-xml-jaxp directory
*/
- @Parameter(defaultValue =
"${project.build.directory}/../../../core/camel-jaxp")
+ @Parameter(defaultValue =
"${project.build.directory}/../../../core/camel-xml-jaxp")
protected File jaxpDir;
/**
