You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2022/06/30 09:07:22 UTC

[camel] branch main updated (c30f5d64f26 -> 81f86d15aa9)

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

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


    from c30f5d64f26 CAMEL-18246: Upgrade hadoop-common version in camel-gora
     new 11f1c9a39ef CAMEL-9627: camel-cxf splitup
     new 81f86d15aa9 CAMEL-9627: camel-cxf splitup

The 2 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:
 .../org/apache/camel/catalog/components.properties |  2 +
 .../org/apache/camel/catalog/components}/cxf.json  |  0
 .../apache/camel/catalog/components}/cxfrs.json    |  0
 .../org/apache/camel/main/components.properties    |  2 +
 .../component/ComponentsBuilderFactory.java        |  8 +--
 .../component/dsl/CxfComponentBuilderFactory.java  |  6 +-
 .../dsl/CxfrsComponentBuilderFactory.java          |  4 +-
 .../src/generated/resources/metadata.json          |  6 +-
 .../builder/endpoint/StaticEndpointBuilders.java   | 16 ++---
 .../endpoint/dsl/CxfEndpointBuilderFactory.java    | 84 +++++++++-------------
 .../endpoint/dsl/CxfRsEndpointBuilderFactory.java  | 12 ++--
 .../apache/camel/maven/packaging/MojoHelper.java   |  3 +
 .../camel/maven/packaging/PrepareCatalogMojo.java  |  1 +
 13 files changed, 67 insertions(+), 77 deletions(-)
 copy {components/camel-cxf/camel-cxf-soap/src/generated/resources/org/apache/camel/component/cxf/jaxws => catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components}/cxf.json (100%)
 copy {components/camel-cxf/camel-cxf-rest/src/generated/resources/org/apache/camel/component/cxf/jaxrs => catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components}/cxfrs.json (100%)


[camel] 01/02: CAMEL-9627: camel-cxf splitup

Posted by da...@apache.org.
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

commit 11f1c9a39ef73b6e2448a4d422151403924444a8
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Thu Jun 30 10:46:16 2022 +0200

    CAMEL-9627: camel-cxf splitup
---
 .../src/main/java/org/apache/camel/maven/packaging/MojoHelper.java     | 3 +++
 .../main/java/org/apache/camel/maven/packaging/PrepareCatalogMojo.java | 1 +
 2 files changed, 4 insertions(+)

diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/MojoHelper.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/MojoHelper.java
index 34ed501a339..2ce0910995a 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/MojoHelper.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/MojoHelper.java
@@ -32,6 +32,9 @@ public final class MojoHelper {
                 return Collections.singletonList(dir.resolve("camel-as2-component"));
             case "camel-avro-rpc":
                 return Collections.singletonList(dir.resolve("camel-avro-rpc-component"));
+            case "camel-cxf":
+                return Arrays.asList(dir.resolve("camel-cxf-soap"),
+                        dir.resolve("camel-cxf-rest"));
             case "camel-salesforce":
                 return Collections.singletonList(dir.resolve("camel-salesforce-component"));
             case "camel-olingo2":
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 538775bd537..92a1a5a3b11 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
@@ -628,6 +628,7 @@ public class PrepareCatalogMojo extends AbstractMojo {
                 case "camel-aws":
                 case "camel-azure":
                 case "camel-box":
+                case "camel-cxf":
                 case "camel-debezium":
                 case "camel-debezium-common":
                 case "camel-fhir":


[camel] 02/02: CAMEL-9627: camel-cxf splitup

Posted by da...@apache.org.
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

commit 81f86d15aa9ad748dd15e2ef7819e941fc04dd25
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Thu Jun 30 11:07:02 2022 +0200

    CAMEL-9627: camel-cxf splitup
---
 .../org/apache/camel/catalog/components.properties |  2 +
 .../org/apache/camel/catalog/components/cxf.json   | 79 ++++++++++++++++++++
 .../org/apache/camel/catalog/components/cxfrs.json | 84 ++++++++++++++++++++++
 .../org/apache/camel/main/components.properties    |  2 +
 .../component/ComponentsBuilderFactory.java        |  8 +--
 .../component/dsl/CxfComponentBuilderFactory.java  |  6 +-
 .../dsl/CxfrsComponentBuilderFactory.java          |  4 +-
 .../src/generated/resources/metadata.json          |  6 +-
 .../builder/endpoint/StaticEndpointBuilders.java   | 16 ++---
 .../endpoint/dsl/CxfEndpointBuilderFactory.java    | 84 +++++++++-------------
 .../endpoint/dsl/CxfRsEndpointBuilderFactory.java  | 12 ++--
 11 files changed, 226 insertions(+), 77 deletions(-)

diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components.properties b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components.properties
index 3048da35a41..3e4f38174c6 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components.properties
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components.properties
@@ -67,6 +67,8 @@ couchdb
 cql
 cron
 crypto
+cxf
+cxfrs
 dataformat
 dataset
 dataset-test
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/cxf.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/cxf.json
new file mode 100644
index 00000000000..9f460a74894
--- /dev/null
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/cxf.json
@@ -0,0 +1,79 @@
+{
+  "component": {
+    "kind": "component",
+    "name": "cxf",
+    "title": "CXF",
+    "description": "Expose SOAP WebServices using Apache CXF or connect to external WebServices using CXF WS client.",
+    "deprecated": false,
+    "firstVersion": "1.0.0",
+    "label": "soap,webservice",
+    "javaType": "org.apache.camel.component.cxf.jaxws.CxfComponent",
+    "supportLevel": "Stable",
+    "groupId": "org.apache.camel",
+    "artifactId": "camel-cxf-soap",
+    "version": "3.18.0-SNAPSHOT",
+    "scheme": "cxf",
+    "extendsScheme": "",
+    "syntax": "cxf:beanId:address",
+    "async": true,
+    "api": false,
+    "consumerOnly": false,
+    "producerOnly": false,
+    "lenientProperties": false
+  },
+  "componentProperties": {
+    "bridgeErrorHandler": { "kind": "property", "displayName": "Bridge Error Handler", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a me [...]
+    "lazyStartProducer": { "kind": "property", "displayName": "Lazy Start Producer", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during star [...]
+    "allowStreaming": { "kind": "property", "displayName": "Allow Streaming", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "description": "This option controls whether the CXF component, when running in PAYLOAD mode, will DOM parse the incoming messages into DOM Elements or keep the payload as a javax.xml.transform.Source object that would allow streaming in some  [...]
+    "autowiredEnabled": { "kind": "property", "displayName": "Autowired Enabled", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which t [...]
+    "headerFilterStrategy": { "kind": "property", "displayName": "Header Filter Strategy", "group": "filter", "label": "filter", "required": false, "type": "object", "javaType": "org.apache.camel.spi.HeaderFilterStrategy", "deprecated": false, "autowired": false, "secret": false, "description": "To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message." },
+    "useGlobalSslContextParameters": { "kind": "property", "displayName": "Use Global Ssl Context Parameters", "group": "security", "label": "security", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Enable usage of global SSL context parameters." }
+  },
+  "headers": {
+    "operationName": { "kind": "header", "displayName": "", "group": "common", "label": "", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The name of the operation.", "constantName": "org.apache.camel.component.cxf.common.message.CxfConstants#OPERATION_NAME" },
+    "operationNamespace": { "kind": "header", "displayName": "", "group": "common", "label": "", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The operation namespace.", "constantName": "org.apache.camel.component.cxf.common.message.CxfConstants#OPERATION_NAMESPACE" },
+    "CamelDestinationOverrideUrl": { "kind": "header", "displayName": "", "group": "common", "label": "", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The destination override url", "constantName": "org.apache.camel.component.cxf.common.message.CxfConstants#DESTINATION_OVERRIDE_URL" },
+    "ResponseContext": { "kind": "header", "displayName": "", "group": "common", "label": "", "required": false, "javaType": "Map<String, Object>", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The response context", "constantName": "org.apache.camel.component.cxf.common.message.CxfConstants#RESPONSE_CONTEXT" },
+    "CamelAuthentication": { "kind": "header", "displayName": "", "group": "common", "label": "", "required": false, "javaType": "javax.security.auth.Subject", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The authentication", "constantName": "org.apache.camel.component.cxf.common.message.CxfConstants#AUTHENTICATION" },
+    "RequestContext": { "kind": "header", "displayName": "", "group": "common", "label": "", "required": false, "javaType": "Object", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The request context", "constantName": "org.apache.camel.component.cxf.common.message.CxfConstants#REQUEST_CONTEXT" }
+  },
+  "properties": {
+    "beanId": { "kind": "path", "displayName": "Bean Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "To lookup an existing configured CxfEndpoint. Must used bean: as prefix." },
+    "address": { "kind": "path", "displayName": "Address", "group": "service", "label": "service", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The service publish address." },
+    "dataFormat": { "kind": "parameter", "displayName": "Data Format", "group": "common", "label": "", "required": false, "type": "object", "javaType": "org.apache.camel.component.cxf.common.DataFormat", "enum": [ "PAYLOAD", "RAW", "MESSAGE", "CXF_MESSAGE", "POJO" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "POJO", "description": "The data type messages supported by the CXF endpoint." },
+    "wrappedStyle": { "kind": "parameter", "displayName": "Wrapped Style", "group": "common", "label": "", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "description": "The WSDL style that describes how parameters are represented in the SOAP body. If the value is false, CXF will chose the document-literal unwrapped style, If the value is true, CXF will chose the document-literal wrapped style" },
+    "bridgeErrorHandler": { "kind": "parameter", "displayName": "Bridge Error Handler", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now [...]
+    "exceptionHandler": { "kind": "parameter", "displayName": "Exception Handler", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.spi.ExceptionHandler", "optionalPrefix": "consumer.", "deprecated": false, "autowired": false, "secret": false, "description": "To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the con [...]
+    "exchangePattern": { "kind": "parameter", "displayName": "Exchange Pattern", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.ExchangePattern", "enum": [ "InOnly", "InOut", "InOptionalOut" ], "deprecated": false, "autowired": false, "secret": false, "description": "Sets the exchange pattern when the consumer creates an exchange." },
+    "cookieHandler": { "kind": "parameter", "displayName": "Cookie Handler", "group": "producer", "label": "producer", "required": false, "type": "object", "javaType": "org.apache.camel.http.base.cookie.CookieHandler", "deprecated": false, "autowired": false, "secret": false, "description": "Configure a cookie handler to maintain a HTTP session" },
+    "defaultOperationName": { "kind": "parameter", "displayName": "Default Operation Name", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "This option will set the default operationName that will be used by the CxfProducer which invokes the remote service." },
+    "defaultOperationNamespace": { "kind": "parameter", "displayName": "Default Operation Namespace", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "This option will set the default operationNamespace that will be used by the CxfProducer which invokes the remote service." },
+    "hostnameVerifier": { "kind": "parameter", "displayName": "Hostname Verifier", "group": "producer", "label": "producer", "required": false, "type": "object", "javaType": "javax.net.ssl.HostnameVerifier", "deprecated": false, "autowired": false, "secret": false, "description": "The hostname verifier to be used. Use the # notation to reference a HostnameVerifier from the registry." },
+    "sslContextParameters": { "kind": "parameter", "displayName": "Ssl Context Parameters", "group": "producer", "label": "producer", "required": false, "type": "object", "javaType": "org.apache.camel.support.jsse.SSLContextParameters", "deprecated": false, "autowired": false, "secret": false, "description": "The Camel SSL setting reference. Use the # notation to reference the SSL Context." },
+    "wrapped": { "kind": "parameter", "displayName": "Wrapped", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Which kind of operation that CXF endpoint producer will invoke" },
+    "lazyStartProducer": { "kind": "parameter", "displayName": "Lazy Start Producer", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may other [...]
+    "synchronous": { "kind": "parameter", "displayName": "Synchronous", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Sets whether synchronous processing should be strictly used" },
+    "allowStreaming": { "kind": "parameter", "displayName": "Allow Streaming", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "description": "This option controls whether the CXF component, when running in PAYLOAD mode, will DOM parse the incoming messages into DOM Elements or keep the payload as a javax.xml.transform.Source object that would allow streaming in some [...]
+    "bus": { "kind": "parameter", "displayName": "Bus", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.cxf.Bus", "deprecated": false, "autowired": false, "secret": false, "description": "To use a custom configured CXF Bus." },
+    "continuationTimeout": { "kind": "parameter", "displayName": "Continuation Timeout", "group": "advanced", "label": "advanced", "required": false, "type": "duration", "javaType": "long", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "30000", "description": "This option is used to set the CXF continuation timeout which could be used in CxfConsumer by default when the CXF server is using Jetty or Servlet transport." },
+    "cxfBinding": { "kind": "parameter", "displayName": "Cxf Binding", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.cxf.common.CxfBinding", "deprecated": false, "autowired": false, "secret": false, "description": "To use a custom CxfBinding to control the binding between Camel Message and CXF Message." },
+    "cxfConfigurer": { "kind": "parameter", "displayName": "Cxf Configurer", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.cxf.jaxws.CxfConfigurer", "deprecated": false, "autowired": false, "secret": false, "description": "This option could apply the implementation of org.apache.camel.component.cxf.CxfEndpointConfigurer which supports to configure the CXF endpoint in programmatic way. User can configure the CXF serv [...]
+    "defaultBus": { "kind": "parameter", "displayName": "Default Bus", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Will set the default bus when CXF endpoint create a bus by itself" },
+    "headerFilterStrategy": { "kind": "parameter", "displayName": "Header Filter Strategy", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.spi.HeaderFilterStrategy", "deprecated": false, "autowired": false, "secret": false, "description": "To use a custom HeaderFilterStrategy to filter header to and from Camel message." },
+    "mergeProtocolHeaders": { "kind": "parameter", "displayName": "Merge Protocol Headers", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether to merge protocol headers. If enabled then propagating headers between Camel and CXF becomes more consistent and similar. For more details see CAMEL-6393." },
+    "mtomEnabled": { "kind": "parameter", "displayName": "Mtom Enabled", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "To enable MTOM (attachments). This requires to use POJO or PAYLOAD data format mode." },
+    "properties": { "kind": "parameter", "displayName": "Properties", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "java.util.Map<java.lang.String, java.lang.Object>", "prefix": "properties.", "multiValue": true, "deprecated": false, "autowired": false, "secret": false, "description": "To set additional CXF options using the key\/value pairs from the Map. For example to turn on stacktraces in SOAP faults, properties.faultStackTraceEnabled=true" },
+    "skipPayloadMessagePartCheck": { "kind": "parameter", "displayName": "Skip Payload Message Part Check", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Sets whether SOAP message validation should be disabled." },
+    "loggingFeatureEnabled": { "kind": "parameter", "displayName": "Logging Feature Enabled", "group": "logging", "label": "logging", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "This option enables CXF Logging Feature which writes inbound and outbound SOAP messages to log." },
+    "loggingSizeLimit": { "kind": "parameter", "displayName": "Logging Size Limit", "group": "logging", "label": "logging", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 49152, "description": "To limit the total size of number of bytes the logger will output when logging feature has been enabled and -1 for no limit." },
+    "skipFaultLogging": { "kind": "parameter", "displayName": "Skip Fault Logging", "group": "logging", "label": "logging", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "This option controls whether the PhaseInterceptorChain skips logging the Fault that it catches." },
+    "password": { "kind": "parameter", "displayName": "Password", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "description": "This option is used to set the basic authentication information of password for the CXF client." },
+    "username": { "kind": "parameter", "displayName": "Username", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "description": "This option is used to set the basic authentication information of username for the CXF client." },
+    "bindingId": { "kind": "parameter", "displayName": "Binding Id", "group": "service", "label": "service", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The bindingId for the service model to use." },
+    "portName": { "kind": "parameter", "displayName": "Port Name", "group": "service", "label": "service", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The endpoint name this service is implementing, it maps to the wsdl:portname. In the format of ns:PORT_NAME where ns is a namespace prefix valid at this scope." },
+    "publishedEndpointUrl": { "kind": "parameter", "displayName": "Published Endpoint Url", "group": "service", "label": "service", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "This option can override the endpointUrl that published from the WSDL which can be accessed with service address url plus wsd" },
+    "serviceClass": { "kind": "parameter", "displayName": "Service Class", "group": "service", "label": "service", "required": false, "type": "string", "javaType": "java.lang.Class<java.lang.Object>", "deprecated": false, "autowired": false, "secret": false, "description": "The class name of the SEI (Service Endpoint Interface) class which could have JSR181 annotation or not." },
+    "serviceName": { "kind": "parameter", "displayName": "Service Name", "group": "service", "label": "service", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The service name this service is implementing, it maps to the wsdl:servicename." },
+    "wsdlURL": { "kind": "parameter", "displayName": "Wsdl URL", "group": "service", "label": "service", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The location of the WSDL. Can be on the classpath, file system, or be hosted remotely." }
+  }
+}
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/cxfrs.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/cxfrs.json
new file mode 100644
index 00000000000..500f66ae27b
--- /dev/null
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/cxfrs.json
@@ -0,0 +1,84 @@
+{
+  "component": {
+    "kind": "component",
+    "name": "cxfrs",
+    "title": "CXF-RS",
+    "description": "Expose JAX-RS REST services using Apache CXF or connect to external REST services using CXF REST client.",
+    "deprecated": false,
+    "firstVersion": "2.0.0",
+    "label": "rest",
+    "javaType": "org.apache.camel.component.cxf.jaxrs.CxfRsComponent",
+    "supportLevel": "Stable",
+    "groupId": "org.apache.camel",
+    "artifactId": "camel-cxf-rest",
+    "version": "3.18.0-SNAPSHOT",
+    "scheme": "cxfrs",
+    "extendsScheme": "",
+    "syntax": "cxfrs:beanId:address",
+    "async": false,
+    "api": false,
+    "consumerOnly": false,
+    "producerOnly": false,
+    "lenientProperties": true
+  },
+  "componentProperties": {
+    "bridgeErrorHandler": { "kind": "property", "displayName": "Bridge Error Handler", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a me [...]
+    "lazyStartProducer": { "kind": "property", "displayName": "Lazy Start Producer", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during star [...]
+    "autowiredEnabled": { "kind": "property", "displayName": "Autowired Enabled", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which t [...]
+    "headerFilterStrategy": { "kind": "property", "displayName": "Header Filter Strategy", "group": "filter", "label": "filter", "required": false, "type": "object", "javaType": "org.apache.camel.spi.HeaderFilterStrategy", "deprecated": false, "autowired": false, "secret": false, "description": "To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message." },
+    "useGlobalSslContextParameters": { "kind": "property", "displayName": "Use Global Ssl Context Parameters", "group": "security", "label": "security", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Enable usage of global SSL context parameters." }
+  },
+  "headers": {
+    "operationName": { "kind": "header", "displayName": "", "group": "common", "label": "", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The name of the operation.", "constantName": "org.apache.camel.component.cxf.common.message.CxfConstants#OPERATION_NAME" },
+    "CamelAuthentication": { "kind": "header", "displayName": "", "group": "common", "label": "", "required": false, "javaType": "javax.security.auth.Subject", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The authentication", "constantName": "org.apache.camel.component.cxf.common.message.CxfConstants#AUTHENTICATION" },
+    "CamelHttpMethod": { "kind": "header", "displayName": "", "group": "common", "label": "", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The http method to use", "constantName": "org.apache.camel.component.cxf.common.message.CxfConstants#HTTP_METHOD" },
+    "CamelHttpPath": { "kind": "header", "displayName": "", "group": "common", "label": "", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The http path", "constantName": "org.apache.camel.component.cxf.common.message.CxfConstants#HTTP_PATH" },
+    "Content-Type": { "kind": "header", "displayName": "", "group": "common", "label": "", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The content type", "constantName": "org.apache.camel.component.cxf.common.message.CxfConstants#CONTENT_TYPE" },
+    "CamelHttpQuery": { "kind": "header", "displayName": "", "group": "common", "label": "", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The http query", "constantName": "org.apache.camel.component.cxf.common.message.CxfConstants#HTTP_QUERY" },
+    "CamelHttpResponseCode": { "kind": "header", "displayName": "", "group": "common", "label": "", "required": false, "javaType": "Integer", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The http response code", "constantName": "org.apache.camel.component.cxf.common.message.CxfConstants#HTTP_RESPONSE_CODE" },
+    "Content-Encoding": { "kind": "header", "displayName": "", "group": "common", "label": "", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The content encoding", "constantName": "org.apache.camel.component.cxf.common.message.CxfConstants#CONTENT_ENCODING" },
+    "org.apache.cxf.message.Message.PROTOCOL_HEADERS": { "kind": "header", "displayName": "", "group": "common", "label": "", "required": false, "javaType": "Map", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The protocol headers", "constantName": "org.apache.camel.component.cxf.common.message.CxfConstants#PROTOCOL_HEADERS" },
+    "CamelCxfMessage": { "kind": "header", "displayName": "", "group": "common", "label": "", "required": false, "javaType": "org.apache.cxf.message.Message", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The CXF message", "constantName": "org.apache.camel.component.cxf.common.message.CxfConstants#CAMEL_CXF_MESSAGE" },
+    "CamelCxfRsUsingHttpAPI": { "kind": "header", "displayName": "", "group": "common", "label": "", "required": false, "javaType": "Boolean", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "If it is true, the CxfRsProducer will use the HttpClientAPI to invoke the service. If it is false, the CxfRsProducer will use the ProxyClientAPI to invoke the service", "constantName": "org.apache.camel.component.cxf.common.message.CxfConstants#CAMEL_C [...]
+    "CamelCxfRsVarValues": { "kind": "header", "displayName": "", "group": "common", "label": "", "required": false, "javaType": "Object[]", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The path values", "constantName": "org.apache.camel.component.cxf.common.message.CxfConstants#CAMEL_CXF_RS_VAR_VALUES" },
+    "CamelCxfRsResponseClass": { "kind": "header", "displayName": "", "group": "common", "label": "", "required": false, "javaType": "Class", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The response class", "constantName": "org.apache.camel.component.cxf.common.message.CxfConstants#CAMEL_CXF_RS_RESPONSE_CLASS" },
+    "CamelCxfRsResponseGenericType": { "kind": "header", "displayName": "", "group": "common", "label": "", "required": false, "javaType": "Type", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The response generic type", "constantName": "org.apache.camel.component.cxf.common.message.CxfConstants#CAMEL_CXF_RS_RESPONSE_GENERIC_TYPE" },
+    "CamelCxfRsQueryMap": { "kind": "header", "displayName": "", "group": "common", "label": "", "required": false, "javaType": "Map<String, String>", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The query map", "constantName": "org.apache.camel.component.cxf.common.message.CxfConstants#CAMEL_CXF_RS_QUERY_MAP" },
+    "CamelCxfRsOperationResourceInfoStack": { "kind": "header", "displayName": "", "group": "common", "label": "", "required": false, "javaType": "org.apache.cxf.jaxrs.model.OperationResourceInfoStack", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The stack of MethodInvocationInfo representing resources path when JAX-RS invocation looks for target.", "constantName": "org.apache.camel.component.cxf.common.message.CxfConstants#CAMEL_CXF_R [...]
+  },
+  "properties": {
+    "beanId": { "kind": "path", "displayName": "Bean Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "To lookup an existing configured CxfRsEndpoint. Must used bean: as prefix." },
+    "address": { "kind": "path", "displayName": "Address", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The service publish address." },
+    "features": { "kind": "parameter", "displayName": "Features", "group": "common", "label": "", "required": false, "type": "array", "javaType": "java.util.List<org.apache.cxf.feature.Feature>", "deprecated": false, "autowired": false, "secret": false, "description": "Set the feature list to the CxfRs endpoint." },
+    "loggingFeatureEnabled": { "kind": "parameter", "displayName": "Logging Feature Enabled", "group": "common", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "This option enables CXF Logging Feature which writes inbound and outbound REST messages to log." },
+    "loggingSizeLimit": { "kind": "parameter", "displayName": "Logging Size Limit", "group": "common", "label": "", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "description": "To limit the total size of number of bytes the logger will output when logging feature has been enabled." },
+    "modelRef": { "kind": "parameter", "displayName": "Model Ref", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "This option is used to specify the model file which is useful for the resource class without annotation. When using this option, then the service class can be omitted, to emulate document-only endpoints" },
+    "providers": { "kind": "parameter", "displayName": "Providers", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Set custom JAX-RS provider(s) list to the CxfRs endpoint. You can specify a string with a list of providers to lookup in the registy separated by comma." },
+    "resourceClasses": { "kind": "parameter", "displayName": "Resource Classes", "group": "common", "label": "", "required": false, "type": "array", "javaType": "java.util.List<java.lang.Class<java.lang.Object>>", "deprecated": false, "autowired": false, "secret": false, "description": "The resource classes which you want to export as REST service. Multiple classes can be separated by comma." },
+    "schemaLocations": { "kind": "parameter", "displayName": "Schema Locations", "group": "common", "label": "", "required": false, "type": "array", "javaType": "java.util.List<java.lang.String>", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the locations of the schema(s) which can be used to validate the incoming XML or JAXB-driven JSON." },
+    "skipFaultLogging": { "kind": "parameter", "displayName": "Skip Fault Logging", "group": "common", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "This option controls whether the PhaseInterceptorChain skips logging the Fault that it catches." },
+    "bindingStyle": { "kind": "parameter", "displayName": "Binding Style", "group": "consumer", "label": "consumer", "required": false, "type": "object", "javaType": "org.apache.camel.component.cxf.jaxrs.BindingStyle", "enum": [ "SimpleConsumer", "Default", "Custom" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "Default", "description": "Sets how requests and responses will be mapped to\/from Camel. Two values are possible: SimpleConsumer: This binding styl [...]
+    "publishedEndpointUrl": { "kind": "parameter", "displayName": "Published Endpoint Url", "group": "consumer", "label": "consumer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "This option can override the endpointUrl that published from the WADL which can be accessed with resource address url plus _wadl" },
+    "bridgeErrorHandler": { "kind": "parameter", "displayName": "Bridge Error Handler", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now [...]
+    "exceptionHandler": { "kind": "parameter", "displayName": "Exception Handler", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.spi.ExceptionHandler", "optionalPrefix": "consumer.", "deprecated": false, "autowired": false, "secret": false, "description": "To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the con [...]
+    "exchangePattern": { "kind": "parameter", "displayName": "Exchange Pattern", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.ExchangePattern", "enum": [ "InOnly", "InOut", "InOptionalOut" ], "deprecated": false, "autowired": false, "secret": false, "description": "Sets the exchange pattern when the consumer creates an exchange." },
+    "serviceBeans": { "kind": "parameter", "displayName": "Service Beans", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The service beans (the bean ids to lookup in the registry) which you want to export as REST service. Multiple beans can be separated by comma" },
+    "cookieHandler": { "kind": "parameter", "displayName": "Cookie Handler", "group": "producer", "label": "producer", "required": false, "type": "object", "javaType": "org.apache.camel.http.base.cookie.CookieHandler", "deprecated": false, "autowired": false, "secret": false, "description": "Configure a cookie handler to maintain a HTTP session" },
+    "hostnameVerifier": { "kind": "parameter", "displayName": "Hostname Verifier", "group": "producer", "label": "producer", "required": false, "type": "object", "javaType": "javax.net.ssl.HostnameVerifier", "deprecated": false, "autowired": false, "secret": false, "description": "The hostname verifier to be used. Use the # notation to reference a HostnameVerifier from the registry." },
+    "sslContextParameters": { "kind": "parameter", "displayName": "Ssl Context Parameters", "group": "producer", "label": "producer", "required": false, "type": "object", "javaType": "org.apache.camel.support.jsse.SSLContextParameters", "deprecated": false, "autowired": false, "secret": false, "description": "The Camel SSL setting reference. Use the # notation to reference the SSL Context." },
+    "throwExceptionOnFailure": { "kind": "parameter", "displayName": "Throw Exception On Failure", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "This option tells the CxfRsProducer to inspect return codes and will generate an Exception if the return code is larger than 207." },
+    "httpClientAPI": { "kind": "parameter", "displayName": "Http Client API", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "If it is true, the CxfRsProducer will use the HttpClientAPI to invoke the service. If it is false, the CxfRsProducer will use the ProxyClientAPI to invoke the service" },
+    "ignoreDeleteMethodMessageBody": { "kind": "parameter", "displayName": "Ignore Delete Method Message Body", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "This option is used to tell CxfRsProducer to ignore the message body of the DELETE method when using HTTP API." },
+    "lazyStartProducer": { "kind": "parameter", "displayName": "Lazy Start Producer", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may other [...]
+    "maxClientCacheSize": { "kind": "parameter", "displayName": "Max Client Cache Size", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 10, "description": "This option allows you to configure the maximum size of the cache. The implementation caches CXF clients or ClientFactoryBean in CxfProvider and CxfRsProvider." },
+    "synchronous": { "kind": "parameter", "displayName": "Synchronous", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Sets whether synchronous processing should be strictly used" },
+    "binding": { "kind": "parameter", "displayName": "Binding", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.cxf.jaxrs.CxfRsBinding", "deprecated": false, "autowired": false, "secret": false, "description": "To use a custom CxfBinding to control the binding between Camel Message and CXF Message." },
+    "bus": { "kind": "parameter", "displayName": "Bus", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.cxf.Bus", "deprecated": false, "autowired": false, "secret": false, "description": "To use a custom configured CXF Bus." },
+    "continuationTimeout": { "kind": "parameter", "displayName": "Continuation Timeout", "group": "advanced", "label": "advanced", "required": false, "type": "duration", "javaType": "long", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "30000", "description": "This option is used to set the CXF continuation timeout which could be used in CxfConsumer by default when the CXF server is using Jetty or Servlet transport." },
+    "cxfRsConfigurer": { "kind": "parameter", "displayName": "Cxf Rs Configurer", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.cxf.jaxrs.CxfRsConfigurer", "deprecated": false, "autowired": false, "secret": false, "description": "This option could apply the implementation of org.apache.camel.component.cxf.jaxrs.CxfRsEndpointConfigurer which supports to configure the CXF endpoint in programmatic way. User can configu [...]
+    "defaultBus": { "kind": "parameter", "displayName": "Default Bus", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Will set the default bus when CXF endpoint create a bus by itself" },
+    "headerFilterStrategy": { "kind": "parameter", "displayName": "Header Filter Strategy", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.spi.HeaderFilterStrategy", "deprecated": false, "autowired": false, "secret": false, "description": "To use a custom HeaderFilterStrategy to filter header to and from Camel message." },
+    "performInvocation": { "kind": "parameter", "displayName": "Perform Invocation", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "When the option is true, Camel will perform the invocation of the resource class instance and put the response object into the exchange for further processing." },
+    "propagateContexts": { "kind": "parameter", "displayName": "Propagate Contexts", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "When the option is true, JAXRS UriInfo, HttpHeaders, Request and SecurityContext contexts will be available to custom CXFRS processors as typed Camel exchange properties. These contexts can be used to analyz [...]
+  }
+}
diff --git a/core/camel-main/src/generated/resources/org/apache/camel/main/components.properties b/core/camel-main/src/generated/resources/org/apache/camel/main/components.properties
index 3048da35a41..3e4f38174c6 100644
--- a/core/camel-main/src/generated/resources/org/apache/camel/main/components.properties
+++ b/core/camel-main/src/generated/resources/org/apache/camel/main/components.properties
@@ -67,6 +67,8 @@ couchdb
 cql
 cron
 crypto
+cxf
+cxfrs
 dataformat
 dataset
 dataset-test
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/ComponentsBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/ComponentsBuilderFactory.java
index 7ec9002a549..6e6135c4e14 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/ComponentsBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/ComponentsBuilderFactory.java
@@ -964,13 +964,13 @@ public interface ComponentsBuilderFactory {
         return org.apache.camel.builder.component.dsl.CryptoComponentBuilderFactory.crypto();
     }
     /**
-     * CXF (camel-cxf)
+     * CXF (camel-cxf-soap)
      * Expose SOAP WebServices using Apache CXF or connect to external
      * WebServices using CXF WS client.
      * 
      * Category: soap,webservice
      * Since: 1.0
-     * Maven coordinates: org.apache.camel:camel-cxf
+     * Maven coordinates: org.apache.camel:camel-cxf-soap
      * 
      * @return the dsl builder
      */
@@ -978,13 +978,13 @@ public interface ComponentsBuilderFactory {
         return org.apache.camel.builder.component.dsl.CxfComponentBuilderFactory.cxf();
     }
     /**
-     * CXF-RS (camel-cxf)
+     * CXF-RS (camel-cxf-rest)
      * Expose JAX-RS REST services using Apache CXF or connect to external REST
      * services using CXF REST client.
      * 
      * Category: rest
      * Since: 2.0
-     * Maven coordinates: org.apache.camel:camel-cxf
+     * Maven coordinates: org.apache.camel:camel-cxf-rest
      * 
      * @return the dsl builder
      */
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/CxfComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/CxfComponentBuilderFactory.java
index c664611090e..91d10a1f7d7 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/CxfComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/CxfComponentBuilderFactory.java
@@ -20,7 +20,7 @@ import javax.annotation.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
-import org.apache.camel.component.cxf.CxfComponent;
+import org.apache.camel.component.cxf.jaxws.CxfComponent;
 
 /**
  * Expose SOAP WebServices using Apache CXF or connect to external WebServices
@@ -32,13 +32,13 @@ import org.apache.camel.component.cxf.CxfComponent;
 public interface CxfComponentBuilderFactory {
 
     /**
-     * CXF (camel-cxf)
+     * CXF (camel-cxf-soap)
      * Expose SOAP WebServices using Apache CXF or connect to external
      * WebServices using CXF WS client.
      * 
      * Category: soap,webservice
      * Since: 1.0
-     * Maven coordinates: org.apache.camel:camel-cxf
+     * Maven coordinates: org.apache.camel:camel-cxf-soap
      * 
      * @return the dsl builder
      */
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/CxfrsComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/CxfrsComponentBuilderFactory.java
index 6f6b875f57b..89286a3dc53 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/CxfrsComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/CxfrsComponentBuilderFactory.java
@@ -32,13 +32,13 @@ import org.apache.camel.component.cxf.jaxrs.CxfRsComponent;
 public interface CxfrsComponentBuilderFactory {
 
     /**
-     * CXF-RS (camel-cxf)
+     * CXF-RS (camel-cxf-rest)
      * Expose JAX-RS REST services using Apache CXF or connect to external REST
      * services using CXF REST client.
      * 
      * Category: rest
      * Since: 2.0
-     * Maven coordinates: org.apache.camel:camel-cxf
+     * Maven coordinates: org.apache.camel:camel-cxf-rest
      * 
      * @return the dsl builder
      */
diff --git a/dsl/camel-componentdsl/src/generated/resources/metadata.json b/dsl/camel-componentdsl/src/generated/resources/metadata.json
index cc2cd016d5e..fc283398d4b 100644
--- a/dsl/camel-componentdsl/src/generated/resources/metadata.json
+++ b/dsl/camel-componentdsl/src/generated/resources/metadata.json
@@ -1539,10 +1539,10 @@
     "deprecated": false,
     "firstVersion": "1.0.0",
     "label": "soap,webservice",
-    "javaType": "org.apache.camel.component.cxf.CxfComponent",
+    "javaType": "org.apache.camel.component.cxf.jaxws.CxfComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
-    "artifactId": "camel-cxf",
+    "artifactId": "camel-cxf-soap",
     "version": "3.18.0-SNAPSHOT",
     "scheme": "cxf",
     "extendsScheme": "",
@@ -1564,7 +1564,7 @@
     "javaType": "org.apache.camel.component.cxf.jaxrs.CxfRsComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
-    "artifactId": "camel-cxf",
+    "artifactId": "camel-cxf-rest",
     "version": "3.18.0-SNAPSHOT",
     "scheme": "cxfrs",
     "extendsScheme": "",
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/StaticEndpointBuilders.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/StaticEndpointBuilders.java
index 55c876fce48..02af2a9cfc8 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/StaticEndpointBuilders.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/StaticEndpointBuilders.java
@@ -3098,13 +3098,13 @@ public class StaticEndpointBuilders {
         return org.apache.camel.builder.endpoint.dsl.DigitalSignatureEndpointBuilderFactory.endpointBuilder(componentName, path);
     }
     /**
-     * CXF (camel-cxf)
+     * CXF (camel-cxf-soap)
      * Expose SOAP WebServices using Apache CXF or connect to external
      * WebServices using CXF WS client.
      * 
      * Category: soap,webservice
      * Since: 1.0
-     * Maven coordinates: org.apache.camel:camel-cxf
+     * Maven coordinates: org.apache.camel:camel-cxf-soap
      * 
      * Syntax: <code>cxf:beanId:address</code>
      * 
@@ -3122,13 +3122,13 @@ public class StaticEndpointBuilders {
         return org.apache.camel.builder.endpoint.dsl.CxfEndpointBuilderFactory.endpointBuilder("cxf", path);
     }
     /**
-     * CXF (camel-cxf)
+     * CXF (camel-cxf-soap)
      * Expose SOAP WebServices using Apache CXF or connect to external
      * WebServices using CXF WS client.
      * 
      * Category: soap,webservice
      * Since: 1.0
-     * Maven coordinates: org.apache.camel:camel-cxf
+     * Maven coordinates: org.apache.camel:camel-cxf-soap
      * 
      * Syntax: <code>cxf:beanId:address</code>
      * 
@@ -3149,13 +3149,13 @@ public class StaticEndpointBuilders {
         return org.apache.camel.builder.endpoint.dsl.CxfEndpointBuilderFactory.endpointBuilder(componentName, path);
     }
     /**
-     * CXF-RS (camel-cxf)
+     * CXF-RS (camel-cxf-rest)
      * Expose JAX-RS REST services using Apache CXF or connect to external REST
      * services using CXF REST client.
      * 
      * Category: rest
      * Since: 2.0
-     * Maven coordinates: org.apache.camel:camel-cxf
+     * Maven coordinates: org.apache.camel:camel-cxf-rest
      * 
      * Syntax: <code>cxfrs:beanId:address</code>
      * 
@@ -3174,13 +3174,13 @@ public class StaticEndpointBuilders {
         return org.apache.camel.builder.endpoint.dsl.CxfRsEndpointBuilderFactory.endpointBuilder("cxfrs", path);
     }
     /**
-     * CXF-RS (camel-cxf)
+     * CXF-RS (camel-cxf-rest)
      * Expose JAX-RS REST services using Apache CXF or connect to external REST
      * services using CXF REST client.
      * 
      * Category: rest
      * Since: 2.0
-     * Maven coordinates: org.apache.camel:camel-cxf
+     * Maven coordinates: org.apache.camel:camel-cxf-rest
      * 
      * Syntax: <code>cxfrs:beanId:address</code>
      * 
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CxfEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CxfEndpointBuilderFactory.java
index ae96d6ad65c..84e405b2505 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CxfEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CxfEndpointBuilderFactory.java
@@ -49,8 +49,7 @@ public interface CxfEndpointBuilderFactory {
          * The data type messages supported by the CXF endpoint.
          * 
          * The option is a:
-         * &lt;code&gt;org.apache.camel.component.cxf.DataFormat&lt;/code&gt;
-         * type.
+         * &lt;code&gt;org.apache.camel.component.cxf.common.DataFormat&lt;/code&gt; type.
          * 
          * Default: POJO
          * Group: common
@@ -59,7 +58,7 @@ public interface CxfEndpointBuilderFactory {
          * @return the dsl builder
          */
         default CxfEndpointConsumerBuilder dataFormat(
-                org.apache.camel.component.cxf.DataFormat dataFormat) {
+                org.apache.camel.component.cxf.common.DataFormat dataFormat) {
             doSetProperty("dataFormat", dataFormat);
             return this;
         }
@@ -67,8 +66,7 @@ public interface CxfEndpointBuilderFactory {
          * The data type messages supported by the CXF endpoint.
          * 
          * The option will be converted to a
-         * &lt;code&gt;org.apache.camel.component.cxf.DataFormat&lt;/code&gt;
-         * type.
+         * &lt;code&gt;org.apache.camel.component.cxf.common.DataFormat&lt;/code&gt; type.
          * 
          * Default: POJO
          * Group: common
@@ -590,8 +588,7 @@ public interface CxfEndpointBuilderFactory {
          * Message and CXF Message.
          * 
          * The option is a:
-         * &lt;code&gt;org.apache.camel.component.cxf.CxfBinding&lt;/code&gt;
-         * type.
+         * &lt;code&gt;org.apache.camel.component.cxf.common.CxfBinding&lt;/code&gt; type.
          * 
          * Group: advanced
          * 
@@ -599,7 +596,7 @@ public interface CxfEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedCxfEndpointConsumerBuilder cxfBinding(
-                org.apache.camel.component.cxf.CxfBinding cxfBinding) {
+                org.apache.camel.component.cxf.common.CxfBinding cxfBinding) {
             doSetProperty("cxfBinding", cxfBinding);
             return this;
         }
@@ -608,8 +605,7 @@ public interface CxfEndpointBuilderFactory {
          * Message and CXF Message.
          * 
          * The option will be converted to a
-         * &lt;code&gt;org.apache.camel.component.cxf.CxfBinding&lt;/code&gt;
-         * type.
+         * &lt;code&gt;org.apache.camel.component.cxf.common.CxfBinding&lt;/code&gt; type.
          * 
          * Group: advanced
          * 
@@ -628,8 +624,7 @@ public interface CxfEndpointBuilderFactory {
          * method of CxfEndpointConfigurer.
          * 
          * The option is a:
-         * &lt;code&gt;org.apache.camel.component.cxf.CxfConfigurer&lt;/code&gt;
-         * type.
+         * &lt;code&gt;org.apache.camel.component.cxf.jaxws.CxfConfigurer&lt;/code&gt; type.
          * 
          * Group: advanced
          * 
@@ -637,7 +632,7 @@ public interface CxfEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedCxfEndpointConsumerBuilder cxfConfigurer(
-                org.apache.camel.component.cxf.CxfConfigurer cxfConfigurer) {
+                org.apache.camel.component.cxf.jaxws.CxfConfigurer cxfConfigurer) {
             doSetProperty("cxfConfigurer", cxfConfigurer);
             return this;
         }
@@ -649,8 +644,7 @@ public interface CxfEndpointBuilderFactory {
          * method of CxfEndpointConfigurer.
          * 
          * The option will be converted to a
-         * &lt;code&gt;org.apache.camel.component.cxf.CxfConfigurer&lt;/code&gt;
-         * type.
+         * &lt;code&gt;org.apache.camel.component.cxf.jaxws.CxfConfigurer&lt;/code&gt; type.
          * 
          * Group: advanced
          * 
@@ -892,8 +886,7 @@ public interface CxfEndpointBuilderFactory {
          * The data type messages supported by the CXF endpoint.
          * 
          * The option is a:
-         * &lt;code&gt;org.apache.camel.component.cxf.DataFormat&lt;/code&gt;
-         * type.
+         * &lt;code&gt;org.apache.camel.component.cxf.common.DataFormat&lt;/code&gt; type.
          * 
          * Default: POJO
          * Group: common
@@ -902,7 +895,7 @@ public interface CxfEndpointBuilderFactory {
          * @return the dsl builder
          */
         default CxfEndpointProducerBuilder dataFormat(
-                org.apache.camel.component.cxf.DataFormat dataFormat) {
+                org.apache.camel.component.cxf.common.DataFormat dataFormat) {
             doSetProperty("dataFormat", dataFormat);
             return this;
         }
@@ -910,8 +903,7 @@ public interface CxfEndpointBuilderFactory {
          * The data type messages supported by the CXF endpoint.
          * 
          * The option will be converted to a
-         * &lt;code&gt;org.apache.camel.component.cxf.DataFormat&lt;/code&gt;
-         * type.
+         * &lt;code&gt;org.apache.camel.component.cxf.common.DataFormat&lt;/code&gt; type.
          * 
          * Default: POJO
          * Group: common
@@ -1562,8 +1554,7 @@ public interface CxfEndpointBuilderFactory {
          * Message and CXF Message.
          * 
          * The option is a:
-         * &lt;code&gt;org.apache.camel.component.cxf.CxfBinding&lt;/code&gt;
-         * type.
+         * &lt;code&gt;org.apache.camel.component.cxf.common.CxfBinding&lt;/code&gt; type.
          * 
          * Group: advanced
          * 
@@ -1571,7 +1562,7 @@ public interface CxfEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedCxfEndpointProducerBuilder cxfBinding(
-                org.apache.camel.component.cxf.CxfBinding cxfBinding) {
+                org.apache.camel.component.cxf.common.CxfBinding cxfBinding) {
             doSetProperty("cxfBinding", cxfBinding);
             return this;
         }
@@ -1580,8 +1571,7 @@ public interface CxfEndpointBuilderFactory {
          * Message and CXF Message.
          * 
          * The option will be converted to a
-         * &lt;code&gt;org.apache.camel.component.cxf.CxfBinding&lt;/code&gt;
-         * type.
+         * &lt;code&gt;org.apache.camel.component.cxf.common.CxfBinding&lt;/code&gt; type.
          * 
          * Group: advanced
          * 
@@ -1600,8 +1590,7 @@ public interface CxfEndpointBuilderFactory {
          * method of CxfEndpointConfigurer.
          * 
          * The option is a:
-         * &lt;code&gt;org.apache.camel.component.cxf.CxfConfigurer&lt;/code&gt;
-         * type.
+         * &lt;code&gt;org.apache.camel.component.cxf.jaxws.CxfConfigurer&lt;/code&gt; type.
          * 
          * Group: advanced
          * 
@@ -1609,7 +1598,7 @@ public interface CxfEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedCxfEndpointProducerBuilder cxfConfigurer(
-                org.apache.camel.component.cxf.CxfConfigurer cxfConfigurer) {
+                org.apache.camel.component.cxf.jaxws.CxfConfigurer cxfConfigurer) {
             doSetProperty("cxfConfigurer", cxfConfigurer);
             return this;
         }
@@ -1621,8 +1610,7 @@ public interface CxfEndpointBuilderFactory {
          * method of CxfEndpointConfigurer.
          * 
          * The option will be converted to a
-         * &lt;code&gt;org.apache.camel.component.cxf.CxfConfigurer&lt;/code&gt;
-         * type.
+         * &lt;code&gt;org.apache.camel.component.cxf.jaxws.CxfConfigurer&lt;/code&gt; type.
          * 
          * Group: advanced
          * 
@@ -1865,8 +1853,7 @@ public interface CxfEndpointBuilderFactory {
          * The data type messages supported by the CXF endpoint.
          * 
          * The option is a:
-         * &lt;code&gt;org.apache.camel.component.cxf.DataFormat&lt;/code&gt;
-         * type.
+         * &lt;code&gt;org.apache.camel.component.cxf.common.DataFormat&lt;/code&gt; type.
          * 
          * Default: POJO
          * Group: common
@@ -1875,7 +1862,7 @@ public interface CxfEndpointBuilderFactory {
          * @return the dsl builder
          */
         default CxfEndpointBuilder dataFormat(
-                org.apache.camel.component.cxf.DataFormat dataFormat) {
+                org.apache.camel.component.cxf.common.DataFormat dataFormat) {
             doSetProperty("dataFormat", dataFormat);
             return this;
         }
@@ -1883,8 +1870,7 @@ public interface CxfEndpointBuilderFactory {
          * The data type messages supported by the CXF endpoint.
          * 
          * The option will be converted to a
-         * &lt;code&gt;org.apache.camel.component.cxf.DataFormat&lt;/code&gt;
-         * type.
+         * &lt;code&gt;org.apache.camel.component.cxf.common.DataFormat&lt;/code&gt; type.
          * 
          * Default: POJO
          * Group: common
@@ -2287,8 +2273,7 @@ public interface CxfEndpointBuilderFactory {
          * Message and CXF Message.
          * 
          * The option is a:
-         * &lt;code&gt;org.apache.camel.component.cxf.CxfBinding&lt;/code&gt;
-         * type.
+         * &lt;code&gt;org.apache.camel.component.cxf.common.CxfBinding&lt;/code&gt; type.
          * 
          * Group: advanced
          * 
@@ -2296,7 +2281,7 @@ public interface CxfEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedCxfEndpointBuilder cxfBinding(
-                org.apache.camel.component.cxf.CxfBinding cxfBinding) {
+                org.apache.camel.component.cxf.common.CxfBinding cxfBinding) {
             doSetProperty("cxfBinding", cxfBinding);
             return this;
         }
@@ -2305,8 +2290,7 @@ public interface CxfEndpointBuilderFactory {
          * Message and CXF Message.
          * 
          * The option will be converted to a
-         * &lt;code&gt;org.apache.camel.component.cxf.CxfBinding&lt;/code&gt;
-         * type.
+         * &lt;code&gt;org.apache.camel.component.cxf.common.CxfBinding&lt;/code&gt; type.
          * 
          * Group: advanced
          * 
@@ -2325,8 +2309,7 @@ public interface CxfEndpointBuilderFactory {
          * method of CxfEndpointConfigurer.
          * 
          * The option is a:
-         * &lt;code&gt;org.apache.camel.component.cxf.CxfConfigurer&lt;/code&gt;
-         * type.
+         * &lt;code&gt;org.apache.camel.component.cxf.jaxws.CxfConfigurer&lt;/code&gt; type.
          * 
          * Group: advanced
          * 
@@ -2334,7 +2317,7 @@ public interface CxfEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedCxfEndpointBuilder cxfConfigurer(
-                org.apache.camel.component.cxf.CxfConfigurer cxfConfigurer) {
+                org.apache.camel.component.cxf.jaxws.CxfConfigurer cxfConfigurer) {
             doSetProperty("cxfConfigurer", cxfConfigurer);
             return this;
         }
@@ -2346,8 +2329,7 @@ public interface CxfEndpointBuilderFactory {
          * method of CxfEndpointConfigurer.
          * 
          * The option will be converted to a
-         * &lt;code&gt;org.apache.camel.component.cxf.CxfConfigurer&lt;/code&gt;
-         * type.
+         * &lt;code&gt;org.apache.camel.component.cxf.jaxws.CxfConfigurer&lt;/code&gt; type.
          * 
          * Group: advanced
          * 
@@ -2573,13 +2555,13 @@ public interface CxfEndpointBuilderFactory {
 
     public interface CxfBuilders {
         /**
-         * CXF (camel-cxf)
+         * CXF (camel-cxf-soap)
          * Expose SOAP WebServices using Apache CXF or connect to external
          * WebServices using CXF WS client.
          * 
          * Category: soap,webservice
          * Since: 1.0
-         * Maven coordinates: org.apache.camel:camel-cxf
+         * Maven coordinates: org.apache.camel:camel-cxf-soap
          * 
          * @return the dsl builder for the headers' name.
          */
@@ -2587,13 +2569,13 @@ public interface CxfEndpointBuilderFactory {
             return CxfHeaderNameBuilder.INSTANCE;
         }
         /**
-         * CXF (camel-cxf)
+         * CXF (camel-cxf-soap)
          * Expose SOAP WebServices using Apache CXF or connect to external
          * WebServices using CXF WS client.
          * 
          * Category: soap,webservice
          * Since: 1.0
-         * Maven coordinates: org.apache.camel:camel-cxf
+         * Maven coordinates: org.apache.camel:camel-cxf-soap
          * 
          * Syntax: <code>cxf:beanId:address</code>
          * 
@@ -2611,13 +2593,13 @@ public interface CxfEndpointBuilderFactory {
             return CxfEndpointBuilderFactory.endpointBuilder("cxf", path);
         }
         /**
-         * CXF (camel-cxf)
+         * CXF (camel-cxf-soap)
          * Expose SOAP WebServices using Apache CXF or connect to external
          * WebServices using CXF WS client.
          * 
          * Category: soap,webservice
          * Since: 1.0
-         * Maven coordinates: org.apache.camel:camel-cxf
+         * Maven coordinates: org.apache.camel:camel-cxf-soap
          * 
          * Syntax: <code>cxf:beanId:address</code>
          * 
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CxfRsEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CxfRsEndpointBuilderFactory.java
index 41a210663d7..4c3028f6e68 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CxfRsEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CxfRsEndpointBuilderFactory.java
@@ -2178,13 +2178,13 @@ public interface CxfRsEndpointBuilderFactory {
 
     public interface CxfRsBuilders {
         /**
-         * CXF-RS (camel-cxf)
+         * CXF-RS (camel-cxf-rest)
          * Expose JAX-RS REST services using Apache CXF or connect to external
          * REST services using CXF REST client.
          * 
          * Category: rest
          * Since: 2.0
-         * Maven coordinates: org.apache.camel:camel-cxf
+         * Maven coordinates: org.apache.camel:camel-cxf-rest
          * 
          * @return the dsl builder for the headers' name.
          */
@@ -2192,13 +2192,13 @@ public interface CxfRsEndpointBuilderFactory {
             return CxfRsHeaderNameBuilder.INSTANCE;
         }
         /**
-         * CXF-RS (camel-cxf)
+         * CXF-RS (camel-cxf-rest)
          * Expose JAX-RS REST services using Apache CXF or connect to external
          * REST services using CXF REST client.
          * 
          * Category: rest
          * Since: 2.0
-         * Maven coordinates: org.apache.camel:camel-cxf
+         * Maven coordinates: org.apache.camel:camel-cxf-rest
          * 
          * Syntax: <code>cxfrs:beanId:address</code>
          * 
@@ -2216,13 +2216,13 @@ public interface CxfRsEndpointBuilderFactory {
             return CxfRsEndpointBuilderFactory.endpointBuilder("cxfrs", path);
         }
         /**
-         * CXF-RS (camel-cxf)
+         * CXF-RS (camel-cxf-rest)
          * Expose JAX-RS REST services using Apache CXF or connect to external
          * REST services using CXF REST client.
          * 
          * Category: rest
          * Since: 2.0
-         * Maven coordinates: org.apache.camel:camel-cxf
+         * Maven coordinates: org.apache.camel:camel-cxf-rest
          * 
          * Syntax: <code>cxfrs:beanId:address</code>
          *