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 65ec975186f CAMEL-9627: camel-cxf splitup
65ec975186f is described below
commit 65ec975186f2aa081ff9f7b97c100c8e248f26a5
Author: Claus Ibsen <[email protected]>
AuthorDate: Thu Jun 30 10:30:27 2022 +0200
CAMEL-9627: camel-cxf splitup
---
tests/camel-itest/pom.xml | 6 +++++-
.../org/apache/camel/itest/greeter/CamelFileGreeterOneWayTest.xml | 5 ++---
.../apache/camel/itest/greeter/CamelGreeterConsumerTest-context.xml | 4 ++--
.../apache/camel/itest/greeter/CamelGreeterFileDomTest-context.xml | 4 ++--
.../org/apache/camel/itest/greeter/CamelGreeterTest-context.xml | 4 ++--
.../org/apache/camel/itest/greeter/CxfToJmsInOutTest-context.xml | 4 ++--
.../apache/camel/itest/greeter/JettyRecipientListCxfIssueTest.xml | 4 ++--
.../org/apache/camel/itest/greeter/JmsToCxfInOutTest-context.xml | 4 ++--
.../org/apache/camel/itest/greeter/MulticastCxfTest-context.xml | 4 ++--
.../apache/camel/itest/greeter/RecipientListCxf2Test-context.xml | 4 ++--
.../org/apache/camel/itest/greeter/RecipientListCxfTest-context.xml | 4 ++--
.../org/apache/camel/itest/security/CxfMessageCamelContext.xml | 6 +++---
.../resources/org/apache/camel/itest/security/camel-context.xml | 6 +++---
13 files changed, 31 insertions(+), 28 deletions(-)
diff --git a/tests/camel-itest/pom.xml b/tests/camel-itest/pom.xml
index 640e00f35ea..90f53b25852 100644
--- a/tests/camel-itest/pom.xml
+++ b/tests/camel-itest/pom.xml
@@ -60,7 +60,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-cxf</artifactId>
+ <artifactId>camel-cxf-spring-soap</artifactId>
<!-- conflicts with mockmail for unit testing, so we exclude this
geronimo spec -->
<exclusions>
<exclusion>
@@ -69,6 +69,10 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-cxf-spring-transport</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-ws-security</artifactId>
diff --git
a/tests/camel-itest/src/test/resources/org/apache/camel/itest/greeter/CamelFileGreeterOneWayTest.xml
b/tests/camel-itest/src/test/resources/org/apache/camel/itest/greeter/CamelFileGreeterOneWayTest.xml
index 4f4933fb5dc..9d5900e2c03 100644
---
a/tests/camel-itest/src/test/resources/org/apache/camel/itest/greeter/CamelFileGreeterOneWayTest.xml
+++
b/tests/camel-itest/src/test/resources/org/apache/camel/itest/greeter/CamelFileGreeterOneWayTest.xml
@@ -19,11 +19,10 @@
-->
<beans xmlns="http://www.springframework.org/schema/beans";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xmlns:cxf="http://camel.apache.org/schema/cxf";
-
+ xmlns:cxf="http://camel.apache.org/schema/cxf/jaxws";
xsi:schemaLocation="
http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd
- http://camel.apache.org/schema/cxf
http://camel.apache.org/schema/cxf/camel-cxf.xsd
+ http://camel.apache.org/schema/cxf/jaxws
http://camel.apache.org/schema/cxf/jaxws/camel-cxf.xsd
http://camel.apache.org/schema/spring
http://camel.apache.org/schema/spring/camel-spring.xsd
">
diff --git
a/tests/camel-itest/src/test/resources/org/apache/camel/itest/greeter/CamelGreeterConsumerTest-context.xml
b/tests/camel-itest/src/test/resources/org/apache/camel/itest/greeter/CamelGreeterConsumerTest-context.xml
index a38e91b01d4..32290ea4faf 100644
---
a/tests/camel-itest/src/test/resources/org/apache/camel/itest/greeter/CamelGreeterConsumerTest-context.xml
+++
b/tests/camel-itest/src/test/resources/org/apache/camel/itest/greeter/CamelGreeterConsumerTest-context.xml
@@ -19,11 +19,11 @@
-->
<beans xmlns="http://www.springframework.org/schema/beans";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xmlns:cxf="http://camel.apache.org/schema/cxf";
+ xmlns:cxf="http://camel.apache.org/schema/cxf/jaxws";
xsi:schemaLocation="
http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd
- http://camel.apache.org/schema/cxf
http://camel.apache.org/schema/cxf/camel-cxf.xsd
+ http://camel.apache.org/schema/cxf/jaxws
http://camel.apache.org/schema/cxf/jaxws/camel-cxf.xsd
http://camel.apache.org/schema/spring
http://camel.apache.org/schema/spring/camel-spring.xsd
">
diff --git
a/tests/camel-itest/src/test/resources/org/apache/camel/itest/greeter/CamelGreeterFileDomTest-context.xml
b/tests/camel-itest/src/test/resources/org/apache/camel/itest/greeter/CamelGreeterFileDomTest-context.xml
index ea5e73688b2..70aad304dea 100644
---
a/tests/camel-itest/src/test/resources/org/apache/camel/itest/greeter/CamelGreeterFileDomTest-context.xml
+++
b/tests/camel-itest/src/test/resources/org/apache/camel/itest/greeter/CamelGreeterFileDomTest-context.xml
@@ -19,10 +19,10 @@
-->
<beans xmlns="http://www.springframework.org/schema/beans";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xmlns:cxf="http://camel.apache.org/schema/cxf";
+ xmlns:cxf="http://camel.apache.org/schema/cxf/jaxws";
xsi:schemaLocation="
http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd
- http://camel.apache.org/schema/cxf
http://camel.apache.org/schema/cxf/camel-cxf.xsd
+ http://camel.apache.org/schema/cxf/jaxws
http://camel.apache.org/schema/cxf/jaxws/camel-cxf.xsd
http://camel.apache.org/schema/spring
http://camel.apache.org/schema/spring/camel-spring.xsd
">
diff --git
a/tests/camel-itest/src/test/resources/org/apache/camel/itest/greeter/CamelGreeterTest-context.xml
b/tests/camel-itest/src/test/resources/org/apache/camel/itest/greeter/CamelGreeterTest-context.xml
index d70b08ae2f8..74e9ed02799 100644
---
a/tests/camel-itest/src/test/resources/org/apache/camel/itest/greeter/CamelGreeterTest-context.xml
+++
b/tests/camel-itest/src/test/resources/org/apache/camel/itest/greeter/CamelGreeterTest-context.xml
@@ -19,11 +19,11 @@
-->
<beans xmlns="http://www.springframework.org/schema/beans";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xmlns:cxf="http://camel.apache.org/schema/cxf";
+ xmlns:cxf="http://camel.apache.org/schema/cxf/jaxws";
xsi:schemaLocation="
http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd
- http://camel.apache.org/schema/cxf
http://camel.apache.org/schema/cxf/camel-cxf.xsd
+ http://camel.apache.org/schema/cxf/jaxws
http://camel.apache.org/schema/cxf/jaxws/camel-cxf.xsd
http://camel.apache.org/schema/spring
http://camel.apache.org/schema/spring/camel-spring.xsd
">
diff --git
a/tests/camel-itest/src/test/resources/org/apache/camel/itest/greeter/CxfToJmsInOutTest-context.xml
b/tests/camel-itest/src/test/resources/org/apache/camel/itest/greeter/CxfToJmsInOutTest-context.xml
index 74fe756bb74..0571de66d65 100644
---
a/tests/camel-itest/src/test/resources/org/apache/camel/itest/greeter/CxfToJmsInOutTest-context.xml
+++
b/tests/camel-itest/src/test/resources/org/apache/camel/itest/greeter/CxfToJmsInOutTest-context.xml
@@ -19,10 +19,10 @@
-->
<beans xmlns="http://www.springframework.org/schema/beans";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xmlns:cxf="http://camel.apache.org/schema/cxf";
+ xmlns:cxf="http://camel.apache.org/schema/cxf/jaxws";
xsi:schemaLocation="
http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd
- http://camel.apache.org/schema/cxf
http://camel.apache.org/schema/cxf/camel-cxf.xsd
+ http://camel.apache.org/schema/cxf/jaxws
http://camel.apache.org/schema/cxf/jaxws/camel-cxf.xsd
http://camel.apache.org/schema/spring
http://camel.apache.org/schema/spring/camel-spring.xsd
">
diff --git
a/tests/camel-itest/src/test/resources/org/apache/camel/itest/greeter/JettyRecipientListCxfIssueTest.xml
b/tests/camel-itest/src/test/resources/org/apache/camel/itest/greeter/JettyRecipientListCxfIssueTest.xml
index 5d054dd54f0..5e8476d1d06 100644
---
a/tests/camel-itest/src/test/resources/org/apache/camel/itest/greeter/JettyRecipientListCxfIssueTest.xml
+++
b/tests/camel-itest/src/test/resources/org/apache/camel/itest/greeter/JettyRecipientListCxfIssueTest.xml
@@ -19,10 +19,10 @@
-->
<beans xmlns="http://www.springframework.org/schema/beans";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xmlns:cxf="http://camel.apache.org/schema/cxf";
+ xmlns:cxf="http://camel.apache.org/schema/cxf/jaxws";
xsi:schemaLocation="
http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd
- http://camel.apache.org/schema/cxf
http://camel.apache.org/schema/cxf/camel-cxf.xsd
+ http://camel.apache.org/schema/cxf/jaxws
http://camel.apache.org/schema/cxf/jaxws/camel-cxf.xsd
http://camel.apache.org/schema/spring
http://camel.apache.org/schema/spring/camel-spring.xsd
">
diff --git
a/tests/camel-itest/src/test/resources/org/apache/camel/itest/greeter/JmsToCxfInOutTest-context.xml
b/tests/camel-itest/src/test/resources/org/apache/camel/itest/greeter/JmsToCxfInOutTest-context.xml
index a638391f8c5..14026a7a5a6 100644
---
a/tests/camel-itest/src/test/resources/org/apache/camel/itest/greeter/JmsToCxfInOutTest-context.xml
+++
b/tests/camel-itest/src/test/resources/org/apache/camel/itest/greeter/JmsToCxfInOutTest-context.xml
@@ -19,12 +19,12 @@
-->
<beans xmlns="http://www.springframework.org/schema/beans";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xmlns:cxf="http://camel.apache.org/schema/cxf";
+ xmlns:cxf="http://camel.apache.org/schema/cxf/jaxws";
xmlns:jaxws="http://cxf.apache.org/jaxws";
xsi:schemaLocation="
http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd
http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd
- http://camel.apache.org/schema/cxf
http://camel.apache.org/schema/cxf/camel-cxf.xsd
+ http://camel.apache.org/schema/cxf/jaxws
http://camel.apache.org/schema/cxf/jaxws/camel-cxf.xsd
http://camel.apache.org/schema/spring
http://camel.apache.org/schema/spring/camel-spring.xsd
">
diff --git
a/tests/camel-itest/src/test/resources/org/apache/camel/itest/greeter/MulticastCxfTest-context.xml
b/tests/camel-itest/src/test/resources/org/apache/camel/itest/greeter/MulticastCxfTest-context.xml
index efdbc15b350..af04858e12a 100644
---
a/tests/camel-itest/src/test/resources/org/apache/camel/itest/greeter/MulticastCxfTest-context.xml
+++
b/tests/camel-itest/src/test/resources/org/apache/camel/itest/greeter/MulticastCxfTest-context.xml
@@ -19,10 +19,10 @@
-->
<beans xmlns="http://www.springframework.org/schema/beans";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xmlns:cxf="http://camel.apache.org/schema/cxf";
+ xmlns:cxf="http://camel.apache.org/schema/cxf/jaxws";
xsi:schemaLocation="
http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd
- http://camel.apache.org/schema/cxf
http://camel.apache.org/schema/cxf/camel-cxf.xsd
+ http://camel.apache.org/schema/cxf/jaxws
http://camel.apache.org/schema/cxf/jaxws/camel-cxf.xsd
http://camel.apache.org/schema/spring
http://camel.apache.org/schema/spring/camel-spring.xsd
">
diff --git
a/tests/camel-itest/src/test/resources/org/apache/camel/itest/greeter/RecipientListCxf2Test-context.xml
b/tests/camel-itest/src/test/resources/org/apache/camel/itest/greeter/RecipientListCxf2Test-context.xml
index 274df54178f..2f25332d851 100644
---
a/tests/camel-itest/src/test/resources/org/apache/camel/itest/greeter/RecipientListCxf2Test-context.xml
+++
b/tests/camel-itest/src/test/resources/org/apache/camel/itest/greeter/RecipientListCxf2Test-context.xml
@@ -19,10 +19,10 @@
-->
<beans xmlns="http://www.springframework.org/schema/beans";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xmlns:cxf="http://camel.apache.org/schema/cxf";
+ xmlns:cxf="http://camel.apache.org/schema/cxf/jaxws";
xsi:schemaLocation="
http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd
- http://camel.apache.org/schema/cxf
http://camel.apache.org/schema/cxf/camel-cxf.xsd
+ http://camel.apache.org/schema/cxf/jaxws
http://camel.apache.org/schema/cxf/jaxws/camel-cxf.xsd
http://camel.apache.org/schema/spring
http://camel.apache.org/schema/spring/camel-spring.xsd
">
diff --git
a/tests/camel-itest/src/test/resources/org/apache/camel/itest/greeter/RecipientListCxfTest-context.xml
b/tests/camel-itest/src/test/resources/org/apache/camel/itest/greeter/RecipientListCxfTest-context.xml
index 06a6d234957..c5e4e22a5cc 100644
---
a/tests/camel-itest/src/test/resources/org/apache/camel/itest/greeter/RecipientListCxfTest-context.xml
+++
b/tests/camel-itest/src/test/resources/org/apache/camel/itest/greeter/RecipientListCxfTest-context.xml
@@ -19,10 +19,10 @@
-->
<beans xmlns="http://www.springframework.org/schema/beans";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xmlns:cxf="http://camel.apache.org/schema/cxf";
+ xmlns:cxf="http://camel.apache.org/schema/cxf/jaxws";
xsi:schemaLocation="
http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd
- http://camel.apache.org/schema/cxf
http://camel.apache.org/schema/cxf/camel-cxf.xsd
+ http://camel.apache.org/schema/cxf/jaxws
http://camel.apache.org/schema/cxf/jaxws/camel-cxf.xsd
http://camel.apache.org/schema/spring
http://camel.apache.org/schema/spring/camel-spring.xsd
">
diff --git
a/tests/camel-itest/src/test/resources/org/apache/camel/itest/security/CxfMessageCamelContext.xml
b/tests/camel-itest/src/test/resources/org/apache/camel/itest/security/CxfMessageCamelContext.xml
index 269e5e9e63b..9b47c2cfb56 100644
---
a/tests/camel-itest/src/test/resources/org/apache/camel/itest/security/CxfMessageCamelContext.xml
+++
b/tests/camel-itest/src/test/resources/org/apache/camel/itest/security/CxfMessageCamelContext.xml
@@ -19,10 +19,10 @@
-->
<beans
xmlns="http://www.springframework.org/schema/beans";
- xmlns:cxf="http://camel.apache.org/schema/cxf";
+ xmlns:cxf="http://camel.apache.org/schema/cxf/jaxws";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://camel.apache.org/schema/cxf
- http://camel.apache.org/schema/cxf/camel-cxf.xsd
+ xsi:schemaLocation="http://camel.apache.org/schema/cxf/jaxws
+ http://camel.apache.org/schema/cxf/jaxws/camel-cxf.xsd
http://camel.apache.org/schema/spring-security
http://camel.apache.org/schema/spring-security/camel-spring-security.xsd
http://www.springframework.org/schema/beans
diff --git
a/tests/camel-itest/src/test/resources/org/apache/camel/itest/security/camel-context.xml
b/tests/camel-itest/src/test/resources/org/apache/camel/itest/security/camel-context.xml
index 5cfc3fe8fcc..ce00be31c5f 100644
---
a/tests/camel-itest/src/test/resources/org/apache/camel/itest/security/camel-context.xml
+++
b/tests/camel-itest/src/test/resources/org/apache/camel/itest/security/camel-context.xml
@@ -19,10 +19,10 @@
-->
<beans
xmlns="http://www.springframework.org/schema/beans";
- xmlns:cxf="http://camel.apache.org/schema/cxf";
+ xmlns:cxf="http://camel.apache.org/schema/cxf/jaxws";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://camel.apache.org/schema/cxf
- http://camel.apache.org/schema/cxf/camel-cxf.xsd
+ xsi:schemaLocation="http://camel.apache.org/schema/cxf/jaxws
+ http://camel.apache.org/schema/cxf/jaxws/camel-cxf.xsd
http://camel.apache.org/schema/spring-security
http://camel.apache.org/schema/spring-security/camel-spring-security.xsd
http://www.springframework.org/schema/beans
