This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-3.18.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-3.18.x by this push:
new 448bdd40f15 CAMEL-18736: Ensure cxfEndpoint schemas are uniquely named
for JaxRS and JaxWS to avoid classpath conflicts (#8753)
448bdd40f15 is described below
commit 448bdd40f15fd33593853f9c9b92046e9dc87b7b
Author: David Riseley <6659301+drise...@users.noreply.github.com>
AuthorDate: Mon Nov 21 19:13:17 2022 +0000
CAMEL-18736: Ensure cxfEndpoint schemas are uniquely named for JaxRS and
JaxWS to avoid classpath conflicts (#8753)
---
.../camel-cxf/camel-cxf-rest/src/main/docs/cxfrs-component.adoc | 4 ++--
components/camel-cxf/camel-cxf-spring-rest/pom.xml | 2 +-
.../src/main/resources/META-INF/spring.schemas | 8 ++++----
.../resources/schema/{cxfEndpoint.xsd => cxfJaxrsEndpoint.xsd} | 0
components/camel-cxf/camel-cxf-spring-soap/pom.xml | 2 +-
.../src/main/resources/META-INF/spring.schemas | 8 ++++----
.../resources/schema/{cxfEndpoint.xsd => cxfJaxwsEndpoint.xsd} | 0
7 files changed, 12 insertions(+), 12 deletions(-)
diff --git
a/components/camel-cxf/camel-cxf-rest/src/main/docs/cxfrs-component.adoc
b/components/camel-cxf/camel-cxf-rest/src/main/docs/cxfrs-component.adoc
index 91d6be24875..92d49e4ed20 100644
--- a/components/camel-cxf/camel-cxf-rest/src/main/docs/cxfrs-component.adoc
+++ b/components/camel-cxf/camel-cxf-rest/src/main/docs/cxfrs-component.adoc
@@ -72,14 +72,14 @@ You can also configure the CXF REST endpoint through the
spring
configuration. Since there are lots of difference between the CXF REST
client and CXF REST Server, we provide different configuration for
them. Please check out the
-https://github.com/apache/camel/blob/main/components/camel-cxf/src/main/resources/schema/cxfEndpoint.xsd[schema
+https://github.com/apache/camel/blob/main/components/camel-cxf/camel-cxf-spring-rest/src/main/resources/schema/cxfJaxrsEndpoint.xsd[schema
file] and http://cxf.apache.org/docs/jax-rs.html[CXF JAX-RS
documentation] for more information.
== How to configure the REST endpoint in Camel
In
-https://github.com/apache/camel/blob/main/components/camel-cxf/src/main/resources/schema/cxfEndpoint.xsd[camel-cxf
+https://github.com/apache/camel/blob/main/components/camel-cxf/camel-cxf-spring-rest/src/main/resources/schema/cxfJaxrsEndpoint.xsd[camel-cxf
schema file], there are two elements for the REST endpoint definition.
*cxf:rsServer* for REST consumer, *cxf:rsClient* for REST producer. +
You can find a Camel REST service route configuration example here.
diff --git a/components/camel-cxf/camel-cxf-spring-rest/pom.xml
b/components/camel-cxf/camel-cxf-spring-rest/pom.xml
index 83c0d0f61f3..b36f3950728 100644
--- a/components/camel-cxf/camel-cxf-spring-rest/pom.xml
+++ b/components/camel-cxf/camel-cxf-spring-rest/pom.xml
@@ -324,7 +324,7 @@
<configuration>
<artifacts>
<artifact>
-
<file>./src/main/resources/schema/cxfEndpoint.xsd</file>
+
<file>./src/main/resources/schema/cxfJaxrsEndpoint.xsd</file>
<classifier>spring</classifier>
<type>xsd</type>
</artifact>
diff --git
a/components/camel-cxf/camel-cxf-spring-rest/src/main/resources/META-INF/spring.schemas
b/components/camel-cxf/camel-cxf-spring-rest/src/main/resources/META-INF/spring.schemas
index fa7168ec3ad..c08b5a66127 100644
---
a/components/camel-cxf/camel-cxf-spring-rest/src/main/resources/META-INF/spring.schemas
+++
b/components/camel-cxf/camel-cxf-spring-rest/src/main/resources/META-INF/spring.schemas
@@ -18,11 +18,11 @@
# under the License.
#
#
-http\://camel.apache.org/schema/cxf/jaxrs/camel-cxf.xsd=schema/cxfEndpoint.xsd
+http\://camel.apache.org/schema/cxf/jaxrs/camel-cxf.xsd=schema/cxfJaxrsEndpoint.xsd
-http\://camel.apache.org/schema/cxf/jaxrs/camel-cxf-${camel.version}.xsd=schema/cxfEndpoint.xsd
+http\://camel.apache.org/schema/cxf/jaxrs/camel-cxf-${camel.version}.xsd=schema/cxfJaxrsEndpoint.xsd
-http\://camel.apache.org/schema/cxf/jaxrs/camel-cxf-spring.xsd=schema/cxfEndpoint.xsd
+http\://camel.apache.org/schema/cxf/jaxrs/camel-cxf-spring.xsd=schema/cxfJaxrsEndpoint.xsd
-http\://camel.apache.org/schema/cxf/jaxrs/camel-cxf-${camel.version}-spring.xsd=schema/cxfEndpoint.xsd
+http\://camel.apache.org/schema/cxf/jaxrs/camel-cxf-${camel.version}-spring.xsd=schema/cxfJaxrsEndpoint.xsd
diff --git
a/components/camel-cxf/camel-cxf-spring-rest/src/main/resources/schema/cxfEndpoint.xsd
b/components/camel-cxf/camel-cxf-spring-rest/src/main/resources/schema/cxfJaxrsEndpoint.xsd
similarity index 100%
rename from
components/camel-cxf/camel-cxf-spring-rest/src/main/resources/schema/cxfEndpoint.xsd
rename to
components/camel-cxf/camel-cxf-spring-rest/src/main/resources/schema/cxfJaxrsEndpoint.xsd
diff --git a/components/camel-cxf/camel-cxf-spring-soap/pom.xml
b/components/camel-cxf/camel-cxf-spring-soap/pom.xml
index df2a8e7d937..9b2e363ead8 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/pom.xml
+++ b/components/camel-cxf/camel-cxf-spring-soap/pom.xml
@@ -328,7 +328,7 @@
<configuration>
<artifacts>
<artifact>
-
<file>./src/main/resources/schema/cxfEndpoint.xsd</file>
+
<file>./src/main/resources/schema/cxfJaxwsEndpoint.xsd</file>
<classifier>spring</classifier>
<type>xsd</type>
</artifact>
diff --git
a/components/camel-cxf/camel-cxf-spring-soap/src/main/resources/META-INF/spring.schemas
b/components/camel-cxf/camel-cxf-spring-soap/src/main/resources/META-INF/spring.schemas
index 2a015357106..44d376bc1c4 100644
---
a/components/camel-cxf/camel-cxf-spring-soap/src/main/resources/META-INF/spring.schemas
+++
b/components/camel-cxf/camel-cxf-spring-soap/src/main/resources/META-INF/spring.schemas
@@ -18,11 +18,11 @@
# under the License.
#
#
-http\://camel.apache.org/schema/cxf/jaxws/camel-cxf.xsd=schema/cxfEndpoint.xsd
+http\://camel.apache.org/schema/cxf/jaxws/camel-cxf.xsd=schema/cxfJaxwsEndpoint.xsd
-http\://camel.apache.org/schema/cxf/jaxws/camel-cxf-${camel.version}.xsd=schema/cxfEndpoint.xsd
+http\://camel.apache.org/schema/cxf/jaxws/camel-cxf-${camel.version}.xsd=schema/cxfJaxwsEndpoint.xsd
-http\://camel.apache.org/schema/cxf/jaxws/camel-cxf-spring.xsd=schema/cxfEndpoint.xsd
+http\://camel.apache.org/schema/cxf/jaxws/camel-cxf-spring.xsd=schema/cxfJaxwsEndpoint.xsd
-http\://camel.apache.org/schema/cxf/jaxws/camel-cxf-${camel.version}-spring.xsd=schema/cxfEndpoint.xsd
+http\://camel.apache.org/schema/cxf/jaxws/camel-cxf-${camel.version}-spring.xsd=schema/cxfJaxwsEndpoint.xsd
diff --git
a/components/camel-cxf/camel-cxf-spring-soap/src/main/resources/schema/cxfEndpoint.xsd
b/components/camel-cxf/camel-cxf-spring-soap/src/main/resources/schema/cxfJaxwsEndpoint.xsd
similarity index 100%
rename from
components/camel-cxf/camel-cxf-spring-soap/src/main/resources/schema/cxfEndpoint.xsd
rename to
components/camel-cxf/camel-cxf-spring-soap/src/main/resources/schema/cxfJaxwsEndpoint.xsd
