camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject svn commit: r979188 - in /camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf: ./ converter/ cxfbean/ feature/ interceptors/ jaxrs/ spring/ transport/ transport/spring/ util/
Date Mon, 26 Jul 2010 07:44:14 GMT
Author: davsclaus
Date: Mon Jul 26 07:44:12 2010
New Revision: 979188

URL: http://svn.apache.org/viewvc?rev=979188&view=rev
Log:
CAMEL-2991: Fixed issue with injecting CamelContext. Should never just create a new DefaultCamelContext. Polished code.

Modified:
    camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfBinding.java
    camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfConsumer.java
    camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
    camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfHeaderFilterStrategy.java
    camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfPayload.java
    camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfSpringEndpoint.java
    camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java
    camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/HybridSourceDataBinding.java
    camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/MessageHeaderFilter.java
    camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/SoapMessageHeaderFilter.java
    camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/WSDLServiceFactoryBean.java
    camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CxfConverter.java
    camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/cxfbean/CxfBeanBinding.java
    camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/cxfbean/CxfBeanDestination.java
    camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/cxfbean/CxfBeanEndpoint.java
    camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/cxfbean/CxfBeanTransportFactory.java
    camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/cxfbean/DefaultCxfBeanBinding.java
    camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/PayLoadDataFormatFeature.java
    camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/interceptors/RemoveClassTypeInterceptor.java
    camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/BeanIdAware.java
    camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsBinding.java
    camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsComponent.java
    camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsConsumer.java
    camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpoint.java
    camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsHeaderFilterStrategy.java
    camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsInvoker.java
    camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducer.java
    camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/DefaultCxfRsBinding.java
    camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/AbstractCxfBeanDefinitionParser.java
    camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/CxfEndpointBean.java
    camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/CxfEndpointBeanDefinitionParser.java
    camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/CxfRsClientFactoryBeanDefinitionParser.java
    camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/CxfRsServerFactoryBeanDefinitionParser.java
    camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/NamespaceHandler.java
    camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/SpringBusFactoryBean.java
    camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelConduit.java
    camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelDestination.java
    camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelTransportFactory.java
    camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/spring/AbstractCamelContextBeanDefinitionParser.java
    camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/spring/CamelDestinationDefinitionParser.java
    camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/spring/NamespaceHandler.java
    camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/util/CxfEndpointUtils.java
    camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/util/CxfHeaderHelper.java
    camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/util/CxfMessageHelper.java
    camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/util/CxfUtils.java
    camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/util/DataInInterceptor.java
    camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/util/DataOutInterceptor.java
    camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/util/WSDLSoapServiceFactoryBean.java

Modified: camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfBinding.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfBinding.java?rev=979188&r1=979187&r2=979188&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfBinding.java (original)
+++ camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfBinding.java Mon Jul 26 07:44:12 2010
@@ -24,7 +24,7 @@ import org.apache.cxf.message.Exchange;
  * An strategy interface for implementing binding between CXF {@link Exchange} 
  * and Camel {@link org.apache.camel.Exchange}.  
  * 
- * Assumptions: CxfProducer and CxfConsumer set {@link #DataFormat} and 
+ * Assumptions: CxfProducer and CxfConsumer set {@link DataFormat} and
  * {@link org.apache.cxf.service.model.BindingOperationInfo} 
  * in Camel Exchange property before calling into these methods.  
  * 

Modified: camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfConsumer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfConsumer.java?rev=979188&r1=979187&r2=979188&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfConsumer.java (original)
+++ camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfConsumer.java Mon Jul 26 07:44:12 2010
@@ -16,7 +16,6 @@
  */
 package org.apache.camel.component.cxf;
 
-
 import java.util.HashMap;
 import java.util.Map;
 

Modified: camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java?rev=979188&r1=979187&r2=979188&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java (original)
+++ camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java Mon Jul 26 07:44:12 2010
@@ -173,7 +173,6 @@ public class CxfEndpoint extends Default
     }
     
     /**
-     * 
      * Create a client factory bean object.  Notice that the serviceClass <b>must</b> be
      * an interface.
      */
@@ -197,7 +196,6 @@ public class CxfEndpoint extends Default
     }
     
     /**
-     * 
      * Create a client factory bean object without serviceClass interface.
      */
     protected ClientFactoryBean createClientFactoryBean() {
@@ -227,11 +225,9 @@ public class CxfEndpoint extends Default
             busFactory = new org.apache.cxf.bus.spring.SpringBusFactory(applicationContext);
         }
         return busFactory.createBus();
-        
     }
     
     /**
-     * 
      * Populate a client factory bean
      */
     protected void setupClientFactoryBean(ClientProxyFactoryBean factoryBean, Class<?> cls) {       
@@ -548,8 +544,7 @@ public class CxfEndpoint extends Default
 
     /**
      * We need to override the {@link ClientImpl#setParameters} method
-     * to insert parameters into CXF Message for {@link DataFormat#PAYLOAD}
-     * mode.
+     * to insert parameters into CXF Message for {@link DataFormat#PAYLOAD} mode.
      */
     class CamelCxfClientImpl extends ClientImpl {
        
@@ -596,4 +591,5 @@ public class CxfEndpoint extends Default
             message.remove(DataFormat.class);
         }
     }
+
 }

Modified: camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfHeaderFilterStrategy.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfHeaderFilterStrategy.java?rev=979188&r1=979187&r2=979188&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfHeaderFilterStrategy.java (original)
+++ camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfHeaderFilterStrategy.java Mon Jul 26 07:44:12 2010
@@ -226,4 +226,5 @@ public class CxfHeaderFilterStrategy ext
     public void setRelayAllMessageHeaders(boolean relayAllMessageHeaders) {
         this.relayAllMessageHeaders = relayAllMessageHeaders;
     }
+
 }

Modified: camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfPayload.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfPayload.java?rev=979188&r1=979187&r2=979188&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfPayload.java (original)
+++ camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfPayload.java Mon Jul 26 07:44:12 2010
@@ -24,7 +24,6 @@ import org.w3c.dom.Element;
 
 import org.apache.camel.converter.jaxp.XmlConverter;
 
-
 /**
  * CxfMessage body type when {@link DataFormat#PAYLOAD} is used.
  * 

Modified: camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfSpringEndpoint.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfSpringEndpoint.java?rev=979188&r1=979187&r2=979188&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfSpringEndpoint.java (original)
+++ camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfSpringEndpoint.java Mon Jul 26 07:44:12 2010
@@ -242,17 +242,14 @@ public class CxfSpringEndpoint extends C
         this.serviceNamespace = serviceNamespace;
     }
 
-
     public String getServiceNamespace() {
         return serviceNamespace;
     }
 
-
     public void setServiceLocalName(String serviceLocalName) {
         this.serviceLocalName = serviceLocalName;
     }
 
-
     public String getServiceLocalName() {
         return serviceLocalName;
     }
@@ -265,15 +262,12 @@ public class CxfSpringEndpoint extends C
         this.endpointLocalName = endpointLocalName;
     }
 
-
     public void setEndpointNamespace(String endpointNamespace) {
         this.endpointNamespace = endpointNamespace;
     }
 
-
     public String getEndpointNamespace() {
         return endpointNamespace;
     }
-    
-    
+
 }

Modified: camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java?rev=979188&r1=979187&r2=979188&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java (original)
+++ camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java Mon Jul 26 07:44:12 2010
@@ -73,13 +73,11 @@ public class DefaultCxfBinding implement
     // -------------------------------------------------------------------------
     
     /**
-     * <p>
-     * This method is called by {@link CxfProducer#process(Exchange)}. It populates 
+     * This method is called by {@link CxfProducer#process(Exchange)}. It populates
      * the CXF exchange and invocation context (i.e. request/response) contexts, it 
      * but does not create and populate a CXF message as a ClientImpl's invoke method
      * will create a new CXF Message.  That method will put all properties from the 
      * CXF exchange and request context to the CXF message.
-     * </p>
      */
     public void populateCxfRequestFromExchange(
             org.apache.cxf.message.Exchange cxfExchange, Exchange camelExchange,
@@ -353,7 +351,6 @@ public class DefaultCxfBinding implement
 
     // HeaderFilterStrategyAware Methods
     // -------------------------------------------------------------------------
-    
 
     public HeaderFilterStrategy getHeaderFilterStrategy() {
         return headerFilterStrategy;
@@ -363,7 +360,6 @@ public class DefaultCxfBinding implement
         this.headerFilterStrategy = strategy;
     }
 
-       
     // Non public methods
     // -------------------------------------------------------------------------
     
@@ -394,8 +390,8 @@ public class DefaultCxfBinding implement
     /**
      * @param camelExchange
      * @param cxfContext Request or Response context
-     * @param camelHeaders 
-     * @param contextKey 
+     * @param camelHeaders
+     * @param contextKey
      */
     @SuppressWarnings("unchecked")
     protected void extractInvocationContextFromCamel(Exchange camelExchange,
@@ -587,8 +583,7 @@ public class DefaultCxfBinding implement
         if (boi.isUnwrapped()) {
             op = boi.getWrappedOperation().getOperationInfo();
         } 
-        
-        
+
         List<MessagePartInfo> partInfos = null;
         boolean client = Boolean.TRUE.equals(message.get(Message.REQUESTOR_ROLE));
         if (client) {
@@ -637,7 +632,6 @@ public class DefaultCxfBinding implement
         return answer;
     }
 
-
     public static Object getBodyFromCamel(org.apache.camel.Message out,
             DataFormat dataFormat) {
         Object answer = null;

Modified: camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/HybridSourceDataBinding.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/HybridSourceDataBinding.java?rev=979188&r1=979187&r2=979188&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/HybridSourceDataBinding.java (original)
+++ camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/HybridSourceDataBinding.java Mon Jul 26 07:44:12 2010
@@ -86,4 +86,5 @@ public class HybridSourceDataBinding ext
     public Class<?>[] getSupportedWriterFormats() {
         return new Class[] {XMLStreamWriter.class, Node.class};
     }
+
 }

Modified: camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/MessageHeaderFilter.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/MessageHeaderFilter.java?rev=979188&r1=979187&r2=979188&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/MessageHeaderFilter.java (original)
+++ camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/MessageHeaderFilter.java Mon Jul 26 07:44:12 2010
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.camel.component.cxf;
 
 import java.util.List;
@@ -24,7 +23,6 @@ import org.apache.cxf.headers.Header;
 
 /**
  * Filter the wire message headers from one CXF endpoint to another CXF endpoint
- *
  */
 public interface MessageHeaderFilter {
 
@@ -42,4 +40,5 @@ public interface MessageHeaderFilter {
      *  @param headers the origin list of headers
      */
     void filter(Direction direction, List<Header> headers);
+
 }

Modified: camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/SoapMessageHeaderFilter.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/SoapMessageHeaderFilter.java?rev=979188&r1=979187&r2=979188&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/SoapMessageHeaderFilter.java (original)
+++ camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/SoapMessageHeaderFilter.java Mon Jul 26 07:44:12 2010
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.camel.component.cxf;
 
 import java.util.Arrays;

Modified: camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/WSDLServiceFactoryBean.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/WSDLServiceFactoryBean.java?rev=979188&r1=979187&r2=979188&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/WSDLServiceFactoryBean.java (original)
+++ camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/WSDLServiceFactoryBean.java Mon Jul 26 07:44:12 2010
@@ -26,6 +26,7 @@ import org.apache.cxf.service.invoker.In
  * @version $Revision$
  */
 public class WSDLServiceFactoryBean extends ReflectionServiceFactoryBean {
+
     @Override
     protected void initializeWSDLOperations() {
         // skip this operation that requires service class
@@ -41,4 +42,5 @@ public class WSDLServiceFactoryBean exte
         // Camel specific invoker will be set 
         return null;
     }
+
 }

Modified: camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CxfConverter.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CxfConverter.java?rev=979188&r1=979187&r2=979188&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CxfConverter.java (original)
+++ camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CxfConverter.java Mon Jul 26 07:44:12 2010
@@ -124,7 +124,6 @@ public final class CxfConverter {
     
     @Converter
     public static InputStream toInputStream(Response response, Exchange exchange) {
-        
         Object obj = response.getEntity();
         
         if (obj == null) {
@@ -149,7 +148,7 @@ public final class CxfConverter {
     /**
      * Use a fallback type converter so we can convert the embedded list element 
      * if the value is MessageContentsList.  The algorithm of this converter
-     * finds the first non-null list element from the list and applies convertion
+     * finds the first non-null list element from the list and applies conversion
      * to the list element.
      * 
      * @param type the desired type to be converted to

Modified: camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/cxfbean/CxfBeanBinding.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/cxfbean/CxfBeanBinding.java?rev=979188&r1=979187&r2=979188&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/cxfbean/CxfBeanBinding.java (original)
+++ camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/cxfbean/CxfBeanBinding.java Mon Jul 26 07:44:12 2010
@@ -21,28 +21,21 @@ import org.apache.camel.spi.HeaderFilter
 import org.apache.cxf.message.Message;
 
 /**
- * A Strategy to bind a Camel exchange to a CXF message used by {@link CxfBeanDestination}. 
- * 
+ * A Strategy to bind a Camel exchange to a CXF message used by {@link CxfBeanDestination}.
+ *
  * @version $Revision$
  */
 public interface CxfBeanBinding {
 
     /**
      * Create a CXF {@link Message} from a Camel exchange.
-     * 
-     * @param camelExchange
-     * @param headerFilterStrategy
      */
-    Message createCxfMessageFromCamelExchange(Exchange camelExchange, 
-            HeaderFilterStrategy headerFilterStrategy);
+    Message createCxfMessageFromCamelExchange(Exchange camelExchange,
+                                              HeaderFilterStrategy headerFilterStrategy);
 
     /**
-     * Given a CXF out/response Message, this method propagates response headers to a 
+     * Given a CXF out/response Message, this method propagates response headers to a
      * Camel exchange.
-     * 
-     * @param cxfMessage
-     * @param camelExchange
-     * @param headerFilterStrategy
      */
     void propagateResponseHeadersToCamel(Message cxfMessage, Exchange camelExchange,
                                          HeaderFilterStrategy headerFilterStrategy);

Modified: camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/cxfbean/CxfBeanDestination.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/cxfbean/CxfBeanDestination.java?rev=979188&r1=979187&r2=979188&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/cxfbean/CxfBeanDestination.java (original)
+++ camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/cxfbean/CxfBeanDestination.java Mon Jul 26 07:44:12 2010
@@ -44,7 +44,7 @@ public class CxfBeanDestination extends 
     public CxfBeanDestination(CxfBeanComponent cxfBeanComponent, Bus bus,
             ConduitInitiator conduitInitiator,
             EndpointInfo endpointInfo) throws IOException {
-        super(null, bus, conduitInitiator, endpointInfo);
+        super(cxfBeanComponent.getCamelContext(), bus, conduitInitiator, endpointInfo);
         this.cxfBeanComponent = cxfBeanComponent;
     }
 

Modified: camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/cxfbean/CxfBeanEndpoint.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/cxfbean/CxfBeanEndpoint.java?rev=979188&r1=979187&r2=979188&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/cxfbean/CxfBeanEndpoint.java (original)
+++ camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/cxfbean/CxfBeanEndpoint.java Mon Jul 26 07:44:12 2010
@@ -125,12 +125,7 @@ public class CxfBeanEndpoint extends Pro
         }
     }
     
-    /**
-     * @param cxfBeanComponent 
-     * 
-     */
     private void registerTransportFactory(CxfBeanComponent cxfBeanComponent) {
-        
         CxfBeanTransportFactory transportFactory = new CxfBeanTransportFactory();
         transportFactory.setCxfBeanComponent(cxfBeanComponent);
         transportFactory.setBus(bus);
@@ -142,7 +137,6 @@ public class CxfBeanEndpoint extends Pro
         // register the destination factory
         DestinationFactoryManager dfm = bus.getExtension(DestinationFactoryManager.class);
         dfm.registerDestinationFactory(CxfBeanTransportFactory.TRANSPORT_ID, transportFactory);    
-        
     }
 
     // Properties

Modified: camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/cxfbean/CxfBeanTransportFactory.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/cxfbean/CxfBeanTransportFactory.java?rev=979188&r1=979187&r2=979188&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/cxfbean/CxfBeanTransportFactory.java (original)
+++ camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/cxfbean/CxfBeanTransportFactory.java Mon Jul 26 07:44:12 2010
@@ -46,12 +46,8 @@ public class CxfBeanTransportFactory ext
         return new CxfBeanDestination(cxfBeanComponent, getBus(), this, endpointInfo);
     }
 
-    /**
-     * @param cxfBeanComponent
-     */
     public void setCxfBeanComponent(CxfBeanComponent cxfBeanComponent) {
         this.cxfBeanComponent = cxfBeanComponent;
-        
     }
     
 }

Modified: camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/cxfbean/DefaultCxfBeanBinding.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/cxfbean/DefaultCxfBeanBinding.java?rev=979188&r1=979187&r2=979188&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/cxfbean/DefaultCxfBeanBinding.java (original)
+++ camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/cxfbean/DefaultCxfBeanBinding.java Mon Jul 26 07:44:12 2010
@@ -111,7 +111,6 @@ public class DefaultCxfBeanBinding imple
             }
         }
 
-        
         // propagate HTTP RESPONSE_CODE
         String key = Message.RESPONSE_CODE;
         Object value = cxfMessage.get(key);
@@ -127,7 +126,6 @@ public class DefaultCxfBeanBinding imple
         if (cxfMessage.get(Message.CONTENT_TYPE) != null) {
             camelHeaders.put(Exchange.CONTENT_TYPE, cxfMessage.get(Message.CONTENT_TYPE));
         }
-        
     }
 
     protected String getPath(org.apache.camel.Message camelMessage) {
@@ -156,7 +154,6 @@ public class DefaultCxfBeanBinding imple
             answer = camelMessage.getHeader(Exchange.CHARSET_NAME, String.class);
         }
         return answer;
-
     }
 
     protected String getRequestContentType(org.apache.camel.Message camelMessage) {

Modified: camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/PayLoadDataFormatFeature.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/PayLoadDataFormatFeature.java?rev=979188&r1=979187&r2=979188&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/PayLoadDataFormatFeature.java (original)
+++ camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/PayLoadDataFormatFeature.java Mon Jul 26 07:44:12 2010
@@ -34,10 +34,8 @@ import org.apache.cxf.interceptor.Client
  */
 public class PayLoadDataFormatFeature extends AbstractDataFormatFeature {
     private static final Logger LOG = LogUtils.getL7dLogger(PayLoadDataFormatFeature.class);    
-
     private static final Collection<Class> REMOVING_FAULT_IN_INTERCEPTORS;
 
-
     static {
         REMOVING_FAULT_IN_INTERCEPTORS = new ArrayList<Class>();
         REMOVING_FAULT_IN_INTERCEPTORS.add(ClientFaultConverter.class);
@@ -68,5 +66,4 @@ public class PayLoadDataFormatFeature ex
         removeInterceptors(client.getEndpoint().getBinding().getInFaultInterceptors(), REMOVING_FAULT_IN_INTERCEPTORS);        
     }
 
-
 }

Modified: camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/interceptors/RemoveClassTypeInterceptor.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/interceptors/RemoveClassTypeInterceptor.java?rev=979188&r1=979187&r2=979188&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/interceptors/RemoveClassTypeInterceptor.java (original)
+++ camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/interceptors/RemoveClassTypeInterceptor.java Mon Jul 26 07:44:12 2010
@@ -41,7 +41,6 @@ public class RemoveClassTypeInterceptor 
     public RemoveClassTypeInterceptor() {
         super(Phase.UNMARSHAL);
         addBefore(SoapHeaderInterceptor.class.getName());
-
     }
 
     public void handleMessage(Message message) throws Fault {
@@ -67,7 +66,6 @@ public class RemoveClassTypeInterceptor 
             removePartTypeClass(bop.getInput());
             removePartTypeClass(bop.getOutput());
         }
-        
     }
 
     protected void removePartTypeClass(BindingMessageInfo bmi) {

Modified: camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/BeanIdAware.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/BeanIdAware.java?rev=979188&r1=979187&r2=979188&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/BeanIdAware.java (original)
+++ camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/BeanIdAware.java Mon Jul 26 07:44:12 2010
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.camel.component.cxf.jaxrs;
 
 /**

Modified: camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsBinding.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsBinding.java?rev=979188&r1=979187&r2=979188&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsBinding.java (original)
+++ camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsBinding.java Mon Jul 26 07:44:12 2010
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.camel.component.cxf.jaxrs;
 
 import java.lang.reflect.Method;
 import java.util.Map;
 
 import javax.ws.rs.core.MultivaluedMap;
+
 import org.apache.cxf.message.Exchange;
 
 /**
@@ -29,77 +29,79 @@ import org.apache.cxf.message.Exchange;
  * @version $Revision$
  */
 public interface CxfRsBinding {
-    
+
     /**
-     * Populate the camel exchange from the CxfRsRequest, the exchange will be consumed 
+     * Populate the camel exchange from the CxfRsRequest, the exchange will be consumed
      * by the processor which the CxfRsConsumer attached.
-     * 
-     * @param camelExchange  camel exchange object
-     * @param cxfExchange  cxf exchange object 
-     * @param method  the method which is need for the camel component
-     * @param paramArray  the parameter list for the method invocation 
+     *
+     * @param camelExchange camel exchange object
+     * @param cxfExchange   cxf exchange object
+     * @param method        the method which is need for the camel component
+     * @param paramArray    the parameter list for the method invocation
      */
     void populateExchangeFromCxfRsRequest(Exchange cxfExchange,
-                              org.apache.camel.Exchange camelExchange,
-                              Method method,
-                              Object[] paramArray);    
-    
+                                          org.apache.camel.Exchange camelExchange,
+                                          Method method,
+                                          Object[] paramArray);
+
     /**
      * Populate the CxfRsResponse object from the camel exchange
-     * @param camelExchange  camel exchange object
-     * @param cxfExchange  cxf exchange object 
+     *
+     * @param camelExchange camel exchange object
+     * @param cxfExchange   cxf exchange object
      * @return the response object
-     * @throws Exception 
+     * @throws Exception can be thrown if error in the binding process
      */
     Object populateCxfRsResponseFromExchange(org.apache.camel.Exchange camelExchange,
-                               Exchange cxfExchange) throws Exception;
-    
+                                             Exchange cxfExchange) throws Exception;
+
     /**
      * Bind the camel in message body to a request body that gets passed
      * to CXF RS {@link org.apache.cxf.jaxrs.client.WebClient} APIs.
-     * 
-     * @param camelMessage the source message
+     *
+     * @param camelMessage  the source message
      * @param camelExchange the Camel exchange
      * @return the request object to be passed to invoke a WebClient
-     * @throws Exception
+     * @throws Exception can be thrown if error in the binding process
      */
     Object bindCamelMessageBodyToRequestBody(org.apache.camel.Message camelMessage,
-                                             org.apache.camel.Exchange camelExchange) 
+                                             org.apache.camel.Exchange camelExchange)
         throws Exception;
-    
+
     /**
      * Bind the camel headers to request headers that gets passed to CXF RS
      * {@link org.apache.cxf.jaxrs.client.WebClient} APIs.
-     * 
-     * @param camelHeaders the source headers
+     *
+     * @param camelHeaders  the source headers
      * @param camelExchange the Camel exchange
-     * @param headers to be passed to WebClient
-     * @throws Exception
+     * @throws Exception can be thrown if error in the binding process
+     * @return the headers
      */
     MultivaluedMap<String, String> bindCamelHeadersToRequestHeaders(Map<String, Object> camelHeaders,
-                                                                    org.apache.camel.Exchange camelExchange) 
+                                                                    org.apache.camel.Exchange camelExchange)
         throws Exception;
-                                                         
-    
+
     /**
      * Bind the HTTP response body to camel out body
-     * @param response
-     * @param exchange
+     *
+     * @param response the response
+     * @param camelExchange the exchange
      * @return the object to be set in the Camel out message body
+     * @throws Exception can be thrown if error in the binding process
      */
     Object bindResponseToCamelBody(Object response, org.apache.camel.Exchange camelExchange)
         throws Exception;
-    
+
     /**
      * Bind the response headers to camel out headers.
-     * 
-     * @param response
-     * @param exchange
+     *
+     * @param response the response
+     * @param camelExchange the exchange
      * @return headers to be set in the Camel out message
-     * @throws Exception
+     * @throws Exception can be thrown if error in the binding process
      */
-    Map<String, Object> bindResponseHeadersToCamelHeaders(Object response, 
-                                                          org.apache.camel.Exchange exchange)
+    Map<String, Object> bindResponseHeadersToCamelHeaders(Object response,
+                                                          org.apache.camel.Exchange camelExchange)
         throws Exception;
 
 }

Modified: camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsComponent.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsComponent.java?rev=979188&r1=979187&r2=979188&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsComponent.java (original)
+++ camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsComponent.java Mon Jul 26 07:44:12 2010
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.camel.component.cxf.jaxrs;
 
 import java.util.HashMap;
@@ -32,6 +31,7 @@ import org.apache.cxf.jaxrs.AbstractJAXR
  * Defines the <a href="http://camel.apache.org/cxfrs.html">CXF RS Component</a> 
  */
 public class CxfRsComponent extends HeaderFilterStrategyComponent {
+
     public CxfRsComponent() {
         super();
     }

Modified: camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsConsumer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsConsumer.java?rev=979188&r1=979187&r2=979188&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsConsumer.java (original)
+++ camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsConsumer.java Mon Jul 26 07:44:12 2010
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.camel.component.cxf.jaxrs;
 
 import org.apache.camel.Processor;

Modified: camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpoint.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpoint.java?rev=979188&r1=979187&r2=979188&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpoint.java (original)
+++ camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpoint.java Mon Jul 26 07:44:12 2010
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.camel.component.cxf.jaxrs;
 
 import java.util.Arrays;
@@ -38,9 +37,6 @@ import org.apache.cxf.helpers.CastUtils;
 import org.apache.cxf.jaxrs.JAXRSServerFactoryBean;
 import org.apache.cxf.jaxrs.client.JAXRSClientFactoryBean;
 
-/**
- * 
- */
 public class CxfRsEndpoint extends DefaultEndpoint implements HeaderFilterStrategyAware {
     private static final Log LOG = LogFactory.getLog(CxfRsEndpoint.class);
 

Modified: camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsHeaderFilterStrategy.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsHeaderFilterStrategy.java?rev=979188&r1=979187&r2=979188&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsHeaderFilterStrategy.java (original)
+++ camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsHeaderFilterStrategy.java Mon Jul 26 07:44:12 2010
@@ -25,6 +25,7 @@ import org.apache.camel.impl.DefaultHead
  * @version $Revision$
  */
 public class CxfRsHeaderFilterStrategy extends DefaultHeaderFilterStrategy {
+
     public CxfRsHeaderFilterStrategy() {
         initialize();  
     }

Modified: camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsInvoker.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsInvoker.java?rev=979188&r1=979187&r2=979188&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsInvoker.java (original)
+++ camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsInvoker.java Mon Jul 26 07:44:12 2010
@@ -62,7 +62,7 @@ public class CxfRsInvoker extends JAXRSI
             Throwable exception = camelExchange.getException();
             Object result = null;
             if (exception instanceof RuntimeCamelException) {
-                exception = ((RuntimeCamelException)exception).getCause();
+                exception = exception.getCause();
             }
             if (exception instanceof WebApplicationException) {
                 result = ((WebApplicationException)exception).getResponse();

Modified: camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducer.java?rev=979188&r1=979187&r2=979188&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducer.java (original)
+++ camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducer.java Mon Jul 26 07:44:12 2010
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.camel.component.cxf.jaxrs;
 
 import java.lang.reflect.Method;
@@ -38,7 +37,6 @@ import org.apache.cxf.jaxrs.client.Clien
 import org.apache.cxf.jaxrs.client.JAXRSClientFactoryBean;
 import org.apache.cxf.jaxrs.client.WebClient;
 
-
 /**
  * CxfRsProducer binds a Camel exchange to a CXF exchange, acts as a CXF 
  * JAXRS client, it will turn the normal Object invocation to a RESTful request
@@ -56,7 +54,6 @@ public class CxfRsProducer extends Defau
     }
 
     public void process(Exchange exchange) throws Exception {
-        
         if (LOG.isTraceEnabled()) {
             LOG.trace("Process exchange: " + exchange);
         }
@@ -72,7 +69,6 @@ public class CxfRsProducer extends Defau
         } else {
             invokeProxyClient(exchange);            
         }
-        
     }
     
     @SuppressWarnings("unchecked")

Modified: camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/DefaultCxfRsBinding.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/DefaultCxfRsBinding.java?rev=979188&r1=979187&r2=979188&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/DefaultCxfRsBinding.java (original)
+++ camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/DefaultCxfRsBinding.java Mon Jul 26 07:44:12 2010
@@ -79,7 +79,6 @@ public class DefaultCxfRsBinding impleme
         return camelExchange.getOut().getBody();
     }
 
-    
     public void populateExchangeFromCxfRsRequest(org.apache.cxf.message.Exchange cxfExchange,
                                                  Exchange camelExchange, Method method, Object[] paramArray) {
         Message camelMessage = camelExchange.getIn();        
@@ -180,7 +179,7 @@ public class DefaultCxfRsBinding impleme
     /**
      * We will return an empty Map unless the response parameter is a {@link Response} object. 
      */
-    public Map<String, Object> bindResponseHeadersToCamelHeaders(Object response, Exchange exchange)
+    public Map<String, Object> bindResponseHeadersToCamelHeaders(Object response, Exchange camelExchange)
         throws Exception {
         
         Map<String, Object> answer = new HashMap<String, Object>();
@@ -188,7 +187,7 @@ public class DefaultCxfRsBinding impleme
             
             for (Map.Entry<String, List<Object>> entry : ((Response)response).getMetadata().entrySet()) {
                 if (!headerFilterStrategy.applyFilterToExternalHeaders(entry.getKey(), 
-                                                                       entry.getValue(), exchange)) {
+                                                                       entry.getValue(), camelExchange)) {
                     
                     String mappedHeaderName = cxfToCamelHeaderMap.get(entry.getKey());
                     if (mappedHeaderName == null) {
@@ -227,7 +226,6 @@ public class DefaultCxfRsBinding impleme
         return headerFilterStrategy;
     }
 
-
     public void setHeaderFilterStrategy(HeaderFilterStrategy strategy) {
         headerFilterStrategy = strategy;        
     }
@@ -262,7 +260,6 @@ public class DefaultCxfRsBinding impleme
             camelMessage.setHeader(CxfConstants.CAMEL_CXF_RS_OPERATION_RESOURCE_INFO_STACK, copyStack);
                         
         }
-      
     }
 
 }
\ No newline at end of file

Modified: camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/AbstractCxfBeanDefinitionParser.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/AbstractCxfBeanDefinitionParser.java?rev=979188&r1=979187&r2=979188&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/AbstractCxfBeanDefinitionParser.java (original)
+++ camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/AbstractCxfBeanDefinitionParser.java Mon Jul 26 07:44:12 2010
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.camel.component.cxf.spring;
 
 import java.util.HashMap;
@@ -29,11 +28,6 @@ import org.springframework.beans.factory
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.xml.ParserContext;
 
-
-
-/**
- * 
- */
 public abstract class AbstractCxfBeanDefinitionParser extends AbstractBeanDefinitionParser {
     
     /**

Modified: camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/CxfEndpointBean.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/CxfEndpointBean.java?rev=979188&r1=979187&r2=979188&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/CxfEndpointBean.java (original)
+++ camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/CxfEndpointBean.java Mon Jul 26 07:44:12 2010
@@ -24,9 +24,6 @@ import org.apache.cxf.service.factory.Re
 
 import org.springframework.beans.factory.DisposableBean;
 
-/**
- *
- */
 public class CxfEndpointBean extends AbstractWSDLBasedEndpointFactory
     implements DisposableBean {
     

Modified: camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/CxfEndpointBeanDefinitionParser.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/CxfEndpointBeanDefinitionParser.java?rev=979188&r1=979187&r2=979188&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/CxfEndpointBeanDefinitionParser.java (original)
+++ camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/CxfEndpointBeanDefinitionParser.java Mon Jul 26 07:44:12 2010
@@ -43,8 +43,7 @@ public class CxfEndpointBeanDefinitionPa
 
     @Override
     protected void mapAttribute(BeanDefinitionBuilder bean, Element e, String name, String val) {
-                
-        if ("endpointName".equals(name) || "serviceName".equals(name)) {           
+        if ("endpointName".equals(name) || "serviceName".equals(name)) {
             QName q = parseQName(e, val);
             bean.addPropertyValue(name, q);
         } else {
@@ -106,5 +105,4 @@ public class CxfEndpointBeanDefinitionPa
         
     }
 
-
 }

Modified: camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/CxfRsClientFactoryBeanDefinitionParser.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/CxfRsClientFactoryBeanDefinitionParser.java?rev=979188&r1=979187&r2=979188&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/CxfRsClientFactoryBeanDefinitionParser.java (original)
+++ camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/CxfRsClientFactoryBeanDefinitionParser.java Mon Jul 26 07:44:12 2010
@@ -35,14 +35,12 @@ import org.springframework.beans.factory
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
 
-
 public class CxfRsClientFactoryBeanDefinitionParser extends AbstractCxfBeanDefinitionParser {
     public CxfRsClientFactoryBeanDefinitionParser() {
         super();
         setBeanClass(SpringJAXRSClientFactoryBean.class);
     }
-    
-    
+
     @Override
     protected void doParse(Element element, ParserContext ctx, BeanDefinitionBuilder bean) {
         super.doParse(element, ctx, bean);

Modified: camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/CxfRsServerFactoryBeanDefinitionParser.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/CxfRsServerFactoryBeanDefinitionParser.java?rev=979188&r1=979187&r2=979188&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/CxfRsServerFactoryBeanDefinitionParser.java (original)
+++ camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/CxfRsServerFactoryBeanDefinitionParser.java Mon Jul 26 07:44:12 2010
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.camel.component.cxf.spring;
 
 import java.util.List;
@@ -37,13 +36,8 @@ import org.springframework.beans.factory
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
 
-
-
-
-/**
- * 
- */
 public class CxfRsServerFactoryBeanDefinitionParser extends AbstractCxfBeanDefinitionParser  {
+
     public CxfRsServerFactoryBeanDefinitionParser() {
         super();
         setBeanClass(SpringJAXRSServerFactoryBean.class);
@@ -120,6 +114,6 @@ public class CxfRsServerFactoryBeanDefin
             setResourceClasses(clazz);
         }
     }
-    
+
    
 }

Modified: camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/NamespaceHandler.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/NamespaceHandler.java?rev=979188&r1=979187&r2=979188&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/NamespaceHandler.java (original)
+++ camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/NamespaceHandler.java Mon Jul 26 07:44:12 2010
@@ -19,9 +19,11 @@ package org.apache.camel.component.cxf.s
 import org.springframework.beans.factory.xml.NamespaceHandlerSupport;
 
 public class NamespaceHandler extends NamespaceHandlerSupport {
+
     public void init() {
         registerBeanDefinitionParser("cxfEndpoint", new CxfEndpointBeanDefinitionParser());
         registerBeanDefinitionParser("rsServer", new CxfRsServerFactoryBeanDefinitionParser());
         registerBeanDefinitionParser("rsClient", new CxfRsClientFactoryBeanDefinitionParser());
     }
+
 }

Modified: camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/SpringBusFactoryBean.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/SpringBusFactoryBean.java?rev=979188&r1=979187&r2=979188&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/SpringBusFactoryBean.java (original)
+++ camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/SpringBusFactoryBean.java Mon Jul 26 07:44:12 2010
@@ -23,12 +23,12 @@ import org.springframework.beans.factory
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
 
-/** This factoryBean which can help user to choice CXF components that he wants bus to load 
- *  without needing to import bunch of CXF packages in OSGi bundle, as the SpringBusFactory 
- *  will try to load the bus extensions with the CXF bundle classloader.
- *  You can set the CXF extensions files with ; as the separator to create a bus.
- * */
-
+/**
+ * This factoryBean which can help user to choice CXF components that he wants bus to load
+ * without needing to import bunch of CXF packages in OSGi bundle, as the SpringBusFactory
+ * will try to load the bus extensions with the CXF bundle classloader.
+ * You can set the CXF extensions files with ; as the separator to create a bus.
+ */
 public class SpringBusFactoryBean implements SmartFactoryBean {
     private String[] cfgFiles;
     private boolean includeDefaultBus;
@@ -46,19 +46,19 @@ public class SpringBusFactoryBean implem
     public Class getObjectType() {
         return Bus.class;
     }
-    
+
     public void setCfgFiles(String cfgFiles) {
         this.cfgFiles = cfgFiles.split(";");
     }
-    
+
     public void setIncludeDefaultBus(boolean includeDefaultBus) {
         this.includeDefaultBus = includeDefaultBus;
     }
-    
+
     public boolean isSingleton() {
         return true;
     }
-   
+
     public boolean isEagerInit() {
         return true;
     }

Modified: camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelConduit.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelConduit.java?rev=979188&r1=979187&r2=979188&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelConduit.java (original)
+++ camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelConduit.java Mon Jul 26 07:44:12 2010
@@ -25,7 +25,6 @@ import org.apache.camel.CamelContext;
 import org.apache.camel.Endpoint;
 import org.apache.camel.Exchange;
 import org.apache.camel.ExchangePattern;
-import org.apache.camel.Processor;
 import org.apache.camel.Producer;
 import org.apache.camel.ProducerTemplate;
 import org.apache.camel.RuntimeCamelException;
@@ -230,6 +229,8 @@ public class CamelConduit extends Abstra
     /**
      * Represented decoupled response endpoint.
      */
+    // TODO: This class is not used
+    @Deprecated
     protected class DecoupledDestination implements Destination {
         protected MessageObserver decoupledMessageObserver;
         private EndpointReferenceType address;

Modified: camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelDestination.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelDestination.java?rev=979188&r1=979187&r2=979188&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelDestination.java (original)
+++ camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelDestination.java Mon Jul 26 07:44:12 2010
@@ -25,13 +25,15 @@ import org.apache.camel.CamelContext;
 import org.apache.camel.Consumer;
 import org.apache.camel.Endpoint;
 import org.apache.camel.Exchange;
+import org.apache.camel.FailedToCreateConsumerException;
 import org.apache.camel.Processor;
 import org.apache.camel.ProducerTemplate;
 import org.apache.camel.component.cxf.CxfConstants;
 import org.apache.camel.component.cxf.util.CxfHeaderHelper;
 import org.apache.camel.component.cxf.util.CxfMessageHelper;
-import org.apache.camel.impl.DefaultCamelContext;
 import org.apache.camel.spi.HeaderFilterStrategy;
+import org.apache.camel.util.ObjectHelper;
+import org.apache.camel.util.ServiceHelper;
 import org.apache.cxf.Bus;
 import org.apache.cxf.common.logging.LogUtils;
 import org.apache.cxf.configuration.Configurable;
@@ -104,6 +106,7 @@ public class CamelDestination extends Ab
 
     public void activate() {
         getLogger().log(Level.FINE, "CamelDestination activate().... ");
+        ObjectHelper.notNull(camelContext, "CamelContext", this);
 
         try {
             getLogger().log(Level.FINE, "establishing Camel connection");
@@ -112,17 +115,15 @@ public class CamelDestination extends Ab
             consumer.start();
 
         } catch (Exception ex) {
-            // TODO: Is it okay just to log severe errors such as this?
-            getLogger().log(Level.SEVERE, "Camel connect failed with Exception : ", ex);
+            throw new FailedToCreateConsumerException(destinationEndpoint, ex);
         }
     }
 
     public void deactivate() {
         try {
-            consumer.stop();
+            ServiceHelper.stopService(consumer);
         } catch (Exception e) {
-            // TODO: Is it okay just to log severe errors such as this?
-            getLogger().log(Level.SEVERE, "Camel stop failed with Exception : ", e);
+            getLogger().log(Level.WARNING, "Error stopping consumer", e);
         }
     }
 
@@ -131,29 +132,14 @@ public class CamelDestination extends Ab
         this.deactivate();
     }
 
-    public ProducerTemplate getCamelTemplate() throws Exception {
-        if (camelTemplate == null) {            
-            camelTemplate = getCamelContext().createProducerTemplate();
-        }
-        return camelTemplate;
-    }
-
-    public void setCamelTemplate(ProducerTemplate template) {
-        camelTemplate = template;
-    }
-
-    public void setCamelContext(CamelContext context) {
-        camelContext = context;
-    }
-
     public CamelContext getCamelContext() {
-        if (camelContext == null) {
-            getLogger().log(Level.INFO, "No CamelContext injected, create a default one");
-            camelContext = new DefaultCamelContext();
-        }
         return camelContext;
     }
 
+    public void setCamelContext(CamelContext camelContext) {
+        this.camelContext = camelContext;
+    }
+
     protected void incoming(org.apache.camel.Exchange camelExchange) {
         getLogger().log(Level.FINE, "server received request: ", camelExchange);
         org.apache.cxf.message.Message inMessage =
@@ -163,7 +149,7 @@ public class CamelDestination extends Ab
         ((MessageImpl)inMessage).setDestination(this);
 
         // Handling the incoming message
-        // The response message will be send back by the outgoingchain
+        // The response message will be send back by the outgoing chain
         incomingObserver.onMessage(inMessage);
 
     }
@@ -257,10 +243,6 @@ public class CamelDestination extends Ab
         return conduitInitiator;
     }
 
-    /**
-     * @param outMessage
-     * @param camelExchange
-     */
     protected void propagateResponseHeadersToCamel(Message outMessage, Exchange camelExchange) {
         CxfHeaderHelper.propagateCxfToCamel(headerFilterStrategy, outMessage, 
                                             camelExchange.getOut().getHeaders(), camelExchange);            

Modified: camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelTransportFactory.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelTransportFactory.java?rev=979188&r1=979187&r2=979188&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelTransportFactory.java (original)
+++ camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelTransportFactory.java Mon Jul 26 07:44:12 2010
@@ -44,13 +44,10 @@ import org.apache.cxf.ws.addressing.Endp
 public class CamelTransportFactory extends AbstractTransportFactory implements ConduitInitiator, DestinationFactory {
 
     public static final String TRANSPORT_ID = "http://cxf.apache.org/transports/camel";
-
     private static final Set<String> URI_PREFIXES = new HashSet<String>();
 
     private Collection<String> activationNamespaces;
-    
     private HeaderFilterStrategy headerFilterStrategy;
-    
     private boolean checkException;
 
     static {
@@ -139,8 +136,7 @@ public class CamelTransportFactory exten
     public void setHeaderFilterStrategy(HeaderFilterStrategy headerFilterStrategy) {
         this.headerFilterStrategy = headerFilterStrategy;
     }
-    
-    
+
 }
 
 

Modified: camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/spring/AbstractCamelContextBeanDefinitionParser.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/spring/AbstractCamelContextBeanDefinitionParser.java?rev=979188&r1=979187&r2=979188&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/spring/AbstractCamelContextBeanDefinitionParser.java (original)
+++ camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/spring/AbstractCamelContextBeanDefinitionParser.java Mon Jul 26 07:44:12 2010
@@ -15,6 +15,7 @@
  * limitations under the License.
  */
 package org.apache.camel.component.cxf.transport.spring;
+
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
@@ -25,7 +26,6 @@ import org.springframework.beans.factory
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.xml.ParserContext;
 
-
 public class AbstractCamelContextBeanDefinitionParser extends AbstractBeanDefinitionParser {
     private static final String DEFAULT_CAMEL_CONTEXT_NAME = "camelContext";
 
@@ -63,4 +63,5 @@ public class AbstractCamelContextBeanDef
             }
         }
     }
+
 }

Modified: camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/spring/CamelDestinationDefinitionParser.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/spring/CamelDestinationDefinitionParser.java?rev=979188&r1=979187&r2=979188&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/spring/CamelDestinationDefinitionParser.java (original)
+++ camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/spring/CamelDestinationDefinitionParser.java Mon Jul 26 07:44:12 2010
@@ -19,8 +19,10 @@ package org.apache.camel.component.cxf.t
 import org.apache.camel.component.cxf.transport.CamelDestination;
 
 public class CamelDestinationDefinitionParser extends AbstractCamelContextBeanDefinitionParser {
+
     public CamelDestinationDefinitionParser() {
         super();
         setBeanClass(CamelDestination.class);
     }
+
 }

Modified: camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/spring/NamespaceHandler.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/spring/NamespaceHandler.java?rev=979188&r1=979187&r2=979188&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/spring/NamespaceHandler.java (original)
+++ camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/spring/NamespaceHandler.java Mon Jul 26 07:44:12 2010
@@ -19,6 +19,7 @@ package org.apache.camel.component.cxf.t
 import org.springframework.beans.factory.xml.NamespaceHandlerSupport;
 
 public class NamespaceHandler extends NamespaceHandlerSupport {
+
     public void init() {
         registerBeanDefinitionParser("conduit", new CamelConduitDefinitionParser());
         registerBeanDefinitionParser("destination", new CamelDestinationDefinitionParser());

Modified: camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/util/CxfEndpointUtils.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/util/CxfEndpointUtils.java?rev=979188&r1=979187&r2=979188&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/util/CxfEndpointUtils.java (original)
+++ camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/util/CxfEndpointUtils.java Mon Jul 26 07:44:12 2010
@@ -154,8 +154,7 @@ public final class CxfEndpointUtils {
         }
         return result;
     }
-    
-    
+
 }
 
 

Modified: camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/util/CxfHeaderHelper.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/util/CxfHeaderHelper.java?rev=979188&r1=979187&r2=979188&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/util/CxfHeaderHelper.java (original)
+++ camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/util/CxfHeaderHelper.java Mon Jul 26 07:44:12 2010
@@ -41,11 +41,11 @@ public final class CxfHeaderHelper {
     }
 
     /**
-     * Progagates Camel headers to CXF message.
+     * Propagates Camel headers to CXF message.
      *
      * @param strategy header filter strategy
      * @param headers Camel header
-     * @param message CXF meassage
+     * @param message CXF message
      * @param exchange provides context for filtering
      */
     public static void propagateCamelToCxf(HeaderFilterStrategy strategy,
@@ -117,4 +117,5 @@ public final class CxfHeaderHelper {
             headers.put(key, value);
         }
     }
+
 }

Modified: camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/util/CxfMessageHelper.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/util/CxfMessageHelper.java?rev=979188&r1=979187&r2=979188&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/util/CxfMessageHelper.java (original)
+++ camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/util/CxfMessageHelper.java Mon Jul 26 07:44:12 2010
@@ -27,6 +27,7 @@ import org.apache.cxf.message.ExchangeIm
 import org.apache.cxf.message.MessageImpl;
 
 public final class CxfMessageHelper {
+
     private CxfMessageHelper() {
         //Helper class
     }
@@ -66,6 +67,8 @@ public final class CxfMessageHelper {
         return answer;
     }
 
+    // TODO: This method is not used
+    @Deprecated
     public static org.apache.cxf.message.Message getCxfOutMessage(HeaderFilterStrategy headerFilterStrategy,
                                                                   org.apache.camel.Exchange exchange,
                                                                   boolean isClient)

Modified: camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/util/CxfUtils.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/util/CxfUtils.java?rev=979188&r1=979187&r2=979188&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/util/CxfUtils.java (original)
+++ camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/util/CxfUtils.java Mon Jul 26 07:44:12 2010
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.camel.component.cxf.util;
 
 import java.io.InputStream;
@@ -169,4 +168,5 @@ public final class CxfUtils {
             }
         }
     }
+
 }

Modified: camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/util/DataInInterceptor.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/util/DataInInterceptor.java?rev=979188&r1=979187&r2=979188&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/util/DataInInterceptor.java (original)
+++ camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/util/DataInInterceptor.java Mon Jul 26 07:44:12 2010
@@ -46,9 +46,7 @@ public class DataInInterceptor extends A
             Document doc = StaxUtils.read(xmlReader);
             message.setContent(Source.class, new DOMSource(doc));
         } catch (XMLStreamException e) {
-            throw new Fault(new org.apache.cxf.common.i18n.Message("XMLSTREAM_EXCEPTION",
-                                                                   LOG),
-                            e);
+            throw new Fault(new org.apache.cxf.common.i18n.Message("XMLSTREAM_EXCEPTION", LOG), e);
         }
     }
 

Modified: camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/util/DataOutInterceptor.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/util/DataOutInterceptor.java?rev=979188&r1=979187&r2=979188&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/util/DataOutInterceptor.java (original)
+++ camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/util/DataOutInterceptor.java Mon Jul 26 07:44:12 2010
@@ -47,11 +47,8 @@ public class DataOutInterceptor extends 
                 StaxUtils.copy(xmlReader, xmlWriter);
             }
         } catch (XMLStreamException e) {
-            throw new Fault(new org.apache.cxf.common.i18n.Message("XMLSTREAM_EXCEPTION",
-                                                                   LOG, e),
-                            e);
+            throw new Fault(new org.apache.cxf.common.i18n.Message("XMLSTREAM_EXCEPTION", LOG, e), e);
         }
-
     }
 
 }

Modified: camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/util/WSDLSoapServiceFactoryBean.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/util/WSDLSoapServiceFactoryBean.java?rev=979188&r1=979187&r2=979188&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/util/WSDLSoapServiceFactoryBean.java (original)
+++ camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/util/WSDLSoapServiceFactoryBean.java Mon Jul 26 07:44:12 2010
@@ -37,14 +37,15 @@ import org.apache.cxf.service.model.Endp
 import org.apache.cxf.service.model.ServiceInfo;
 import org.apache.cxf.wsdl11.WSDLServiceFactory;
 
-//The service factory bean which is used for the service without SEI
+/**
+ * The service factory bean which is used for the service without SEI
+ */
 public class WSDLSoapServiceFactoryBean extends ReflectionServiceFactoryBean {
     private QName serviceName;
     private QName endpointName;
 
     @Override
     public Service create() {
-
         WSDLServiceFactory factory = new WSDLServiceFactory(getBus(), getWsdlURL(), getServiceQName());
 
         setService(factory.create());
@@ -68,14 +69,12 @@ public class WSDLSoapServiceFactoryBean 
                 //ei.getBinding().setProperty(AbstractBindingFactory.DATABINDING_DISABLED, Boolean.TRUE);
             }
         }
-
     }
     
     protected void checkServiceClassAnnotations(Class<?> sc) {
         // do nothing here
     }
 
-
     // do not handle any payload information here
     private void initializeSoapInterceptors() {
         getService().getInInterceptors().add(new DataInInterceptor());
@@ -122,4 +121,5 @@ public class WSDLSoapServiceFactoryBean 
     public void setEndpointName(QName name) {
         endpointName = name;
     }
+
 }



Mime
View raw message