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-karaf.git
The following commit(s) were added to refs/heads/main by this push:
new 77306de3 CAMEL-9627: camel-cxf splitup
77306de3 is described below
commit 77306de33dec682d5d2ff78a76db08a6058c0dd1
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Thu Jun 30 14:18:07 2022 +0200
CAMEL-9627: camel-cxf splitup
---
components/camel-cxf-blueprint/pom.xml | 7 ++++++-
.../apache/camel/component/cxf/blueprint/CxfBlueprintEndpoint.java | 6 ++----
.../camel/component/cxf/blueprint/RsClientBlueprintBean.java | 2 +-
.../camel/component/cxf/blueprint/RsServerBlueprintBean.java | 2 +-
4 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/components/camel-cxf-blueprint/pom.xml
b/components/camel-cxf-blueprint/pom.xml
index ce5deb14..e3e4c2b7 100644
--- a/components/camel-cxf-blueprint/pom.xml
+++ b/components/camel-cxf-blueprint/pom.xml
@@ -41,9 +41,14 @@
<dependencies>
+ <!-- TODO: avoid spring where we only depend on some spring reflection
helper -->
<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-cxf-spring-rest</artifactId>
</dependency>
<!-- OSGi, Blueprint -->
diff --git
a/components/camel-cxf-blueprint/src/main/java/org/apache/camel/component/cxf/blueprint/CxfBlueprintEndpoint.java
b/components/camel-cxf-blueprint/src/main/java/org/apache/camel/component/cxf/blueprint/CxfBlueprintEndpoint.java
index ecdcfcba..3b9f05e2 100644
---
a/components/camel-cxf-blueprint/src/main/java/org/apache/camel/component/cxf/blueprint/CxfBlueprintEndpoint.java
+++
b/components/camel-cxf-blueprint/src/main/java/org/apache/camel/component/cxf/blueprint/CxfBlueprintEndpoint.java
@@ -17,11 +17,9 @@
package org.apache.camel.component.cxf.blueprint;
import org.apache.camel.blueprint.BlueprintCamelContext;
-import org.apache.camel.component.cxf.CxfComponent;
-import org.apache.camel.component.cxf.CxfEndpoint;
+import org.apache.camel.component.cxf.jaxws.CxfEndpoint;
import org.apache.cxf.BusFactory;
import org.osgi.framework.BundleContext;
-import org.osgi.framework.ServiceReference;
import org.osgi.service.blueprint.container.BlueprintContainer;
public class CxfBlueprintEndpoint extends CxfEndpoint {
@@ -31,7 +29,7 @@ public class CxfBlueprintEndpoint extends CxfEndpoint {
private BlueprintCamelContext blueprintCamelContext;
public CxfBlueprintEndpoint(String address, BundleContext context) {
- super(address, (CxfComponent)null);
+ super(address, null);
bundleContext = context;
}
diff --git
a/components/camel-cxf-blueprint/src/main/java/org/apache/camel/component/cxf/blueprint/RsClientBlueprintBean.java
b/components/camel-cxf-blueprint/src/main/java/org/apache/camel/component/cxf/blueprint/RsClientBlueprintBean.java
index 5b005267..a9801945 100644
---
a/components/camel-cxf-blueprint/src/main/java/org/apache/camel/component/cxf/blueprint/RsClientBlueprintBean.java
+++
b/components/camel-cxf-blueprint/src/main/java/org/apache/camel/component/cxf/blueprint/RsClientBlueprintBean.java
@@ -18,7 +18,7 @@ package org.apache.camel.component.cxf.blueprint;
import java.util.HashMap;
-import org.apache.camel.component.cxf.NullFaultListener;
+import org.apache.camel.component.cxf.common.NullFaultListener;
import org.apache.cxf.ext.logging.LoggingFeature;
import org.apache.cxf.jaxrs.client.JAXRSClientFactoryBean;
import org.apache.cxf.logging.FaultListener;
diff --git
a/components/camel-cxf-blueprint/src/main/java/org/apache/camel/component/cxf/blueprint/RsServerBlueprintBean.java
b/components/camel-cxf-blueprint/src/main/java/org/apache/camel/component/cxf/blueprint/RsServerBlueprintBean.java
index 64fb07af..9b29bd0a 100644
---
a/components/camel-cxf-blueprint/src/main/java/org/apache/camel/component/cxf/blueprint/RsServerBlueprintBean.java
+++
b/components/camel-cxf-blueprint/src/main/java/org/apache/camel/component/cxf/blueprint/RsServerBlueprintBean.java
@@ -18,7 +18,7 @@ package org.apache.camel.component.cxf.blueprint;
import java.util.HashMap;
-import org.apache.camel.component.cxf.NullFaultListener;
+import org.apache.camel.component.cxf.common.NullFaultListener;
import org.apache.cxf.feature.LoggingFeature;
import org.apache.cxf.jaxrs.JAXRSServerFactoryBean;
import org.apache.cxf.logging.FaultListener;
