svn commit: r774638 - in /servicemix/components/bindings/servicemix-cxf-bc/trunk/src: main/java/org/apache/servicemix/cxfbc/ test/java/org/apache/servicemix/cxfbc/

[ffang]

Author: ffang
Date: Thu May 14 05:21:21 2009
New Revision: 774638

URL: http://svn.apache.org/viewvc?rev=774638&view=rev
Log:
[SMXCOMP-542]minor refactor cxf bc to honor recent changes of cxf 
dispatch/provider

Modified:
    
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/CxfBcProvider.java
    
servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/CalculatorSoapMessageProvider.java

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=774638&r1=774637&r2=774638&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
 Thu May 14 05:21:21 2009
@@ -433,7 +433,7 @@
             }
 
             ei.getBinding().setProperty(
-                    AbstractBindingFactory.DATABINDING_DISABLED, Boolean.TRUE);
+                    AbstractBindingFactory.SMX_DATABINDING_DISABLED, 
Boolean.TRUE);
 
             cxfService.getInInterceptors().add(new 
AbstractPhaseInterceptor<Message>(Phase.PRE_PROTOCOL) {
                 public void handleMessage(Message message) throws Fault {

Modified: 
servicemix/components/bindings/servicemix-cxf-bc/trunk/src/main/java/org/apache/servicemix/cxfbc/CxfBcProvider.java
URL: 
http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-cxf-bc/trunk/src/main/java/org/apache/servicemix/cxfbc/CxfBcProvider.java?rev=774638&r1=774637&r2=774638&view=diff
==============================================================================
--- 
servicemix/components/bindings/servicemix-cxf-bc/trunk/src/main/java/org/apache/servicemix/cxfbc/CxfBcProvider.java
 (original)
+++ 
servicemix/components/bindings/servicemix-cxf-bc/trunk/src/main/java/org/apache/servicemix/cxfbc/CxfBcProvider.java
 Thu May 14 05:21:21 2009
@@ -478,7 +478,7 @@
                     endpoint = ei.getName().getLocalPart();
                 }
                 ei.getBinding().setProperty(
-                        AbstractBindingFactory.DATABINDING_DISABLED,
+                        AbstractBindingFactory.SMX_DATABINDING_DISABLED,
                         Boolean.TRUE);
 
                 ep = new EndpointImpl(getBus(), cxfService, ei);

Modified: 
servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/CalculatorSoapMessageProvider.java
URL: 
http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/CalculatorSoapMessageProvider.java?rev=774638&r1=774637&r2=774638&view=diff
==============================================================================
--- 
servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/CalculatorSoapMessageProvider.java
 (original)
+++ 
servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/CalculatorSoapMessageProvider.java
 Thu May 14 05:21:21 2009
@@ -19,6 +19,7 @@
 import java.io.InputStream;
 
 import javax.xml.soap.MessageFactory;
+import javax.xml.soap.SOAPConstants;
 import javax.xml.soap.SOAPMessage;
 import javax.xml.ws.Provider;
 import javax.xml.ws.Service;
@@ -43,7 +44,7 @@
         SOAPMessage response = null;
         try {
             System.out.println("Incoming Client Request as a SOAPMessage");
-            MessageFactory factory = MessageFactory.newInstance();
+            MessageFactory factory = 
MessageFactory.newInstance(SOAPConstants.SOAP_1_2_PROTOCOL);
             InputStream is = 
getClass().getResourceAsStream("provider_rep.xml");
             response =  factory.createMessage(null, is);
             is.close();