You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2009/07/28 10:15:03 UTC
svn commit: r798441 - in /camel/branches/camel-1.x:
components/camel-cxf/src/main/java/org/apache/camel/component/cxf/util/
components/camel-cxf/src/test/java/org/apache/camel/component/cxf/ parent/
Author: ningjiang
Date: Tue Jul 28 08:15:02 2009
New Revision: 798441
URL: http://svn.apache.org/viewvc?rev=798441&view=rev
Log:
CAMEL-1667 upgraded CXF version to 2.2.2
Modified:
camel/branches/camel-1.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/util/NullDestinationFactory.java
camel/branches/camel-1.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/util/WSDLSoapServiceFactoryBean.java
camel/branches/camel-1.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfSoapMessageProviderTest.java
camel/branches/camel-1.x/parent/pom.xml
Modified: camel/branches/camel-1.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/util/NullDestinationFactory.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-1.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/util/NullDestinationFactory.java?rev=798441&r1=798440&r2=798441&view=diff
==============================================================================
--- camel/branches/camel-1.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/util/NullDestinationFactory.java (original)
+++ camel/branches/camel-1.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/util/NullDestinationFactory.java Tue Jul 28 08:15:02 2009
@@ -20,7 +20,6 @@
import java.util.List;
import java.util.Set;
-import org.apache.cxf.binding.AbstractBindingFactory;
import org.apache.cxf.service.model.EndpointInfo;
import org.apache.cxf.transport.Destination;
import org.apache.cxf.transport.DestinationFactory;
@@ -31,7 +30,6 @@
// setup the endpoint information
ei.setAddress("local://" + ei.getService().getName().toString() + "/" + ei.getName().getLocalPart());
// working as the dispatch mode, the binding factory will not add interceptor
- ei.getBinding().setProperty(AbstractBindingFactory.DATABINDING_DISABLED, Boolean.TRUE);
// do nothing here , just creating a null destination to store the observer
return new NullDestination();
}
Modified: camel/branches/camel-1.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/util/WSDLSoapServiceFactoryBean.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-1.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/util/WSDLSoapServiceFactoryBean.java?rev=798441&r1=798440&r2=798441&view=diff
==============================================================================
--- camel/branches/camel-1.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/util/WSDLSoapServiceFactoryBean.java (original)
+++ camel/branches/camel-1.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/util/WSDLSoapServiceFactoryBean.java Tue Jul 28 08:15:02 2009
@@ -67,7 +67,6 @@
//setup the endpoint address
ei.setAddress("local://" + ei.getService().getName().toString() + "/" + ei.getName().getLocalPart());
// working as the dispatch mode, the binding factory will not add interceptor
- ei.getBinding().setProperty(AbstractBindingFactory.DATABINDING_DISABLED, Boolean.TRUE);
}
}
Modified: camel/branches/camel-1.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfSoapMessageProviderTest.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-1.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfSoapMessageProviderTest.java?rev=798441&r1=798440&r2=798441&view=diff
==============================================================================
--- camel/branches/camel-1.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfSoapMessageProviderTest.java (original)
+++ camel/branches/camel-1.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfSoapMessageProviderTest.java Tue Jul 28 08:15:02 2009
@@ -69,7 +69,7 @@
assertEquals("Can't get the right message count", fromHandler.getMessageCount(), 8);
assertEquals("Can't get the right fault count", fromHandler.getFaultCount(), 0);
- assertEquals("Can't get the right headers count", fromHandler.getGetHeadersCount(), 0);
+ assertEquals("Can't get the right headers count", fromHandler.getGetHeadersCount(), 4);
}
Modified: camel/branches/camel-1.x/parent/pom.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-1.x/parent/pom.xml?rev=798441&r1=798440&r2=798441&view=diff
==============================================================================
--- camel/branches/camel-1.x/parent/pom.xml (original)
+++ camel/branches/camel-1.x/parent/pom.xml Tue Jul 28 08:15:02 2009
@@ -40,7 +40,7 @@
<activemq-version>5.2.0</activemq-version>
<apacheds-version>1.5.4</apacheds-version>
<axiom-version>1.2.8</axiom-version>
- <cxf-version>2.2</cxf-version>
+ <cxf-version>2.2.2</cxf-version>
<felix-version>1.4.1</felix-version>
<felix-osgi-version>1.2.0</felix-osgi-version>
<geronimo-jms-spec-version>1.1.1</geronimo-jms-spec-version>
@@ -49,7 +49,7 @@
<httpcore-version>4.0-beta3</httpcore-version>
<httpcore-niossl-version>4.0-alpha6</httpcore-niossl-version>
<jetty-version>6.1.14</jetty-version>
- <slf4j-version>1.5.5</slf4j-version>
+ <slf4j-version>1.5.6</slf4j-version>
<openjpa-version>1.2.0</openjpa-version>
<spring-version>2.5.6</spring-version>
<spring-osgi-version>1.1.2</spring-osgi-version>