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

[ffang]

Author: ffang
Date: Wed Jul 22 02:31:30 2009
New Revision: 796606

URL: http://svn.apache.org/viewvc?rev=796606&view=rev
Log:
[SMXCOMP-597]CxfBCSESystemTest failed due to recent change in cxf

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/test/java/org/apache/servicemix/cxfbc/CalculatorImpl.java
    
servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/resources/org/apache/servicemix/cxfbc/xbean_without_jbi_wrapper.xml

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=796606&r1=796605&r2=796606&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
 Wed Jul 22 02:31:30 2009
@@ -39,9 +39,6 @@
 import javax.wsdl.extensions.soap.SOAPBinding;
 import javax.xml.namespace.QName;
 import javax.xml.transform.Source;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.ServletException;
 
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
@@ -52,7 +49,6 @@
 import org.apache.cxf.Bus;
 import org.apache.cxf.BusFactory;
 import org.apache.cxf.attachment.AttachmentImpl;
-import org.apache.cxf.binding.AbstractBindingFactory;
 import org.apache.cxf.binding.soap.SoapFault;
 import org.apache.cxf.binding.soap.SoapMessage;
 import org.apache.cxf.binding.soap.interceptor.MustUnderstandInterceptor;
@@ -64,7 +60,6 @@
 import org.apache.cxf.catalog.OASISCatalogManager;
 import org.apache.cxf.continuations.Continuation;
 import org.apache.cxf.continuations.ContinuationProvider;
-import org.apache.cxf.continuations.SuspendedInvocationException;
 import org.apache.cxf.endpoint.Endpoint;
 import org.apache.cxf.endpoint.EndpointImpl;
 import org.apache.cxf.endpoint.Server;
@@ -116,8 +111,6 @@
 import org.apache.servicemix.jbi.jaxp.SourceTransformer;
 import org.apache.servicemix.soap.util.DomUtil;
 import org.mortbay.jetty.Handler;
-import org.mortbay.jetty.HttpConnection;
-import org.mortbay.jetty.handler.AbstractHandler;
 import org.springframework.core.io.Resource;
 import org.springframework.transaction.PlatformTransactionManager;
 
@@ -827,7 +820,10 @@
                         if (exchange.getProperty("faultstring") != null) {
                             details = (Element) 
details.getElementsByTagName("faultstring").item(0);
                         } else {
-                            details = (Element) 
details.getElementsByTagName("detail").item(0);
+                            details = (Element) 
details.getElementsByTagName("detail").item(0) == null ?
+                                    (Element) 
details.getElementsByTagName("soap:Detail").item(0):
+                                        (Element) 
details.getElementsByTagName("detail").item(0);
+                          
                         }
 
                         assert details != null;

Modified: 
servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/CalculatorImpl.java
URL: 
http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/CalculatorImpl.java?rev=796606&r1=796605&r2=796606&view=diff
==============================================================================
--- 
servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/CalculatorImpl.java
 (original)
+++ 
servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/CalculatorImpl.java
 Wed Jul 22 02:31:30 2009
@@ -29,6 +29,7 @@
             targetNamespace = "http://apache.org/cxf/calculator";, 
             endpointInterface = "org.apache.cxf.calculator.CalculatorPortType",
             wsdlLocation = "testutils/calculator.wsdl")
+...@javax.xml.ws.bindingtype(value = 
"http://www.w3.org/2003/05/soap/bindings/HTTP/";)
 public class CalculatorImpl implements CalculatorPortType {
     public int add(int number1, int number2) throws AddNumbersFault {
         if (number1 < 0 || number2 < 0) {

Modified: 
servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/resources/org/apache/servicemix/cxfbc/xbean_without_jbi_wrapper.xml
URL: 
http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/resources/org/apache/servicemix/cxfbc/xbean_without_jbi_wrapper.xml?rev=796606&r1=796605&r2=796606&view=diff
==============================================================================
--- 
servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/resources/org/apache/servicemix/cxfbc/xbean_without_jbi_wrapper.xml
 (original)
+++ 
servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/resources/org/apache/servicemix/cxfbc/xbean_without_jbi_wrapper.xml
 Wed Jul 22 02:31:30 2009
@@ -38,7 +38,7 @@
     <sm:endpoints>
       <cxfse:endpoint useJBIWrapper="false">
         <cxfse:pojo>
-          <bean class="org.apache.cxf.calculator.CalculatorImpl" />
+          <bean class="org.apache.servicemix.cxfbc.CalculatorImpl" />
         </cxfse:pojo>
         <cxfse:inInterceptors>
           <bean class="org.apache.cxf.interceptor.LoggingInInterceptor"/>