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 06:05:36 UTC
[camel-examples] branch main updated (946649c8 -> 7b2a94de)
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-examples.git
from 946649c8 CAMEL-18125: fix not setting a cache for the clustering example
new e9344c90 CAMEL-9627: camel-cxf splitup
new cdede533 CAMEL-9627: camel-cxf splitup
new 7b2a94de CAMEL-9627: camel-cxf splitup
The 3 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:
examples/cxf-proxy/pom.xml | 22 ++++++++++++++--------
.../resources/META-INF/spring/camel-config.xml | 4 ++--
examples/cxf-tomcat/pom.xml | 20 +-------------------
3 files changed, 17 insertions(+), 29 deletions(-)
[camel-examples] 03/03: 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-examples.git
commit 7b2a94de3a155652f82dd9dcbf9e966a59c33386
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Thu Jun 30 08:05:27 2022 +0200
CAMEL-9627: camel-cxf splitup
---
examples/cxf-proxy/pom.xml | 22 ++++++++++++++--------
.../resources/META-INF/spring/camel-config.xml | 4 ++--
2 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/examples/cxf-proxy/pom.xml b/examples/cxf-proxy/pom.xml
index b9c7d867..4cd44fa2 100644
--- a/examples/cxf-proxy/pom.xml
+++ b/examples/cxf-proxy/pom.xml
@@ -17,7 +17,8 @@
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
@@ -55,25 +56,30 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-core</artifactId>
</dependency>
-
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-spring-xml</artifactId>
</dependency>
-
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-http</artifactId>
+ <artifactId>camel-spring-main</artifactId>
</dependency>
-
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-cxf</artifactId>
+ <artifactId>camel-cxf-spring-soap</artifactId>
</dependency>
-
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-spring-main</artifactId>
+ <artifactId>camel-cxf-spring-transport</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-http</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-web</artifactId>
+ <version>${spring-version}</version>
</dependency>
<!-- cxf -->
diff --git a/examples/cxf-proxy/src/main/resources/META-INF/spring/camel-config.xml b/examples/cxf-proxy/src/main/resources/META-INF/spring/camel-config.xml
index 6a9d6183..bc01720c 100644
--- a/examples/cxf-proxy/src/main/resources/META-INF/spring/camel-config.xml
+++ b/examples/cxf-proxy/src/main/resources/META-INF/spring/camel-config.xml
@@ -21,13 +21,13 @@
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:camel="http://camel.apache.org/schema/spring"
- xmlns:cxf="http://camel.apache.org/schema/cxf"
+ xmlns:cxf="http://camel.apache.org/schema/cxf/jaxws"
xmlns:context="http://www.springframework.org/schema/context"
xsi:schemaLocation="
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.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">
<!-- spring property placeholder, ignore resource not found as the file resource is for unit testing -->
<context:property-placeholder location="classpath:incident.properties,file:target/custom.properties"
[camel-examples] 02/03: 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-examples.git
commit cdede533e7fa12d385eef7b2e4082cc4ab076d2f
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Thu Jun 30 08:05:19 2022 +0200
CAMEL-9627: camel-cxf splitup
---
examples/cxf-tomcat/pom.xml | 18 ------------------
1 file changed, 18 deletions(-)
diff --git a/examples/cxf-tomcat/pom.xml b/examples/cxf-tomcat/pom.xml
index 6b117aeb..676adde2 100644
--- a/examples/cxf-tomcat/pom.xml
+++ b/examples/cxf-tomcat/pom.xml
@@ -178,22 +178,4 @@
<!-- Test dependencies END -->
</dependencies>
- <profiles>
- <profile>
- <id>Tomcat7</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <properties>
- <tomcat.url>http://localhost:8080/manager/text</tomcat.url>
- </properties>
- </profile>
- <profile>
- <id>Tomcat6</id>
- <properties>
- <tomcat.url>http://localhost:8080/manager</tomcat.url>
- </properties>
- </profile>
- </profiles>
-
</project>
[camel-examples] 01/03: 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-examples.git
commit e9344c90f61be9725fd1f66d7591c126047b9183
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Thu Jun 30 07:51:10 2022 +0200
CAMEL-9627: camel-cxf splitup
---
examples/cxf-tomcat/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/examples/cxf-tomcat/pom.xml b/examples/cxf-tomcat/pom.xml
index ba0d6068..6b117aeb 100644
--- a/examples/cxf-tomcat/pom.xml
+++ b/examples/cxf-tomcat/pom.xml
@@ -106,7 +106,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-cxf</artifactId>
+ <artifactId>camel-cxf-spring-soap</artifactId>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>