From 4a3ef79db66dfe9f3aaf731d9444e23236bf3638 Mon Sep 17 00:00:00 2001
From: Thomas Diesler <thomas.diesler@jboss.com>
Date: Thu, 15 Oct 2015 11:13:13 +0200
Subject: [PATCH] [CAMEL-9240] Abstract CXF endpoint creation for WildFly
 integration

---
 .../apache/camel/component/cxf/CxfComponent.java   | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfComponent.java b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfComponent.java
index e5af409f3b0e6..85776b61cf32b 100644
--- a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfComponent.java
+++ b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfComponent.java
@@ -86,8 +86,8 @@ protected Endpoint createEndpoint(String uri, String remaining, Map<String, Obje
                 beanId = beanId.substring(2);
             }
 
-            result = CamelContextHelper.mandatoryLookup(getCamelContext(), beanId, CxfEndpoint.class);
-            // need to check the CamelContext value 
+            result = createCxfSpringEndpoint(beanId);
+            // need to check the CamelContext value
             if (getCamelContext().equals(result.getCamelContext())) {
                 result.setCamelContext(getCamelContext());
             }
@@ -95,7 +95,7 @@ protected Endpoint createEndpoint(String uri, String remaining, Map<String, Obje
 
         } else {
             // endpoint URI does not specify a bean
-            result = new CxfEndpoint(remaining, this);
+            result = createCxfEndpoint(remaining);
         }
         if (result.getCamelContext() == null) {
             result.setCamelContext(getCamelContext());
@@ -116,6 +116,14 @@ protected Endpoint createEndpoint(String uri, String remaining, Map<String, Obje
         return result;
     }
 
+    protected CxfEndpoint createCxfSpringEndpoint(String beanId) throws Exception {
+        return CamelContextHelper.mandatoryLookup(getCamelContext(), beanId, CxfEndpoint.class);
+    }
+
+    protected CxfEndpoint createCxfEndpoint(String remaining) {
+        return new CxfEndpoint(remaining, this);
+    }
+
     @Override
     protected void afterConfiguration(String uri, String remaining, Endpoint endpoint, Map<String, Object> parameters) throws Exception {
         CxfEndpoint cxfEndpoint = (CxfEndpoint) endpoint;