This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/main by this push:
     new 925395258b1 CAMEL-18320: camel-core - Move xtokenize language into 
camel-stax
925395258b1 is described below

commit 925395258b1bb8c001dcf7ef571e09c0eb748221
Author: Claus Ibsen <[email protected]>
AuthorDate: Mon Sep 5 14:48:06 2022 +0200

    CAMEL-18320: camel-core - Move xtokenize language into camel-stax
---
 .../apache/camel/catalog/components/language.json  |  2 +-
 .../apache/camel/catalog/languages/xtokenize.json  |  2 +-
 .../apache/camel/component/language/language.json  |  2 +-
 .../camel/component/language/LanguageEndpoint.java |  4 +-
 .../camel/language/SpringXMLTokenSplitTest.java    | 39 -----------------
 components/camel-stax/pom.xml                      |  4 ++
 .../services/org/apache/camel/language.properties  |  6 +--
 .../services/org/apache/camel/language/xtokenize   |  0
 .../camel/language/xtokenizer/xtokenize.json       |  2 +-
 .../src/main/docs}/xtokenize-language.adoc         |  2 +-
 .../language/xtokenizer/RecordableReader.java      |  0
 .../xtokenizer/XMLTokenExpressionIterator.java     |  0
 .../language/xtokenizer/XMLTokenizeLanguage.java   |  0
 .../apache/camel/language/xtokenizer/package.html  |  0
 .../language/xtokenizer/AttributedQNameTest.java   |  0
 .../xtokenizer}/SplitGroupMultiXmlTokenTest.java   |  6 +--
 .../SplitGroupWrappedMultiXmlTokenTest.java        |  6 +--
 .../xtokenizer/SpringXMLTokenSplitTest.java        | 49 ++++------------------
 .../XMLTokenExpressionIteratorCharsetTest.java     |  0
 .../XMLTokenExpressionIteratorGroupingTest.java    |  0
 .../XMLTokenExpressionIteratorInvalidXMLTest.java  |  0
 .../xtokenizer/XMLTokenExpressionIteratorTest.java |  0
 .../language/xtokenizer}/XMLTokenSplitTest.java    |  9 ++--
 .../XMLTokenizeExpressionIteratorWModeTest.java    |  0
 .../XMLTokenizeLanguageGroupingTest.java           | 18 +++-----
 .../XMLTokenizeLanguageStreamingFileTest.java      |  6 +--
 .../XMLTokenizeLanguageStreamingTest.java          |  2 +-
 .../xtokenizer}/XMLTokenizeLanguageTest.java       | 18 +++-----
 .../XMLTokenizeWrapLanguageGroupingTest.java       |  6 +--
 .../xtokenizer}/XMLTokenizeWrapLanguageTest.java   |  6 +--
 .../xtokenizer}/SpringXMLTokenSplitTest.xml        | 26 ++++++------
 .../{language.properties => other.properties}      |  2 +-
 .../src/generated/resources/xml-jaxp.json          | 15 +++++++
 .../modules/languages/examples/json/xtokenize.json |  2 +-
 .../languages/pages/xtokenize-language.adoc        |  2 +-
 .../ROOT/pages/camel-3x-upgrade-guide-3_19.adoc    |  9 +++-
 36 files changed, 91 insertions(+), 154 deletions(-)

diff --git 
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/language.json
 
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/language.json
index 58a81109e8b..d3417f202d9 100644
--- 
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/language.json
+++ 
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/language.json
@@ -29,7 +29,7 @@
     "CamelLanguageScript": { "kind": "header", "displayName": "", "group": 
"producer", "label": "", "required": false, "javaType": "String or Expression", 
"deprecated": false, "deprecationNote": "", "autowired": false, "secret": 
false, "description": "The script to execute provided in the header. Takes 
precedence over script configured on the endpoint.", "constantName": 
"org.apache.camel.component.language.LanguageConstants#LANGUAGE_SCRIPT" }
   },
   "properties": {
-    "languageName": { "kind": "path", "displayName": "Language Name", "group": 
"producer", "label": "", "required": true, "type": "string", "javaType": 
"java.lang.String", "enum": [ "bean", "constant", "exchangeProperty", "file", 
"groovy", "header", "javascript", "jsonpath", "mvel", "ognl", "", "ref", 
"simple", "spel", "sql", "terser", "tokenize", "xpath", "xquery", "xtokenize" 
], "deprecated": false, "deprecationNote": "", "autowired": false, "secret": 
false, "description": "Sets the na [...]
+    "languageName": { "kind": "path", "displayName": "Language Name", "group": 
"producer", "label": "", "required": true, "type": "string", "javaType": 
"java.lang.String", "enum": [ "bean", "constant", "csimple", "datasonnet", 
"exchangeProperty", "file", "groovy", "header", "hl7terser", "joor", "jq", 
"jsonpath", "mvel", "ognl", "ref", "simple", "spel", "sql", "tokenize", 
"xpath", "xquery", "xtokenize" ], "deprecated": false, "deprecationNote": "", 
"autowired": false, "secret": false, "de [...]
     "resourceUri": { "kind": "path", "displayName": "Resource Uri", "group": 
"producer", "label": "", "required": false, "type": "string", "javaType": 
"java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": 
false, "secret": false, "description": "Path to the resource, or a reference to 
lookup a bean in the Registry to use as the resource" },
     "allowContextMapAll": { "kind": "parameter", "displayName": "Allow Context 
Map All", "group": "producer", "label": "", "required": false, "type": 
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false, 
"secret": false, "defaultValue": false, "description": "Sets whether the 
context map should allow access to all details. By default only the message 
body and headers can be accessed. This option can be enabled for full access to 
the current Exchange and CamelContext. [...]
     "binary": { "kind": "parameter", "displayName": "Binary", "group": 
"producer", "label": "", "required": false, "type": "boolean", "javaType": 
"boolean", "deprecated": false, "autowired": false, "secret": false, 
"defaultValue": false, "description": "Whether the script is binary content or 
text content. By default the script is read as text content (eg 
java.lang.String)" },
diff --git 
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/languages/xtokenize.json
 
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/languages/xtokenize.json
index cea5f0fb268..b09d950bf44 100644
--- 
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/languages/xtokenize.json
+++ 
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/languages/xtokenize.json
@@ -10,7 +10,7 @@
     "javaType": "org.apache.camel.language.xtokenizer.XMLTokenizeLanguage",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
-    "artifactId": "camel-xml-jaxp",
+    "artifactId": "camel-stax",
     "version": "3.19.0-SNAPSHOT",
     "modelName": "xtokenize",
     "modelJavaType": "org.apache.camel.model.language.XMLTokenizerExpression"
diff --git 
a/components/camel-language/src/generated/resources/org/apache/camel/component/language/language.json
 
b/components/camel-language/src/generated/resources/org/apache/camel/component/language/language.json
index 58a81109e8b..d3417f202d9 100644
--- 
a/components/camel-language/src/generated/resources/org/apache/camel/component/language/language.json
+++ 
b/components/camel-language/src/generated/resources/org/apache/camel/component/language/language.json
@@ -29,7 +29,7 @@
     "CamelLanguageScript": { "kind": "header", "displayName": "", "group": 
"producer", "label": "", "required": false, "javaType": "String or Expression", 
"deprecated": false, "deprecationNote": "", "autowired": false, "secret": 
false, "description": "The script to execute provided in the header. Takes 
precedence over script configured on the endpoint.", "constantName": 
"org.apache.camel.component.language.LanguageConstants#LANGUAGE_SCRIPT" }
   },
   "properties": {
-    "languageName": { "kind": "path", "displayName": "Language Name", "group": 
"producer", "label": "", "required": true, "type": "string", "javaType": 
"java.lang.String", "enum": [ "bean", "constant", "exchangeProperty", "file", 
"groovy", "header", "javascript", "jsonpath", "mvel", "ognl", "", "ref", 
"simple", "spel", "sql", "terser", "tokenize", "xpath", "xquery", "xtokenize" 
], "deprecated": false, "deprecationNote": "", "autowired": false, "secret": 
false, "description": "Sets the na [...]
+    "languageName": { "kind": "path", "displayName": "Language Name", "group": 
"producer", "label": "", "required": true, "type": "string", "javaType": 
"java.lang.String", "enum": [ "bean", "constant", "csimple", "datasonnet", 
"exchangeProperty", "file", "groovy", "header", "hl7terser", "joor", "jq", 
"jsonpath", "mvel", "ognl", "ref", "simple", "spel", "sql", "tokenize", 
"xpath", "xquery", "xtokenize" ], "deprecated": false, "deprecationNote": "", 
"autowired": false, "secret": false, "de [...]
     "resourceUri": { "kind": "path", "displayName": "Resource Uri", "group": 
"producer", "label": "", "required": false, "type": "string", "javaType": 
"java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": 
false, "secret": false, "description": "Path to the resource, or a reference to 
lookup a bean in the Registry to use as the resource" },
     "allowContextMapAll": { "kind": "parameter", "displayName": "Allow Context 
Map All", "group": "producer", "label": "", "required": false, "type": 
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false, 
"secret": false, "defaultValue": false, "description": "Sets whether the 
context map should allow access to all details. By default only the message 
body and headers can be accessed. This option can be enabled for full access to 
the current Exchange and CamelContext. [...]
     "binary": { "kind": "parameter", "displayName": "Binary", "group": 
"producer", "label": "", "required": false, "type": "boolean", "javaType": 
"boolean", "deprecated": false, "autowired": false, "secret": false, 
"defaultValue": false, "description": "Whether the script is binary content or 
text content. By default the script is read as text content (eg 
java.lang.String)" },
diff --git 
a/components/camel-language/src/main/java/org/apache/camel/component/language/LanguageEndpoint.java
 
b/components/camel-language/src/main/java/org/apache/camel/component/language/LanguageEndpoint.java
index 2363b37ee61..6d6f310fba0 100644
--- 
a/components/camel-language/src/main/java/org/apache/camel/component/language/LanguageEndpoint.java
+++ 
b/components/camel-language/src/main/java/org/apache/camel/component/language/LanguageEndpoint.java
@@ -52,8 +52,8 @@ public class LanguageEndpoint extends ResourceEndpoint {
     private Language language;
     private Expression expression;
     private boolean contentResolvedFromResource;
-    @UriPath(enums = 
"bean,constant,exchangeProperty,file,groovy,header,javascript,jsonpath,mvel,ognl,"
-                     + 
",ref,simple,spel,sql,terser,tokenize,xpath,xquery,xtokenize")
+    @UriPath(enums = 
"bean,constant,csimple,datasonnet,exchangeProperty,file,groovy,header,hl7terser,joor,jq,jsonpath"
+            + ",mvel,ognl,ref,simple,spel,sql,tokenize,xpath,xquery,xtokenize")
     @Metadata(required = true)
     private String languageName;
     // resourceUri is optional in the language endpoint
diff --git 
a/components/camel-spring-xml/src/test/java/org/apache/camel/language/SpringXMLTokenSplitTest.java
 
b/components/camel-spring-xml/src/test/java/org/apache/camel/language/SpringXMLTokenSplitTest.java
deleted file mode 100644
index 2cd07161172..00000000000
--- 
a/components/camel-spring-xml/src/test/java/org/apache/camel/language/SpringXMLTokenSplitTest.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * 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.language;
-
-import org.apache.camel.CamelContext;
-import org.junit.jupiter.api.Test;
-
-import static 
org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
-
-/**
- *
- */
-public class SpringXMLTokenSplitTest extends XMLTokenSplitTest {
-
-    @Override
-    protected CamelContext createCamelContext() throws Exception {
-        return createSpringCamelContext(this, 
"org/apache/camel/language/SpringXMLTokenSplitTest.xml");
-    }
-
-    @Override
-    @Test
-    public void testXMLToken2() throws Exception {
-        // noop
-    }
-}
diff --git a/components/camel-stax/pom.xml b/components/camel-stax/pom.xml
index 7397850a0a7..da6493f45d6 100644
--- a/components/camel-stax/pom.xml
+++ b/components/camel-stax/pom.xml
@@ -44,6 +44,10 @@
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-support</artifactId>
         </dependency>          
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-xml-jaxp</artifactId>
+        </dependency>
         <dependency>
             <groupId>com.fasterxml.woodstox</groupId>
             <artifactId>woodstox-core</artifactId>
diff --git 
a/core/camel-xml-jaxp/src/generated/resources/META-INF/services/org/apache/camel/language.properties
 
b/components/camel-stax/src/generated/resources/META-INF/services/org/apache/camel/language.properties
similarity index 58%
copy from 
core/camel-xml-jaxp/src/generated/resources/META-INF/services/org/apache/camel/language.properties
copy to 
components/camel-stax/src/generated/resources/META-INF/services/org/apache/camel/language.properties
index ffdfa41ce0c..3f94546a549 100644
--- 
a/core/camel-xml-jaxp/src/generated/resources/META-INF/services/org/apache/camel/language.properties
+++ 
b/components/camel-stax/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-xml-jaxp
+artifactId=camel-stax
 version=3.19.0-SNAPSHOT
-projectName=Camel :: XML JAXP
-projectDescription=Camel XML JAXP
+projectName=Camel :: StAX
+projectDescription=Camel StAX support
diff --git 
a/core/camel-xml-jaxp/src/generated/resources/META-INF/services/org/apache/camel/language/xtokenize
 
b/components/camel-stax/src/generated/resources/META-INF/services/org/apache/camel/language/xtokenize
similarity index 100%
rename from 
core/camel-xml-jaxp/src/generated/resources/META-INF/services/org/apache/camel/language/xtokenize
rename to 
components/camel-stax/src/generated/resources/META-INF/services/org/apache/camel/language/xtokenize
diff --git 
a/core/camel-xml-jaxp/src/generated/resources/org/apache/camel/language/xtokenizer/xtokenize.json
 
b/components/camel-stax/src/generated/resources/org/apache/camel/language/xtokenizer/xtokenize.json
similarity index 98%
rename from 
core/camel-xml-jaxp/src/generated/resources/org/apache/camel/language/xtokenizer/xtokenize.json
rename to 
components/camel-stax/src/generated/resources/org/apache/camel/language/xtokenizer/xtokenize.json
index cea5f0fb268..b09d950bf44 100644
--- 
a/core/camel-xml-jaxp/src/generated/resources/org/apache/camel/language/xtokenizer/xtokenize.json
+++ 
b/components/camel-stax/src/generated/resources/org/apache/camel/language/xtokenizer/xtokenize.json
@@ -10,7 +10,7 @@
     "javaType": "org.apache.camel.language.xtokenizer.XMLTokenizeLanguage",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
-    "artifactId": "camel-xml-jaxp",
+    "artifactId": "camel-stax",
     "version": "3.19.0-SNAPSHOT",
     "modelName": "xtokenize",
     "modelJavaType": "org.apache.camel.model.language.XMLTokenizerExpression"
diff --git 
a/core/camel-xml-jaxp/src/main/docs/modules/languages/pages/xtokenize-language.adoc
 b/components/camel-stax/src/main/docs/xtokenize-language.adoc
similarity index 97%
rename from 
core/camel-xml-jaxp/src/main/docs/modules/languages/pages/xtokenize-language.adoc
rename to components/camel-stax/src/main/docs/xtokenize-language.adoc
index 95805020061..9e2c4c912cb 100644
--- 
a/core/camel-xml-jaxp/src/main/docs/modules/languages/pages/xtokenize-language.adoc
+++ b/components/camel-stax/src/main/docs/xtokenize-language.adoc
@@ -1,7 +1,7 @@
 = XML Tokenize Language
 :doctitle: XML Tokenize
 :shortname: xtokenize
-:artifactid: camel-xml-jaxp
+:artifactid: camel-stax
 :description: Tokenize XML payloads.
 :since: 2.14
 :supportlevel: Stable
diff --git 
a/core/camel-xml-jaxp/src/main/java/org/apache/camel/language/xtokenizer/RecordableReader.java
 
b/components/camel-stax/src/main/java/org/apache/camel/language/xtokenizer/RecordableReader.java
similarity index 100%
rename from 
core/camel-xml-jaxp/src/main/java/org/apache/camel/language/xtokenizer/RecordableReader.java
rename to 
components/camel-stax/src/main/java/org/apache/camel/language/xtokenizer/RecordableReader.java
diff --git 
a/core/camel-xml-jaxp/src/main/java/org/apache/camel/language/xtokenizer/XMLTokenExpressionIterator.java
 
b/components/camel-stax/src/main/java/org/apache/camel/language/xtokenizer/XMLTokenExpressionIterator.java
similarity index 100%
rename from 
core/camel-xml-jaxp/src/main/java/org/apache/camel/language/xtokenizer/XMLTokenExpressionIterator.java
rename to 
components/camel-stax/src/main/java/org/apache/camel/language/xtokenizer/XMLTokenExpressionIterator.java
diff --git 
a/core/camel-xml-jaxp/src/main/java/org/apache/camel/language/xtokenizer/XMLTokenizeLanguage.java
 
b/components/camel-stax/src/main/java/org/apache/camel/language/xtokenizer/XMLTokenizeLanguage.java
similarity index 100%
rename from 
core/camel-xml-jaxp/src/main/java/org/apache/camel/language/xtokenizer/XMLTokenizeLanguage.java
rename to 
components/camel-stax/src/main/java/org/apache/camel/language/xtokenizer/XMLTokenizeLanguage.java
diff --git 
a/core/camel-xml-jaxp/src/main/java/org/apache/camel/language/xtokenizer/package.html
 
b/components/camel-stax/src/main/java/org/apache/camel/language/xtokenizer/package.html
similarity index 100%
rename from 
core/camel-xml-jaxp/src/main/java/org/apache/camel/language/xtokenizer/package.html
rename to 
components/camel-stax/src/main/java/org/apache/camel/language/xtokenizer/package.html
diff --git 
a/core/camel-xml-jaxp/src/test/java/org/apache/camel/language/xtokenizer/AttributedQNameTest.java
 
b/components/camel-stax/src/test/java/org/apache/camel/language/xtokenizer/AttributedQNameTest.java
similarity index 100%
rename from 
core/camel-xml-jaxp/src/test/java/org/apache/camel/language/xtokenizer/AttributedQNameTest.java
rename to 
components/camel-stax/src/test/java/org/apache/camel/language/xtokenizer/AttributedQNameTest.java
diff --git 
a/core/camel-core/src/test/java/org/apache/camel/processor/SplitGroupMultiXmlTokenTest.java
 
b/components/camel-stax/src/test/java/org/apache/camel/language/xtokenizer/SplitGroupMultiXmlTokenTest.java
similarity index 94%
rename from 
core/camel-core/src/test/java/org/apache/camel/processor/SplitGroupMultiXmlTokenTest.java
rename to 
components/camel-stax/src/test/java/org/apache/camel/language/xtokenizer/SplitGroupMultiXmlTokenTest.java
index 03a07360223..f0f838405d4 100644
--- 
a/core/camel-core/src/test/java/org/apache/camel/processor/SplitGroupMultiXmlTokenTest.java
+++ 
b/components/camel-stax/src/test/java/org/apache/camel/language/xtokenizer/SplitGroupMultiXmlTokenTest.java
@@ -14,16 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.camel.processor;
+package org.apache.camel.language.xtokenizer;
 
-import org.apache.camel.ContextTestSupport;
 import org.apache.camel.Exchange;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.support.builder.Namespaces;
+import org.apache.camel.test.junit5.CamelTestSupport;
 import org.junit.jupiter.api.Test;
 
-public class SplitGroupMultiXmlTokenTest extends ContextTestSupport {
+public class SplitGroupMultiXmlTokenTest extends CamelTestSupport {
 
     @Test
     public void testTokenXMLPairGroup() throws Exception {
diff --git 
a/core/camel-core/src/test/java/org/apache/camel/processor/SplitGroupWrappedMultiXmlTokenTest.java
 
b/components/camel-stax/src/test/java/org/apache/camel/language/xtokenizer/SplitGroupWrappedMultiXmlTokenTest.java
similarity index 94%
rename from 
core/camel-core/src/test/java/org/apache/camel/processor/SplitGroupWrappedMultiXmlTokenTest.java
rename to 
components/camel-stax/src/test/java/org/apache/camel/language/xtokenizer/SplitGroupWrappedMultiXmlTokenTest.java
index 8015f3c6ffd..88c15b61736 100644
--- 
a/core/camel-core/src/test/java/org/apache/camel/processor/SplitGroupWrappedMultiXmlTokenTest.java
+++ 
b/components/camel-stax/src/test/java/org/apache/camel/language/xtokenizer/SplitGroupWrappedMultiXmlTokenTest.java
@@ -14,16 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.camel.processor;
+package org.apache.camel.language.xtokenizer;
 
-import org.apache.camel.ContextTestSupport;
 import org.apache.camel.Exchange;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.support.builder.Namespaces;
+import org.apache.camel.test.junit5.CamelTestSupport;
 import org.junit.jupiter.api.Test;
 
-public class SplitGroupWrappedMultiXmlTokenTest extends ContextTestSupport {
+public class SplitGroupWrappedMultiXmlTokenTest extends CamelTestSupport {
 
     @Test
     public void testTokenXMLPairGroup() throws Exception {
diff --git 
a/core/camel-core/src/test/java/org/apache/camel/language/XMLTokenSplitTest.java
 
b/components/camel-stax/src/test/java/org/apache/camel/language/xtokenizer/SpringXMLTokenSplitTest.java
similarity index 53%
copy from 
core/camel-core/src/test/java/org/apache/camel/language/XMLTokenSplitTest.java
copy to 
components/camel-stax/src/test/java/org/apache/camel/language/xtokenizer/SpringXMLTokenSplitTest.java
index 671bd72012d..db39383d1e0 100644
--- 
a/core/camel-core/src/test/java/org/apache/camel/language/XMLTokenSplitTest.java
+++ 
b/components/camel-stax/src/test/java/org/apache/camel/language/xtokenizer/SpringXMLTokenSplitTest.java
@@ -14,19 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.camel.language;
+package org.apache.camel.language.xtokenizer;
 
-import org.apache.camel.ContextTestSupport;
 import org.apache.camel.Exchange;
-import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.support.builder.Namespaces;
+import org.apache.camel.test.spring.junit5.CamelSpringTestSupport;
 import org.junit.jupiter.api.Test;
+import org.springframework.context.support.AbstractApplicationContext;
+import org.springframework.context.support.ClassPathXmlApplicationContext;
 
-/**
- *
- */
-public class XMLTokenSplitTest extends ContextTestSupport {
+public class SpringXMLTokenSplitTest extends CamelSpringTestSupport {
 
     @Test
     public void testXMLToken() throws Exception {
@@ -42,18 +39,9 @@ public class XMLTokenSplitTest extends ContextTestSupport {
         assertMockEndpointsSatisfied();
     }
 
-    @Test
-    public void testXMLToken2() throws Exception {
-        MockEndpoint mock = getMockEndpoint("mock:split");
-        mock.expectedMessageCount(3);
-        mock.message(0).body().isEqualTo("<order id=\"1\" 
xmlns=\"http:acme.com\">Camel in Action</order>");
-        mock.message(1).body().isEqualTo("<order id=\"2\" 
xmlns=\"http:acme.com\">ActiveMQ in Action</order>");
-        mock.message(2).body().isEqualTo("<order id=\"3\" 
xmlns=\"http:acme.com\">DSL in Action</order>");
-
-        String body = createBody();
-        template.sendBodyAndHeader(fileUri("xtokenizer2"), body, 
Exchange.FILE_NAME, "orders.xml");
-
-        assertMockEndpointsSatisfied();
+    @Override
+    protected AbstractApplicationContext createApplicationContext() {
+        return new 
ClassPathXmlApplicationContext("org/apache/camel/language/xtokenizer/SpringXMLTokenSplitTest.xml");
     }
 
     protected String createBody() {
@@ -67,25 +55,4 @@ public class XMLTokenSplitTest extends ContextTestSupport {
         return sb.toString();
     }
 
-    @Override
-    protected RouteBuilder createRouteBuilder() throws Exception {
-        return new RouteBuilder() {
-            Namespaces ns = new Namespaces("", "http:acme.com");
-
-            @Override
-            public void configure() throws Exception {
-                // START SNIPPET: e1
-                from(fileUri("xtokenizer?initialDelay=0&delay=10"))
-                        // split the order child tags, and inherit namespaces 
from
-                        // the orders root tag
-                        .split().xtokenize("//orders/order", 
ns).to("mock:split");
-                // END SNIPPET: e1
-
-                from(fileUri("xtokenizer2?initialDelay=0&delay=10"))
-                        // split the order child tags, and inherit namespaces 
from
-                        // the orders root tag
-                        .split(body().xtokenize("//orders/order", 
ns)).to("mock:split");
-            }
-        };
-    }
 }
diff --git 
a/core/camel-xml-jaxp/src/test/java/org/apache/camel/language/xtokenizer/XMLTokenExpressionIteratorCharsetTest.java
 
b/components/camel-stax/src/test/java/org/apache/camel/language/xtokenizer/XMLTokenExpressionIteratorCharsetTest.java
similarity index 100%
rename from 
core/camel-xml-jaxp/src/test/java/org/apache/camel/language/xtokenizer/XMLTokenExpressionIteratorCharsetTest.java
rename to 
components/camel-stax/src/test/java/org/apache/camel/language/xtokenizer/XMLTokenExpressionIteratorCharsetTest.java
diff --git 
a/core/camel-xml-jaxp/src/test/java/org/apache/camel/language/xtokenizer/XMLTokenExpressionIteratorGroupingTest.java
 
b/components/camel-stax/src/test/java/org/apache/camel/language/xtokenizer/XMLTokenExpressionIteratorGroupingTest.java
similarity index 100%
rename from 
core/camel-xml-jaxp/src/test/java/org/apache/camel/language/xtokenizer/XMLTokenExpressionIteratorGroupingTest.java
rename to 
components/camel-stax/src/test/java/org/apache/camel/language/xtokenizer/XMLTokenExpressionIteratorGroupingTest.java
diff --git 
a/core/camel-xml-jaxp/src/test/java/org/apache/camel/language/xtokenizer/XMLTokenExpressionIteratorInvalidXMLTest.java
 
b/components/camel-stax/src/test/java/org/apache/camel/language/xtokenizer/XMLTokenExpressionIteratorInvalidXMLTest.java
similarity index 100%
rename from 
core/camel-xml-jaxp/src/test/java/org/apache/camel/language/xtokenizer/XMLTokenExpressionIteratorInvalidXMLTest.java
rename to 
components/camel-stax/src/test/java/org/apache/camel/language/xtokenizer/XMLTokenExpressionIteratorInvalidXMLTest.java
diff --git 
a/core/camel-xml-jaxp/src/test/java/org/apache/camel/language/xtokenizer/XMLTokenExpressionIteratorTest.java
 
b/components/camel-stax/src/test/java/org/apache/camel/language/xtokenizer/XMLTokenExpressionIteratorTest.java
similarity index 100%
rename from 
core/camel-xml-jaxp/src/test/java/org/apache/camel/language/xtokenizer/XMLTokenExpressionIteratorTest.java
rename to 
components/camel-stax/src/test/java/org/apache/camel/language/xtokenizer/XMLTokenExpressionIteratorTest.java
diff --git 
a/core/camel-core/src/test/java/org/apache/camel/language/XMLTokenSplitTest.java
 
b/components/camel-stax/src/test/java/org/apache/camel/language/xtokenizer/XMLTokenSplitTest.java
similarity index 96%
rename from 
core/camel-core/src/test/java/org/apache/camel/language/XMLTokenSplitTest.java
rename to 
components/camel-stax/src/test/java/org/apache/camel/language/xtokenizer/XMLTokenSplitTest.java
index 671bd72012d..13a306a0b22 100644
--- 
a/core/camel-core/src/test/java/org/apache/camel/language/XMLTokenSplitTest.java
+++ 
b/components/camel-stax/src/test/java/org/apache/camel/language/xtokenizer/XMLTokenSplitTest.java
@@ -14,19 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.camel.language;
+package org.apache.camel.language.xtokenizer;
 
-import org.apache.camel.ContextTestSupport;
 import org.apache.camel.Exchange;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.support.builder.Namespaces;
+import org.apache.camel.test.junit5.CamelTestSupport;
 import org.junit.jupiter.api.Test;
 
-/**
- *
- */
-public class XMLTokenSplitTest extends ContextTestSupport {
+public class XMLTokenSplitTest extends CamelTestSupport {
 
     @Test
     public void testXMLToken() throws Exception {
diff --git 
a/core/camel-xml-jaxp/src/test/java/org/apache/camel/language/xtokenizer/XMLTokenizeExpressionIteratorWModeTest.java
 
b/components/camel-stax/src/test/java/org/apache/camel/language/xtokenizer/XMLTokenizeExpressionIteratorWModeTest.java
similarity index 100%
rename from 
core/camel-xml-jaxp/src/test/java/org/apache/camel/language/xtokenizer/XMLTokenizeExpressionIteratorWModeTest.java
rename to 
components/camel-stax/src/test/java/org/apache/camel/language/xtokenizer/XMLTokenizeExpressionIteratorWModeTest.java
diff --git 
a/core/camel-core/src/test/java/org/apache/camel/language/tokenizer/XMLTokenizeLanguageGroupingTest.java
 
b/components/camel-stax/src/test/java/org/apache/camel/language/xtokenizer/XMLTokenizeLanguageGroupingTest.java
similarity index 89%
rename from 
core/camel-core/src/test/java/org/apache/camel/language/tokenizer/XMLTokenizeLanguageGroupingTest.java
rename to 
components/camel-stax/src/test/java/org/apache/camel/language/xtokenizer/XMLTokenizeLanguageGroupingTest.java
index d3de5999647..07fd27eaff0 100644
--- 
a/core/camel-core/src/test/java/org/apache/camel/language/tokenizer/XMLTokenizeLanguageGroupingTest.java
+++ 
b/components/camel-stax/src/test/java/org/apache/camel/language/xtokenizer/XMLTokenizeLanguageGroupingTest.java
@@ -14,15 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.camel.language.tokenizer;
+package org.apache.camel.language.xtokenizer;
 
-import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.support.builder.Namespaces;
+import org.apache.camel.test.junit5.CamelTestSupport;
 import org.junit.jupiter.api.Test;
 
-public class XMLTokenizeLanguageGroupingTest extends ContextTestSupport {
+public class XMLTokenizeLanguageGroupingTest extends CamelTestSupport {
 
     @Test
     public void testSendClosedTagMessageToTokenize() throws Exception {
@@ -124,15 +124,9 @@ public class XMLTokenizeLanguageGroupingTest extends 
ContextTestSupport {
     @Test
     public void testSendMoreParentsMessageToTokenize() throws Exception {
         MockEndpoint result = getMockEndpoint("mock:result");
-        if (getJavaMajorVersion() <= 7) {
-            result.expectedBodiesReceived(
-                    "<group><c:child some_attr='a' anotherAttr='a' 
xmlns:g=\"urn:g\" xmlns:d=\"urn:d\" xmlns:c=\"urn:c\"></c:child>"
-                                          + "<c:child some_attr='b' 
anotherAttr='b' xmlns:g=\"urn:g\" xmlns:d=\"urn:d\" 
xmlns:c=\"urn:c\"/></group>");
-        } else {
-            result.expectedBodiesReceived(
-                    "<group><c:child some_attr='a' anotherAttr='a' 
xmlns:c=\"urn:c\" xmlns:d=\"urn:d\" xmlns:g=\"urn:g\"></c:child>"
-                                          + "<c:child some_attr='b' 
anotherAttr='b' xmlns:c=\"urn:c\" xmlns:d=\"urn:d\" 
xmlns:g=\"urn:g\"/></group>");
-        }
+        result.expectedBodiesReceived(
+                "<group><c:child some_attr='a' anotherAttr='a' 
xmlns:c=\"urn:c\" xmlns:d=\"urn:d\" xmlns:g=\"urn:g\"></c:child>"
+                                      + "<c:child some_attr='b' 
anotherAttr='b' xmlns:c=\"urn:c\" xmlns:d=\"urn:d\" 
xmlns:g=\"urn:g\"/></group>");
 
         template
                 .sendBody("direct:start",
diff --git 
a/core/camel-core/src/test/java/org/apache/camel/language/tokenizer/XMLTokenizeLanguageStreamingFileTest.java
 
b/components/camel-stax/src/test/java/org/apache/camel/language/xtokenizer/XMLTokenizeLanguageStreamingFileTest.java
similarity index 93%
rename from 
core/camel-core/src/test/java/org/apache/camel/language/tokenizer/XMLTokenizeLanguageStreamingFileTest.java
rename to 
components/camel-stax/src/test/java/org/apache/camel/language/xtokenizer/XMLTokenizeLanguageStreamingFileTest.java
index a1852a200af..5eca0d279f5 100644
--- 
a/core/camel-core/src/test/java/org/apache/camel/language/tokenizer/XMLTokenizeLanguageStreamingFileTest.java
+++ 
b/components/camel-stax/src/test/java/org/apache/camel/language/xtokenizer/XMLTokenizeLanguageStreamingFileTest.java
@@ -14,15 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.camel.language.tokenizer;
+package org.apache.camel.language.xtokenizer;
 
-import org.apache.camel.ContextTestSupport;
 import org.apache.camel.Exchange;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.support.builder.Namespaces;
+import org.apache.camel.test.junit5.CamelTestSupport;
 import org.junit.jupiter.api.Test;
 
-public class XMLTokenizeLanguageStreamingFileTest extends ContextTestSupport {
+public class XMLTokenizeLanguageStreamingFileTest extends CamelTestSupport {
 
     @Test
     public void testFromFile() throws Exception {
diff --git 
a/core/camel-core/src/test/java/org/apache/camel/language/tokenizer/XMLTokenizeLanguageStreamingTest.java
 
b/components/camel-stax/src/test/java/org/apache/camel/language/xtokenizer/XMLTokenizeLanguageStreamingTest.java
similarity index 96%
rename from 
core/camel-core/src/test/java/org/apache/camel/language/tokenizer/XMLTokenizeLanguageStreamingTest.java
rename to 
components/camel-stax/src/test/java/org/apache/camel/language/xtokenizer/XMLTokenizeLanguageStreamingTest.java
index 8252ee071a2..7e1567d593d 100644
--- 
a/core/camel-core/src/test/java/org/apache/camel/language/tokenizer/XMLTokenizeLanguageStreamingTest.java
+++ 
b/components/camel-stax/src/test/java/org/apache/camel/language/xtokenizer/XMLTokenizeLanguageStreamingTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.camel.language.tokenizer;
+package org.apache.camel.language.xtokenizer;
 
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.support.builder.Namespaces;
diff --git 
a/core/camel-core/src/test/java/org/apache/camel/language/tokenizer/XMLTokenizeLanguageTest.java
 
b/components/camel-stax/src/test/java/org/apache/camel/language/xtokenizer/XMLTokenizeLanguageTest.java
similarity index 89%
rename from 
core/camel-core/src/test/java/org/apache/camel/language/tokenizer/XMLTokenizeLanguageTest.java
rename to 
components/camel-stax/src/test/java/org/apache/camel/language/xtokenizer/XMLTokenizeLanguageTest.java
index e8db2e69fa3..5e4d372d324 100644
--- 
a/core/camel-core/src/test/java/org/apache/camel/language/tokenizer/XMLTokenizeLanguageTest.java
+++ 
b/components/camel-stax/src/test/java/org/apache/camel/language/xtokenizer/XMLTokenizeLanguageTest.java
@@ -14,15 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.camel.language.tokenizer;
+package org.apache.camel.language.xtokenizer;
 
-import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.support.builder.Namespaces;
+import org.apache.camel.test.junit5.CamelTestSupport;
 import org.junit.jupiter.api.Test;
 
-public class XMLTokenizeLanguageTest extends ContextTestSupport {
+public class XMLTokenizeLanguageTest extends CamelTestSupport {
 
     @Test
     public void testSendClosedTagMessageToTokenize() throws Exception {
@@ -122,15 +122,9 @@ public class XMLTokenizeLanguageTest extends 
ContextTestSupport {
     @Test
     public void testSendMoreParentsMessageToTokenize() throws Exception {
         MockEndpoint result = getMockEndpoint("mock:result");
-        if (getJavaMajorVersion() <= 7) {
-            result.expectedBodiesReceived(
-                    "<c:child some_attr='a' anotherAttr='a' xmlns:g=\"urn:g\" 
xmlns:d=\"urn:d\" xmlns:c=\"urn:c\"></c:child>",
-                    "<c:child some_attr='b' anotherAttr='b' xmlns:g=\"urn:g\" 
xmlns:d=\"urn:d\" xmlns:c=\"urn:c\"/>");
-        } else {
-            result.expectedBodiesReceived(
-                    "<c:child some_attr='a' anotherAttr='a' xmlns:c=\"urn:c\" 
xmlns:d=\"urn:d\" xmlns:g=\"urn:g\"></c:child>",
-                    "<c:child some_attr='b' anotherAttr='b' xmlns:c=\"urn:c\" 
xmlns:d=\"urn:d\" xmlns:g=\"urn:g\"/>");
-        }
+        result.expectedBodiesReceived(
+                "<c:child some_attr='a' anotherAttr='a' xmlns:c=\"urn:c\" 
xmlns:d=\"urn:d\" xmlns:g=\"urn:g\"></c:child>",
+                "<c:child some_attr='b' anotherAttr='b' xmlns:c=\"urn:c\" 
xmlns:d=\"urn:d\" xmlns:g=\"urn:g\"/>");
 
         template
                 .sendBody("direct:start",
diff --git 
a/core/camel-core/src/test/java/org/apache/camel/language/tokenizer/XMLTokenizeWrapLanguageGroupingTest.java
 
b/components/camel-stax/src/test/java/org/apache/camel/language/xtokenizer/XMLTokenizeWrapLanguageGroupingTest.java
similarity index 98%
rename from 
core/camel-core/src/test/java/org/apache/camel/language/tokenizer/XMLTokenizeWrapLanguageGroupingTest.java
rename to 
components/camel-stax/src/test/java/org/apache/camel/language/xtokenizer/XMLTokenizeWrapLanguageGroupingTest.java
index 4d7a06786ad..24b5218b6cb 100644
--- 
a/core/camel-core/src/test/java/org/apache/camel/language/tokenizer/XMLTokenizeWrapLanguageGroupingTest.java
+++ 
b/components/camel-stax/src/test/java/org/apache/camel/language/xtokenizer/XMLTokenizeWrapLanguageGroupingTest.java
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.camel.language.tokenizer;
+package org.apache.camel.language.xtokenizer;
 
-import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.support.builder.Namespaces;
+import org.apache.camel.test.junit5.CamelTestSupport;
 import org.junit.jupiter.api.Test;
 
-public class XMLTokenizeWrapLanguageGroupingTest extends ContextTestSupport {
+public class XMLTokenizeWrapLanguageGroupingTest extends CamelTestSupport {
 
     @Test
     public void testSendClosedTagMessageToTokenize() throws Exception {
diff --git 
a/core/camel-core/src/test/java/org/apache/camel/language/tokenizer/XMLTokenizeWrapLanguageTest.java
 
b/components/camel-stax/src/test/java/org/apache/camel/language/xtokenizer/XMLTokenizeWrapLanguageTest.java
similarity index 98%
rename from 
core/camel-core/src/test/java/org/apache/camel/language/tokenizer/XMLTokenizeWrapLanguageTest.java
rename to 
components/camel-stax/src/test/java/org/apache/camel/language/xtokenizer/XMLTokenizeWrapLanguageTest.java
index 94dbe8b31a9..d23f2baffbe 100644
--- 
a/core/camel-core/src/test/java/org/apache/camel/language/tokenizer/XMLTokenizeWrapLanguageTest.java
+++ 
b/components/camel-stax/src/test/java/org/apache/camel/language/xtokenizer/XMLTokenizeWrapLanguageTest.java
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.camel.language.tokenizer;
+package org.apache.camel.language.xtokenizer;
 
-import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.support.builder.Namespaces;
+import org.apache.camel.test.junit5.CamelTestSupport;
 import org.junit.jupiter.api.Test;
 
-public class XMLTokenizeWrapLanguageTest extends ContextTestSupport {
+public class XMLTokenizeWrapLanguageTest extends CamelTestSupport {
 
     @Test
     public void testSendClosedTagMessageToTokenize() throws Exception {
diff --git 
a/components/camel-spring-xml/src/test/resources/org/apache/camel/language/SpringXMLTokenSplitTest.xml
 
b/components/camel-stax/src/test/resources/org/apache/camel/language/xtokenizer/SpringXMLTokenSplitTest.xml
similarity index 66%
rename from 
components/camel-spring-xml/src/test/resources/org/apache/camel/language/SpringXMLTokenSplitTest.xml
rename to 
components/camel-stax/src/test/resources/org/apache/camel/language/xtokenizer/SpringXMLTokenSplitTest.xml
index 81db26b5f9a..a394eb65a74 100644
--- 
a/components/camel-spring-xml/src/test/resources/org/apache/camel/language/SpringXMLTokenSplitTest.xml
+++ 
b/components/camel-stax/src/test/resources/org/apache/camel/language/xtokenizer/SpringXMLTokenSplitTest.xml
@@ -24,18 +24,18 @@
        http://camel.apache.org/schema/spring 
http://camel.apache.org/schema/spring/camel-spring.xsd
     ">
 
-  <!-- START SNIPPET: e1 -->
-  <camelContext xmlns="http://camel.apache.org/schema/spring"; 
xmlns:s="http:acme.com">
-    <route>
-      <from 
uri="file:target/data/SpringXMLTokenSplitTest/xtokenizer?initialDelay=0&amp;delay=10"/>
-      <split>
-        <!-- split the file using XML tokenizer, where we grab the order tag,
-             and inject the namespaces declarations from its ancestor nodes -->
-        <xtokenize>//s:orders/s:order</xtokenize>
-        <to uri="mock:split"/>
-      </split>
-    </route>
-  </camelContext>
-  <!-- END SNIPPET: e1 -->
+    <!-- START SNIPPET: e1 -->
+    <camelContext xmlns="http://camel.apache.org/schema/spring"; 
xmlns:s="http:acme.com">
+        <route>
+            <from 
uri="file:target/data/SpringXMLTokenSplitTest/xtokenizer?initialDelay=0&amp;delay=10"/>
+            <split>
+                <!-- split the file using XML tokenizer, where we grab the 
order tag,
+                     and inject the namespaces declarations from its ancestor 
nodes -->
+                <xtokenize>//s:orders/s:order</xtokenize>
+                <to uri="mock:split"/>
+            </split>
+        </route>
+    </camelContext>
+    <!-- END SNIPPET: e1 -->
 
 </beans>
diff --git 
a/core/camel-xml-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/other.properties
similarity index 90%
rename from 
core/camel-xml-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/other.properties
index ffdfa41ce0c..f405f631a70 100644
--- 
a/core/camel-xml-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/other.properties
@@ -1,5 +1,5 @@
 # Generated by camel build tools - do NOT edit this file!
-languages=xtokenize
+name=xml-jaxp
 groupId=org.apache.camel
 artifactId=camel-xml-jaxp
 version=3.19.0-SNAPSHOT
diff --git a/core/camel-xml-jaxp/src/generated/resources/xml-jaxp.json 
b/core/camel-xml-jaxp/src/generated/resources/xml-jaxp.json
new file mode 100644
index 00000000000..c0034ff3b19
--- /dev/null
+++ b/core/camel-xml-jaxp/src/generated/resources/xml-jaxp.json
@@ -0,0 +1,15 @@
+{
+  "other": {
+    "kind": "other",
+    "name": "xml-jaxp",
+    "title": "Xml Jaxp",
+    "description": "Camel XML JAXP",
+    "deprecated": false,
+    "firstVersion": "3.0.0",
+    "label": "core,xml",
+    "supportLevel": "Stable",
+    "groupId": "org.apache.camel",
+    "artifactId": "camel-xml-jaxp",
+    "version": "3.19.0-SNAPSHOT"
+  }
+}
diff --git a/docs/components/modules/languages/examples/json/xtokenize.json 
b/docs/components/modules/languages/examples/json/xtokenize.json
index 243f472d834..edcbaae218d 120000
--- a/docs/components/modules/languages/examples/json/xtokenize.json
+++ b/docs/components/modules/languages/examples/json/xtokenize.json
@@ -1 +1 @@
-../../../../../../core/camel-xml-jaxp/src/generated/resources/org/apache/camel/language/xtokenizer/xtokenize.json
\ No newline at end of file
+../../../../../../components/camel-stax/src/generated/resources/org/apache/camel/language/xtokenizer/xtokenize.json
\ No newline at end of file
diff --git a/docs/components/modules/languages/pages/xtokenize-language.adoc 
b/docs/components/modules/languages/pages/xtokenize-language.adoc
index 0a5a91fab25..f08d50dca93 120000
--- a/docs/components/modules/languages/pages/xtokenize-language.adoc
+++ b/docs/components/modules/languages/pages/xtokenize-language.adoc
@@ -1 +1 @@
-../../../../../core/camel-xml-jaxp/src/main/docs/modules/languages/pages/xtokenize-language.adoc
\ No newline at end of file
+../../../../../components/camel-stax/src/main/docs/xtokenize-language.adoc
\ No newline at end of file
diff --git 
a/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_19.adoc 
b/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_19.adoc
index 633757ea16f..5d09563f00e 100644
--- a/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_19.adoc
+++ b/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_19.adoc
@@ -45,7 +45,6 @@ spec:
 
 The URI format for consumer operations has changed. All consumer URIs now use 
the `subscribe` operation. E.g., `salesforce:subscribe:<topic_name>`, 
`salesforce:subscribe:event/<event_name>`, 
`salesforce:subscribe:data/ChangeEvents`.
 
-
 === camel-consul
 
 The deprecated options were removed and should be replaced by the following 
options:
@@ -65,4 +64,10 @@ The deprecated options were removed and should be replaced 
by the following opti
 
 === camel-google-bigquery-sql
 
-Parameters in form of `@name` are extracted from the body or message and their 
type is preserved and translated into corresponding 
`com.google.cloud.bigquery.StandardSQLTypeName`. See the 
https://cloud.google.com/java/docs/reference/google-cloud-bigquery/latest/com.google.cloud.bigquery.QueryParameterValue[documentation]
 for more information. (Conversion to StandardSQLTypeName.STRING was used for 
each type before)
\ No newline at end of file
+Parameters in form of `@name` are extracted from the body or message and their 
type is preserved and translated into corresponding 
`com.google.cloud.bigquery.StandardSQLTypeName`. See the 
https://cloud.google.com/java/docs/reference/google-cloud-bigquery/latest/com.google.cloud.bigquery.QueryParameterValue[documentation]
 for more information. (Conversion to StandardSQLTypeName.STRING was used for 
each type before)
+
+=== xtokenize language
+
+The xtokenize language has moved from `camel-xml-jaxp` to `camel-stax` JAR 
because
+a stax parser was needed anyway to use the language.
+

Reply via email to