Author: ffang
Date: Fri May 22 07:52:34 2009
New Revision: 777420
URL: http://svn.apache.org/viewvc?rev=777420&view=rev
Log:
[SMXCOMP-550]cxf se should be able to extract operationName based on payload
and servicemodel if using doc/literal style in case that no operationName bound
to the MessageExchange
Modified:
servicemix/smx3/branches/servicemix-3.2/deployables/bindingcomponents/servicemix-cxf-bc/src/test/java/org/apache/servicemix/cxfbc/CxfBcProviderTest.java
servicemix/smx3/branches/servicemix-3.2/deployables/serviceengines/servicemix-cxf-se/src/main/java/org/apache/servicemix/cxfse/CxfSeEndpoint.java
Modified:
servicemix/smx3/branches/servicemix-3.2/deployables/bindingcomponents/servicemix-cxf-bc/src/test/java/org/apache/servicemix/cxfbc/CxfBcProviderTest.java
URL:
http://svn.apache.org/viewvc/servicemix/smx3/branches/servicemix-3.2/deployables/bindingcomponents/servicemix-cxf-bc/src/test/java/org/apache/servicemix/cxfbc/CxfBcProviderTest.java?rev=777420&r1=777419&r2=777420&view=diff
==============================================================================
---
servicemix/smx3/branches/servicemix-3.2/deployables/bindingcomponents/servicemix-cxf-bc/src/test/java/org/apache/servicemix/cxfbc/CxfBcProviderTest.java
(original)
+++
servicemix/smx3/branches/servicemix-3.2/deployables/bindingcomponents/servicemix-cxf-bc/src/test/java/org/apache/servicemix/cxfbc/CxfBcProviderTest.java
Fri May 22 07:52:34 2009
@@ -78,7 +78,6 @@
io = client.createInOutExchange();
io.setService(new QName("http://apache.org/hello_world_soap_http";,
"SOAPServiceProvider"));
io.setInterfaceName(new
QName("http://apache.org/hello_world_soap_http";, "Greeter"));
- io.setOperation(new QName("http://apache.org/hello_world_soap_http";,
"greetMe"));
//send message to proxy
io.getInMessage().setContent(new StringSource(
"<message
xmlns='http://java.sun.com/xml/ns/jbi/wsdl-11-wrapper'>"
@@ -99,7 +98,6 @@
io = client.createInOutExchange();
io.setService(new QName("http://apache.org/hello_world_soap_http";,
"SOAPServiceProvider"));
io.setInterfaceName(new
QName("http://apache.org/hello_world_soap_http";, "Greeter"));
- io.setOperation(new QName("http://apache.org/hello_world_soap_http";,
"greetMe"));
//send message to proxy
io.getInMessage().setContent(new StringSource(
"<message
xmlns='http://java.sun.com/xml/ns/jbi/wsdl-11-wrapper'>"
@@ -137,7 +135,6 @@
io = client.createInOutExchange();
io.setService(new QName("http://apache.org/hello_world_soap_http";,
"SOAPServiceProvider"));
io.setInterfaceName(new
QName("http://apache.org/hello_world_soap_http";, "Greeter"));
- io.setOperation(new QName("http://apache.org/hello_world_soap_http";,
"greetMe"));
//send message to proxy
io.getInMessage().setContent(new StringSource(
"<message
xmlns='http://java.sun.com/xml/ns/jbi/wsdl-11-wrapper'>"
@@ -174,7 +171,6 @@
io = client.createInOutExchange();
io.setService(new QName("http://apache.org/hello_world_soap_http";,
"SOAPServiceProvider"));
io.setInterfaceName(new
QName("http://apache.org/hello_world_soap_http";, "Greeter"));
- io.setOperation(new QName("http://apache.org/hello_world_soap_http";,
"greetMe"));
io.getInMessage().setContent(new StringSource(
"<message
xmlns='http://java.sun.com/xml/ns/jbi/wsdl-11-wrapper'>"
+ "<part> "
@@ -193,7 +189,6 @@
io = client.createInOutExchange();
io.setService(new QName("http://apache.org/hello_world_soap_http";,
"SOAPServiceProvider"));
io.setInterfaceName(new
QName("http://apache.org/hello_world_soap_http";, "Greeter"));
- io.setOperation(new QName("http://apache.org/hello_world_soap_http";,
"greetMe"));
io.getInMessage().setContent(new StringSource(
"<message xmlns='http://java.sun.com/xml/ns/jbi/wsdl-11-wrapper'>"
+ "<part> "
@@ -223,7 +218,6 @@
io = client.createInOutExchange();
io.setService(new QName("http://apache.org/hello_world_soap_http";,
"SOAPServiceProvider"));
io.setInterfaceName(new
QName("http://apache.org/hello_world_soap_http";, "Greeter"));
- io.setOperation(new QName("http://apache.org/hello_world_soap_http";,
"greetMe"));
//send message to proxy
io.getInMessage().setContent(new StringSource(
"<message
xmlns='http://java.sun.com/xml/ns/jbi/wsdl-11-wrapper'>"
@@ -255,7 +249,6 @@
io = client.createInOutExchange();
io.setService(new QName("http://apache.org/hello_world_soap_http";,
"SOAPServiceProvider"));
io.setInterfaceName(new
QName("http://apache.org/hello_world_soap_http";, "Greeter"));
- io.setOperation(new QName("http://apache.org/hello_world_soap_http";,
"greetMe"));
io.getInMessage().setContent(new StringSource(
"<message
xmlns='http://java.sun.com/xml/ns/jbi/wsdl-11-wrapper'>"
+ "<part> "
Modified:
servicemix/smx3/branches/servicemix-3.2/deployables/serviceengines/servicemix-cxf-se/src/main/java/org/apache/servicemix/cxfse/CxfSeEndpoint.java
URL:
http://svn.apache.org/viewvc/servicemix/smx3/branches/servicemix-3.2/deployables/serviceengines/servicemix-cxf-se/src/main/java/org/apache/servicemix/cxfse/CxfSeEndpoint.java?rev=777420&r1=777419&r2=777420&view=diff
==============================================================================
---
servicemix/smx3/branches/servicemix-3.2/deployables/serviceengines/servicemix-cxf-se/src/main/java/org/apache/servicemix/cxfse/CxfSeEndpoint.java
(original)
+++
servicemix/smx3/branches/servicemix-3.2/deployables/serviceengines/servicemix-cxf-se/src/main/java/org/apache/servicemix/cxfse/CxfSeEndpoint.java
Fri May 22 07:52:34 2009
@@ -16,6 +16,7 @@
*/
package org.apache.servicemix.cxfse;
+import java.io.IOException;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.util.List;
@@ -30,14 +31,21 @@
import javax.jbi.messaging.ExchangeStatus;
import javax.jbi.messaging.InOnly;
import javax.jbi.messaging.MessageExchange;
+import javax.jbi.messaging.NormalizedMessage;
import javax.jbi.messaging.RobustInOnly;
import javax.wsdl.WSDLException;
import javax.wsdl.factory.WSDLFactory;
import javax.xml.namespace.QName;
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.transform.TransformerException;
import javax.xml.ws.WebServiceRef;
-
+import org.w3c.dom.Element;
+import org.xml.sax.SAXException;
import org.apache.cxf.Bus;
import org.apache.cxf.aegis.databinding.AegisDatabinding;
+import org.apache.cxf.binding.soap.SoapMessage;
+import org.apache.cxf.binding.soap.SoapVersion;
+import org.apache.cxf.binding.soap.model.SoapBindingInfo;
import org.apache.cxf.endpoint.Server;
import org.apache.cxf.frontend.ServerFactoryBean;
import org.apache.cxf.interceptor.Fault;
@@ -48,6 +56,8 @@
import org.apache.cxf.jaxws.ServiceImpl;
import org.apache.cxf.jaxws.support.JaxWsImplementorInfo;
import org.apache.cxf.jaxws.support.JaxWsServiceFactoryBean;
+import org.apache.cxf.message.Message;
+import org.apache.cxf.service.model.BindingOperationInfo;
import org.apache.cxf.service.model.EndpointInfo;
import org.apache.cxf.transport.ConduitInitiatorManager;
import org.apache.cxf.transport.jbi.JBIDestination;
@@ -59,8 +69,11 @@
import org.apache.servicemix.cxfse.interceptors.AttachmentOutInterceptor;
import org.apache.servicemix.cxfse.support.ReflectionUtils;
import org.apache.servicemix.id.IdGenerator;
+import org.apache.servicemix.jbi.jaxp.SourceTransformer;
+import org.apache.servicemix.soap.util.DomUtil;
import org.springframework.util.ReflectionUtils.FieldCallback;
+
/**
*
* @author gnodet
@@ -104,6 +117,7 @@
private String pojoEndpoint;
private QName pojoInterfaceName;
+ private Server soapBindingServer;
/**
* Returns the object implementing the endpoint's functionality. It is
* returned as a generic Java <code>Object</code> that can be cast to the
@@ -344,9 +358,17 @@
.getName();
exchange.setOperation(opeName);
} else {
- throw new Fault(new Exception(
- "Operation not bound on this MessageExchange"));
-
+ NormalizedMessage nm = exchange.getMessage("in");
+ if (soapBindingServer == null) {
+ ServerFactoryBean sfForSoapBinding = new
ServerFactoryBean();
+ sfForSoapBinding.setServiceBean(getPojo());
+
sfForSoapBinding.getServiceFactory().setPopulateFromClass(true);
+ sfForSoapBinding.setStart(false);
+ soapBindingServer = sfForSoapBinding.create();
+ }
+ Message message =
soapBindingServer.getEndpoint().getBinding().createMessage();
+ opeName = findOperation(nm, message, exchange);
+ exchange.setOperation(opeName);
}
}
JBITransportFactory jbiTransportFactory = (JBITransportFactory)
getBus()
@@ -371,6 +393,52 @@
}
}
+ private QName findOperation(NormalizedMessage nm,
+ Message message, MessageExchange exchange)
+ throws TransformerException, ParserConfigurationException,
+ IOException, SAXException {
+ // try to figure out the operationName based on the incoming message
+ // payload and wsdl if use doc/literal/wrapped
+ Element element = new
SourceTransformer().toDOMElement(nm.getContent());
+
+ if (!useJBIWrapper) {
+ SoapVersion soapVersion = ((SoapMessage) message).getVersion();
+ if (element != null) {
+ Element bodyElement = (Element) element.getElementsByTagNameNS(
+ element.getNamespaceURI(),
+ soapVersion.getBody().getLocalPart()).item(0);
+ if (bodyElement != null) {
+ element = (Element) bodyElement.getFirstChild();
+ }
+ }
+ } else {
+ element = DomUtil.getFirstChildElement(DomUtil
+ .getFirstChildElement(element));
+ }
+
+ QName opeName = new QName(element.getNamespaceURI(), element
+ .getLocalName());
+ SoapBindingInfo binding = (SoapBindingInfo)
soapBindingServer.getEndpoint().getEndpointInfo().getBinding();
+ for (BindingOperationInfo op : binding.getOperations()) {
+ String style = binding.getStyle(op.getOperationInfo());
+ if (style == null) {
+ style = binding.getStyle();
+ }
+ if ("document".equals(style)) {
+ if
(op.getName().getLocalPart().equals(opeName.getLocalPart())) {
+ return new QName(getPojoService().getNamespaceURI(),
+ opeName.getLocalPart());
+ }
+ } else {
+ throw new Fault(
+ new Exception(
+ "Operation must bound on this MessageExchange
if use rpc mode"));
+ }
+ }
+ throw new Fault(new Exception("Operation not bound on this
MessageExchange"));
+
+ }
+
/*
* (non-Javadoc)
*
