Author: ffang
Date: Thu Apr 10 01:47:14 2008
New Revision: 646685
URL: http://svn.apache.org/viewvc?rev=646685&view=rev
Log:
sync changes to 3.2.2 release branch
Modified:
servicemix/smx3/branches/servicemix-3.2.2/deployables/bindingcomponents/servicemix-cxf-bc/src/main/java/org/apache/servicemix/cxfbc/CxfBcProvider.java
servicemix/smx3/branches/servicemix-3.2.2/tooling/xfire-maven-plugin/pom.xml
Modified:
servicemix/smx3/branches/servicemix-3.2.2/deployables/bindingcomponents/servicemix-cxf-bc/src/main/java/org/apache/servicemix/cxfbc/CxfBcProvider.java
URL:
http://svn.apache.org/viewvc/servicemix/smx3/branches/servicemix-3.2.2/deployables/bindingcomponents/servicemix-cxf-bc/src/main/java/org/apache/servicemix/cxfbc/CxfBcProvider.java?rev=646685&r1=646684&r2=646685&view=diff
==============================================================================
---
servicemix/smx3/branches/servicemix-3.2.2/deployables/bindingcomponents/servicemix-cxf-bc/src/main/java/org/apache/servicemix/cxfbc/CxfBcProvider.java
(original)
+++
servicemix/smx3/branches/servicemix-3.2.2/deployables/bindingcomponents/servicemix-cxf-bc/src/main/java/org/apache/servicemix/cxfbc/CxfBcProvider.java
Thu Apr 10 01:47:14 2008
@@ -41,6 +41,7 @@
import org.apache.cxf.Bus;
import org.apache.cxf.binding.AbstractBindingFactory;
+import org.apache.cxf.binding.soap.interceptor.SoapActionOutInterceptor;
import org.apache.cxf.binding.soap.interceptor.SoapOutInterceptor;
import org.apache.cxf.binding.soap.interceptor.SoapPreProtocolOutInterceptor;
import org.apache.cxf.bus.spring.SpringBusFactory;
@@ -163,7 +164,7 @@
outList.add(new JbiOutWsdl1Interceptor(isUseJBIWrapper()));
outList.add(new SoapPreProtocolOutInterceptor());
outList.add(new SoapOutInterceptor(getBus()));
-
+ outList.add(new SoapActionOutInterceptor());
PhaseInterceptorChain outChain =
outboundChainCache.get(pm.getOutPhases(), outList);
outChain.add(getOutInterceptors());
outChain.add(getOutFaultInterceptors());
Modified:
servicemix/smx3/branches/servicemix-3.2.2/tooling/xfire-maven-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx3/branches/servicemix-3.2.2/tooling/xfire-maven-plugin/pom.xml?rev=646685&r1=646684&r2=646685&view=diff
==============================================================================
---
servicemix/smx3/branches/servicemix-3.2.2/tooling/xfire-maven-plugin/pom.xml
(original)
+++
servicemix/smx3/branches/servicemix-3.2.2/tooling/xfire-maven-plugin/pom.xml
Thu Apr 10 01:47:14 2008
@@ -83,6 +83,11 @@
<version>2.3</version>
<scope>runtime</scope>
</dependency>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ </dependency>
+
</dependencies>