svn commit: r1145841 - in /camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf: CxfBlueprintEndpoint.java CxfComponent.java

[ningjiang]

Author: ningjiang
Date: Wed Jul 13 02:33:09 2011
New Revision: 1145841

URL: http://svn.apache.org/viewvc?rev=1145841&view=rev
Log:
clean up the code of CxfBlueprintEndpoint

Modified:
    
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfBlueprintEndpoint.java
    
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfComponent.java

Modified: 
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfBlueprintEndpoint.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfBlueprintEndpoint.java?rev=1145841&r1=1145840&r2=1145841&view=diff
==============================================================================
--- 
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfBlueprintEndpoint.java
 (original)
+++ 
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfBlueprintEndpoint.java
 Wed Jul 13 02:33:09 2011
@@ -42,11 +42,6 @@ public class CxfBlueprintEndpoint extend
 
     private static final Logger LOG = 
LoggerFactory.getLogger(CxfBlueprintEndpoint.class);
 
-    protected Map<String, Object> properties;
-
-    private List<Handler> handlers;
-    private List<String> schemaLocations;
-
     private BlueprintContainer blueprintContainer;
     private BundleContext bundleContext;
     private BlueprintCamelContext blueprintCamelContext;
@@ -56,14 +51,6 @@ public class CxfBlueprintEndpoint extend
         bundleContext = context;
     }
 
-    public List<Handler> getHandlers() {
-        return handlers;
-    }
-
-    public void setHandlers(List<Handler> handlers) {
-        this.handlers = handlers;
-    }
-
     public void destroy() {
         // Clean up the BusFactory's defaultBus
         // This method is not called magically, blueprint
@@ -157,14 +144,6 @@ public class CxfBlueprintEndpoint extend
         return answer;
     }
 
-    public void setSchemaLocations(List<String> schemaLocations) {
-        this.schemaLocations = schemaLocations;
-    }
-
-    public List<String> getSchemaLocations() {
-        return schemaLocations;
-    }
-
     public BlueprintContainer getBlueprintContainer() {
         return blueprintContainer;
     }
@@ -189,14 +168,6 @@ public class CxfBlueprintEndpoint extend
         this.blueprintCamelContext = blueprintCamelContext;
     }
 
-    public Map<String, Object> getProperties() {
-        return properties;
-    }
-
-    public void setProperties(Map<String, Object> properties) {
-        this.properties = properties;
-    }
-
     public CxfBlueprintEndpoint getBean() {
         return this;
     }

Modified: 
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfComponent.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfComponent.java?rev=1145841&r1=1145840&r2=1145841&view=diff
==============================================================================
--- 
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfComponent.java
 (original)
+++ 
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfComponent.java
 Wed Jul 13 02:33:09 2011
@@ -56,6 +56,10 @@ public class CxfComponent extends Header
             }
 
             result = CamelContextHelper.mandatoryLookup(getCamelContext(), 
beanId, CxfEndpoint.class);
+            // need to set the CamelContext value 
+            if (result.getCamelContext() == null) {
+                result.setCamelContext(getCamelContext());
+            }
         } else {
             // endpoint URI does not specify a bean
             result = new CxfEndpoint(remaining, this);