Author: dandiep
Date: Thu Jul 26 23:18:54 2007
New Revision: 560124
URL: http://svn.apache.org/viewvc?view=rev&rev=560124
Log:
Also set the OperationInfo when selecting a SOAPAction. Remove soapAction
settings from the anonymous_complex_type.wsdl because the operations all had
the same SOAPAction, which is illegal AFAIK.
Modified:
incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapActionInInterceptor.java
incubator/cxf/trunk/testutils/src/main/resources/wsdl/anonymous_complex_type.wsdl
Modified:
incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapActionInInterceptor.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapActionInInterceptor.java?view=diff&rev=560124&r1=560123&r2=560124
==============================================================================
---
incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapActionInInterceptor.java
(original)
+++
incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapActionInInterceptor.java
Thu Jul 26 23:18:54 2007
@@ -34,6 +34,7 @@
import org.apache.cxf.message.Message;
import org.apache.cxf.phase.Phase;
import org.apache.cxf.service.model.BindingOperationInfo;
+import org.apache.cxf.service.model.OperationInfo;
public class SoapActionInInterceptor extends AbstractSoapInterceptor {
@@ -95,6 +96,8 @@
SoapOperationInfo soi = (SoapOperationInfo)
boi.getExtensor(SoapOperationInfo.class);
if (soi != null && soi.getAction().equals(action)) {
ex.put(BindingOperationInfo.class, boi);
+ ex.put(OperationInfo.class, boi.getOperationInfo());
+ return;
}
}
}
Modified:
incubator/cxf/trunk/testutils/src/main/resources/wsdl/anonymous_complex_type.wsdl
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/testutils/src/main/resources/wsdl/anonymous_complex_type.wsdl?view=diff&rev=560124&r1=560123&r2=560124
==============================================================================
---
incubator/cxf/trunk/testutils/src/main/resources/wsdl/anonymous_complex_type.wsdl
(original)
+++
incubator/cxf/trunk/testutils/src/main/resources/wsdl/anonymous_complex_type.wsdl
Thu Jul 26 23:18:54 2007
@@ -89,7 +89,7 @@
<wsdl:binding name="anonymous_complex_typeSOAP"
type="tns:anonymous_complex_type">
<soap:binding style="document"
transport="http://schemas.xmlsoap.org/soap/http"; />
<wsdl:operation name="SplitName">
- <soap:operation
soapAction="http://cxf.apache.org/anonymous_complex_type/SplitName"; />
+ <soap:operation />
<wsdl:input>
<soap:body use="literal" />
</wsdl:input>
@@ -98,7 +98,7 @@
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="RefSplitName">
- <soap:operation
soapAction="http://cxf.apache.org/anonymous_complex_type/SplitName"; />
+ <soap:operation />
<wsdl:input>
<soap:body use="literal" />
</wsdl:input>
