svn commit: r995638 - in /camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf: feature/AbstractDataFormatFeature.java spring/CxfEndpointBean.java

[ni...@apache.org]

Author: ningjiang
Date: Fri Sep 10 01:52:05 2010
New Revision: 995638

URL: http://svn.apache.org/viewvc?rev=995638&view=rev
Log:
CAMEL-3113 revert the change which are for CXF 2.3.0-SNAPSHOT

Modified:
    camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/AbstractDataFormatFeature.java
    camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/CxfEndpointBean.java

Modified: camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/AbstractDataFormatFeature.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/AbstractDataFormatFeature.java?rev=995638&r1=995637&r2=995638&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/AbstractDataFormatFeature.java (original)
+++ camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/AbstractDataFormatFeature.java Fri Sep 10 01:52:05 2010
@@ -23,7 +23,6 @@ import java.util.logging.Logger;
 
 import org.apache.cxf.feature.AbstractFeature;
 import org.apache.cxf.interceptor.Interceptor;
-import org.apache.cxf.message.Message;
 import org.apache.cxf.phase.PhaseInterceptor;
 
 /**
@@ -33,7 +32,7 @@ public abstract class AbstractDataFormat
 
     protected abstract Logger getLogger();
     
-    protected void removeInterceptorWhichIsInThePhases(List<Interceptor<? extends Message>> interceptors, String[] phaseNames) {
+    protected void removeInterceptorWhichIsInThePhases(List<Interceptor> interceptors, String[] phaseNames) {
         for (Interceptor i : interceptors) {
             if (i instanceof PhaseInterceptor) {
                 PhaseInterceptor p = (PhaseInterceptor)i;
@@ -48,7 +47,7 @@ public abstract class AbstractDataFormat
         }
     }
 
-    protected void removeInterceptorWhichIsOutThePhases(List<Interceptor<? extends Message>> interceptors, String[] phaseNames) {
+    protected void removeInterceptorWhichIsOutThePhases(List<Interceptor> interceptors, String[] phaseNames) {
         for (Interceptor i : interceptors) {
             boolean outside = false;
             if (i instanceof PhaseInterceptor) {
@@ -68,7 +67,7 @@ public abstract class AbstractDataFormat
     }
     
       
-    protected void removeInterceptors(List<Interceptor<? extends Message>> interceptors,
+    protected void removeInterceptors(List<Interceptor> interceptors,
                                       Collection<Class> toBeRemovedInterceptors) {
         for (Interceptor interceptor : interceptors) {
             if (toBeRemovedInterceptors.contains(interceptor.getClass())) {

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=995638&r1=995637&r2=995638&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 Fri Sep 10 01:52:05 2010
@@ -19,16 +19,14 @@ package org.apache.camel.component.cxf.s
 import java.util.List;
 
 import org.apache.cxf.BusFactory;
-import org.apache.cxf.frontend.AbstractServiceFactory;
 import org.apache.cxf.frontend.AbstractWSDLBasedEndpointFactory;
 import org.apache.cxf.service.factory.ReflectionServiceFactoryBean;
-import org.apache.cxf.wsdl11.WSDLEndpointFactory;
 
 import org.springframework.beans.factory.BeanNameAware;
 import org.springframework.beans.factory.DisposableBean;
 import org.springframework.beans.factory.NamedBean;
 
-public class CxfEndpointBean extends AbstractServiceFactory
+public class CxfEndpointBean extends AbstractWSDLBasedEndpointFactory
     implements DisposableBean, BeanNameAware, NamedBean {
     
     private List handlers;
@@ -64,5 +62,4 @@ public class CxfEndpointBean extends Abs
     public String getBeanName() {
         return beanName;
     }
-
 }