You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by ff...@apache.org on 2009/03/24 15:08:21 UTC
svn commit: r757810 - in
/servicemix/components/bindings/servicemix-cxf-bc/trunk: ./
src/main/java/org/apache/servicemix/cxfbc/
src/main/java/org/apache/servicemix/cxfbc/interceptors/
src/test/java/org/apache/servicemix/cxfbc/
Author: ffang
Date: Tue Mar 24 14:08:18 2009
New Revision: 757810
URL: http://svn.apache.org/viewvc?rev=757810&view=rev
Log:
[SMXCOMP-482]Upgrade to CXF 2.2
Modified:
servicemix/components/bindings/servicemix-cxf-bc/trunk/pom.xml
servicemix/components/bindings/servicemix-cxf-bc/trunk/src/main/java/org/apache/servicemix/cxfbc/CxfBcConsumer.java
servicemix/components/bindings/servicemix-cxf-bc/trunk/src/main/java/org/apache/servicemix/cxfbc/CxfBcProviderMessageObserver.java
servicemix/components/bindings/servicemix-cxf-bc/trunk/src/main/java/org/apache/servicemix/cxfbc/interceptors/JbiInWsdl1Interceptor.java
servicemix/components/bindings/servicemix-cxf-bc/trunk/src/main/java/org/apache/servicemix/cxfbc/interceptors/JbiOutInterceptor.java
servicemix/components/bindings/servicemix-cxf-bc/trunk/src/main/java/org/apache/servicemix/cxfbc/interceptors/JbiOutWsdl1Interceptor.java
servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/CxfBcProviderTest.java
Modified: servicemix/components/bindings/servicemix-cxf-bc/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-cxf-bc/trunk/pom.xml?rev=757810&r1=757809&r2=757810&view=diff
==============================================================================
--- servicemix/components/bindings/servicemix-cxf-bc/trunk/pom.xml (original)
+++ servicemix/components/bindings/servicemix-cxf-bc/trunk/pom.xml Tue Mar 24 14:08:18 2009
@@ -47,8 +47,8 @@
<previous.releases>3.1.2,3.2,3.2.1,3.2.2,3.2.3,2008.01</previous.releases>
<servicemix-version>3.3</servicemix-version>
<servicemix-shared-version>2009.01</servicemix-shared-version>
- <servicemix-cxf-se-version>2009.01</servicemix-cxf-se-version>
- <cxf-version>2.1.4</cxf-version>
+ <servicemix-cxf-se-version>2009.02-SNAPSHOT</servicemix-cxf-se-version>
+ <cxf-version>2.2.1-SNAPSHOT</cxf-version>
<jetty-version>6.1.14</jetty-version>
<spring-version>2.5.6</spring-version>
<derby-version>10.4.1.3</derby-version>
@@ -392,10 +392,6 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<forkMode>${surefire.fork.mode}</forkMode>
- <excludes>
- <exclude>**/CxfBCMtomJMSFlowTest.java</exclude>
- <exclude>**/CxfBcHttpJmsBridgeMtomTest.java</exclude>
- </excludes>
<systemProperties>
<property>
<name>derby.system.home</name>
Modified: servicemix/components/bindings/servicemix-cxf-bc/trunk/src/main/java/org/apache/servicemix/cxfbc/CxfBcConsumer.java
URL: http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-cxf-bc/trunk/src/main/java/org/apache/servicemix/cxfbc/CxfBcConsumer.java?rev=757810&r1=757809&r2=757810&view=diff
==============================================================================
--- servicemix/components/bindings/servicemix-cxf-bc/trunk/src/main/java/org/apache/servicemix/cxfbc/CxfBcConsumer.java (original)
+++ servicemix/components/bindings/servicemix-cxf-bc/trunk/src/main/java/org/apache/servicemix/cxfbc/CxfBcConsumer.java Tue Mar 24 14:08:18 2009
@@ -316,6 +316,7 @@
} else if (tm instanceof PlatformTransactionManager) {
jmsConfig.setSessionTransacted(true);
jmsConfig.setTransactionManager((PlatformTransactionManager)tm);
+ jmsConfig.setUseJms11(false);
setSynchronous(true);
transactionEnabled = true;
}
Modified: servicemix/components/bindings/servicemix-cxf-bc/trunk/src/main/java/org/apache/servicemix/cxfbc/CxfBcProviderMessageObserver.java
URL: http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-cxf-bc/trunk/src/main/java/org/apache/servicemix/cxfbc/CxfBcProviderMessageObserver.java?rev=757810&r1=757809&r2=757810&view=diff
==============================================================================
--- servicemix/components/bindings/servicemix-cxf-bc/trunk/src/main/java/org/apache/servicemix/cxfbc/CxfBcProviderMessageObserver.java (original)
+++ servicemix/components/bindings/servicemix-cxf-bc/trunk/src/main/java/org/apache/servicemix/cxfbc/CxfBcProviderMessageObserver.java Tue Mar 24 14:08:18 2009
@@ -30,6 +30,7 @@
import javax.xml.namespace.QName;
import javax.xml.transform.Source;
+import org.apache.cxf.Bus;
import org.apache.cxf.binding.soap.SoapMessage;
import org.apache.cxf.binding.soap.interceptor.MustUnderstandInterceptor;
import org.apache.cxf.binding.soap.interceptor.ReadHeadersInterceptor;
@@ -120,6 +121,7 @@
soapMessage
.put(org.apache.cxf.message.Message.REQUESTOR_ROLE, true);
Exchange cxfExchange = new ExchangeImpl();
+ cxfExchange.put(Bus.class, this.providerEndpoint.getBus());
soapMessage.setExchange(cxfExchange);
cxfExchange.put(BindingOperationInfo.class, boi);
@@ -139,9 +141,6 @@
PhaseInterceptorChain inChain = inboundChainCache.get(pm
.getInPhases(), inList);
inChain.add(providerEndpoint.getInInterceptors());
- inChain.add(providerEndpoint.getInFaultInterceptors());
- inChain.add(this.providerEndpoint.getInInterceptors());
- inChain.add(this.providerEndpoint.getInFaultInterceptors());
soapMessage.setInterceptorChain(inChain);
inChain.doIntercept(soapMessage);
Modified: servicemix/components/bindings/servicemix-cxf-bc/trunk/src/main/java/org/apache/servicemix/cxfbc/interceptors/JbiInWsdl1Interceptor.java
URL: http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-cxf-bc/trunk/src/main/java/org/apache/servicemix/cxfbc/interceptors/JbiInWsdl1Interceptor.java?rev=757810&r1=757809&r2=757810&view=diff
==============================================================================
--- servicemix/components/bindings/servicemix-cxf-bc/trunk/src/main/java/org/apache/servicemix/cxfbc/interceptors/JbiInWsdl1Interceptor.java (original)
+++ servicemix/components/bindings/servicemix-cxf-bc/trunk/src/main/java/org/apache/servicemix/cxfbc/interceptors/JbiInWsdl1Interceptor.java Tue Mar 24 14:08:18 2009
@@ -403,8 +403,4 @@
return param;
}
- protected boolean isRequestor(Message message) {
- return Boolean.TRUE.equals(message.get(Message.REQUESTOR_ROLE));
- }
-
}
Modified: servicemix/components/bindings/servicemix-cxf-bc/trunk/src/main/java/org/apache/servicemix/cxfbc/interceptors/JbiOutInterceptor.java
URL: http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-cxf-bc/trunk/src/main/java/org/apache/servicemix/cxfbc/interceptors/JbiOutInterceptor.java?rev=757810&r1=757809&r2=757810&view=diff
==============================================================================
--- servicemix/components/bindings/servicemix-cxf-bc/trunk/src/main/java/org/apache/servicemix/cxfbc/interceptors/JbiOutInterceptor.java (original)
+++ servicemix/components/bindings/servicemix-cxf-bc/trunk/src/main/java/org/apache/servicemix/cxfbc/interceptors/JbiOutInterceptor.java Tue Mar 24 14:08:18 2009
@@ -221,9 +221,6 @@
}
- private boolean isRequestor(org.apache.cxf.message.Message message) {
- return Boolean.TRUE.equals(message
- .containsKey(org.apache.cxf.message.Message.REQUESTOR_ROLE));
- }
+
}
Modified: servicemix/components/bindings/servicemix-cxf-bc/trunk/src/main/java/org/apache/servicemix/cxfbc/interceptors/JbiOutWsdl1Interceptor.java
URL: http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-cxf-bc/trunk/src/main/java/org/apache/servicemix/cxfbc/interceptors/JbiOutWsdl1Interceptor.java?rev=757810&r1=757809&r2=757810&view=diff
==============================================================================
--- servicemix/components/bindings/servicemix-cxf-bc/trunk/src/main/java/org/apache/servicemix/cxfbc/interceptors/JbiOutWsdl1Interceptor.java (original)
+++ servicemix/components/bindings/servicemix-cxf-bc/trunk/src/main/java/org/apache/servicemix/cxfbc/interceptors/JbiOutWsdl1Interceptor.java Tue Mar 24 14:08:18 2009
@@ -236,7 +236,7 @@
}
- protected String addOperationNode(Message message, XMLStreamWriter xmlWriter)
+ protected String addOperationNode(SoapMessage message, XMLStreamWriter xmlWriter)
throws XMLStreamException {
String responseSuffix = !isRequestor(message) ? "Response" : "";
BindingOperationInfo boi = message.getExchange().get(
Modified: servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/CxfBcProviderTest.java
URL: http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/CxfBcProviderTest.java?rev=757810&r1=757809&r2=757810&view=diff
==============================================================================
--- servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/CxfBcProviderTest.java (original)
+++ servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/CxfBcProviderTest.java Tue Mar 24 14:08:18 2009
@@ -92,7 +92,7 @@
client.done(io);
}
- public void xtestTargetServiceNotExist() throws Exception {
+ public void testTargetServiceNotExist() throws Exception {
client = new DefaultServiceMixClient(jbi);
io = client.createInOutExchange();
io.setService(new QName("http://apache.org/hello_world_soap_http", "SOAPServiceProvider"));